From 1f60a386e6c5c5fb13aa463699f3aab7fc22be5b Mon Sep 17 00:00:00 2001
From: Soar Qin <soarchin@gmail.com>
Date: Tue, 17 Oct 2023 17:34:48 +0800
Subject: [PATCH] some fixes

---
 CheatEnabler/FactoryPatch.cs        | 7 ++++---
 UXAssist/PlanetPatch.cs             | 3 +--
 UXAssist/UIConfigWindow.cs          | 9 +++++----
 UniverseGenTweaks/UIConfigWindow.cs | 2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/CheatEnabler/FactoryPatch.cs b/CheatEnabler/FactoryPatch.cs
index 654cef6..68e1b95 100644
--- a/CheatEnabler/FactoryPatch.cs
+++ b/CheatEnabler/FactoryPatch.cs
@@ -342,10 +342,11 @@ public static class FactoryPatch
                     ref var signal = ref entitySignPool[belt.entityId];
                     if (signal.iconId0 < 1000) continue;
                     var signalBelt = pair.Value;
+                    var inc = signalBelt.Inc / signalBelt.Stack;
                     if (altFormat)
-                        signal.count0 = signalBelt.SpeedLimit + signalBelt.Stack * 10000 + signalBelt.Inc / signalBelt.Stack * 100000;
+                        signal.count0 = signalBelt.SpeedLimit + signalBelt.Stack * 10000 + inc * 100000;
                     else
-                        signal.count0 = signalBelt.SpeedLimit * 100 + signalBelt.Stack + signalBelt.Inc / signalBelt.Stack * 10;
+                        signal.count0 = signalBelt.SpeedLimit * 100 + signalBelt.Stack + inc * 10;
                 }
             }
         }
@@ -526,7 +527,7 @@ public static class FactoryPatch
             GetSignalBelts(factory)?.Remove(beltId);
         }
 
-        public static void RemovePlanetSignalBelts(int factory)
+        private static void RemovePlanetSignalBelts(int factory)
         {
             GetSignalBelts(factory)?.Clear();
         }
diff --git a/UXAssist/PlanetPatch.cs b/UXAssist/PlanetPatch.cs
index 6a10f59..1510fe1 100644
--- a/UXAssist/PlanetPatch.cs
+++ b/UXAssist/PlanetPatch.cs
@@ -96,8 +96,7 @@ public static class PlanetPatch
             );
             matcher.Repeat(codeMatcher =>
             {
-                matcher.Advance(1);
-                matcher.InsertAndAdvance(
+                codeMatcher.Advance(1).InsertAndAdvance(
                     new CodeInstruction(OpCodes.Ldloc, local1),
                     new CodeInstruction(OpCodes.Or)
                 );
diff --git a/UXAssist/UIConfigWindow.cs b/UXAssist/UIConfigWindow.cs
index 8eaf3c3..ac1d165 100644
--- a/UXAssist/UIConfigWindow.cs
+++ b/UXAssist/UIConfigWindow.cs
@@ -8,7 +8,7 @@ public static class UIConfigWindow
 {
     private static RectTransform _windowTrans;
     private static RectTransform _tab;
-    private static readonly UIButton[] _dysonLayerBtn = new UIButton[10];
+    private static readonly UIButton[] DysonLayerBtn = new UIButton[10];
 
     public static void Init()
     {
@@ -30,6 +30,7 @@ public static class UIConfigWindow
         I18N.Add("Click to dismantle selected layer", "Click to dismantle selected layer", "点击拆除对应的戴森壳");
         I18N.Apply();
         MyConfigWindow.OnUICreated += CreateUI;
+        MyConfigWindow.OnUpdateUI += UpdateUI;
     }
 
     private static void CreateUI(MyConfigWindow wnd, RectTransform trans)
@@ -77,7 +78,7 @@ public static class UIConfigWindow
             var id = i + 1;
             var btn = wnd.AddFlatButton(x, y, tab1, id.ToString(), 12, "dismantle-layer-" + id, () => { DysonSpherePatch.InitCurrentDysonSphere(id); });
             ((RectTransform)btn.transform).sizeDelta = new Vector2(40f, 20f);
-            _dysonLayerBtn[i] = btn;
+            DysonLayerBtn[i] = btn;
             if (i == 4)
             {
                 x -= 160f;
@@ -113,7 +114,7 @@ public static class UIConfigWindow
                 for (var i = 1; i <= 10; i++)
                 {
                     var layer = ds.layersIdBased[i];
-                    _dysonLayerBtn[i - 1].button.interactable = layer != null && layer.id == i;
+                    DysonLayerBtn[i - 1].button.interactable = layer != null && layer.id == i;
                 }
 
                 return;
@@ -122,7 +123,7 @@ public static class UIConfigWindow
 
         for (var i = 0; i < 10; i++)
         {
-            _dysonLayerBtn[i].button.interactable = false;
+            DysonLayerBtn[i].button.interactable = false;
         }
     }
 }
diff --git a/UniverseGenTweaks/UIConfigWindow.cs b/UniverseGenTweaks/UIConfigWindow.cs
index 80fcb74..60d4678 100644
--- a/UniverseGenTweaks/UIConfigWindow.cs
+++ b/UniverseGenTweaks/UIConfigWindow.cs
@@ -48,7 +48,7 @@ public static class UIConfigWindow
         MyWindow.AddText(x, y, tab, "Maximum star count", 16);
         x += 20f;
         y += 26f;
-        var sl0 = MySlider.CreateSlider(x, y, tab, (float)MoreSettings.MaxStarCount.Value, 64f, 1024f, "G", 240f);
+        var sl0 = MySlider.CreateSlider(x, y, tab, MoreSettings.MaxStarCount.Value, 64f, 1024f, "G", 240f);
         sl0.OnValueChanged += () =>
         {
             sl0.Value = MoreSettings.MaxStarCount.Value = (Mathf.RoundToInt(sl0.Value) + 7) & ~7;