diff --git a/core/src/main/assets/messages/actors/actors.properties b/core/src/main/assets/messages/actors/actors.properties index 5672c5709..c87bf8b1b 100644 --- a/core/src/main/assets/messages/actors/actors.properties +++ b/core/src/main/assets/messages/actors/actors.properties @@ -833,7 +833,7 @@ actors.hero.herosubclass.berserker_short_desc=The _Berserker_ builds rage as he actors.hero.herosubclass.berserker_desc=The Berserker gains rage as he takes physical damage, including damage that gets blocked by his armor! Rage steadily fades away over time, but fades more slowly if he is at low HP.\n\nRage can cause the Berserker to deal up to +50% damage. At max rage he can go berserk, gaining a burst of shielding and keeping his rage as long as he has shielding left. The shielding scales with the level of the berserker's armor, and can be massively boosted if he is at low health. The Berserker needs time to recover after he goes berserk. actors.hero.herosubclass.gladiator=gladiator actors.hero.herosubclass.gladiator_short_desc=The _Gladiator_ builds combo when he makes successful attacks. He can spend combo to use unique abilities. -actors.hero.herosubclass.gladiator_desc=The Gladiator builds one point of combo every time he makes a successful attack with a melee or thrown weapon. If the Gladiator does not make a successful attack within 5 turns, his combo is reset.\n\nAs he builds combo the Gladiator can use a variety of abilities that are guaranteed to hit:\n2 Combo: knock enemy back, preserves combo\n4 Combo: deal damage based on armor\n6 Combo: parry, preserves combo\n8 Combo: damage target and nearby enemies\n10 Combo: attack once for each combo +actors.hero.herosubclass.gladiator_desc=The Gladiator builds one point of combo every time he makes a successful attack with a melee or thrown weapon. If the Gladiator does not make a successful attack within 5 turns (15 turns after a kill), his combo is reset.\n\nAs he builds combo the Gladiator can use a variety of abilities that are guaranteed to hit:\n2 Combo: knock enemy back, preserves combo\n4 Combo: deal damage based on armor\n6 Combo: parry, preserves combo\n8 Combo: damage target and nearby enemies\n10 Combo: attack once for each combo actors.hero.herosubclass.battlemage=battlemage actors.hero.herosubclass.battlemage_short_desc=The _Battlemage_ conjures bonus effects when fighting in melee with his staff. These effects depend on the wand his staff is imbued with. actors.hero.herosubclass.battlemage_desc=The Battlemage gains a bonus effect whenever he strikes in melee with his staff, as if his staff had an additional enchantment. These effects depend on the wand his staff is imbued with, every wand has its own effect. In addition to the wand effects, the Battlemage's staff will also gain 0.5 charges when he strikes with it. @@ -934,7 +934,7 @@ actors.hero.talent.enraged_catalyst.title=enraged catalyst actors.hero.talent.enraged_catalyst.desc=_+1:_ Enchantments and curses on the Berserker's weapon trigger more often the more rage he has, to a maximum of _15% more often_ at 100% rage.\n\n_+2:_ Enchantments and curses on the Berserker's weapon trigger more often the more rage he has, to a maximum of _30% more often_ at 100% rage.\n\n_+3:_ Enchantments and curses on the Berserker's weapon trigger more often the more rage he has, to a maximum of _45% more often_ at 100% rage. actors.hero.talent.cleave.title=cleave -actors.hero.talent.cleave.desc=_+1:_ When the Gladiator kills an enemy, the combo cooldown for his next hit is increased to _15 turns_.\n\n_+2:_ When the Gladiator kills an enemy, the combo cooldown for his next hit is increased to _30 turns_.\n\n_+3:_ When the Gladiator kills an enemy, the combo cooldown for his next hit is increased to _45 turns_. +actors.hero.talent.cleave.desc=_+1:_ The extra time the Gladiator gets on a kill is increased to _30 turns_, from 15.\n\n_+2:_ The extra time the Gladiator gets on a kill is increased to _45 turns_, from 15.\n\n_+3:_ The extra time the Gladiator gets on a kill is increased to _60 turns_, from 15. actors.hero.talent.lethal_defense.title=lethal defense actors.hero.talent.lethal_defense.desc=_+1:_ When the Gladiator kills an enemy with a combo move, the cooldown on his broken seal shielding is _reduced by 33%_.\n\n_+2:_ When the Gladiator kills an enemy with a combo move, the cooldown on his broken seal shielding is _reduced by 67%_.\n\n_+3:_ When the Gladiator kills an enemy with a combo move, the cooldown on his broken seal shielding is _reduced by 100%_.\n\nThe shield cooldown can be reduced to as low as -100% by this talent, which means it will immediately be available again once it is activated. actors.hero.talent.enhanced_combo.title=enhanced combo diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java index 079f79761..0d1480f2f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java @@ -93,7 +93,7 @@ public class Combo extends Buff implements ActionIndicator.Action { comboTime = 5f; if (!enemy.isAlive() || (enemy.buff(Corruption.class) != null && enemy.HP == enemy.HT)){ - comboTime = Math.max(comboTime, 15*((Hero)target).pointsInTalent(Talent.CLEAVE)); + comboTime = 15f + 15f*((Hero)target).pointsInTalent(Talent.CLEAVE); } initialComboTime = comboTime;