diff --git a/src/engine/mbEnums.java b/src/engine/mbEnums.java index 71f10564..2078b0f1 100644 --- a/src/engine/mbEnums.java +++ b/src/engine/mbEnums.java @@ -3052,7 +3052,22 @@ public class mbEnums { PLAYERS, ALLBUTGROUP, ALLBUTPETS; + } + + public enum CastingModeType { + NONE, + COMBAT, + NONCOMBAT, + BOTH; + } + public enum TargetSelectType { + NONE, + CLICK, + GROUP, + GUILD, + NEARBYMOBS, + NAME; } } diff --git a/src/engine/wpak/PowerEntry.java b/src/engine/wpak/PowerEntry.java index 7c357cef..968817cc 100644 --- a/src/engine/wpak/PowerEntry.java +++ b/src/engine/wpak/PowerEntry.java @@ -29,8 +29,8 @@ public class PowerEntry { public float release_time; public float recycle_time; public int hitRollYN; - public String castingMode; + public mbEnums.CastingModeType castingMode; public int initAmin; public int releaseAnim; - public String targetSelect; + public mbEnums.TargetSelectType targetSelect; } diff --git a/src/engine/wpak/PowersParser.java b/src/engine/wpak/PowersParser.java index 060f2146..a70f5e24 100644 --- a/src/engine/wpak/PowersParser.java +++ b/src/engine/wpak/PowersParser.java @@ -99,10 +99,10 @@ public class PowersParser { powerEntry.release_time = Float.parseFloat(iterator.next()); powerEntry.recycle_time = Float.parseFloat(iterator.next()); powerEntry.hitRollYN = Integer.parseInt(iterator.next()); - powerEntry.castingMode = iterator.next(); + powerEntry.castingMode = mbEnums.CastingModeType.valueOf(iterator.next()); powerEntry.initAmin = Integer.parseInt(iterator.next()); powerEntry.releaseAnim = Integer.parseInt(iterator.next()); - powerEntry.targetSelect = iterator.next(); + powerEntry.targetSelect = mbEnums.TargetSelectType.valueOf(iterator.next()); for (int x = 2; x < powerEntries.length; x++) {