From acbff733c167d4c3e41379d8bbd0eb0e8ba9e9ed Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Mon, 13 Feb 2023 14:47:56 -0500 Subject: [PATCH] v2.0.0: improved the 'remembering waterskin quickslot' functionality --- .../ui/QuickSlotButton.java | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/QuickSlotButton.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/QuickSlotButton.java index 0bde74cc8..d155c0572 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/QuickSlotButton.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/QuickSlotButton.java @@ -271,13 +271,14 @@ public class QuickSlotButton extends Button { public static void set(int slotNum, Item item){ Dungeon.quickslot.setSlot( slotNum , item ); refresh(); - boolean containsWaterskin = false; - for (int i = 0; i < instance.length; i++) { - if (select(i) instanceof Waterskin) containsWaterskin = true; - } - //Remember if the hero adds/removes the waterskin as one of their first actions. + + //Remember if the player adds the waterskin as one of their first actions. if (Statistics.duration + Actor.now() <= 10){ - SPDSettings.quickslotWaterskin(containsWaterskin); + boolean containsWaterskin = false; + for (int i = 0; i < instance.length; i++) { + if (select(i) instanceof Waterskin) containsWaterskin = true; + } + if (containsWaterskin) SPDSettings.quickslotWaterskin(true); } } @@ -375,6 +376,14 @@ public class QuickSlotButton extends Button { if (Toolbar.SWAP_INSTANCE != null){ Toolbar.SWAP_INSTANCE.updateVisuals(); } + //Remember if the player removes the waterskin as one of their first actions. + if (Statistics.duration + Actor.now() <= 10){ + boolean containsWaterskin = false; + for (int i = 0; i < instance.length; i++) { + if (select(i) instanceof Waterskin) containsWaterskin = true; + } + if (!containsWaterskin) SPDSettings.quickslotWaterskin(false); + } } public static void target( Char target ) {