From ce806361412965cf62022be089e77746bae5ffe9 Mon Sep 17 00:00:00 2001 From: T00thpick1 Date: Sun, 18 Aug 2013 02:38:40 -0400 Subject: [PATCH] Min value for IronArm configurable --- src/main/java/com/gmail/nossr50/config/AdvancedConfig.java | 1 + src/main/java/com/gmail/nossr50/skills/unarmed/Unarmed.java | 1 + .../java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java | 2 +- src/main/resources/advanced.yml | 2 ++ 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java b/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java index 47eaf7ce7..df071b04d 100644 --- a/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java +++ b/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java @@ -1030,6 +1030,7 @@ public class AdvancedConfig extends AutoUpdateConfigLoader { public double getIronGripChanceMax() { return config.getDouble("Skills.Unarmed.IronGrip_ChanceMax", 100.0D); } public int getIronGripMaxBonusLevel() { return config.getInt("Skills.Unarmed.IronGrip_MaxBonusLevel", 1000); } + public int getIronArmMinBonus() { return config.getInt("Skills.Unarmed.IronArm_BonusMin", 3); } public int getIronArmMaxBonus() { return config.getInt("Skills.Unarmed.IronArm_BonusMax", 8); } public int getIronArmIncreaseLevel() { return config.getInt("Skills.Unarmed.IronArm_IncreaseLevel", 50); } diff --git a/src/main/java/com/gmail/nossr50/skills/unarmed/Unarmed.java b/src/main/java/com/gmail/nossr50/skills/unarmed/Unarmed.java index 5c9897cb0..8e2022487 100644 --- a/src/main/java/com/gmail/nossr50/skills/unarmed/Unarmed.java +++ b/src/main/java/com/gmail/nossr50/skills/unarmed/Unarmed.java @@ -10,6 +10,7 @@ import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.config.Config; public class Unarmed { + public static int ironArmMinBonusDamage = AdvancedConfig.getInstance().getIronArmMinBonus(); public static int ironArmMaxBonusDamage = AdvancedConfig.getInstance().getIronArmMaxBonus(); public static int ironArmIncreaseLevel = AdvancedConfig.getInstance().getIronArmIncreaseLevel(); diff --git a/src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java b/src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java index 4fa75a624..103d3fe5f 100644 --- a/src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java +++ b/src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java @@ -106,7 +106,7 @@ public class UnarmedManager extends SkillManager { * @return the modified event damage */ public double ironArmCheck(double damage) { - int unarmedBonus = Math.min(3 + (getSkillLevel() / Unarmed.ironArmIncreaseLevel), Unarmed.ironArmMaxBonusDamage); + int unarmedBonus = Math.min(Unarmed.ironArmMinBonusDamage + (getSkillLevel() / Unarmed.ironArmIncreaseLevel), Unarmed.ironArmMaxBonusDamage); return damage + unarmedBonus; } diff --git a/src/main/resources/advanced.yml b/src/main/resources/advanced.yml index 5583e198c..97f4b598e 100644 --- a/src/main/resources/advanced.yml +++ b/src/main/resources/advanced.yml @@ -390,8 +390,10 @@ Skills: IronGrip_ChanceMax: 100.0 IronGrip_MaxBonusLevel: 1000 + # IronArm_BonusMin: Minimum bonus damage for unarmed # IronArm_BonusMax: Maximum bonus damage for unarmed # IronArm_IncreaseLevel: Bonus damage increases every increase level + IronArm_BonusMin: 3 IronArm_BonusMax: 8 IronArm_IncreaseLevel: 50 #