forked from MagicBane/Server
Signature updated for actions
This commit is contained in:
@@ -302,7 +302,7 @@ public class WpakPowerManager {
|
||||
if (powerUsed.maxMobTargets > 1 || powerUsed.maxPlayerTargets > 1)
|
||||
AoeHandler(caster, target, powerUsed, msg.getNumTrains());
|
||||
else
|
||||
applyAllPowerEffects(caster, powerUsed, msg.getNumTrains(), target);
|
||||
runPowerActions(caster, powerUsed, msg.getNumTrains(), target);
|
||||
}
|
||||
|
||||
private static void AoeHandler(PlayerCharacter caster, AbstractWorldObject target, Power powerUsed, int rank) {
|
||||
@@ -319,7 +319,7 @@ public class WpakPowerManager {
|
||||
|
||||
for (AbstractWorldObject mob : mobTargets) {
|
||||
if (count < powerUsed.maxMobTargets + 1) {
|
||||
applyAllPowerEffects(caster, powerUsed, rank, mob);
|
||||
runPowerActions(caster, powerUsed, rank, mob);
|
||||
count++;
|
||||
} else {
|
||||
break;
|
||||
@@ -329,7 +329,7 @@ public class WpakPowerManager {
|
||||
count = 1;
|
||||
for (AbstractWorldObject pc : pcTargets) {
|
||||
if (count < powerUsed.maxPlayerTargets + 1) {
|
||||
applyAllPowerEffects(caster, powerUsed, rank, pc);
|
||||
runPowerActions(caster, powerUsed, rank, pc);
|
||||
count++;
|
||||
} else {
|
||||
break;
|
||||
@@ -337,7 +337,10 @@ public class WpakPowerManager {
|
||||
}
|
||||
}
|
||||
|
||||
public static void applyAllPowerEffects(AbstractCharacter caster, Power power, int rank, AbstractWorldObject target) {
|
||||
public static void runPowerActions(AbstractCharacter caster, Power power, int rank, AbstractWorldObject target) {
|
||||
|
||||
// Iterate through the poweractions for this
|
||||
// power and execute them..
|
||||
|
||||
for (ActionEntry actionEntry : power.actionEntries) {
|
||||
|
||||
@@ -348,6 +351,9 @@ public class WpakPowerManager {
|
||||
continue;
|
||||
}
|
||||
|
||||
powerAction.action_type.execute(caster, target, power, rank,
|
||||
powerAction);
|
||||
|
||||
// Iterate effects for this powerAction and apply
|
||||
|
||||
for (Effect effect : powerAction.effects) {
|
||||
|
||||
Reference in New Issue
Block a user