Merge branch 'feature-config-parsing2' into feature-config-usage

src/engine/wpak/data/ConditionEntry.java

@@ -0,0 +1,21 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2024
+//                www.magicbane.com
+//
+package engine.wpak.data;
+
+import engine.mbEnums;
+
+import java.util.EnumSet;
+
+public class ConditionEntry {
+    public String condition;
+    public int arg;
+    public mbEnums.CompoundCurveType curveType;
+    public EnumSet<mbEnums.DamageType> damageTypes = EnumSet.noneOf(mbEnums.DamageType.class);
+
+}

src/engine/wpak/data/EffectEntry.java

@@ -11,7 +11,6 @@ package engine.wpak.data;
 import engine.powers.effectmodifiers.AbstractEffectModifier;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 
 public class EffectEntry {
@@ -20,7 +19,7 @@ public class EffectEntry {
     public int icon;
     public HashSet<String> sources = new HashSet<>();
     public ArrayList<EffectModifier> mods = new ArrayList<>();
-    public HashMap<String, Float> conditions = new HashMap<>();
+    public ArrayList<ConditionEntry> conditions = new ArrayList<>();
 
     public boolean isItemEffect;
     public boolean isSpireEffect;

src/engine/wpak/data/EquipmentPreReq.java

@@ -14,6 +14,6 @@ public class EquipmentPreReq {
 
     public mbEnums.EquipSlotType slot;
     public String skill;
-    public int level;
+    public int required;
 
 }

src/engine/wpak/data/PowerEntry.java

@@ -50,7 +50,7 @@ public class PowerEntry {
     public boolean canCastWhileMoving = false;
     public boolean bladeTrails = false;
     public ArrayList<EffectDescription> effectPreReqs = new ArrayList<>();
-    public EquipmentPreReq equipmentPreReq;
+    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);
     public boolean shouldCheckPath = false;