From 6d720e6ab16a279dcdc9c51c684379c9e232b67a Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Mon, 21 Jan 2019 13:11:42 -0800
Subject: [PATCH] Fixing styling on Woodcutting

---
 .../com/gmail/nossr50/commands/skills/MiningCommand.java    | 2 +-
 .../com/gmail/nossr50/commands/skills/UnarmedCommand.java   | 2 +-
 .../gmail/nossr50/commands/skills/WoodcuttingCommand.java   | 6 ++++--
 src/main/resources/locale/locale_en_US.properties           | 5 ++---
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java
index 075872ad2..3011f3600 100644
--- a/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java
@@ -115,7 +115,7 @@ public class MiningCommand extends SkillCommand {
 
         if (canSuperBreaker) {
             messages.add(getStatMessage(SubSkillType.MINING_SUPER_BREAKER, superBreakerLength)
-                    + (isLucky ? LocaleLoader.getString("Perks.ActivationTime.Bonus", superBreakerLengthEndurance) : ""));
+                    + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", superBreakerLengthEndurance) : ""));
             //messages.add(LocaleLoader.getString("Mining.Ability.Length", superBreakerLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", superBreakerLengthEndurance) : ""));
         }
 
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 99a3a9dde..01c75ad85 100644
--- a/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java
@@ -136,7 +136,7 @@ public class UnarmedCommand extends SkillCommand {
 
         if (canBerserk) {
             messages.add(getStatMessage(SubSkillType.UNARMED_BERSERK, berserkLength)
-                    + (isLucky ? LocaleLoader.getString("Perks.ActivationTime.Bonus", berserkLengthEndurance) : ""));
+                    + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", berserkLengthEndurance) : ""));
             //messages.add(LocaleLoader.getString("Unarmed.Ability.Berserk.Length", berserkLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", berserkLengthEndurance) : ""));
         }
 
diff --git a/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java
index 8698a6824..7685059c0 100644
--- a/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java
@@ -102,11 +102,13 @@ public class WoodcuttingCommand extends SkillCommand {
         }
 
         if (canDoubleDrop) {
-            messages.add(LocaleLoader.getString("Woodcutting.Ability.Chance.DDrop", doubleDropChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", doubleDropChanceLucky) : ""));
+            messages.add(getStatMessage(SubSkillType.WOODCUTTING_HARVEST_LUMBER, doubleDropChance)
+                    + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", doubleDropChanceLucky) : ""));
         }
 
         if (canTreeFell) {
-            messages.add(LocaleLoader.getString("Woodcutting.Ability.Length", treeFellerLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", treeFellerLengthEndurance) : ""));
+            messages.add(getStatMessage(SubSkillType.WOODCUTTING_TREE_FELLER, treeFellerLength)
+                    + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", treeFellerLengthEndurance) : ""));
         }
 
         return messages;
diff --git a/src/main/resources/locale/locale_en_US.properties b/src/main/resources/locale/locale_en_US.properties
index b9745bb94..6cfd75b30 100644
--- a/src/main/resources/locale/locale_en_US.properties
+++ b/src/main/resources/locale/locale_en_US.properties
@@ -245,7 +245,6 @@ Fishing.Ability.TH.Boom=[[GRAY]]BOOM TIME!!!
 Fishing.Ability.TH.Poison=[[GRAY]]Something doesn't smell quite right...
 Fishing.SkillName=FISHING
 #HERBALISM
-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.Fail=**GREEN THUMB FAIL**
 Herbalism.Ability.GTh=[[GREEN]]**GREEN THUMB**
@@ -495,15 +494,15 @@ Unarmed.Skills.Berserk.Refresh=[[GREEN]]Your [[YELLOW]]Berserk [[GREEN]]ability
 #WOODCUTTING
 Woodcutting.Ability.0=Leaf Blower
 Woodcutting.Ability.1=Blow away leaves
-Woodcutting.Ability.Chance.DDrop=Double Drop Chance: [[YELLOW]]{0}
-Woodcutting.Ability.Length=Tree Feller Length: [[YELLOW]]{0}s
 Woodcutting.Ability.Locked.0=LOCKED UNTIL {0}+ SKILL (LEAF BLOWER)
 Woodcutting.SubSkill.TreeFeller.Name=Tree Feller
 Woodcutting.SubSkill.TreeFeller.Description=Make trees explode
+Woodcutting.SubSkill.TreeFeller.Stat=Tree Feller Length
 Woodcutting.SubSkill.LeafBlower.Name=Leaf Blower
 Woodcutting.SubSkill.LeafBlower.Description=Blow Away Leaves
 Woodcutting.SubSkill.HarvestLumber.Name=Harvest Lumber
 Woodcutting.SubSkill.HarvestLumber.Description=Skillfully extract more Lumber
+Woodcutting.SubSkill.HarvestLumber.Stat=Double Drop Chance
 Woodcutting.SubSkill.Splinter.Name=Splinter
 Woodcutting.SubSkill.Splinter.Description=Cut down trees more efficiently.
 Woodcutting.SubSkill.BarkSurgeon.Name=Bark Surgeon