b86

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

Hide file tree

Showing 7 changed files with 12 additions and 11 deletions.
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.3")]
-[assembly: AssemblyFileVersion("2.0.85.3")]
+[assembly: AssemblyVersion("2.0.86.0")]
+[assembly: AssemblyFileVersion("2.0.86.0")]
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.3")]
+    [BepInPlugin("dsp.galactic-scale.2", "Galactic Scale 2 Plug-In", "2.0.86.0")]
     [BepInDependency("space.customizing.console", BepInDependency.DependencyFlags.SoftDependency)]
     public class Bootstrap : BaseUnityPlugin
     {

diff --git a/GalacticScale2/Scripts/GalacticScale2.0/Generators/GS2.GeneratorData.cs b/GalacticScale2/Scripts/GalacticScale2.0/Generators/GS2.GeneratorData.cs
@@ -16,7 +16,7 @@ public static partial class GS2
             //new Generators.SizeTest(),
             //new Generators.TintTest(),
             new Sol(),
-            new JsonImport(),
+            // new JsonImport(),
             //new Generators.ThemeViewer(),
             //new Generators.Spiral(),
             //new Debug()

diff --git a/GalacticScale2/Scripts/GalacticScale2.0/Generators/GS2Dev/GS2Generator.cs b/GalacticScale2/Scripts/GalacticScale2.0/Generators/GS2Dev/GS2Generator.cs
@@ -39,7 +39,7 @@ public void Generate(int starCount, StarData forcedBirthStar = null)
             if (forcedBirthStar != null)
             {
                 this.forcedBirthStar = forcedBirthStar.name;
-                GS2.Warn("Forcing BirthStar to "+this.forcedBirthStar);
+                // GS2.Warn("Forcing BirthStar to "+this.forcedBirthStar);
             }
             var highStopwatch = new HighStopwatch();
             highStopwatch.Begin();
@@ -165,7 +165,7 @@ private void EnsureBirthSystemHasTi()
                         Themes.AshenGelisol.Process();
                         if (!GSSettings.ThemeLibrary.ContainsKey("AshenGelisol"))
                         {
-                            Warn("Nope" + GS2.ThemeLibrary.Count);
+                            // Warn("Nope" + GS2.ThemeLibrary.Count);
                             GSSettings.ThemeLibrary.Add("AshenGelisol", Themes.AshenGelisol);
                             Themes.AshenGelisol.Process();
                         }
@@ -389,7 +389,7 @@ private int ClampedNormalSize(GS2.Random random, int min, int max, int bias)
 
         private void AddSiTiToBirthPlanet()
         {
-            Warn("Setting SI/TI");
+            // Warn("Setting SI/TI");
             birthPlanet.veinSettings = birthPlanet.GsTheme.VeinSettings.Clone();
             birthPlanet.veinSettings.Algorithm = "GS2";
             birthPlanet.GsTheme.CustomGeneration = true;

diff --git a/GalacticScale2/Scripts/GalacticScale2.0/Generators/GS2Dev/Settings.cs b/GalacticScale2/Scripts/GalacticScale2.0/Generators/GS2Dev/Settings.cs
@@ -476,7 +476,7 @@ private void MoonChanceCallback(Val o)
 
         private void GasChanceCallback(Val o)
         {
-            GS2.Warn("Setting Gas Chance"+ o.String());
+            // GS2.Warn("Setting Gas Chance"+ o.String());
             SetAllStarTypeOptions("chanceGas", o);
         }
 

diff --git a/GalacticScale2/Scripts/GalacticScale2.0/Generators/GS2Dev/Stars.cs b/GalacticScale2/Scripts/GalacticScale2.0/Generators/GS2Dev/Stars.cs
@@ -41,12 +41,12 @@ public void GenerateStars(int starCount, int startID = 0)
 
             if (forcedBirthStar != null)
             {
-                GS2.Warn("Forcing birthStar");
+                // GS2.Warn("Forcing birthStar");
                 foreach (var star in GSSettings.Stars)
                 {
                     if (star.Name == forcedBirthStar) {
                         birthStar = star;
-                        GS2.Warn("birthStar forced");
+                        // GS2.Warn("birthStar forced");
                         break;
                     }
                 }

diff --git a/GalacticScale2/Scripts/GalacticScale2.0/SettingsUI/MainSettings.cs b/GalacticScale2/Scripts/GalacticScale2.0/SettingsUI/MainSettings.cs
@@ -91,9 +91,10 @@ public void Init()
             JsonOptions.Add(GSUI.Input("Export Filename".Translate(), "My First Custom Galaxy", "Export Filename", null, "Excluding .json".Translate()));
             JsonOptions.Add(GSUI.Checkbox("Minify Exported JSON".Translate(), false, "Minify JSON", null, "Only save changes".Translate()));
             _exportButton = JsonOptions.Add(GSUI.Button("Export Custom Galaxy".Translate(), "Export".Translate(), ExportJsonGalaxy, null, "Save Galaxy to File".Translate()));
+            JsonGalaxies = JsonOptions.Add(GSUI.Combobox("Custom Galaxy".Translate(), filenames, CustomFileSelectorCallback, CustomFileSelectorPostfix));
             JsonOptions.Add(GSUI.Button("Load Custom Galaxy".Translate(), "Load", LoadJsonGalaxy, null,
                 "Will end current game".Translate()));
-            JsonGalaxies = JsonOptions.Add(GSUI.Combobox("Custom Galaxy".Translate(), filenames, CustomFileSelectorCallback, CustomFileSelectorPostfix));
+
 
             Options.Add(GSUI.Group("Custom Galaxy Export/Import".Translate(), JsonOptions, "Export available once in game".Translate()));
         }