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);