Merge pull request #21 from Sigma88/Development

AFG Hotfix
Sigma88 · Nov 10, 2016 · 5728b23 · 5728b23
2 parents 26d57aa + 6f96763
commit 5728b23
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 32 deletions.
diff --git a/Changelog.txt b/Changelog.txt
@@ -1,3 +1,8 @@
+**v0.6.1**
+
+- Fixed AtmosphereFromGround resize
+
+
 **v0.6.0**
 
 - Updated to KSP 1.2.1 and Kopernicus 1.2.1-1

diff --git a/GameData/Sigma/Dimensions/Configs/ReDimension/atmoScale.cfg b/GameData/Sigma/Dimensions/Configs/ReDimension/atmoScale.cfg
@@ -51,25 +51,26 @@
 		}
 		@Atmosphere:HAS[~addAFG[False]]
 		{
-			%AtmosphereFromGround
-			{
-				&innerRadiusMult = 0.975
-				&outerRadiusMult = 1.025
-			}
 			@AtmosphereFromGround:HAS[#outerRadius[*]]
 			{
-				@outerRadiusMult = #$../../Properties/radius$
-				@outerRadiusMult /= #$outerRadius$
+				@outerRadius /= #$../../Properties/radius$
+				&outerRadiusMult = #$outerRadius$
+				!outerRadius,* = DEL
 			}
-			@AtmosphereFromGround:HAS[~outerRadius[*]]
+			%AtmosphereFromGround
 			{
-				outerRadius = #$../../Properties/radius$
-				@outerRadius *= #$outerRadiusMult$
+				&outerRadiusMult = 1.025
 			}
 			@AtmosphereFromGround:HAS[#innerRadius[*]]
 			{
-				@innerRadiusMult = #$outerRadius$
-				@innerRadiusMult /= #$innerRadius$
+				@innerRadius /= #$../../Properties/radius$
+				@innerRadius /= #$outerRadiusMult$
+				&innerRadiusMult = #$innerRadius$
+				!innerRadius,* = DEL
+			}
+			%AtmosphereFromGround
+			{
+				&innerRadiusMult = 0.975
 			}
 			@AtmosphereFromGround:HAS[#transformScale[*]]
 			{
@@ -81,37 +82,31 @@
 				%removeAFG = True
 			}
 			@AtmosphereFromGround:HAS[~removeAFG[True]]
-			{
-				!transformScale,* = DEL
-				transformScale = #$../../SigmaDimensions/Resize$
-			}
-			@AtmosphereFromGround:HAS[~removeAFG[True],~transformScale[<1]]
-			{
-				@transformScale = 1
-			}
-			@AtmosphereFromGround:HAS[~removeAFG[True],#transformScale[<1]]
-			{
-				@transformScale != -0.333333333333333
-			}
-			@AtmosphereFromGround:HAS[~removeAFG[True]]
 			{
 				@innerRadiusMult *= #$outerRadiusMult$
 				@innerRadiusMult -= 1
-				@innerRadiusMult *= #$transformScale$
 				@innerRadiusMult *= #$../../SigmaDimensions/atmoVisualEffect$
 				@innerRadiusMult += 1
 
 				@outerRadiusMult -= 1
-				@outerRadiusMult *= #$transformScale$
 				@outerRadiusMult *= #$../../SigmaDimensions/atmoVisualEffect$
+				%transformScale = #$outerRadiusMult$
 				@outerRadiusMult += 1
 
 				@innerRadiusMult /= #$outerRadiusMult$
 
 				@transformScale *= 2
-				@outerRadiusMult -= 1
-				@transformScale *= #$outerRadiusMult$
-				@outerRadiusMult += 1
+				@transformScale *= #$../../Properties/radius$
+				@transformScale *= #$../../SigmaDimensions/Resize$
+			}
+			@AtmosphereFromGround:HAS[#transformScale[<7500],~removeAFG[True]]
+			{
+				@transformScale = 7500
+			}
+			@AtmosphereFromGround:HAS[~removeAFG[True]]
+			{
+				@transformScale /= #$../../Properties/radius$
+				@transformScale /= #$../../SigmaDimensions/Resize$
 				@transformScale += 1
 				@transformScale = #$transformScale$,$transformScale$,$transformScale$
 			}

diff --git a/GameData/Sigma/Dimensions/Configs/Sigma-Dimensions.version b/GameData/Sigma/Dimensions/Configs/Sigma-Dimensions.version
@@ -13,7 +13,7 @@
 	{
 		"MAJOR": 0,
 		"MINOR": 6,
-		"PATCH": 0,
+		"PATCH": 1,
 		"BUILD": 0
 	},
 	"KSP_VERSION":

diff --git a/GameData/Sigma/Dimensions/README.txt b/GameData/Sigma/Dimensions/README.txt
@@ -189,7 +189,7 @@ To apply Planet Specific Changes follow these instructions.
 
 
 ## For other questions, visit the Forum Thread:
-# http://forum.kerbalspaceprogram.com/index.php/topic/126548-/
+# http://forum.kerbalspaceprogram.com/index.php?/topic/126548-0