diff --git a/core/src/main/assets/messages/actors/actors.properties b/core/src/main/assets/messages/actors/actors.properties index 1a126fee4..148436a20 100644 --- a/core/src/main/assets/messages/actors/actors.properties +++ b/core/src/main/assets/messages/actors/actors.properties @@ -703,7 +703,7 @@ actors.hero.talent.shield_battery.title=shield battery actors.hero.talent.shield_battery.desc=_+1:_ The Mage can self-target with a wand to convert all of its charges into shielding at a rate of _4% max HP per charge_.\n\n_+2:_ The Mage can self-target with a wand to convert all of its charges into shielding at a rate of _6% max HP per charge_. actors.hero.talent.desperate_power.title=desperate power -actors.hero.talent.desperate_power.desc=_+1:_ The Mage's wands and staff gain _+1 level_ when they are down to their last charge.\n\n_+2:_ The Mage's wands and staff gain _+2 levels_ when they are down to their last charge.\n\n_+3:_ The Mage's wands and staff gain _+3 levels_ when they are down to their last charge. +actors.hero.talent.desperate_power.desc=_+1:_ The Mage's wands and staff gain _+1 level_ on their final zap when they are down to their last charge.\n\n_+2:_ The Mage's wands and staff gain _+2 levels_ on their final zap when they are down to their last charge.\n\n_+3:_ The Mage's wands and staff gain _+3 levels_ on their final zap when they are down to their last charge. actors.hero.talent.ally_warp.title=ally warp actors.hero.talent.ally_warp.desc=_+1:_ The Mage can select an ally to instantly swap places with them, with a _2 tile range_.\n\n_+2:_ The Mage can select an ally to instantly swap places with them, with a _4 tile range_.\n\n_+3:_ The Mage can select an ally to instantly swap places with them, with a _6 tile range_.\n\nThe Mage cannot swap places with immobile allies. diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java index 1bd472ba8..8a0234e25 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java @@ -156,11 +156,11 @@ public class MagesStaff extends MeleeWeapon { } @Override - public int buffedLvl() { + public int buffedVisiblyUpgraded() { if (wand != null){ - return Math.max(super.buffedLvl(), wand.buffedLvl()); + return Math.max(super.buffedVisiblyUpgraded(), wand.buffedVisiblyUpgraded()); } else { - return super.buffedLvl(); + return super.buffedVisiblyUpgraded(); } }