From fab77a0dbbaf43f33a797528877e6d54828b00b6 Mon Sep 17 00:00:00 2001 From: MagicBot Date: Mon, 19 Aug 2024 13:13:31 -0400 Subject: [PATCH] PowerAction work started. --- src/engine/wpak/PowersParser.java | 4 ++-- src/engine/wpak/data/PowerActionEntry.java | 6 ++++++ src/engine/wpak/data/PowerEntry.java | 4 ++-- .../wpak/data/{EffectPreReq.java => effectDescription.java} | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) rename src/engine/wpak/data/{EffectPreReq.java => effectDescription.java} (96%) diff --git a/src/engine/wpak/PowersParser.java b/src/engine/wpak/PowersParser.java index bb58d73b..cb4760bc 100644 --- a/src/engine/wpak/PowersParser.java +++ b/src/engine/wpak/PowersParser.java @@ -216,7 +216,7 @@ public class PowersParser { powerEntry.bladeTrails = Boolean.parseBoolean(lineValues[1].trim()); break; case "EFFECTPREREQ": - EffectPreReq effectPreReq = new EffectPreReq(); + effectDescription effectPreReq = new effectDescription(); arguments = lineValues[1].trim().split("\\s+"); effectPreReq.effect_id = arguments[9]; effectPreReq.level = Integer.parseInt(arguments[1]); @@ -260,7 +260,7 @@ public class PowersParser { powerEntry.casterPulseParticle = Integer.parseInt(lineValues[1].trim()); break; case "TARGETEFFECTPREREQS_ORED": - EffectPreReq preReq = new EffectPreReq(); + effectDescription preReq = new effectDescription(); arguments = lineValues[1].trim().split("\\s+"); preReq.effect_id = arguments[0]; preReq.level = Integer.parseInt(arguments[1]); diff --git a/src/engine/wpak/data/PowerActionEntry.java b/src/engine/wpak/data/PowerActionEntry.java index 17da215e..7c84e16a 100644 --- a/src/engine/wpak/data/PowerActionEntry.java +++ b/src/engine/wpak/data/PowerActionEntry.java @@ -8,5 +8,11 @@ package engine.wpak.data; +import java.util.ArrayList; + public class PowerActionEntry { + public String action_id; + public String action_type; + public ArrayList effects; + } diff --git a/src/engine/wpak/data/PowerEntry.java b/src/engine/wpak/data/PowerEntry.java index 915bc8ac..fa1e663f 100644 --- a/src/engine/wpak/data/PowerEntry.java +++ b/src/engine/wpak/data/PowerEntry.java @@ -50,7 +50,7 @@ public class PowerEntry { public String category; public boolean canCastWhileMoving = false; public boolean bladeTrails = false; - public ArrayList effectPreReqs = new ArrayList<>(); + public ArrayList effectPreReqs = new ArrayList<>(); public EquipmentPreReq equipmentPreReq; public EnumSet monsterRestricts = EnumSet.noneOf(mbEnums.MonsterType.class); public EnumSet monsterPrereqs = EnumSet.noneOf(mbEnums.MonsterType.class); @@ -62,7 +62,7 @@ public class PowerEntry { public int maxPlayerTargets; public boolean isAdminPower = false; public int casterPulseParticle; - public ArrayList targetEffectPrereqs = new ArrayList<>(); + public ArrayList targetEffectPrereqs = new ArrayList<>(); public boolean canCastWhileFlying = false; public boolean isProjectile = false; public HashMap conditions = new HashMap<>(); diff --git a/src/engine/wpak/data/EffectPreReq.java b/src/engine/wpak/data/effectDescription.java similarity index 96% rename from src/engine/wpak/data/EffectPreReq.java rename to src/engine/wpak/data/effectDescription.java index 512109f1..bc812c5f 100644 --- a/src/engine/wpak/data/EffectPreReq.java +++ b/src/engine/wpak/data/effectDescription.java @@ -8,7 +8,7 @@ package engine.wpak.data; -public class EffectPreReq { +public class effectDescription { public String effect_id; public int level; public String message;