diff --git a/core/src/main/assets/messages/actors/actors.properties b/core/src/main/assets/messages/actors/actors.properties index 421010a23..e84a5d4ee 100644 --- a/core/src/main/assets/messages/actors/actors.properties +++ b/core/src/main/assets/messages/actors/actors.properties @@ -890,7 +890,7 @@ actors.hero.talent.adventurers_intuition.desc=_+1:_ The Duelist identifies weapo actors.hero.talent.patient_strike.title=patient strike actors.hero.talent.patient_strike.desc=_+1:_ If the Duelist waits before performing a melee attack, she will deal _1-2 bonus damage_.\n\n_+2:_ If the Duelist waits before performing a melee attack, she will deal _2 bonus damage_. actors.hero.talent.aggressive_barrier.title=aggressive barrier -actors.hero.talent.aggressive_barrier.desc=_+1:_ The Duelist gains 3 shielding when she uses a weapon ability and is below _40% health_.\n\n_+2:_ The Duelist gains 3 shielding when she uses a weapon ability and is below _60% health_. +actors.hero.talent.aggressive_barrier.desc=_+1:_ The Duelist gains 3 shielding when she uses a weapon ability and is at or below _50% health_.\n\n_+2:_ The Duelist gains 5 shielding when she uses a weapon ability and is at or below _50% health_. actors.hero.talent.aggressive_barrier.meta_desc=_If this talent is gained by a different hero_ it will instead grant shielding when making a melee attack at low health, with a 50 turn cooldown. actors.hero.talent.focused_meal.title=focused meal 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 7006fde40..b594f1d19 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 @@ -204,9 +204,10 @@ public class MeleeWeapon extends Weapon { if (hero.heroClass == HeroClass.DUELIST && hero.hasTalent(Talent.AGGRESSIVE_BARRIER) - && (hero.HP / (float)hero.HT) < 0.20f*(1+hero.pointsInTalent(Talent.AGGRESSIVE_BARRIER))){ - Buff.affect(hero, Barrier.class).setShield(3); - hero.sprite.showStatusWithIcon(CharSprite.POSITIVE, "3", FloatingText.SHIELDING); + && (hero.HP / (float)hero.HT) <= 0.5f){ + int shieldAmt = 1 + 2*hero.pointsInTalent(Talent.AGGRESSIVE_BARRIER); + Buff.affect(hero, Barrier.class).setShield(shieldAmt); + hero.sprite.showStatusWithIcon(CharSprite.POSITIVE, Integer.toString(shieldAmt), FloatingText.SHIELDING); } if (hero.buff(Talent.CombinedLethalityAbilityTracker.class) != null