From 085a25306c96e87fb9dc3721bcc1e55ceb496035 Mon Sep 17 00:00:00 2001
From: TfT_02 <tft_02@hotmail.com>
Date: Thu, 10 Jan 2013 22:54:57 +0100
Subject: [PATCH] Make the MagicHunter Chance configurable

---
 src/main/java/com/gmail/nossr50/config/AdvancedConfig.java    | 2 +-
 src/main/java/com/gmail/nossr50/skills/gathering/Fishing.java | 3 ++-
 src/main/resources/advanced.yml                               | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java b/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java
index 224035cc9..54f86f37c 100644
--- a/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java
+++ b/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java
@@ -68,7 +68,7 @@ public class AdvancedConfig extends ConfigLoader {
 
     /* FISHING */
     public int getShakeUnlockLevel() { return config.getInt("Skills.Fishing.Shake_UnlockLevel", 150); }
-    public int getFishingEnchantmentChance() { return config.getInt("Skills.Fishing.Enchantment_Chance", 10); }
+    public int getFishingMagicMultiplier() { return config.getInt("Skills.Fishing.MagicHunter_Multiplier", 5); }
 
     /* HERBALISM */
     public int getFarmerDietRankChange() { return config.getInt("Skills.Herbalism.Food_RankChange", 200); }
diff --git a/src/main/java/com/gmail/nossr50/skills/gathering/Fishing.java b/src/main/java/com/gmail/nossr50/skills/gathering/Fishing.java
index 53b99ba3f..61a9e19c0 100755
--- a/src/main/java/com/gmail/nossr50/skills/gathering/Fishing.java
+++ b/src/main/java/com/gmail/nossr50/skills/gathering/Fishing.java
@@ -151,6 +151,7 @@ public class Fishing {
 
         if (theCatch.getItemStack().getType() != Material.RAW_FISH) {
             int lootTier = Fishing.getFishingLootTier(profile);
+            int magicHunterMultiplier = advancedConfig.getFishingMagicMultiplier();
             int specificChance = 1;
             boolean enchanted = false;
             ItemStack fishingResults = theCatch.getItemStack();
@@ -171,7 +172,7 @@ public class Fishing {
                  * 20% - Tier 4
                  * 25% - Tier 5
                  */
-                if (Misc.getRandom().nextInt(randomChance) <= (lootTier * 5) && Permissions.fishingMagic(player)) {
+                if (Misc.getRandom().nextInt(randomChance) <= (lootTier * magicHunterMultiplier) && Permissions.fishingMagic(player)) {
                     for (Enchantment newEnchant : Enchantment.values()) {
                         if (newEnchant.canEnchantItem(fishingResults)) {
                             specificChance++;
diff --git a/src/main/resources/advanced.yml b/src/main/resources/advanced.yml
index 417824f1f..e9abd5ba2 100644
--- a/src/main/resources/advanced.yml
+++ b/src/main/resources/advanced.yml
@@ -97,8 +97,8 @@ Skills:
         # Shake_UnlockLevel: Fishing level when the Shake ability unlocks
         Shake_UnlockLevel: 150
 
-        # Enchantment_Chance: Chance of getting fishing treasure with enchantments
-        Enchantment_Chance: 10
+        # MagicHunter_Multiplier: Determines the chance of fishing enchanted items. The chance is calculated by getting the fishing TreasureHunt tier and multiplying it with MagicHunter_Multiplier
+        MagicHunter_Multiplier: 5
     #
     #  Settings for Herbalism
     ###