diff --git a/src/engine/wpakpowers/Behaviour.java b/src/engine/wpakpowers/Behaviour.java index 4dbd982c..2140e5a3 100644 --- a/src/engine/wpakpowers/Behaviour.java +++ b/src/engine/wpakpowers/Behaviour.java @@ -18,37 +18,37 @@ import engine.wpak.data.Power; public class Behaviour { public static Object Flag(AbstractCharacter caster, AbstractWorldObject target, Power power, - ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) { + ActionEntry actionEntry, Effect effect, ModifierEntry modifierEntry, Integer rank) { boolean modValue = true; return modValue; } public static Object MapIntToInts(AbstractCharacter caster, AbstractWorldObject target, Power power, - ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) { + ActionEntry actionEntry, Effect effect, ModifierEntry modifierEntry, Integer rank) { System.out.println("Behavior method called"); return null; } public static Object Standard(AbstractCharacter caster, AbstractWorldObject target, Power power, - ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) { + ActionEntry actionEntry, Effect effect, ModifierEntry modifierEntry, Integer rank) { - return WpakPowerManager.applyCurveToModifier(powerAction, modifierEntry, rank); + return WpakPowerManager.applyCurveToModifier(actionEntry, modifierEntry, rank); } public static Object FPSubTypeAttr(AbstractCharacter caster, AbstractWorldObject target, Power power, - ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) { + ActionEntry actionEntry, Effect effect, ModifierEntry modifierEntry, Integer rank) { System.out.println("Behavior method called"); return null; } public static Object SubTypeSourceType(AbstractCharacter caster, AbstractWorldObject target, Power power, - ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) { + ActionEntry actionEntry, Effect effect, ModifierEntry modifierEntry, Integer rank) { System.out.println("Behavior method called"); return null; } public static Object SubTypePowerType(AbstractCharacter caster, AbstractWorldObject target, Power power, - ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) { + ActionEntry actionEntry, Effect effect, ModifierEntry modifierEntry, Integer rank) { System.out.println("Behavior method called"); return null; } @@ -60,49 +60,49 @@ public class Behaviour { } public static Object FPSubTypeDmg(AbstractCharacter caster, AbstractWorldObject target, Power power, - ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) { + ActionEntry actionEntry, Effect effect, ModifierEntry modifierEntry, Integer rank) { System.out.println("Behavior method called"); return null; } public static Object DD(AbstractCharacter caster, AbstractWorldObject target, Power power, - ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) { + ActionEntry actionEntry, Effect effect, ModifierEntry modifierEntry, Integer rank) { System.out.println("Behavior method called"); return null; } public static Object StringBehaviour(AbstractCharacter caster, AbstractWorldObject target, Power power, - ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) { + ActionEntry actionEntry, Effect effect, ModifierEntry modifierEntry, Integer rank) { System.out.println("Behavior method called"); return null; } public static Object SubTypeMod(AbstractCharacter caster, AbstractWorldObject target, Power power, - ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) { + ActionEntry actionEntry, Effect effect, ModifierEntry modifierEntry, Integer rank) { System.out.println("Behavior method called"); return null; } public static Object SubTypePower(AbstractCharacter caster, AbstractWorldObject target, Power power, - ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) { + ActionEntry actionEntry, Effect effect, ModifierEntry modifierEntry, Integer rank) { System.out.println("Behavior method called"); return null; } public static Object SubTypeDmg(AbstractCharacter caster, AbstractWorldObject target, Power power, - ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) { + ActionEntry actionEntry, Effect effect, ModifierEntry modifierEntry, Integer rank) { System.out.println("Behavior method called"); return null; } public static Object FPSubTypeSkill(AbstractCharacter caster, AbstractWorldObject target, Power power, - ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) { + ActionEntry actionEntry, Effect effect, ModifierEntry modifierEntry, Integer rank) { System.out.println("Behavior method called"); return null; } public static Object FPSubTypeMonster(AbstractCharacter caster, AbstractWorldObject target, Power power, - ActionEntry powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) { + ActionEntry actionEntry, Effect effect, ModifierEntry modifierEntry, Integer rank) { System.out.println("Behavior method called"); return null; } diff --git a/src/engine/wpakpowers/WpakPowerManager.java b/src/engine/wpakpowers/WpakPowerManager.java index bd3e7c1e..cda73b65 100644 --- a/src/engine/wpakpowers/WpakPowerManager.java +++ b/src/engine/wpakpowers/WpakPowerManager.java @@ -334,12 +334,12 @@ public class WpakPowerManager { public static void applyAllPowerEffects(AbstractCharacter caster, Power power, int rank, AbstractWorldObject target) { - for (ActionEntry powerAction : power.actionEntries) { + for (ActionEntry actionEntry : power.actionEntries) { - Effect effect = effect_data.get(powerAction.effect_id); + Effect effect = effect_data.get(actionEntry.effect_id); if (effect == null) { - Logger.error("Null effect for " + powerAction.effect_id); + Logger.error("Null effect for " + actionEntry.effect_id); continue; } @@ -353,7 +353,7 @@ public class WpakPowerManager { for (ModifierEntry modifierEntry : effect.mods) { Object modifier = modifierEntry.type.behaviorType.apply(caster, target, power, - powerAction, effect, modifierEntry, rank); + actionEntry, effect, modifierEntry, rank); appliedEffect.modifiers.put(modifierEntry.type, modifier); }