EffectDescription refactored out.

src/engine/wpak/data/Effect.java

@@ -11,7 +11,7 @@ package engine.wpak.data;
 import java.util.ArrayList;
 import java.util.HashSet;
 
-public class EffectEntry {
+public class Effect {
     public String effect_id;
     public String effect_name;
     public int icon;
@@ -19,8 +19,17 @@ public class EffectEntry {
     public ArrayList<EffectModifier> mods = new ArrayList<>();
     public ArrayList<ConditionEntry> conditions = new ArrayList<>();
 
+    // Additional variables outside of tags or parsed
+    // elsewhere from Effects.cfg
+
     public boolean isItemEffect;
     public boolean isSpireEffect;
     public boolean ignoreNoMod;
     public boolean dontSave;
+
+    public String type;
+    public int level;
+    public String message;
+    public int cycleDuration;
+    public int cycleDelay;
 }

src/engine/wpak/data/EffectDescription.java

@@ -1,18 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2024
-//                www.magicbane.com
-
-package engine.wpak.data;
-
-public class EffectDescription {
-    public String effect_id;
-    public String type;
-    public int level;
-    public String message;
-    public int cycleDuration;
-    public int cycleDelay;
-}

src/engine/wpak/data/Power.java

@@ -14,7 +14,7 @@ import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.HashMap;
 
-public class PowerEntry {
+public class Power {
     public String power_id;
     public String power;
     public ArrayList<PowerData> powers = new ArrayList<>();
@@ -49,7 +49,7 @@ public class PowerEntry {
     public String category;
     public boolean canCastWhileMoving = false;
     public boolean bladeTrails = false;
-    public ArrayList<EffectDescription> effectPreReqs = new ArrayList<>();
+    public ArrayList<Effect> effectPreReqs = new ArrayList<>();
     public ArrayList<EquipmentPreReq> equipmentPreReq = new ArrayList<>();
     public EnumSet<mbEnums.MonsterType> monsterRestricts = EnumSet.noneOf(mbEnums.MonsterType.class);
     public EnumSet<mbEnums.MonsterType> monsterPrereqs = EnumSet.noneOf(mbEnums.MonsterType.class);
@@ -61,7 +61,7 @@ public class PowerEntry {
     public int maxPlayerTargets;
     public boolean isAdminPower = false;
     public int casterPulseParticle;
-    public ArrayList<EffectDescription> targetEffectPrereqs = new ArrayList<>();
+    public ArrayList<Effect> targetEffectPrereqs = new ArrayList<>();
     public boolean canCastWhileFlying = false;
     public boolean isProjectile = false;
     public HashMap<String, Float> conditions = new HashMap<>();

src/engine/wpak/data/PowerAction.java

@@ -12,13 +12,13 @@ import engine.mbEnums;
 
 import java.util.ArrayList;
 
-public class PowerActionEntry {
+public class PowerAction {
 
     // Header values
 
     public String action_id;
     public String action_type;
-    public ArrayList<EffectDescription> effects = new ArrayList<>();
+    public ArrayList<Effect> effects = new ArrayList<>();
     public int petLevel;
     public int petRace;
     public StatTransfer statTransfer;