From c758346c3fd529c766ad8b730f94e06c16c2538f Mon Sep 17 00:00:00 2001 From: Oaksworth <46974852+Oaksworth@users.noreply.github.com> Date: Wed, 23 Jan 2019 19:04:13 -0200 Subject: [PATCH] Update Axes to alphabetical order --- .../nossr50/commands/skills/AxesCommand.java | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 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 7316d23df..981d9f926 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java @@ -38,23 +38,23 @@ public class AxesCommand extends SkillCommand { impactDamage = 1 + (skillValue / Axes.impactIncreaseLevel); } - // SKULL SPLITTER - if (canSkullSplitter) { - String[] skullSplitterStrings = calculateLengthDisplayValues(player, skillValue); - skullSplitterLength = skullSplitterStrings[0]; - skullSplitterLengthEndurance = skullSplitterStrings[1]; + // AXE MASTERY + if (canAxeMastery) { + axeMasteryDamage = Axes.getAxeMasteryBonusDamage(player); } - + // CRITICAL HIT if (canCritical) { String[] criticalHitStrings = calculateAbilityDisplayValues(skillValue, SubSkillType.AXES_CRITICAL_STRIKES, isLucky); critChance = criticalHitStrings[0]; critChanceLucky = criticalHitStrings[1]; } - - // AXE MASTERY - if (canAxeMastery) { - axeMasteryDamage = Axes.getAxeMasteryBonusDamage(player); + + // SKULL SPLITTER + if (canSkullSplitter) { + String[] skullSplitterStrings = calculateLengthDisplayValues(player, skillValue); + skullSplitterLength = skullSplitterStrings[0]; + skullSplitterLengthEndurance = skullSplitterStrings[1]; } } @@ -71,22 +71,22 @@ public class AxesCommand extends SkillCommand { protected List statsDisplay(Player player, float skillValue, boolean hasEndurance, boolean isLucky) { List messages = new ArrayList(); - if (canAxeMastery) { - messages.add(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Axes.Ability.Bonus.0"), LocaleLoader.getString("Axes.Ability.Bonus.1", axeMasteryDamage))); - } - if (canImpact) { messages.add(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Axes.Ability.Bonus.2"), LocaleLoader.getString("Axes.Ability.Bonus.3", impactDamage))); } - - if (canGreaterImpact) { - messages.add(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Axes.Ability.Bonus.4"), LocaleLoader.getString("Axes.Ability.Bonus.5", Axes.greaterImpactBonusDamage))); + + if (canAxeMastery) { + messages.add(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Axes.Ability.Bonus.0"), LocaleLoader.getString("Axes.Ability.Bonus.1", axeMasteryDamage))); } if (canCritical) { messages.add(getStatMessage(SubSkillType.AXES_CRITICAL_STRIKES, critChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", critChanceLucky) : "")); } + + if (canGreaterImpact) { + messages.add(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Axes.Ability.Bonus.4"), LocaleLoader.getString("Axes.Ability.Bonus.5", Axes.greaterImpactBonusDamage))); + } if (canSkullSplitter) { messages.add(getStatMessage(SubSkillType.AXES_SKULL_SPLITTER, skullSplitterLength)