parser now uses poweractiontype

src/engine/wpak/PowerActionParser.java

@@ -84,26 +84,26 @@ public class PowerActionParser {
 
         Iterator<String> headerIterator = headerData.iterator();
         powerAction.action_id = headerIterator.next();
-        powerAction.action_type = headerIterator.next();
+        powerAction.action_type = mbEnums.PowerActionType.valueOf(headerIterator.next());
 
         switch (powerAction.action_type) {
-            case "RemoveEffect":
+            case RemoveEffect:
                 effect = new Effect();
                 effect.effect_id = headerIterator.next();
                 powerAction.effects.add(effect);
                 break;
-            case "CreateMob":
+            case CreateMob:
                 powerAction.petRace = Integer.parseInt(headerIterator.next());
                 powerAction.petLevel = Integer.parseInt(headerIterator.next());
                 break;
-            case "DamageOverTime":
+            case DamageOverTime:
                 effect = new Effect();
                 effect.effect_id = headerIterator.next();
                 effect.cycleDuration = Integer.parseInt(headerIterator.next());
                 effect.cycleDelay = Integer.parseInt(headerIterator.next());
                 powerAction.effects.add(effect);
                 break;
-            case "ApplyEffects":
+            case ApplyEffects:
                 int level = Integer.parseInt(headerIterator.next());
 
                 while (headerIterator.hasNext()) {
@@ -113,12 +113,12 @@ public class PowerActionParser {
                     powerAction.effects.add(effect);
                 }
                 break;
-            case "Transform":
-            case "Invis":
-            case "ApplyEffect":
-            case "DeferredPower":
-            case "DirectDamage":
-            case "SpireDisable":
+            case Transform:
+            case Invis:
+            case ApplyEffect:
+            case DeferredPower:
+            case DirectDamage:
+            case SpireDisable:
                 while (headerIterator.hasNext()) {
                     effect = new Effect();
                     effect.effect_id = headerIterator.next();
@@ -131,7 +131,7 @@ public class PowerActionParser {
                     powerAction.effects.add(effect);
                 }
                 break;
-            case "TransferStat":
+            case TransferStat:
                 statTransfer = new StatTransfer();
                 statTransfer.fromStat = mbEnums.CostType.valueOf(headerIterator.next());
                 statTransfer.toStat = mbEnums.CostType.valueOf(headerIterator.next());
@@ -143,7 +143,7 @@ public class PowerActionParser {
                 statTransfer.isDrain = Boolean.parseBoolean(headerIterator.next());
                 powerAction.statTransfer = statTransfer;
                 break;
-            case "TransferStatOT":
+            case TransferStatOT:
                 statTransfer = new StatTransfer();
                 statTransfer.fromStat = mbEnums.CostType.valueOf(headerIterator.next());
                 statTransfer.toStat = mbEnums.CostType.valueOf(headerIterator.next());
@@ -157,26 +157,26 @@ public class PowerActionParser {
                 statTransfer.transfer_ticks = Integer.parseInt(headerIterator.next());
                 powerAction.statTransfer = statTransfer;
                 break;
-            case "Charm":
+            case Charm:
                 effect = new Effect();
                 effect.effect_id = headerIterator.next();
                 effect.level = Integer.parseInt(headerIterator.next());
                 effect.type = headerIterator.next();
                 powerAction.effects.add(effect);
                 break;
-            case "Block":
+            case Block:
                 effect = new Effect();
                 effect.effect_id = headerIterator.next();
                 effect.level = Integer.parseInt(headerIterator.next());
                 powerAction.effects.add(effect);
                 break;
-            case "Resurrect":
+            case Resurrect:
                 powerAction.ramp = Integer.parseInt(headerIterator.next());
                 break;
-            case "SetItemFlag":
+            case SetItemFlag:
                 powerAction.itemFlag = mbEnums.ItemFlags.valueOf(headerIterator.next());
                 break;
-            case "Track":
+            case Track:
                 trackEntry = new TrackEntry();
                 trackEntry.action_id = headerIterator.next();
                 trackEntry.trackPlayer = Boolean.parseBoolean(headerIterator.next());
@@ -186,21 +186,21 @@ public class PowerActionParser {
                 trackEntry.max = Integer.parseInt(headerIterator.next());
                 powerAction.trackEntry = trackEntry;
                 break;
-            case "Teleport":
+            case Teleport:
                 if (headerIterator.hasNext())
                     powerAction.ignoreNoTeleSpire = Boolean.parseBoolean(headerIterator.next());
                 break;
-            case "Recall": // No arguments for these tags or not parsed
-            case "Summon":
-            case "TreeChoke":
-            case "SimpleDamage":
-            case "MobRecall": // One argument always zero
-            case "ClearAggro":
-            case "ClearNearbyAggro":
-            case "Peek":
-            case "ClaimMine":
-            case "RunegateTeleport":
-            case "Steal":
+            case Recall: // No arguments for these tags or not parsed
+            case Summon:
+            case TreeChoke:
+            case SimpleDamage:
+            case MobRecall: // One argument always zero
+            case ClearAggro:
+            case ClearNearbyAggro:
+            case Peek:
+            case ClaimMine:
+            case RunegateTeleport:
+            case Steal:
                 break;
             default:
                 Logger.error("Unhandled type " + powerAction.action_type + " for Pow4erAction: " + powerAction.action_id);

src/engine/wpak/data/PowerAction.java

@@ -18,7 +18,7 @@ public class PowerAction {
     // Header values
 
     public String action_id;
-    public String action_type;
+    public mbEnums.PowerActionType action_type;
     public ArrayList<Effect> effects = new ArrayList<>();
     public int petLevel;
     public int petRace;