diff --git a/core/src/main/assets/messages/actors/actors.properties b/core/src/main/assets/messages/actors/actors.properties index aa9504e96..426d865e1 100644 --- a/core/src/main/assets/messages/actors/actors.properties +++ b/core/src/main/assets/messages/actors/actors.properties @@ -592,7 +592,7 @@ actors.hero.herosubclass.monk_desc=The Monk is a master of physical technique. A ##talents actors.hero.talent$followupstriketracker.name=followup strike -actors.hero.talent$followupstriketracker.desc=The Huntress has recently attacked with a thrown weapon, her next melee attack against the same target will have boosted damage.\n\nTurns remaining: %s. +actors.hero.talent$followupstriketracker.desc=The Huntress has recently attacked an enemy with a thrown weapon, her next melee attack against the same target will have boosted damage.\n\nTurns remaining: %s. actors.hero.talent$patientstriketracker.name=patient strike actors.hero.talent$patientstriketracker.desc=The Duelist has just spent a turn waiting, her next melee attack will deal bonus damage. actors.hero.talent$improvisedprojectilecooldown.name=improvised projectiles cooldown diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java index 7a46c75d4..efcba935e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Talent.java @@ -679,7 +679,7 @@ public enum Talent { Buff.affect(enemy, SuckerPunchTracker.class); } - if (hero.hasTalent(Talent.FOLLOWUP_STRIKE)) { + if (hero.hasTalent(Talent.FOLLOWUP_STRIKE) && enemy.alignment == Char.Alignment.ENEMY) { if (hero.belongings.attackingWeapon() instanceof MissileWeapon) { Buff.prolong(hero, FollowupStrikeTracker.class, 5f).object = enemy.id(); } else if (hero.buff(FollowupStrikeTracker.class) != null @@ -704,7 +704,7 @@ public enum Talent { } } - if (hero.hasTalent(DEADLY_FOLLOWUP)) { + if (hero.hasTalent(DEADLY_FOLLOWUP) && enemy.alignment == Char.Alignment.ENEMY) { if (hero.belongings.attackingWeapon() instanceof MissileWeapon) { if (!(hero.belongings.attackingWeapon() instanceof SpiritBow.SpiritArrow)) { Buff.prolong(hero, DeadlyFollowupTracker.class, 5f).object = enemy.id();