Merge pull request #28 from Sigma88/Development

Sigma Dimensions v0.7.1
Sigma88 · Dec 7, 2016 · 66705b9 · 66705b9
2 parents 4f12080 + 3c9049c
commit 66705b9
Show file tree

Hide file tree

Showing 13 changed files with 491 additions and 86 deletions.
diff --git a/Changelog.txt b/Changelog.txt
@@ -1,3 +1,12 @@
+**v0.7.1**
+
+- Updated to KSP 1.2.2 and Kopernicus 1.2.2-1
+- Added the parameter atmoTopLayer
+  (allows to extend/trim atmosphere curves)
+- Added the parameter debug
+  (completely useless since nobody ever provides logs)
+
+
 **v0.7.0**
 
 - Included SigmaDimensions.dll plugin

diff --git a/GameData/Sigma/Dimensions/Configs/General/atmosphereFix.cfg b/GameData/Sigma/Dimensions/Configs/General/atmosphereFix.cfg
@@ -0,0 +1,38 @@
+@Kopernicus:FOR[SigDim]
+{
+	@Body,*
+	{
+		// Fix maxAltitude
+
+		@Atmosphere:HAS[#atmosphereDepth[*]]
+		{
+			%altitude = #$atmosphereDepth$
+			%maxAltitude = #$atmosphereDepth$
+		}
+		@Atmosphere:HAS[#altitude[*],~atmosphereDepth[*]]
+		{
+			%maxAltitude = #$altitude$
+			%atmosphereDepth = #$altitude$
+		}
+		@Atmosphere:HAS[#maxAltitude[*],~altitude[*],~atmosphereDepth[*]]
+		{
+			%altitude = #$maxAltitude$
+			%atmosphereDepth = #$maxAltitude$
+		}
+
+
+		// Fix normalized curves
+
+		@Atmosphere:HAS[#pressureCurveIsNormalized[True]]
+		{
+			!pressureCurveIsNormalized,* = DEL
+			%pressureCurveNormalizeFix = True
+			@pressureCurve
+			{
+				@key,*[0, ] *= #$../maxAltitude$
+				@key,*[2, ] /= #$../maxAltitude$
+				@key,*[3, ] /= #$../maxAltitude$
+			}
+		}
+	}
+}
diff --git a/GameData/Sigma/Dimensions/Configs/ReDimension/advancedSettings.cfg b/GameData/Sigma/Dimensions/Configs/ReDimension/advancedSettings.cfg
@@ -64,6 +64,10 @@
 {
 	%resizeBuildings = 1
 }
+@SigmaDimensions:HAS[~atmoTopLayer[>0]]:AFTER[SigDim]
+{
+	%atmoTopLayer = 1
+}
 
 // Create SigmaDimensions node in each body
 

diff --git a/GameData/Sigma/Dimensions/Configs/ReDimension/atmoScale.cfg b/GameData/Sigma/Dimensions/Configs/ReDimension/atmoScale.cfg
@@ -2,21 +2,6 @@
 {
 	@Body,*
 	{
-		@Atmosphere:HAS[#atmosphereDepth[*]]
-		{
-			%altitude = #$atmosphereDepth$
-			%maxAltitude = #$atmosphereDepth$
-		}
-		@Atmosphere:HAS[#altitude[*],~atmosphereDepth[*]]
-		{
-			%maxAltitude = #$altitude$
-			%atmosphereDepth = #$altitude$
-		}
-		@Atmosphere:HAS[#maxAltitude[*],~altitude[*],~atmosphereDepth[*]]
-		{
-			%altitude = #$maxAltitude$
-			%atmosphereDepth = #$maxAltitude$
-		}
 		@Atmosphere
 		{
 			@maxAltitude *= #$../SigmaDimensions/Atmosphere$
@@ -35,18 +20,41 @@
 			@pressureCurve
 			{
 				@key,* ^= :$: 0 0 0 x:
+
+				@key,*[0, ] *= #$../../SigmaDimensions/Atmosphere$
+				@key,*[2, ] /= #$../../SigmaDimensions/Atmosphere$
+				@key,*[3, ] /= #$../../SigmaDimensions/Atmosphere$
+
 				@key,*[1, ] *= #$../../SigmaDimensions/atmoASL$
 				@key,*[2, ] *= #$../../SigmaDimensions/atmoASL$
 				@key,*[3, ] *= #$../../SigmaDimensions/atmoASL$
+
 				@key,* ^= : 0 0 0 x$: :
 			}
 
 			@temperatureCurve
 			{
 				@key,* ^= :$: 0 0 0 x:
+
+				@key,*[0, ] *= #$../../SigmaDimensions/Atmosphere$
+				@key,*[2, ] /= #$../../SigmaDimensions/Atmosphere$
+				@key,*[3, ] /= #$../../SigmaDimensions/Atmosphere$
+
 				@key,*[1, ] *= #$../../SigmaDimensions/tempASL$
 				@key,*[2, ] *= #$../../SigmaDimensions/tempASL$
 				@key,*[3, ] *= #$../../SigmaDimensions/tempASL$
+
+				@key,* ^= : 0 0 0 x$: :
+			}
+
+			@temperatureSunMultCurve
+			{
+				@key,* ^= :$: 0 0 0 x:
+
+				@key,*[0, ] *= #$../../SigmaDimensions/Atmosphere$
+				@key,*[2, ] /= #$../../SigmaDimensions/Atmosphere$
+				@key,*[3, ] /= #$../../SigmaDimensions/Atmosphere$
+
 				@key,* ^= : 0 0 0 x$: :
 			}
 		}
@@ -116,56 +124,42 @@
 				%transformScale = 0,0,0
 				!removeAFG = DEL
 			}
-		}	
-		@Atmosphere:HAS[~pressureCurveIsNormalized[True]]
-		{
-			// pressureCurve
-
-			@pressureCurve
-			{
-				@key,* ^= :$: 0 0 0 x:
-				@key,*[0, ] *= #$../../SigmaDimensions/Atmosphere$
-				@key,*[2, ] /= #$../../SigmaDimensions/Atmosphere$
-				@key,*[3, ] /= #$../../SigmaDimensions/Atmosphere$
-				@key,* ^= : 0 0 0 x$: :
-			}
-		}
-		@Atmosphere:HAS[~temperatureCurveIsNormalized[True]]
-		{
-			// temperatureCurve
-
-			@temperatureCurve
-			{
-				@key,* ^= :$: 0 0 0 x:
-				@key,*[0, ] *= #$../../SigmaDimensions/Atmosphere$
-				@key,*[2, ] /= #$../../SigmaDimensions/Atmosphere$
-				@key,*[3, ] /= #$../../SigmaDimensions/Atmosphere$
-				@key,* ^= : 0 0 0 x$: :
-			}
 		}
+	}
+
+
+	// ISP fix
+
+	@Body[Kerbin]
+	{
 		@Atmosphere
 		{
-			// temperatureSunMultCurve
-
-			@temperatureSunMultCurve
+			@pressureCurve
 			{
-				@key,* ^= :$: 0 0 0 x:
-				@key,*[0, ] *= #$../../SigmaDimensions/Atmosphere$
-				@key,*[2, ] /= #$../../SigmaDimensions/Atmosphere$
-				@key,*[3, ] /= #$../../SigmaDimensions/Atmosphere$
-				@key,* ^= : 0 0 0 x$: :
+				@key,*[0, ] += 1e-6
+				key,0 = 0 101.325 0 0
 			}
 		}
 	}
-	@Body[Kerbin]
+
+
+	// Normalization Fix
+
+	@Body,*
 	{
-		@Atmosphere
+		@Atmosphere:HAS[#pressureCurveNormalizeFix[True]]
 		{
-			// ISP fix
+			!pressureCurveNormalizeFix = DEL
+			pressureCurveIsNormalized = True
 			@pressureCurve
 			{
-				@key,*[0, ] += 0.0001
-				key,0 = 0 101.325
+				@key,* ^= :$: 0 0 0 x:
+
+				@key,*[0, ] /= #$../maxAltitude$
+				@key,*[2, ] *= #$../maxAltitude$
+				@key,*[3, ] *= #$../maxAltitude$
+
+				@key,* ^= : 0 0 0 x$: :
 			}
 		}
 	}

diff --git a/GameData/Sigma/Dimensions/Configs/Sigma-Dimensions.version b/GameData/Sigma/Dimensions/Configs/Sigma-Dimensions.version
@@ -13,13 +13,13 @@
 	{
 		"MAJOR": 0,
 		"MINOR": 7,
-		"PATCH": 0,
+		"PATCH": 1,
 		"BUILD": 0
 	},
 	"KSP_VERSION":
 	{
 		"MAJOR": 1,
 		"MINOR": 2,
-		"PATCH": 1
+		"PATCH": 2
 	}
 }
diff --git a/GameData/Sigma/Dimensions/Plugins/SigmaDimensions.dll b/GameData/Sigma/Dimensions/Plugins/SigmaDimensions.dll
diff --git a/GameData/Sigma/Dimensions/README.txt b/GameData/Sigma/Dimensions/README.txt
@@ -49,14 +49,6 @@ Does not affect tidally locked bodies.
 ## Advanced Settings Definitions
 
 
-# geeASLmultiplier (default value = 1)
-
-- Can be set to any positive number.
-
-Surface gravity is multiplied by this value.
-
----
-
 # landscape (default value = 1)
 
 - Can be set to any positive number.
@@ -65,11 +57,11 @@ Altitude of geographical features is multiplied by the "Resize" and "landscape"
 
 ---
 
-# atmoVisualEffect (default value = 1)
+# geeASLmultiplier (default value = 1)
 
 - Can be set to any positive number.
 
-The height of the atmosphere aesthetics is multiplied by this parameter.
+Surface gravity is multiplied by this value.
 
 ---
 
@@ -84,6 +76,15 @@ Ground scatter density is always adjusted to account for the different surface a
 
 ---
 
+# resizeBuildings (default value = 0)
+
+- Automatic when zero, custom when set to a positive number.
+
+AUTOMATIC: buildings size is multiplied by "Resize" when shrinking planets.
+CUSTOM:    buildings size is multiplied by this parameter.
+
+---
+
 # CustomSoISize (default value = 0)
 
 - Enabled if set to a positive number.
@@ -120,20 +121,27 @@ Surface temperature is multiplied by this parameter.
 
 ---
 
-# scanAltitude (default value = 1)
+# atmoVisualEffect (default value = 1)
 
 - Can be set to any positive number.
 
-Altitude limits for orbital scanners is multiplied by the "Resize" and "scanAltitude" parameters.
+The height of the atmosphere aesthetics is multiplied by this parameter.
 
 ---
 
-# resizeBuildings (default value = 0)
+# atmoTopLayer (default value = 1)
 
-- Automatic when zero, custom when set to a positive number.
+- Can be set to any positive number.
 
-AUTOMATIC: buildings size is multiplied by "Resize" when shrinking planets.
-CUSTOM:    buildings size is multiplied by this parameter.
+Atmosphere depth is multiplied by this parameter. Atmosphere curves are extended/trimmed accordingly.
+
+---
+
+# scanAltitude (default value = 1)
+
+- Can be set to any positive number.
+
+Altitude limits for orbital scanners is multiplied by the "Resize" and "scanAltitude" parameters.
 
 ---
 

diff --git a/GameData/Sigma/Dimensions/Settings.cfg b/GameData/Sigma/Dimensions/Settings.cfg
@@ -1,27 +1,28 @@
-// Base Settings
-
 SigmaDimensions
 {
+	// Base Settings
+
 	Resize = 1
 	Rescale = 1
 	Atmosphere = 1
 	dayLengthMultiplier = 1
-}
-
 
 
-// Advanced Settings
+	// Advanced Settings
 
-@SigmaDimensions
-{
-	geeASLmultiplier = 1
 	landscape = 1
-	atmoVisualEffect = 1
+	geeASLmultiplier = 1
+
 	resizeScatter = 1
+	resizeBuildings = 0
+
 	CustomSoISize = 0
 	CustomRingSize = 0
+
 	atmoASL = 1
 	tempASL = 1
+	atmoTopLayer = 1
+	atmoVisualEffect = 1
+
 	scanAltitude = 1
-	resizeBuildings = 0
 }
diff --git a/[Source]/Distribution/SigmaDimensions.dll b/[Source]/Distribution/SigmaDimensions.dll