Merge pull request #17 from Sigma88/Development

Updating to KSP 1.1.2 and Kopernicus 1.0.4
Sigma88 · May 8, 2016 · 45097cb · 45097cb
2 parents f5e5341 + a6e90d7
commit 45097cb
Show file tree

Hide file tree

Showing 15 changed files with 136 additions and 73 deletions.
diff --git a/Changelog.txt b/Changelog.txt
@@ -1,3 +1,12 @@
+**v0.5.0**
+
+- Updated to KSP 1.1.2 and Kopernicus 1.0.4
+- Added the parameter scanAltitude
+- Tweaked inverseRotThresholdAltitude on atmospheric bodies
+- Fixed AtmosphereFromGround rescaling
+- Fixed orbital rescaling of asteroids
+
+
 **v0.4.3**
 
 - Fixed Kerbin Rotation

diff --git a/GameData/Sigma/Dimensions/Configs/Bodies/Duna_atmo.cfg b/GameData/Sigma/Dimensions/Configs/Bodies/Duna_atmo.cfg
@@ -13,6 +13,11 @@
 			%temperatureCurve {}
 			%temperatureSunMultCurve {}
 
+			%AtmosphereFromGround
+			{
+				&innerRadiusMult = 0.975
+				&outerRadiusMult = 1.025
+			}
 			@pressureCurve:HAS[~key[*]]
 			{
 				key = 0 6.755 0 -0.0007

diff --git a/GameData/Sigma/Dimensions/Configs/Bodies/Eve_atmo.cfg b/GameData/Sigma/Dimensions/Configs/Bodies/Eve_atmo.cfg
@@ -13,6 +13,11 @@
 			%temperatureCurve {}
 			%temperatureSunMultCurve {}
 
+			%AtmosphereFromGround
+			{
+				&innerRadiusMult = 0.975
+				&outerRadiusMult = 1.025
+			}
 			@pressureCurve:HAS[~key[*]]
 			{
 				key = 0 506.625 -0.08693577 -0.08693577

diff --git a/GameData/Sigma/Dimensions/Configs/Bodies/Jool_atmo.cfg b/GameData/Sigma/Dimensions/Configs/Bodies/Jool_atmo.cfg
@@ -13,6 +13,11 @@
 			%temperatureCurve {}
 			%temperatureSunMultCurve {}
 
+			%AtmosphereFromGround
+			{
+				&innerRadiusMult = 0.975
+				&outerRadiusMult = 1.025
+			}
 			@pressureCurve:HAS[~key[*]]
 			{
 				key = 0 1519.875 0 -0.05753474

diff --git a/GameData/Sigma/Dimensions/Configs/Bodies/Kerbin_atmo.cfg b/GameData/Sigma/Dimensions/Configs/Bodies/Kerbin_atmo.cfg
@@ -13,6 +13,11 @@
 			%temperatureCurve {}
 			%temperatureSunMultCurve {}
 
+			%AtmosphereFromGround
+			{
+				&innerRadiusMult = 0.975
+				&outerRadiusMult = 1.025
+			}
 			@pressureCurve:HAS[~key[*]]
 			{
 				key = 0 101.325 0 -0.01501631

diff --git a/GameData/Sigma/Dimensions/Configs/Bodies/Laythe_atmo.cfg b/GameData/Sigma/Dimensions/Configs/Bodies/Laythe_atmo.cfg
@@ -13,6 +13,11 @@
 			%temperatureCurve {}
 			%temperatureSunMultCurve {}
 
+			%AtmosphereFromGround
+			{
+				&innerRadiusMult = 0.975
+				&outerRadiusMult = 1.025
+			}
 			@pressureCurve:HAS[~key[*]]
 			{
 				key = 0 60.795 0 -0.005216384

diff --git a/GameData/Sigma/Dimensions/Configs/Bodies/Sun_atmo.cfg b/GameData/Sigma/Dimensions/Configs/Bodies/Sun_atmo.cfg
@@ -33,10 +33,6 @@
 				key = 500000 6000 0.001352723 0.001352723
 				key = 600000 10000 0.06371323 0
 			}
-			%AtmosphereFromGround
-			{
-				sunAtmo = True
-			}
 		}
 	}
 }
diff --git a/GameData/Sigma/Dimensions/Configs/ReDimension/advancedSettings.cfg b/GameData/Sigma/Dimensions/Configs/ReDimension/advancedSettings.cfg
@@ -52,6 +52,10 @@
 {
 	%reEntryHeat = 1
 }
+@SigmaDimensions:HAS[~scanAltitude[>0]]:AFTER[SigDim]
+{
+	%scanAltitude = 1
+}
 
 // Create PlanetDimensions parameter
 

diff --git a/GameData/Sigma/Dimensions/Configs/ReDimension/atmoScale.cfg b/GameData/Sigma/Dimensions/Configs/ReDimension/atmoScale.cfg
@@ -2,20 +2,6 @@
 {
 	@Body,*
 	{
-		@Atmosphere:HAS[!AtmosphereFromGround:HAS[#innerRadius[*]]]
-		{
-			%AtmosphereFromGround
-			{
-				innerRadiusMult = 0.975
-			}
-		}
-		@Atmosphere:HAS[!AtmosphereFromGround:HAS[#outerRadius[*]]]
-		{
-			%AtmosphereFromGround
-			{
-				outerRadiusMult = 1.025
-			}
-		}
 		@Atmosphere:HAS[#atmosphereDepth[*]]
 		{
 			%altitude = #$atmosphereDepth$
@@ -36,7 +22,6 @@
 			@maxAltitude *= #$../PlanetDimensions[2]$
 			@altitude *= #$../PlanetDimensions[2]$
 			@atmosphereDepth *= #$../PlanetDimensions[2]$
-			%AtmosphereFromGround {}
 			@AtmosphereFromGround:HAS[~outerRadius[*]]
 			{
 				outerRadius = #$../../Properties/radius$
@@ -47,7 +32,16 @@
 				innerRadius = #$outerRadius$
 				@innerRadius *= #$innerRadiusMult$
 			}
-			@AtmosphereFromGround:HAS[~sunAtmo[True]]
+			@AtmosphereFromGround:HAS[#transformScale[*]]
+			{
+				@transformScale ^= : ::
+				@transformScale ^= :	::
+			}
+			@AtmosphereFromGround:HAS[#transformScale[0,0,0]]
+			{
+				%removeAFG = True
+			}
+			@AtmosphereFromGround:HAS[~removeAFG[True]]
 			{
 				// inner radius
 				@innerRadius -= #$../../Properties/radius$
@@ -68,22 +62,22 @@
 				!innerRadiusMult,* = DEL
 				!outerRadiusMult,* = DEL
 			}
-			@AtmosphereFromGround:HAS[#transformScale[<6000]]
+			@AtmosphereFromGround:HAS[~removeAFG[True],#transformScale[<6000]]
 			{
 				@transformScale = 6000
 			}
-			@AtmosphereFromGround:HAS[~sunAtmo[True]]
+			@AtmosphereFromGround:HAS[~removeAFG[True]]
 			{
 				@transformScale *= 2
 				@transformScale /= #$../../Properties/radius$
 				@transformScale /= #$../../PlanetDimensions[0]$
 				@transformScale += 1
 				@transformScale = #$transformScale$,$transformScale$,$transformScale$
 			}
-			@AtmosphereFromGround:HAS[#sunAtmo[True]]
+			@AtmosphereFromGround:HAS[#removeAFG[True]]
 			{
-				!sunAtmo = DEL
 				%transformScale = 0,0,0
+				!removeAFG = DEL
 			}
 
 			// pressure ASL

diff --git a/GameData/Sigma/Dimensions/Configs/ReDimension/rescaleSCANsat.cfg b/GameData/Sigma/Dimensions/Configs/ReDimension/rescaleSCANsat.cfg
@@ -1,39 +1,43 @@
+@SigmaDimensions:FOR[SigDim2]
+{
+	@scanAltitude *= #$@SigmaDimensions/Resize$
+}
 @PART:FOR[SigDim2]
 {
 	@MODULE:HAS[#name[ModuleSCANresourceScanner]]
 	{
-		@min_alt *= #$@SigmaDimensions/Resize$
-		@max_alt *= #$@SigmaDimensions/Resize$
-		@best_alt *= #$@SigmaDimensions/Resize$
+		@min_alt *= #$@SigmaDimensions/scanAltitude$
+		@max_alt *= #$@SigmaDimensions/scanAltitude$
+		@best_alt *= #$@SigmaDimensions/scanAltitude$
 	}
 	@MODULE:HAS[#name[SCANsat]]
 	{
-		@min_alt *= #$@SigmaDimensions/Resize$
-		@max_alt *= #$@SigmaDimensions/Resize$
-		@best_alt *= #$@SigmaDimensions/Resize$
+		@min_alt *= #$@SigmaDimensions/scanAltitude$
+		@max_alt *= #$@SigmaDimensions/scanAltitude$
+		@best_alt *= #$@SigmaDimensions/scanAltitude$
 	}
 	@MODULE:HAS[#name[ModuleResourceScanner]]
 	{
-		@MaxAbundanceAltitude *= #$@SigmaDimensions/Resize$
+		@MaxAbundanceAltitude *= #$@SigmaDimensions/scanAltitude$
 	}
 	@MODULE:HAS[#name[ModuleOrbitalSurveyor]]
 	{
-		@minThreshold *= #$@SigmaDimensions/Resize$
-		@maxThreshold *= #$@SigmaDimensions/Resize$
+		@minThreshold *= #$@SigmaDimensions/scanAltitude$
+		@maxThreshold *= #$@SigmaDimensions/scanAltitude$
 	}
 }
 @SCAN_Color_Config:FOR[SigDim2]
 {
-	@defaultMinHeightRange *= #$@SigmaDimensions/Resize$
-	@defaultMaxHeightRange *= #$@SigmaDimensions/Resize$
-	@rangeAboveMaxHeight *= #$@SigmaDimensions/Resize$
-	@rangeBelowMinHeight *= #$@SigmaDimensions/Resize$
+	@defaultMinHeightRange *= #$@SigmaDimensions/scanAltitude$
+	@defaultMaxHeightRange *= #$@SigmaDimensions/scanAltitude$
+	@rangeAboveMaxHeight *= #$@SigmaDimensions/scanAltitude$
+	@rangeBelowMinHeight *= #$@SigmaDimensions/scanAltitude$
 	@SCANsat_Altimetry,*
 	{
 		@Item,*
 		{
-			@minHeightRange *= #$@SigmaDimensions/Resize$
-			@maxHeightRange *= #$@SigmaDimensions/Resize$
+			@minHeightRange *= #$@SigmaDimensions/scanAltitude$
+			@maxHeightRange *= #$@SigmaDimensions/scanAltitude$
 		}
 	}
 }
diff --git a/GameData/Sigma/Dimensions/Configs/ReDimension/setAsteroids.cfg b/GameData/Sigma/Dimensions/Configs/ReDimension/setAsteroids.cfg
@@ -8,8 +8,22 @@
 			{
 				@Body,*
 				{
-					@minAltitude *= #$@SigmaDimensions/Rescale$
-					@maxAltitude *= #$@SigmaDimensions/Rescale$
+					@semiMajorAxis,*
+					{
+						@minValue,* *= #$@SigmaDimensions/Rescale$
+						@maxValue,* *= #$@SigmaDimensions/Rescale$
+					}
+				}
+			}
+			@Nearby,*
+			{
+				@Body,*
+				{
+					@semiMajorAxis,*
+					{
+						@minValue,* *= #$@SigmaDimensions/Rescale$
+						@maxValue,* *= #$@SigmaDimensions/Rescale$
+					}
 				}
 			}
 		}

diff --git a/GameData/Sigma/Dimensions/Configs/ReDimension/setDimensions.cfg b/GameData/Sigma/Dimensions/Configs/ReDimension/setDimensions.cfg
@@ -8,6 +8,13 @@
 			@inverseRotThresholdAltitude *= #$../PlanetDimensions[2]$
 		}
 	}
+	@Body:HAS[@Atmosphere:HAS[#maxAltitude[>0]]]
+	{
+		@Properties
+		{
+			@inverseRotThresholdAltitude = #$../Atmosphere:HAS[#maxAltitude[>0]]/maxAltitude$
+		}
+	}
 	@Body:HAS[!Atmosphere]
 	{
 		@Properties

diff --git a/GameData/Sigma/Dimensions/Configs/Sigma-Dimensions.version b/GameData/Sigma/Dimensions/Configs/Sigma-Dimensions.version
@@ -1 +1 @@
-{"NAME":"Sigma Dimensions","URL":"http://ksp-avc.cybutek.net/version.php?id=235","DOWNLOAD":"http://forum.kerbalspaceprogram.com/threads/140687","CHANGE_LOG_URL":"https://github.com/Sigma88/Sigma-Dimensions/raw/master/Changelog.txt","VERSION":{"MAJOR":0,"MINOR":4,"PATCH":3,"BUILD":0},"KSP_VERSION":{"MAJOR":1,"MINOR":0,"PATCH":5}}
+{"NAME":"Sigma Dimensions","URL":"http://ksp-avc.cybutek.net/version.php?id=235","DOWNLOAD":"http://forum.kerbalspaceprogram.com/threads/140687","CHANGE_LOG_URL":"https://github.com/Sigma88/Sigma-Dimensions/raw/master/Changelog.txt","VERSION":{"MAJOR":0,"MINOR":5,"PATCH":0,"BUILD":0},"KSP_VERSION":{"MAJOR":1,"MINOR":1,"PATCH":2}}