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

v2.1.0: fixed scroll of transmutation triggering swift equip

Browse Source
This commit is contained in:
Evan Debenham
2023-04-27 14:09:02 -04:00
parent 9cd16948ec
commit 7c1e813bea
1 changed files with 4 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
+4 -3
View File
@@ -100,7 +100,7 @@ abstract public class KindOfWeapon extends EquipableItem {
@Override @Override
public boolean doEquip( Hero hero ) { public boolean doEquip( Hero hero ) {
boolean wasInInv = hero.belongings.contains(this);
detachAll( hero.belongings.backpack ); detachAll( hero.belongings.backpack );
if (hero.belongings.weapon == null || hero.belongings.weapon.doUnequip( hero, true )) { if (hero.belongings.weapon == null || hero.belongings.weapon.doUnequip( hero, true )) {
@@ -118,7 +118,7 @@ abstract public class KindOfWeapon extends EquipableItem {
GLog.n( Messages.get(KindOfWeapon.class, "equip_cursed") ); GLog.n( Messages.get(KindOfWeapon.class, "equip_cursed") );
} }
if (hero.hasTalent(Talent.SWIFT_EQUIP)) { if (wasInInv && hero.hasTalent(Talent.SWIFT_EQUIP)) {
if (hero.buff(Talent.SwiftEquipCooldown.class) == null){ if (hero.buff(Talent.SwiftEquipCooldown.class) == null){
hero.spendAndNext(-hero.cooldown()); hero.spendAndNext(-hero.cooldown());
Buff.affect(hero, Talent.SwiftEquipCooldown.class, 19f) Buff.affect(hero, Talent.SwiftEquipCooldown.class, 19f)
@@ -144,6 +144,7 @@ abstract public class KindOfWeapon extends EquipableItem {
} }
public boolean equipSecondary( Hero hero ){ public boolean equipSecondary( Hero hero ){
boolean wasInInv = hero.belongings.contains(this);
detachAll( hero.belongings.backpack ); detachAll( hero.belongings.backpack );
if (hero.belongings.secondWep == null || hero.belongings.secondWep.doUnequip( hero, true )) { if (hero.belongings.secondWep == null || hero.belongings.secondWep.doUnequip( hero, true )) {
@@ -161,7 +162,7 @@ abstract public class KindOfWeapon extends EquipableItem {
GLog.n( Messages.get(KindOfWeapon.class, "equip_cursed") ); GLog.n( Messages.get(KindOfWeapon.class, "equip_cursed") );
} }
if (hero.hasTalent(Talent.SWIFT_EQUIP)) { if (wasInInv && hero.hasTalent(Talent.SWIFT_EQUIP)) {
if (hero.buff(Talent.SwiftEquipCooldown.class) == null){ if (hero.buff(Talent.SwiftEquipCooldown.class) == null){
hero.spendAndNext(-hero.cooldown()); hero.spendAndNext(-hero.cooldown());
Buff.affect(hero, Talent.SwiftEquipCooldown.class, 19f) Buff.affect(hero, Talent.SwiftEquipCooldown.class, 19f)