diff --git a/core/src/main/assets/messages/items/items.properties b/core/src/main/assets/messages/items/items.properties index bc48b1de5..fbcc905a9 100644 --- a/core/src/main/assets/messages/items/items.properties +++ b/core/src/main/assets/messages/items/items.properties @@ -1607,7 +1607,6 @@ items.weapon.melee.meleeweapon.stats_known=This _tier-%1$d_ melee weapon deals _ items.weapon.melee.meleeweapon.stats_unknown=Typically this _tier-%1$d_ melee weapon deals _%2$d-%3$d damage_ and requires _%4$d strength_ to use properly. items.weapon.melee.meleeweapon.probably_too_heavy=Probably this weapon is too heavy for you. items.weapon.melee.meleeweapon.stats_desc= -items.weapon.melee.meleeweapon.swift_equip=You quickly switch your equipped weapon. items.weapon.melee.meleeweapon.ability_need_equip=You must equip that weapon to use its ability. items.weapon.melee.meleeweapon.ability_low_str=You aren't strong enough to use this weapon's ability. items.weapon.melee.meleeweapon.ability_no_charge=You don't have enough energy to use that ability. @@ -1921,6 +1920,7 @@ items.item.curse=curse items.kindofmisc.unequip_title=Unequip one item items.kindofmisc.unequip_message=You must unequip one of these items first. Select an item to swap with. +items.kindofweapon.swift_equip=You swiftly equip your weapon. items.kindofweapon.equip_cursed=Your grip involuntarily tightens around the weapon. items.kindofweapon.which_equip_msg=Which weapon slot would you like to equip this item to?\n\nThe Champion directly attacks with her primary weapon, but can use the ability of either weapon. Both weapons have their own charge count.\n\nThe Champion can also swap her primary and secondary weapon instantly. items.kindofweapon.which_equip_primary=Primary (%s) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/KindOfWeapon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/KindOfWeapon.java index bde5c998a..91bf0af3a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/KindOfWeapon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/KindOfWeapon.java @@ -114,9 +114,11 @@ abstract public class KindOfWeapon extends EquipableItem { hero.spendAndNext(-hero.cooldown()); Buff.affect(hero, Talent.SwiftEquipCooldown.class, 49f) .secondUse = hero.pointsInTalent(Talent.SWIFT_EQUIP) == 2; + GLog.i(Messages.get(this, "swift_equip")); } else if (hero.buff(Talent.SwiftEquipCooldown.class).hasSecondUse()) { hero.spendAndNext(-hero.cooldown()); hero.buff(Talent.SwiftEquipCooldown.class).secondUse = false; + GLog.i(Messages.get(this, "swift_equip")); } else { hero.spendAndNext(TIME_TO_EQUIP); } @@ -155,9 +157,11 @@ abstract public class KindOfWeapon extends EquipableItem { hero.spendAndNext(-hero.cooldown()); Buff.affect(hero, Talent.SwiftEquipCooldown.class, 49f) .secondUse = hero.pointsInTalent(Talent.SWIFT_EQUIP) == 2; + GLog.i(Messages.get(this, "swift_equip")); } else if (hero.buff(Talent.SwiftEquipCooldown.class).hasSecondUse()) { hero.spendAndNext(-hero.cooldown()); hero.buff(Talent.SwiftEquipCooldown.class).secondUse = false; + GLog.i(Messages.get(this, "swift_equip")); } else { hero.spendAndNext(TIME_TO_EQUIP); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java index 85853bc98..0edd097f4 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java @@ -99,7 +99,6 @@ public class MeleeWeapon extends Weapon { if (hero.buff(Talent.SwiftEquipCooldown.class) == null || hero.buff(Talent.SwiftEquipCooldown.class).hasSecondUse()){ execute(hero, AC_EQUIP); - GLog.i(Messages.get(this, "swift_equip")); } else { GLog.w(Messages.get(this, "ability_need_equip")); usesTargeting = false;