diff --git a/core/src/main/assets/interfaces/talent_icons.png b/core/src/main/assets/interfaces/talent_icons.png index fb7ed0018..7fe5af5e9 100644 Binary files a/core/src/main/assets/interfaces/talent_icons.png and b/core/src/main/assets/interfaces/talent_icons.png differ diff --git a/core/src/main/assets/messages/actors/actors.properties b/core/src/main/assets/messages/actors/actors.properties index 218346c3a..c85662bae 100644 --- a/core/src/main/assets/messages/actors/actors.properties +++ b/core/src/main/assets/messages/actors/actors.properties @@ -913,9 +913,9 @@ actors.hero.talent.directed_power.desc=_+1:_ The direct attack from elemental st actors.hero.talent.feigned_retreat.title=feigned retreat actors.hero.talent.feigned_retreat.desc=_+1:_ If an enemy attacks the Duelist's afterimage, she gains _2 turns_ of haste.\n\n_+2:_ If an enemy attacks the Duelist's afterimage, she gains _4 turns_ of haste.\n\n_+3:_ If an enemy attacks the Duelist's afterimage, she gains _6 turns_ of haste.\n\n_+4:_ If an enemy attacks the Duelist's afterimage, she gains _8 turns_ of haste. actors.hero.talent.expose_weakness.title=expose weakness -actors.hero.talent.expose_weakness.desc=_+1:_ Enemies that attack the Duelist's afterimage become vulnerable for _1 turn_.\n\n_+2:_ Enemies that attack the Duelist's afterimage become vulnerable for _2 turns_.\n\n_+3:_ Enemies that attack the Duelist's afterimage become vulnerable for _3 turns_.\n\n_+1:_ Enemies that attack the Duelist's afterimage become vulnerable for _4 turns_. -actors.hero.talent.lasting_image.title=TODO -actors.hero.talent.lasting_image.desc=specific mechanics TBD +actors.hero.talent.expose_weakness.desc=_+1:_ Enemies that attack the Duelist's afterimage become vulnerable for _1 turn_.\n\n_+2:_ Enemies that attack the Duelist's afterimage become vulnerable for _2 turns_.\n\n_+3:_ Enemies that attack the Duelist's afterimage become vulnerable for _3 turns_.\n\n_+4:_ Enemies that attack the Duelist's afterimage become vulnerable for _4 turns_. +actors.hero.talent.counter_ability.title=counter ability +actors.hero.talent.counter_ability.desc=_+1:_ If the Duelist uses a weapon ability within 3 turns of her afterimage being attacked, it will consume _0.5 fewer charges_.\n\n_+2:_ If the Duelist uses a weapon ability within 3 turns of her afterimage being attacked, it will consume _1 fewer charge_.\n\n_+3:_ If the Duelist uses a weapon ability within 3 turns of her afterimage being attacked, it will consume _1.5 fewer charges_.\n\n_+4:_ If the Duelist uses a weapon ability within 3 turns of her afterimage being attacked, it will consume _2 fewer charges_. #universal actors.hero.talent.heroic_energy.title=heroic energy 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 99ea72cd3..2fafdeb80 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 @@ -165,7 +165,7 @@ public enum Talent { //Elemental Strike T4 ELEMENTAL_REACH(148, 4), STRIKING_FORCE(149, 4), DIRECTED_POWER(150, 4), //Duelist A3 T4 - FEIGNED_RETREAT(151, 4), EXPOSE_WEAKNESS(152, 4), LASTING_IMAGE(153, 4), + FEIGNED_RETREAT(151, 4), EXPOSE_WEAKNESS(152, 4), COUNTER_ABILITY(153, 4), //universal T4 HEROIC_ENERGY(26, 4), //See icon() and title() for special logic for this one diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/duelist/Feint.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/duelist/Feint.java index 2d1ed0dc9..8b81afc17 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/duelist/Feint.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/duelist/Feint.java @@ -51,7 +51,7 @@ import com.watabou.utils.Callback; public class Feint extends ArmorAbility { { - baseChargeUse = 0; + baseChargeUse = 50; } @Override @@ -136,7 +136,7 @@ public class Feint extends ArmorAbility { @Override public Talent[] talents() { - return new Talent[]{Talent.FEIGNED_RETREAT, Talent.EXPOSE_WEAKNESS, Talent.LASTING_IMAGE, Talent.HEROIC_ENERGY}; + return new Talent[]{Talent.FEIGNED_RETREAT, Talent.EXPOSE_WEAKNESS, Talent.COUNTER_ABILITY, Talent.HEROIC_ENERGY}; } public static class AfterImage extends Mob {