Merge pull request #61 from post-kerbin-mining-corporation/dev

Fixes to loading
post-kerbin-mining-corporation · Nov 20, 2024 · 029daab · 029daab
2 parents 701d07c + 3d0bfa2
commit 029daab
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 6 deletions.
diff --git a/GameData/SpaceDust/Plugins/SpaceDust.dll b/GameData/SpaceDust/Plugins/SpaceDust.dll
diff --git a/GameData/SpaceDust/SpaceDustSettings.cfg b/GameData/SpaceDust/SpaceDustSettings.cfg
@@ -8,7 +8,9 @@ SPACEDUSTSETTINGS
   DebugOverlay = false
   // Emit module  debug messages
   DebugModules = false
-
+  DebugBackground = false
+  DebugPersistence = false
+  DebugLoading = false
 
   // UI Stuff
   // ----------------------

diff --git a/GameData/SpaceDust/Versioning/SpaceDust.version b/GameData/SpaceDust/Versioning/SpaceDust.version
@@ -6,7 +6,7 @@
     {
         "MAJOR":0,
         "MINOR":5,
-        "PATCH":4,
+        "PATCH":5,
         "BUILD":0
     },
     "KSP_VERSION":

diff --git a/Source/SpaceDust/ResourceMap.cs b/Source/SpaceDust/ResourceMap.cs
@@ -85,7 +85,10 @@ public List<string> GetBodyResources(CelestialBody body)
         {
           for (int i = 0; i < Resources[body.name].Count; i++)
           {
-            getResources.Add(Resources[body.name][i].ResourceName);
+            if (!getResources.Contains(Resources[body.name][i].ResourceName))
+            {
+              getResources.Add(Resources[body.name][i].ResourceName);
+            }
           }
         }
       }
@@ -107,7 +110,9 @@ public List<ResourceBand> GetBodyDistributions(CelestialBody body, string resour
         for (int i = 0; i < Resources[body.name].Count; i++)
         {
           if (Resources[body.name][i].ResourceName == resourceName)
-            dist = Resources[body.name][i].Bands;
+          {
+            dist.AddRange(Resources[body.name][i].Bands);
+          }
 
         }
       }

diff --git a/Source/SpaceDust/UI/ToolbarUI.cs b/Source/SpaceDust/UI/ToolbarUI.cs
@@ -33,11 +33,11 @@ protected virtual void Awake()
       {
         GameEvents.onGUIApplicationLauncherReady.Add(OnGUIAppLauncherReady);
         GameEvents.onGUIApplicationLauncherDestroyed.Add(OnGUIAppLauncherDestroyed);
+        GameEvents.onGUIApplicationLauncherUnreadifying.Add(new EventData<GameScenes>.OnEvent(OnGUIAppLauncherUnreadifying));
 
         GameEvents.OnMapEntered.Add(new EventVoid.OnEvent(OnMapEntered));
         GameEvents.OnMapExited.Add(new EventVoid.OnEvent(OnMapExited));
         GameEvents.OnMapFocusChange.Add(new EventData<MapObject>.OnEvent(OnMapFocusChange));
-        GameEvents.onGUIApplicationLauncherUnreadifying.Add(new EventData<GameScenes>.OnEvent(OnGUIAppLauncherUnreadifying));
       }
       resourceVisibilities = new Dictionary<string, bool>();
       Instance = this;
@@ -224,10 +224,13 @@ public void OnDestroy()
       {
         ApplicationLauncher.Instance.RemoveModApplication(stockToolbarButton);
       }
+      GameEvents.onGUIApplicationLauncherDestroyed.Remove(OnGUIAppLauncherDestroyed);
+      GameEvents.onGUIApplicationLauncherUnreadifying.Remove(OnGUIAppLauncherUnreadifying);
 
       GameEvents.OnMapEntered.Remove(OnMapEntered);
       GameEvents.OnMapFocusChange.Remove(OnMapFocusChange);
       GameEvents.OnMapExited.Remove(OnMapExited);
+
     }
 
     protected void OnGUIAppLauncherReady()

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,8 @@
+v0.5.5
+------
+- Fixed an issue where multiple SPACEDUST_RESOURCE entries with the same body and resource overwrote previous entries rather than concatenating them
+- Added the missing debug switches to the config file 
+
 v0.5.4
 ------
 - Rebalanced Antimatter distributions

diff --git a/readme.txt b/readme.txt
@@ -1,5 +1,5 @@
 ================
-SPACE DUST 0.5.4
+SPACE DUST 0.5.5
 ================
 
 This is a KSP mod designed to overhaul the atmospheric and exospheric mining experience in KSP. It functions both as a framework, providing part modules and distributions to others, and an actual gameplay mod designed to provide a set of parts focused around atmospheric ISRU in the stock system.