From f55039ac6b77e688e335b864cc668741ee469051 Mon Sep 17 00:00:00 2001
From: TfT_02 <tft_02@hotmail.com>
Date: Mon, 28 Oct 2013 17:38:03 +0100
Subject: [PATCH] Earn XP when using Shake

Adds #1564
---
 Changelog.txt                                                | 1 +
 .../gmail/nossr50/config/experience/ExperienceConfig.java    | 5 +++++
 .../com/gmail/nossr50/skills/fishing/FishingManager.java     | 1 +
 src/main/resources/experience.yml                            | 1 +
 4 files changed, 8 insertions(+)

diff --git a/Changelog.txt b/Changelog.txt
index 32c4bba97..9f08b7315 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -8,6 +8,7 @@ Key:
   - Removal
 
 Version 1.4.08-dev
+ + Added the possibility to gain experience when using Fishing "Shake"
 
 Version 1.4.07
  + Added XP boost to Acrobatics when wearing Boots of Feather Falling
diff --git a/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java b/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java
index bf815b067..bcdc12474 100644
--- a/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java
+++ b/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java
@@ -102,6 +102,10 @@ public class ExperienceConfig extends AutoUpdateConfigLoader {
             reason.add("Experience.Fishing.Base should be greater than 0!");
         }
 
+        if (getFishingShakeXP() <= 0) {
+            reason.add("Experience.Fishing.Shake should be greater than 0!");
+        }
+
         /* Repair */
         if (getRepairXPBase() <= 0) {
             reason.add("Experience.Repair.Base should be greater than 0!");
@@ -197,6 +201,7 @@ public class ExperienceConfig extends AutoUpdateConfigLoader {
 
     /* Fishing */
     public int getFishingBaseXP() { return config.getInt("Experience.Fishing.Base", 800); }
+    public int getFishingShakeXP() { return config.getInt("Experience.Fishing.Shake", 50); }
 
     /* Repair */
     public double getRepairXPBase() { return config.getDouble("Experience.Repair.Base", 1000.0); }
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 93dc50831..1da7594be 100644
--- a/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java
@@ -432,6 +432,7 @@ public class FishingManager extends SkillManager {
 
             Misc.dropItem(target.getLocation(), drop);
             CombatUtils.dealDamage(target, Math.max(target.getMaxHealth() / 4, 1)); // Make it so you can shake a mob no more than 4 times.
+            applyXpGain(ExperienceConfig.getInstance().getFishingShakeXP());
         }
     }
 
diff --git a/src/main/resources/experience.yml b/src/main/resources/experience.yml
index 14790e966..c31646602 100644
--- a/src/main/resources/experience.yml
+++ b/src/main/resources/experience.yml
@@ -75,6 +75,7 @@ Experience:
         FeatherFall_Multiplier: 2.0
     Fishing:
         Base: 800
+        Shake: 50
     Excavation:
         Clay: 40
         Dirt: 40