From 9d91de72cf1c445386be819e38806a7b0b83de59 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sun, 29 Jan 2023 13:05:32 -0500 Subject: [PATCH] v2.0.0: re-added the 0-1 blocking on rapier and buffed aggro barrier --- core/src/main/assets/messages/actors/actors.properties | 2 +- core/src/main/assets/messages/items/items.properties | 3 ++- .../shatteredpixeldungeon/actors/hero/Hero.java | 2 +- .../items/weapon/melee/MeleeWeapon.java | 2 +- .../shatteredpixeldungeon/items/weapon/melee/Rapier.java | 5 +++++ 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/core/src/main/assets/messages/actors/actors.properties b/core/src/main/assets/messages/actors/actors.properties index ed5d31e44..557e3c11d 100644 --- a/core/src/main/assets/messages/actors/actors.properties +++ b/core/src/main/assets/messages/actors/actors.properties @@ -831,7 +831,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=If the Duelist waits before performing a melee attack, she will deal _1-2 bonus damage_.\n\nIf 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 2 shielding when she uses a weapon ability and is below _33% health_.\n\n_+2:_ The Duelist gains 2 shielding when she uses a weapon ability and is below _50% health_. +actors.hero.talent.aggressive_barrier.desc=_+1:_ The Duelist gains 3 shielding when she uses a weapon ability and is below _33% health_.\n\n_+2:_ The Duelist gains 3 shielding when she uses a weapon ability and is 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/assets/messages/items/items.properties b/core/src/main/assets/messages/items/items.properties index cda017e87..bc48b1de5 100644 --- a/core/src/main/assets/messages/items/items.properties +++ b/core/src/main/assets/messages/items/items.properties @@ -1631,9 +1631,10 @@ items.weapon.melee.quarterstaff$defensivestance.name=defensive stance items.weapon.melee.quarterstaff$defensivestance.desc=The Duelist is using her quarterstaff to deflect incoming blows and projectiles. As long as she is in this stance, her evasion against all attacks is doubled.\n\nTurns remaining: %s. items.weapon.melee.rapier.name=rapier +items.weapon.melee.rapier.stats_desc=This weapon blocks 0-1 damage. items.weapon.melee.rapier.ability_name=lunge items.weapon.melee.rapier.ability_desc=The Duelist can _lunge_ with a rapier at an enemy 1 tile away. This moves toward the enemy, deals +67% damage, and is guaranteed to hit. -items.weapon.melee.rapier.desc=A slim straight sword has less raw slashing power, but can still be quite strong with the right technique. +items.weapon.melee.rapier.desc=A slim straight sword that offers some protection in exchange for less slashing power. items.weapon.melee.roundshield.name=round shield items.weapon.melee.roundshield.typical_stats_desc=Typically this weapon blocks 0-%d damage. This blocking scales with upgrades. diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java index b0e738127..677f9b79f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java @@ -1207,7 +1207,7 @@ public class Hero extends Char { && hasTalent(Talent.AGGRESSIVE_BARRIER) && buff(Talent.AggressiveBarrierCooldown.class) == null && (HP / (float)HT) < 0.167f*(1+pointsInTalent(Talent.AGGRESSIVE_BARRIER))){ - Buff.affect(this, Barrier.class).setShield(2); + Buff.affect(this, Barrier.class).setShield(3); Buff.affect(this, Talent.AggressiveBarrierCooldown.class, 50f); } sprite.attack( enemy.pos ); 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 7649cab8d..85853bc98 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 @@ -184,7 +184,7 @@ public class MeleeWeapon extends Weapon { if (hero.heroClass == HeroClass.DUELIST && hero.hasTalent(Talent.AGGRESSIVE_BARRIER) && (hero.HP / (float)hero.HT) < 0.167f*(1+hero.pointsInTalent(Talent.AGGRESSIVE_BARRIER))){ - Buff.affect(hero, Barrier.class).setShield(2); + Buff.affect(hero, Barrier.class).setShield(3); } if (hero.buff(Talent.CombinedLethalityAbilityTracker.class) != null diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Rapier.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Rapier.java index b66d79409..486f9981b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Rapier.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Rapier.java @@ -53,6 +53,11 @@ public class Rapier extends MeleeWeapon { lvl*(tier+1); //scaling unchanged } + @Override + public int defenseFactor( Char owner ) { + return 1; //1 extra defence + } + @Override public String targetingPrompt() { return Messages.get(this, "prompt");