direct damage handler - power damage modifiers

Begin filling out first behaviour

src/engine/db/handlers/dbEffectsBaseHandler.java

@@ -1,303 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2022
-//                www.magicbane.com
-
-
-package engine.db.handlers;
-
-import engine.gameManager.DbManager;
-import engine.gameManager.PowersManager;
-import engine.mbEnums;
-import engine.powers.EffectsBase;
-import engine.powers.effectmodifiers.*;
-import org.pmw.tinylog.Logger;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.HashSet;
-
-public class dbEffectsBaseHandler extends dbHandlerBase {
-
-    public dbEffectsBaseHandler() {
-
-    }
-
-    public static ArrayList<EffectsBase> getAllEffectsBase() {
-
-        ArrayList<EffectsBase> effectList = new ArrayList<>();
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement prepareStatement = connection.prepareStatement("SELECT * FROM static_power_effectbase ORDER BY `IDString` DESC")) {
-
-            ResultSet rs = prepareStatement.executeQuery();
-
-            while (rs.next()) {
-                EffectsBase effectBase = new EffectsBase(rs);
-                effectList.add(effectBase);
-            }
-        } catch (SQLException e) {
-            Logger.error(e.toString());
-        }
-
-        return effectList;
-    }
-
-    public static void cacheAllEffectModifiers() {
-
-        String IDString;
-        AbstractEffectModifier abstractEffectModifier = null;
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement prepareStatement = connection.prepareStatement("SELECT * FROM static_power_effectmod")) {
-
-            ResultSet rs = prepareStatement.executeQuery();
-
-            while (rs.next()) {
-
-                IDString = rs.getString("IDString");
-                EffectsBase effectBase = PowersManager.getEffectByIDString(IDString);
-                mbEnums.ModType modifier = mbEnums.ModType.GetModType(rs.getString("modType"));
-
-                //combine item prefix and suffix effect modifiers
-
-                abstractEffectModifier = getCombinedModifiers(abstractEffectModifier, rs, effectBase, modifier);
-
-                if (abstractEffectModifier != null) {
-
-                    if (EffectsBase.modifiersMap.containsKey(effectBase.getIDString()) == false)
-                        EffectsBase.modifiersMap.put(effectBase.getIDString(), new HashSet<>());
-
-                    EffectsBase.modifiersMap.get(effectBase.getIDString()).add(abstractEffectModifier);
-
-                }
-
-            }
-
-        } catch (Exception e) {
-            Logger.error(e);
-        }
-
-    }
-
-    private static AbstractEffectModifier getCombinedModifiers(AbstractEffectModifier abstractEffectModifier, ResultSet rs, EffectsBase effectBase, mbEnums.ModType modifier) throws SQLException {
-        switch (modifier) {
-            case AdjustAboveDmgCap:
-                abstractEffectModifier = new AdjustAboveDmgCapEffectModifier(rs);
-                break;
-            case Ambidexterity:
-                abstractEffectModifier = new AmbidexterityEffectModifier(rs);
-                break;
-            case AnimOverride:
-                break;
-            case ArmorPiercing:
-                abstractEffectModifier = new ArmorPiercingEffectModifier(rs);
-                break;
-            case AttackDelay:
-                abstractEffectModifier = new AttackDelayEffectModifier(rs);
-                break;
-            case Attr:
-                abstractEffectModifier = new AttributeEffectModifier(rs);
-                break;
-            case BlackMantle:
-                abstractEffectModifier = new BlackMantleEffectModifier(rs);
-                break;
-            case BladeTrails:
-                abstractEffectModifier = new BladeTrailsEffectModifier(rs);
-                break;
-            case Block:
-                abstractEffectModifier = new BlockEffectModifier(rs);
-                break;
-            case BlockedPowerType:
-                abstractEffectModifier = new BlockedPowerTypeEffectModifier(rs);
-                break;
-            case CannotAttack:
-                abstractEffectModifier = new CannotAttackEffectModifier(rs);
-                break;
-            case CannotCast:
-                abstractEffectModifier = new CannotCastEffectModifier(rs);
-                break;
-            case CannotMove:
-                abstractEffectModifier = new CannotMoveEffectModifier(rs);
-                break;
-            case CannotTrack:
-                abstractEffectModifier = new CannotTrackEffectModifier(rs);
-                break;
-            case Charmed:
-                abstractEffectModifier = new CharmedEffectModifier(rs);
-                break;
-            case ConstrainedAmbidexterity:
-                abstractEffectModifier = new ConstrainedAmbidexterityEffectModifier(rs);
-                break;
-            case DamageCap:
-                abstractEffectModifier = new DamageCapEffectModifier(rs);
-                break;
-            case DamageShield:
-                abstractEffectModifier = new DamageShieldEffectModifier(rs);
-                break;
-            case DCV:
-                abstractEffectModifier = new DCVEffectModifier(rs);
-                break;
-            case Dodge:
-                abstractEffectModifier = new DodgeEffectModifier(rs);
-                break;
-            case DR:
-                abstractEffectModifier = new DREffectModifier(rs);
-                break;
-            case Durability:
-                abstractEffectModifier = new DurabilityEffectModifier(rs);
-                break;
-            case ExclusiveDamageCap:
-                abstractEffectModifier = new ExclusiveDamageCapEffectModifier(rs);
-                break;
-            case Fade:
-                abstractEffectModifier = new FadeEffectModifier(rs);
-                break;
-            case Fly:
-                abstractEffectModifier = new FlyEffectModifier(rs);
-                break;
-            case Health:
-                abstractEffectModifier = new HealthEffectModifier(rs);
-                break;
-            case HealthFull:
-                abstractEffectModifier = new HealthFullEffectModifier(rs);
-                break;
-            case HealthRecoverRate:
-                abstractEffectModifier = new HealthRecoverRateEffectModifier(rs);
-                break;
-            case IgnoreDamageCap:
-                abstractEffectModifier = new IgnoreDamageCapEffectModifier(rs);
-                break;
-            case IgnorePassiveDefense:
-                abstractEffectModifier = new IgnorePassiveDefenseEffectModifier(rs);
-                break;
-            case ImmuneTo:
-                abstractEffectModifier = new ImmuneToEffectModifier(rs);
-                break;
-            case ImmuneToAttack:
-                abstractEffectModifier = new ImmuneToAttackEffectModifier(rs);
-                break;
-            case ImmuneToPowers:
-                abstractEffectModifier = new ImmuneToPowersEffectModifier(rs);
-                break;
-            case Invisible:
-                abstractEffectModifier = new InvisibleEffectModifier(rs);
-                break;
-            case ItemName:
-                abstractEffectModifier = new ItemNameEffectModifier(rs);
-                if (((ItemNameEffectModifier) abstractEffectModifier).name.isEmpty())
-                    break;
-                if (effectBase != null)
-                    effectBase.setName((((ItemNameEffectModifier) abstractEffectModifier).name));
-                break;
-            case Mana:
-                abstractEffectModifier = new ManaEffectModifier(rs);
-                break;
-            case ManaFull:
-                abstractEffectModifier = new ManaFullEffectModifier(rs);
-                break;
-            case ManaRecoverRate:
-                abstractEffectModifier = new ManaRecoverRateEffectModifier(rs);
-                break;
-            case MaxDamage:
-                abstractEffectModifier = new MaxDamageEffectModifier(rs);
-                break;
-            case MeleeDamageModifier:
-                abstractEffectModifier = new MeleeDamageEffectModifier(rs);
-                break;
-            case MinDamage:
-                abstractEffectModifier = new MinDamageEffectModifier(rs);
-                break;
-            case NoMod:
-                abstractEffectModifier = new NoModEffectModifier(rs);
-                break;
-            case OCV:
-                abstractEffectModifier = new OCVEffectModifier(rs);
-                break;
-            case Parry:
-                abstractEffectModifier = new ParryEffectModifier(rs);
-                break;
-            case PassiveDefense:
-                abstractEffectModifier = new PassiveDefenseEffectModifier(rs);
-                break;
-            case PowerCost:
-                abstractEffectModifier = new PowerCostEffectModifier(rs);
-                break;
-            case PowerCostHealth:
-                abstractEffectModifier = new PowerCostHealthEffectModifier(rs);
-                break;
-            case PowerDamageModifier:
-                abstractEffectModifier = new PowerDamageEffectModifier(rs);
-                break;
-            case ProtectionFrom:
-                abstractEffectModifier = new ProtectionFromEffectModifier(rs);
-                break;
-            case Resistance:
-                abstractEffectModifier = new ResistanceEffectModifier(rs);
-                break;
-            case ScaleHeight:
-                abstractEffectModifier = new ScaleHeightEffectModifier(rs);
-                break;
-            case ScaleWidth:
-                abstractEffectModifier = new ScaleWidthEffectModifier(rs);
-                break;
-            case ScanRange:
-                abstractEffectModifier = new ScanRangeEffectModifier(rs);
-                break;
-            case SeeInvisible:
-                abstractEffectModifier = new SeeInvisibleEffectModifier(rs);
-                break;
-            case Silenced:
-                abstractEffectModifier = new SilencedEffectModifier(rs);
-                break;
-            case Skill:
-                abstractEffectModifier = new SkillEffectModifier(rs);
-                break;
-            case Slay:
-                abstractEffectModifier = new SlayEffectModifier(rs);
-                break;
-            case Speed:
-                abstractEffectModifier = new SpeedEffectModifier(rs);
-                break;
-            case SpireBlock:
-                abstractEffectModifier = new SpireBlockEffectModifier(rs);
-                break;
-            case Stamina:
-                abstractEffectModifier = new StaminaEffectModifier(rs);
-                break;
-            case StaminaFull:
-                abstractEffectModifier = new StaminaFullEffectModifier(rs);
-                break;
-            case StaminaRecoverRate:
-                abstractEffectModifier = new StaminaRecoverRateEffectModifier(rs);
-                break;
-            case Stunned:
-                abstractEffectModifier = new StunnedEffectModifier(rs);
-                break;
-            case Value:
-                abstractEffectModifier = new ValueEffectModifier(rs);
-                if (effectBase != null) {
-                    ValueEffectModifier valueEffect = (ValueEffectModifier) abstractEffectModifier;
-                    effectBase.setValue(valueEffect.minMod);
-                }
-                break;
-            case WeaponProc:
-                abstractEffectModifier = new WeaponProcEffectModifier(rs);
-                break;
-            case WeaponRange:
-                abstractEffectModifier = new WeaponRangeEffectModifier(rs);
-                break;
-            case WeaponSpeed:
-                abstractEffectModifier = new WeaponSpeedEffectModifier(rs);
-                break;
-
-        }
-        return abstractEffectModifier;
-    }
-}

src/engine/db/handlers/dbLootHandler.java

@@ -221,20 +221,4 @@ public class dbLootHandler extends dbHandlerBase {
         return bootySets;
     }
 
-    public void LOAD_ENCHANT_VALUES() {
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT `IDString`, `minMod` FROM `static_power_effectmod` WHERE `modType` = ?")) {
-
-            preparedStatement.setString(1, "Value");
-            ResultSet rs = preparedStatement.executeQuery();
-
-            while (rs.next())
-                Item.addEnchantValue(rs.getString("IDString"), rs.getInt("minMod"));
-
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-    }
-
 }

src/engine/db/handlers/dbPowerHandler.java

