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 Swords & Taming commands

Browse Source
This commit is contained in:
GJ
2013-01-22 10:48:10 -05:00
parent 65d71db72f
commit e048a6d0d0
17 changed files with 121 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/gmail/nossr50/skills/swords/BleedEventHandler.java
View File

@ -23,17 +23,17 @@ public class BleedEventHandler {
}
protected void calculateSkillModifier() {
this.skillModifier = Misc.skillCheck(skillLevel, Swords.BLEED_MAX_BONUS_LEVEL);
this.skillModifier = Misc.skillCheck(skillLevel, Swords.bleedMaxBonusLevel);
}
protected void addBleedTicks() {
int bleedTicks;
if (skillLevel >= Swords.BLEED_MAX_BONUS_LEVEL) {
bleedTicks = Swords.MAX_BLEED_TICKS;
if (skillLevel >= Swords.bleedMaxBonusLevel) {
bleedTicks = Swords.bleedMaxTicks;
}
else {
bleedTicks = Swords.BASE_BLEED_TICKS;
bleedTicks = Swords.bleedBaseTicks;
}
BleedTimer.add(defender, bleedTicks);

4
src/main/java/com/gmail/nossr50/skills/swords/CounterAttackEventHandler.java
View File

@ -31,11 +31,11 @@ public class CounterAttackEventHandler {
}
protected void calculateSkillModifier() {
this.skillModifier = Misc.skillCheck(manager.getSkillLevel(), Swords.COUNTER_ATTACK_MAX_BONUS_LEVEL);
this.skillModifier = Misc.skillCheck(manager.getSkillLevel(), Swords.counterAttackMaxBonusLevel);
}
protected void dealDamage() {
Combat.dealDamage(attacker, damage / Swords.COUNTER_ATTACK_MODIFIER);
Combat.dealDamage(attacker, damage / Swords.counterAttackModifier);
}
protected void sendAbilityMessages() {

4
src/main/java/com/gmail/nossr50/skills/swords/SerratedStrikesEventHandler.java
View File

@ -19,7 +19,7 @@ public class SerratedStrikesEventHandler {
}
protected void applyAbilityEffects() {
Combat.applyAbilityAoE(player, target, damage / Swords.SERRATED_STRIKES_MODIFIER, SkillType.SWORDS);
BleedTimer.add(target, Swords.SERRATED_STRIKES_BLEED_TICKS);
Combat.applyAbilityAoE(player, target, damage / Swords.serratedStrikesModifier, SkillType.SWORDS);
BleedTimer.add(target, Swords.serratedStrikesBleedTicks);
}
}

20
src/main/java/com/gmail/nossr50/skills/swords/Swords.java
View File

@ -3,17 +3,15 @@ package com.gmail.nossr50.skills.swords;
import com.gmail.nossr50.config.AdvancedConfig;
public class Swords {
static AdvancedConfig advancedConfig = AdvancedConfig.getInstance();
public static double bleedMaxChance = AdvancedConfig.getInstance().getBleedChanceMax();
public static int bleedMaxBonusLevel = AdvancedConfig.getInstance().getBleedMaxBonusLevel();
public static int bleedMaxTicks = AdvancedConfig.getInstance().getBleedMaxTicks();
public static int bleedBaseTicks = AdvancedConfig.getInstance().getBleedBaseTicks();
public static final int BLEED_CHANCE_MAX = AdvancedConfig.getInstance().getBleedChanceMax();
public static final int BLEED_MAX_BONUS_LEVEL = advancedConfig.getBleedMaxBonusLevel();
public static final int MAX_BLEED_TICKS = advancedConfig.getBleedMaxTicks();
public static final int BASE_BLEED_TICKS = advancedConfig.getBleedBaseTicks();
public static double counterAttackMaxChance = AdvancedConfig.getInstance().getCounterChanceMax();
public static int counterAttackMaxBonusLevel = AdvancedConfig.getInstance().getCounterMaxBonusLevel();
public static int counterAttackModifier = AdvancedConfig.getInstance().getCounterModifier();
public static final int COUNTER_ATTACK_CHANCE_MAX = advancedConfig.getCounterChanceMax();
public static final int COUNTER_ATTACK_MAX_BONUS_LEVEL = advancedConfig.getCounterMaxBonusLevel();
public static final int COUNTER_ATTACK_MODIFIER = advancedConfig.getCounterModifier();
public static final int SERRATED_STRIKES_MODIFIER = advancedConfig.getSerratedStrikesModifier();
public static final int SERRATED_STRIKES_BLEED_TICKS = advancedConfig.getSerratedStrikesTicks();
public static int serratedStrikesModifier = AdvancedConfig.getInstance().getSerratedStrikesModifier();
public static int serratedStrikesBleedTicks = AdvancedConfig.getInstance().getSerratedStrikesTicks();
}

8
src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java
View File

@ -31,8 +31,8 @@ public class SwordsManager extends SkillManager {
if (Combat.shouldBeAffected(player, defender)) {
BleedEventHandler eventHandler = new BleedEventHandler(this, defender);
float chance = (float) (((double) Swords.BLEED_CHANCE_MAX / (double) Swords.BLEED_MAX_BONUS_LEVEL) * skillLevel);
if (chance > Swords.BLEED_CHANCE_MAX) chance = Swords.BLEED_CHANCE_MAX;
float chance = (float) ((Swords.bleedMaxChance / Swords.bleedMaxBonusLevel) * skillLevel);
if (chance > Swords.bleedMaxChance) chance = (float) Swords.bleedMaxChance;
if (chance > Misc.getRandom().nextInt(activationChance)) {
eventHandler.addBleedTicks();
@ -54,8 +54,8 @@ public class SwordsManager extends SkillManager {
if (eventHandler.isHoldingSword()) {
eventHandler.calculateSkillModifier();
float chance = (float) (((double) Swords.COUNTER_ATTACK_CHANCE_MAX / (double) Swords.COUNTER_ATTACK_MAX_BONUS_LEVEL) * skillLevel);
if (chance > Swords.COUNTER_ATTACK_CHANCE_MAX) chance = Swords.COUNTER_ATTACK_CHANCE_MAX;
float chance = (float) ((Swords.counterAttackMaxChance / Swords.counterAttackMaxBonusLevel) * skillLevel);
if (chance > Swords.counterAttackMaxChance) chance = (float) Swords.counterAttackMaxChance;
if (chance > Misc.getRandom().nextInt(activationChance)) {
eventHandler.dealDamage();

6
src/main/java/com/gmail/nossr50/skills/taming/GoreEventHandler.java
View File

@ -23,11 +23,11 @@ public class GoreEventHandler {
}
protected void calculateSkillModifier() {
this.skillModifier = Misc.skillCheck(manager.getSkillLevel(), Taming.GORE_MAX_BONUS_LEVEL);
this.skillModifier = Misc.skillCheck(manager.getSkillLevel(), Taming.goreMaxBonusLevel);
}
protected void modifyEventDamage() {
event.setDamage(event.getDamage() * Taming.GORE_MULTIPLIER);
event.setDamage(event.getDamage() * Taming.goreModifier);
}
protected void sendAbilityMessage() {
@ -39,6 +39,6 @@ public class GoreEventHandler {
}
protected void applyBleed() {
BleedTimer.add((LivingEntity) entity, Taming.GORE_BLEED_TICKS);
BleedTimer.add((LivingEntity) entity, Taming.goreBleedTicks);
}
}

2
src/main/java/com/gmail/nossr50/skills/taming/SharpenedClawsEventHandler.java
View File

@ -10,6 +10,6 @@ public class SharpenedClawsEventHandler {
}
protected void modifyEventDamage() {
event.setDamage(event.getDamage() + Taming.SHARPENED_CLAWS_BONUS);
event.setDamage(event.getDamage() + Taming.sharpenedClawsBonusDamage);
}
}

2
src/main/java/com/gmail/nossr50/skills/taming/ShockProofEventHandler.java
View File

@ -10,6 +10,6 @@ public class ShockProofEventHandler {
}
protected void modifyEventDamage() {
event.setDamage(event.getDamage() / Taming.SHOCK_PROOF_MODIFIER);
event.setDamage(event.getDamage() / Taming.shockProofModifier);
}
}

28
src/main/java/com/gmail/nossr50/skills/taming/Taming.java
View File

@ -3,24 +3,22 @@ package com.gmail.nossr50.skills.taming;
import com.gmail.nossr50.config.AdvancedConfig;
public class Taming {
static AdvancedConfig advancedConfig = AdvancedConfig.getInstance();
public static int environmentallyAwareUnlockLevel = AdvancedConfig.getInstance().getEnviromentallyAwareUnlock();
public static final int ENVIRONMENTALLY_AWARE_ACTIVATION_LEVEL = advancedConfig.getEnviromentallyAwareUnlock();
public static double fastFoodServiceActivationChance = AdvancedConfig.getInstance().getFastFoodChance();
public static int fastFoodServiceUnlockLevel = AdvancedConfig.getInstance().getFastFoodUnlock();
public static final int FAST_FOOD_SERVICE_ACTIVATION_CHANCE = advancedConfig.getFastFoodChance();
public static final int FAST_FOOD_SERVICE_ACTIVATION_LEVEL = advancedConfig.getFastFoodUnlock();
public static double goreMaxChance = AdvancedConfig.getInstance().getGoreChanceMax();
public static int goreBleedTicks = AdvancedConfig.getInstance().getGoreBleedTicks();
public static int goreMaxBonusLevel = AdvancedConfig.getInstance().getGoreMaxBonusLevel();
public static int goreModifier = AdvancedConfig.getInstance().getGoreModifier();
public static final int GORE_CHANCE_MAX = AdvancedConfig.getInstance().getGoreChanceMax();
public static final int GORE_BLEED_TICKS = advancedConfig.getGoreBleedTicks();
public static final int GORE_MAX_BONUS_LEVEL = advancedConfig.getGoreMaxBonusLevel();
public static final int GORE_MULTIPLIER = advancedConfig.getGoreModifier();
public static int sharpenedClawsUnlockLevel = AdvancedConfig.getInstance().getSharpenedClawsUnlock();
public static int sharpenedClawsBonusDamage = AdvancedConfig.getInstance().getSharpenedClawsBonus();
public static final int SHARPENED_CLAWS_ACTIVATION_LEVEL = advancedConfig.getSharpenedClawsUnlock();
public static final int SHARPENED_CLAWS_BONUS = advancedConfig.getSharpenedClawsBonus();
public static int shockProofUnlockLevel = AdvancedConfig.getInstance().getShockProofUnlock();
public static int shockProofModifier = AdvancedConfig.getInstance().getShockProofModifier();
public static final int SHOCK_PROOF_ACTIVATION_LEVEL = advancedConfig.getShockProofUnlock();
public static final int SHOCK_PROOF_MODIFIER = advancedConfig.getShockProofModifier();
public static final int THICK_FUR_ACTIVATION_LEVEL = advancedConfig.getThickFurUnlock();
public static final int THICK_FUR_MODIFIER = advancedConfig.getThickFurModifier();
public static int thickFurUnlockLevel = AdvancedConfig.getInstance().getThickFurUnlock();
public static int thickFurModifier = AdvancedConfig.getInstance().getThickFurModifier();
}

16
src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java
View File

@ -36,8 +36,8 @@ public class TamingManager extends SkillManager {
return;
}
if (skillLevel >= Taming.FAST_FOOD_SERVICE_ACTIVATION_LEVEL) {
if (Misc.getRandom().nextInt(activationChance) < Taming.FAST_FOOD_SERVICE_ACTIVATION_CHANCE) {
if (skillLevel >= Taming.fastFoodServiceUnlockLevel) {
if (Misc.getRandom().nextInt(activationChance) < Taming.fastFoodServiceActivationChance) {
FastFoodServiceEventHandler eventHandler = new FastFoodServiceEventHandler(wolf);
eventHandler.modifyHealth(damage);
@ -58,7 +58,7 @@ public class TamingManager extends SkillManager {
return;
}
if (skillLevel >= Taming.SHARPENED_CLAWS_ACTIVATION_LEVEL) {
if (skillLevel >= Taming.sharpenedClawsUnlockLevel) {
SharpenedClawsEventHandler eventHandler = new SharpenedClawsEventHandler(event);
eventHandler.modifyEventDamage();
@ -80,8 +80,8 @@ public class TamingManager extends SkillManager {
GoreEventHandler eventHandler = new GoreEventHandler(this, event);
float chance = (float) (((double) Taming.GORE_CHANCE_MAX / (double) Taming.GORE_MAX_BONUS_LEVEL) * skillLevel);
if (chance > Taming.GORE_CHANCE_MAX) chance = Taming.GORE_CHANCE_MAX;
float chance = (float) ((Taming.goreMaxChance / Taming.goreMaxBonusLevel) * skillLevel);
if (chance > Taming.goreMaxChance) chance = (float) Taming.goreMaxChance;
if (chance > Misc.getRandom().nextInt(activationChance)) {
eventHandler.modifyEventDamage();
@ -203,7 +203,7 @@ public class TamingManager extends SkillManager {
return;
}
if (skillLevel >= Taming.ENVIRONMENTALLY_AWARE_ACTIVATION_LEVEL) {
if (skillLevel >= Taming.environmentallyAwareUnlockLevel) {
EnvironmentallyAwareEventHandler eventHandler = new EnvironmentallyAwareEventHandler(this, event);
switch (cause) {
@ -238,7 +238,7 @@ public class TamingManager extends SkillManager {
return;
}
if (skillLevel >= Taming.THICK_FUR_ACTIVATION_LEVEL) {
if (skillLevel >= Taming.thickFurUnlockLevel) {
ThickFurEventHandler eventHandler = new ThickFurEventHandler(event, cause);
eventHandler.modifyEventDamage();
@ -258,7 +258,7 @@ public class TamingManager extends SkillManager {
return;
}
if (skillLevel >= Taming.SHOCK_PROOF_ACTIVATION_LEVEL) {
if (skillLevel >= Taming.shockProofUnlockLevel) {
ShockProofEventHandler eventHandler = new ShockProofEventHandler(event);
eventHandler.modifyEventDamage();

2
src/main/java/com/gmail/nossr50/skills/taming/ThickFurEventHandler.java
View File

@ -23,7 +23,7 @@ public class ThickFurEventHandler {
case ENTITY_ATTACK:
case PROJECTILE:
event.setDamage(event.getDamage() / Taming.THICK_FUR_MODIFIER);
event.setDamage(event.getDamage() / Taming.thickFurModifier);
break;
default: