From a58a3d91dce388387fa1e8b8a8d7068c73928846 Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Fri, 2 Apr 2021 12:13:54 -0700
Subject: [PATCH] tweak locale / command output

---
 Changelog.txt                                            | 2 ++
 .../com/gmail/nossr50/commands/skills/SwordsCommand.java | 9 ++++-----
 src/main/resources/locale/locale_en_US.properties        | 6 ++++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Changelog.txt b/Changelog.txt
index 89fef502a..46a178ee0 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -7,6 +7,8 @@ Version 2.1.186
     Updated locale string 'Swords.SubSkill.Rupture.Description'
     Updated locale string 'Swords.SubSkill.Rupture.Stat.Extra'
     Updated locale string 'Swords.Combat.Rupture.Note'
+    Added locale string 'Swords.SubSkill.Rupture.Stat.TickDamage'
+    Added locale string 'Swords.SubSkill.Rupture.Stat.ExplosionDamage'
     Added 'Skills.Swords.Rupture.Rupture_Mechanics.Chance_To_Apply_On_Hit' to advanced.yml
     Added 'Skills.Swords.Rupture.Rupture_Mechanics.Duration_In_Seconds.Against_Players' to advanced.yml
     Added 'Skills.Swords.Rupture.Rupture_Mechanics.Duration_In_Seconds.Against_Mobs' to advanced.yml
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 4ca8749e6..3fbe8726f 100644
--- a/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java
@@ -89,11 +89,10 @@ public class SwordsCommand extends SkillCommand {
                     + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", ruptureChanceToApplyLucky) : ""));
             messages.add(getStatMessage(true, true, SubSkillType.SWORDS_RUPTURE,
                     ruptureLengthSecondsAgainstPlayers,
-                    ruptureLengthSecondsAgainstMobs,
-                    rupturePureTickDamageAgainstPlayers,
-                    rupturePureTickDamageAgainstMobs,
-                    ruptureExplosionDamageAgainstPlayers,
-                    ruptureExplosionDamageAgainstMobs));
+                    ruptureLengthSecondsAgainstMobs));
+
+            messages.add(LocaleLoader.getString("Swords.SubSkill.Rupture.Stat.TickDamage", rupturePureTickDamageAgainstPlayers, rupturePureTickDamageAgainstMobs));
+            messages.add(LocaleLoader.getString("Swords.SubSkill.Rupture.Stat.ExplosionDamage", ruptureExplosionDamageAgainstPlayers, ruptureExplosionDamageAgainstMobs));
 
             messages.add(LocaleLoader.getString("Swords.Combat.Rupture.Note"));
         }
diff --git a/src/main/resources/locale/locale_en_US.properties b/src/main/resources/locale/locale_en_US.properties
index 4e702d860..64aab7ea8 100644
--- a/src/main/resources/locale/locale_en_US.properties
+++ b/src/main/resources/locale/locale_en_US.properties
@@ -406,7 +406,7 @@ Anvil.Unbreakable=This item is unbreakable!
 #SWORDS
 Swords.Ability.Lower=&7You lower your sword.
 Swords.Ability.Ready=&3You &6ready&3 your Sword.
-Swords.Combat.Rupture.Note=&7NOTE: Pure tick damage is dealt twice a second during Rupture and bypasses resistances but IS never lethal, an explosion goes off after 5 seconds with is reduced by armor and other resistances.
+Swords.Combat.Rupture.Note=&7(Rupture Note): Periodic damage is dealt twice a second and bypasses armor, explosion damage does not
 Swords.Combat.Bleeding.Started=&4 You're bleeding!
 Swords.Combat.Bleeding.Stopped=&7The bleeding has &astopped&7!
 Swords.Combat.Bleeding=&a**ENEMY BLEEDING**
@@ -428,7 +428,9 @@ Swords.SubSkill.SwordsLimitBreak.Name=Swords Limit Break
 Swords.SubSkill.SwordsLimitBreak.Description=Breaking your limits. Increased damage against tough opponents. Intended for PVP, up to server settings for whether or not it will boost damage in PVE.
 Swords.SubSkill.SwordsLimitBreak.Stat=Limit Break Max DMG
 Swords.SubSkill.Rupture.Stat=Rupture Chance
-Swords.SubSkill.Rupture.Stat.Extra=Rupture: Duration in seconds: &a{0} vs Players, {1} vs Mobs. Pure Tick Damage: {2} vs Players, {3} vs Mobs. Explosion Damage: {4} vs Players, {5} vs Mobs
+Swords.SubSkill.Rupture.Stat.Extra=[[DARK_AQUA]]Rupture Duration: &e{0}&a vs Players, &e{1}&a vs Mobs.
+Swords.SubSkill.Rupture.Stat.TickDamage=[[DARK_AQUA]]Rupture Pure Tick Damage: &e{0}&a vs Players, &e{1}&a vs Mobs.
+Swords.SubSkill.Rupture.Stat.ExplosionDamage=[[DARK_AQUA]]Rupture Explosion Damage: &e{0}&a vs Players, &e{1}&a vs Mobs
 Swords.Effect.4=Serrated Strikes Rupture+
 Swords.Effect.5={0} Tick Rupture
 Swords.Listener=Swords: