Merge pull request #21 from Sigma88/Development

Sigma88 · web-flow · commit 24325c1913e7 · 2016-06-18T18:26:48.000+02:00
Development
diff --git a/Changelog.txt b/Changelog.txt
@@ -1,3 +1,8 @@
+**v1.5.3**
+
+- Added some fail-safe measures to the code
+
+
 **v1.5.2**
 
 - Fixed science archives
diff --git a/GameData/Sigma/Binary/Configs/checkMaxDistance.cfg b/GameData/Sigma/Binary/Configs/checkMaxDistance.cfg
@@ -8,44 +8,44 @@
 		!Body:HAS[!Orbit:HAS[#referenceBody[Sun]]] {}
 		@Body:HAS[@Template[Dres]]
 		{
-			@Orbit:HAS[~eccentricity[*]]
+			@Orbit
 			{
-				eccentricity = 0.145
+				&eccentricity = 0.145
 			}
 		}
 		@Body:HAS[@Template[Pol]]
 		{
-			@Orbit:HAS[~eccentricity[*]]
+			@Orbit
 			{
-				eccentricity = 0.17085
+				&eccentricity = 0.17085
 			}
 		}
 		@Body:HAS[@Template[Moho]]
 		{
-			@Orbit:HAS[~eccentricity[*]]
+			@Orbit
 			{
-				eccentricity = 0.200000002980232
+				&eccentricity = 0.200000002980232
 			}
 		}
 		@Body:HAS[@Template[Bop]]
 		{
-			@Orbit:HAS[~eccentricity[*]]
+			@Orbit
 			{
-				eccentricity = 0.234999999403954
+				&eccentricity = 0.234999999403954
 			}
 		}
 		@Body:HAS[@Template[Eeloo]]
 		{
-			@Orbit:HAS[~eccentricity[*]]
+			@Orbit
 			{
-				eccentricity = 0.26
+				&eccentricity = 0.26
 			}
 		}
 		@Body:HAS[@Template[Jool]]
 		{
-			@Orbit:HAS[~eccentricity[*]]
+			@Orbit
 			{
-				eccentricity = 0.550000011920929
+				&eccentricity = 0.550000011920929
 			}
 		}
 		@Body,*
@@ -55,15 +55,17 @@
 				@eccentricity += 1
 				@semiMajorAxis *= #$eccentricity$
 			}
-			@Orbit
+			!SBDistance,* {}
+			SBDistance
 			{
+				semiMajorAxis = #$../Orbit/semiMajorAxis$
 				@semiMajorAxis -= #$/sbMaxDistance$
 			}
 		}
