From a446a17d02ee6602884c162fe5aab6344e881fc8 Mon Sep 17 00:00:00 2001
From: Soar Qin <soarchin@gmail.com>
Date: Mon, 25 Aug 2025 23:24:39 +0800
Subject: [PATCH] UniverseGenTweaks fix

---
 UniverseGenTweaks/MoreSettings.cs | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/UniverseGenTweaks/MoreSettings.cs b/UniverseGenTweaks/MoreSettings.cs
index 03c1fc8..3341b73 100644
--- a/UniverseGenTweaks/MoreSettings.cs
+++ b/UniverseGenTweaks/MoreSettings.cs
@@ -137,6 +137,11 @@ public class MoreSettings
     [HarmonyPatch(typeof(UIGalaxySelect), nameof(UIGalaxySelect._OnOpen))]
     private static void UIGalaxySelect__OnOpen_Prefix()
     {
+        _gameMinDist = _minDist;
+        _gameMinStep = _minStep;
+        _gameMaxStep = _maxStep;
+        _gameFlatten = _flatten;
+
         _minDistText.text = _minDist.ToString();
         _minStepText.text = _minStep.ToString();
         _maxStepText.text = _maxStep.ToString();
@@ -237,6 +242,8 @@ public class MoreSettings
         [HarmonyPatch(typeof(GameData), nameof(GameData.Import))]
         private static void GameData_Import_Prefix(GameData __instance)
         {
+            // Skip prologue demo save
+            if (DSPGame.IsMenuDemo && DSPGame.LoadDemoIndex == -99) return;
             ResetSettings();
         }
 
@@ -307,16 +314,6 @@ public class MoreSettings
         }
     }
 
-    [HarmonyPrefix]
-    [HarmonyPatch(typeof(UIGalaxySelect), nameof(UIGalaxySelect.ApplySetting))]
-    private static void UIGalaxySelect_EnterGame_Prefix()
-    {
-        _gameMinDist = _minDist;
-        _gameMinStep = _minStep;
-        _gameMaxStep = _maxStep;
-        _gameFlatten = _flatten;
-    }
-
     #region CombatSettings
 
     [HarmonyPostfix]