From ba34442ebbc2fda04e340cbe1b792e48155d782f Mon Sep 17 00:00:00 2001 From: nossr50 Date: Mon, 21 Jan 2019 08:52:44 -0800 Subject: [PATCH] Fixing styling on Axes --- .../java/com/gmail/nossr50/commands/skills/AxesCommand.java | 6 ++++-- src/main/resources/locale/locale_en_US.properties | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java index 5cc822613..e4535c42a 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java @@ -111,11 +111,13 @@ public class AxesCommand extends SkillCommand { } if (canCritical) { - messages.add(LocaleLoader.getString("Axes.Combat.CritChance", critChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", critChanceLucky) : "")); + messages.add(getStatMessage(SubSkillType.AXES_CRITICAL_STRIKES, critChance) + + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", critChanceLucky) : "")); } if (canSkullSplitter) { - messages.add(LocaleLoader.getString("Axes.Combat.SS.Length", skullSplitterLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", skullSplitterLengthEndurance) : "")); + messages.add(getStatMessage(SubSkillType.AXES_SKULL_SPLITTER, skullSplitterLength) + + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", skullSplitterLengthEndurance) : "")); } return messages; diff --git a/src/main/resources/locale/locale_en_US.properties b/src/main/resources/locale/locale_en_US.properties index 925e2f471..c9b25513c 100644 --- a/src/main/resources/locale/locale_en_US.properties +++ b/src/main/resources/locale/locale_en_US.properties @@ -174,16 +174,16 @@ Axes.Ability.Bonus.5=Deal {0} Bonus DMG to unarmored foes Axes.Ability.Lower=[[GRAY]]You lower your Axe. Axes.Ability.Ready=[[DARK_AQUA]]You [[GOLD]]ready[[DARK_AQUA]] your Axe. Axes.Combat.CritStruck=[[DARK_RED]]You were CRITICALLY hit! -Axes.Combat.CritChance=Chance to critically strike: [[YELLOW]]{0} Axes.Combat.CriticalHit=CRITICAL HIT! Axes.Combat.GI.Proc=[[GREEN]]**STRUCK WITH GREAT FORCE** Axes.Combat.GI.Struck=**HIT BY GREATER IMPACT** Axes.Combat.SS.Struck=[[DARK_RED]]Struck by SKULL SPLITTER! -Axes.Combat.SS.Length=Skull Splitter Length: [[YELLOW]]{0}s Axes.SubSkill.SkullSplitter.Name=Skull Splitter Axes.SubSkill.SkullSplitter.Description=Deal AoE Damage +Axes.SubSkill.SkullSplitter.Stat=Skull Splitter Duration Axes.SubSkill.CriticalStrikes.Name=Critical Strikes Axes.SubSkill.CriticalStrikes.Description=Double Damage +Axes.SubSkill.CriticalStrikes.Stat=Critical Strike Chance Axes.SubSkill.AxeMastery.Name=Axe Mastery Axes.SubSkill.AxeMastery.Description=Adds bonus DMG Axes.SubSkill.ArmorImpact.Name=Armor Impact