diff --git a/GalacticScale2/Properties/AssemblyInfo.cs b/GalacticScale2/Properties/AssemblyInfo.cs index 63aac918..e9d3b7da 100644 --- 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.0")] -[assembly: AssemblyFileVersion("2.0.85.0")] \ No newline at end of file +[assembly: AssemblyVersion("2.0.85.1")] +[assembly: AssemblyFileVersion("2.0.85.1")] \ No newline at end of file diff --git a/GalacticScale2/Scripts/Bootstrap.cs b/GalacticScale2/Scripts/Bootstrap.cs index 0e63ebab..69865894 100644 --- 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.0")] + [BepInPlugin("dsp.galactic-scale.2", "Galactic Scale 2 Plug-In", "2.0.85.1")] [BepInDependency("space.customizing.console", BepInDependency.DependencyFlags.SoftDependency)] public class Bootstrap : BaseUnityPlugin { diff --git a/GalacticScale2/Scripts/GalacticScale2.0/Generators/GS2Dev/Settings.cs b/GalacticScale2/Scripts/GalacticScale2.0/Generators/GS2Dev/Settings.cs index 00b4e9b6..d27960bf 100644 --- a/GalacticScale2/Scripts/GalacticScale2.0/Generators/GS2Dev/Settings.cs +++ b/GalacticScale2/Scripts/GalacticScale2.0/Generators/GS2Dev/Settings.cs @@ -31,6 +31,7 @@ public partial class GS2Generator2 : iConfigurableGenerator public void Init() { + Config.enableStarSelector = true; AddUIElements(); InitPreferences(); } diff --git a/GalacticScale2/Scripts/GalacticScale2.0/Models/Generator/GSGeneratorConfig.cs b/GalacticScale2/Scripts/GalacticScale2.0/Models/Generator/GSGeneratorConfig.cs index bb060b3e..81726929 100644 --- a/GalacticScale2/Scripts/GalacticScale2.0/Models/Generator/GSGeneratorConfig.cs +++ b/GalacticScale2/Scripts/GalacticScale2.0/Models/Generator/GSGeneratorConfig.cs @@ -9,15 +9,16 @@ public class GSGeneratorConfig private int _minStarCount = 1; public bool DisableSeedInput; public bool DisableStarCountSlider; - + public bool enableStarSelector = false; public GSGeneratorConfig(bool disableStarCountSlider = false, bool disableSeedInput = false, - int minStarCount = 1, int maxStarCount = 1024, int defaultStarCount = 1) + int minStarCount = 1, int maxStarCount = 1024, int defaultStarCount = 1, bool enableSelector = false) { DisableStarCountSlider = disableStarCountSlider; DisableSeedInput = disableSeedInput; MinStarCount = minStarCount; MaxStarCount = maxStarCount; DefaultStarCount = defaultStarCount; + enableStarSelector = enableSelector; } [SerializeField] diff --git a/GalacticScale2/Scripts/GalacticScale2.0/Patches/UIVirtualStarmap/_OnLateUpdate.cs b/GalacticScale2/Scripts/GalacticScale2.0/Patches/UIVirtualStarmap/_OnLateUpdate.cs index 42e94e51..8e782c4c 100644 --- a/GalacticScale2/Scripts/GalacticScale2.0/Patches/UIVirtualStarmap/_OnLateUpdate.cs +++ b/GalacticScale2/Scripts/GalacticScale2.0/Patches/UIVirtualStarmap/_OnLateUpdate.cs @@ -64,11 +64,18 @@ public static bool _OnLateUpdate(ref UIVirtualStarmap __instance) // GS2.Log("0"); if (pressing) { - GS2.ActiveGenerator.Generate(GSSettings.StarCount, __instance.starPool[index1].starData); - __instance.galaxyData = GS2.ProcessGalaxy(GS2.gameDesc, true); - __instance.OnGalaxyDataReset(); - // __instance.starPool[index2].nameText.text = __instance.starPool[index2].textContent + "\r\n" + - // __instance.clickText.Translate(); + if (GS2.ActiveGenerator.Config.enableStarSelector) + { + GS2.ActiveGenerator.Generate(GSSettings.StarCount, __instance.starPool[index1].starData); + __instance.galaxyData = GS2.ProcessGalaxy(GS2.gameDesc, true); + __instance.OnGalaxyDataReset(); + } + else + { + __instance.starPool[index2].nameText.text = __instance.starPool[index2].textContent + "\r\n" + __instance.clickText.Translate(); + } + + } // GS2.Log(__instance.starPool[index1].starData.name + " - " +