@@ -1,82 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2022
-//                www.magicbane.com
-
-
-package engine.db.handlers;
-
-import engine.gameManager.DbManager;
-import engine.gameManager.PowersManager;
-import engine.mbEnums;
-import engine.objects.Mob;
-import engine.powers.EffectsBase;
-import org.pmw.tinylog.Logger;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.util.HashSet;
-
-public class dbPowerHandler extends dbHandlerBase {
-
-    public dbPowerHandler() {
-        this.localClass = Mob.class;
-        this.localObjectType = mbEnums.GameObjectType.valueOf(this.localClass.getSimpleName());
-    }
-
-    public static void addAllSourceTypes() {
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_power_sourcetype")) {
-
-            ResultSet rs = preparedStatement.executeQuery();
-            String IDString, source;
-
-            while (rs.next()) {
-                IDString = rs.getString("IDString");
-                int token = DbManager.hasher.SBStringHash(IDString);
-
-                source = rs.getString("source").replace("-", "").trim();
-                mbEnums.EffectSourceType effectSourceType = mbEnums.EffectSourceType.GetEffectSourceType(source);
-
-                if (EffectsBase.effectSourceTypeMap.containsKey(token) == false)
-                    EffectsBase.effectSourceTypeMap.put(token, new HashSet<>());
-
-                EffectsBase.effectSourceTypeMap.get(token).add(effectSourceType);
-            }
-        } catch (Exception e) {
-            Logger.error(e);
-        }
-    }
-
-    public static void addAllAnimationOverrides() {
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_power_animation_override")) {
-
-            ResultSet rs = preparedStatement.executeQuery();
-
-            String IDString;
-            int animation;
-            while (rs.next()) {
-                IDString = rs.getString("IDString");
-
-                EffectsBase eb = PowersManager.getEffectByIDString(IDString);
-                if (eb != null)
-                    IDString = eb.getIDString();
-
-                animation = rs.getInt("animation");
-                PowersManager.AnimationOverrides.put(IDString, animation);
-
-            }
-        } catch (Exception e) {
-            Logger.error(e);
-        }
-
-    }
-
-}

src/engine/devcmd/cmds/ApplyBonusCmd.java

@@ -1,156 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2022
-//                www.magicbane.com
-
-
-package engine.devcmd.cmds;
-
-import engine.devcmd.AbstractDevCmd;
-import engine.gameManager.ChatManager;
-import engine.gameManager.PowersManager;
-import engine.mbEnums.PowerActionType;
-import engine.objects.AbstractGameObject;
-import engine.objects.PlayerCharacter;
-import engine.powers.ActionsBase;
-import engine.powers.PowersBase;
-import engine.powers.effectmodifiers.AbstractEffectModifier;
-import engine.util.ThreadUtils;
-import org.pmw.tinylog.Logger;
-
-import java.util.HashMap;
-import java.util.HashSet;
-
-public class ApplyBonusCmd extends AbstractDevCmd {
-
-    public ApplyBonusCmd() {
-        super("applybonus");
-    }
-
-    @Override
-    protected void _doCmd(PlayerCharacter pcSender, String[] words,
-                          AbstractGameObject target) {
-
-        String action = words[0];
-
-        PowerActionType actionType = null;
-
-        HashMap<String, HashSet<String>> appliedMods = new HashMap<>();
-
-        try {
-
-            if (action.equals("all") == false)
-                for (PowerActionType powerActionType : PowerActionType.values()) {
-                    if (powerActionType.name().equalsIgnoreCase(action) == false)
-                        continue;
-                    actionType = powerActionType;
-                    break;
-                }
-
-        } catch (Exception e) {
-            this.throwbackError(pcSender, "Invalid power Action type for " + action);
-            this.throwbackInfo(pcSender, "Valid Types : " + this.getActionTypes());
-            return;
-        }
-        if (action.equals("all") == false)
-            if (actionType == null) {
-                this.throwbackError(pcSender, "Invalid power Action type for " + action);
-                this.throwbackInfo(pcSender, "Valid Types : " + this.getActionTypes());
-                return;
-            }
-
-
-        for (PowersBase pb : PowersManager.powersBaseByIDString.values()) {
-            if (pb.getActions() == null || pb.getActions().isEmpty())
-                continue;
-
-            for (ActionsBase ab : pb.getActions()) {
-                if (ab.getPowerAction() == null)
-                    continue;
-                if (action.equals("all") == false)
-                    if (ab.getPowerAction().getType().equalsIgnoreCase(action) == false)
-                        continue;
-                String effect1 = "";
-                String effect2 = "";
-                ChatManager.chatSystemInfo(pcSender, "Applying Power " + pb.getName() + " : " + pb.getDescription());
-                if (ab.getPowerAction().getEffectsBase() == null) {
-
-                    try {
-                        PowersManager.runPowerAction(pcSender, pcSender, pcSender.getLoc(), ab, 1, pb);
-                    } catch (Exception e) {
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
-                    }
-                    ThreadUtils.sleep(500);
-                    continue;
-                }
-
-
-                if (ab.getPowerAction().getEffectsBase().getModifiers() == null || ab.getPowerAction().getEffectsBase().getModifiers().isEmpty()) {
-                    try {
-                        PowersManager.runPowerAction(pcSender, pcSender, pcSender.getLoc(), ab, 1, pb);
-                    } catch (Exception e) {
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
-                    }
-                    continue;
-                }
-
-                boolean run = true;
-                for (AbstractEffectModifier mod : ab.getPowerAction().getEffectsBase().getModifiers()) {
-                    if (appliedMods.containsKey(mod.modType.name()) == false) {
-                        appliedMods.put(mod.modType.name(), new HashSet<>());
-                    }
-
-//						if (appliedMods.get(mod.modType.name()).contains(mod.sourceType.name())){
-//							continue;
-//						}
-
-                    appliedMods.get(mod.modType.name()).add(mod.sourceType.name());
-                    try {
-                        try {
-                            PowersManager.runPowerAction(pcSender, pcSender, pcSender.getLoc(), ab, 1, pb);
-                        } catch (Exception e) {
-                            // TODO Auto-generated catch block
-                            e.printStackTrace();
-                        }
-
-                    } catch (Exception e) {
-                        Logger.error(e);
-                    }
-                    break;
-
-
-                }
-
-            }
-        }
-    }
-
-
-    @Override
-    protected String _getUsageString() {
-        return "' /bounds'";
-    }
-
-    @Override
-    protected String _getHelpString() {
-        return "Audits all the mobs in a zone.";
-
-    }
-
-    private String getActionTypes() {
-        String output = "";
-
-        for (PowerActionType actionType : PowerActionType.values()) {
-            output += actionType.name() + " | ";
-
-        }
-
-        return output.substring(0, output.length() - 3);
-    }
-
-}

src/engine/gameManager/BuildingManager.java

