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

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;