From c7ed3ee2a0ef6d4610577455af134ebe6acf300f Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Sun, 27 Jan 2019 20:56:16 -0800
Subject: [PATCH] Magic Hunter requires treasure hunter and has ranks now

---
 Changelog.txt                                          |  2 ++
 .../gmail/nossr50/datatypes/skills/SubSkillType.java   |  2 +-
 .../gmail/nossr50/skills/fishing/FishingManager.java   | 10 +++++++++-
 src/main/resources/skillranks.yml                      |  5 +++++
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/Changelog.txt b/Changelog.txt
index 073aec4fc..b6d9f8197 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -17,6 +17,8 @@ Version 2.1.2
     (Skills) Tree Feller now works on Mushroom Stems
     (Skills) Fixed a bug where magic chance would show as null
     (Skills) Fixed a bug where Trap percentages were added to Fishing even though they no longer exist
+    (Skills) Magic Hunter now uses a rank system
+    (Skills) Fixed a bug where Magic Hunter would work without treasure hunter
     (Experience) Wood blocks now give XP and are affected by Tree Feller (6 sided bark blocks)
     (API) Moved XPGainReason from skills to experience package
     (API) Added XpGainSource for tracking sources of XP
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 5e80ea72b..7ab90f3e7 100644
--- a/src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillType.java
+++ b/src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillType.java
@@ -33,7 +33,7 @@ public enum SubSkillType {
     /* Fishing */
     FISHING_FISHERMANS_DIET(5),
     FISHING_ICE_FISHING(1),
-    FISHING_MAGIC_HUNTER,
+    FISHING_MAGIC_HUNTER(1),
     FISHING_MASTER_ANGLER(1),
     FISHING_TREASURE_HUNTER(8),
     FISHING_SHAKE(1),
diff --git a/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java b/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java
index 9eb309477..fcdedecce 100644
--- a/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java
@@ -179,6 +179,13 @@ public class FishingManager extends SkillManager {
         hook.setBiteChance(Math.min(biteChance, 1.0));
     }
 
+    public boolean isMagicHunterEnabled()
+    {
+        return RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.FISHING_MAGIC_HUNTER)
+                && RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.FISHING_TREASURE_HUNTER)
+                && Permissions.isSubSkillEnabled(getPlayer(), SubSkillType.FISHING_TREASURE_HUNTER);
+    }
+
     /**
      * Process the results from a successful fishing trip
      *
@@ -200,7 +207,8 @@ public class FishingManager extends SkillManager {
             ItemStack treasureDrop = treasure.getDrop().clone(); // Not cloning is bad, m'kay?
             Map<Enchantment, Integer> enchants = new HashMap<Enchantment, Integer>();
 
-            if (Permissions.isSubSkillEnabled(player, SubSkillType.FISHING_MAGIC_HUNTER) && ItemUtils.isEnchantable(treasureDrop)) {
+            if (isMagicHunterEnabled()
+                    && ItemUtils.isEnchantable(treasureDrop)) {
                 enchants = handleMagicHunter(treasureDrop);
             }
 
diff --git a/src/main/resources/skillranks.yml b/src/main/resources/skillranks.yml
index aeafd216e..87d97ce7f 100644
--- a/src/main/resources/skillranks.yml
+++ b/src/main/resources/skillranks.yml
@@ -319,6 +319,11 @@ Herbalism:
             Rank_4: 800
             Rank_5: 1000
 Fishing:
+    MagicHunter:
+        Standard:
+            Rank_1: 20
+        RetroMode:
+            Rank_1: 200
     Shake:
         Standard:
             Rank_1: 15