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

v0.9.4: improved unequipped item handling when invent is lost

Browse Source
This commit is contained in:
Evan Debenham 2021-08-11 18:29:17 -04:00
parent 4c1300aa21
commit 440694cd47
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/EquipableItem.java
View File

@ -127,12 +127,16 @@ public abstract class EquipableItem extends Item {
hero.spend( time2equip( hero ) ); hero.spend( time2equip( hero ) );
} }
//temporarily keep this item so it can be collected
boolean wasKept = keptThoughLostInvent;
keptThoughLostInvent = true;
if (!collect || !collect( hero.belongings.backpack )) { if (!collect || !collect( hero.belongings.backpack )) {
onDetach(); onDetach();
Dungeon.quickslot.clearItem(this); Dungeon.quickslot.clearItem(this);
updateQuickslot(); updateQuickslot();
if (collect) Dungeon.level.drop( this, hero.pos ); if (collect) Dungeon.level.drop( this, hero.pos );
} }
keptThoughLostInvent = wasKept;
return true; return true;
} }

5
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndResurrect.java
View File

@ -130,9 +130,8 @@ public class WndResurrect extends Window {
@Override @Override
public boolean itemSelectable(Item item) { public boolean itemSelectable(Item item) {
//cannot select ankhs, bags or equippable items that aren't equipped //cannot select ankhs or bags or equippable items that aren't equipped
return !(item instanceof Ankh) && !(item instanceof Bag) && return !(item instanceof Ankh || item instanceof Bag);
(!(item instanceof EquipableItem) || item.isEquipped(Dungeon.hero) || item instanceof MissileWeapon);
} }
@Override @Override