Synchronize with RSS master branch

PhineasFreak · PhineasFreak · commit 375b5b544312 · 2026-05-02T20:29:38.000+03:00
diff --git a/GameData/RealSolarSystem/Compatibility/TimeWarp.cfg b/GameData/RealSolarSystem/Compatibility/TimeWarp.cfg
@@ -0,0 +1,15 @@
+// No need to override the user's settings when using BetterTimeWarp or TimeControl
+
+RealSolarSystem:NEEDS[!BetterTimeWarpCont&!TimeControl]
+{
+	timeWarpRates
+	{
+	  rate1 = 10
+	  rate2 = 100
+	  rate3 = 1000
+	  rate4 = 10000
+	  rate5 = 100000
+	  rate6 = 1000000
+	  rate7 = 6000000
+	}
+}
diff --git a/GameData/RealSolarSystem/Config/Neptune/Neptune.cfg b/GameData/RealSolarSystem/Config/Neptune/Neptune.cfg
@@ -195,7 +195,7 @@
 
 			temperatureCurve
 			{
-				key = 0 717.7 0 -0.001348
+				key = 0 59 0 -0.001348
 				key = 100000 580.5 -0.001389 -0.001389
 				key = 200000 443.0 -0.001332 -0.001332
 				key = 275000 351.4 -0.001048 -0.001048
diff --git a/GameData/RealSolarSystem/Config/RSS_Settings.cfg b/GameData/RealSolarSystem/Config/RSS_Settings.cfg
@@ -17,17 +17,6 @@ REALSOLARSYSTEM
 			cam01FarClip = 3000000
 		}
 	}
-
-	timeWarpRates
-	{
-		rate1 = 10
-		rate2 = 100
-		rate3 = 1000
-		rate4 = 10000
-		rate5 = 100000
-		rate6 = 1000000
-		rate7 = 6000000
-	}
 }
 
 RSSRUNWAYFIX
