From 42312349e1a7ed65d40113851b1e1ac186ed0368 Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Mon, 21 Jan 2019 10:56:28 -0800
Subject: [PATCH] Fixing styling on Herbalism

---
 .../commands/skills/HerbalismCommand.java     | 22 +++++++++++++------
 .../resources/locale/locale_en_US.properties  | 13 ++++++-----
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java
index 3fa8de5a8..89e41bdc8 100644
--- a/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java
@@ -135,31 +135,39 @@ public class HerbalismCommand extends SkillCommand {
         List<String> messages = new ArrayList<String>();
 
         if (canGreenTerra) {
-            messages.add(LocaleLoader.getString("Herbalism.Ability.GTe.Length", greenTerraLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", greenTerraLengthEndurance) : ""));
+            messages.add(getStatMessage(SubSkillType.HERBALISM_GREEN_TERRA, greenTerraLength)
+                    + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", greenTerraLengthEndurance) : ""));
+
+            //messages.add(LocaleLoader.getString("Herbalism.Ability.GTe.Length", greenTerraLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", greenTerraLengthEndurance) : ""));
         }
 
         if (canGreenThumbBlocks || canGreenThumbPlants) {
-            messages.add(LocaleLoader.getString("Herbalism.Ability.GTh.Chance", greenThumbChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", greenThumbChanceLucky) : ""));
+            messages.add(getStatMessage(SubSkillType.HERBALISM_GREEN_THUMB, greenThumbChance)
+                    + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", greenThumbChanceLucky) : ""));
+            //messages.add(LocaleLoader.getString("Herbalism.Ability.GTh.Chance", greenThumbChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", greenThumbChanceLucky) : ""));
         }
 
         if (canGreenThumbPlants) {
-            messages.add(LocaleLoader.getString("Herbalism.Ability.GTh.Stage", greenThumbStage));
+            messages.add(getStatMessage(true, true,SubSkillType.HERBALISM_GREEN_THUMB, String.valueOf(greenThumbStage)));
         }
 
         if (canFarmersDiet) {
-            messages.add(LocaleLoader.getString("Herbalism.Ability.FD", farmersDietRank));
+            messages.add(getStatMessage(false, true, SubSkillType.HERBALISM_FARMERS_DIET, String.valueOf(farmersDietRank)));
         }
 
         if (hasHylianLuck) {
-            messages.add(LocaleLoader.getString("Herbalism.Ability.HylianLuck", hylianLuckChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", hylianLuckChanceLucky) : ""));
+            messages.add(getStatMessage(SubSkillType.HERBALISM_HYLIAN_LUCK, hylianLuckChance)
+                    + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", hylianLuckChanceLucky) : ""));
         }
 
         if (canShroomThumb) {
-            messages.add(LocaleLoader.getString("Herbalism.Ability.ShroomThumb.Chance", shroomThumbChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", shroomThumbChanceLucky) : ""));
+            messages.add(getStatMessage(SubSkillType.HERBALISM_SHROOM_THUMB, shroomThumbChance)
+                    + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", shroomThumbChanceLucky) : ""));
         }
 
         if (canDoubleDrop) {
-            messages.add(LocaleLoader.getString("Herbalism.Ability.DoubleDropChance", doubleDropChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", doubleDropChanceLucky) : ""));
+            messages.add(getStatMessage(SubSkillType.HERBALISM_DOUBLE_DROPS, doubleDropChance)
+                    + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", doubleDropChanceLucky) : ""));
         }
 
         return messages;
diff --git a/src/main/resources/locale/locale_en_US.properties b/src/main/resources/locale/locale_en_US.properties
index 5eda44a1f..44a48e753 100644
--- a/src/main/resources/locale/locale_en_US.properties
+++ b/src/main/resources/locale/locale_en_US.properties
@@ -245,33 +245,34 @@ Fishing.Ability.TH.Boom=[[GRAY]]BOOM TIME!!!
 Fishing.Ability.TH.Poison=[[GRAY]]Something doesn't smell quite right...
 Fishing.SkillName=FISHING
 #HERBALISM
-Herbalism.Ability.DoubleDropChance=Double Drop Chance: [[YELLOW]]{0}
-Herbalism.Ability.FD=Farmer''s Diet: [[YELLOW]]Rank {0}
 Herbalism.Ability.GTe.Length=Green Terra Length: [[YELLOW]]{0}s
 Herbalism.Ability.GTe.NeedMore=You need more seeds to spread Green Terra.
-Herbalism.Ability.GTh.Chance=Green Thumb Chance: [[YELLOW]]{0}
 Herbalism.Ability.GTh.Fail=**GREEN THUMB FAIL**
-Herbalism.Ability.GTh.Stage=Green Thumb Stage: [[YELLOW]] Crops grow in stage {0}
 Herbalism.Ability.GTh=[[GREEN]]**GREEN THUMB**
-Herbalism.Ability.HylianLuck=Hylian Luck Chance: [[YELLOW]]{0}
 Herbalism.Ability.Lower=[[GRAY]]You lower your Hoe.
 Herbalism.Ability.Ready=[[DARK_AQUA]]You [[GOLD]]ready[[DARK_AQUA]] your Hoe.
-Herbalism.Ability.ShroomThumb.Chance=Shroom Thumb Chance: [[YELLOW]]{0}
 Herbalism.Ability.ShroomThumb.Fail=**SHROOM THUMB FAIL**
 Herbalism.SubSkill.GreenTerra.Name=Green Terra
 Herbalism.SubSkill.GreenTerra.Description=Spread the Terra, 3x Drops
+Herbalism.SubSkill.GreenTerra.Stat=Green Terra Duration
 Herbalism.SubSkill.GreenThumb.Name=Green Thumb
 Herbalism.SubSkill.GreenThumb.Description=Auto-Plants crops when harvesting
+Herbalism.SubSkill.GreenThumb.Stat=Green Thumb Chance
+Herbalism.SubSkill.GreenThumb.Stat.Extra=Green Thumb Stage: [[GREEN]] Crops grow in stage {0}
 Herbalism.Effect.4=Green Thumb (Blocks)
 Herbalism.SubSkill.GreenThumb.Description.2=Make bricks mossy, or make grass grow
 Herbalism.SubSkill.FarmersDiet.Name=Farmer's Diet
 Herbalism.SubSkill.FarmersDiet.Description=Improves hunger restored from farmed foods
+Herbalism.SubSkill.FarmersDiet.Stat=Farmer's Diet: [[GREEN]]Rank {0}
 Herbalism.SubSkill.DoubleDrops.Name=Double Drops
 Herbalism.SubSkill.DoubleDrops.Description=Double the normal loot
+Herbalism.SubSkill.DoubleDrops.Stat=Double Drop Chance
 Herbalism.SubSkill.HylianLuck.Name=Hylian Luck
 Herbalism.SubSkill.HylianLuck.Description=Gives a small chance of finding rare items
+Herbalism.SubSkill.HylianLuck.Stat=Hylian Luck Chance
 Herbalism.SubSkill.ShroomThumb.Name=Shroom Thumb
 Herbalism.SubSkill.ShroomThumb.Description=Spread mycelium to dirt & grass
+Herbalism.SubSkill.ShroomThumb.Stat=Shroom Thumb Chance
 Herbalism.HylianLuck=[[GREEN]]The luck of Hyrule is with you today!
 Herbalism.Listener=Herbalism:
 Herbalism.SkillName=HERBALISM