From 1bc40109dc413d1b307263c5ea1047e5c9266eef Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Tue, 10 Jan 2023 11:58:10 -0500 Subject: [PATCH] v2.0.0: item selectors now pick backpack if preferred back isn't present --- .../shatteredpixeldungeon/ui/InventoryPane.java | 4 +++- .../shatteredpixel/shatteredpixeldungeon/windows/WndBag.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/InventoryPane.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/InventoryPane.java index f6d4a7528..76bf7d59b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/InventoryPane.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/InventoryPane.java @@ -393,7 +393,9 @@ public class InventoryPane extends Component { lastBag = Dungeon.hero.belongings.backpack; } else if (selector.preferredBag() != null) { Bag preferred = Dungeon.hero.belongings.getItem(selector.preferredBag()); - if (preferred != null) lastBag = preferred; + if (preferred != null) lastBag = preferred; + //if a specific preferred bag isn't present, then the relevant items will be in backpack + else lastBag = Dungeon.hero.belongings.backpack; } updateInventory(); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndBag.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndBag.java index 8a01576aa..25f0b0a66 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndBag.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndBag.java @@ -167,7 +167,9 @@ public class WndBag extends WndTabbed { } else if (selector.preferredBag() != null){ Bag bag = Dungeon.hero.belongings.getItem( selector.preferredBag() ); - if (bag != null) return new WndBag( bag, selector ); + if (bag != null) return new WndBag( bag, selector ); + //if a specific preferred bag isn't present, then the relevant items will be in backpack + else return new WndBag( Dungeon.hero.belongings.backpack, selector ); } return lastBag( selector );