From 661cf15be151fe616ba4be5d239dc42b30ebb7a9 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Mon, 21 Jan 2019 12:54:37 -0800 Subject: [PATCH] Fixing styling on Unarmed --- .../nossr50/commands/skills/SwordsCommand.java | 7 +------ .../nossr50/commands/skills/UnarmedCommand.java | 16 ++++++++++++---- .../resources/locale/locale_en_US.properties | 8 ++++---- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java index 8ad257855..ed3cc6a87 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java @@ -91,24 +91,19 @@ public class SwordsCommand extends SkillCommand { if (canCounter) { messages.add(getStatMessage(SubSkillType.SWORDS_COUNTER_ATTACK, counterChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", counterChanceLucky) : "")); - - //messages.add(LocaleLoader.getString("Swords.Combat.Counter.Chance", counterChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", counterChanceLucky) : "")); } if (canBleed) { messages.add(getStatMessage(SubSkillType.SWORDS_BLEED, bleedChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", bleedChanceLucky) : "")); messages.add(getStatMessage(true, true, SubSkillType.SWORDS_BLEED, String.valueOf(bleedLength))); - //messages.add(LocaleLoader.getString("Swords.Combat.Bleed.Length", bleedLength)); + messages.add(LocaleLoader.getString("Swords.Combat.Bleed.Note")); - //messages.add(LocaleLoader.getString("Swords.Combat.Bleed.Chance", bleedChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", bleedChanceLucky) : "")); } if (canSerratedStrike) { messages.add(getStatMessage(SubSkillType.SWORDS_SERRATED_STRIKES, serratedStrikesLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", serratedStrikesLengthEndurance) : "")); - - //messages.add(LocaleLoader.getString("Swords.SS.Length", serratedStrikesLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", serratedStrikesLengthEndurance) : "")); } return messages; diff --git a/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java index 72f67f7d0..99a3a9dde 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java @@ -117,19 +117,27 @@ public class UnarmedCommand extends SkillCommand { } if (canDeflect) { - messages.add(LocaleLoader.getString("Unarmed.Ability.Chance.ArrowDeflect", deflectChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", deflectChanceLucky) : "")); + messages.add(getStatMessage(SubSkillType.UNARMED_ARROW_DEFLECT, deflectChance) + + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", deflectChanceLucky) : "")); + //messages.add(LocaleLoader.getString("Unarmed.Ability.Chance.ArrowDeflect", deflectChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", deflectChanceLucky) : "")); } if (canDisarm) { - messages.add(LocaleLoader.getString("Unarmed.Ability.Chance.Disarm", disarmChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", disarmChanceLucky) : "")); + messages.add(getStatMessage(SubSkillType.UNARMED_DISARM, disarmChance) + + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", disarmChanceLucky) : "")); + //messages.add(LocaleLoader.getString("Unarmed.Ability.Chance.Disarm", disarmChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", disarmChanceLucky) : "")); } if (canIronGrip) { - messages.add(LocaleLoader.getString("Unarmed.Ability.Chance.IronGrip", ironGripChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", ironGripChanceLucky) : "")); + messages.add(getStatMessage(SubSkillType.UNARMED_IRON_GRIP, ironGripChance) + + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", ironGripChanceLucky) : "")); + //messages.add(LocaleLoader.getString("Unarmed.Ability.Chance.IronGrip", ironGripChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", ironGripChanceLucky) : "")); } if (canBerserk) { - messages.add(LocaleLoader.getString("Unarmed.Ability.Berserk.Length", berserkLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", berserkLengthEndurance) : "")); + messages.add(getStatMessage(SubSkillType.UNARMED_BERSERK, berserkLength) + + (isLucky ? LocaleLoader.getString("Perks.ActivationTime.Bonus", berserkLengthEndurance) : "")); + //messages.add(LocaleLoader.getString("Unarmed.Ability.Berserk.Length", berserkLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", berserkLengthEndurance) : "")); } return messages; diff --git a/src/main/resources/locale/locale_en_US.properties b/src/main/resources/locale/locale_en_US.properties index 1514d20e1..b9745bb94 100644 --- a/src/main/resources/locale/locale_en_US.properties +++ b/src/main/resources/locale/locale_en_US.properties @@ -463,26 +463,26 @@ Taming.Summon.Fail.Horse=You have too many horses nearby to summon any more. Taming.Summon.Fail.TooMany=You have reached the maximum limit of pets to summon. [[YELLOW]]({0}) Taming.Summon.Name.Format={0}''s {1} #UNARMED -Unarmed.Ability.Berserk.Length=Berserk Length: [[YELLOW]]{0}s Unarmed.Ability.Bonus.0=Iron Arm Style Unarmed.Ability.Bonus.1=+{0} DMG Upgrade -Unarmed.Ability.Chance.ArrowDeflect=Arrow Deflect Chance: [[YELLOW]]{0} -Unarmed.Ability.Chance.Disarm=Disarm Chance: [[YELLOW]]{0} -Unarmed.Ability.Chance.IronGrip=Iron Grip Chance: [[YELLOW]]{0} Unarmed.Ability.IronGrip.Attacker=Your opponent has an iron grip! Unarmed.Ability.IronGrip.Defender=[[GREEN]]Your iron grip kept you from being disarmed! Unarmed.Ability.Lower=[[GRAY]]You lower your fists. Unarmed.Ability.Ready=[[DARK_AQUA]]You [[GOLD]]ready[[DARK_AQUA]] your Fists. Unarmed.SubSkill.Berserk.Name=Berserk Unarmed.SubSkill.Berserk.Description=+50% DMG, Breaks weak materials +Unarmed.SubSkill.Berserk.Stat=Berserk Length Unarmed.SubSkill.Disarm.Name=Disarm Unarmed.SubSkill.Disarm.Description=Drops the foes item held in hand +Unarmed.SubSkill.Disarm.Stat=Disarm Chance Unarmed.SubSkill.IronArmStyle.Name=Iron Arm Style Unarmed.SubSkill.IronArmStyle.Description=Hardens your arm over time Unarmed.SubSkill.ArrowDeflect.Name=Arrow Deflect Unarmed.SubSkill.ArrowDeflect.Description=Deflect arrows +Unarmed.SubSkill.ArrowDeflect.Stat=Arrow Deflect Chance Unarmed.SubSkill.IronGrip.Name=Iron Grip Unarmed.SubSkill.IronGrip.Description=Prevents you from being disarmed +Unarmed.SubSkill.IronGrip.Stat=Iron Grip Chance Unarmed.SubSkill.BlockCracker.Name=Block Cracker Unarmed.SubSkill.BlockCracker.Description=Break rock with your fists Unarmed.Listener=Unarmed: