updated ModifierEntry contructors

src/engine/powers/EffectsBase.java

@@ -28,8 +28,8 @@ import engine.powers.effectmodifiers.*;
 import engine.server.MBServerStatics;
 import engine.util.Hasher;
 import engine.wpak.data.ConditionEntry;
-import engine.wpak.data.EffectEntry;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.Effect;
+import engine.wpak.data.ModifierEntry;
 import org.pmw.tinylog.Logger;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -87,7 +87,7 @@ public class EffectsBase {
      * EffectEntry Constructor
      */
 
-    public EffectsBase(EffectEntry entry) {
+    public EffectsBase(Effect entry) {
         this.IDString = entry.effect_id;
         this.name = entry.effect_name;
         this.token = Hasher.SBStringHash(entry.effect_name);
@@ -113,7 +113,7 @@ public class EffectsBase {
             this.isSuffix = true;
 
         //load effect modifiers
-        for (EffectModifier mod : entry.mods)
+        for (ModifierEntry mod : entry.mods)
             this.effectModifiers.add(getCombinedModifiers(null, mod, this, mod.type));
 
         //load sources
@@ -367,7 +367,7 @@ public class EffectsBase {
                 float duration = ab.getDurationInSeconds(trains);
                 if (pb.getToken() == 1672601862) {
 
-                    Effect eff = awo.getEffects().get("DeathShroud");
+                    engine.objects.Effect eff = awo.getEffects().get("DeathShroud");
 
 
                     if (eff != null) {
@@ -659,7 +659,7 @@ public class EffectsBase {
         this.name = name;
     }
 
-    public static AbstractEffectModifier getCombinedModifiers(AbstractEffectModifier abstractEffectModifier, EffectModifier rs, EffectsBase effectBase, mbEnums.ModType modifier){
+    public static AbstractEffectModifier getCombinedModifiers(AbstractEffectModifier abstractEffectModifier, ModifierEntry rs, EffectsBase effectBase, mbEnums.ModType modifier){
         switch (modifier) {
             case AdjustAboveDmgCap:
                 abstractEffectModifier = new AdjustAboveDmgCapEffectModifier(rs);

src/engine/powers/effectmodifiers/AbstractEffectModifier.java

@@ -17,7 +17,7 @@ import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
 import engine.powers.EffectsBase;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -40,25 +40,10 @@ public abstract class AbstractEffectModifier {
     protected String string1;
     protected String string2;
 
-    public AbstractEffectModifier(ResultSet rs) throws SQLException {
+    public AbstractEffectModifier(ResultSet rs){
 
-        this.UUID = rs.getInt("ID");
-        this.IDString = rs.getString("IDString");
-        this.effectType = rs.getString("modType");
-        this.modType = ModType.GetModType(this.effectType);
-        this.type = rs.getString("type").replace("\"", "");
-        this.sourceType = SourceType.GetSourceType(this.type.replace(" ", "").replace("-", ""));
-        this.minMod = rs.getFloat("minMod");
-        this.maxMod = rs.getFloat("maxMod");
-        this.percentMod = rs.getFloat("percentMod");
-        this.ramp = rs.getFloat("ramp");
-        this.useRampAdd = (rs.getInt("useRampAdd") == 1) ? true : false;
-
-        this.string1 = rs.getString("string1");
-        this.string2 = rs.getString("string2");
     }
-
-    public AbstractEffectModifier(EffectModifier mod) {
+    public AbstractEffectModifier(ModifierEntry mod) {
 
         this.IDString = mod.type.name();
         this.effectType = mod.type.name();
@@ -67,7 +52,7 @@ public abstract class AbstractEffectModifier {
         this.sourceType = SourceType.GetSourceType(this.type.replace(" ", "").replace("-", ""));
         this.minMod = mod.min;
         this.maxMod = mod.max;
-        this.percentMod = mod.scale;
+        this.percentMod = mod.value;
         this.ramp = (float)mod.compoundCurveType.getValue();
         this.useRampAdd = (float)mod.compoundCurveType.getValue() != 0;
 

src/engine/powers/effectmodifiers/AdjustAboveDmgCapEffectModifier.java

@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -19,11 +19,7 @@ import java.sql.SQLException;
 
 public class AdjustAboveDmgCapEffectModifier extends AbstractEffectModifier {
 
-    public AdjustAboveDmgCapEffectModifier(ResultSet rs) throws SQLException {
-        super(rs);
-    }
-
-    public AdjustAboveDmgCapEffectModifier(EffectModifier rs){
+    public AdjustAboveDmgCapEffectModifier(ModifierEntry rs){
         super(rs);
     }
 

src/engine/powers/effectmodifiers/AmbidexterityEffectModifier.java

@@ -13,7 +13,7 @@ import engine.jobs.AbstractEffectJob;
 import engine.mbEnums.ModType;
 import engine.mbEnums.SourceType;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -21,10 +21,7 @@ import java.sql.SQLException;
 
 public class AmbidexterityEffectModifier extends AbstractEffectModifier {
 
-    public AmbidexterityEffectModifier(ResultSet rs) throws SQLException {
-        super(rs);
-    }
-    public AmbidexterityEffectModifier(EffectModifier rs) {
+    public AmbidexterityEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/ArmorPiercingEffectModifier.java

@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -19,11 +19,7 @@ import java.sql.SQLException;
 
 public class ArmorPiercingEffectModifier extends AbstractEffectModifier {
 
-    public ArmorPiercingEffectModifier(ResultSet rs) throws SQLException {
-        super(rs);
-    }
-
-    public ArmorPiercingEffectModifier(EffectModifier rs){
+    public ArmorPiercingEffectModifier(ModifierEntry rs){
         super(rs);
     }
 

src/engine/powers/effectmodifiers/AttackDelayEffectModifier.java

@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class AttackDelayEffectModifier extends AbstractEffectModifier {
     public AttackDelayEffectModifier(ResultSet rs) throws SQLException {
         super(rs);
     }
-    public AttackDelayEffectModifier(EffectModifier rs){
+    public AttackDelayEffectModifier(ModifierEntry rs){
         super(rs);
     }
 

src/engine/powers/effectmodifiers/AttributeEffectModifier.java

@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -23,7 +23,7 @@ public class AttributeEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public AttributeEffectModifier(EffectModifier rs) {
+    public AttributeEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/BlackMantleEffectModifier.java

@@ -13,7 +13,8 @@ import engine.jobs.AbstractEffectJob;
 import engine.mbEnums.ModType;
 import engine.mbEnums.SourceType;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
+import engine.wpak.data.ModifierEntry;
 import org.pmw.tinylog.Logger;
 
 import java.sql.ResultSet;
@@ -26,7 +27,7 @@ public class BlackMantleEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public BlackMantleEffectModifier(EffectModifier rs) {
+    public BlackMantleEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/BladeTrailsEffectModifier.java

@@ -14,7 +14,7 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -25,7 +25,7 @@ public class BladeTrailsEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public BladeTrailsEffectModifier(EffectModifier rs) {
+    public BladeTrailsEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/BlockEffectModifier.java

@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -23,7 +23,7 @@ public class BlockEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public BlockEffectModifier(EffectModifier rs) {
+    public BlockEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/BlockedPowerTypeEffectModifier.java

@@ -12,7 +12,7 @@ package engine.powers.effectmodifiers;
 import engine.jobs.AbstractEffectJob;
 import engine.mbEnums.ModType;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -25,7 +25,7 @@ public class BlockedPowerTypeEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public BlockedPowerTypeEffectModifier(EffectModifier rs) {
+    public BlockedPowerTypeEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/CannotAttackEffectModifier.java

@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -23,7 +23,7 @@ public class CannotAttackEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public CannotAttackEffectModifier(EffectModifier rs) {
+    public CannotAttackEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/CannotCastEffectModifier.java

@@ -12,7 +12,7 @@ package engine.powers.effectmodifiers;
 import engine.jobs.AbstractEffectJob;
 import engine.mbEnums;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -24,7 +24,7 @@ public class CannotCastEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public CannotCastEffectModifier(EffectModifier rs) {
+    public CannotCastEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/CannotMoveEffectModifier.java

@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -23,7 +23,7 @@ public class CannotMoveEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public CannotMoveEffectModifier(EffectModifier rs) {
+    public CannotMoveEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/CannotTrackEffectModifier.java

@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -23,7 +23,7 @@ public class CannotTrackEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public CannotTrackEffectModifier(EffectModifier rs) {
+    public CannotTrackEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/CharmedEffectModifier.java

@@ -14,7 +14,7 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -25,7 +25,7 @@ public class CharmedEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public CharmedEffectModifier(EffectModifier rs) {
+    public CharmedEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/ConstrainedAmbidexterityEffectModifier.java

@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -23,7 +23,7 @@ public class ConstrainedAmbidexterityEffectModifier extends AbstractEffectModifi
         super(rs);
     }
 
-    public ConstrainedAmbidexterityEffectModifier(EffectModifier rs) {
+    public ConstrainedAmbidexterityEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/DCVEffectModifier.java

@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -23,7 +23,7 @@ public class DCVEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public DCVEffectModifier(EffectModifier rs) {
+    public DCVEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/DREffectModifier.java

@@ -14,7 +14,7 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -25,7 +25,7 @@ public class DREffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public DREffectModifier(EffectModifier rs) {
+    public DREffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/DamageCapEffectModifier.java

@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -23,7 +23,7 @@ public class DamageCapEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public DamageCapEffectModifier(EffectModifier rs) {
+    public DamageCapEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/DamageShieldEffectModifier.java

@@ -13,7 +13,7 @@ import engine.jobs.AbstractEffectJob;
 import engine.mbEnums;
 import engine.objects.*;
 import engine.powers.DamageShield;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -25,7 +25,7 @@ public class DamageShieldEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public DamageShieldEffectModifier(EffectModifier rs) {
+    public DamageShieldEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/DodgeEffectModifier.java

@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -23,7 +23,7 @@ public class DodgeEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public DodgeEffectModifier(EffectModifier rs) {
+    public DodgeEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/DurabilityEffectModifier.java

@@ -14,7 +14,7 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -25,7 +25,7 @@ public class DurabilityEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public DurabilityEffectModifier(EffectModifier rs) {
+    public DurabilityEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/ExclusiveDamageCapEffectModifier.java

@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -23,7 +23,7 @@ public class ExclusiveDamageCapEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public ExclusiveDamageCapEffectModifier(EffectModifier rs) {
+    public ExclusiveDamageCapEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/FadeEffectModifier.java

@@ -14,7 +14,7 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -25,7 +25,7 @@ public class FadeEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public FadeEffectModifier(EffectModifier rs) {
+    public FadeEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/FlyEffectModifier.java

@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class FlyEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public FlyEffectModifier(EffectModifier rs) {
+    public FlyEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/HealthEffectModifier.java

@@ -20,7 +20,7 @@ import engine.net.AbstractNetMsg;
 import engine.net.client.msg.ModifyHealthKillMsg;
 import engine.net.client.msg.ModifyHealthMsg;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 import org.pmw.tinylog.Logger;
 
 import java.sql.ResultSet;
@@ -42,7 +42,7 @@ public class HealthEffectModifier extends AbstractEffectModifier {
         }
     }
 
-    public HealthEffectModifier(EffectModifier rs) {
+    public HealthEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/HealthFullEffectModifier.java

@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class HealthFullEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public HealthFullEffectModifier(EffectModifier rs) {
+    public HealthFullEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/HealthRecoverRateEffectModifier.java

@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class HealthRecoverRateEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public HealthRecoverRateEffectModifier(EffectModifier rs) {
+    public HealthRecoverRateEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/IgnoreDamageCapEffectModifier.java

@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -23,7 +23,7 @@ public class IgnoreDamageCapEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public IgnoreDamageCapEffectModifier(EffectModifier rs) {
+    public IgnoreDamageCapEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/IgnorePassiveDefenseEffectModifier.java

@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class IgnorePassiveDefenseEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public IgnorePassiveDefenseEffectModifier(EffectModifier rs) {
+    public IgnorePassiveDefenseEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/ImmuneToAttackEffectModifier.java

@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class ImmuneToAttackEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public ImmuneToAttackEffectModifier(EffectModifier rs) {
+    public ImmuneToAttackEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/ImmuneToEffectModifier.java

@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class ImmuneToEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public ImmuneToEffectModifier(EffectModifier rs) {
+    public ImmuneToEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/ImmuneToPowersEffectModifier.java

@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class ImmuneToPowersEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public ImmuneToPowersEffectModifier(EffectModifier rs) {
+    public ImmuneToPowersEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/InvisibleEffectModifier.java

@@ -16,7 +16,7 @@ import engine.net.client.ClientConnection;
 import engine.objects.*;
 import engine.powers.ActionsBase;
 import engine.powers.PowersBase;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 import org.pmw.tinylog.Logger;
 
 import java.sql.ResultSet;
@@ -28,7 +28,7 @@ public class InvisibleEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public InvisibleEffectModifier(EffectModifier rs) {
+    public InvisibleEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/ItemNameEffectModifier.java

@@ -15,7 +15,7 @@ import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
 import engine.powers.EffectsBase;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -123,7 +123,7 @@ public class ItemNameEffectModifier extends AbstractEffectModifier {
         EffectsBase.addItemEffectsByName(n, IDString);
     }
 
-    public ItemNameEffectModifier(EffectModifier rs) {
+    public ItemNameEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/ManaEffectModifier.java

@@ -21,7 +21,7 @@ import engine.powers.ActionsBase;
 import engine.powers.poweractions.AbstractPowerAction;
 import engine.powers.poweractions.DamageOverTimePowerAction;
 import engine.powers.poweractions.DirectDamagePowerAction;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 import org.pmw.tinylog.Logger;
 
 import java.sql.ResultSet;
@@ -44,7 +44,7 @@ public class ManaEffectModifier extends AbstractEffectModifier {
         }
     }
 
-    public ManaEffectModifier(EffectModifier rs) {
+    public ManaEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/ManaFullEffectModifier.java

@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class ManaFullEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public ManaFullEffectModifier(EffectModifier rs) {
+    public ManaFullEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/ManaRecoverRateEffectModifier.java

@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class ManaRecoverRateEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public ManaRecoverRateEffectModifier(EffectModifier rs) {
+    public ManaRecoverRateEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/MaxDamageEffectModifier.java

@@ -14,7 +14,7 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -25,7 +25,7 @@ public class MaxDamageEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public MaxDamageEffectModifier(EffectModifier rs) {
+    public MaxDamageEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/MeleeDamageEffectModifier.java

@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class MeleeDamageEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public MeleeDamageEffectModifier(EffectModifier rs) {
+    public MeleeDamageEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/MinDamageEffectModifier.java

@@ -14,7 +14,7 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -25,7 +25,7 @@ public class MinDamageEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public MinDamageEffectModifier(EffectModifier rs) {
+    public MinDamageEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/NoModEffectModifier.java

@@ -12,7 +12,7 @@ package engine.powers.effectmodifiers;
 import engine.jobs.AbstractEffectJob;
 import engine.mbEnums.GameObjectType;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -23,7 +23,7 @@ public class NoModEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public NoModEffectModifier(EffectModifier rs) {
+    public NoModEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/OCVEffectModifier.java

@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class OCVEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public OCVEffectModifier(EffectModifier rs) {
+    public OCVEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/ParryEffectModifier.java

@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class ParryEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public ParryEffectModifier(EffectModifier rs) {
+    public ParryEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/PassiveDefenseEffectModifier.java

@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class PassiveDefenseEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public PassiveDefenseEffectModifier(EffectModifier rs) {
+    public PassiveDefenseEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/PowerCostEffectModifier.java

@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class PowerCostEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public PowerCostEffectModifier(EffectModifier rs) {
+    public PowerCostEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/PowerCostHealthEffectModifier.java

@@ -14,7 +14,7 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -25,7 +25,7 @@ public class PowerCostHealthEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public PowerCostHealthEffectModifier(EffectModifier rs) {
+    public PowerCostHealthEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/PowerDamageEffectModifier.java

@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class PowerDamageEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public PowerDamageEffectModifier(EffectModifier rs) {
+    public PowerDamageEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/ProtectionFromEffectModifier.java

@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class ProtectionFromEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public ProtectionFromEffectModifier(EffectModifier rs) {
+    public ProtectionFromEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/ResistanceEffectModifier.java

@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class ResistanceEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public ResistanceEffectModifier(EffectModifier rs) {
+    public ResistanceEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/ScaleHeightEffectModifier.java

@@ -14,7 +14,7 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -25,7 +25,7 @@ public class ScaleHeightEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public ScaleHeightEffectModifier(EffectModifier rs) {
+    public ScaleHeightEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/ScaleWidthEffectModifier.java

@@ -14,7 +14,7 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -25,7 +25,7 @@ public class ScaleWidthEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public ScaleWidthEffectModifier(EffectModifier rs) {
+    public ScaleWidthEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/ScanRangeEffectModifier.java

@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class ScanRangeEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public ScanRangeEffectModifier(EffectModifier rs) {
+    public ScanRangeEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/SeeInvisibleEffectModifier.java

@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class SeeInvisibleEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public SeeInvisibleEffectModifier(EffectModifier rs) {
+    public SeeInvisibleEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/SilencedEffectModifier.java

@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class SilencedEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public SilencedEffectModifier(EffectModifier rs) {
+    public SilencedEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/SkillEffectModifier.java

@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class SkillEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public SkillEffectModifier(EffectModifier rs) {
+    public SkillEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/SlayEffectModifier.java

@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class SlayEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public SlayEffectModifier(EffectModifier rs) {
+    public SlayEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/SpeedEffectModifier.java

@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class SpeedEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public SpeedEffectModifier(EffectModifier rs) {
+    public SpeedEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/SpireBlockEffectModifier.java

@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class SpireBlockEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public SpireBlockEffectModifier(EffectModifier rs) {
+    public SpireBlockEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/StaminaEffectModifier.java

@@ -21,7 +21,7 @@ import engine.powers.ActionsBase;
 import engine.powers.poweractions.AbstractPowerAction;
 import engine.powers.poweractions.DamageOverTimePowerAction;
 import engine.powers.poweractions.DirectDamagePowerAction;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 import org.pmw.tinylog.Logger;
 
 import java.sql.ResultSet;
@@ -44,7 +44,7 @@ public class StaminaEffectModifier extends AbstractEffectModifier {
         }
     }
 
-    public StaminaEffectModifier(EffectModifier rs) {
+    public StaminaEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/StaminaFullEffectModifier.java

@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class StaminaFullEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public StaminaFullEffectModifier(EffectModifier rs) {
+    public StaminaFullEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/StaminaRecoverRateEffectModifier.java

@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class StaminaRecoverRateEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public StaminaRecoverRateEffectModifier(EffectModifier rs) {
+    public StaminaRecoverRateEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/StunnedEffectModifier.java

@@ -12,7 +12,7 @@ package engine.powers.effectmodifiers;
 import engine.jobs.AbstractEffectJob;
 import engine.mbEnums.GameObjectType;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -23,7 +23,7 @@ public class StunnedEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public StunnedEffectModifier(EffectModifier rs) {
+    public StunnedEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/ValueEffectModifier.java

@@ -14,7 +14,7 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -25,7 +25,7 @@ public class ValueEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public ValueEffectModifier(EffectModifier rs) {
+    public ValueEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/WeaponProcEffectModifier.java

@@ -16,7 +16,7 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -27,7 +27,7 @@ public class WeaponProcEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public WeaponProcEffectModifier(EffectModifier rs) {
+    public WeaponProcEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/WeaponRangeEffectModifier.java

@@ -11,7 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,7 +22,7 @@ public class WeaponRangeEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public WeaponRangeEffectModifier(EffectModifier rs) {
+    public WeaponRangeEffectModifier(ModifierEntry rs) {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/WeaponSpeedEffectModifier.java

@@ -14,7 +14,7 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
-import engine.wpak.data.EffectModifier;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -25,7 +25,7 @@ public class WeaponSpeedEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public WeaponSpeedEffectModifier(EffectModifier rs) {
+    public WeaponSpeedEffectModifier(ModifierEntry rs) {
         super(rs);
     }