LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v1.2.0: fixed inconsistencies with inventory pane and lost inventory

Browse Source
This commit is contained in:
Evan Debenham 2022-03-14 18:00:04 -04:00
parent 0ef903befb
commit adfaa59cc8
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/InventoryPane.java
View File

@ -26,6 +26,7 @@ import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.SPDAction; import com.shatteredpixel.shatteredpixeldungeon.SPDAction;
import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.LostInventory;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Belongings; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Belongings;
import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.items.bags.Bag; import com.shatteredpixel.shatteredpixeldungeon.items.bags.Bag;
@ -275,7 +276,7 @@ public class InventoryPane extends Component {
Belongings stuff = Dungeon.hero.belongings; Belongings stuff = Dungeon.hero.belongings;
if (lastBag == null || !stuff.contains(lastBag)){ if (lastBag == null || !stuff.getBags().contains(lastBag)){
lastBag = stuff.backpack; lastBag = stuff.backpack;
} }
@ -332,15 +333,18 @@ public class InventoryPane extends Component {
} }
} }
boolean lostInvent = Dungeon.hero.buff(LostInventory.class) != null;
for (InventorySlot b : equipped){ for (InventorySlot b : equipped){
b.enable(lastEnabled b.enable(lastEnabled
&& !(b.item() instanceof WndBag.Placeholder) && !(b.item() instanceof WndBag.Placeholder)
&& (selector == null || selector.itemSelectable(b.item()))); && (selector == null || selector.itemSelectable(b.item()))
&& (!lostInvent || b.item().keptThoughLostInvent));
} }
for (InventorySlot b : bagItems){ for (InventorySlot b : bagItems){
b.enable(lastEnabled b.enable(lastEnabled
&& b.item() != null && b.item() != null
&& (selector == null || selector.itemSelectable(b.item()))); && (selector == null || selector.itemSelectable(b.item()))
&& (!lostInvent || b.item().keptThoughLostInvent));
} }
for (BagButton b : bags){ for (BagButton b : bags){
b.enable(lastEnabled); b.enable(lastEnabled);
@ -408,15 +412,18 @@ public class InventoryPane extends Component {
if (lastEnabled != (Dungeon.hero.ready || !Dungeon.hero.isAlive())) { if (lastEnabled != (Dungeon.hero.ready || !Dungeon.hero.isAlive())) {
lastEnabled = (Dungeon.hero.ready || !Dungeon.hero.isAlive()); lastEnabled = (Dungeon.hero.ready || !Dungeon.hero.isAlive());
boolean lostInvent = Dungeon.hero.buff(LostInventory.class) != null;
for (InventorySlot b : equipped){ for (InventorySlot b : equipped){
b.enable(lastEnabled b.enable(lastEnabled
&& !(b.item() instanceof WndBag.Placeholder) && !(b.item() instanceof WndBag.Placeholder)
&& (selector == null || selector.itemSelectable(b.item()))); && (selector == null || selector.itemSelectable(b.item()))
&& (!lostInvent || b.item().keptThoughLostInvent));
} }
for (InventorySlot b : bagItems){ for (InventorySlot b : bagItems){
b.enable(lastEnabled b.enable(lastEnabled
&& b.item() != null && b.item() != null
&& (selector == null || selector.itemSelectable(b.item()))); && (selector == null || selector.itemSelectable(b.item()))
&& (!lostInvent || b.item().keptThoughLostInvent));
} }
for (BagButton b : bags){ for (BagButton b : bags){
b.enable(lastEnabled); b.enable(lastEnabled);