From 9bc3b1245ab5bda51ac690dc7577cde4b171faae Mon Sep 17 00:00:00 2001 From: celvro Date: Thu, 17 Aug 2023 16:46:03 -0500 Subject: [PATCH] Release 2.0.0 Fixed label issue in exosuit --- .vs/QuickSlotsPlus/v17/.suo | Bin 107520 -> 103936 bytes StandardConfig.cs | 2 +- Utility/LabelUtil.cs | 10 ++++++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.vs/QuickSlotsPlus/v17/.suo b/.vs/QuickSlotsPlus/v17/.suo index a133b7fc45fab88ca877075c2db76ea344f11799..a93ce07ba466b355032120100c21694377b04b89 100644 GIT binary patch delta 4572 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 C1n<-U delta 3995 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 diff --git a/StandardConfig.cs b/StandardConfig.cs index 011f175..9f0a3db 100644 --- 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 index faa9f57..5c6eaa2 100644 --- 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()?.compTextHand;