-		!Body:HAS[!Orbit:HAS[#semiMajorAxis[>0]]] {}
+		!Body:HAS[!SBDistance:HAS[#semiMajorAxis[>0]]] {}
 		@Body,*
 		{
-			@Orbit
+			@SBDistance
 			{
 				@semiMajorAxis += #$/sbMaxDistance$
 			}
@@ -73,20 +75,20 @@
 }
 @Kopernicus:HAS[@Kopernicus]:FOR[SigmaBinary]
 {
-	@sbMaxDistance = #$Kopernicus/Body/Orbit/semiMajorAxis$
+	@sbMaxDistance = #$Kopernicus/Body/SBDistance/semiMajorAxis$
 	@Kopernicus
 	{
 		@Body,*
 		{
-			@Orbit
+			@SBDistance
 			{
 				@semiMajorAxis -= #$/sbMaxDistance$
 			}
 		}
-		!Body:HAS[!Orbit:HAS[#semiMajorAxis[>0]]] {}
+		!Body:HAS[!SBDistance:HAS[#semiMajorAxis[>0]]] {}
 		@Body,*
 		{
-			@Orbit
+			@SBDistance
 			{
 				@semiMajorAxis += #$/sbMaxDistance$
 			}
diff --git a/GameData/Sigma/Binary/Configs/generateBarycenters.cfg b/GameData/Sigma/Binary/Configs/generateBarycenters.cfg
@@ -52,7 +52,7 @@
 			fadeEnd = 0
 			Material
 			{
-				color = 0,0,0,1
+				color = 0,0,0,0
 				shininess = 0
 			}
 		}
diff --git a/GameData/Sigma/Binary/Configs/generateOrbits.cfg b/GameData/Sigma/Binary/Configs/generateOrbits.cfg
@@ -54,7 +54,7 @@
 			fadeEnd = 0
 			Material
 			{
-				color = 0,0,0,1
+				color = 0,0,0,0
 				shininess = 0
 			}
 		}
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":5,"PATCH":2,"BUILD":0},"KSP_VERSION":{"MAJOR":1,"MINOR":1,"PATCH":2}}
+{"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":5,"PATCH":3,"BUILD":0},"KSP_VERSION":{"MAJOR":1,"MINOR":1,"PATCH":2}}

Original file line number	Diff line number	Diff line change
`@@ -8,44 +8,44 @@`
`8`	`8`	`!Body:HAS[!Orbit:HAS[#referenceBody[Sun]]] {}`
`9`	`9`	`@Body:HAS[@Template[Dres]]`
`10`	`10`	`{`
`11`		`- @Orbit:HAS[~eccentricity[*]]`
	`11`	`+ @Orbit`
`12`	`12`	`{`
`13`		`- eccentricity = 0.145`
	`13`	`+ &eccentricity = 0.145`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`	`@Body:HAS[@Template[Pol]]`
`17`	`17`	`{`
`18`		`- @Orbit:HAS[~eccentricity[*]]`
	`18`	`+ @Orbit`
`19`	`19`	`{`
`20`		`- eccentricity = 0.17085`
	`20`	`+ &eccentricity = 0.17085`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`	`@Body:HAS[@Template[Moho]]`
`24`	`24`	`{`
`25`		`- @Orbit:HAS[~eccentricity[*]]`
	`25`	`+ @Orbit`
`26`	`26`	`{`
`27`		`- eccentricity = 0.200000002980232`
	`27`	`+ &eccentricity = 0.200000002980232`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`	`@Body:HAS[@Template[Bop]]`
`31`	`31`	`{`
`32`		`- @Orbit:HAS[~eccentricity[*]]`
	`32`	`+ @Orbit`
`33`	`33`	`{`
`34`		`- eccentricity = 0.234999999403954`
	`34`	`+ &eccentricity = 0.234999999403954`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`	`@Body:HAS[@Template[Eeloo]]`
`38`	`38`	`{`
`39`		`- @Orbit:HAS[~eccentricity[*]]`
	`39`	`+ @Orbit`
`40`	`40`	`{`
`41`		`- eccentricity = 0.26`
	`41`	`+ &eccentricity = 0.26`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`	`@Body:HAS[@Template[Jool]]`
`45`	`45`	`{`
`46`		`- @Orbit:HAS[~eccentricity[*]]`
	`46`	`+ @Orbit`
`47`	`47`	`{`
`48`		`- eccentricity = 0.550000011920929`
	`48`	`+ &eccentricity = 0.550000011920929`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`	`@Body,*`
`@@ -55,15 +55,17 @@`
`55`	`55`	`@eccentricity += 1`
`56`	`56`	`@semiMajorAxis *= #$eccentricity$`
`57`	`57`	`}`
`58`		`- @Orbit`
	`58`	`+ !SBDistance,* {}`
	`59`	`+ SBDistance`
`59`	`60`	`{`
	`61`	`+ semiMajorAxis = #$../Orbit/semiMajorAxis$`
`60`	`62`	`@semiMajorAxis -= #$/sbMaxDistance$`
`61`	`63`	`}`
`62`	`64`	`}`
`63`		`- !Body:HAS[!Orbit:HAS[#semiMajorAxis[>0]]] {}`
	`65`	`+ !Body:HAS[!SBDistance:HAS[#semiMajorAxis[>0]]] {}`
`64`	`66`	`@Body,*`
`65`	`67`	`{`
`66`		`- @Orbit`
	`68`	`+ @SBDistance`
`67`	`69`	`{`
`68`	`70`	`@semiMajorAxis += #$/sbMaxDistance$`
`69`	`71`	`}`
`@@ -73,20 +75,20 @@`
`73`	`75`	`}`
`74`	`76`	`@Kopernicus:HAS[@Kopernicus]:FOR[SigmaBinary]`
`75`	`77`	`{`
`76`		`- @sbMaxDistance = #$Kopernicus/Body/Orbit/semiMajorAxis$`
	`78`	`+ @sbMaxDistance = #$Kopernicus/Body/SBDistance/semiMajorAxis$`
`77`	`79`	`@Kopernicus`
`78`	`80`	`{`
`79`	`81`	`@Body,*`
`80`	`82`	`{`
`81`		`- @Orbit`
	`83`	`+ @SBDistance`
`82`	`84`	`{`
`83`	`85`	`@semiMajorAxis -= #$/sbMaxDistance$`
`84`	`86`	`}`
`85`	`87`	`}`
`86`		`- !Body:HAS[!Orbit:HAS[#semiMajorAxis[>0]]] {}`
	`88`	`+ !Body:HAS[!SBDistance:HAS[#semiMajorAxis[>0]]] {}`
`87`	`89`	`@Body,*`
`88`	`90`	`{`
`89`		`- @Orbit`
	`91`	`+ @SBDistance`
`90`	`92`	`{`
`91`	`93`	`@semiMajorAxis += #$/sbMaxDistance$`
`92`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@`
`52`	`52`	`fadeEnd = 0`
`53`	`53`	`Material`
`54`	`54`	`{`
`55`		`- color = 0,0,0,1`
	`55`	`+ color = 0,0,0,0`
`56`	`56`	`shininess = 0`
`57`	`57`	`}`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@`
`54`	`54`	`fadeEnd = 0`
`55`	`55`	`Material`
`56`	`56`	`{`
`57`		`- color = 0,0,0,1`
	`57`	`+ color = 0,0,0,0`
`58`	`58`	`shininess = 0`
`59`	`59`	`}`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +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":5,"PATCH":2,"BUILD":0},"KSP_VERSION":{"MAJOR":1,"MINOR":1,"PATCH":2}}`
	`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":5,"PATCH":3,"BUILD":0},"KSP_VERSION":{"MAJOR":1,"MINOR":1,"PATCH":2}}`