From a9a9b6a8ac7c958d4b4f184c9e85598de3a99902 Mon Sep 17 00:00:00 2001 From: MagicBot Date: Mon, 19 Aug 2024 13:13:54 -0400 Subject: [PATCH] PowerAction work started. --- src/engine/wpak/PowersParser.java | 4 ++-- .../data/{effectDescription.java => EffectDescription.java} | 2 +- src/engine/wpak/data/PowerActionEntry.java | 2 +- src/engine/wpak/data/PowerEntry.java | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) rename src/engine/wpak/data/{effectDescription.java => EffectDescription.java} (96%) diff --git a/src/engine/wpak/PowersParser.java b/src/engine/wpak/PowersParser.java index cb4760bc..6e2eeb3b 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": - effectDescription effectPreReq = new effectDescription(); + 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": - effectDescription preReq = new effectDescription(); + 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/effectDescription.java b/src/engine/wpak/data/EffectDescription.java similarity index 96% rename from src/engine/wpak/data/effectDescription.java rename to src/engine/wpak/data/EffectDescription.java index bc812c5f..ed6664b5 100644 --- a/src/engine/wpak/data/effectDescription.java +++ b/src/engine/wpak/data/EffectDescription.java @@ -8,7 +8,7 @@ package engine.wpak.data; -public class effectDescription { +public class EffectDescription { public String effect_id; public int level; public String message; diff --git a/src/engine/wpak/data/PowerActionEntry.java b/src/engine/wpak/data/PowerActionEntry.java index 7c84e16a..be1662f0 100644 --- a/src/engine/wpak/data/PowerActionEntry.java +++ b/src/engine/wpak/data/PowerActionEntry.java @@ -13,6 +13,6 @@ import java.util.ArrayList; public class PowerActionEntry { public String action_id; public String action_type; - public ArrayList effects; + public ArrayList effects; } diff --git a/src/engine/wpak/data/PowerEntry.java b/src/engine/wpak/data/PowerEntry.java index fa1e663f..9ff89257 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<>();