From e9407246d70771b7ed2d22098f9332f6071feeb6 Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Sat, 30 Mar 2024 05:22:28 -0700
Subject: [PATCH] update note about WIP status on tridents/xbows

---
 .../gmail/nossr50/commands/skills/CrossbowsCommand.java  | 5 ++---
 .../com/gmail/nossr50/commands/skills/SkillCommand.java  | 6 ------
 .../gmail/nossr50/commands/skills/TridentsCommand.java   | 9 +--------
 src/main/resources/locale/locale_en_US.properties        | 2 ++
 4 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/commands/skills/CrossbowsCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/CrossbowsCommand.java
index 3b3ff230b..6ef04eaae 100644
--- a/src/main/java/com/gmail/nossr50/commands/skills/CrossbowsCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/CrossbowsCommand.java
@@ -47,9 +47,6 @@ public class CrossbowsCommand extends SkillCommand {
             return messages;
         }
 
-        messages.add(ChatColor.DARK_AQUA + "Reminder: " + ChatColor.GOLD + "This is a BETA version of mcMMO, please report any bugs you find!");
-        messages.add(ChatColor.GOLD + "Crossbows is a " + ChatColor.RED + "WIP" +ChatColor.GOLD + " skill that is still being developed, please leave feedback in our discord!");
-
         if (canPoweredShot) {
             messages.add(getStatMessage(ARCHERY_SKILL_SHOT, percent.format(mmoPlayer.getCrossbowsManager().getDamageBonusPercent(player))));
         }
@@ -64,6 +61,8 @@ public class CrossbowsCommand extends SkillCommand {
                     String.valueOf(CombatUtils.getLimitBreakDamageAgainstQuality(player, CROSSBOWS_CROSSBOWS_LIMIT_BREAK, 1000))));
         }
 
+        messages.add(ChatColor.GRAY + "The Crossbows skill is a work in progress and is still being developed, feedback would be appreciated in the mcMMO discord server.");
+
         return messages;
     }
 
diff --git a/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java
index d48a6608d..61b2f7ae4 100644
--- a/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java
@@ -62,12 +62,6 @@ public abstract class SkillCommand implements TabExecutor {
             return true;
         }
 
-        // Tridents skill is not ready yet
-        if (skill == PrimarySkillType.TRIDENTS) {
-            sender.sendMessage(ChatColor.RED + "Tridents will come in a future version!");
-            return true;
-        }
-
         if (args.length == 0) {
             boolean isLucky = Permissions.lucky(player, skill);
             boolean hasEndurance = PerksUtils.handleActivationPerks(player, 0, 0) != 0;
diff --git a/src/main/java/com/gmail/nossr50/commands/skills/TridentsCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/TridentsCommand.java
index 7ff5cc5bb..ff4165659 100644
--- a/src/main/java/com/gmail/nossr50/commands/skills/TridentsCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/TridentsCommand.java
@@ -37,14 +37,6 @@ public class TridentsCommand extends SkillCommand {
             return messages;
         }
 
-        messages.add(ChatColor.DARK_AQUA + "Reminder: " + ChatColor.GOLD + "This is a BETA version of mcMMO, please report any bugs you find!");
-        messages.add(ChatColor.GOLD + "Tridents is a " + ChatColor.RED + "WIP" +ChatColor.GOLD + " skill that is still being developed, please leave feedback in our discord!");
-
-//        if (SkillUtils.canUseSubskill(player, TRIDENTS_SUPER)) {
-//            messages.add("Tridents Super Ability");
-//            //TODO: Implement Tridents Super
-//        }
-
         if(SkillUtils.canUseSubskill(player, TRIDENTS_TRIDENTS_LIMIT_BREAK)) {
             messages.add(getStatMessage(TRIDENTS_TRIDENTS_LIMIT_BREAK,
                     String.valueOf(CombatUtils.getLimitBreakDamageAgainstQuality(player, TRIDENTS_TRIDENTS_LIMIT_BREAK, 1000))));
@@ -55,6 +47,7 @@ public class TridentsCommand extends SkillCommand {
                     String.valueOf(mmoPlayer.getTridentsManager().impaleDamageBonus())));
         }
 
+        messages.add(ChatColor.GRAY + "The Tridents skill is a work in progress and is still being developed, feedback would be appreciated in the mcMMO discord server.");
         return messages;
     }
 
diff --git a/src/main/resources/locale/locale_en_US.properties b/src/main/resources/locale/locale_en_US.properties
index 9223462fd..84316e4c5 100644
--- a/src/main/resources/locale/locale_en_US.properties
+++ b/src/main/resources/locale/locale_en_US.properties
@@ -440,6 +440,7 @@ Crossbows.SubSkill.TrickShot.Description=Richochet arrows with steep angles
 Crossbows.SubSkill.TrickShot.Stat=Trick Shot Max Bounces
 Crossbows.SubSkill.TrickShot.Stat.Extra=Trick Shot Max Bounces: &a{0}
 Crossbows.SubSkill.TrickShot.Stat.Extra2=Trick Shot Reduced DMG per Bounce: &a{0}
+Crossbows.SubSkill.SuperShotgun.Name=Super Shotgun
 Crossbows.Listener=Crossbows:
 
 #TRIDENTS
@@ -452,6 +453,7 @@ Tridents.SubSkill.Impale.Stat=Impale Bonus Damage
 Tridents.SubSkill.TridentsLimitBreak.Name=Tridents Limit Break
 Tridents.SubSkill.TridentsLimitBreak.Description=Breaking your limits. Increased damage against tough opponents. Intended for PVP, up to server settings for whether it will boost damage in PVE.
 Tridents.SubSkill.TridentsLimitBreak.Stat=Limit Break Max DMG
+Tridents.SubSkill.TridentAbility.Name=WIP
 Tridents.Listener=Tridents:
 
 #MACES