coldsore
/
Server
forked from MagicBane/Server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Unified signature: caster/power/rank/target

feature-config-usage
MagicBot 8 months ago
parent
fc7b7eb915
commit
1a64272801
3 changed files with 64 additions and 64 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      src/engine/mbEnums.java
  2. 116
      src/engine/wpakpowers/Actions.java
  3. 2
      src/engine/wpakpowers/WpakPowerManager.java

10
src/engine/mbEnums.java
Unescape View File

@ -1375,8 +1375,8 @@ public class mbEnums { @@ -1375,8 +1375,8 @@ public class mbEnums {
@FunctionalInterface
public interface PowerActionFunction {
void execute(AbstractCharacter caster, AbstractWorldObject target, Power power,
Integer rank, PowerAction powerAction);
void execute(AbstractCharacter caster, Power power, Integer rank, AbstractWorldObject target,
PowerAction powerAction);
}
public enum PowerActionType {
@ -1420,9 +1420,9 @@ public class mbEnums { @@ -1420,9 +1420,9 @@ public class mbEnums {
// Need to figure out what this signature looks like.
// Identical to behaviours?
public void execute(AbstractCharacter caster, AbstractWorldObject target, Power power,
Integer rank, PowerAction powerAction) {
function.execute(caster, target, power, rank, powerAction);
public void execute(AbstractCharacter caster, Power power, Integer rank, AbstractWorldObject target,
PowerAction powerAction) {
function.execute(caster, power, rank, target, powerAction);
}
}

116
src/engine/wpakpowers/Actions.java
Unescape View File

@ -17,8 +17,8 @@ import engine.wpak.data.PowerAction; @@ -17,8 +17,8 @@ import engine.wpak.data.PowerAction;
public class Actions {
public static void ApplyEffects(AbstractCharacter caster, AbstractWorldObject target, Power power,
Integer rank, PowerAction powerAction) {
public static void ApplyEffects(AbstractCharacter caster, Power power,
Integer rank, AbstractWorldObject target, PowerAction powerAction) {
// Iterate effects for this powerAction and apply
@ -48,143 +48,143 @@ public class Actions { @@ -48,143 +48,143 @@ public class Actions {
// target.updateBonuses() here?
}
public static void Block(AbstractCharacter caster, AbstractWorldObject target, Power power,
Integer rank, PowerAction powerAction) {
public static void Block(AbstractCharacter caster, Power power,
Integer rank, AbstractWorldObject target, PowerAction powerAction) {
System.out.println("PowerAction method called");
}
public static void Charm(AbstractCharacter caster, AbstractWorldObject target, Power power,
Integer rank, PowerAction powerAction) {
public static void Charm(AbstractCharacter caster, Power power,
Integer rank, AbstractWorldObject target, PowerAction powerAction) {
System.out.println("PowerAction method called");
}
public static void ClaimMine(AbstractCharacter caster, AbstractWorldObject target, Power power,
Integer rank, PowerAction powerAction) {
public static void ClaimMine(AbstractCharacter caster, Power power,
Integer rank, AbstractWorldObject target, PowerAction powerAction) {
System.out.println("PowerAction method called");
}
public static void ClearAggro(AbstractCharacter caster, AbstractWorldObject target, Power power,
Integer rank, PowerAction powerAction) {
public static void ClearAggro(AbstractCharacter caster, Power power,
Integer rank, AbstractWorldObject target, PowerAction powerAction) {
System.out.println("PowerAction method called");
}
public static void ClearNearbyAggro(AbstractCharacter caster, AbstractWorldObject target, Power power,
Integer rank, PowerAction powerAction) {
public static void ClearNearbyAggro(AbstractCharacter caster, Power power,
Integer rank, AbstractWorldObject target, PowerAction powerAction) {
System.out.println("PowerAction method called");
}
public static void Confusion(AbstractCharacter caster, AbstractWorldObject target, Power power,
Integer rank, PowerAction powerAction) {
public static void Confusion(AbstractCharacter caster, Power power,
Integer rank, AbstractWorldObject target, PowerAction powerAction) {
System.out.println("PowerAction method called");
}
public static void CreateMob(AbstractCharacter caster, AbstractWorldObject target, Power power,
Integer rank, PowerAction powerAction) {
public static void CreateMob(AbstractCharacter caster, Power power,
Integer rank, AbstractWorldObject target, PowerAction powerAction) {
System.out.println("PowerAction method called");
}
public static void DamageOverTime(AbstractCharacter caster, AbstractWorldObject target, Power power,
Integer rank, PowerAction powerAction) {
public static void DamageOverTime(AbstractCharacter caster, Power power,
Integer rank, AbstractWorldObject target, PowerAction powerAction) {
System.out.println("PowerAction method called");
}
public static void DeferredPower(AbstractCharacter caster, AbstractWorldObject target, Power power,
Integer rank, PowerAction powerAction) {
public static void DeferredPower(AbstractCharacter caster, Power power,
Integer rank, AbstractWorldObject target, PowerAction powerAction) {
System.out.println("PowerAction method called");
}
public static void DirectDamage(AbstractCharacter caster, AbstractWorldObject target, Power power,
Integer rank, PowerAction powerAction) {
public static void DirectDamage(AbstractCharacter caster, Power power,
Integer rank, AbstractWorldObject target, PowerAction powerAction) {
System.out.println("PowerAction method called");
}
public static void Invis(AbstractCharacter caster, AbstractWorldObject target, Power power,
Integer rank, PowerAction powerAction) {
public static void Invis(AbstractCharacter caster, Power power,
Integer rank, AbstractWorldObject target, PowerAction powerAction) {
System.out.println("PowerAction method called");
}
public static void MobRecall(AbstractCharacter caster, AbstractWorldObject target, Power power,
Integer rank, PowerAction powerAction) {
public static void MobRecall(AbstractCharacter caster, Power power,
Integer rank, AbstractWorldObject target, PowerAction powerAction) {
System.out.println("PowerAction method called");
}
public static void Peek(AbstractCharacter caster, AbstractWorldObject target, Power power,
Integer rank, PowerAction powerAction) {
public static void Peek(AbstractCharacter caster, Power power,
Integer rank, AbstractWorldObject target, PowerAction powerAction) {
System.out.println("PowerAction method called");
}
public static void Recall(AbstractCharacter caster, AbstractWorldObject target, Power power,
Integer rank, PowerAction powerAction) {
public static void Recall(AbstractCharacter caster, Power power,
Integer rank, AbstractWorldObject target, PowerAction powerAction) {
System.out.println("PowerAction method called");
}
public static void RemoveEffect(AbstractCharacter caster, AbstractWorldObject target, Power power,
Integer rank, PowerAction powerAction) {
public static void RemoveEffect(AbstractCharacter caster, Power power,
Integer rank, AbstractWorldObject target, PowerAction powerAction) {
System.out.println("PowerAction method called");
}
public static void Resurrect(AbstractCharacter caster, AbstractWorldObject target, Power power,
Integer rank, PowerAction powerAction) {
public static void Resurrect(AbstractCharacter caster, Power power,
Integer rank, AbstractWorldObject target, PowerAction powerAction) {
System.out.println("PowerAction method called");
}
public static void RunegateTeleport(AbstractCharacter caster, AbstractWorldObject target, Power power,
Integer rank, PowerAction powerAction) {
public static void RunegateTeleport(AbstractCharacter caster, Power power,
Integer rank, AbstractWorldObject target, PowerAction powerAction) {
System.out.println("PowerAction method called");
}
public static void SetItemFlag(AbstractCharacter caster, AbstractWorldObject target, Power power,
Integer rank, PowerAction powerAction) {
public static void SetItemFlag(AbstractCharacter caster, Power power,
Integer rank, AbstractWorldObject target, PowerAction powerAction) {
System.out.println("PowerAction method called");
}
public static void SimpleDamage(AbstractCharacter caster, AbstractWorldObject target, Power power,
Integer rank, PowerAction powerAction) {
public static void SimpleDamage(AbstractCharacter caster, Power power,
Integer rank, AbstractWorldObject target, PowerAction powerAction) {
System.out.println("PowerAction method called");
}
public static void SpireDisable(AbstractCharacter caster, AbstractWorldObject target, Power power,
Integer rank, PowerAction powerAction) {
public static void SpireDisable(AbstractCharacter caster, Power power,
Integer rank, AbstractWorldObject target, PowerAction powerAction) {
System.out.println("PowerAction method called");
}
public static void Steal(AbstractCharacter caster, AbstractWorldObject target, Power power,
Integer rank, PowerAction powerAction) {
public static void Steal(AbstractCharacter caster, Power power,
Integer rank, AbstractWorldObject target, PowerAction powerAction) {
System.out.println("PowerAction method called");
}
public static void Summon(AbstractCharacter caster, AbstractWorldObject target, Power power,
Integer rank, PowerAction powerAction) {
public static void Summon(AbstractCharacter caster, Power power,
Integer rank, AbstractWorldObject target, PowerAction powerAction) {
System.out.println("PowerAction method called");
}
public static void Teleport(AbstractCharacter caster, AbstractWorldObject target, Power power,
Integer rank, PowerAction powerAction) {
public static void Teleport(AbstractCharacter caster, Power power,
Integer rank, AbstractWorldObject target, PowerAction powerAction) {
System.out.println("PowerAction method called");
}
public static void Track(AbstractCharacter caster, AbstractWorldObject target, Power power,
Integer rank, PowerAction powerAction) {
public static void Track(AbstractCharacter caster, Power power,
Integer rank, AbstractWorldObject target, PowerAction powerAction) {
System.out.println("PowerAction method called");
}
public static void TransferStat(AbstractCharacter caster, AbstractWorldObject target, Power power,
Integer rank, PowerAction powerAction) {
public static void TransferStat(AbstractCharacter caster, Power power,
Integer rank, AbstractWorldObject target, PowerAction powerAction) {
System.out.println("PowerAction method called");
}
public static void TransferStatOT(AbstractCharacter caster, AbstractWorldObject target, Power power,
Integer rank, PowerAction powerAction) {
public static void TransferStatOT(AbstractCharacter caster, Power power,
Integer rank, AbstractWorldObject target, PowerAction powerAction) {
System.out.println("PowerAction method called");
}
public static void Transform(AbstractCharacter caster, AbstractWorldObject target, Power power,
Integer rank, PowerAction powerAction) {
public static void Transform(AbstractCharacter caster, Power power,
Integer rank, AbstractWorldObject target, PowerAction powerAction) {
System.out.println("PowerAction method called");
}
public static void TreeChoke(AbstractCharacter caster, AbstractWorldObject target, Power power,
Integer rank, PowerAction powerAction) {
public static void TreeChoke(AbstractCharacter caster, Power power,
Integer rank, AbstractWorldObject target, PowerAction powerAction) {
System.out.println("PowerAction method called");
}
}

2
src/engine/wpakpowers/WpakPowerManager.java
Unescape View File

@ -351,7 +351,7 @@ public class WpakPowerManager { @@ -351,7 +351,7 @@ public class WpakPowerManager {
continue;
}
powerAction.action_type.execute(caster, target, power, rank,
powerAction.action_type.execute(caster, power, rank, target,
powerAction);
}
}

Write Preview
Loading…
Cancel
Save