From f43b4ebdc58353e4f1d4df3ad0cbe1b4399d06f9 Mon Sep 17 00:00:00 2001
From: gmcferrin <gjmcferrin@gmail.com>
Date: Thu, 10 Jan 2013 15:22:47 -0500
Subject: [PATCH] Clarify the way fishing enchantments work - need to fix
 command display still.

---
 .../nossr50/skills/gathering/Fishing.java     | 39 ++++++++++++-------
 1 file changed, 25 insertions(+), 14 deletions(-)

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 32979b47d..21cc9fc39 100755
--- a/src/main/java/com/gmail/nossr50/skills/gathering/Fishing.java
+++ b/src/main/java/com/gmail/nossr50/skills/gathering/Fishing.java
@@ -2,7 +2,6 @@ package com.gmail.nossr50.skills.gathering;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 import org.bukkit.DyeColor;
 import org.bukkit.Location;
@@ -151,7 +150,8 @@ public class Fishing {
         Item theCatch = (Item) event.getCaught();
 
         if (theCatch.getItemStack().getType() != Material.RAW_FISH) {
-            final int ENCHANTMENT_CHANCE = advancedConfig.getFishingEnchantmentChance();
+            int lootTier = Fishing.getFishingLootTier(profile);
+            int specificChance = 1;
             boolean enchanted = false;
             ItemStack fishingResults = theCatch.getItemStack();
 
@@ -163,23 +163,36 @@ public class Fishing {
                 if (Permissions.luckyFishing(player)) {
                     randomChance = (int) (randomChance * 0.75);
                 }
-
-                if (Misc.getRandom().nextInt(randomChance) <= ENCHANTMENT_CHANCE
-                        && Permissions.fishingMagic(player)) {
+
+                /* CHANCE OF ITEM BEING ENCHANTED
+                 * 10% - Tier 1
+                 * 20% - Tier 2
+                 * 30% - Tier 3
+                 * 40% - Tier 4
+                 * 50% - Tier 5
+                 */
+                if (Misc.getRandom().nextInt(randomChance) <= (lootTier * 10) && Permissions.fishingMagic(player)) {
                     for (Enchantment newEnchant : Enchantment.values()) {
                         if (newEnchant.canEnchantItem(fishingResults)) {
-                            Map<Enchantment, Integer> resultEnchantments = fishingResults.getEnchantments();
+                            specificChance++;
 
-                            for (Enchantment oldEnchant : resultEnchantments.keySet()) {
+                            for (Enchantment oldEnchant : fishingResults.getEnchantments().keySet()) {
                                 if (oldEnchant.conflictsWith(newEnchant))
+                                    specificChance--;
                                     continue;
                             }
 
-                            /*
-                             * Actual chance to have an enchantment is related
-                             * to your fishing skill
+                            /* CHANCE OF GETTING EACH ENCHANTMENT
+                             * 50% - 1st Enchantment
+                             * 33% - 2nd Enchantment
+                             * 25% - 3rd Enchantment
+                             * 20% - 4th Enchantment
+                             * 16.66% - 5th Enchantment
+                             * 14.29% - 6th Enchantment
+                             * 12.5% - 7th Enchantment
+                             * 11.11% - 8th Enchantment
                              */
-                            if (Misc.getRandom().nextInt(15) < Fishing.getFishingLootTier(profile)) {
+                            if (Misc.getRandom().nextInt(specificChance) < 1) {
                                 enchanted = true;
                                 int randomEnchantLevel = Misc.getRandom().nextInt(newEnchant.getMaxLevel()) + 1;
 
@@ -187,10 +200,8 @@ public class Fishing {
                                     randomEnchantLevel = newEnchant.getStartLevel();
                                 }
 
-                                if (randomEnchantLevel >= 1000)
-                                    continue;
 
-                                fishingResults.addEnchantment(newEnchant,randomEnchantLevel);
+                                fishingResults.addEnchantment(newEnchant, randomEnchantLevel);
                             }
                         }
                     }