From 91298de6e93d708bb3a240fa097eb6940dc157df Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Tue, 19 Apr 2016 19:55:40 -0400 Subject: [PATCH] v0.3.5: gladiator polish --- .../actors/buffs/Combo.java | 16 ++++++++++++---- .../messages/actors/actors.properties | 13 +++++++------ 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java index 1cc0aeafe..bbf62f8b7 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java @@ -104,7 +104,15 @@ public class Combo extends Buff implements ActionIndicator.Action { @Override public String desc() { - return Messages.get(this, "desc"); + String desc = Messages.get(this, "desc"); + + if (count >= 10) desc += "\n\n" + Messages.get(this, "fury_desc"); + else if (count >= 8)desc += "\n\n" + Messages.get(this, "crush_desc"); + else if (count >= 6)desc += "\n\n" + Messages.get(this, "slam_desc"); + else if (count >= 4)desc += "\n\n" + Messages.get(this, "cleave_desc"); + else if (count >= 2)desc += "\n\n" + Messages.get(this, "clobber_desc"); + + return desc; } private static final String COUNT = "count"; @@ -167,7 +175,7 @@ public class Combo extends Buff implements ActionIndicator.Action { if (enemy == null || userPos == cell || (Dungeon.hero.belongings.weapon != null ? Level.distance( userPos, enemy.pos ) > Dungeon.hero.belongings.weapon.reachFactor(Dungeon.hero) : !Level.adjacent( userPos, enemy.pos ))){ - GLog.w( "TODO" ); + GLog.w( Messages.get(Combo.class, "bad_target") ); } else { target.sprite.attack(cell, new Callback() { @Override @@ -206,10 +214,10 @@ public class Combo extends Buff implements ActionIndicator.Action { int dmgReroll = target.damageRoll(); if (dmgReroll > dmg) dmg = dmgReroll; } - dmg *= 2; + dmg = Math.round(dmg*2.5f); break; case FURY: - dmg = Math.round(dmg*.35f); + dmg = Math.round(dmg*.4f); break; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors.properties b/src/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors.properties index 00a6966c8..0801b3a4e 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors.properties +++ b/src/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors.properties @@ -76,17 +76,18 @@ actors.buffs.chill.desc=Not quite frozen, but still much too cold.\n\nChilled ta actors.buffs.combo.name=Combo actors.buffs.combo.combo=%d hit combo! +actors.butts.combo.bad_target=You must target an enemy in attack range. actors.buffs.combo.clobber_prompt=Select a target to Clobber\nStuns and knocks back -actors.buffs.combo.= +actors.buffs.combo.clobber_desc=_Clobber_ is currently available. This attack _knocks an enemy back and stuns them,_ but deals reduced damage. It's excellent for buying a little time during a fight. actors.buffs.combo.cleave_prompt=Select a target to Cleave\nIf it kills, preserves combo -actors.buffs.combo.= +actors.buffs.combo.cleave_desc=_Cleave_ is currently available. This attack deals increased damage, and _if it kills an enemy, it will increase combo instead of resetting it._ It's great for building combo when fighting multiple enemies. actors.buffs.combo.slam_prompt=Select a target to Slam\nShields you based on damage -actors.buffs.combo.= +actors.buffs.combo.slam_desc=_Slam_ is currently available. This attack deals increased damage, and _grants you shielding_ proportional to the damage you deal. It's great for finishing a fight, letting you carry over endurance to the next one. actors.buffs.combo.crush_prompt=Select a target to Crush\nDeals lots of damage -actors.buffs.combo.= +actors.buffs.combo.crush_desc=_Crush_ is currently available. This devastating attack _deals massive damage very consistently._ It's great for taking down a powerful opponent from high health! actors.buffs.combo.fury_prompt=Unload fury on which enemy?\nAttacks many times rapidly -actors.buffs.combo.= -actors.buffs.combo.desc=TODO +actors.buffs.combo.fury_desc=_Fury_ is currently available. This devastating attack _hits as many times as your current combo count,_ albeit at reduced damage. Fury is great if you have a weapon enchant, as the enchant will activate on each hit! +actors.buffs.combo.desc=The gladiator builds momentum as they land successful blows. Each blow increases the combo counter by one, but taking too long to attack, missing more than once, or using items will reset the combo counter to 0.\n\nBuilding combo unlocks special finisher abilities: powerful attacks that cannot miss! A different finisher is available at 2, 4, 6, 8, and 10 combo count, and using a finisher will reset your combo. actors.buffs.corruption.name=Corrupted actors.buffs.corruption.desc=Corruption seeps into the essence of a being, twisting them against their former nature.\n\nCorrupted creatures will attack and aggravate their allies, and ignore their former enemies. Corruption is damaging as well, and will slowly cause its target to succumb.\n\nCorruption is permanent, its effects only end in death.