fix save load. breaks vanilla gen saves. custom json load from settings

Touhma · Aug 13, 2021 · c33320f · c33320f
1 parent e157dbd
commit c33320f
Show file tree

Hide file tree

Showing 21 changed files with 453 additions and 1,923 deletions.
diff --git a/GalacticScale2/DSP_Plugins.GalacticScale.csproj b/GalacticScale2/DSP_Plugins.GalacticScale.csproj
@@ -162,9 +162,6 @@
     <Compile Include="Scripts\GalacticScale2.0\Generators\GS2Dev\Settings.cs" />
     <Compile Include="Scripts\GalacticScale2.0\Generators\GS2Dev\Stars.cs" />
     <Compile Include="Scripts\GalacticScale2.0\Generators\GS2Dev\Themes.cs" />
-    <Compile Include="Scripts\GalacticScale2.0\Generators\GS2\Settings.cs" />
-    <Compile Include="Scripts\GalacticScale2.0\Generators\GS2\GS2Generator.cs" />
-    <Compile Include="Scripts\GalacticScale2.0\Generators\GS2\Themes.cs" />
     <Compile Include="Scripts\GalacticScale2.0\Generators\StarTest.cs" />
     <Compile Include="Scripts\GalacticScale2.0\Logging\ConsoleSplash.cs" />
     <Compile Include="Scripts\GalacticScale2.0\Models\GSUI\Val.cs" />
@@ -282,6 +279,7 @@
     <Compile Include="Scripts\GalacticScale2.0\SettingsUI\MonoBehaviors\GSUIDropdown.cs" />
     <Compile Include="Scripts\GalacticScale2.0\SettingsUI\MonoBehaviors\GSUIHeader.cs" />
     <Compile Include="Scripts\GalacticScale2.0\SettingsUI\MonoBehaviors\GSUIRangeSlider.cs" />
+    <Compile Include="Scripts\GalacticScale2.0\SettingsUI\MonoBehaviors\GSUISelector.cs" />
     <Compile Include="Scripts\GalacticScale2.0\SettingsUI\MonoBehaviors\GSUISlider.cs" />
     <Compile Include="Scripts\GalacticScale2.0\SettingsUI\MonoBehaviors\GSUIInput.cs" />
     <Compile Include="Scripts\GalacticScale2.0\SettingsUI\MonoBehaviors\GSUIButton.cs" />
@@ -290,6 +288,7 @@
     <Compile Include="Scripts\GalacticScale2.0\SettingsUI\MonoBehaviors\GSUITemplate.cs" />
     <Compile Include="Scripts\GalacticScale2.0\SettingsUI\MonoBehaviors\GSUITemplates.cs" />
     <Compile Include="Scripts\GalacticScale2.0\SettingsUI\MonoBehaviors\GSUIToggle.cs" />
+    <Compile Include="Scripts\GalacticScale2.0\SettingsUI\MonoBehaviors\GSUIToggleList.cs" />
     <Compile Include="Scripts\GalacticScale2.0\SettingsUI\ThemeSelectGroup.cs" />
     <Compile Include="Scripts\GalacticScale2.0\SettingsUI\ThemeSelectItem.cs" />
     <Compile Include="Scripts\GalacticScale2.0\SettingsUI\ThemeSelectorUI.cs" />

diff --git a/GalacticScale2/Properties/AssemblyInfo.cs b/GalacticScale2/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.85.1")]
-[assembly: AssemblyFileVersion("2.0.85.1")]
+[assembly: AssemblyVersion("2.0.85.3")]
+[assembly: AssemblyFileVersion("2.0.85.3")]
diff --git a/GalacticScale2/Scripts/Assets/galacticbundle b/GalacticScale2/Scripts/Assets/galacticbundle
diff --git a/GalacticScale2/Scripts/Bootstrap.cs b/GalacticScale2/Scripts/Bootstrap.cs
@@ -7,7 +7,7 @@
 
 namespace GalacticScale
 {
-    [BepInPlugin("dsp.galactic-scale.2", "Galactic Scale 2 Plug-In", "2.0.85.1")]
+    [BepInPlugin("dsp.galactic-scale.2", "Galactic Scale 2 Plug-In", "2.0.85.3")]
     [BepInDependency("space.customizing.console", BepInDependency.DependencyFlags.SoftDependency)]
     public class Bootstrap : BaseUnityPlugin
     {

diff --git a/GalacticScale2/Scripts/GalacticScale2.0/Galaxy Generation/ProcessGalaxy.cs b/GalacticScale2/Scripts/GalacticScale2.0/Galaxy Generation/ProcessGalaxy.cs
@@ -26,6 +26,7 @@ public static GalaxyData ProcessGalaxy(GameDesc desc, bool sketchOnly = false)
                     Log("Seed From gameDesc = " + GSSettings.Seed);
                     gsPlanets.Clear();
                     gsStars.Clear();
+
                     //Warn("Cleared");
                     Warn("Loading Data from Generator : " + ActiveGenerator.Name);
                     ActiveGenerator.Generate(gameDesc.starCount);