diff --git a/GameData/RealSolarSystem/Config/Saturn/Saturn.cfg b/GameData/RealSolarSystem/Config/Saturn/Saturn.cfg
@@ -223,7 +223,7 @@
 
 			temperatureCurve
 			{
-				key = 0 1005.6 0 -0.000922
+				key = 0 96 0 -0.000922
 				key = 125000 889.0 -0.000942 -0.000942
 				key = 250000 770.6 -0.000948 -0.000948
 				key = 375000 653.3 -0.000919 -0.000919
diff --git a/GameData/RealSolarSystem/Config/Uranus/Uranus.cfg b/GameData/RealSolarSystem/Config/Uranus/Uranus.cfg
@@ -192,7 +192,7 @@
 
 			temperatureCurve
 			{
-				key = 0 731.3 0 -0.001083
+				key = 0 58 0 -0.001083
 				key = 100000 621.2 -0.001118 -0.001118
 				key = 200000 508.5 -0.001130 -0.001130
 				key = 300000 398.0 -0.001053 -0.001053
diff --git a/Source/Properties/AssemblyInfo.cs b/Source/Properties/AssemblyInfo.cs
@@ -39,10 +39,12 @@
 #if CIBUILD
 [assembly: AssemblyVersion("@MAJOR@.@MINOR@.@PATCH@.@BUILD@")]
 [assembly: AssemblyFileVersion("@MAJOR@.@MINOR@.@PATCH@.@BUILD@")]
+[assembly: KSPAssembly("RealSolarSystem", @MAJOR@, @MINOR@, @PATCH@)]
 #else
 [assembly: AssemblyVersion("18.5.0.0")]
 [assembly: AssemblyFileVersion("18.5.0.0")]
+[assembly: KSPAssembly("RealSolarSystem", 21, 0, 0)]
 #endif
 
 [assembly: KSPAssemblyDependency("Kopernicus", 1, 0)]
-[assembly: KSPAssemblyDependency("Kopernicus.Parser", 1, 0)]
+[assembly: KSPAssemblyDependency("Kopernicus.Parser", 1, 0)]
diff --git a/Source/TimeWarpFixer.cs b/Source/TimeWarpFixer.cs
@@ -1,4 +1,5 @@
-﻿using UnityEngine;
+﻿using System.Linq;
+using UnityEngine;
 
 namespace RealSolarSystem
 {
@@ -23,15 +24,13 @@ public void Update()
             if (!fixedTimeWarp && TimeWarp.fetch != null)
             {
                 fixedTimeWarp = true;
-                ConfigNode twNode = null;
 
-                foreach (ConfigNode node in GameDatabase.Instance.GetConfigNodes("REALSOLARSYSTEM"))
-                    twNode = node.GetNode("timeWarpRates");
-
-                Debug.Log("[RealSolarSystem] Setting TimeWarp rates...");
+                ConfigNode twNode = GameDatabase.Instance.GetConfigNodes("REALSOLARSYSTEM").FirstOrDefault(n => n.HasNode("timeWarpRates"));
 
                 if (twNode != null)
                 {
+                    Debug.Log("[RealSolarSystem] Setting TimeWarp rates...");
+
                     for (int i = 1; i < 8; i++)
                     {
                         if (twNode.HasValue("rate" + i))

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@`
`195`	`195`
`196`	`196`	`temperatureCurve`
`197`	`197`	`{`
`198`		`- key = 0 717.7 0 -0.001348`
	`198`	`+ key = 0 59 0 -0.001348`
`199`	`199`	`key = 100000 580.5 -0.001389 -0.001389`
`200`	`200`	`key = 200000 443.0 -0.001332 -0.001332`
`201`	`201`	`key = 275000 351.4 -0.001048 -0.001048`
Original file line number	Diff line number	Diff line change
`@@ -17,17 +17,6 @@ REALSOLARSYSTEM`
`17`	`17`	`cam01FarClip = 3000000`
`18`	`18`	`}`
`19`	`19`	`}`
`20`		`-`
`21`		`- timeWarpRates`
`22`		`- {`
`23`		`- rate1 = 10`
`24`		`- rate2 = 100`
`25`		`- rate3 = 1000`
`26`		`- rate4 = 10000`
`27`		`- rate5 = 100000`
`28`		`- rate6 = 1000000`
`29`		`- rate7 = 6000000`
`30`		`- }`
`31`	`20`	`}`
`32`	`21`
`33`	`22`	`RSSRUNWAYFIX`
Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@`
`223`	`223`
`224`	`224`	`temperatureCurve`
`225`	`225`	`{`
`226`		`- key = 0 1005.6 0 -0.000922`
	`226`	`+ key = 0 96 0 -0.000922`
`227`	`227`	`key = 125000 889.0 -0.000942 -0.000942`
`228`	`228`	`key = 250000 770.6 -0.000948 -0.000948`
`229`	`229`	`key = 375000 653.3 -0.000919 -0.000919`
Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@`
`192`	`192`
`193`	`193`	`temperatureCurve`
`194`	`194`	`{`
`195`		`- key = 0 731.3 0 -0.001083`
	`195`	`+ key = 0 58 0 -0.001083`
`196`	`196`	`key = 100000 621.2 -0.001118 -0.001118`
`197`	`197`	`key = 200000 508.5 -0.001130 -0.001130`
`198`	`198`	`key = 300000 398.0 -0.001053 -0.001053`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using UnityEngine;`
	`1`	`+using System.Linq;`
	`2`	`+using UnityEngine;`
`2`	`3`
`3`	`4`	`namespace RealSolarSystem`
`4`	`5`	`{`
`@@ -23,15 +24,13 @@ public void Update()`
`23`	`24`	`if (!fixedTimeWarp && TimeWarp.fetch != null)`
`24`	`25`	`{`
`25`	`26`	`fixedTimeWarp = true;`
`26`		`- ConfigNode twNode = null;`
`27`	`27`
`28`		`- foreach (ConfigNode node in GameDatabase.Instance.GetConfigNodes("REALSOLARSYSTEM"))`
`29`		`- twNode = node.GetNode("timeWarpRates");`
`30`		`-`
`31`		`- Debug.Log("[RealSolarSystem] Setting TimeWarp rates...");`
	`28`	`+ ConfigNode twNode = GameDatabase.Instance.GetConfigNodes("REALSOLARSYSTEM").FirstOrDefault(n => n.HasNode("timeWarpRates"));`
`32`	`29`
`33`	`30`	`if (twNode != null)`
`34`	`31`	`{`
	`32`	`+ Debug.Log("[RealSolarSystem] Setting TimeWarp rates...");`
	`33`	`+`
`35`	`34`	`for (int i = 1; i < 8; i++)`
`36`	`35`	`{`
`37`	`36`	`if (twNode.HasValue("rate" + i))`