EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-28 03:34:43 +02:00
Code Issues Projects Releases Wiki Activity

Cleanup of UnarmedCommand.java

Browse Source
This commit is contained in:
GJ
2013-01-22 11:18:12 -05:00
parent e048a6d0d0
commit 74c32c4e59
11 changed files with 92 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gmail/nossr50/skills/unarmed/DeflectEventHandler.java
View File

@ -18,7 +18,7 @@ public class DeflectEventHandler {
}
protected void calculateSkillModifier() {
this.skillModifier = Misc.skillCheck(manager.getSkillLevel(), Unarmed.DEFLECT_MAX_BONUS_LEVEL);
this.skillModifier = Misc.skillCheck(manager.getSkillLevel(), Unarmed.deflectMaxBonusLevel);
}
protected void sendAbilityMessage() {

2
src/main/java/com/gmail/nossr50/skills/unarmed/DisarmEventHandler.java
View File

@ -26,7 +26,7 @@ public class DisarmEventHandler {
}
protected void calculateSkillModifier() {
this.skillModifier = Misc.skillCheck(manager.getSkillLevel(), Unarmed.DISARM_MAX_BONUS_LEVEL);
this.skillModifier = Misc.skillCheck(manager.getSkillLevel(), Unarmed.disarmMaxBonusLevel);
}
private void sendAbilityMessage() {

2
src/main/java/com/gmail/nossr50/skills/unarmed/IronGripEventHandler.java
View File

@ -20,7 +20,7 @@ public class IronGripEventHandler {
}
protected void calculateSkillModifier() {
this.skillModifier = Misc.skillCheck(Users.getProfile(defender).getSkillLevel(SkillType.UNARMED), Unarmed.IRON_GRIP_MAX_BONUS_LEVEL);
this.skillModifier = Misc.skillCheck(Users.getProfile(defender).getSkillLevel(SkillType.UNARMED), Unarmed.ironGripMaxBonusLevel);
}
protected void sendAbilityMessages() {

18
src/main/java/com/gmail/nossr50/skills/unarmed/Unarmed.java
View File

@ -3,17 +3,15 @@ package com.gmail.nossr50.skills.unarmed;
import com.gmail.nossr50.config.AdvancedConfig;
public class Unarmed {
static AdvancedConfig advancedConfig = AdvancedConfig.getInstance();
public static int ironArmMaxBonusDamage = AdvancedConfig.getInstance().getIronArmMaxBonus();
public static int ironArmIncreaseLevel = AdvancedConfig.getInstance().getIronArmIncreaseLevel();
public static final int BONUS_DAMAGE_MAX_BONUS_MODIFIER = advancedConfig.getIronArmBonus();
public static final int BONUS_DAMAGE_INCREASE_LEVEL = advancedConfig.getIronArmIncreaseLevel();
public static double deflectMaxChance = AdvancedConfig.getInstance().getDisarmChanceMax() ;
public static int deflectMaxBonusLevel = AdvancedConfig.getInstance().getDisarmMaxBonusLevel();
public static final int DEFLECT_MAX_CHANCE = advancedConfig.getDisarmChanceMax() ;
public static final int DEFLECT_MAX_BONUS_LEVEL = advancedConfig.getDisarmMaxBonusLevel();
public static double disarmMaxChance = AdvancedConfig.getInstance().getDeflectChanceMax();
public static int disarmMaxBonusLevel = AdvancedConfig.getInstance().getDeflectMaxBonusLevel();
public static final int DISARM_MAX_CHANCE = advancedConfig.getDeflectChanceMax();
public static final int DISARM_MAX_BONUS_LEVEL = advancedConfig.getDeflectMaxBonusLevel();
public static final int IRON_GRIP_MAX_CHANCE = advancedConfig.getIronGripChanceMax();
public static final int IRON_GRIP_MAX_BONUS_LEVEL = advancedConfig.getIronGripMaxBonusLevel();
public static double ironGripMaxChance = AdvancedConfig.getInstance().getIronGripChanceMax();
public static int ironGripMaxBonusLevel = AdvancedConfig.getInstance().getIronGripMaxBonusLevel();
}

6
src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedBonusDamageEventHandler.java
View File

@ -14,10 +14,10 @@ public class UnarmedBonusDamageEventHandler {
}
protected void calculateDamageBonus() {
int damageBonus = 3 + (manager.getSkillLevel() / Unarmed.BONUS_DAMAGE_INCREASE_LEVEL);
int damageBonus = 3 + (manager.getSkillLevel() / Unarmed.ironArmIncreaseLevel);
if (damageBonus > Unarmed.BONUS_DAMAGE_MAX_BONUS_MODIFIER) {
damageBonus = Unarmed.BONUS_DAMAGE_MAX_BONUS_MODIFIER;
if (damageBonus > Unarmed.ironArmBonusDamage) {
damageBonus = Unarmed.ironArmBonusDamage;
}
this.damageBonus = damageBonus;

12
src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java
View File

@ -28,8 +28,8 @@ public class UnarmedManager extends SkillManager {
if (eventHandler.isHoldingItem()) {
eventHandler.calculateSkillModifier();
float chance = (float) (((double) Unarmed.DISARM_MAX_CHANCE / (double) Unarmed.DISARM_MAX_BONUS_LEVEL) * skillLevel);
if (chance > Unarmed.DISARM_MAX_CHANCE) chance = Unarmed.DISARM_MAX_CHANCE;
float chance = (float) ((Unarmed.disarmMaxChance / Unarmed.disarmMaxBonusLevel) * skillLevel);
if (chance > Unarmed.disarmMaxChance) chance = (float) Unarmed.disarmMaxChance;
if (chance > Misc.getRandom().nextInt(activationChance)) {
if (!hasIronGrip(defender)) {
@ -55,8 +55,8 @@ public class UnarmedManager extends SkillManager {
DeflectEventHandler eventHandler = new DeflectEventHandler(this, event);
float chance = (float) (((double) Unarmed.DEFLECT_MAX_CHANCE / (double) Unarmed.DEFLECT_MAX_BONUS_LEVEL) * skillLevel);
if (chance > Unarmed.DEFLECT_MAX_CHANCE) chance = Unarmed.DEFLECT_MAX_CHANCE;
float chance = (float) ((Unarmed.deflectMaxChance / Unarmed.deflectMaxBonusLevel) * skillLevel);
if (chance > Unarmed.deflectMaxChance) chance = (float) Unarmed.deflectMaxChance;
if (chance > Misc.getRandom().nextInt(activationChance)) {
eventHandler.cancelEvent();
@ -99,8 +99,8 @@ public class UnarmedManager extends SkillManager {
IronGripEventHandler eventHandler = new IronGripEventHandler(this, defender);
float chance = (float) (((double) Unarmed.IRON_GRIP_MAX_CHANCE / (double) Unarmed.IRON_GRIP_MAX_BONUS_LEVEL) * skillLevel);
if (chance > Unarmed.IRON_GRIP_MAX_CHANCE) chance = Unarmed.IRON_GRIP_MAX_CHANCE;
float chance = (float) ((Unarmed.ironGripMaxChance / Unarmed.ironGripMaxBonusLevel) * skillLevel);
if (chance > Unarmed.ironGripMaxChance) chance = (float) Unarmed.ironGripMaxChance;
if (chance > Misc.getRandom().nextInt(activationChance)) {
eventHandler.sendAbilityMessages();