Merge pull request #11 from Sigma88/Development

Development
Sigma88 · Feb 7, 2016 · 6dfe66a · 6dfe66a
2 parents 55b9081 + eb3a2a3
commit 6dfe66a
Show file tree

Hide file tree

Showing 13 changed files with 610 additions and 179 deletions.
diff --git a/Changelog.txt b/Changelog.txt
@@ -1,3 +1,14 @@
+**v1.4.0**
+
+- Barycenter name now accounts for cbNameLater
+- Secondary orbit line is now drawn relative to the barycenter
+- template.cfg now deactivates if there are missing bodies
+- Fixed calculation of minimum SphereOfInfluence
+- Fixed calculations when finalizeOrbit is used
+- Moved clean-up of temp values from :FINAL to :FOR[SigmaCleanUp]
+- Fixed names of config files to account for linux case sensitivity
+
+
 **v1.3.3**
 
 - Added conversion of meanAnomalyAtEpochD (deg) to meanAnomalyAtEpoch (rad)

diff --git a/GameData/Sigma/Binary/Configs/caseSensitivityFix.cfg b/GameData/Sigma/Binary/Configs/caseSensitivityFix.cfg
@@ -14,4 +14,4 @@
 			@tidallyLocked ^= :E:e:
 		}
 	}
