From bad70231296b6fb9e028e93b7584618048d70acd Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Sat, 30 Sep 2023 15:43:19 -0700
Subject: [PATCH] Shake has 8 ranks again

---
 Changelog.txt                                    |  6 ++++++
 pom.xml                                          |  2 +-
 .../nossr50/datatypes/skills/SubSkillType.java   |  2 +-
 src/main/resources/advanced.yml                  |  9 ++++++++-
 src/main/resources/skillranks.yml                | 16 +++++++++++++++-
 5 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/Changelog.txt b/Changelog.txt
index eb779a4f1..c05319bbf 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,3 +1,9 @@
+Version 2.1.224
+    Fishing Shake has 8 ranks again
+
+    NOTES:
+    At some point Shake got reduced to 1 rank, this didn't really make sense as it was meant to be a skill that ranked up and got better over time.
+    It now has 8 ranks again, you may need to updated advanced.yml and skillranks.yml to get the new ranks.
 Version 2.1.223
     Folia Support added (Thanks to HSGamer, TechnicallyCoded, Rockyers, and Yomamaeatstoes)
 
diff --git a/pom.xml b/pom.xml
index 82174ac73..764777521 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
-    <version>2.1.223</version>
+    <version>2.1.224-SNAPSHOT</version>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <scm>
diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillType.java b/src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillType.java
index fc3ad681f..a11b98eb2 100644
--- a/src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillType.java
+++ b/src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillType.java
@@ -41,7 +41,7 @@ public enum SubSkillType {
     FISHING_MAGIC_HUNTER(1),
     FISHING_MASTER_ANGLER(8),
     FISHING_TREASURE_HUNTER(8),
-    FISHING_SHAKE(1),
+    FISHING_SHAKE(8),
 
     /* Herbalism */
     HERBALISM_DOUBLE_DROPS(1),
diff --git a/src/main/resources/advanced.yml b/src/main/resources/advanced.yml
index 4ade2d77c..ff7f917b3 100644
--- a/src/main/resources/advanced.yml
+++ b/src/main/resources/advanced.yml
@@ -209,7 +209,14 @@ Skills:
     Fishing:
 
         ShakeChance:
-            Rank_1: 30
+            Rank_1: 15.0
+            Rank_2: 15.0
+            Rank_3: 25.0
+            Rank_4: 35.0
+            Rank_5: 45.0
+            Rank_6: 55.0
+            Rank_7: 65.0
+            Rank_8: 75.0
 
         # VanillaXPMultiplier: Vanilla XP gained from fishing is multiplied by these values.
         VanillaXPMultiplier:
diff --git a/src/main/resources/skillranks.yml b/src/main/resources/skillranks.yml
index 6e68929a0..4ea659b03 100644
--- a/src/main/resources/skillranks.yml
+++ b/src/main/resources/skillranks.yml
@@ -406,8 +406,22 @@ Fishing:
     Shake:
         Standard:
             Rank_1: 15
+            Rank_2: 20
+            Rank_3: 25
+            Rank_4: 30
+            Rank_5: 40
+            Rank_6: 50
+            Rank_7: 60
+            Rank_8: 70
         RetroMode:
-            Rank_1: 150
+            Rank_1: 15
+            Rank_2: 20
+            Rank_3: 25
+            Rank_4: 30
+            Rank_5: 40
+            Rank_6: 50
+            Rank_7: 60
+            Rank_8: 70
     MasterAngler:
         Standard:
             Rank_1: 1