Unified signature: caster/power/rank/target

src/engine/mbEnums.java

@@ -1338,8 +1338,8 @@ public class mbEnums {
 
     @FunctionalInterface
     public interface ModBehaviorFunction {
-        Object apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
-                     PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank);
+        Object apply(AbstractCharacter caster, Power power, Integer rank, AbstractWorldObject target,
+                     PowerAction powerAction, Effect effect, ModifierEntry modifierEntry);
     }
 
     public enum ModBehaviorType {
@@ -1367,9 +1367,9 @@ public class mbEnums {
             this.function = function;
         }
 
-        public Object apply(AbstractCharacter caster, AbstractWorldObject target, Power power,
-                            PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
-            return function.apply(caster, target, power, powerAction, effect, modifierEntry, rank);
+        public Object apply(AbstractCharacter caster, Power power, Integer rank, AbstractWorldObject target,
+                            PowerAction powerAction, Effect effect, ModifierEntry modifierEntry) {
+            return function.apply(caster, power, rank, target, powerAction, effect, modifierEntry);
         }
     }
 

src/engine/wpakpowers/Actions.java

@@ -35,8 +35,8 @@ public class Actions {
             // based on the needs of the behaviour.
 
             for (ModifierEntry modifierEntry : effect.mods) {
-                Object modifier = modifierEntry.type.behaviorType.apply(caster, target, power,
-                        powerAction, effect, modifierEntry, rank);
+                Object modifier = modifierEntry.type.behaviorType.apply(caster, power, rank, target,
+                        powerAction, effect, modifierEntry);
                 appliedEffect.modifiers.put(modifierEntry.type, modifier);
             }
 

src/engine/wpakpowers/Behaviours.java

@@ -18,96 +18,96 @@ import engine.wpak.data.PowerAction;
 
 public class Behaviours {
 
-    public static Object Flag(AbstractCharacter caster, AbstractWorldObject target, Power power,
-                              PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
+    public static Object Flag(AbstractCharacter caster, Power power, Integer rank, AbstractWorldObject target,
+                              PowerAction powerAction, Effect effect, ModifierEntry modifierEntry) {
         boolean modValue = true;
         return modValue;
     }
 
-    public static Object MapIntToInts(AbstractCharacter caster, AbstractWorldObject target, Power power,
-                                      PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
+    public static Object MapIntToInts(AbstractCharacter caster, Power power, Integer rank, AbstractWorldObject target,
+                                      PowerAction powerAction, Effect effect, ModifierEntry modifierEntry) {
 
         return powerAction.attackAnimations.clone();
     }
 
-    public static Object Standard(AbstractCharacter caster, AbstractWorldObject target, Power power,
-                                  PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
+    public static Object Standard(AbstractCharacter caster, Power power, Integer rank, AbstractWorldObject target,
+                                  PowerAction powerAction, Effect effect, ModifierEntry modifierEntry) {
 
         return WpakPowerManager.applyCurveToModifier(powerAction, modifierEntry, rank);
     }
 
-    public static Object FPSubTypeAttr(AbstractCharacter caster, AbstractWorldObject target, Power power,
-                                       PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
+    public static Object FPSubTypeAttr(AbstractCharacter caster, Power power, Integer rank, AbstractWorldObject target,
+                                       PowerAction powerAction, Effect effect, ModifierEntry modifierEntry) {
         return WpakPowerManager.applyCurveToModifier(powerAction, modifierEntry, rank);
     }
 
-    public static Object SubTypeSourceType(AbstractCharacter caster, AbstractWorldObject target, Power power,
-                                           PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
+    public static Object SubTypeSourceType(AbstractCharacter caster, Power power, Integer rank, AbstractWorldObject target,
+                                           PowerAction powerAction, Effect effect, ModifierEntry modifierEntry) {
 
         return modifierEntry.arg1;  // Should we return the enum here?
     }
 
-    public static Object SubTypePowerType(AbstractCharacter caster, AbstractWorldObject target, Power power,
-                                          PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
+    public static Object SubTypePowerType(AbstractCharacter caster, Power power, Integer rank, AbstractWorldObject target,
+                                          PowerAction powerAction, Effect effect, ModifierEntry modifierEntry) {
         return modifierEntry.arg1;
     }
 
-    public static Object SubTypeSkill(AbstractCharacter caster, AbstractWorldObject target, Power power,
-                                      PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
+    public static Object SubTypeSkill(AbstractCharacter caster, Power power, Integer rank, AbstractWorldObject target,
+                                      PowerAction powerAction, Effect effect, ModifierEntry modifierEntry) {
         return modifierEntry.arg1;
     }
 
-    public static Object FPSubTypeDmg(AbstractCharacter caster, AbstractWorldObject target, Power power,
-                                      PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
+    public static Object FPSubTypeDmg(AbstractCharacter caster, Power power, Integer rank, AbstractWorldObject target,
+                                      PowerAction powerAction, Effect effect, ModifierEntry modifierEntry) {
         String key = modifierEntry.arg1;
         float value = WpakPowerManager.applyCurveToModifier(powerAction, modifierEntry, rank);
         return new Pair<>(key,value);
     }
 
-    public static Object DD(AbstractCharacter caster, AbstractWorldObject target, Power power,
-                            PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
+    public static Object DD(AbstractCharacter caster, Power power, Integer rank, AbstractWorldObject target,
+                            PowerAction powerAction, Effect effect, ModifierEntry modifierEntry) {
         System.out.println("Behavior method called");
         return null;
     }
 
-    public static Object StringBehaviour(AbstractCharacter caster, AbstractWorldObject target, Power power,
-                                         PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
+    public static Object StringBehaviour(AbstractCharacter caster, Power power, Integer rank, AbstractWorldObject target,
+                                         PowerAction powerAction, Effect effect, ModifierEntry modifierEntry) {
         System.out.println("Behavior method called");
         return null;
     }
 
-    public static Object SubTypeMod(AbstractCharacter caster, AbstractWorldObject target, Power power,
-                                    PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
+    public static Object SubTypeMod(AbstractCharacter caster, Power power, Integer rank, AbstractWorldObject target,
+                                    PowerAction powerAction, Effect effect, ModifierEntry modifierEntry) {
         System.out.println("Behavior method called");
         return null;
     }
 
-    public static Object SubTypePower(AbstractCharacter caster, AbstractWorldObject target, Power power,
-                                      PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
+    public static Object SubTypePower(AbstractCharacter caster, Power power, Integer rank, AbstractWorldObject target,
+                                      PowerAction powerAction, Effect effect, ModifierEntry modifierEntry) {
         System.out.println("Behavior method called");
         return null;
     }
 
-    public static Object SubTypeDmg(AbstractCharacter caster, AbstractWorldObject target, Power power,
-                                    PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
+    public static Object SubTypeDmg(AbstractCharacter caster, Power power, Integer rank, AbstractWorldObject target,
+                                    PowerAction powerAction, Effect effect, ModifierEntry modifierEntry) {
         System.out.println("Behavior method called");
         return null;
     }
 
-    public static Object FPSubTypeSkill(AbstractCharacter caster, AbstractWorldObject target, Power power,
-                                        PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
+    public static Object FPSubTypeSkill(AbstractCharacter caster, Power power, Integer rank, AbstractWorldObject target,
+                                        PowerAction powerAction, Effect effect, ModifierEntry modifierEntry) {
         System.out.println("Behavior method called");
         return null;
     }
 
-    public static Object FPSubTypeMonster(AbstractCharacter caster, AbstractWorldObject target, Power power,
-                                          PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
+    public static Object FPSubTypeMonster(AbstractCharacter caster, Power power, Integer rank, AbstractWorldObject target,
+                                          PowerAction powerAction, Effect effect, ModifierEntry modifierEntry) {
         System.out.println("Behavior method called");
         return null;
     }
 
-    public static Object ProcInfo(AbstractCharacter caster, AbstractWorldObject target, Power power,
-                                  PowerAction powerAction, Effect effect, ModifierEntry modifierEntry, Integer rank) {
+    public static Object ProcInfo(AbstractCharacter caster, Power power, Integer rank, AbstractWorldObject target,
+                                  PowerAction powerAction, Effect effect, ModifierEntry modifierEntry) {
         System.out.println("Behavior method called");
         return null;
     }