@@ -798,7 +798,7 @@ public enum BuildingManager {
         // Attempt to write to database or delete the building
         // if we are destroying it.
 
-        if (rank == -1)
+        if (rank < 0)
             success = DbManager.BuildingQueries.DELETE_FROM_DATABASE(building);
         else
             success = DbManager.BuildingQueries.updateBuildingRank(building, rank);

src/engine/gameManager/ConfigManager.java

@@ -11,6 +11,9 @@ package engine.gameManager;
 import engine.mbEnums;
 import engine.server.login.LoginServer;
 import engine.server.world.WorldServer;
+import engine.wpak.EffectsParser;
+import engine.wpak.PowerActionParser;
+import engine.wpak.PowersParser;
 import org.pmw.tinylog.Logger;
 
 import java.io.BufferedReader;
@@ -164,6 +167,13 @@ public enum ConfigManager {
         Logger.info("Compiling regex");
 
         regex.put(MB_LOGIN_FNAME_REGEX, Pattern.compile(MB_LOGIN_FNAME_REGEX.getValue()));
+
+        Logger.info("Loading WPAK data");
+
+        //EffectsParser.parseWpakFile();
+        //PowersParser.parseWpakFile();
+        //PowerActionParser.parseWpakFile();
+
         return true;
     }
 

src/engine/gameManager/DbManager.java

@@ -69,8 +69,6 @@ public enum DbManager {
     public static final dbBlueprintHandler BlueprintQueries = new dbBlueprintHandler();
     public static final dbShrineHandler ShrineQueries = new dbShrineHandler();
     public static final dbRunegateHandler RunegateQueries = new dbRunegateHandler();
-
-    public static final dbPowerHandler PowerQueries = new dbPowerHandler();
     public static final dbPetitionHandler PetitionQueries = new dbPetitionHandler();
     private static final EnumMap<GameObjectType, ConcurrentHashMap<Integer, AbstractGameObject>> objectCache = new EnumMap<>(GameObjectType.class);
     public static Hasher hasher;

src/engine/gameManager/DevCmdManager.java

@@ -122,7 +122,6 @@ public enum DevCmdManager {
         DevCmdManager.registerDevCmd(new SetNpcNameCmd());
         DevCmdManager.registerDevCmd(new BoundsCmd());
         DevCmdManager.registerDevCmd(new RegionCmd());
-        DevCmdManager.registerDevCmd(new ApplyBonusCmd());
         DevCmdManager.registerDevCmd(new SlotTestCmd());
     }
 

src/engine/gameManager/PowersManager.java

@@ -10,8 +10,6 @@ package engine.gameManager;
 
 import engine.InterestManagement.Terrain;
 import engine.InterestManagement.WorldGrid;
-import engine.db.handlers.dbEffectsBaseHandler;
-import engine.db.handlers.dbPowerHandler;
 import engine.db.handlers.dbSkillReqHandler;
 import engine.job.AbstractJob;
 import engine.job.AbstractScheduleJob;
@@ -29,8 +27,14 @@ import engine.net.client.ClientConnection;
 import engine.net.client.msg.*;
 import engine.objects.*;
 import engine.powers.*;
-import engine.powers.poweractions.AbstractPowerAction;
+import engine.powers.poweractions.*;
 import engine.server.MBServerStatics;
+import engine.wpak.EffectsParser;
+import engine.wpak.PowerActionParser;
+import engine.wpak.PowersParser;
+import engine.wpak.data.Effect;
+import engine.wpak.data.PowerAction;
+import engine.wpakpowers.WpakPowerManager;
 import org.pmw.tinylog.Logger;
 
 import java.util.ArrayList;
@@ -53,7 +57,6 @@ public enum PowersManager {
     public static HashMap<String, AbstractPowerAction> powerActionsByIDString = new HashMap<>();
     public static HashMap<Integer, AbstractPowerAction> powerActionsByID = new HashMap<>();
     public static HashMap<String, Integer> ActionTokenByIDString = new HashMap<>();
-    public static HashMap<String, Integer> AnimationOverrides = new HashMap<>();
     public static HashMap<Integer, ArrayList<RunePowerEntry>> _allRunePowers;
     public static HashMap<Integer, ArrayList<RuneSkillAdjustEntry>> _allRuneSkillAdjusts;
     public static HashMap<String, HashMap<ResourceType, Integer>> _effect_costMaps = new HashMap<>();
@@ -61,10 +64,12 @@ public enum PowersManager {
 
     public static void initPowersManager(boolean fullPowersLoad) {
 
-        if (fullPowersLoad)
+        if (fullPowersLoad) {
-            PowersManager.InitializePowers();
+            //PowersManager.InitializePowers();
-        else
+            WpakPowerManager.init();
+        }else {
             PowersManager.InitializeLoginPowers();
+        }
 
         PowersManager.js = JobScheduler.getInstance();
 
@@ -112,33 +117,138 @@ public enum PowersManager {
         return powerEntries;
     }
 
-    // This pre-loads all powers and effects
+    public static void InitializeEffects(){
-    public static void InitializePowers() {
-
         // Add EffectsBase
-        ArrayList<EffectsBase> ebList = dbEffectsBaseHandler.getAllEffectsBase();
+        ArrayList<EffectsBase> effectList = new ArrayList<>();
 
-        for (EffectsBase eb : ebList) {
+        for (Effect entry : WpakPowerManager._effectsLookup.values()) {
-            PowersManager.effectsBaseByToken.put(eb.getToken(), eb);
+            EffectsBase effectBase = new EffectsBase(entry);
-            PowersManager.effectsBaseByIDString.put(eb.getIDString(), eb);
+            effectList.add(effectBase);
+            PowersManager.effectsBaseByToken.put(effectBase.getToken(), effectBase);
+            PowersManager.effectsBaseByIDString.put(effectBase.getIDString(), effectBase);
+        }
 
     }
 
-        // Add Fail Conditions
+    public static void InitializePowerActions(){
-        EffectsBase.getFailConditions(PowersManager.effectsBaseByIDString);
-
-        // Add Modifiers to Effects
-        dbEffectsBaseHandler.cacheAllEffectModifiers();
-
-        // Add Source Types to Effects
-        dbPowerHandler.addAllSourceTypes();
-        dbPowerHandler.addAllAnimationOverrides();
-
         // Add PowerActions
-        AbstractPowerAction.getAllPowerActions(PowersManager.powerActionsByIDString, PowersManager.powerActionsByID, PowersManager.effectsBaseByIDString);
+        //AbstractPowerAction.getAllPowerActions(PowersManager.powerActionsByIDString, PowersManager.powerActionsByID, PowersManager.effectsBaseByIDString);
 
-        // Load valid Item Flags
+        HashMap<String, EffectsBase> effects = PowersManager.effectsBaseByIDString;
-        //	AbstractPowerAction.loadValidItemFlags(PowersManager.powerActionsByIDString);
+
+        for (PowerAction powerAction : WpakPowerManager._powerActionLookup.values()) {
+            AbstractPowerAction apa;
+            PowerActionType type = powerAction.action_type;
+            String IDString = powerAction.action_id;
+            int token = DbManager.hasher.SBStringHash(IDString);
+            //cache token, used for applying effects.
+            PowersManager.ActionTokenByIDString.put(IDString, token);
+            apa = null;
+            switch (type) {
+                default:
+                    Logger.error("valid type not found for poweraction of ID" + IDString);
+                    break;
+                case ApplyEffect:
+                    apa = new ApplyEffectPowerAction(powerAction, effects);
+                    break;
+                case ApplyEffects:
+                    apa = new ApplyEffectsPowerAction(powerAction, effects);
+                    break;
+                case DeferredPower:
+                    apa = new DeferredPowerPowerAction(powerAction, effects);
+                    break;
+                case DamageOverTime:
+                    apa = new DamageOverTimePowerAction(powerAction, effects);
+                    break;
+                case Peek:
+                    apa = new PeekPowerAction(powerAction);
+                    break;
+                case Charm:
+                    apa = new CharmPowerAction(powerAction);
+                    break;
+                case RemoveEffect:
+                    apa = new RemoveEffectPowerAction(powerAction);
+                    break;
+                case Track:
+                    apa = new TrackPowerAction(powerAction, effects);
+                    break;
+                case DirectDamage:
+                    apa = new DirectDamagePowerAction(powerAction, effects);
+                    break;
+                case Transform:
+                    apa = new TransformPowerAction(powerAction, effects);
+                    break;
+                case CreateMob:
+                    apa = new CreateMobPowerAction(powerAction);
+                    break;
+                case Invis:
+                    apa = new InvisPowerAction(powerAction, effects);
+                    break;
+                case ClearNearbyAggro:
+                    apa = new ClearNearbyAggroPowerAction(powerAction);
+                    break;
+                case MobRecall:
+                    apa = new MobRecallPowerAction(powerAction);
+                    break;
+                case SetItemFlag:
+                    apa = new SetItemFlagPowerAction(powerAction);
+                    break;
+                case SimpleDamage:
+                    apa = new SimpleDamagePowerAction(powerAction);
+                    break;
+                case TransferStatOT:
+                    apa = new TransferStatOTPowerAction(powerAction, effects);
+                    break;
+                case TransferStat:
+                    apa = new TransferStatPowerAction(powerAction, effects);
+                    break;
+                case Teleport:
+                    apa = new TeleportPowerAction(powerAction);
+                    break;
+                case TreeChoke:
+                    apa = new TreeChokePowerAction(powerAction);
+                    break;
+                case Block:
+                    apa = new BlockPowerAction(powerAction);
+                    break;
+                case Resurrect:
+                    apa = new ResurrectPowerAction(powerAction);
+                    break;
+                case ClaimMine:
+                    apa = new ClaimMinePowerAction(powerAction);
+                    break;
+                case Recall:
+                    apa = new RecallPowerAction(powerAction);
+                    break;
+                case SpireDisable:
+                    apa = new SpireDisablePowerAction(powerAction);
+                    break;
+                case Steal:
+                    apa = new StealPowerAction(powerAction);
+                    break;
+                case Summon:
+                    apa = new SummonPowerAction(powerAction);
+                    break;
+                case RunegateTeleport:
+                    apa = new RunegateTeleportPowerAction(powerAction);
+                    break;
+            }
+            PowersManager.powerActionsByIDString.put(IDString, apa);
+        }
+    }
+
+    // This pre-loads all powers and effects
+    public static void InitializePowers() {
+
+        EffectsParser.parseWpakFile();
+        PowersParser.parseWpakFile();
+        PowerActionParser.parseWpakFile();
+
+        //Initialize Effects Data
+        InitializeEffects();
+
+        //Initialize Power Actions
+        InitializePowerActions();
 
         // get all PowersBase
         ArrayList<PowersBase> pbList = dbSkillReqHandler.getAllPowersBase();
@@ -159,16 +269,6 @@ public enum PowersManager {
 
     }
 
-    public static EffectsBase setEffectToken(int ID, int token) {
-        for (EffectsBase eb : PowersManager.effectsBaseByIDString.values()) {
-            if (eb.getUUID() == ID) {
-                eb.setToken(token);
-                return eb;
-            }
-        }
-        return null;
-    }
-
     public static void usePower(final PerformActionMsg msg, ClientConnection origin,
                                 boolean sendCastToSelf) {
 
@@ -957,7 +1057,7 @@ public enum PowersManager {
                 //				if (!stackType.equals("IgnoreStack")) {
                 if (target.getEffects().containsKey(stackType)) {
                     // remove any existing power that overrides
-                    Effect ef = target.getEffects().get(stackType);
+                    engine.objects.Effect ef = target.getEffects().get(stackType);
                     AbstractEffectJob effect = null;
                     if (ef != null) {
                         JobContainer jc = ef.getJobContainer();
@@ -1129,7 +1229,7 @@ public enum PowersManager {
                 //				if (!stackType.equals("IgnoreStack")) {
                 if (target.getEffects().containsKey(stackType)) {
                     // remove any existing power that overrides
-                    Effect ef = target.getEffects().get(stackType);
+                    engine.objects.Effect ef = target.getEffects().get(stackType);
                     AbstractEffectJob effect = null;
                     if (ef != null) {
                         JobContainer jc = ef.getJobContainer();
@@ -1443,7 +1543,7 @@ public enum PowersManager {
             stackType = (stackType.equals("IgnoreStack")) ? Integer.toString(ab.getUUID()) : stackType;
             if (target.getEffects().containsKey(stackType)) {
                 // remove any existing power that overrides
-                Effect ef = target.getEffects().get(stackType);
+                engine.objects.Effect ef = target.getEffects().get(stackType);
                 AbstractEffectJob effect = null;
                 if (ef != null) {
                     JobContainer jc = ef.getJobContainer();
@@ -1890,7 +1990,7 @@ public enum PowersManager {
         stackType = (stackType.equals("IgnoreStack")) ? Integer
                 .toString(toRemove.getUUID()) : stackType;
         if (fromChant) {
-            Effect eff = awo.getEffects().get(stackType);
+            engine.objects.Effect eff = awo.getEffects().get(stackType);
             if (eff != null)
                 eff.cancelJob(true);
         } else

src/engine/jobs/UsePowerJob.java

@@ -14,6 +14,7 @@ import engine.job.AbstractScheduleJob;
 import engine.net.client.msg.PerformActionMsg;
 import engine.objects.PlayerCharacter;
 import engine.powers.PowersBase;
+import engine.wpak.data.Power;
 
 public class UsePowerJob extends AbstractScheduleJob {
 

src/engine/jobs/WpakUsePowerJob.java

@@ -0,0 +1,42 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2022
+//                www.magicbane.com
+
+
+package engine.jobs;
+
+import engine.gameManager.PowersManager;
+import engine.job.AbstractScheduleJob;
+import engine.net.client.msg.PerformActionMsg;
+import engine.objects.AbstractWorldObject;
+import engine.objects.PlayerCharacter;
+import engine.wpakpowers.WpakPowerManager;
+
+public class WpakUsePowerJob extends AbstractScheduleJob {
+
+    private final PlayerCharacter pc;
+    private final PerformActionMsg msg;
+    private AbstractWorldObject target;
+
+    public WpakUsePowerJob(PlayerCharacter pc, PerformActionMsg msg, AbstractWorldObject tar) {
+        super();
+        this.pc = pc;
+        this.msg = msg;
+        this.target = tar;
+    }
+
+    @Override
+    protected void doJob() {
+        WpakPowerManager.finishUsePower(this.msg, this.pc,this.target);
+    }
+
+    @Override
+    protected void _cancelJob() {
+        //cast stopped early, reset recycle timer
+        PowersManager.finishRecycleTime(this.msg, this.pc, true);
+    }
+}

src/engine/net/client/handlers/PerformActionMsgHandler.java

@@ -8,10 +8,10 @@
 
 package engine.net.client.handlers;
 
-import engine.gameManager.PowersManager;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.ClientNetMsg;
 import engine.net.client.msg.PerformActionMsg;
+import engine.wpakpowers.WpakPowerManager;
 
 public class PerformActionMsgHandler extends AbstractClientMsgHandler {
 
@@ -23,7 +23,8 @@ public class PerformActionMsgHandler extends AbstractClientMsgHandler {
     protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
 
         PerformActionMsg msg = (PerformActionMsg) baseMsg;
-        PowersManager.usePower(msg, origin, false);  // Wtf ?
+        //PowersManager.beginCast(msg, origin, false);  // Wtf ?
+        WpakPowerManager.beginCast(msg, origin, false);
 
         return true;
     }

src/engine/net/client/handlers/SendSummonsMsgHandler.java

@@ -17,8 +17,10 @@ import engine.net.client.msg.PerformActionMsg;
 import engine.net.client.msg.SendSummonsMsg;
 import engine.objects.PlayerCharacter;
 import engine.server.MBServerStatics;
+import engine.wpakpowers.WpakPowerManager;
 
-import static engine.gameManager.PowersManager.*;
+import static engine.gameManager.PowersManager.sendPowerMsg;
+import static engine.gameManager.PowersManager.sendRecyclePower;
 
 public class SendSummonsMsgHandler extends AbstractClientMsgHandler {
 
@@ -81,7 +83,8 @@ public class SendSummonsMsgHandler extends AbstractClientMsgHandler {
 
         // Client removes 200 mana on summon use.. so don't send message to self
         target.addSummoner(playerCharacter.getObjectUUID(), System.currentTimeMillis() + MBServerStatics.FOURTYFIVE_SECONDS);
-        usePower(pam, origin, false);
+        //beginCast(pam, origin, false);
+        WpakPowerManager.beginCast(pam, origin, false);
 
         return true;
     }

src/engine/net/client/handlers/TrackWindowMsgHandler.java

@@ -86,15 +86,15 @@ public class TrackWindowMsgHandler extends AbstractClientMsgHandler {
         if (ablist == null)
             return true;
 
-        TrackPowerAction tpa = null;
+        TrackPowerAction trackPowerAction = null;
 
         for (ActionsBase ab : ablist) {
             AbstractPowerAction apa = ab.getPowerAction();
             if (apa != null && apa instanceof TrackPowerAction)
-                tpa = (TrackPowerAction) apa;
+                trackPowerAction = (TrackPowerAction) apa;
         }
 
-        if (tpa == null)
+        if (trackPowerAction == null)
             return true;
 
         // Check powers for normal users
@@ -111,16 +111,16 @@ public class TrackWindowMsgHandler extends AbstractClientMsgHandler {
         int mask = 0;
 
         if (pb.targetPlayer())
-            if (tpa.trackVampire()) // track vampires
+            if (trackPowerAction.powerAction.trackEntry.filter.equals(mbEnums.MonsterType.Vampire)) // track vampires
                 mask = MBServerStatics.MASK_PLAYER | MBServerStatics.MASK_UNDEAD;
             else
                 // track all players
                 mask = MBServerStatics.MASK_PLAYER;
         else if (pb.targetCorpse()) // track corpses
             mask = MBServerStatics.MASK_CORPSE;
-        else if (tpa.trackNPC()) // Track NPCs
+        else if (trackPowerAction.powerAction.trackEntry.filter.equals(mbEnums.MonsterType.NPC)) // Track NPCs
             mask = MBServerStatics.MASK_NPC;
-        else if (tpa.trackUndead()) // Track Undead
+        else if (trackPowerAction.powerAction.trackEntry.filter.equals(mbEnums.MonsterType.Undead)) // Track Undead
             mask = MBServerStatics.MASK_MOB | MBServerStatics.MASK_UNDEAD;
         else
             // Track All

src/engine/objects/AbstractWorldObject.java

@@ -29,6 +29,7 @@ import engine.net.client.ClientConnection;
 import engine.net.client.msg.UpdateEffectsMsg;
 import engine.powers.EffectsBase;
 import engine.server.MBServerStatics;
+import engine.wpakpowers.AppliedEffect;
 import org.pmw.tinylog.Logger;
 
 import java.sql.ResultSet;
@@ -60,6 +61,10 @@ public abstract class AbstractWorldObject extends AbstractGameObject {
     private int objectTypeMask = 0;
     private Bounds bounds;
 
+    // Effects collection for wpak power manager
+
+    public ConcurrentHashMap<engine.wpak.data.Effect, AppliedEffect> _effects = new ConcurrentHashMap<>();
+
     /**
      * No Id Constructor
      */
@@ -375,7 +380,7 @@ public abstract class AbstractWorldObject extends AbstractGameObject {
             if (eff == null) {
                 continue;
             }
-            if (eff.containsSource(source) && trains >= eff.getTrains()) {
+            if (eff.getEffectsBase().effectSources.contains(source) && trains >= eff.getTrains()) {
                 if (removeAll) {
                     //remove all effects of source type
                     if (eff.cancel()) {

src/engine/objects/Building.java

@@ -561,7 +561,7 @@ public class Building extends AbstractWorldObject {
                 BuildingManager.setRank(barracksBuilding, -1);
         }
 
-        // If the tree is R8 and deranking, we need to update it's
+        // If the tree is R8 and deranking, we need to update the
         // mesh along with buildings losing their health bonus
 
         if (this.rank == 8) {

src/engine/objects/City.java

@@ -41,6 +41,7 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 public class City extends AbstractWorldObject {
@@ -80,6 +81,7 @@ public class City extends AbstractWorldObject {
     private String hash;
     public Warehouse warehouse;
     public Realm realm;
+    public AtomicBoolean isDestroyed = new AtomicBoolean(false);
 
     /**
      * ResultSet Constructor
@@ -306,6 +308,21 @@ public class City extends AbstractWorldObject {
             if (city.parentZone == null)
                 continue;
 
+            // Can't teleport to something without a tree
+
+            if (city.getTOL() == null)
+                continue;
+
+            // No abandoned cities
+
+            if (city.getTOL().getGuild().isEmptyGuild())
+                continue;
+
+            // No destroyed cities
+
+            if (city.getTOL().getRank() == -1)
+                continue;
+
             //can't repledge to a guild you're already part of
 
             if (repledge && city.getGuild().equals(playerCharacter.guild))
@@ -1102,17 +1119,21 @@ public class City extends AbstractWorldObject {
 
     public final void destroy() {
 
+        if (this.isDestroyed.compareAndSet(false, true)) {
+
             Thread destroyCityThread = new Thread(new DestroyCityThread(this));
 
-        destroyCityThread.setName("destroyCity:" + this.getName());
+            destroyCityThread.setName("destroyCity:" + this.getParent().zoneName);
             destroyCityThread.start();
+        } else
+            Logger.error("Attempt to destroy destroyed city");
     }
 
     public final void transfer(AbstractCharacter newOwner) {
 
         Thread transferCityThread = new Thread(new TransferCityThread(this, newOwner));
 
-        transferCityThread.setName("TransferCity:" + this.getName());
+        transferCityThread.setName("TransferCity:" + this.getParent().zoneName);
         transferCityThread.start();
     }
 

src/engine/objects/Effect.java

@@ -433,12 +433,6 @@ public class Effect {
         return duration;
     }
 
-    public boolean containsSource(EffectSourceType source) {
-        if (this.eb != null)
-            return this.eb.containsSource(source);
-        return false;
-    }
-
     public JobContainer getJobContainer() {
         return this.jc;
     }

src/engine/objects/Mine.java

@@ -220,8 +220,7 @@ public class Mine extends AbstractGameObject {
         // Only inactive mines are returned.
 
         for (Mine mine : Mine.mineMap.keySet()) {
-            if (mine.owningGuild.getObjectUUID() == guildID &&
+            if (mine.owningGuild.getObjectUUID() == guildID)
-                    mine.isActive == false)
                 mineList.add(mine);
         }
         return mineList;

src/engine/powers/EffectsBase.java

@@ -9,7 +9,6 @@
 
 package engine.powers;
 
-import engine.gameManager.DbManager;
 import engine.gameManager.DispatchManager;
 import engine.gameManager.PowersManager;
 import engine.job.JobContainer;
@@ -26,63 +25,60 @@ import engine.net.client.ClientConnection;
 import engine.net.client.msg.ApplyEffectMsg;
 import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
-import engine.objects.Effect;
+import engine.objects.Item;
 import engine.objects.PlayerCharacter;
-import engine.powers.effectmodifiers.AbstractEffectModifier;
+import engine.powers.effectmodifiers.*;
 import engine.server.MBServerStatics;
+import engine.util.Hasher;
+import engine.wpak.data.ConditionEntry;
+import engine.wpak.data.Effect;
+import engine.wpak.data.ModifierEntry;
 import org.pmw.tinylog.Logger;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.concurrent.ConcurrentHashMap;
 
 public class EffectsBase {
-
+    private static final ConcurrentHashMap<String, String> itemEffectsByName = new ConcurrentHashMap<>(MBServerStatics.CHM_INIT_CAP, MBServerStatics.CHM_LOAD, MBServerStatics.CHM_THREAD_LOW);
-    public static HashMap<Integer, HashSet<EffectSourceType>> effectSourceTypeMap = new HashMap<>();
+    public static int NewID = 3000;
-    public static HashMap<String, HashSet<AbstractEffectModifier>> modifiersMap = new HashMap<>();
+    public int UUID;
-    public static HashMap<String, HashMap<String, ArrayList<String>>> OldEffectsMap = new HashMap<>();
+    public String IDString;
-    public static HashMap<String, HashMap<String, ArrayList<String>>> NewEffectsMap = new HashMap<>();
+    // public String name;
-    public static HashMap<String, HashMap<String, ArrayList<String>>> ChangedEffectsMap = new HashMap<>();
+    public int token;
-    public static HashMap<String, HashSet<PowerFailCondition>> EffectFailConditions = new HashMap<>();
+    public float amount;
-    public static HashMap<Integer, HashSet<mbEnums.DamageType>> EffectDamageTypes = new HashMap<>();
+    public float amountRamp;
-    public static HashSet<AbstractEffectModifier> DefaultModifiers = new HashSet<>();
-    private static ConcurrentHashMap<String, String> itemEffectsByName = new ConcurrentHashMap<>(MBServerStatics.CHM_INIT_CAP, MBServerStatics.CHM_LOAD, MBServerStatics.CHM_THREAD_LOW);
-    private static int NewID = 3000;
-    private int UUID;
-    private String IDString;
-    // private String name;
-    private int token;
-    private float amount;
-    private float amountRamp;
     // flags
-    private boolean isItemEffect;
+    public boolean isItemEffect;
-    private boolean isSpireEffect;
+    public boolean isSpireEffect;
-    private boolean ignoreMod;
+    public boolean ignoreNoMod;
-    private boolean dontSave;
+    public boolean dontSave;
-    private boolean cancelOnAttack = false;
+    public boolean cancelOnAttack = false;
-    private boolean cancelOnAttackSwing = false;
+    public boolean cancelOnAttackSwing = false;
-    private boolean cancelOnCast = false;
+    public boolean cancelOnCast = false;
-    private boolean cancelOnCastSpell = false;
+    public boolean cancelOnCastSpell = false;
-    private boolean cancelOnEquipChange = false;
+    public boolean cancelOnEquipChange = false;
-    private boolean cancelOnLogout = false;
+    public boolean cancelOnLogout = false;
-    private boolean cancelOnMove = false;
+    public boolean cancelOnMove = false;
-    private boolean cancelOnNewCharm = false;
+    public boolean cancelOnNewCharm = false;
-    private boolean cancelOnSit = false;
+    public boolean cancelOnSit = false;
-    private boolean cancelOnTakeDamage = false;
+    public boolean cancelOnTakeDamage = false;
-    private boolean cancelOnTerritoryClaim = false;
+    public boolean cancelOnTerritoryClaim = false;
-    private boolean cancelOnUnEquip = false;
+    public boolean cancelOnUnEquip = false;
-    private boolean useRampAdd;
+    public boolean useRampAdd;
-    private boolean isPrefix = false; //used by items
+    public boolean isPrefix = false; //used by items
-    private boolean isSuffix = false; //used by items
+    public boolean isSuffix = false; //used by items
-    private String name = "";
+    public String name = "";
-    private float value = 0;
+    public float value = 0;
     private ConcurrentHashMap<mbEnums.ResourceType, Integer> resourceCosts = new ConcurrentHashMap<>();
-    private ConcurrentHashMap<String, Boolean> sourceTypes = new ConcurrentHashMap<>(MBServerStatics.CHM_INIT_CAP, MBServerStatics.CHM_LOAD, MBServerStatics.CHM_THREAD_LOW);
+
+    //loaded values from parser
+    public HashSet<EffectSourceType> effectSources = new HashSet<>();
+    public HashSet<AbstractEffectModifier> effectModifiers = new HashSet<>();
+    public HashSet<PowerFailCondition> effectFailCondition = new HashSet<>();
+
+    public  HashSet<mbEnums.DamageType> effectDamageTypes = new HashSet<>();
 
     /**
      * No Table ID Constructor
@@ -91,6 +87,110 @@ public class EffectsBase {
 
     }
 
+    /**
+     * EffectEntry Constructor
+     */
+
+    public EffectsBase(Effect entry) {
+        this.IDString = entry.effect_id;
+        this.name = entry.effect_name;
+        this.token = Hasher.SBStringHash(entry.effect_name);
+
+        //override tokens for some effects like Safemode that use the Action Token instead of the effect Token,
+        switch (this.IDString) {
+            case "INVIS-D":
+                this.token = -1661751254;
+                break;
+            case "SafeMode":
+                this.token = -1661750486;
+                break;
+
+        }
+        this.isItemEffect = entry.isItemEffect;
+        this.isSpireEffect = entry.isSpireEffect;
+        this.ignoreNoMod = entry.ignoreNoMod;
+        this.dontSave = entry.dontSave;
+
+        if (this.IDString.startsWith("PRE-"))
+            this.isPrefix = true;
+        else if (this.IDString.startsWith("SUF-"))
+            this.isSuffix = true;
+
+        //load effect modifiers
+        for (ModifierEntry mod : entry.mods)
+            this.effectModifiers.add(getCombinedModifiers(null, mod, this, mod.type));
+
+        //load sources
+        for (String source : entry.sources)
+            this.effectSources.add(EffectSourceType.GetEffectSourceType(source));
+
+        //load fail conditions
+        for (ConditionEntry condition : entry.conditions) {
+            PowerFailCondition failCondition = PowerFailCondition.valueOf(condition.condition);
+            this.effectFailCondition.add(failCondition);
+            loadFailConditions(failCondition, this, condition);
+
+            //add all damage types
+            if(!condition.damageTypes.isEmpty())
+                this.effectDamageTypes.addAll(condition.damageTypes);
+        }
+
+
+    }
+
+    public static void loadFailConditions(PowerFailCondition failCondition, EffectsBase eb, ConditionEntry entry) {
+
+        if (failCondition == null || eb == null) {
+            return;
+        }
+
+        switch (failCondition) {
+
+            case TakeDamage:
+
+                eb.cancelOnTakeDamage = true;
+
+
+                eb.amount = entry.arg;
+                eb.amountRamp = (float) entry.curveType.value;
+                eb.useRampAdd = (float) entry.curveType.value != 0;
+                break;
+            case Attack:
+                eb.cancelOnAttack = true;
+                break;
+            case AttackSwing:
+                eb.cancelOnAttackSwing = true;
+                break;
+            case Cast:
+                eb.cancelOnCast = true;
+                break;
+            case CastSpell:
+                eb.cancelOnCastSpell = true;
+                break;
+            case EquipChange:
+                eb.cancelOnEquipChange = true;
+                break;
+            case Logout:
+                eb.cancelOnLogout = true;
+                break;
+            case Move:
+                eb.cancelOnMove = true;
+                break;
+            case NewCharm:
+                eb.cancelOnNewCharm = true;
+                break;
+            case Sit:
+                eb.cancelOnSit = true;
+                break;
+            case TerritoryClaim:
+                eb.cancelOnTerritoryClaim = true;
+                break;
+            case UnEquip:
+                eb.cancelOnUnEquip = true;
+                break;
+        }
+    }
+
     public EffectsBase(EffectsBase copyEffect, int newToken, String IDString) {
 
         UUID = NewID++;
@@ -102,7 +202,7 @@ public class EffectsBase {
             int flags = 0;
             this.isItemEffect = ((flags & 1) != 0) ? true : false;
             this.isSpireEffect = ((flags & 2) != 0) ? true : false;
-            this.ignoreMod = ((flags & 4) != 0) ? true : false;
+            this.ignoreNoMod = ((flags & 4) != 0) ? true : false;
             this.dontSave = ((flags & 8) != 0) ? true : false;
 
             if (this.IDString.startsWith("PRE-"))
@@ -117,7 +217,7 @@ public class EffectsBase {
         this.amountRamp = copyEffect.amountRamp;
         this.isItemEffect = copyEffect.isItemEffect;
         this.isSpireEffect = copyEffect.isSpireEffect;
-        this.ignoreMod = copyEffect.ignoreMod;
+        this.ignoreNoMod = copyEffect.ignoreNoMod;
         this.dontSave = copyEffect.dontSave;
         this.cancelOnAttack = copyEffect.cancelOnAttack;
         this.cancelOnAttackSwing = copyEffect.cancelOnAttackSwing;
@@ -163,7 +263,7 @@ public class EffectsBase {
         int flags = rs.getInt("flags");
         this.isItemEffect = ((flags & 1) != 0) ? true : false;
         this.isSpireEffect = ((flags & 2) != 0) ? true : false;
-        this.ignoreMod = ((flags & 4) != 0) ? true : false;
+        this.ignoreNoMod = ((flags & 4) != 0) ? true : false;
         this.dontSave = ((flags & 8) != 0) ? true : false;
 
         if (this.IDString.startsWith("PRE-"))
@@ -173,113 +273,6 @@ public class EffectsBase {
         // getFailConditions();
     }
 
-    public static void getFailConditions(HashMap<String, EffectsBase> effects) {
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_power_failcondition WHERE powerOrEffect = 'Effect';")) {
-
-            ResultSet rs = preparedStatement.executeQuery();
-
-            PowerFailCondition failCondition = null;
-
-            while (rs.next()) {
-                String fail = rs.getString("type");
-
-
-                String IDString = rs.getString("IDString");
-                failCondition = PowerFailCondition.valueOf(fail);
-
-                if (failCondition == null) {
-                    Logger.error("Couldn't Find FailCondition " + fail + " for " + IDString);
-                    continue;
-                }
-
-                if (EffectsBase.EffectFailConditions.get(IDString) == null) {
-                    EffectsBase.EffectFailConditions.put(IDString, new HashSet<>());
-                }
-
-                EffectsBase.EffectFailConditions.get(IDString).add(failCondition);
-                EffectsBase eb = effects.get(IDString);
-
-                switch (failCondition) {
-
-                    case TakeDamage:
-
-                        // dont go any further.
-
-                        if (eb == null)
-                            break;
-
-                        eb.cancelOnTakeDamage = true;
-
-
-                        eb.amount = rs.getFloat("amount");
-                        eb.amountRamp = rs.getFloat("ramp");
-                        eb.useRampAdd = rs.getBoolean("UseAddFormula");
-
-                        String damageType1 = rs.getString("damageType1");
-                        String damageType2 = rs.getString("damageType2");
-                        String damageType3 = rs.getString("damageType3");
-
-                        if (damageType1.isEmpty() && damageType2.isEmpty() && damageType3.isEmpty())
-                            break;
-
-                        if (!EffectsBase.EffectDamageTypes.containsKey(eb.getToken()))
-                            EffectsBase.EffectDamageTypes.put(eb.getToken(), new HashSet<>());
-
-                        mbEnums.DamageType dt = mbEnums.DamageType.getDamageType(damageType1);
-                        if (dt != null)
-                            EffectsBase.EffectDamageTypes.get(eb.token).add(dt);
-
-                        dt = mbEnums.DamageType.getDamageType(damageType2);
-                        if (dt != null)
-                            EffectsBase.EffectDamageTypes.get(eb.token).add(dt);
-                        dt = mbEnums.DamageType.getDamageType(damageType3);
-                        if (dt != null)
-                            EffectsBase.EffectDamageTypes.get(eb.token).add(dt);
-                        break;
-                    case Attack:
-                        eb.cancelOnAttack = true;
-                        break;
-                    case AttackSwing:
-                        eb.cancelOnAttackSwing = true;
-                        break;
-                    case Cast:
-                        eb.cancelOnCast = true;
-                        break;
-                    case CastSpell:
-                        eb.cancelOnCastSpell = true;
-                        break;
-                    case EquipChange:
-                        eb.cancelOnEquipChange = true;
-                        break;
-                    case Logout:
-                        eb.cancelOnLogout = true;
-                        break;
-                    case Move:
-                        eb.cancelOnMove = true;
-                        break;
-                    case NewCharm:
-                        eb.cancelOnNewCharm = true;
-                        break;
-                    case Sit:
-                        eb.cancelOnSit = true;
-                        break;
-                    case TerritoryClaim:
-                        eb.cancelOnTerritoryClaim = true;
-                        break;
-                    case UnEquip:
-                        eb.cancelOnUnEquip = true;
-                        break;
-                }
-            }
-
-            rs.close();
-        } catch (Exception e) {
-            Logger.error(e);
-        }
-    }
-
     public static String getItemEffectsByName(String string) {
         if (EffectsBase.itemEffectsByName.containsKey(string))
             return EffectsBase.itemEffectsByName.get(string);
@@ -303,14 +296,12 @@ public class EffectsBase {
 
     public boolean damageTypeSpecific() {
 
-        return EffectsBase.EffectDamageTypes.containsKey(this.token);
+        return !this.effectDamageTypes.isEmpty();
 
     }
 
     public boolean containsDamageType(mbEnums.DamageType dt) {
-        if (!EffectsBase.EffectDamageTypes.containsKey(this.token))
+        return this.effectDamageTypes.contains(dt);
-            return false;
-        return EffectsBase.EffectDamageTypes.get(this.token).contains(dt);
     }
 
     public int getUUID() {
@@ -330,32 +321,8 @@ public class EffectsBase {
         this.token = token;
     }
 
-    public ConcurrentHashMap<String, Boolean> getSourceTypes() {
-        return this.sourceTypes;
-    }
-
     public HashSet<AbstractEffectModifier> getModifiers() {
-
+        return this.effectModifiers;
-        if (EffectsBase.modifiersMap.containsKey(this.IDString) == false)
-            return EffectsBase.DefaultModifiers;
-
-        return EffectsBase.modifiersMap.get(this.IDString);
-    }
-
-    public boolean isItemEffect() {
-        return this.isItemEffect;
-    }
-
-    public boolean isSpireEffect() {
-        return this.isSpireEffect;
-    }
-
-    public boolean ignoreMod() {
-        return this.ignoreMod;
-    }
-
-    public boolean dontSave() {
-        return this.dontSave;
     }
 
     public boolean isPrefix() {
@@ -404,7 +371,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) {
@@ -639,13 +606,6 @@ public class EffectsBase {
         }
     }
 
-    public boolean containsSource(EffectSourceType sourceType) {
-        if (EffectsBase.effectSourceTypeMap.containsKey(this.token) == false)
-            return false;
-        return EffectsBase.effectSourceTypeMap.get(this.token).contains(sourceType);
-
-    }
-
     public boolean cancelOnAttack() {
         return this.cancelOnAttack;
     }
@@ -694,16 +654,6 @@ public class EffectsBase {
         return this.cancelOnUnEquip;
     }
 
-    public String getDamageTypes() {
-        String text = "";
-        if (!EffectsBase.EffectDamageTypes.containsKey(this.token))
-            return text;
-        for (mbEnums.DamageType type : EffectsBase.EffectDamageTypes.get(this.token)) {
-            text += type.name() + ' ';
-        }
-        return text;
-    }
-
     public String getName() {
 
         return name;
@@ -713,12 +663,220 @@ public class EffectsBase {
         this.name = name;
     }
 
-    public float getValue() {
+    public static AbstractEffectModifier getCombinedModifiers(AbstractEffectModifier abstractEffectModifier, ModifierEntry rs, EffectsBase effectBase, mbEnums.ModType modifier){
-        return value;
+        switch (modifier) {
+            case AdjustAboveDmgCap:
+                abstractEffectModifier = new AdjustAboveDmgCapEffectModifier(rs);
+                break;
+            case Ambidexterity:
+                abstractEffectModifier = new AmbidexterityEffectModifier(rs);
+                break;
+            case AnimOverride:
+                break;
+            case ArmorPiercing:
+                abstractEffectModifier = new ArmorPiercingEffectModifier(rs);
+                break;
+            case AttackDelay:
+                abstractEffectModifier = new AttackDelayEffectModifier(rs);
+                break;
+            case Attr:
+                abstractEffectModifier = new AttributeEffectModifier(rs);
+                break;
+            case BlackMantle:
+                abstractEffectModifier = new BlackMantleEffectModifier(rs);
+                break;
+            case BladeTrails:
+                abstractEffectModifier = new BladeTrailsEffectModifier(rs);
+                break;
+            case Block:
+                abstractEffectModifier = new BlockEffectModifier(rs);
+                break;
+            case BlockedPowerType:
+                abstractEffectModifier = new BlockedPowerTypeEffectModifier(rs);
+                break;
+            case CannotAttack:
+                abstractEffectModifier = new CannotAttackEffectModifier(rs);
+                break;
+            case CannotCast:
+                abstractEffectModifier = new CannotCastEffectModifier(rs);
+                break;
+            case CannotMove:
+                abstractEffectModifier = new CannotMoveEffectModifier(rs);
+                break;
+            case CannotTrack:
+                abstractEffectModifier = new CannotTrackEffectModifier(rs);
+                break;
+            case Charmed:
+                abstractEffectModifier = new CharmedEffectModifier(rs);
+                break;
+            case ConstrainedAmbidexterity:
+                abstractEffectModifier = new ConstrainedAmbidexterityEffectModifier(rs);
+                break;
+            case DamageCap:
+                abstractEffectModifier = new DamageCapEffectModifier(rs);
+                break;
+            case DamageShield:
+                abstractEffectModifier = new DamageShieldEffectModifier(rs);
+                break;
+            case DCV:
+                abstractEffectModifier = new DCVEffectModifier(rs);
+                break;
+            case Dodge:
+                abstractEffectModifier = new DodgeEffectModifier(rs);
+                break;
+            case DR:
+                abstractEffectModifier = new DREffectModifier(rs);
+                break;
+            case Durability:
+                abstractEffectModifier = new DurabilityEffectModifier(rs);
+                break;
+            case ExclusiveDamageCap:
+                abstractEffectModifier = new ExclusiveDamageCapEffectModifier(rs);
+                break;
+            case Fade:
+                abstractEffectModifier = new FadeEffectModifier(rs);
+                break;
+            case Fly:
+                abstractEffectModifier = new FlyEffectModifier(rs);
+                break;
+            case Health:
+                abstractEffectModifier = new HealthEffectModifier(rs);
+                break;
+            case HealthFull:
+                abstractEffectModifier = new HealthFullEffectModifier(rs);
+                break;
+            case HealthRecoverRate:
+                abstractEffectModifier = new HealthRecoverRateEffectModifier(rs);
+                break;
+            case IgnoreDamageCap:
+                abstractEffectModifier = new IgnoreDamageCapEffectModifier(rs);
+                break;
+            case IgnorePassiveDefense:
+                abstractEffectModifier = new IgnorePassiveDefenseEffectModifier(rs);
+                break;
+            case ImmuneTo:
+                abstractEffectModifier = new ImmuneToEffectModifier(rs);
+                break;
+            case ImmuneToAttack:
+                abstractEffectModifier = new ImmuneToAttackEffectModifier(rs);
+                break;
+            case ImmuneToPowers:
+                abstractEffectModifier = new ImmuneToPowersEffectModifier(rs);
+                break;
+            case Invisible:
+                abstractEffectModifier = new InvisibleEffectModifier(rs);
+                break;
+            case ItemName:
+                abstractEffectModifier = new ItemNameEffectModifier(rs);
+                if (((ItemNameEffectModifier) abstractEffectModifier).name.isEmpty())
+                    break;
+                if (effectBase != null)
+                    effectBase.setName((((ItemNameEffectModifier) abstractEffectModifier).name));
+                break;
+            case Mana:
+                abstractEffectModifier = new ManaEffectModifier(rs);
+                break;
+            case ManaFull:
+                abstractEffectModifier = new ManaFullEffectModifier(rs);
+                break;
+            case ManaRecoverRate:
+                abstractEffectModifier = new ManaRecoverRateEffectModifier(rs);
+                break;
+            case MaxDamage:
+                abstractEffectModifier = new MaxDamageEffectModifier(rs);
+                break;
+            case MeleeDamageModifier:
+                abstractEffectModifier = new MeleeDamageEffectModifier(rs);
+                break;
+            case MinDamage:
+                abstractEffectModifier = new MinDamageEffectModifier(rs);
+                break;
+            case NoMod:
+                abstractEffectModifier = new NoModEffectModifier(rs);
+                break;
+            case OCV:
+                abstractEffectModifier = new OCVEffectModifier(rs);
+                break;
+            case Parry:
+                abstractEffectModifier = new ParryEffectModifier(rs);
+                break;
+            case PassiveDefense:
+                abstractEffectModifier = new PassiveDefenseEffectModifier(rs);
+                break;
+            case PowerCost:
+                abstractEffectModifier = new PowerCostEffectModifier(rs);
+                break;
+            case PowerCostHealth:
+                abstractEffectModifier = new PowerCostHealthEffectModifier(rs);
+                break;
+            case PowerDamageModifier:
+                abstractEffectModifier = new PowerDamageEffectModifier(rs);
+                break;
+            case ProtectionFrom:
+                abstractEffectModifier = new ProtectionFromEffectModifier(rs);
+                break;
+            case Resistance:
+                abstractEffectModifier = new ResistanceEffectModifier(rs);
+                break;
+            case ScaleHeight:
+                abstractEffectModifier = new ScaleHeightEffectModifier(rs);
+                break;
+            case ScaleWidth:
+                abstractEffectModifier = new ScaleWidthEffectModifier(rs);
+                break;
+            case ScanRange:
+                abstractEffectModifier = new ScanRangeEffectModifier(rs);
+                break;
+            case SeeInvisible:
+                abstractEffectModifier = new SeeInvisibleEffectModifier(rs);
+                break;
+            case Silenced:
+                abstractEffectModifier = new SilencedEffectModifier(rs);
+                break;
+            case Skill:
+                abstractEffectModifier = new SkillEffectModifier(rs);
+                break;
+            case Slay:
+                abstractEffectModifier = new SlayEffectModifier(rs);
+                break;
+            case Speed:
+                abstractEffectModifier = new SpeedEffectModifier(rs);
+                break;
+            case SpireBlock:
+                abstractEffectModifier = new SpireBlockEffectModifier(rs);
+                break;
+            case Stamina:
+                abstractEffectModifier = new StaminaEffectModifier(rs);
+                break;
+            case StaminaFull:
+                abstractEffectModifier = new StaminaFullEffectModifier(rs);
+                break;
+            case StaminaRecoverRate:
+                abstractEffectModifier = new StaminaRecoverRateEffectModifier(rs);
+                break;
+            case Stunned:
+                abstractEffectModifier = new StunnedEffectModifier(rs);
+                break;
+            case Value:
+                abstractEffectModifier = new ValueEffectModifier(rs);
+                if (effectBase != null) {
+                    ValueEffectModifier valueEffect = (ValueEffectModifier) abstractEffectModifier;
+                    effectBase.value = valueEffect.minMod;
+                    Item.addEnchantValue(effectBase.getIDString(), (int)valueEffect.minMod);
                 }
+                break;
+            case WeaponProc:
+                abstractEffectModifier = new WeaponProcEffectModifier(rs);
+                break;
+            case WeaponRange:
+                abstractEffectModifier = new WeaponRangeEffectModifier(rs);
+                break;
+            case WeaponSpeed:
+                abstractEffectModifier = new WeaponSpeedEffectModifier(rs);
+                break;
 
-    public void setValue(float Value) {
+        }
-        this.value = Value;
+        return abstractEffectModifier;
     }
 
 }

src/engine/powers/effectmodifiers/AbstractEffectModifier.java

@@ -17,9 +17,9 @@ import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
 import engine.powers.EffectsBase;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
-import java.sql.SQLException;
 
 
 public abstract class AbstractEffectModifier {
@@ -39,22 +39,24 @@ 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");
+    public AbstractEffectModifier(ModifierEntry mod) {
-        this.effectType = rs.getString("modType");
+
-        this.modType = ModType.GetModType(this.effectType);
+        this.IDString = mod.type.name();
-        this.type = rs.getString("type").replace("\"", "");
+        this.effectType = mod.type.name();
+        this.modType = mod.type;
+        this.type = mod.type.name().replace("\"", "");
         this.sourceType = SourceType.GetSourceType(this.type.replace(" ", "").replace("-", ""));
-        this.minMod = rs.getFloat("minMod");
+        this.minMod = mod.min;
-        this.maxMod = rs.getFloat("maxMod");
+        this.maxMod = mod.max;
-        this.percentMod = rs.getFloat("percentMod");
+        this.percentMod = mod.percentage;
-        this.ramp = rs.getFloat("ramp");
+        this.ramp = (float) mod.compoundCurveType.value;
-        this.useRampAdd = (rs.getInt("useRampAdd") == 1) ? true : false;
+        this.useRampAdd = (float) mod.compoundCurveType.value != 0;
 
-        this.string1 = rs.getString("string1");
+        this.string1 = mod.arg1;
-        this.string2 = rs.getString("string2");
+        this.string2 = mod.arg2;
     }
 
 

src/engine/powers/effectmodifiers/AdjustAboveDmgCapEffectModifier.java

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

src/engine/powers/effectmodifiers/AmbidexterityEffectModifier.java

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

src/engine/powers/effectmodifiers/ArmorPiercingEffectModifier.java

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

src/engine/powers/effectmodifiers/AttackDelayEffectModifier.java

@@ -11,6 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -21,6 +22,9 @@ public class AttackDelayEffectModifier extends AbstractEffectModifier {
     public AttackDelayEffectModifier(ResultSet rs) throws SQLException {
         super(rs);
     }
+    public AttackDelayEffectModifier(ModifierEntry rs){
+        super(rs);
+    }
 
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {

src/engine/powers/effectmodifiers/AttributeEffectModifier.java

@@ -11,6 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,6 +23,10 @@ public class AttributeEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public AttributeEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/BlackMantleEffectModifier.java

@@ -13,6 +13,8 @@ import engine.jobs.AbstractEffectJob;
 import engine.mbEnums.ModType;
 import engine.mbEnums.SourceType;
 import engine.objects.*;
+import engine.wpak.data.ModifierEntry;
+import engine.wpak.data.ModifierEntry;
 import org.pmw.tinylog.Logger;
 
 import java.sql.ResultSet;
@@ -25,6 +27,10 @@ public class BlackMantleEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public BlackMantleEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/BladeTrailsEffectModifier.java

@@ -14,6 +14,7 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -24,6 +25,10 @@ public class BladeTrailsEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public BladeTrailsEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/BlockEffectModifier.java

@@ -11,6 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,6 +23,10 @@ public class BlockEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public BlockEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/BlockedPowerTypeEffectModifier.java

@@ -12,6 +12,7 @@ package engine.powers.effectmodifiers;
 import engine.jobs.AbstractEffectJob;
 import engine.mbEnums.ModType;
 import engine.objects.*;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -24,6 +25,10 @@ public class BlockedPowerTypeEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public BlockedPowerTypeEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 
@@ -37,7 +42,7 @@ public class BlockedPowerTypeEffectModifier extends AbstractEffectModifier {
 
         for (String effect : ac.getEffects().keySet()) {
             Effect eff = ac.getEffects().get(effect);
-            ModType toBlock = ModType.None;
+            ModType toBlock = null;
 
             switch (this.sourceType) {
                 case Invisible:
@@ -45,6 +50,10 @@ public class BlockedPowerTypeEffectModifier extends AbstractEffectModifier {
                     break;
             }
 
+            if (toBlock == null)
+                return;
+            ;
+                
             HashSet<AbstractEffectModifier> aemList = eff.getEffectModifiers();
             for (AbstractEffectModifier aem : aemList) {
                 if (aem.modType.equals(toBlock)) {

src/engine/powers/effectmodifiers/CannotAttackEffectModifier.java

@@ -11,6 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,6 +23,10 @@ public class CannotAttackEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public CannotAttackEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/CannotCastEffectModifier.java

@@ -12,6 +12,7 @@ package engine.powers.effectmodifiers;
 import engine.jobs.AbstractEffectJob;
 import engine.mbEnums;
 import engine.objects.*;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -23,6 +24,10 @@ public class CannotCastEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public CannotCastEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/CannotMoveEffectModifier.java

@@ -11,6 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,6 +23,10 @@ public class CannotMoveEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public CannotMoveEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/CannotTrackEffectModifier.java

@@ -11,6 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,6 +23,10 @@ public class CannotTrackEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public CannotTrackEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/CharmedEffectModifier.java

@@ -14,6 +14,7 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -24,6 +25,10 @@ public class CharmedEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public CharmedEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/ConstrainedAmbidexterityEffectModifier.java

@@ -11,6 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,6 +23,10 @@ public class ConstrainedAmbidexterityEffectModifier extends AbstractEffectModifi
         super(rs);
     }
 
+    public ConstrainedAmbidexterityEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/DCVEffectModifier.java

@@ -11,6 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,6 +23,10 @@ public class DCVEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public DCVEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/DREffectModifier.java

@@ -14,6 +14,7 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -24,6 +25,10 @@ public class DREffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public DREffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/DamageCapEffectModifier.java

@@ -11,6 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,6 +23,10 @@ public class DamageCapEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public DamageCapEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/DamageShieldEffectModifier.java

@@ -13,6 +13,7 @@ import engine.jobs.AbstractEffectJob;
 import engine.mbEnums;
 import engine.objects.*;
 import engine.powers.DamageShield;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -24,6 +25,10 @@ public class DamageShieldEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public DamageShieldEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/DodgeEffectModifier.java

@@ -11,6 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,6 +23,10 @@ public class DodgeEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public DodgeEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/DurabilityEffectModifier.java

@@ -14,6 +14,7 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -24,6 +25,10 @@ public class DurabilityEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public DurabilityEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/ExclusiveDamageCapEffectModifier.java

@@ -11,6 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,6 +23,10 @@ public class ExclusiveDamageCapEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public ExclusiveDamageCapEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/FadeEffectModifier.java

@@ -14,6 +14,7 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -24,6 +25,10 @@ public class FadeEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public FadeEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/FlyEffectModifier.java

@@ -11,6 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -21,6 +22,10 @@ public class FlyEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public FlyEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/HealthEffectModifier.java

@@ -20,6 +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.ModifierEntry;
 import org.pmw.tinylog.Logger;
 
 import java.sql.ResultSet;
@@ -41,6 +42,10 @@ public class HealthEffectModifier extends AbstractEffectModifier {
         }
     }
 
+    public HealthEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     public static float getMinDamage(float baseMin, float intelligence, float spirit, float focus) {
         float min = baseMin * (((float) Math.pow(intelligence, 0.75f) * 0.0311f) + (0.02f * (int) focus) + ((float) Math.pow(spirit, 0.75f) * 0.0416f));
         return (float) ((int) (min + 0.5f)); //round to nearest whole number

src/engine/powers/effectmodifiers/HealthFullEffectModifier.java

@@ -11,6 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -21,6 +22,10 @@ public class HealthFullEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public HealthFullEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/HealthRecoverRateEffectModifier.java

@@ -11,6 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -21,6 +22,10 @@ public class HealthRecoverRateEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public HealthRecoverRateEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/IgnoreDamageCapEffectModifier.java

@@ -11,6 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,6 +23,10 @@ public class IgnoreDamageCapEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public IgnoreDamageCapEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/IgnorePassiveDefenseEffectModifier.java

@@ -11,6 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -21,6 +22,10 @@ public class IgnorePassiveDefenseEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public IgnorePassiveDefenseEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/ImmuneToAttackEffectModifier.java

@@ -11,6 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -21,6 +22,10 @@ public class ImmuneToAttackEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public ImmuneToAttackEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/ImmuneToEffectModifier.java

@@ -11,6 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -21,6 +22,10 @@ public class ImmuneToEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public ImmuneToEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/ImmuneToPowersEffectModifier.java

@@ -11,6 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -21,6 +22,10 @@ public class ImmuneToPowersEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public ImmuneToPowersEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/InvisibleEffectModifier.java

@@ -16,6 +16,7 @@ import engine.net.client.ClientConnection;
 import engine.objects.*;
 import engine.powers.ActionsBase;
 import engine.powers.PowersBase;
+import engine.wpak.data.ModifierEntry;
 import org.pmw.tinylog.Logger;
 
 import java.sql.ResultSet;
@@ -27,6 +28,10 @@ public class InvisibleEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public InvisibleEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/ItemNameEffectModifier.java

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

src/engine/powers/effectmodifiers/ManaEffectModifier.java

@@ -21,6 +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.ModifierEntry;
 import org.pmw.tinylog.Logger;
 
 import java.sql.ResultSet;
@@ -43,6 +44,10 @@ public class ManaEffectModifier extends AbstractEffectModifier {
         }
     }
 
+    public ManaEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
         if (awo == null) {

src/engine/powers/effectmodifiers/ManaFullEffectModifier.java

@@ -11,6 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -21,6 +22,10 @@ public class ManaFullEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public ManaFullEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/ManaRecoverRateEffectModifier.java

@@ -11,6 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -21,6 +22,10 @@ public class ManaRecoverRateEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public ManaRecoverRateEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/MaxDamageEffectModifier.java

@@ -14,6 +14,7 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -24,6 +25,10 @@ public class MaxDamageEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public MaxDamageEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/MeleeDamageEffectModifier.java

@@ -11,6 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -21,6 +22,10 @@ public class MeleeDamageEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public MeleeDamageEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/MinDamageEffectModifier.java

@@ -14,6 +14,7 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -24,6 +25,10 @@ public class MinDamageEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public MinDamageEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/NoModEffectModifier.java

@@ -12,6 +12,7 @@ package engine.powers.effectmodifiers;
 import engine.jobs.AbstractEffectJob;
 import engine.mbEnums.GameObjectType;
 import engine.objects.*;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,6 +23,10 @@ public class NoModEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public NoModEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
         //TODO check if anything needs removed.

src/engine/powers/effectmodifiers/OCVEffectModifier.java

@@ -11,6 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -21,6 +22,10 @@ public class OCVEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public OCVEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/ParryEffectModifier.java

@@ -11,6 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -21,6 +22,10 @@ public class ParryEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public ParryEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/PassiveDefenseEffectModifier.java

@@ -11,6 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -21,6 +22,10 @@ public class PassiveDefenseEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public PassiveDefenseEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/PowerCostEffectModifier.java

@@ -11,6 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -21,6 +22,10 @@ public class PowerCostEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public PowerCostEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/PowerCostHealthEffectModifier.java

@@ -14,6 +14,7 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -24,6 +25,10 @@ public class PowerCostHealthEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public PowerCostHealthEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/PowerDamageEffectModifier.java

@@ -11,6 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -21,6 +22,10 @@ public class PowerDamageEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public PowerDamageEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/ProtectionFromEffectModifier.java

@@ -11,6 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -21,6 +22,10 @@ public class ProtectionFromEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public ProtectionFromEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/ResistanceEffectModifier.java

@@ -11,6 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -21,6 +22,10 @@ public class ResistanceEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public ResistanceEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/ScaleHeightEffectModifier.java

@@ -14,6 +14,7 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -24,6 +25,10 @@ public class ScaleHeightEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public ScaleHeightEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/ScaleWidthEffectModifier.java

@@ -14,6 +14,7 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -24,6 +25,10 @@ public class ScaleWidthEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public ScaleWidthEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/ScanRangeEffectModifier.java

@@ -11,6 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -21,6 +22,10 @@ public class ScanRangeEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public ScanRangeEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/SeeInvisibleEffectModifier.java

@@ -11,6 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -21,6 +22,10 @@ public class SeeInvisibleEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public SeeInvisibleEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/SilencedEffectModifier.java

@@ -11,6 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -21,6 +22,10 @@ public class SilencedEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public SilencedEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/SkillEffectModifier.java

@@ -11,6 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -21,6 +22,10 @@ public class SkillEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public SkillEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/SlayEffectModifier.java

@@ -11,6 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -21,6 +22,10 @@ public class SlayEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public SlayEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/SpeedEffectModifier.java

@@ -11,6 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -21,6 +22,10 @@ public class SpeedEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public SpeedEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
         //Logger.error(this.getSimpleClassName(), "Speed applied with " + trains + " trains");

src/engine/powers/effectmodifiers/SpireBlockEffectModifier.java

@@ -11,6 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -21,6 +22,10 @@ public class SpireBlockEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public SpireBlockEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/StaminaEffectModifier.java

@@ -21,6 +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.ModifierEntry;
 import org.pmw.tinylog.Logger;
 
 import java.sql.ResultSet;
@@ -43,6 +44,10 @@ public class StaminaEffectModifier extends AbstractEffectModifier {
         }
     }
 
+    public StaminaEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
         if (awo == null) {

src/engine/powers/effectmodifiers/StaminaFullEffectModifier.java

@@ -11,6 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -21,6 +22,10 @@ public class StaminaFullEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public StaminaFullEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/StaminaRecoverRateEffectModifier.java

@@ -11,6 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -21,6 +22,10 @@ public class StaminaRecoverRateEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public StaminaRecoverRateEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/StunnedEffectModifier.java

@@ -12,6 +12,7 @@ package engine.powers.effectmodifiers;
 import engine.jobs.AbstractEffectJob;
 import engine.mbEnums.GameObjectType;
 import engine.objects.*;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,6 +23,10 @@ public class StunnedEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public StunnedEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/ValueEffectModifier.java

@@ -14,6 +14,7 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -24,6 +25,10 @@ public class ValueEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public ValueEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/WeaponProcEffectModifier.java

@@ -16,6 +16,7 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -26,6 +27,10 @@ public class WeaponProcEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public WeaponProcEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/WeaponRangeEffectModifier.java

@@ -11,6 +11,7 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -21,6 +22,10 @@ public class WeaponRangeEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public WeaponRangeEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/WeaponSpeedEffectModifier.java

@@ -14,6 +14,7 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
+import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -24,6 +25,10 @@ public class WeaponSpeedEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
+    public WeaponSpeedEffectModifier(ModifierEntry rs) {
+        super(rs);
+    }
+
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/poweractions/AbstractPowerAction.java

@@ -9,22 +9,15 @@
 
 package engine.powers.poweractions;
 
-import engine.gameManager.DbManager;
-import engine.gameManager.PowersManager;
 import engine.math.Vector3fImmutable;
+import engine.mbEnums;
 import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Item;
 import engine.powers.ActionsBase;
 import engine.powers.EffectsBase;
 import engine.powers.PowersBase;
-import org.pmw.tinylog.Logger;
+import engine.wpak.data.PowerAction;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.HashMap;
 
 
 public abstract class AbstractPowerAction {
@@ -32,7 +25,7 @@ public abstract class AbstractPowerAction {
     protected PowersBase parent;
     protected int UUID;
     protected String IDString;
-    protected String type;
+    protected mbEnums.PowerActionType type;
     protected boolean isAggressive;
     protected long validItemFlags;
 
@@ -46,16 +39,15 @@ public abstract class AbstractPowerAction {
     /**
      * ResultSet Constructor
      */
-    public AbstractPowerAction(ResultSet rs) throws SQLException {
+    public AbstractPowerAction(PowerAction powerAction) {
 
-        this.UUID = rs.getInt("ID");
+        this.IDString = powerAction.action_id;
-        this.IDString = rs.getString("IDString");
+        this.type = powerAction.action_type;
-        this.type = rs.getString("type");
+        int flags = powerAction.itemFlag.ordinal();
-        int flags = rs.getInt("flags");
+        this.isAggressive = powerAction.isAggressive;
-        this.isAggressive = ((flags & 128) != 0) ? true : false;
     }
 
-    public AbstractPowerAction(int uUID, String iDString, String type, boolean isAggressive,
+    public AbstractPowerAction(int uUID, String iDString, mbEnums.PowerActionType type, boolean isAggressive,
                                long validItemFlags) {
         super();
         UUID = uUID;
@@ -64,139 +56,6 @@ public abstract class AbstractPowerAction {
         this.isAggressive = false;
     }
 
-    public static void getAllPowerActions(HashMap<String, AbstractPowerAction> powerActions, HashMap<Integer, AbstractPowerAction> powerActionsByID, HashMap<String, EffectsBase> effects) {
-
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_power_poweraction")) {
-
-            ResultSet rs = preparedStatement.executeQuery();
-            String IDString, type;
-
-            while (rs.next()) {
-                AbstractPowerAction apa;
-                type = rs.getString("type");
-                IDString = rs.getString("IDString");
-                int token = DbManager.hasher.SBStringHash(IDString);
-                //cache token, used for applying effects.
-                PowersManager.ActionTokenByIDString.put(IDString, token);
-                apa = null;
-                switch (type) {
-                    default:
-                        Logger.error("valid type not found for poweraction of ID" + rs.getInt("ID"));
-                        break;
-                    case "ApplyEffect":
-                        apa = new ApplyEffectPowerAction(rs, effects);
-                        break;
-                    case "ApplyEffects":
-                        apa = new ApplyEffectsPowerAction(rs, effects);
-                        break;
-                    case "DeferredPower":
-                        apa = new DeferredPowerPowerAction(rs, effects);
-                        break;
-                    case "DamageOverTime":
-                        apa = new DamageOverTimePowerAction(rs, effects);
-                        break;
-                    case "Peek":
-                        apa = new PeekPowerAction(rs);
-                        break;
-                    case "Charm":
-                        apa = new CharmPowerAction(rs);
-                        break;
-                    case "Fear":
-                        apa = new FearPowerAction(rs);
-                        break;
-                    case "Confusion":
-                        apa = new ConfusionPowerAction(rs);
-                        break;
-                    case "RemoveEffect":
-                        apa = new RemoveEffectPowerAction(rs);
-                        break;
-                    case "Track":
-                        apa = new TrackPowerAction(rs, effects);
-                        break;
-                    case "DirectDamage":
-                        apa = new DirectDamagePowerAction(rs, effects);
-                        break;
-                    case "Transform":
-                        apa = new TransformPowerAction(rs, effects);
-                        break;
-                    case "CreateMob":
-                        apa = new CreateMobPowerAction(rs);
-                        break;
-                    case "Invis":
-                        apa = new InvisPowerAction(rs, effects);
-                        break;
-                    case "ClearNearbyAggro":
-                        apa = new ClearNearbyAggroPowerAction(rs);
-                        break;
-                    case "MobRecall":
-                        apa = new MobRecallPowerAction(rs);
-                        break;
-                    case "SetItemFlag":
-                        apa = new SetItemFlagPowerAction(rs);
-                        break;
-                    case "SimpleDamage":
-                        apa = new SimpleDamagePowerAction(rs);
-                        break;
-                    case "TransferStatOT":
-                        apa = new TransferStatOTPowerAction(rs, effects);
-                        break;
-                    case "TransferStat":
-                        apa = new TransferStatPowerAction(rs, effects);
-                        break;
-                    case "Teleport":
-                        apa = new TeleportPowerAction(rs);
-                        break;
-                    case "TreeChoke":
-                        apa = new TreeChokePowerAction(rs);
-                        break;
-                    case "Block":
-                        apa = new BlockPowerAction(rs);
-                        break;
-                    case "Resurrect":
-                        apa = new ResurrectPowerAction(rs);
-                        break;
-                    case "ClearAggro":
-                        apa = new ClearAggroPowerAction(rs);
-                        break;
-                    case "ClaimMine":
-                        apa = new ClaimMinePowerAction(rs);
-                        break;
-                    case "Recall":
-                        apa = new RecallPowerAction(rs);
-                        break;
-                    case "SpireDisable":
-                        apa = new SpireDisablePowerAction(rs);
-                        break;
-                    case "Steal":
-                        apa = new StealPowerAction(rs);
-                        break;
-                    case "Summon":
-                        apa = new SummonPowerAction(rs);
-                        break;
-                    case "RunegateTeleport":
-                        apa = new RunegateTeleportPowerAction(rs);
-                        break;
-                    case "OpenGate":
-                        apa = new OpenGatePowerAction(rs);
-                        break;
-                }
-                powerActions.put(IDString, apa);
-                powerActionsByID.put(apa.UUID, apa);
-                apa.validItemFlags = 0;
-            }
-            rs.close();
-        } catch (Exception e) {
-            Logger.error(e.toString());
-        }
-
-        //Add OpenGatePowerAction
-        AbstractPowerAction openGateAction = new OpenGatePowerAction(5000, "OPENGATE", "OpenGate", false, 0);
-        powerActions.put("OPENGATE", openGateAction);
-        powerActionsByID.put(openGateAction.UUID, openGateAction);
-    }
-
     public void startAction(AbstractCharacter source, AbstractWorldObject awo, Vector3fImmutable targetLoc, int numTrains, ActionsBase ab, PowersBase pb) {
         this._startAction(source, awo, targetLoc, numTrains, ab, pb);
     }
@@ -272,7 +131,7 @@ public abstract class AbstractPowerAction {
         return this.validItemFlags;
     }
 
-    public String getType() {
+    public mbEnums.PowerActionType getType() {
         return type;
     }
 

src/engine/powers/poweractions/ApplyEffectPowerAction.java

@@ -25,10 +25,9 @@ import engine.powers.ActionsBase;
 import engine.powers.EffectsBase;
 import engine.powers.PowersBase;
 import engine.server.MBServerStatics;
+import engine.wpak.data.PowerAction;
 import org.pmw.tinylog.Logger;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.HashMap;
 
 public class ApplyEffectPowerAction extends AbstractPowerAction {
@@ -38,11 +37,11 @@ public class ApplyEffectPowerAction extends AbstractPowerAction {
     private String effectParentID;
     private EffectsBase effectParent;
 
-    public ApplyEffectPowerAction(ResultSet rs, HashMap<String, EffectsBase> effects) throws SQLException {
+    public ApplyEffectPowerAction(PowerAction powerAction, HashMap<String, EffectsBase> effects) {
-        super(rs);
+        super(powerAction);
-        this.effectParentID = rs.getString("IDString");
+        this.effectParentID = powerAction.effects.get(0).effect_id;
         this.effectParent = effects.get(this.effectParentID);
-        this.effectID = rs.getString("effectID");
+        this.effectID = powerAction.effects.get(0).effect_id;
         this.effect = effects.get(this.effectID);
     }
 

src/engine/powers/poweractions/ApplyEffectsPowerAction.java

@@ -17,10 +17,9 @@ import engine.objects.Item;
 import engine.powers.ActionsBase;
 import engine.powers.EffectsBase;
 import engine.powers.PowersBase;
+import engine.wpak.data.PowerAction;
 import org.pmw.tinylog.Logger;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.HashMap;
 
 
@@ -32,11 +31,11 @@ public class ApplyEffectsPowerAction extends AbstractPowerAction {
     private EffectsBase effect2;
     private EffectsBase effectParent;
 
-    public ApplyEffectsPowerAction(ResultSet rs, HashMap<String, EffectsBase> effects) throws SQLException {
+    public ApplyEffectsPowerAction(PowerAction powerAction, HashMap<String, EffectsBase> effects) {
-        super(rs);
+        super(powerAction);
-        this.IDString = rs.getString("IDString");
+        this.IDString = powerAction.action_id;
-        this.effectID = rs.getString("effectID");
+        this.effectID = powerAction.effects.get(0).effect_id;
-        this.effectID2 = rs.getString("effectID2");
+        this.effectID2 = powerAction.effects.get(2).effect_id;
         this.effect = effects.get(this.effectID);
         this.effect2 = effects.get(this.effectID2);
         this.effectParent = effects.get(this.IDString);

src/engine/powers/poweractions/BlockPowerAction.java

@@ -14,15 +14,13 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.powers.ActionsBase;
 import engine.powers.PowersBase;
-
+import engine.wpak.data.PowerAction;
-import java.sql.ResultSet;
-import java.sql.SQLException;
 
 
 public class BlockPowerAction extends AbstractPowerAction {
 
-    public BlockPowerAction(ResultSet rs) throws SQLException {
+    public BlockPowerAction(PowerAction powerAction) {
-        super(rs);
+        super(powerAction);
     }
 
     @Override

src/engine/powers/poweractions/CharmPowerAction.java

@@ -18,9 +18,7 @@ import engine.objects.Mob;
 import engine.objects.PlayerCharacter;
 import engine.powers.ActionsBase;
 import engine.powers.PowersBase;
-
+import engine.wpak.data.PowerAction;
-import java.sql.ResultSet;
-import java.sql.SQLException;
 
 
 public class CharmPowerAction extends AbstractPowerAction {
@@ -28,10 +26,10 @@ public class CharmPowerAction extends AbstractPowerAction {
     private int levelCap;
     private int levelCapRamp;
 
-    public CharmPowerAction(ResultSet rs) throws SQLException {
+    public CharmPowerAction(PowerAction powerAction) {
-        super(rs);
+        super(powerAction);
-        this.levelCap = rs.getInt("levelCap");
+        this.levelCap = powerAction.levelCap;
-        this.levelCapRamp = rs.getInt("levelCapRamp");
+        this.levelCapRamp = powerAction.levelCapCurve.ordinal();
     }
 
     @Override

src/engine/powers/poweractions/ClaimMinePowerAction.java

@@ -15,15 +15,13 @@ import engine.mbEnums;
 import engine.objects.*;
 import engine.powers.ActionsBase;
 import engine.powers.PowersBase;
-
+import engine.wpak.data.PowerAction;
-import java.sql.ResultSet;
-import java.sql.SQLException;
 
 
 public class ClaimMinePowerAction extends AbstractPowerAction {
 
-    public ClaimMinePowerAction(ResultSet rs) throws SQLException {
+    public ClaimMinePowerAction(PowerAction powerAction) {
-        super(rs);
+        super(powerAction);
     }
 
     @Override

src/engine/powers/poweractions/ClearAggroPowerAction.java

@@ -16,15 +16,13 @@ import engine.objects.AbstractWorldObject;
 import engine.objects.Mob;
 import engine.powers.ActionsBase;
 import engine.powers.PowersBase;
-
+import engine.wpak.data.PowerAction;
-import java.sql.ResultSet;
-import java.sql.SQLException;
 
 
 public class ClearAggroPowerAction extends AbstractPowerAction {
 
-    public ClearAggroPowerAction(ResultSet rs) throws SQLException {
+    public ClearAggroPowerAction(PowerAction powerAction) {
-        super(rs);
+        super(powerAction);
     }
 
     @Override

src/engine/powers/poweractions/ClearNearbyAggroPowerAction.java

@@ -15,15 +15,13 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.powers.ActionsBase;
 import engine.powers.PowersBase;
-
+import engine.wpak.data.PowerAction;
-import java.sql.ResultSet;
-import java.sql.SQLException;
 
 
 public class ClearNearbyAggroPowerAction extends AbstractPowerAction {
 
-    public ClearNearbyAggroPowerAction(ResultSet rs) throws SQLException {
+    public ClearNearbyAggroPowerAction(PowerAction powerAction) {
-        super(rs);
+        super(powerAction);
     }
 
     @Override

src/engine/powers/poweractions/ConfusionPowerAction.java

@@ -14,15 +14,13 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.powers.ActionsBase;
 import engine.powers.PowersBase;
-
+import engine.wpak.data.PowerAction;
-import java.sql.ResultSet;
-import java.sql.SQLException;
 
 
 public class ConfusionPowerAction extends AbstractPowerAction {
 
-    public ConfusionPowerAction(ResultSet rs) throws SQLException {
+    public ConfusionPowerAction(PowerAction powerAction) {
-        super(rs);
+        super(powerAction);
     }
 
     @Override

src/engine/powers/poweractions/CreateMobPowerAction.java

@@ -22,30 +22,20 @@ import engine.net.client.msg.PetMsg;
 import engine.objects.*;
 import engine.powers.ActionsBase;
 import engine.powers.PowersBase;
+import engine.wpak.data.PowerAction;
 import org.pmw.tinylog.Logger;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
 
 public class CreateMobPowerAction extends AbstractPowerAction {
 
     private int mobID;
     private int mobLevel;
 
-    public CreateMobPowerAction(ResultSet rs) throws SQLException {
+    public CreateMobPowerAction(PowerAction powerAction) {
-        super(rs);
+        super(powerAction);
 
-        this.mobID = rs.getInt("mobID");
+        this.mobID = powerAction.petRace;
-        this.mobLevel = rs.getInt("mobLevel");
+        this.mobLevel = powerAction.petLevel;
-    }
-
-    public int getMobID() {
-        return this.mobID;
-    }
-
-    public int getMobLevel() {
-        return this.mobLevel;
     }
 
     @Override

src/engine/powers/poweractions/DamageOverTimePowerAction.java

@@ -16,9 +16,8 @@ import engine.objects.AbstractWorldObject;
 import engine.powers.ActionsBase;
 import engine.powers.EffectsBase;
 import engine.powers.PowersBase;
+import engine.wpak.data.PowerAction;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.HashMap;
 
 
@@ -28,11 +27,11 @@ public class DamageOverTimePowerAction extends AbstractPowerAction {
     private int numIterations;
     private EffectsBase effect;
 
-    public DamageOverTimePowerAction(ResultSet rs, HashMap<String, EffectsBase> effects) throws SQLException {
+    public DamageOverTimePowerAction(PowerAction powerAction, HashMap<String, EffectsBase> effects) {
-        super(rs);
+        super(powerAction);
 
-        this.effectID = rs.getString("effectID");
+        this.effectID = powerAction.action_id;
-        this.numIterations = rs.getInt("numIterations");
+        this.numIterations = powerAction.effects.get(0).cycleDelay;
         this.effect = effects.get(this.effectID);
     }
 

src/engine/powers/poweractions/DeferredPowerPowerAction.java

@@ -18,9 +18,8 @@ import engine.objects.PlayerCharacter;
 import engine.powers.ActionsBase;
 import engine.powers.EffectsBase;
 import engine.powers.PowersBase;
+import engine.wpak.data.PowerAction;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.HashMap;
 
 
@@ -31,11 +30,11 @@ public class DeferredPowerPowerAction extends AbstractPowerAction {
     private EffectsBase effect;
     //	private EffectsBase deferedPower;
 
-    public DeferredPowerPowerAction(ResultSet rs, HashMap<String, EffectsBase> effects) throws SQLException {
+    public DeferredPowerPowerAction(PowerAction powerAction, HashMap<String, EffectsBase> effects) {
-        super(rs);
+        super(powerAction);
 
-        this.effectID = rs.getString("effectID");
+        this.effectID = powerAction.effects.get(0).effect_id;
-        this.deferedPowerID = rs.getString("deferredPowerID");
+        this.deferedPowerID = powerAction.action_id;
         this.effect = effects.get(this.effectID);
     }