-}
+}
diff --git a/GameData/Sigma/Binary/Configs/diameterFix.cfg b/GameData/Sigma/Binary/Configs/diameterFix.cfg
@@ -2,119 +2,119 @@
 {
 	@Body:HAS[@Template:HAS[#name[Kerbin]]]
 	{
-		@Properties:HAS[~radius[]]
+		@Properties:HAS[~radius[*]]
 		{
 			radius = 600000
 		}
 	}
 	@Body:HAS[@Template:HAS[#name[Mun]]]
 	{
-		@Properties:HAS[~radius[]]
+		@Properties:HAS[~radius[*]]
 		{
 			radius = 200000
 		}
 	}
 	@Body:HAS[@Template:HAS[#name[Minmus]]]
 	{
-		@Properties:HAS[~radius[]]
+		@Properties:HAS[~radius[*]]
 		{
 			radius = 60000
 		}
 	}
 	@Body:HAS[@Template:HAS[#name[Moho]]]
 	{
-		@Properties:HAS[~radius[]]
+		@Properties:HAS[~radius[*]]
 		{
 			radius = 250000
 		}
 	}
 	@Body:HAS[@Template:HAS[#name[Eve]]]
 	{
-		@Properties:HAS[~radius[]]
+		@Properties:HAS[~radius[*]]
 		{
 			radius = 700000
 		}
 	}
 	@Body:HAS[@Template:HAS[#name[Gilly]]]
 	{
-		@Properties:HAS[~radius[]]
+		@Properties:HAS[~radius[*]]
 		{
 			radius = 13000
 		}
 	}
 	@Body:HAS[@Template:HAS[#name[Duna]]]
 	{
-		@Properties:HAS[~radius[]]
+		@Properties:HAS[~radius[*]]
 		{
 			radius = 320000
 		}
 	}
 	@Body:HAS[@Template:HAS[#name[Ike]]]
 	{
-		@Properties:HAS[~radius[]]
+		@Properties:HAS[~radius[*]]
 		{
 			radius = 130000
 		}
 	}
 	@Body:HAS[@Template:HAS[#name[Dres]]]
 	{
-		@Properties:HAS[~radius[]]
+		@Properties:HAS[~radius[*]]
 		{
 			radius = 138000
 		}
 	}
 	@Body:HAS[@Template:HAS[#name[Jool]]]
 	{
-		@Properties:HAS[~radius[]]
+		@Properties:HAS[~radius[*]]
 		{
 			radius = 6000000
 		}
 	}
 	@Body:HAS[@Template:HAS[#name[Laythe]]]
 	{
-		@Properties:HAS[~radius[]]
+		@Properties:HAS[~radius[*]]
 		{
 			radius = 500000
 		}
 	}
 	@Body:HAS[@Template:HAS[#name[Vall]]]
 	{
-		@Properties:HAS[~radius[]]
+		@Properties:HAS[~radius[*]]
 		{
 			radius = 300000
 		}
 	}
 	@Body:HAS[@Template:HAS[#name[Tylo]]]
 	{
-		@Properties:HAS[~radius[]]
+		@Properties:HAS[~radius[*]]
 		{
 			radius = 600000
 		}
 	}
 	@Body:HAS[@Template:HAS[#name[Bop]]]
 	{
-		@Properties:HAS[~radius[]]
+		@Properties:HAS[~radius[*]]
 		{
 			radius = 65000
 		}
 	}
 	@Body:HAS[@Template:HAS[#name[Pol]]]
 	{
-		@Properties:HAS[~radius[]]
+		@Properties:HAS[~radius[*]]
 		{
 			radius = 44000
 		}
 	}
 	@Body:HAS[@Template:HAS[#name[Eeloo]]]
 	{
-		@Properties:HAS[~radius[]]
+		@Properties:HAS[~radius[*]]
 		{
 			radius = 210000
 		}
 	}
 	@Body:HAS[@Template:HAS[#name[Sun]]]:NEEDS[!GalacticNeighborhood]
 	{
-		@Properties:HAS[~radius[]]
+		@Properties:HAS[~radius[*]]
 		{
 			radius = 261600000
 		}

diff --git a/GameData/Sigma/Binary/Configs/gravityFix.cfg b/GameData/Sigma/Binary/Configs/gravityFix.cfg
@@ -2,7 +2,7 @@
 {
 	@Body,*
 	{
-		@Properties:HAS[~mass[],~gravParameter[],~geeASL[],#radius[*]]
+		@Properties:HAS[~mass[*],~gravParameter[*],~geeASL[*],#radius[*]]
 		{
 			geeASL = fixME
 		}
@@ -126,4 +126,4 @@
 			@geeASL = 1.7462500333786
 		}
 	}
-}
+}
diff --git a/GameData/Sigma/Binary/Configs/massFix.cfg b/GameData/Sigma/Binary/Configs/massFix.cfg
@@ -5,7 +5,7 @@
 
 	// mass from geeASL + radius
 
-	@Body:HAS[@Properties:HAS[#geeASL[*],~mass[]]]
+	@Body:HAS[@Properties:HAS[#geeASL[*],~mass[*]]]
 	{
 		@Properties
 		{
@@ -81,7 +81,7 @@
 		{
 			mass = 9.76002360215474e+20
 		}
-		@Properties:HAS[~tidallyLocked[]]
+		@Properties:HAS[~tidallyLocked[*]]
 		{
 			tidallyLocked = True
 		}
@@ -199,7 +199,7 @@
 		{
 			mass = 2.78219487161283e+20
 		}
-		@Properties:HAS[~tidallyLocked[]]
+		@Properties:HAS[~tidallyLocked[*]]
 		{
 			tidallyLocked = True
 		}
@@ -260,7 +260,7 @@
 		{
 			mass = 2.9397663009231e+22
 		}
-		@Properties:HAS[~tidallyLocked[]]
+		@Properties:HAS[~tidallyLocked[*]]
 		{
 			tidallyLocked = True
 		}
@@ -283,7 +283,7 @@
 		{
 			mass = 3.10880280901635e+21
 		}
-		@Properties:HAS[~tidallyLocked[]]
+		@Properties:HAS[~tidallyLocked[*]]
 		{
 			tidallyLocked = True
 		}
@@ -306,7 +306,7 @@
 		{
 			mass = 4.23326347332927e+22
 		}
-		@Properties:HAS[~tidallyLocked[]]
+		@Properties:HAS[~tidallyLocked[*]]
 		{
 			tidallyLocked = True
 		}
@@ -329,7 +329,7 @@
 		{
 			mass = 3.72615364760999e+19
 		}
-		@Properties:HAS[~tidallyLocked[]]
+		@Properties:HAS[~tidallyLocked[*]]
 		{
 			tidallyLocked = True
 		}
@@ -352,7 +352,7 @@
 		{
 			mass = 1.08136362001798e+19
 		}
-		@Properties:HAS[~tidallyLocked[]]
+		@Properties:HAS[~tidallyLocked[*]]
 		{
 			tidallyLocked = True
 		}
@@ -388,7 +388,7 @@
 			epoch = 0
 		}
 	}
-	@Body:HAS[@Template:HAS[#name[Sun]]]:NEEDS[!GalacticNeighborhood]
+	@Body:HAS[@Template:HAS[#name[Sun]]]
 	{
 		@Properties
 		{

diff --git a/GameData/Sigma/Binary/Configs/nameFix.cfg b/GameData/Sigma/Binary/Configs/nameFix.cfg
@@ -0,0 +1,11 @@
+@Kopernicus:FOR[SigmaBinary]
+{
+	@Body,*
+	{
+	  sbName = #$name$
+	}
+	@Body:HAS[#cbNameLater[*]]
+	{
+	  @sbName = #$cbNameLater$
+	}
+}
diff --git a/.../Sigma/Binary/Configs/SigmaBarycenter.cfg → .../Sigma/Binary/Configs/sigmaBarycenter.cfg b/.../Sigma/Binary/Configs/SigmaBarycenter.cfg → .../Sigma/Binary/Configs/sigmaBarycenter.cfg
@@ -1,20 +1,5 @@
 @Kopernicus:FOR[SigmaBinary]
 {
-	// Add finalizeOrbit
-	@Body:HAS[~finalizeOrbit[]]
-	{
-		finalizeOrbit = False
-	}
-
-	// Add SigmaFinalize
-	@Body,*
-	{
-		%Properties
-		{
-			%SigmaFinalize = #$../finalizeOrbit$
-		}
-	}
-
 	// Create the barycenter as a template
 	Body
 	{
@@ -27,8 +12,6 @@
 		{
 			mass = 0
 			radius = 61
-			rotates = false
-			rotationPeriod = 0
 		}
 		Atmosphere
 		{
@@ -51,20 +34,3 @@
 		}
 	}
 }
-
-// Clear Temporary Stuff
-
-@Kopernicus:FINAL
-{
-	// Delete SigmaFinalize
-	@Body,*
-	{
-		@Properties
-		{
-			!SigmaFinalize = DEL
-		}
-	}
-
-	// Delete the Template Barycenter
-	!Body[SigmaBarycenter] {}
-}
diff --git a/GameData/Sigma/Binary/Configs/sigmaCleanUp.cfg b/GameData/Sigma/Binary/Configs/sigmaCleanUp.cfg
@@ -0,0 +1,11 @@
+@Kopernicus:FOR[SigmaCleanUp]
+{
+	// Delete sbName
+	@Body,*
+	{
+		!sbName = DEL
+	}
+
+	// Delete the Template Barycenter
+	!Body[SigmaBarycenter] {}
+}
diff --git a/GameData/Sigma/Binary/Configs/sigmaFinalize.cfg b/GameData/Sigma/Binary/Configs/sigmaFinalize.cfg
@@ -0,0 +1,8 @@
+@Kopernicus:FOR[SigmaBinary]
+{
+	// Add finalizeOrbit
+	@Body:HAS[~finalizeOrbit[*]]
+	{
+		finalizeOrbit = False
+	}
+}
diff --git a/GameData/Sigma/Binary/Sigma-Binary.version b/GameData/Sigma/Binary/Sigma-Binary.version
@@ -1 +1 @@
-{"NAME":"Sigma: Binary","URL":"http://ksp-avc.cybutek.net/version.php?id=188","DOWNLOAD":"http://forum.kerbalspaceprogram.com/threads/127820","CHANGE_LOG_URL":"https://github.com/Sigma88/Sigma-Binary/raw/master/Changelog.txt","VERSION":{"MAJOR":1,"MINOR":3,"PATCH":3,"BUILD":0},"KSP_VERSION":{"MAJOR":1,"MINOR":0,"PATCH":5}}
+{"NAME":"Sigma: Binary","URL":"http://ksp-avc.cybutek.net/version.php?id=188","DOWNLOAD":"http://forum.kerbalspaceprogram.com/threads/127820","CHANGE_LOG_URL":"https://github.com/Sigma88/Sigma-Binary/raw/master/Changelog.txt","VERSION":{"MAJOR":1,"MINOR":4,"PATCH":0,"BUILD":0},"KSP_VERSION":{"MAJOR":1,"MINOR":0,"PATCH":5}}