Merge pull request #16 from Sigma88/Development

Last version compatible with KSP 1.0.5
Sigma88 · Apr 23, 2016 · f5e5341 · f5e5341
2 parents 47a24da + 7314790
commit f5e5341
Show file tree

Hide file tree

Showing 15 changed files with 140 additions and 70 deletions.
diff --git a/Changelog.txt b/Changelog.txt
@@ -1,3 +1,14 @@
+**v0.4.3**
+
+- Fixed Kerbin Rotation
+- Fixed AtmosphereFromGround rescaling
+- Added SCANsat compatibility
+- Added KerbalKonstructs compatibility
+- Added ISP Fix when changing atmosphere pressure ASL
+- Fixed bug with LandControl Rescaling
+- First steps towards Physics.cfg rescale
+
+
 **v0.4.2**
 
 - Tweaked Atmosphere Visuals

diff --git a/GameData/Sigma/Dimensions/Configs/Bodies/AllowUserDefined.cfg b/GameData/Sigma/Dimensions/Configs/Bodies/AllowUserDefined.cfg
@@ -2,6 +2,13 @@
 {
 	@Body,*
 	{
+		@Template
+		{
+			@removeAtmosphere ^= :t:T:
+			@removeAtmosphere ^= :R:r:
+			@removeAtmosphere ^= :U:u:
+			@removeAtmosphere ^= :E:e:
+		}
 		%Properties
 		{
 			inverseRotThresholdAltitude = 100000
@@ -27,6 +34,7 @@
 					%userDefined = 1
 					@landClasses,*
 					{
+						%userDefined = 1
 						@Class,*
 						{
 							%userDefined = 1

diff --git a/GameData/Sigma/Dimensions/Configs/Bodies/Duna.cfg b/GameData/Sigma/Dimensions/Configs/Bodies/Duna.cfg
@@ -74,28 +74,26 @@
 					atmosphereDepth = 11500
 					SigmaDimensions = 1
 				}
-				%LandControl
+				%LandControl {}
+				@LandControl,*
 				{
 					vHeightMax = 3500
-					SigmaDimensions = 1
-				}
-				@LandControl:HAS[!landClasses]
-				{
-					landClasses {}
-				}
-				@LandControl
-				{
+					%SigmaDimensions = 1
+					%landClasses {}
 					@landClasses:HAS[!Class[Ice?Caps]]
 					{
+						%SigmaDimensions = 1
 						Class
 						{
 							name = Ice Caps
+							%SigmaDimensions = 1
 						}
 					}
 					@landClasses
 					{
 						@Class[Ice?Caps]
 						{
+							%SigmaDimensions = 1
 							alterApparentHeight = 100
 							alterRealHeight = 100
 						}

diff --git a/GameData/Sigma/Dimensions/Configs/Bodies/Kerbin.cfg b/GameData/Sigma/Dimensions/Configs/Bodies/Kerbin.cfg
@@ -4,7 +4,7 @@
 	{
 		%Properties
 		{
-			rotationPeriod = 21549.4251830898
+			rotationPeriod = 21600
 			inverseRotThresholdAltitude = 100000
 			timewarpAltitudeLimits = 0 30000 30000 60000 120000 240000 480000 600000
 			%ScienceValues
@@ -44,40 +44,25 @@
 					simplexHeightStart = 0
 					SigmaDimensions = 1
 				}
-				%LandControl
+				%LandControl {}
+				@LandControl,*
 				{
 					vHeightMax = 3500
-					SigmaDimensions = 1
-				}
-				@LandControl:HAS[!landClasses]
-				{
-					landClasses {}
-				}
-				@LandControl
-				{
-					@landClasses:HAS[!Class[DesertMountains]]
-					{
-						Class
-						{
-							name = DesertMountains
-						}
-					}
-					@landClasses:HAS[!Class[IceCaps]]
-					{
-						Class
-						{
-							name = IceCaps
-						}
-					}
+					%SigmaDimensions = 1
+
+					%landClasses {}
 					@landClasses
 					{
-						@Class[DesertMountains]
+						%SigmaDimensions = 1
+						%Class[DesertMountains]
 						{
+							%SigmaDimensions = 1
 							alterApparentHeight = -0.8
 							alterRealHeight = 0
 						}
-						@Class[IceCaps]
+						%Class[IceCaps]
 						{
+							%SigmaDimensions = 1
 							alterApparentHeight = 100
 							alterRealHeight = 10
 						}

diff --git a/GameData/Sigma/Dimensions/Configs/Bodies/Laythe.cfg b/GameData/Sigma/Dimensions/Configs/Bodies/Laythe.cfg
@@ -25,28 +25,18 @@
 			deactivateAltitude = 160000
 			%Mods
 			{
-				%LandControl
+				%LandControl {}
+				@LandControl,*
 				{
 					vHeightMax = 6000
-					SigmaDimensions = 1
-				}
-				@LandControl:HAS[!landClasses]
-				{
-					landClasses {}
-				}
-				@LandControl
-				{
-					@landClasses:HAS[!Class[IceCaps]]
-					{
-						Class
-						{
-							name = IceCaps
-						}
-					}
+					%SigmaDimensions = 1
+					%landClasses {}
 					@landClasses
 					{
-						@Class[IceCaps]
+						%SigmaDimensions = 1
+						%Class[IceCaps]
 						{
+							%SigmaDimensions = 1
 							alterApparentHeight = 100
 							alterRealHeight = 10
 						}

diff --git a/GameData/Sigma/Dimensions/Configs/General/caseSensitivityFix.cfg b/GameData/Sigma/Dimensions/Configs/General/caseSensitivityFix.cfg
@@ -12,11 +12,6 @@
 			@removeAllPQSMods ^= :R:r:
 			@removeAllPQSMods ^= :U:u:
 			@removeAllPQSMods ^= :E:e:
-
-			@removeAtmosphere ^= :t:T:
-			@removeAtmosphere ^= :R:r:
-			@removeAtmosphere ^= :U:u:
-			@removeAtmosphere ^= :E:e:
 		}
 		@Properties
 		{

diff --git a/GameData/Sigma/Dimensions/Configs/General/massFix.cfg b/GameData/Sigma/Dimensions/Configs/General/massFix.cfg
@@ -389,7 +389,7 @@
 			epoch = 0
 		}
 	}
-	@Body:HAS[@Template:HAS[#name[Sun]]]:NEEDS[!GalacticNeighborhood]
+	@Body:HAS[@Template:HAS[#name[Sun]]]
 	{
 		@Properties
 		{

diff --git a/GameData/Sigma/Dimensions/Configs/General/removePQSMods.cfg b/GameData/Sigma/Dimensions/Configs/General/removePQSMods.cfg
@@ -25,9 +25,10 @@
 				!MapDecalTangent:HAS[#SigmaDimensions[1],~userDefined[1]] {}
 				!MapDecal:HAS[#SigmaDimensions[1],~userDefined[1]] {}
 				!FlattenOcean:HAS[#SigmaDimensions[1],~userDefined[1]] {}
-				@LandControl,*
+				@LandControl:HAS[#SigmaDimensions[1]]
 				{
-					@landClasses,*
+					!landClasses:HAS[#SigmaDimensions[1],~userDefined[1]] {}
+					@landClasses:HAS[#SigmaDimensions[1]]
 					{
 						!Class:HAS[#SigmaDimensions[1],~userDefined[1]] {}
 					}
@@ -80,6 +81,14 @@
 			@Mods
 			{
 				!LandControl:HAS[#SigmaDimensions[1],~userDefined[1]] {}
+				@LandControl:HAS[#SigmaDimensions[1]]
+				{
+					!landClasses:HAS[#SigmaDimensions[1],~userDefined[1]] {}
+					@landClasses:HAS[#SigmaDimensions[1]]
+					{
+						!Class:HAS[#SigmaDimensions[1],~userDefined[1]] {}
+					}
+				}
 			}
 		}
 	}

diff --git a/GameData/Sigma/Dimensions/Configs/ReDimension/advancedSettings.cfg b/GameData/Sigma/Dimensions/Configs/ReDimension/advancedSettings.cfg
@@ -1,7 +1,5 @@
 // Check for missing and invalid variables
 
-%SigmaDimensions {}
-
 @SigmaDimensions:HAS[~Resize[<1],~Resize[>1]]:AFTER[SigDim]
 {
 	%Resize = 1
@@ -50,6 +48,10 @@
 {
 	%tempASL = 1
 }
+@SigmaDimensions:HAS[~reEntryHeat[>0]]:AFTER[SigDim]
+{
+	%reEntryHeat = 1
+}
 
 // Create PlanetDimensions parameter
 

diff --git a/GameData/Sigma/Dimensions/Configs/ReDimension/atmoScale.cfg b/GameData/Sigma/Dimensions/Configs/ReDimension/atmoScale.cfg
@@ -6,7 +6,7 @@
 		{
 			%AtmosphereFromGround
 			{
-				innerRadiusMult = 0.999375
+				innerRadiusMult = 0.975
 			}
 		}
 		@Atmosphere:HAS[!AtmosphereFromGround:HAS[#outerRadius[*]]]
@@ -37,16 +37,16 @@
 			@altitude *= #$../PlanetDimensions[2]$
 			@atmosphereDepth *= #$../PlanetDimensions[2]$
 			%AtmosphereFromGround {}
-			@AtmosphereFromGround:HAS[~innerRadius[*]]
-			{
-				innerRadius = #$../../Properties/radius$
-				@innerRadius *= #$innerRadiusMult$
-			}
 			@AtmosphereFromGround:HAS[~outerRadius[*]]
 			{
 				outerRadius = #$../../Properties/radius$
 				@outerRadius *= #$outerRadiusMult$
 			}
+			@AtmosphereFromGround:HAS[~innerRadius[*]]
+			{
+				innerRadius = #$outerRadius$
+				@innerRadius *= #$innerRadiusMult$
+			}
 			@AtmosphereFromGround:HAS[~sunAtmo[True]]
 			{
 				// inner radius
@@ -148,4 +148,16 @@
 			}
 		}
 	}
+	@Body[Kerbin]
+	{
+		@Atmosphere
+		{
+			// ISP fix
+			@pressureCurve
+			{
+				@key,*[0, ] += 0.0001
+				key = 0 101.325
+			}
+		}
+	}
 }
diff --git a/GameData/Sigma/Dimensions/Configs/ReDimension/physicsModifier.cfg b/GameData/Sigma/Dimensions/Configs/ReDimension/physicsModifier.cfg
@@ -0,0 +1,12 @@
+@SigmaDimensions:FOR[SigDim2]
+{
+  %heatMulti = #$Resize$
+  @heatMulti != #$@PHYSICSGLOBALS/machTemperatureVelocityExponent$
+  @heatMulti != -0.5
+  @reEntryHeat *= #$heatMulti$
+  !heatMulti = DEL
+}
+@PHYSICSGLOBALS:FOR[SigDim2]
+{
+  @machTemperatureScalar *= #$@SigmaDimensions/reEntryHeat$
+}
diff --git a/GameData/Sigma/Dimensions/Configs/ReDimension/rescaleSCANsat.cfg b/GameData/Sigma/Dimensions/Configs/ReDimension/rescaleSCANsat.cfg
@@ -0,0 +1,39 @@
+@PART:FOR[SigDim2]
+{
+	@MODULE:HAS[#name[ModuleSCANresourceScanner]]
+	{
+		@min_alt *= #$@SigmaDimensions/Resize$
+		@max_alt *= #$@SigmaDimensions/Resize$
+		@best_alt *= #$@SigmaDimensions/Resize$
+	}
+	@MODULE:HAS[#name[SCANsat]]
+	{
+		@min_alt *= #$@SigmaDimensions/Resize$
+		@max_alt *= #$@SigmaDimensions/Resize$
+		@best_alt *= #$@SigmaDimensions/Resize$
+	}
+	@MODULE:HAS[#name[ModuleResourceScanner]]
+	{
+		@MaxAbundanceAltitude *= #$@SigmaDimensions/Resize$
+	}
+	@MODULE:HAS[#name[ModuleOrbitalSurveyor]]
+	{
+		@minThreshold *= #$@SigmaDimensions/Resize$
+		@maxThreshold *= #$@SigmaDimensions/Resize$
+	}
+}
+@SCAN_Color_Config:FOR[SigDim2]
+{
+	@defaultMinHeightRange *= #$@SigmaDimensions/Resize$
+	@defaultMaxHeightRange *= #$@SigmaDimensions/Resize$
+	@rangeAboveMaxHeight *= #$@SigmaDimensions/Resize$
+	@rangeBelowMinHeight *= #$@SigmaDimensions/Resize$
+	@SCANsat_Altimetry,*
+	{
+		@Item,*
+		{
+			@minHeightRange *= #$@SigmaDimensions/Resize$
+			@maxHeightRange *= #$@SigmaDimensions/Resize$
+		}
+	}
+}
diff --git a/GameData/Sigma/Dimensions/Configs/ReDimension/resizeKonstructs.cfg b/GameData/Sigma/Dimensions/Configs/ReDimension/resizeKonstructs.cfg
@@ -0,0 +1,8 @@
+@STATIC:FOR[SigDim2]
+{
+	@Instances,*
+	{
+		@RadiusOffset *= #$@SigmaDimensions/Resize$
+		@RadiusOffset *= #$@SigmaDimensions/landscape$
+	}
+}
diff --git a/GameData/Sigma/Dimensions/Configs/ReDimension/setDimensions.cfg b/GameData/Sigma/Dimensions/Configs/ReDimension/setDimensions.cfg
@@ -5,13 +5,15 @@
 		@Properties
 		{
 			@timewarpAltitudeLimits,0[*, ] *= #$../PlanetDimensions[2]$
+			@inverseRotThresholdAltitude *= #$../PlanetDimensions[2]$
 		}
 	}
 	@Body:HAS[!Atmosphere]
 	{
 		@Properties
 		{
 			@timewarpAltitudeLimits,0[*, ] *= #$../PlanetDimensions[0]$
+			@inverseRotThresholdAltitude *= #$../PlanetDimensions[0]$
 		}
 	}
 	@Body,*
@@ -30,7 +32,6 @@
 			@mass *= #$../PlanetDimensions[0]$
 			@mass *= #$../PlanetDimensions[4]$
 			@rotationPeriod *= #$../PlanetDimensions[3]$
-			@inverseRotThresholdAltitude *= #$../PlanetDimensions[0]$
 			@sphereOfInfluence *= #$../PlanetDimensions[8]$
 			@ScienceValues
 			{

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":2,"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":4,"PATCH":3,"BUILD":0},"KSP_VERSION":{"MAJOR":1,"MINOR":0,"PATCH":5}}
Original file line number	Diff line number	Diff line change
		@@ -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":2,"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":4,"PATCH":3,"BUILD":0},"KSP_VERSION":{"MAJOR":1,"MINOR":0,"PATCH":5}}