From de93b11c252038b9bc209e6bcce71990b38a1590 Mon Sep 17 00:00:00 2001
From: TfT_02 <tft_02@hotmail.com>
Date: Sun, 2 Dec 2012 22:54:03 +0100
Subject: [PATCH] Fixed an error where Greater Impact was confused with Armor
 Impact

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

diff --git a/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java b/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java
index 164fb386f..91208c13d 100644
--- a/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java
+++ b/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java
@@ -57,9 +57,10 @@ public class AdvancedConfig extends ConfigLoader {
     public int getAxesCriticalPVEModifier() { return config.getInt("Skills.Axes.AxesCritical_PVE_Modifier", 2); }
     
     public int getGreaterImpactChance() { return config.getInt("Skills.Axes.GreaterImpact_Chance", 25); }
-    public int getGreaterImpactIncreaseLevel() { return config.getInt("Skills.Axes.GreaterImpact_IncreaseLevel", 50); }
     public double getGreaterImpactModifier() { return config.getDouble("Skills.Axes.GreaterImpact_KnockbackModifier", 1.5); }
     public int getGreaterImpactBonusDamage() { return config.getInt("Skills.Axes.GreaterImpact_BonusDamage", 2); }
+
+    public int getArmorImpactIncreaseLevel() { return config.getInt("Skills.Axes.ArmorImpact_IncreaseLevel", 50); }
     
     /* EXCAVATION */
     //Nothing to configure, everything is already configurable in config.yml
diff --git a/src/main/java/com/gmail/nossr50/skills/combat/Axes.java b/src/main/java/com/gmail/nossr50/skills/combat/Axes.java
index 1306f2690..22b1cf4f5 100644
--- a/src/main/java/com/gmail/nossr50/skills/combat/Axes.java
+++ b/src/main/java/com/gmail/nossr50/skills/combat/Axes.java
@@ -129,7 +129,7 @@ public class Axes {
             short durabilityDamage = 1; //Start with 1 durability damage
 
             /* Every 30 Skill Levels you gain 1 durability damage */
-            int impactIncreaseLevel = advancedConfig.getGreaterImpactIncreaseLevel();
+            int impactIncreaseLevel = advancedConfig.getArmorImpactIncreaseLevel();
             durabilityDamage += (int) ((double) Users.getProfile(attacker).getSkillLevel(SkillType.AXES) / (double) impactIncreaseLevel);
 
             if (!hasArmor(targetPlayer)) {
diff --git a/src/main/resources/advanced.yml b/src/main/resources/advanced.yml
index c578513ee..939e69e55 100644
--- a/src/main/resources/advanced.yml
+++ b/src/main/resources/advanced.yml
@@ -42,9 +42,9 @@ Skills:
         AxesCritical_PVP_Modifier: 1.5
         AxesCritical_PVE_Modifier: 2
         GreaterImpact_Chance: 25
-        GreaterImpact_IncreaseLevel: 50
         GreaterImpact_KnockbackModifier: 1.5
         GreaterImpact_BonusDamage: 2
+        ArmorImpact_IncreaseLevel: 50
     Fishing:
         Shake_UnlockLevel: 150
         Enchantment_Chance: 10