konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v2.0.0: unequipping secon wep with a full inventory no longer drops it

Browse Source
This commit is contained in:
Evan Debenham
2023-02-13 16:34:37 -05:00
parent 853e6050b1
commit f765600876
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/KindOfWeapon.java
+9 -3
View File
@@ -181,17 +181,23 @@ abstract public class KindOfWeapon extends EquipableItem {
public boolean doUnequip( Hero hero, boolean collect, boolean single ) { public boolean doUnequip( Hero hero, boolean collect, boolean single ) {
boolean second = hero.belongings.secondWep == this; boolean second = hero.belongings.secondWep == this;
if (second){
//do this first so that the item can go to a full inventory
hero.belongings.secondWep = null;
}
if (super.doUnequip( hero, collect, single )) { if (super.doUnequip( hero, collect, single )) {
if (second){ if (!second){
hero.belongings.secondWep = null;
} else {
hero.belongings.weapon = null; hero.belongings.weapon = null;
} }
return true; return true;
} else { } else {
if (second){
hero.belongings.secondWep = this;
}
return false; return false;
} }