Release 2.0.0

Fixed label issue in exosuit
celvro · Aug 17, 2023 · 9bc3b12 · 9bc3b12
1 parent 61f59cd
commit 9bc3b12
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/.vs/QuickSlotsPlus/v17/.suo b/.vs/QuickSlotsPlus/v17/.suo
diff --git a/StandardConfig.cs b/StandardConfig.cs
@@ -75,7 +75,7 @@ public class StandardConfig : ConfigFile
         [Keybind("Slot 20"), OnChange(nameof(RedrawQuickSlots))]
         public KeyCode HotKey20;
 
-        [Button("Reset Keybinds", Tooltip = "Reset Keybinds to their default values. Close options menu to take effect.")]
+        /*[Button("Reset Keybinds", Tooltip = "Reset Keybinds to their default values. Close options menu to take effect.")]*/
         public void ResetKeybinds(ButtonClickedEventArgs eventArgs)
         {
             Mod.Options.HotKey6 = KeyCode.Alpha6;

diff --git a/Utility/LabelUtil.cs b/Utility/LabelUtil.cs
@@ -186,8 +186,8 @@ public static void DrawLabels(uGUI_QuickSlots quickSlots)
             {
                 uGUI_ItemIcon itemIcon = icons[i];
                 var index = i;
-                // Fix for Slot Extender since first 2 Prawn slots are right and left click
-                if (Player.main.inExosuit && !Player.main.pda.isInUse)
+                // Fix for slot labels since first 2 Prawn slots are right and left click
+                if (Player.main.inExosuit && PDAClosed())
                 {
                     /*
                      * LeftHand  = -4,
@@ -209,6 +209,12 @@ public static void DrawLabels(uGUI_QuickSlots quickSlots)
             }
         }
 
+        private static bool PDAClosed()
+        {
+            PDA.State state = Player.main.pda.state;
+            return state == PDA.State.Closed || state == PDA.State.Closing;
+        }
+
         private static TextMeshProUGUI GetTextPrefab()
         {
             return Object.FindObjectOfType<HandReticle>()?.compTextHand;