Merge remote-tracking branch 'refs/remotes/origin/weekend-fixings' into feature-config-parsing2

src/engine/db/handlers/dbWarehouseHandler.java

@@ -136,6 +136,12 @@ public class dbWarehouseHandler extends dbHandlerBase {
                 int cityUID = rs.getInt("cityUUID");
                 JSONObject jsonObject = new JSONObject(rs.getString("warehouse"));
                 City city = City.getCity(cityUID);
+
+                if (city == null) {
+                    Logger.error("No city " + cityUID + " for warehouse");
+                    continue;
+                }
+
                 city.warehouse = new Warehouse(jsonObject);
                 city.warehouse.city = city;
 
@@ -192,6 +198,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
         // via the client interface.
 
         ArrayList<WorkOrder> submitList = new ArrayList<>();
+        ArrayList<WorkOrder> orphanList = new ArrayList<>();
 
         try (Connection connection = DbManager.getConnection();
              PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `dyn_workorders`;");
@@ -209,7 +216,14 @@ public class dbWarehouseHandler extends dbHandlerBase {
         // Submit new workOrders to the ForgeManager
 
         for (WorkOrder workOrder : submitList) {
+
             DbManager.WarehouseQueries.DELETE_WORKORDER(workOrder);
+
+            // Delete but do not reconstitute orphan workOrders
+
+            if (workOrder.vendor == null)
+                continue;
+
             workOrder.workOrderID = ForgeManager.workOrderCounter.incrementAndGet();
             DbManager.WarehouseQueries.WRITE_WORKORDER(workOrder);
             ForgeManager.vendorWorkOrderLookup.get(workOrder.vendor).add(workOrder);

src/engine/gameManager/BuildingManager.java

@@ -104,67 +104,67 @@ public enum BuildingManager {
         if (building == null)
             return false;
 
+        //cannot access destroyed buildings
         if (building.getRank() == -1)
             return false;
 
-        if (IsOwner(building, player))
+        //admin characters can always access buildings
-            return true;
-
-        //individual friend.
-
-        if (building.getFriends() != null && building.getFriends().get(player.getObjectUUID()) != null)
-            return true;
-
-        //Admins can access stuff
-
         if (player.isCSR())
             return true;
 
-        //Guild stuff
+        //owner can always access their own building
-
-        if (building.getGuild().isGuildLeader(player.getObjectUUID()))
-            return true;
-
-        if (building.getFriends().get(player.getGuild().getObjectUUID()) != null && building.getFriends().get(player.getGuild().getObjectUUID()).friendType == 8)
-            return true;
-
-        if (building.getFriends().get(player.getGuild().getObjectUUID()) != null && building.getFriends().get(player.getGuild().getObjectUUID()).friendType == 9 && GuildStatusController.isInnerCouncil(player.getGuildStatus()))
-            return true;
-
-        if (Guild.sameGuild(building.getGuild(), player.getGuild()) && GuildStatusController.isInnerCouncil(player.getGuildStatus()))
-            return true;
-
-        return Guild.sameGuild(building.getGuild(), player.getGuild()) && GuildStatusController.isGuildLeader(player.getGuildStatus());
-
-        //TODO test friends list once added
-        //does not meet above criteria. Cannot access.
-    }
-
-    public static boolean playerCanManageNotFriends(PlayerCharacter player, Building building) {
-
-        //Player Can only Control Building if player is in Same Guild as Building and is higher rank than IC.
-
-        if (player == null)
-            return false;
-
-        if (building == null)
-            return false;
-
-        if (building.getRank() == -1)
-            return false;
-
         if (IsOwner(building, player))
             return true;
 
-        //Somehow guild leader check fails? lets check if Player is true Guild GL.
+        //check for default IC access if building belongs to same guild
-        if (building.getGuild() != null && building.getGuild().isGuildLeader(player.getObjectUUID()))
+        if(player.guild.equals(building.getGuild())) {
-            return true;
+            if (building.getBlueprint() != null && building.getBlueprint().getBuildingGroup() != null) {
+                switch (building.getBlueprint().getBuildingGroup()) {
+                    case TOL:
+                    case BARRACK:
+                    case SPIRE:
+                    case SHRINE:
+                    case BANESTONE:
+                    case MINE:
+                    case WAREHOUSE:
+                    case BULWARK:
+                    case SIEGETENT:
+                        if (GuildStatusController.isInnerCouncil(player.getGuildStatus()))
+                            return true;
+                        if (GuildStatusController.isGuildLeader(player.getGuildStatus()))
+                            return true;
+                        break;
+                }
+            }
+        }
 
-        if (!GuildStatusController.isGuildLeader(player.getGuildStatus()) && !GuildStatusController.isInnerCouncil(player.getGuildStatus()))
+        //check against friends list entries if any present
-            return false;
+        if (building.getFriends() != null) {
 
+            //check individuals
+            if (building.getFriends().get(player.getObjectUUID()) != null)
+                return true;
+
+            if (building.getFriends().get(player.guild.objectUUID) != null) {
+
+                //check friend type for guild related access
+                switch (building.getFriends().get(player.guild.objectUUID).friendType) {
+                    case 8: //full member
+                        if (GuildStatusController.isFullMember(player.getGuildStatus()))
+                            return true;
+                        break;
+                    case 9: //Inner Council
+                        if (GuildStatusController.isInnerCouncil(player.getGuildStatus()))
+                            return true;
+                        if (GuildStatusController.isGuildLeader(player.getGuildStatus()))
+                            return true;
+                        break;
+
+                }
+            }
+        }
+        //did not meet access grant criteria, deny access
         return false;
-
     }
 
     public static synchronized boolean lootBuilding(PlayerCharacter player, Building building) {
@@ -463,29 +463,19 @@ public enum BuildingManager {
         return GuildStatusController.isGuildLeader(player.getGuildStatus()) || GuildStatusController.isInnerCouncil(player.getGuildStatus());
     }
 
-    public static int GetAvailableGold(Building building) {
-
-        if (building.getStrongboxValue() == 0)
-            return 0;
-
-        if (building.getStrongboxValue() < building.reserve)
-            return 0;
-
-        return building.getStrongboxValue() - building.reserve;
-    }
-
     public static boolean IsPlayerHostile(Building building, PlayerCharacter player) {
 
-        //Nation Members and Guild members are not hostile.
-        //		if (building.getGuild() != null){
-        //			if (pc.getGuild() != null)
-        //			if (building.getGuild().getObjectUUID() == pc.getGuildUUID()
-        //			|| pc.getGuild().getNation().getObjectUUID() == building.getGuild().getNation().getObjectUUID())
-        //				return false;
-        //		}
         if (Guild.sameNationExcludeErrant(building.getGuild(), player.getGuild()))
             return false;
 
+        if(building.enforceKOS) {
+            if (building.getCity() != null) {
+                Building TOL = building.getCity().getTOL();
+                if (TOL != null) {
+                    building = TOL;
+                }
+            }
+        }
         if (!building.reverseKOS) {
 
             Condemned condemn = building.getCondemned().get(player.getObjectUUID());
@@ -808,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/CombatManager.java

@@ -12,7 +12,6 @@ import engine.job.JobContainer;
 import engine.job.JobScheduler;
 import engine.jobs.AttackJob;
 import engine.jobs.DeferredPowerJob;
-import engine.math.Vector3f;
 import engine.mbEnums;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.TargetedActionMsg;
@@ -20,6 +19,7 @@ import engine.net.client.msg.UpdateStateMsg;
 import engine.objects.*;
 import engine.powers.DamageShield;
 import engine.powers.effectmodifiers.AbstractEffectModifier;
+import engine.powers.effectmodifiers.WeaponProcEffectModifier;
 import engine.server.MBServerStatics;
 import org.pmw.tinylog.Logger;
 
@@ -124,9 +124,9 @@ public enum CombatManager {
                 return;
 
             //check if this slot is on attack timer, if timer has passed clear it, else early exit
-            if(attacker.getTimers().containsKey("Attack"+slot.name()))
+            if (attacker.getTimers() != null && attacker.getTimers().containsKey("Attack" + slot.name()))
-                if(attacker.getTimers().get("Attack"+slot.name()).timeToExecutionLeft() <= 0)
+                if (attacker.getTimers().get("Attack" + slot.name()).timeToExecutionLeft() <= 0)
-                    attacker.getTimers().remove("Attack"+slot.name());
+                    attacker.getTimers().remove("Attack" + slot.name());
                 else
                     return;
         }
@@ -156,12 +156,12 @@ public enum CombatManager {
 
         boolean inRange = false;
         if (AbstractCharacter.IsAbstractCharacter(target)) {
-            attackRange += ((AbstractCharacter)target).calcHitBox();
+            attackRange += ((AbstractCharacter) target).calcHitBox();
         } else {
 
         }
 
-        if(attackRange > 15 && attacker.isMoving()){
+        if (attackRange > 15 && attacker.isMoving()) {
             //cannot shoot bow while moving;
             return;
         }
@@ -169,23 +169,23 @@ public enum CombatManager {
         switch (target.getObjectType()) {
             case PlayerCharacter:
                 attackRange += ((PlayerCharacter) target).getCharacterHeight() * 0.5f;
-                if (distanceSquared < attackRange * attackRange)
+                if (distanceSquared <= attackRange * attackRange)
                     inRange = true;
                 break;
             case Mob:
                 attackRange += ((AbstractCharacter) target).calcHitBox();
-                if (distanceSquared < attackRange * attackRange)
+                if (distanceSquared <= attackRange * attackRange)
                     inRange = true;
                 break;
             case Building:
-                if(attackRange > 15){
+                if (attackRange > 15) {
                     float rangeSquared = (attackRange + target.getBounds().getHalfExtents().x) * (attackRange + target.getBounds().getHalfExtents().x);
                     //float distanceSquared = attacker.loc.distanceSquared(target.loc);
-                    if(distanceSquared < rangeSquared) {
+                    if (distanceSquared < rangeSquared) {
                         inRange = true;
                         break;
                     }
-                }else {
+                } else {
                     float locX = target.loc.x - target.getBounds().getHalfExtents().x;
                     float locZ = target.loc.z - target.getBounds().getHalfExtents().y;
                     float sizeX = (target.getBounds().getHalfExtents().x + attackRange) * 2;
@@ -202,7 +202,7 @@ public enum CombatManager {
 
         if (weapon != null) {
 
-            int wepSpeed = (int) (weapon.template.item_weapon_wepspeed);
+            float wepSpeed = (int) (weapon.template.item_weapon_wepspeed);
 
             if (weapon.getBonusPercent(mbEnums.ModType.WeaponSpeed, mbEnums.SourceType.None) != 0f) //add weapon speed bonus
                 wepSpeed *= (1 + weapon.getBonus(mbEnums.ModType.WeaponSpeed, mbEnums.SourceType.None));
@@ -213,7 +213,7 @@ public enum CombatManager {
             if (wepSpeed < 10)
                 wepSpeed = 10; //Old was 10, but it can be reached lower with legit buffs,effects.
 
-            delay = wepSpeed * 100L;
+            delay = (long)wepSpeed * 100L;
         }
 
         if (attacker.getObjectType().equals(mbEnums.GameObjectType.Mob))
@@ -221,6 +221,16 @@ public enum CombatManager {
 
         if (inRange) {
 
+            if(attacker.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)){
+                if(!attacker.getTimestamps().contains(slot.name()+"Attack")){
+                    attacker.getTimestamps().put(slot.name()+"Attack", System.currentTimeMillis() - 1000);
+                } else if(System.currentTimeMillis() < attacker.getTimestamps().get(slot.name()+"Attack") + delay){
+                    setAutoAttackJob(attacker,slot,delay);
+                    return;
+                }
+            }
+
+
             //handle retaliate
             if (AbstractCharacter.IsAbstractCharacter(target)) {
                 if (((AbstractCharacter) target).combatTarget == null || !((AbstractCharacter) target).combatTarget.isAlive()) {
@@ -264,6 +274,22 @@ public enum CombatManager {
                 atr = attacker.atrHandTwo;
             }
 
+            //apply weapon powers before early exit for miss or passives
+            DeferredPowerJob dpj = null;
+
+            if (attacker.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)) {
+
+                dpj = ((PlayerCharacter) attacker).getWeaponPower();
+
+                if (dpj != null) {
+                    dpj.attack(target, attackRange);
+
+                    if (dpj.getPower() != null && (dpj.getPowerToken() == -1851459567 || dpj.getPowerToken() == -1851489518))
+                        ((PlayerCharacter) attacker).setWeaponPower(dpj);
+                }
+            }
+
+
             int def = 0;
 
             if (AbstractCharacter.IsAbstractCharacter(target))
@@ -293,7 +319,7 @@ public enum CombatManager {
                     DispatchManager.sendToAllInRange(attacker, msg);
 
                 //we need to send the animation even if the attacker misses
-                TargetedActionMsg cmm = new TargetedActionMsg(attacker, target, (float) 0, getSwingAnimation(weapon.template,null,slot));
+                TargetedActionMsg cmm = new TargetedActionMsg(attacker, target, (float) 0, getSwingAnimation(weapon.template, null, slot));
                 DispatchManager.sendToAllInRange(target, cmm);
 
                 //set auto attack job
@@ -332,12 +358,18 @@ public enum CombatManager {
                     if (target.getObjectType() == mbEnums.GameObjectType.PlayerCharacter)
                         DispatchManager.dispatchMsgToInterestArea(target, msg, mbEnums.DispatchChannel.PRIMARY, MBServerStatics.CHARACTER_LOAD_RANGE, true, false);
 
+                    //we need to send the animation even if the attacker misses
+                    TargetedActionMsg cmm = new TargetedActionMsg(attacker, target, (float) 0, getSwingAnimation(weapon.template, null, slot));
+                    DispatchManager.sendToAllInRange(target, cmm);
                     //set auto attack job
                     setAutoAttackJob(attacker, slot, delay);
                     return;
                 }
             }
 
+            //check for proccing
+            checkForProc(attacker,target,weapon);
+
             //calculate the base damage
             int damage = ThreadLocalRandom.current().nextInt(min, max + 1);
             if (damage == 0) {
@@ -345,7 +377,7 @@ public enum CombatManager {
                 setAutoAttackJob(attacker, slot, delay);
                 return;
             }
-            if(attacker.getObjectType().equals(mbEnums.GameObjectType.Mob) && ((Mob)attacker).isPet())
+            if (attacker.getObjectType().equals(mbEnums.GameObjectType.Mob) && ((Mob) attacker).isPet())
                 calculatePetDamage(attacker);
 
             //get the damage type
@@ -414,6 +446,9 @@ public enum CombatManager {
 
                     if (resists.immuneTo(damageType)) {
                         //set auto attack job
+                        //we need to send the animation even if the attacker misses
+                        TargetedActionMsg cmm = new TargetedActionMsg(attacker, target, (float) 0, getSwingAnimation(weapon.template, null, slot));
+                        DispatchManager.sendToAllInRange(target, cmm);
                         setAutoAttackJob(attacker, slot, delay);
                         return;
                     }
@@ -446,20 +481,6 @@ public enum CombatManager {
             }
         }
 
-        DeferredPowerJob dpj = null;
-
-        if (attacker.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)) {
-
-            dpj = ((PlayerCharacter) attacker).getWeaponPower();
-
-            if (dpj != null) {
-                dpj.attack(target, attackRange);
-
-                if (dpj.getPower() != null && (dpj.getPowerToken() == -1851459567 || dpj.getPowerToken() == -1851489518))
-                    ((PlayerCharacter) attacker).setWeaponPower(dpj);
-            }
-        }
-
         //set auto attack job
         setAutoAttackJob(attacker, slot, delay);
 
@@ -537,7 +558,7 @@ public enum CombatManager {
         }
 
         //Item has no equipment slots and should not try to return an animation, return default instead
-        if(wb.item_eq_slots_or == null || wb.item_eq_slots_or.size() == 0){
+        if (wb.item_eq_slots_or == null || wb.item_eq_slots_or.isEmpty()) {
             return 75;
         }
 
@@ -546,15 +567,15 @@ public enum CombatManager {
         int random;
 
         //Item can only be equipped in one slot, return animation for that slot
-        if(wb.item_eq_slots_or.size() == 1){
+        if (wb.item_eq_slots_or.size() == 1) {
             if (wb.item_eq_slots_or.iterator().next().equals(mbEnums.EquipSlotType.RHELD)) {
                 anim = wb.weapon_attack_anim_right.get(0)[0];
                 if (dpj != null) {
                     random = ThreadLocalRandom.current().nextInt(wb.weapon_attack_anim_right.size());
                     anim = wb.weapon_attack_anim_right.get(random)[0];
                 }
-            }else {
+            } else {
-                anim =  wb.weapon_attack_anim_left.get(0)[0];
+                anim = wb.weapon_attack_anim_left.get(0)[0];
                 if (dpj != null) {
                     random = ThreadLocalRandom.current().nextInt(wb.weapon_attack_anim_left.size());
                     anim = wb.weapon_attack_anim_left.get(random)[0];
@@ -570,7 +591,7 @@ public enum CombatManager {
                 random = ThreadLocalRandom.current().nextInt(wb.weapon_attack_anim_right.size());
                 anim = wb.weapon_attack_anim_right.get(random)[0];
             }
-        }else {
+        } else {
             anim = wb.weapon_attack_anim_left.get(0)[0];
             if (dpj != null) {
                 random = ThreadLocalRandom.current().nextInt(wb.weapon_attack_anim_left.size());
@@ -580,8 +601,8 @@ public enum CombatManager {
         return anim;
     }
 
-    public static int getPassiveAnimation(mbEnums.PassiveType passiveType){
+    public static int getPassiveAnimation(mbEnums.PassiveType passiveType) {
-        switch(passiveType){
+        switch (passiveType) {
             case Block:
                 return COMBAT_BLOCK_ANIMATION;
             case Parry:
@@ -596,7 +617,7 @@ public enum CombatManager {
     public static void setAutoAttackJob(AbstractCharacter attacker, mbEnums.EquipSlotType slot, long delay) {
         //calculate next allowed attack and update the timestamp
 
-        if(attacker.getTimestamps().containsKey("Attack" + slot.name()) && attacker.getTimestamps().get("Attack" + slot.name()) > System.currentTimeMillis())
+        if (attacker.getTimestamps().containsKey("Attack" + slot.name()) && attacker.getTimestamps().get("Attack" + slot.name()) > System.currentTimeMillis())
             return;
 
         attacker.getTimestamps().put("Attack" + slot.name(), System.currentTimeMillis() + delay);
@@ -613,6 +634,7 @@ public enum CombatManager {
             Logger.error("Unable to find Timers for Character " + attacker.getObjectUUID());
 
     }
+
     public static int calculatePetDamage(AbstractCharacter agent) {
         //damage calc for pet
         float range;
@@ -627,6 +649,7 @@ public enum CombatManager {
         damage = min + ((ThreadLocalRandom.current().nextFloat() * range) + (ThreadLocalRandom.current().nextFloat() * range)) / 2;
         return (int) (damage * dmgMultiplier);
     }
+
     public static double getMinDmg(double min, AbstractCharacter agent) {
         int primary = agent.getStatStrCurrent();
         int secondary = agent.getStatDexCurrent();
@@ -634,6 +657,7 @@ public enum CombatManager {
         int masteryLevel = 0;
         return min * (pow(0.0048 * primary + .049 * (primary - 0.75), 0.5) + pow(0.0066 * secondary + 0.064 * (secondary - 0.75), 0.5) + +0.01 * (focusLevel + masteryLevel));
     }
+
     public static double getMaxDmg(double max, AbstractCharacter agent) {
         int primary = agent.getStatStrCurrent();
         int secondary = agent.getStatDexCurrent();
@@ -641,4 +665,20 @@ public enum CombatManager {
         int masteryLevel = 0;
         return max * (pow(0.0124 * primary + 0.118 * (primary - 0.75), 0.5) + pow(0.0022 * secondary + 0.028 * (secondary - 0.75), 0.5) + 0.0075 * (focusLevel + masteryLevel));
     }
+
+    public static void checkForProc(AbstractCharacter attacker, AbstractWorldObject target, Item weapon){
+
+        if(weapon == null) // cant proc without a weapon
+            return;
+
+        for(Effect eff : weapon.effects.values()){
+            for(AbstractEffectModifier mod : eff.getEffectsBase().getModifiers()){
+                if(mod.modType.equals(mbEnums.ModType.WeaponProc))
+                    if(ThreadLocalRandom.current().nextInt(0,101) < 6)
+                        ((WeaponProcEffectModifier)mod).applyProc(attacker,target);
+            }
+        }
+
+
+    }
 }

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/ForgeManager.java

@@ -67,7 +67,7 @@ public enum ForgeManager implements Runnable {
                 // Early exit for completed workOrders loaded from disk
                 // or vendors who were re-deeded with items still cooking.
 
-                if (workOrder.vendor == null && workOrder.runCompleted.get())
+                if (workOrder.vendor == null || workOrder.runCompleted.get())
                     continue;
 
                 // This workOrder has completed production.
@@ -265,12 +265,12 @@ public enum ForgeManager implements Runnable {
 
         // Assign a prefix and suffix to this item if random rolled
 
-        if (workOrder.prefixToken == 0)
+        if (workOrder.prefixToken == 0 && workOrder.vendor.getItemModTable().contains((template.modTable)))
             forgedItem.prefixToken = calcRandomMod(workOrder.vendor, mbEnums.ItemModType.PREFIX, template.modTable);
         else
             forgedItem.prefixToken = workOrder.prefixToken;
 
-        if (workOrder.suffixToken == 0)
+        if (workOrder.suffixToken == 0 && workOrder.vendor.getItemModTable().contains((template.modTable)))
             forgedItem.suffixToken = calcRandomMod(workOrder.vendor, mbEnums.ItemModType.SUFFIX, template.modTable);
         else
             forgedItem.suffixToken = workOrder.suffixToken;
@@ -393,6 +393,12 @@ public enum ForgeManager implements Runnable {
         if (rollForModifier < 80) {
             int randomModifier = LootManager.TableRoll(vendor.getLevel(), false);
             modTableEntry = ModTableEntry.rollTable(modTypeTableEntry.modTableID, randomModifier);
+
+            // @TODO : Figure out how a null can be returned from a defined set.
+
+            if (modTableEntry == null)
+                return 0;
+
             EffectsBase effectsBase = PowersManager.getEffectByIDString(modTableEntry.action);
             modifier = effectsBase.getToken();
         }

src/engine/gameManager/ItemManager.java

@@ -102,7 +102,7 @@ public enum ItemManager {
             if (characterSkill == null)
                 return false;
 
-            if (characterSkill.getModifiedAmountBeforeMods() > required_value)
+            if (characterSkill.getModifiedAmountBeforeMods() >= required_value)
                 return true;
 
         }

src/engine/gameManager/PowersManager.java

@@ -31,6 +31,10 @@ import engine.objects.*;
 import engine.powers.*;
 import engine.powers.poweractions.AbstractPowerAction;
 import engine.server.MBServerStatics;
+import engine.wpak.EffectsParser;
+import engine.wpak.PowerActionParser;
+import engine.wpak.PowersParser;
+import engine.wpak.data.Effect;
 import org.pmw.tinylog.Logger;
 
 import java.util.ArrayList;
@@ -112,10 +116,30 @@ public enum PowersManager {
         return powerEntries;
     }
 
+    public static void InitializeEffects(){
+        // Add EffectsBase
+        ArrayList<EffectsBase> effectList = new ArrayList<>();
+
+        for (Effect entry : EffectsParser.effect_data.values()) {
+            EffectsBase effectBase = new EffectsBase(entry);
+            effectList.add(effectBase);
+            PowersManager.effectsBaseByToken.put(effectBase.getToken(), effectBase);
+            PowersManager.effectsBaseByIDString.put(effectBase.getIDString(), effectBase);
+        }
+
+        // Add Fail Conditions
+        EffectsBase.getFailConditions(PowersManager.effectsBaseByIDString);
+    }
+
     // This pre-loads all powers and effects
     public static void InitializePowers() {
 
-        // Add EffectsBase
+        EffectsParser.parseWpakFile();
+        PowersParser.parseWpakFile();
+        PowerActionParser.parseWpakFile();
+
+        //InitializeEffects();
+
         ArrayList<EffectsBase> ebList = dbEffectsBaseHandler.getAllEffectsBase();
 
         for (EffectsBase eb : ebList) {
@@ -176,12 +200,29 @@ public enum PowersManager {
             PowersBase pb = PowersManager.powersBaseByToken.get(msg.getPowerUsedID());
             PlayerCharacter caster = origin.getPlayerCharacter();
             PlayerCharacter target = PlayerCharacter.getFromCache(msg.getTargetID());
-            if (pb != null && pb.isHarmful == false) {
+            if (pb != null && pb.enforceLore()) {
                 //if (caster.guild.equals(Guild.getErrantGuild()))
                 //    return;
 
-                if (target != null && caster.guild.getGuildType().equals(target.guild.getGuildType()) == false && target.getObjectType().equals(GameObjectType.Building) == false)
+                if (target != null && caster.guild.getGuildType().equals(target.guild.getGuildType()) == false && target.getObjectType().equals(GameObjectType.Building) == false) {
+                    RecyclePowerMsg recyclePowerMsg = new RecyclePowerMsg(msg.getPowerUsedID());
+                    Dispatch dispatch = Dispatch.borrow(origin.getPlayerCharacter(), recyclePowerMsg);
+                    DispatchManager.dispatchMsgDispatch(dispatch, DispatchChannel.PRIMARY);
+
+                    // Send Fail to cast message
+                    PlayerCharacter pc = SessionManager
+                            .getPlayerCharacter(origin);
+
+                    if (pc != null) {
+                        sendPowerMsg(pc, 2, msg);
+                        if (pc.isCasting()) {
+                            pc.update();
+                        }
+
+                        pc.setIsCasting(false);
+                    }
                     return;
+                }
             }
         }
 
@@ -908,10 +949,6 @@ public enum PowersManager {
                 if (pb.isHarmful())
                     mobTarget.handleDirectAggro(playerCharacter);
             }
-            //Power is aiding a target, handle aggro if combat target is a Mob.
-            if (!pb.isHarmful() && target.getObjectType() == GameObjectType.PlayerCharacter) {
-                PlayerCharacter pcTarget = (PlayerCharacter) target;
-            }
 
             // update target of used power timer
 
@@ -933,8 +970,7 @@ public enum PowersManager {
                     continue;
                 // If something blocks the action, then stop
 
-                if (ab.blocked(target, pb, trains)) {
+                if (ab.blocked(target,pb.vampDrain)) {
-
                     PowersManager.sendEffectMsg(playerCharacter, 5, ab, pb);
                     continue;
                 }
@@ -945,7 +981,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();
@@ -1109,7 +1145,7 @@ public enum PowersManager {
                     continue;
                 // If something blocks the action, then stop
 
-                if (ab.blocked(target, pb, trains))
+                if (ab.blocked(target,pb.vampDrain))
                     continue;
                 // TODO handle overwrite stack order here
                 String stackType = ab.getStackType();
@@ -1117,7 +1153,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();
@@ -1423,7 +1459,7 @@ public enum PowersManager {
             if (trains < ab.getMinTrains() || trains > ab.getMaxTrains())
                 continue;
             // If something blocks the action, then stop
-            if (ab.blocked(target, pb, trains))
+            if (ab.blocked(target,pb.vampDrain))
                 // sendPowerMsg(pc, 5, msg);
                 continue;
             // TODO handle overwrite stack order here
@@ -1431,7 +1467,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();
@@ -1878,7 +1914,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/loot/WorkOrder.java

@@ -84,6 +84,11 @@ public class WorkOrder implements Delayed {
         this.completionTime = jsonWorkOrder.getLong("completionTime");
         this.runCompleted.set(jsonWorkOrder.getBoolean("runCompleted"));
 
+        // Vendor sanity check.  Might have been deleted
+
+        if (this.vendor == null)
+            return;
+
         JSONObject productionCostMap = jsonWorkOrder.getJSONObject("production_cost");
 
         for (String key : productionCostMap.keySet()) {
@@ -107,6 +112,7 @@ public class WorkOrder implements Delayed {
         for (Object o : tokenList) {
             int prefix = ((JSONArray) o).getInt(0);
             int suffix = ((JSONArray) o).getInt(1);
+
             Item cookingItem = ForgeManager.forgeItem(this);
             cookingItem.prefixToken = prefix;
             cookingItem.suffixToken = suffix;
@@ -129,7 +135,8 @@ public class WorkOrder implements Delayed {
         if (!workOrder.vendor.charItemManager.hasRoomInventory(template.item_wt))
             return 30;  //30: That person cannot carry that item
 
-        if (!workOrder.vendor.getItemModTable().contains((template.modTable)))
+        if ((workOrder.prefixToken != 0 || workOrder.suffixToken != 0) &&
+                !workOrder.vendor.getItemModTable().contains((template.modTable)))
             return 59;   //59: This hireling does not have this formula
 
         if (!Warehouse.calcCostOverrun(workOrder).isEmpty())

src/engine/mbEnums.java

@@ -831,16 +831,22 @@ public class mbEnums {
         SPIRES,
         SNARE,
         STUN,
-        BLIND,
+        BLINDNESS,
         ROOT,
         FEAR,
         CHARM,
-        POWERBLOCK,
+        POWERINHIBITOR,
         DEBUFF,
         STEAL,
         DRAIN;
 
         public static DamageType getDamageType(String modName) {
+            if(modName.toLowerCase().equals("blind"))
+                modName = "BLINDNESS";
+
+            if(modName.toLowerCase().equals("powerblock"))
+                modName = "POWERINHIBITOR";
+
             DamageType damageType;
             if (modName.isEmpty())
                 return DamageType.NONE;
@@ -2715,42 +2721,45 @@ public class mbEnums {
 
     public enum ResourceType {
 
-        GOLD(7, 2308551, 100000000, 10),
+        GOLD(7, -1670881623, 2308551, 100000000, 50000),
-        ADAMANT(1580003, -1741189964, 1000, 10),
+        ADAMANT(1580003, 1557001525, -1741189964, 1000, 10),
-        AGATE(1580009, 75173057, 2000, 10),
+        AGATE(1580009, -1096157543, 75173057, 2000, 20),
-        ANTIMONY(1580014, 452320058, 1000, 10),
+        ANTIMONY(1580014, 1256147265, 452320058, 1000, 10),
-        AZOTH(1580012, 78329697, 2000, 10),
+        AZOTH(1580012, -1205326951, 78329697, 2000, 20),
-        BLOODSTONE(1580020, -1569826353, 500, 10),
+        BLOODSTONE(1580020, -1912381716, -1569826353, 500, 5),
-        BRONZEWOOD(1580006, 1334770447, 500, 10),
+        BRONZEWOOD(1580006, -519681813, 1334770447, 1000, 30),
-        COAL(1580008, 2559427, 3000, 10),
+        COAL(1580008, -1672872311, 2559427, 3000, 30),
-        DIAMOND(1580010, -1730704107, 2000, 10),
+        DIAMOND(1580010, 1540225085, -1730704107, 2000, 20),
-        GALVOR(1580017, -1596311545, 2000, 10),
+        GALVOR(1580017, -1683992404, -1596311545, 2000, 5),
-        IRON(1580002, 2504297, 2000, 10),
+        IRON(1580002, -1673518119, 2504297, 2000, 20),
-        LUMBER(1580004, -1603256692, 10000, 10),
+        LUMBER(1580004, -1628412684, -1603256692, 10000, 100),
-        MANDRAKE(1580007, 1191391799, 1000, 10),
+        MANDRAKE(1580007, 1519910613, 1191391799, 1000, 10),
-        MITHRIL(1580021, -1761257186, 500, 10),
+        MITHRIL(1580021, 626743397, -1761257186, 500, 5),
-        OAK(1580005, 74767, 3000, 10),
+        OAK(1580005, -1653034775, 74767, 3000, 30),
-        OBSIDIAN(1580019, -697973233, 500, 10),
+        OBSIDIAN(1580019, 778019055, -697973233, 500, 5),
-        ONYX(1580011, 2977263, 1000, 10),
+        ONYX(1580011, -1675952151, 2977263, 1000, 10),
-        ORICHALK(1580013, -2036290524, 3000, 10),
+        ORICHALK(1580013, -1468730955, -2036290524, 3000, 30),
-        QUICKSILVER(1580016, -472884509, 1000, 10),
+        QUICKSILVER(1580016, -2081208434, -472884509, 1000, 10),
-        STONE(1580000, 74856115, 10000, 10),
+        STONE(1580000, -1094703863, 74856115, 10000, 100),
-        SULFUR(1580015, -1586349421, 1000, 10),
+        SULFUR(1580015, -1763687412, -1586349421, 1000, 10),
-        TRUESTEEL(1580001, -317484979, 2000, 10),
+        TRUESTEEL(1580001, -169012482, -317484979, 2000, 20),
-        WORMWOOD(1580018, 1532478436, 500, 10);
+        WORMWOOD(1580018, 1204785075, 1532478436, 500, 5);
 
-        public static HashMap<Integer, ResourceType> resourceLookup = new HashMap<>();
+        public static HashMap<Integer, ResourceType> templateLookup = new HashMap<>();
-        public static HashMap<Integer, ResourceType> hashLookup = new HashMap<>();
+        public static HashMap<Integer, ResourceType> templateHashLookup = new HashMap<>();
+        public static HashMap<Integer, ResourceType> resourceHashLookup = new HashMap<>();
         public int templateID;
         public ItemTemplate template;
-        public int hash;
+        public int resourceHash;
+        public int templateHash;
         public int deposit_limit;
         public int mine_production;
 
-        ResourceType(int templateID, int hash, int deposit_limit, int mine_production) {
+        ResourceType(int templateID, int resourceHash, int templateHash, int deposit_limit, int mine_production) {
             this.templateID = templateID;
             this.template = ItemTemplate.templates.get(this.templateID);
-            this.hash = hash;
+            this.resourceHash = resourceHash;
+            this.templateHash = templateHash;
             this.deposit_limit = deposit_limit;
             this.mine_production = mine_production;
         }
@@ -2758,11 +2767,11 @@ public class mbEnums {
         public static void InitializeResourceTypes() {
 
             for (ResourceType resourceType : ResourceType.values()) {
-                resourceLookup.put(resourceType.templateID, resourceType);
+                templateLookup.put(resourceType.templateID, resourceType);
-                hashLookup.put(resourceType.hash, resourceType);
+                templateHashLookup.put(resourceType.templateHash, resourceType);
+                resourceHashLookup.put(resourceType.resourceHash, resourceType);
             }
 
-
         }
     }
 
@@ -3013,5 +3022,62 @@ public class mbEnums {
         PREFIX,
         SUFFIX;
     }
+
+    public enum PowerType {
+        None,
+        SPELL,
+        SKILL;
+    }
+
+    public enum CostType {
+        NONE,
+        HEALTH,
+        MANA,
+        STAMINA;
+    }
+
+    public enum AreaType {
+        NONE,
+        SPHERE,
+        POINTBLANK,
+        LINE,
+        CONE,
+        WALL;
+    }
+
+    public enum ExcludeType {
+        NONE,
+        CASTER,
+        GROUP,
+        GUILD,
+        NATION,
+        PLAYERS,
+        ALLBUTGROUP,
+        ALLBUTPETS;
+    }
+
+    public enum CastingModeType {
+        NONE,
+        COMBAT,
+        NONCOMBAT,
+        BOTH;
+    }
+
+    public enum TargetSelectType {
+        NONE,
+        CLICK,
+        GROUP,
+        GUILD,
+        NEARBYMOBS,
+        NAME;
+    }
+
+    public enum CategoryToPowerType {
+        None,
+        GreaterThanOrEqualTo,
+        GreaterThan,
+        Always
+    }
+
 }
 

src/engine/mobileAI/MobAI.java

@@ -100,7 +100,7 @@ public class MobAI {
     public static void attackPlayer(Mob mob, PlayerCharacter target) {
 
         try {
-            if(target == null || !target.isAlive() || !target.isActive() ) {
+            if (target == null || !target.isAlive() || !target.isActive()) {
                 mob.setCombatTarget(null);
                 return;
             }
@@ -175,6 +175,8 @@ public class MobAI {
     public static void attackMob(Mob mob, Mob target) {
 
         try {
+            if (mob == null || target == null)
+                return;
 
             if (mob.getRange() >= 30 && mob.isMoving())
                 return;
@@ -973,36 +975,36 @@ public class MobAI {
     }
 
     private static void hamletGuardAggro(Mob mob) {
-            Realm realm = RealmMap.getRealmAtLocation(mob.loc);
+        Realm realm = RealmMap.getRealmAtLocation(mob.loc);
-            if(realm.getRealmName().equals("Uthgaard")){
+        if (realm.getRealmName().equals("Uthgaard")) {
-                HashSet<AbstractWorldObject> loadedMobs = WorldGrid.getObjectsInRangePartial(mob.loc, MobAIThread.AI_BASE_AGGRO_RANGE, MBServerStatics.MASK_MOB);
+            HashSet<AbstractWorldObject> loadedMobs = WorldGrid.getObjectsInRangePartial(mob.loc, MobAIThread.AI_BASE_AGGRO_RANGE, MBServerStatics.MASK_MOB);
-                for (AbstractWorldObject awo : loadedMobs) {
+            for (AbstractWorldObject awo : loadedMobs) {
-                    Mob targetMob = (Mob) awo;
+                Mob targetMob = (Mob) awo;
-                    if (targetMob.equals(mob))
+                if (targetMob.equals(mob))
-                        continue;
+                    continue;
-                    if (!targetMob.isAlive() || targetMob.despawned)
+                if (!targetMob.isAlive() || targetMob.despawned)
-                        continue;
+                    continue;
-                    if (targetMob.isPet())
+                if (targetMob.isPet())
-                        continue;
+                    continue;
-                    mob.combatTarget = targetMob;
+                mob.combatTarget = targetMob;
-                    return;
-                }
                 return;
             }
-            HashSet<AbstractWorldObject> loadedPlayers = WorldGrid.getObjectsInRangePartial(mob.loc, MobAIThread.AI_BASE_AGGRO_RANGE, MBServerStatics.MASK_PLAYER);
+            return;
-            for (AbstractWorldObject awo : loadedPlayers) {
+        }
-                PlayerCharacter pc = (PlayerCharacter) awo;
+        HashSet<AbstractWorldObject> loadedPlayers = WorldGrid.getObjectsInRangePartial(mob.loc, MobAIThread.AI_BASE_AGGRO_RANGE, MBServerStatics.MASK_PLAYER);
-                if (!pc.isAlive() || !pc.isActive())
+        for (AbstractWorldObject awo : loadedPlayers) {
-                    continue;
+            PlayerCharacter pc = (PlayerCharacter) awo;
-                if (pc.guild.equals(Guild.getErrantGuild())) {
+            if (!pc.isAlive() || !pc.isActive())
-                    mob.combatTarget = pc;
+                continue;
-                    return;
+            if (pc.guild.equals(Guild.getErrantGuild())) {
-                }
-                if (pc.guild.charter.equals(mob.guild.charter))
-                    continue;
                 mob.combatTarget = pc;
                 return;
             }
+            if (pc.guild.charter.equals(mob.guild.charter))
+                continue;
+            mob.combatTarget = pc;
+            return;
+        }
     }
 
     private static void defaultLogic(Mob mob) {

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

@@ -50,7 +50,7 @@ public class ArcMineChangeProductionMsgHandler extends AbstractClientMsgHandler
 
         //make sure valid resource
 
-        mbEnums.ResourceType resource = mbEnums.ResourceType.hashLookup.get(changeProductionMsg.getResourceHash());
+        mbEnums.ResourceType resource = mbEnums.ResourceType.resourceHashLookup.get(changeProductionMsg.getResourceHash());
 
         if (resource == null)
             return true;

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

@@ -102,7 +102,7 @@ public class ClaimGuildTreeMsgHandler extends AbstractClientMsgHandler {
                     if (building.getGuild().isEmptyGuild())
                         return true;
 
-                    if (!ManageCityAssetMsgHandler.playerCanManageNotFriends(sourcePlayer, building))
+                    if (!BuildingManager.playerCanManage(sourcePlayer, building))
                         return true;
 
 
@@ -159,7 +159,7 @@ public class ClaimGuildTreeMsgHandler extends AbstractClientMsgHandler {
                             (building == null) || playerZone == null || playerCity == null)
                         return true;
 
-                    if (!ManageCityAssetMsgHandler.playerCanManageNotFriends(sourcePlayer, building))
+                    if (!BuildingManager.playerCanManage(sourcePlayer, building))
                         return true;
 
                     boolean open = (msg.getMessageType() == OPEN_CITY);

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

@@ -102,6 +102,9 @@ public class InviteToSubHandler extends AbstractClientMsgHandler {
         //source guild is limited to 7 subs
         //TODO this should be based on TOL rank
 
+        //cannot be subbed into a nation if you already have your own sub guilds
+        if(targetGuild.getSubGuildList() != null && targetGuild.getSubGuildList().size() > 0)
+            return true;
 
         if (!sourceGuild.canSubAGuild(targetGuild)) {
             sendChat(source, "This Guild can't be subbed.");

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

@@ -28,30 +28,6 @@ public class ManageCityAssetMsgHandler extends AbstractClientMsgHandler {
         super();
     }
 
-    public static boolean playerCanManageNotFriends(PlayerCharacter player, Building building) {
-
-        //Player Can only Control Building if player is in Same Guild as Building and is higher rank than IC.
-
-        if (player == null)
-            return false;
-
-        if (building.getRank() == -1)
-            return false;
-
-        if (BuildingManager.IsOwner(building, player))
-            return true;
-
-        if (GuildStatusController.isGuildLeader(player.getGuildStatus()) == false && GuildStatusController.isInnerCouncil(player.getGuildStatus()) == false)
-            return false;
-
-        //Somehow guild leader check fails above? lets check if Player is true Guild GL.
-        if (building.getGuild() != null && building.getGuild().isGuildLeader(player.getObjectUUID()))
-            return true;
-
-        return Guild.sameGuild(building.getGuild(), player.getGuild());
-
-    }
-
     @Override
     protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
 

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

@@ -248,7 +248,7 @@ public class MerchantMsgHandler extends AbstractClientMsgHandler {
         City targetCity = null;
 
         if (isTeleport)
-            cities = City.getCitiesToTeleportTo(player);
+            cities = City.getCitiesToTeleportTo(player, false);
         else
             cities = City.getCitiesToRepledgeTo(player);
         for (City city : cities) {

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

@@ -264,8 +264,9 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler {
                         player.cancelOnSpell();
                         break;
                     case RUNE:
-                        ApplyRuneMsg.applyRune(uuid, origin, player);
+                        if(ApplyRuneMsg.applyRune(uuid, origin, player)) {
-                        itemMan.consume(item);
+                            itemMan.consume(item);
+                        }
                         break;
                     default: //shouldn't be here, consume item
                         dispatch = Dispatch.borrow(player, msg);

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

@@ -183,7 +183,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
         if (building == null)
             return;
 
-        if (ManageCityAssetMsgHandler.playerCanManageNotFriends(player, building) == false)
+        if (BuildingManager.playerCanManage(player, building) == false)
             return;
 
         if (orderNpcMsg.getPatrolSize() >= 20)
@@ -411,7 +411,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
                 case 2:
                     player = SessionManager.getPlayerCharacter(origin);
 
-                    if (ManageCityAssetMsgHandler.playerCanManageNotFriends(player, building) == false)
+                    if (BuildingManager.playerCanManage(player, building) == false)
                         return true;
 
                     if (building.getHirelings().containsKey(npc) == false)

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

@@ -54,7 +54,7 @@ public class PetAttackMsgHandler extends AbstractClientMsgHandler {
             pet.setCombatTarget(PlayerCharacter.getPlayerCharacter(msg.getTargetID()));
 
         switch (msg.getTargetType()) {
-            case 53: //player character
+            case 52: //player character
                 pet.setCombatTarget(PlayerCharacter.getPlayerCharacter(msg.getTargetID()));
                 break;
             case 37://mob

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

@@ -53,7 +53,7 @@ public class TransferGoldToFromBuildingMsgHandler extends AbstractClientMsgHandl
 
         if (msg.getDirection() == 2) {
 
-            if (!ManageCityAssetMsgHandler.playerCanManageNotFriends(player, building))
+            if (!BuildingManager.playerCanManage(player, building))
                 return true;
             if (building.setReserve(msg.getUnknown01(), player)) {
                 dispatch = Dispatch.borrow(player, msg);

src/engine/net/client/msg/SendOwnPlayerMsg.java

@@ -59,7 +59,7 @@ public class SendOwnPlayerMsg extends ClientNetMsg {
     @Override
     protected int getPowerOfTwoBufferSize() {
         //Larger size for historically larger opcodes
-        return (17); // 2^17 == 131,072
+        return (18); // 2^17 == 131,072
     }
 
     /**

src/engine/net/client/msg/TeleportRepledgeListMsg.java

@@ -73,10 +73,8 @@ public class TeleportRepledgeListMsg extends ClientNetMsg {
 
     public void configure() {
 
-        if (isTeleport)
+        cities = City.getCitiesToTeleportTo(player, !isTeleport);
-            cities = City.getCitiesToTeleportTo(player);
+
-        else
-            cities = City.getCitiesToRepledgeTo(player);
     }
 
     /**

src/engine/net/client/msg/ViewResourcesMsg.java

@@ -93,7 +93,7 @@ public class ViewResourcesMsg extends ClientNetMsg {
 
         for (mbEnums.ResourceType resourceType : (warehouseObject.resources.keySet())) {
 
-            writer.putInt(resourceType.hash);
+            writer.putInt(resourceType.templateHash);
             writer.putInt((warehouseObject.resources.get(resourceType)));
 
 
@@ -107,7 +107,7 @@ public class ViewResourcesMsg extends ClientNetMsg {
 
         for (mbEnums.ResourceType resourceType : warehouseObject.resources.keySet()) {
 
-            writer.putInt(resourceType.hash);
+            writer.putInt(resourceType.templateHash);
             writer.putInt(0); //available?
             writer.putInt(resourceType.deposit_limit); //max?
         }

src/engine/objects/AbstractCharacter.java

@@ -31,6 +31,7 @@ import engine.net.client.msg.ApplyRuneMsg;
 import engine.net.client.msg.UpdateStateMsg;
 import engine.powers.EffectsBase;
 import engine.powers.PowersBase;
+import engine.powers.effectmodifiers.AbstractEffectModifier;
 import engine.server.MBServerStatics;
 import org.pmw.tinylog.Logger;
 
@@ -655,13 +656,13 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
         AssignDamageAtrForPlayers(abstractCharacter, equipped.get(EquipSlotType.LHELD), false, equipped.get(EquipSlotType.LHELD));
         if (abstractCharacter.getObjectType().equals(GameObjectType.Mob)) {
             Mob mob = (Mob) abstractCharacter;
-            abstractCharacter.minDamageHandOne += (int) mob.mobBase.getDamageMin();
+            abstractCharacter.minDamageHandOne = (int) mob.mobBase.getDamageMin();
-            abstractCharacter.minDamageHandTwo += (int) mob.mobBase.getDamageMin();
+            abstractCharacter.minDamageHandTwo = (int) mob.mobBase.getDamageMin();
-            abstractCharacter.maxDamageHandOne += (int) mob.mobBase.getDamageMax();
+            abstractCharacter.maxDamageHandOne = (int) mob.mobBase.getDamageMax();
-            abstractCharacter.maxDamageHandTwo += (int) mob.mobBase.getDamageMax();
+            abstractCharacter.maxDamageHandTwo = (int) mob.mobBase.getDamageMax();
-            abstractCharacter.atrHandOne += mob.mobBase.getAttackRating();
+            abstractCharacter.atrHandOne = mob.mobBase.getAttackRating();
-            abstractCharacter.atrHandTwo += mob.mobBase.getAttackRating();
+            abstractCharacter.atrHandTwo = mob.mobBase.getAttackRating();
-            abstractCharacter.defenseRating += mob.mobBase.getDefenseRating();
+            abstractCharacter.defenseRating = mob.mobBase.getDefenseRating();
         }
     }
 
@@ -804,7 +805,25 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
         if (weapon != null)
             speed *= (1 + abstractCharacter.bonuses.getFloatPercentAll(ModType.WeaponSpeed, SourceType.None));
 
-        speed *= (1 + abstractCharacter.bonuses.getFloatPercentAll(ModType.AttackDelay, SourceType.None));
+        PlayerBonuses bonuses = abstractCharacter.bonuses;
+        if (bonuses != null) {
+            ModType modType = ModType.AttackDelay;
+            for (AbstractEffectModifier mod : bonuses.bonusFloats.keySet()) {
+
+                if (mod.getPercentMod() == 0)
+                    continue;
+
+
+                if (!mod.modType.equals(modType))
+                    continue;
+
+                if (bonuses.bonusFloats.get(mod) == null)
+                    continue;
+
+                speed *= (1 + bonuses.bonusFloats.get(mod));
+            }
+        }
+        //speed *= (1 + abstractCharacter.bonuses.getFloatPercentAll(ModType.AttackDelay, SourceType.None));
 
         if (speed < 10)
             speed = 10;
@@ -1809,7 +1828,13 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
                     //handle hate value addition
                     Mob target = (Mob) this;
                     if (attacker.getObjectType().equals(GameObjectType.PlayerCharacter)) {
-                        target.playerAgroMap.put(attacker.getObjectUUID(), target.playerAgroMap.get(attacker.getObjectUUID()) + value);
+
+                        if (target.playerAgroMap.containsKey(attacker.getObjectUUID()))
+                            target.playerAgroMap.put(attacker.getObjectUUID(), target.playerAgroMap.get(attacker.getObjectUUID()) + value);
+                        else
+                            target.playerAgroMap.put(attacker.getObjectUUID(), value);
+
+
                         if (target.isPlayerGuard()) {
                             if (target.guardedCity != null && target.guardedCity.cityOutlaws.contains(attacker.getObjectUUID()) == false)
                                 target.guardedCity.cityOutlaws.add(attacker.getObjectUUID());

src/engine/objects/Bane.java

@@ -641,18 +641,18 @@ public final class Bane {
         return cityUUID;
     }
 
-    public void startBane(){
+    public void startBane() {
         City city = this.getCity();
-        if(city == null)
+        if (city == null)
             return;
 
         this.isStarted = true; //flag the bane as started
 
-        for(AbstractWorldObject awo : WorldGrid.getObjectsInRangePartial(city.loc,mbEnums.CityBoundsType.ZONE.halfExtents + 64,MBServerStatics.MASK_BUILDING)){
+        for (AbstractWorldObject awo : WorldGrid.getObjectsInRangePartial(city.loc, mbEnums.CityBoundsType.ZONE.halfExtents + 64, MBServerStatics.MASK_BUILDING)) {
-            Building building = (Building)awo;
+            Building building = (Building) awo;
-            if(building == null)
+            if (building == null)
                 continue;
-            if(building.protectionState.equals(ProtectionState.UNDERSIEGE) == false)
+            if (building.protectionState.equals(ProtectionState.UNDERSIEGE) == false)
                 building.protectionState = ProtectionState.UNDERSIEGE;
         }
 

src/engine/objects/Building.java

@@ -163,6 +163,11 @@ public class Building extends AbstractWorldObject {
             if (upgradeTimeStamp != null)
                 this.upgradeDateTime = LocalDateTime.ofInstant(upgradeTimeStamp.toInstant(), ZoneId.systemDefault());
 
+            if(rs.getInt("enforceKOS") == 0)
+                this.enforceKOS = false;
+            else
+                this.enforceKOS = true;
+
         } catch (Exception e) {
             Logger.error("Failed for object " + this.blueprintUUID + ' ' + this.getObjectUUID() + e);
         }
@@ -556,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) {
@@ -1447,7 +1452,7 @@ public class Building extends AbstractWorldObject {
 
     public synchronized boolean setReserve(int amount, PlayerCharacter player) {
 
-        if (!BuildingManager.playerCanManageNotFriends(player, this))
+        if (!BuildingManager.playerCanManage(player, this))
             return false;
 
         if (amount < 0)

src/engine/objects/CharacterItemManager.java

@@ -1400,6 +1400,7 @@ public class CharacterItemManager {
 
             if (!ItemManager.validForSkills(item, pc.getSkills())) {
                 this.forceToInventory(slot, item, pc, initialized);
+                this.equipped.remove(slot);
                 pc.applyBonuses();
             }
         }

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
@@ -120,9 +122,7 @@ public class City extends AbstractWorldObject {
             this.treeOfLifeID = rs.getInt("treeOfLifeUUID");
             this.bindX = rs.getFloat("bindX");
             this.bindZ = rs.getFloat("bindZ");
-            this.bindLoc = new Vector3fImmutable(this.location.getX() + this.bindX,
+            this.bindLoc = new Vector3fImmutable(this.location.getX() + this.bindX, this.location.getY(), this.location.getZ() + this.bindZ);
-                    this.location.getY(),
-                    this.location.getZ() + this.bindZ);
             this.radiusType = rs.getInt("radiusType");
 
             float bindradiustemp = rs.getFloat("bindRadius");
@@ -288,106 +288,134 @@ public class City extends AbstractWorldObject {
         return city.getBindLoc();
     }
 
-    public static ArrayList<City> getCitiesToTeleportTo(PlayerCharacter pc) {
+    public static ArrayList<City> getCitiesToTeleportTo(PlayerCharacter playerCharacter, boolean repledge) {
+
         ArrayList<City> cities = new ArrayList<>();
 
-        if (pc == null)
+        if (playerCharacter == null)
             return cities;
 
         ConcurrentHashMap<Integer, AbstractGameObject> worldCities = DbManager.getMap(mbEnums.GameObjectType.City);
 
-        if (ConfigManager.MB_RULESET.getValue().equals("LORE")) {
+        //handle compiling of cities able to be teleported to for lore rule-set
-            //handle compiling of cities able to be teleported to for lore rule-set
+
-            for (AbstractGameObject ago : worldCities.values()) {
+        for (AbstractGameObject ago : worldCities.values()) {
-                City city = (City) ago;
+
-                if(city.cityName.equals("Perdition") || city.cityName.equals("Bastion"))
+            City city = (City) ago;
-                    continue; // cannot teleport to perdition or bastion
+
-                if (city.isNpc == 1 && city.getGuild().charter.equals(pc.guild.charter)) {
+            // Filter Player cities
-                    cities.add(city); // anyone of the same charter can teleport to a safehold of that charter
+
+            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))
+                continue;
+
+            if (city.parentZone.guild_zone) {
+
+                //players can all port and repledge inside their own nation
+
+                if(city.getGuild().getNation().equals(playerCharacter.guild.getNation())){
+                    cities.add(city);
                     continue;
-                } else if (city.isNoobIsle == 1 && pc.level <= 20) {
+                }
-                    cities.add(city); // everyone can go to noob island if they are under level 20
+
-                    continue;
+                if (city.isOpen() && city.getTOL().rank > 4) {
-                } else if (city.cityName.equals("Khan'Ov Srekel")) {
+
-                    cities.add(city); //everyone anytime can teleport to khan
+                    // Filter Lore cities
-                    continue;
+
-                } else if (city.isOpen() && city.getTOL().rank > 4 && city.getGuild().charter.equals(pc.guild.charter))
+                    if (ConfigManager.MB_RULESET.getValue().equals("LORE")) {
-                    if (!city.getTOL().reverseKOS) {
+
-                        cities.add(city);//can teleport to any open ToL that shares  charter
+                        if (repledge) {
-                        continue;
+                            if (!city.getGuild().charter.canJoin(playerCharacter))
+                                continue;
+                        } else if (!city.getGuild().charter.equals(playerCharacter.guild.charter))
+                                continue;
+                    }
+
+                    Integer playerUUID = playerCharacter.objectUUID;
+                    Integer guildUUID = playerCharacter.guildUUID;
+                    Integer nationUUID = playerCharacter.guild.getNation().getObjectUUID();
+                    boolean allowed = false;
+
+                    if (city.getTOL().reverseKOS) {
+
+                        //reverse KOS, specific values are allowed
+
+                        if ((city.getTOL().getCondemned().containsKey(playerUUID) && city.getTOL().getCondemned().get(playerUUID).active) ||
+                                (city.getTOL().getCondemned().containsKey(guildUUID) && city.getTOL().getCondemned().get(guildUUID).active) ||
+                                (city.getTOL().getCondemned().containsKey(nationUUID) && city.getTOL().getCondemned().get(nationUUID).active))
+                            allowed = true;
+
                     } else {
-                        if (city.getTOL().getCondemned().contains(pc.objectUUID) && city.getTOL().getCondemned().get(pc.objectUUID).active) {
+                        //not reverse KOS, everyone is allowed by default
-                            cities.add(city);//this player is allowed for the reverse KOS
+
-                            continue;
+                        allowed = true;
-                        }
+
-                        if (city.getTOL().getCondemned().contains(pc.guildUUID) && city.getTOL().getCondemned().get(pc.guildUUID).active) {
+                        //specific values are not allowed
-                            cities.add(city);//this guild is allowed for the reverse KOS
+
-                            continue;
+                        if ((city.getTOL().getCondemned().containsKey(playerUUID) && city.getTOL().getCondemned().get(playerUUID).active) ||
-                        }
+                                (city.getTOL().getCondemned().containsKey(guildUUID) && city.getTOL().getCondemned().get(guildUUID).active) ||
-                        if (city.getTOL().getCondemned().contains(pc.guild.getNation().getObjectUUID()) && city.getTOL().getCondemned().get(pc.guild.getNation().getObjectUUID()).active) {
+                                (city.getTOL().getCondemned().containsKey(nationUUID) && city.getTOL().getCondemned().get(nationUUID).active))
-                            cities.add(city);//this nation is allowed for the reverse KOS
+                            allowed = false;
-                            continue;
+
-                        }
                     }
-                if (city.getGuild().getNation().equals(pc.guild.getNation())) {
+
-                    cities.add(city);//can always teleport inside your own nation
+                    if (allowed)
+                        cities.add(city);
                 }
-            }
+            } else {
-        } else {
 
-            Guild pcG = pc.getGuild();
+                // Filter NPC cities
-            //add npc cities
 
-            for (AbstractGameObject ago : worldCities.values()) {
+                if (city.isNoobIsle == 1) {
 
-                if (ago.getObjectType().equals(GameObjectType.City)) {
+                    if (playerCharacter.level < 20)
-                    City city = (City) ago;
+                        cities.add(city); // everyone can go to noob island if they are under level 20
 
-                    if (city.noTeleport)
+                    continue;
-                        continue;
+                }
 
-                    if (city.parentZone != null && city.parentZone.guild_zone) {
+                // Players cannot teleport to perdition or bastion
 
-                        if (pc.getAccount().status.equals(AccountStatus.ADMIN)) {
+                if (city.cityName.equals("Perdition") || city.cityName.equals("Bastion"))
+                    continue;
+
+                // These cities are available for anyone off noob island
+
+                if (playerCharacter.level >= 20 && (city.cityName.equals("Sea Dog's Rest") || city.cityName.equals("Khan'Ov Srekel") || city.cityName.equals("City of Khar Th'Sekt"))) {
+                    cities.add(city);
+                    continue;
+                }
+
+                // Add Lore cities
+
+                if (ConfigManager.MB_RULESET.getValue().equals("LORE")) {
+
+                    if (repledge) {
+                        if (city.getGuild().charter.canJoin(playerCharacter))
                             cities.add(city);
-                        } else
+                    } else if (city.getGuild().charter.equals(playerCharacter.guild.charter))
-                            //list Player cities
+                        cities.add(city);
-
-                            //open city, just list
-
-                            if (city.open && city.getTOL() != null && city.getTOL().getRank() > 4) {
-
-                                if (!BuildingManager.IsPlayerHostile(city.getTOL(), pc)) {
-                                    if (ConfigManager.MB_RULESET.getValue().equals("LORE")) {
-                                        if (city.getGuild().getGuildType().equals(pc.guild.getGuildType())) {
-                                            cities.add(city);
-                                        }
-                                    } else {
-                                        cities.add(city); //verify nation or guild is same
-                                    }
-                                }
-                            } else if (Guild.sameNationExcludeErrant(city.getGuild(), pcG))
-                                cities.add(city);
-
-
-                    } else if (city.isNpc == 1) {
-
-                        //list NPC cities
-
-                        Guild g = city.getGuild();
-                        if (g == null) {
-                            if (city.isNpc == 1)
-                                if (city.isNoobIsle == 1) {
-                                    if (pc.getLevel() < 21)
-                                        cities.add(city); //verify nation or guild is same
-                                } else if (pc.getLevel() > 9)
-                                    cities.add(city); //verify nation or guild is same
-
-                        } else if (pc.getLevel() >= g.getTeleportMin() && pc.getLevel() <= g.getTeleportMax())
-                            cities.add(city); //verify nation or guild is same
-                    }
-
                 }
+
             }
         }
         return cities;
@@ -407,7 +435,7 @@ public class City extends AbstractWorldObject {
             //handle compiling of cities able to be repledged to for lore rule-set
             for (AbstractGameObject ago : worldCities.values()) {
                 City city = (City) ago;
-                if(city.cityName.equals("Perdition") || city.cityName.equals("Bastion"))
+                if (city.cityName.equals("Perdition") || city.cityName.equals("Bastion"))
                     continue; // cannot repledge to perdition or bastion
                 if (city.isNpc == 1 && city.getGuild().charter.canJoin(playerCharacter)) {
                     cities.add(city); // anyone of the same charter can teleport to a safehold of that charter
@@ -586,7 +614,7 @@ public class City extends AbstractWorldObject {
         if (this.siegesWithstood == siegesWithstood)
             return;
 
-        if (DbManager.CityQueries.updateSiegesWithstood(this, siegesWithstood) == true)
+        if (DbManager.CityQueries.updateSiegesWithstood(this, siegesWithstood))
             this.siegesWithstood = siegesWithstood;
         else
             Logger.error("Error when writing to database for cityUUID: " + this.getObjectUUID());
@@ -640,19 +668,12 @@ public class City extends AbstractWorldObject {
     public Guild getGuild() {
 
         if (this.getTOL() == null)
-            return null;
+            return Guild.getErrantGuild();
 
-        if (this.isNpc == 1) {
+        if (this.getTOL().getOwner() == null)
+            return Guild.getErrantGuild();
 
-            if (this.getTOL().getOwner() == null)
+        return this.getTOL().getOwner().getGuild();
-                return null;
-            return this.getTOL().getOwner().getGuild();
-        } else {
-
-            if (this.getTOL().getOwner() == null)
-                return null;
-            return this.getTOL().getOwner().getGuild();
-        }
     }
 
     public boolean openCity(boolean open) {
@@ -731,7 +752,7 @@ public class City extends AbstractWorldObject {
 
         for (AbstractCharacter npc : getTOL().getHirelings().keySet()) {
             if (npc.getObjectType() == GameObjectType.NPC)
-                if (((NPC) npc).getContract().isRuneMaster() == true)
+                if (((NPC) npc).getContract().isRuneMaster())
                     outNPC = (NPC) npc;
         }
 
@@ -764,16 +785,13 @@ public class City extends AbstractWorldObject {
         // Set location for this city
 
         this.location = new Vector3fImmutable(this.parentZone.absX, this.parentZone.absY, this.parentZone.absZ);
-        this.bindLoc = new Vector3fImmutable(this.location.x + this.bindX,
+        this.bindLoc = new Vector3fImmutable(this.location.x + this.bindX, this.location.y, this.location.z + this.bindZ);
-                this.location.y,
-                this.location.z + this.bindZ);
 
         // set city bounds
 
         Bounds cityBounds = Bounds.borrow();
         cityBounds.setBounds(new Vector2f(this.location.x + 64, this.location.z + 64), // location x and z are offset by 64 from the center of the city.
-                new Vector2f(mbEnums.CityBoundsType.GRID.halfExtents, mbEnums.CityBoundsType.GRID.halfExtents),
+                new Vector2f(mbEnums.CityBoundsType.GRID.halfExtents, mbEnums.CityBoundsType.GRID.halfExtents), 0.0f);
-                0.0f);
         this.setBounds(cityBounds);
 
         // Sanity check; no tol
@@ -781,8 +799,7 @@ public class City extends AbstractWorldObject {
         if (BuildingManager.getBuilding(this.treeOfLifeID) == null)
             Logger.info("City UID " + this.getObjectUUID() + " Failed to Load Tree of Life with ID " + this.treeOfLifeID);
 
-        if ((ConfigManager.serverType.equals(ServerType.WORLDSERVER))
+        if ((ConfigManager.serverType.equals(ServerType.WORLDSERVER)) && (this.isNpc == (byte) 0)) {
-                && (this.isNpc == (byte) 0)) {
 
             this.realm = RealmMap.getRealmAtLocation(this.getLoc());
 
@@ -802,8 +819,7 @@ public class City extends AbstractWorldObject {
             if (this.getGuild().getGuildState() == GuildState.Nation)
                 for (Guild sub : this.getGuild().getSubGuildList()) {
 
-                    if ((sub.getGuildState() == GuildState.Protectorate) ||
+                    if ((sub.getGuildState() == GuildState.Protectorate) || (sub.getGuildState() == GuildState.Province)) {
-                            (sub.getGuildState() == GuildState.Province)) {
                         this.isCapital = 1;
                         break;
                     }
@@ -828,7 +844,7 @@ public class City extends AbstractWorldObject {
 
             this.setHash();
 
-            if (DataWarehouse.recordExists(mbEnums.DataRecordType.CITY, this.getObjectUUID()) == false) {
+            if (!DataWarehouse.recordExists(DataRecordType.CITY, this.getObjectUUID())) {
                 CityRecord cityRecord = CityRecord.borrow(this, mbEnums.RecordEventType.CREATE);
                 DataWarehouse.pushToWarehouse(cityRecord);
             }
@@ -853,9 +869,7 @@ public class City extends AbstractWorldObject {
 
             for (Building building : this.parentZone.zoneBuildingSet) {
 
-                if (building.getBlueprint() != null &&
+                if (building.getBlueprint() != null && building.getBlueprint().getBuildingGroup() != BuildingGroup.BANESTONE && building.getBlueprint().getBuildingGroup() != BuildingGroup.TOL) {
-                        building.getBlueprint().getBuildingGroup() != BuildingGroup.BANESTONE &&
-                        building.getBlueprint().getBuildingGroup() != BuildingGroup.TOL) {
 
                     building.healthMax += (building.healthMax * Realm.getRealmHealthMod(this));
 
@@ -937,7 +951,7 @@ public class City extends AbstractWorldObject {
 
             // Reapply effect with timeout?
 
-            if (refreshEffect == true)
+            if (refreshEffect)
                 player.addCityEffect(Integer.toString(effectBase.getUUID()), effectBase, rank, MBServerStatics.FOURTYFIVE_SECONDS, false, this);
 
         }
@@ -1105,17 +1119,21 @@ public class City extends AbstractWorldObject {
 
     public final void destroy() {
 
-        Thread destroyCityThread = new Thread(new DestroyCityThread(this));
+        if (this.isDestroyed.compareAndSet(false, true)) {
 
-        destroyCityThread.setName("destroyCity:" + this.getName());
+            Thread destroyCityThread = new Thread(new DestroyCityThread(this));
-        destroyCityThread.start();
+
+            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();
     }
 
@@ -1193,26 +1211,25 @@ public class City extends AbstractWorldObject {
             // All protection contracts are void upon transfer of a city
             //Dont forget to not Flip protection on Banestones and siege Equipment... Noob.
 
-            if (cityBuilding.getBlueprint() != null && !cityBuilding.getBlueprint().isSiegeEquip()
+            if (cityBuilding.getBlueprint() != null && !cityBuilding.getBlueprint().isSiegeEquip() && cityBuilding.getBlueprint().getBuildingGroup() != BuildingGroup.BANESTONE)
-                    && cityBuilding.getBlueprint().getBuildingGroup() != BuildingGroup.BANESTONE)
                 cityBuilding.setProtectionState(ProtectionState.NONE);
 
             // Transfer ownership of valid city assets
             // these assets are autoprotected.
 
-            if ((cityBuilding.getBlueprint().getBuildingGroup() == BuildingGroup.TOL)
+            if ((cityBuilding.getBlueprint().getBuildingGroup() == BuildingGroup.TOL) || (cityBuilding.getBlueprint().getBuildingGroup() == BuildingGroup.SPIRE) || (cityBuilding.getBlueprint().getBuildingGroup() == BuildingGroup.BARRACK) || (cityBuilding.getBlueprint().isWallPiece()) || (cityBuilding.getBlueprint().getBuildingGroup() == BuildingGroup.SHRINE)) {
-                    || (cityBuilding.getBlueprint().getBuildingGroup() == BuildingGroup.SPIRE)
+                PlayerCharacter guildLeader = PlayerCharacter.getPlayerCharacter(sourcePlayer.guild.getGuildLeaderUUID());
-                    || (cityBuilding.getBlueprint().getBuildingGroup() == BuildingGroup.BARRACK)
+                if(guildLeader != null)
-                    || (cityBuilding.getBlueprint().isWallPiece())
+                    cityBuilding.claim(guildLeader);
-                    || (cityBuilding.getBlueprint().getBuildingGroup() == BuildingGroup.SHRINE)) {
+                else
-
+                    cityBuilding.claim(sourcePlayer);
-                cityBuilding.claim(sourcePlayer);
                 cityBuilding.setProtectionState(ProtectionState.PROTECTED);
             }
         }
 
         this.setForceRename(true);
 
+
         // Reset city timer for map update
 
         City.lastCityUpdate = System.currentTimeMillis();
@@ -1245,12 +1262,7 @@ public class City extends AbstractWorldObject {
             // Transfer ownership of valid city assets
             // these assets are autoprotected.
 
-            if ((cityBuilding.getBlueprint().getBuildingGroup() == BuildingGroup.TOL)
+            if ((cityBuilding.getBlueprint().getBuildingGroup() == BuildingGroup.TOL) || (cityBuilding.getBlueprint().getBuildingGroup() == BuildingGroup.SPIRE) || (cityBuilding.getBlueprint().getBuildingGroup() == BuildingGroup.BARRACK) || (cityBuilding.getBlueprint().isWallPiece()) || (cityBuilding.getBlueprint().getBuildingGroup() == BuildingGroup.SHRINE)) {
-                    || (cityBuilding.getBlueprint().getBuildingGroup() == BuildingGroup.SPIRE)
-                    || (cityBuilding.getBlueprint().getBuildingGroup() == BuildingGroup.BARRACK)
-                    || (cityBuilding.getBlueprint().isWallPiece())
-                    || (cityBuilding.getBlueprint().getBuildingGroup() == BuildingGroup.SHRINE)
-            ) {
 
                 cityBuilding.claim(sourcePlayer);
                 cityBuilding.setProtectionState(ProtectionState.PROTECTED);
@@ -1399,7 +1411,7 @@ public class City extends AbstractWorldObject {
             taxPercent = .20f;
 
         for (int resourceHash : msg.getResources().keySet())
-            resources.add(ResourceType.hashLookup.get(resourceHash));
+            resources.add(ResourceType.templateHashLookup.get(resourceHash));
 
         for (ResourceType resourceType : resources) {
             if (Warehouse.isAboveCap(ruledWarehouse, resourceType, (int) (city.warehouse.resources.get(resourceType) * taxPercent))) {

src/engine/objects/Guild.java

@@ -193,12 +193,16 @@ public class Guild extends AbstractWorldObject {
     }
 
     public static boolean sameNationExcludeErrant(Guild a, Guild b) {
+
         if (a == null || b == null)
             return false;
+
         if (a.getObjectUUID() == b.getObjectUUID())
             return true;
+
         if (a.nation == null || b.nation == null)
             return false;
+
         return a.nation.getObjectUUID() == b.nation.getObjectUUID() && !a.nation.isEmptyGuild();
     }
 

src/engine/objects/Mine.java

@@ -166,7 +166,7 @@ public class Mine extends AbstractGameObject {
         writer.putInt(mine.getObjectUUID()); //actually a hash of mine
         writer.putString(mine.mineType.name);
         writer.putString(mine.zoneName);
-        writer.putInt(mine.production.hash);
+        writer.putInt(mine.production.resourceHash);
         writer.putInt(mine.production.mine_production);
         writer.putInt(mine.getModifiedProductionAmount()); //TODO calculate range penalty here
         writer.putInt(3600); //window in seconds
@@ -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;
@@ -393,7 +392,7 @@ public class Mine extends AbstractGameObject {
         //		writer.putInt(0x215C92BB); //this.unknown1);
         writer.putString(this.mineType.name);
         writer.putString(this.zoneName);
-        writer.putInt(this.production.hash);
+        writer.putInt(this.production.resourceHash);
         writer.putInt(this.production.mine_production);
         writer.putInt(this.getModifiedProductionAmount()); //TODO calculate range penalty here
         writer.putInt(3600); //window in seconds
@@ -482,7 +481,7 @@ public class Mine extends AbstractGameObject {
         if (this.owningGuild.getOwnedCity().warehouse == null)
             return false;
 
-        return Warehouse.depositFromMine(this, mbEnums.ResourceType.resourceLookup.get(this.production.templateID), this.getModifiedProductionAmount(), this.owningGuild.getOwnedCity().warehouse);
+        return Warehouse.depositFromMine(this, mbEnums.ResourceType.templateLookup.get(this.production.templateID), this.getModifiedProductionAmount(), this.owningGuild.getOwnedCity().warehouse);
     }
 
     public boolean updateGuildOwner(PlayerCharacter playerCharacter) {

src/engine/objects/PlayerBonuses.java

@@ -27,7 +27,7 @@ import java.util.concurrent.ConcurrentHashMap;
 public class PlayerBonuses {
 
     //First bonus set
-    private ConcurrentHashMap<AbstractEffectModifier, Float> bonusFloats = new ConcurrentHashMap<>();
+    ConcurrentHashMap<AbstractEffectModifier, Float> bonusFloats = new ConcurrentHashMap<>();
     private ConcurrentHashMap<AbstractEffectModifier, DamageShield> bonusDamageShields = new ConcurrentHashMap<>();
     private ConcurrentHashMap<AbstractEffectModifier, String> bonusStrings = new ConcurrentHashMap<>();
     private ConcurrentHashMap<ModType, HashSet<SourceType>> bonusLists = new ConcurrentHashMap<>();

src/engine/objects/Resists.java

@@ -349,13 +349,13 @@ public class Resists {
             if (rb.getBool(ModType.ImmuneTo, SourceType.Stun))
                 this.immuneTo.put(mbEnums.DamageType.STUN, true);
             if (rb.getBool(ModType.ImmuneTo, SourceType.Blind))
-                this.immuneTo.put(mbEnums.DamageType.BLIND, true);
+                this.immuneTo.put(mbEnums.DamageType.BLINDNESS, true);
             if (rb.getBool(ModType.ImmuneToAttack, SourceType.None))
                 this.immuneTo.put(mbEnums.DamageType.ATTACK, true);
             if (rb.getBool(ModType.ImmuneToPowers, SourceType.None))
                 this.immuneTo.put(mbEnums.DamageType.POWERS, true);
             if (rb.getBool(ModType.ImmuneTo, SourceType.Powerblock))
-                this.immuneTo.put(mbEnums.DamageType.POWERBLOCK, true);
+                this.immuneTo.put(mbEnums.DamageType.POWERINHIBITOR, true);
             if (rb.getBool(ModType.ImmuneTo, SourceType.DeBuff))
                 this.immuneTo.put(mbEnums.DamageType.DEBUFF, true);
             if (rb.getBool(ModType.ImmuneTo, SourceType.Fear))

src/engine/objects/Warehouse.java

@@ -140,7 +140,7 @@ public class Warehouse {
         if (warehouse == null)
             return;
 
-        mbEnums.ResourceType resourceType = mbEnums.ResourceType.hashLookup.get(msg.getHashID());
+        mbEnums.ResourceType resourceType = mbEnums.ResourceType.templateHashLookup.get(msg.getHashID());
 
         if (isResourceLocked(warehouse, resourceType)) {
             ChatManager.chatSystemInfo(playerCharacter, "You cannot withdrawl a locked resource.");
@@ -182,7 +182,7 @@ public class Warehouse {
 
         warehouse = city.warehouse;
 
-        mbEnums.ResourceType resourceType = mbEnums.ResourceType.hashLookup.get(hashID);
+        mbEnums.ResourceType resourceType = mbEnums.ResourceType.templateHashLookup.get(hashID);
 
         // toggle lock
 
@@ -233,7 +233,7 @@ public class Warehouse {
             return false;
         }
 
-        mbEnums.ResourceType resourceType = mbEnums.ResourceType.resourceLookup.get(resource.templateID);
+        mbEnums.ResourceType resourceType = mbEnums.ResourceType.templateLookup.get(resource.templateID);
 
         if (warehouse.resources.get(resourceType) == null)
             return false;
@@ -261,7 +261,7 @@ public class Warehouse {
 
         int newAmount = oldAmount + amount;
 
-        if (newAmount > mbEnums.ResourceType.resourceLookup.get(resource.templateID).deposit_limit)
+        if (newAmount > mbEnums.ResourceType.templateLookup.get(resource.templateID).deposit_limit)
             return false;
 
         if (removeFromInventory) {
@@ -381,7 +381,7 @@ public class Warehouse {
             int amount = (int) (warehouse.resources.get(resourceType) * taxPercent);
 
             if (amount <= 0) {
-                msg.getResources().put(resourceType.hash, 0);
+                msg.getResources().put(resourceType.resourceHash, 0);
                 continue;
             }
 
@@ -395,20 +395,18 @@ public class Warehouse {
             if (newAmount < amount)
                 continue;
 
-            msg.getResources().put(resourceType.hash, amount);
+            msg.getResources().put(resourceType.resourceHash, amount);
 
             if (!DbManager.WarehouseQueries.UPDATE_WAREHOUSE(warehouse)) {
-                msg.getResources().put(resourceType.hash, 0);
+                msg.getResources().put(resourceType.resourceHash, 0);
                 warehouse.resources.put(resourceType, oldAmount);
                 continue;
             }
 
             warehouse.resources.put(resourceType, newAmount);
             depositRealmTaxes(taxer, resourceType, amount, warehouse);
-            mbEnums.ResourceType resource;
 
             AddTransactionToWarehouse(warehouse, taxer.getObjectType(), taxer.getObjectUUID(), mbEnums.TransactionType.TAXRESOURCE, resourceType, amount);
-
         }
     }
 
@@ -431,7 +429,7 @@ public class Warehouse {
             return false;
 
         if (addToInventory)
-            if (!itemMan.hasRoomInventory(template.item_wt * amount)) {
+            if (!itemMan.hasRoomInventory(template.item_wt)) {
                 ChatManager.chatSystemInfo(playerCharacter, "You can not carry any more of that item.");
                 return false;
             }

src/engine/powers/ActionsBase.java

@@ -11,13 +11,11 @@ package engine.powers;
 
 import engine.gameManager.DbManager;
 import engine.gameManager.PowersManager;
+import engine.mbEnums;
 import engine.mbEnums.ModType;
 import engine.mbEnums.SourceType;
 import engine.mbEnums.StackType;
-import engine.objects.AbstractCharacter;
+import engine.objects.*;
-import engine.objects.AbstractWorldObject;
-import engine.objects.PlayerBonuses;
-import engine.objects.Runegate;
 import engine.powers.poweractions.AbstractPowerAction;
 import org.pmw.tinylog.Logger;
 
@@ -244,32 +242,23 @@ public class ActionsBase {
     }
 
     //Add blocked types here
-    public boolean blocked(AbstractWorldObject awo, PowersBase pb, int trains) {
+    public boolean blocked(AbstractWorldObject awo, boolean vampDrain) {
-        if (AbstractWorldObject.IsAbstractCharacter(awo)) {
+        //Check for immunities
-            AbstractCharacter ac = (AbstractCharacter) awo;
+        if (AbstractCharacter.IsAbstractCharacter(awo)){
-            PlayerBonuses bonus = ac.getBonuses();
+            AbstractCharacter pcTarget = (AbstractCharacter) awo;
-            if (bonus == null)
+            PlayerBonuses bonus = pcTarget.getBonuses();
-                return false;
 
-            //TODO make this more efficient then testing strings
+            if(vampDrain)
-            if (this.stackType.equals("Stun") && bonus.getBool(ModType.ImmuneTo, SourceType.STUN))
+                return bonus.getBool(ModType.BlockedPowerType, SourceType.VAMPDRAIN);
-                return true; //Currently stun immune. Skip stun
+
-            else if (this.stackType.equals("Snare") && bonus.getBool(ModType.ImmuneTo, SourceType.Snare))
+            if ((this.stackType.equals("Flight") && bonus.getBool(ModType.NoMod, SourceType.Fly)) ||
-                return true; //Currently snare immune. Skip snare
+                    (this.stackType.equals("Track") && bonus.getBool(ModType.CannotTrack, SourceType.None))) {
-            else if (this.stackType.equals("Blindness") && bonus.getBool(ModType.ImmuneTo, SourceType.Blind))
-                return true; //Currently blind immune. Skip blind
-            else if (this.stackType.equals("PowerInhibitor") && bonus.getBool(ModType.ImmuneTo, SourceType.Powerblock))
-                return true; //Currently power block immune. Skip power block
-            else if (this.stackType.equals("Root") && bonus.getBool(ModType.ImmuneTo, SourceType.Root))
                 return true;
-                //			else if (pb.isHeal() && (bonus.getByte("immuneTo.Heal")) >= trains)
+            }
-                //				return true; //Currently shadowmantled. Skip heals
+
-            else if (this.stackType.equals("Flight") && bonus.getBool(ModType.NoMod, SourceType.Fly))
+            mbEnums.DamageType damageType = mbEnums.DamageType.getDamageType(this.stackType.toUpperCase());
-                return true;
+            return pcTarget.getResists().immuneTo(damageType);
-            else if (this.stackType.equals("Track") && bonus.getBool(ModType.CannotTrack, SourceType.None))
+
-                return true;
-            else
-                return pb.vampDrain() && bonus.getBool(ModType.BlockedPowerType, SourceType.VAMPDRAIN);
         }
         return false;
     }

src/engine/powers/EffectsBase.java

@@ -26,10 +26,11 @@ 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.PlayerCharacter;
 import engine.powers.effectmodifiers.AbstractEffectModifier;
 import engine.server.MBServerStatics;
+import engine.util.Hasher;
+import engine.wpak.data.Effect;
 import org.pmw.tinylog.Logger;
 
 import java.sql.Connection;
@@ -62,7 +63,7 @@ public class EffectsBase {
     // flags
     private boolean isItemEffect;
     private boolean isSpireEffect;
-    private boolean ignoreMod;
+    private boolean ignoreNoMod;
     private boolean dontSave;
     private boolean cancelOnAttack = false;
     private boolean cancelOnAttackSwing = false;
@@ -91,6 +92,33 @@ 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;
+    }
+
     public EffectsBase(EffectsBase copyEffect, int newToken, String IDString) {
 
         UUID = NewID++;
@@ -102,7 +130,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 +145,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 +191,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-"))
@@ -351,7 +379,7 @@ public class EffectsBase {
     }
 
     public boolean ignoreMod() {
-        return this.ignoreMod;
+        return this.ignoreNoMod;
     }
 
     public boolean dontSave() {
@@ -404,7 +432,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) {

src/engine/powers/PowersBase.java

@@ -633,4 +633,8 @@ public class PowersBase {
         return description;
     }
 
+    public boolean enforceLore(){
+        return this.powerCategory.equals(PowerCategoryType.SUMMON) || this.powerCategory.equals(PowerCategoryType.HEAL)|| this.powerCategory.equals(PowerCategoryType.BUFF);
+    }
+
 }

src/engine/powers/poweractions/OpenGatePowerAction.java

@@ -11,7 +11,6 @@ package engine.powers.poweractions;
 
 import engine.math.Vector3fImmutable;
 import engine.mbEnums;
-import engine.mbEnums.BuildingGroup;
 import engine.mbEnums.GameObjectType;
 import engine.mbEnums.PortalType;
 import engine.objects.AbstractCharacter;
@@ -54,15 +53,17 @@ public class OpenGatePowerAction extends AbstractPowerAction {
             return;
 
         // Make sure target building is a runegate
-        if(targetBuilding.meshUUID != 24500) // runegate
+
+        if (targetBuilding.meshUUID != 24500) // runegate
             return;
 
         // Which runegate was clicked on?
+
         Runegate runeGate = Runegate._runegates.get(targetBuilding.getObjectUUID());
 
-        if(runeGate == null){
+        if (runeGate == null)
             return; // mob camp prop runegate cannot be opened
-        }
+
         // Which portal was opened?
 
         token = pb.getToken();
@@ -72,41 +73,31 @@ public class OpenGatePowerAction extends AbstractPowerAction {
             case 428937084: //Death Gate
                 portalType = PortalType.OBLIV;
                 break;
-
             case 429756284: //Chaos Gate
                 portalType = PortalType.CHAOS;
                 break;
-
             case 429723516: //Khar Gate
                 portalType = PortalType.MERCHANT;
                 break;
-
             case 429559676: //Spirit Gate
                 portalType = PortalType.SPIRIT;
                 break;
-
             case 429592444: //Water Gate
                 portalType = PortalType.WATER;
                 break;
-
             case 429428604: //Fire Gate
                 portalType = PortalType.FIRE;
                 break;
-
             case 429526908: //Air Gate
                 portalType = PortalType.AIR;
                 break;
-
             case 429625212: //Earth Gate
                 portalType = PortalType.EARTH;
                 break;
-
             default:
         }
 
-
         runeGate.activatePortal(portalType);
-
     }
 
     @Override

src/engine/server/world/WorldServer.java

@@ -76,7 +76,7 @@ public class WorldServer {
         super();
     }
 
-    public static void main(String[] args) {
+    public static void main(String[] args) throws IOException {
 
         WorldServer worldServer;
 

src/engine/workthreads/DestroyCityThread.java

@@ -53,116 +53,117 @@ public class DestroyCityThread implements Runnable {
 
         // Member variable assignment
 
-        cityZone = city.getParent();
+        try {
-        newParent = cityZone.parent;
+            cityZone = city.getParent();
-        formerGuild = city.getTOL().getGuild();
+            newParent = cityZone.parent;
+            formerGuild = city.getTOL().getGuild();
 
-        // Former guild loses it's tree!
+            Logger.info("Destroy city thread started for: " + cityZone.zoneName);
 
-        if (DbManager.GuildQueries.SET_GUILD_OWNED_CITY(formerGuild.getObjectUUID(), 0)) {
+            // Former guild loses tree!
 
-            //Successful Update of guild
+            if (DbManager.GuildQueries.SET_GUILD_OWNED_CITY(formerGuild.getObjectUUID(), 0)) {
 
-            formerGuild.setGuildState(mbEnums.GuildState.Errant);
+                //Successful Update of guild
-            formerGuild.setNation(null);
-            formerGuild.setCityUUID(0);
-            GuildManager.updateAllGuildTags(formerGuild);
-            GuildManager.updateAllGuildBinds(formerGuild, null);
-        }
 
-        // By losing the tree, the former owners lose all of their subguilds.
+                formerGuild.setGuildState(mbEnums.GuildState.Errant);
-
+                formerGuild.setNation(null);
-        if (!formerGuild.getSubGuildList().isEmpty()) {
+                formerGuild.setCityUUID(0);
-
+                GuildManager.updateAllGuildTags(formerGuild);
-            subGuildList = new ArrayList<>();
+                GuildManager.updateAllGuildBinds(formerGuild, null);
-
-            subGuildList.addAll(formerGuild.getSubGuildList());
-
-            for (Guild subGuild : subGuildList) {
-                formerGuild.removeSubGuild(subGuild);
-            }
-        }
-
-        Building tol = null;
-
-        // Build list of buildings within this parent zone
-
-        for (Building cityBuilding : cityZone.zoneBuildingSet) {
-
-            // Sanity Check in case player deletes the building
-            // before this thread can get to it
-
-            if (cityBuilding == null)
-                continue;
-
-            // Do nothing with the banestone.  It will be removed elsewhere
-
-            if (cityBuilding.getBlueprint().getBuildingGroup().equals(mbEnums.BuildingGroup.BANESTONE))
-                continue;
-
-            // TOL is processed after all other structures in the city zone
-
-            if (cityBuilding.getBlueprint().getBuildingGroup().equals(mbEnums.BuildingGroup.TOL)) {
-                tol = cityBuilding;
-                continue;
             }
 
-            // All buildings are moved to a location relative
+            // By losing the tree, the former owners lose all of their subguilds.
-            // to their new parent zone
 
-            localCoords = ZoneManager.worldToLocal(cityBuilding.getLoc(), newParent);
+            if (!formerGuild.getSubGuildList().isEmpty()) {
 
-            DbManager.BuildingQueries.MOVE_BUILDING(cityBuilding.getObjectUUID(), newParent.getObjectUUID(), localCoords.x, localCoords.y, localCoords.z);
+                subGuildList = new ArrayList<>();
 
-            // All buildings are re-parented to a zone one node
+                subGuildList.addAll(formerGuild.getSubGuildList());
-            // higher in the tree (continent) as we will be
-            // deleting the city zone very shortly.
 
-            if (cityBuilding.getParentZoneID() != newParent.getParentZoneID())
+                for (Guild subGuild : subGuildList) {
-                cityBuilding.setParentZone(newParent);
+                    formerGuild.removeSubGuild(subGuild);
-
+                }
-            // No longer a tree, no longer any protection contract!
-
-            cityBuilding.setProtectionState(mbEnums.ProtectionState.NONE);
-
-            // Destroy all remaining city assets
-
-            if ((cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.BARRACK)
-                    || (cityBuilding.getBlueprint().isWallPiece())
-                    || (cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.SHRINE)
-                    || (cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.TOL)
-                    || (cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.SPIRE)
-                    || (cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.WAREHOUSE)) {
-
-                if (cityBuilding.getRank() != -1)
-                    BuildingManager.setRank(cityBuilding, -1);
             }
+
+            // Build list of buildings within this parent zone
+
+            ArrayList<Building> destroySet = new ArrayList<>();
+
+            for (Building cityBuilding : cityZone.zoneBuildingSet) {
+
+                // Sanity Check in case player deletes the building
+                // before this thread can get to it
+
+                if (cityBuilding == null)
+                    continue;
+
+                // Do nothing with the banestone.  It will be removed elsewhere
+
+                if (cityBuilding.getBlueprint().getBuildingGroup().equals(mbEnums.BuildingGroup.BANESTONE))
+                    continue;
+
+                // All buildings are moved to a location relative
+                // to their new parent zone
+
+                localCoords = ZoneManager.worldToLocal(cityBuilding.getLoc(), newParent);
+
+                DbManager.BuildingQueries.MOVE_BUILDING(cityBuilding.getObjectUUID(), newParent.getObjectUUID(), localCoords.x, localCoords.y, localCoords.z);
+
+                // All buildings are re-parented to a zone one node
+                // higher in the tree (continent) as we will be
+                // deleting the city zone very shortly.
+
+                if (cityBuilding.getParentZoneID() != newParent.getParentZoneID())
+                    cityBuilding.setParentZone(newParent);
+
+                // No longer a tree, no longer any protection contract!
+
+                cityBuilding.setProtectionState(mbEnums.ProtectionState.NONE);
+
+                // Remove warehouse entry if one exists.
+
+                if (cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.WAREHOUSE) {
+                    DbManager.WarehouseQueries.DELETE_WAREHOUSE(city.warehouse);
+                    city.warehouse = null;
+                }
+
+                // Mark all auto protected buildings for destruction
+
+                if ((cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.BARRACK) || (cityBuilding.getBlueprint().isWallPiece()) || (cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.SHRINE) || (cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.TOL) || (cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.SPIRE) || (cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.WAREHOUSE))
+                    destroySet.add(cityBuilding);
+            }
+
+            // Destroy set of auto-protected buildings
+
+            for (Building building : destroySet)
+                if (building.getRank() != -1)
+                    BuildingManager.setRank(building, -1);
+
+            if (city.realm != null) {
+                city.realm.removeCity(city.getObjectUUID());
+                city.realm = null;
+            }
+
+            // It's now safe to delete the city zone from the database
+            // which will cause a cascade delete of everything else
+
+            if (!DbManager.ZoneQueries.DELETE_ZONE(cityZone)) {
+                Logger.error("DestroyCityThread", "Database error when deleting city zone: " + cityZone.getObjectUUID());
+                return;
+            }
+
+            // Refresh the city for map requests
+
+            City.lastCityUpdate = System.currentTimeMillis();
+
+        } catch (Exception e) {
+            Logger.error(e);
         }
 
-        // Destroy the tol
-
-        if (tol != null)
-            BuildingManager.setRank(tol, -1);
-
-        if (city.realm != null)
-            city.realm.removeCity(city.getObjectUUID());
-
-        // It's now safe to delete the city zone from the database
-        // which will cause a cascade delete of everything else
-
-
-        if (DbManager.ZoneQueries.DELETE_ZONE(cityZone) == false) {
-            Logger.error("DestroyCityThread", "Database error when deleting city zone: " + cityZone.getObjectUUID());
-            return;
-        }
-
-        // Refresh the city for map requests
-
-        City.lastCityUpdate = System.currentTimeMillis();
-
         // Zone and city should vanish upon next reboot
         // if the codebase reaches here.
 
-        Logger.info(city.getParent().zoneName + " uuid:" + city.getObjectUUID() + "has been destroyed!");
+        Logger.info(city.getParent().zoneName + " uuid: " + city.getObjectUUID() + " has been destroyed!");
     }
 }

src/engine/workthreads/HourlyJobThread.java

@@ -289,10 +289,10 @@ public class HourlyJobThread implements Runnable {
         Logger.info(PurgeOprhans.recordsDeleted.toString() + "orphaned items deleted");
     }
 
-    public static void processBanes(){
+    public static void processBanes() {
         //handle banes
-        for(Bane bane : Bane.banes.values()){
+        for (Bane bane : Bane.banes.values()) {
-            if(bane.getLiveDate() != null && DateTime.now().isAfter(bane.getLiveDate().minusMinutes(1)) && bane.isStarted == false)
+            if (bane.getLiveDate() != null && DateTime.now().isAfter(bane.getLiveDate().minusMinutes(1)) && bane.isStarted == false)
                 bane.startBane();
         }
     }

src/engine/wpak/EffectsParser.java

@@ -0,0 +1,279 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2024
+//                www.magicbane.com
+
+package engine.wpak;
+
+import engine.gameManager.ConfigManager;
+import engine.mbEnums;
+import engine.wpak.data.ConditionEntry;
+import engine.wpak.data.Effect;
+import engine.wpak.data.ModifierEntry;
+import org.pmw.tinylog.Logger;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class EffectsParser {
+
+    public static String effectsPath = ConfigManager.DEFAULT_DATA_DIR + "wpak/Effects.cfg";
+    public static HashMap<String, Effect> effect_data = new HashMap<>();
+    private static final Pattern EFFECT_REGEX = Pattern.compile("(?<=EFFECTBEGIN)(.+?)(?=EFFECTEND)", Pattern.DOTALL);
+    private static final Pattern SOURCE_REGEX = Pattern.compile("(?<=SOURCEBEGIN)(.+?)(?=SOURCEEND)", Pattern.DOTALL);
+    private static final Pattern MODS_REGEX = Pattern.compile("(?<=MODSBEGIN)(.+?)(?=MODSEND)", Pattern.DOTALL);
+    private static final Pattern CONDITIONS_REGEX = Pattern.compile("(?<=CONDITIONBEGIN)(.+?)(?=CONDITIONEND)", Pattern.DOTALL);
+    private static final Pattern STRSPLIT_REGEX = Pattern.compile("([^\"]\\S*|\"[^\"]*\")\\s*"); // Regex ignores spaces within quotes
+
+    public static void parseWpakFile() {
+
+        // Read .wpak file from disk
+
+        byte[] fileData;
+
+        try {
+            fileData = Files.readAllBytes(Paths.get(effectsPath));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+        String fileContents = new String(fileData);
+
+        // Iterate over effect entries from .wpak data
+
+        Matcher matcher = EFFECT_REGEX.matcher(fileContents);
+
+        while (matcher.find()) {
+            Effect effect = parseEffectEntry(matcher.group());
+            effect_data.put(effect.effect_id, effect);
+        }
+    }
+
+    private static Effect parseEffectEntry(String effectData) {
+
+        Effect effect = new Effect();
+
+        // Parse fields that lie outside the other tags
+
+        effect.isItemEffect = effectData.contains("IsItemEffect");
+        effect.isSpireEffect = effectData.contains("IsSpireEffect");
+        effect.ignoreNoMod = effectData.contains("IgnoreNoMod");
+        effect.dontSave = effectData.contains("DontSave");
+
+        // Remove all lines that contain a # and leading/trailing blank lines
+
+        effectData = effectData.replaceAll("(?m)^(\\s*#.*|\\s*)\r?\n?", "");
+        effectData = effectData.trim();
+
+        // Parse effect entry header
+
+        String firstLine;
+        ArrayList<String> effectHeader = new ArrayList<>();
+
+        // Some effects exist without sources/mods or conditions
+        // (ACID "MOB" 0)
+
+        if (effectData.indexOf('\n') > 0)
+            firstLine = effectData.substring(0, effectData.indexOf('\n'));
+        else
+            firstLine = effectData;
+
+        Matcher matcher = STRSPLIT_REGEX.matcher(firstLine);
+
+        while (matcher.find())
+            effectHeader.add(matcher.group().trim());
+
+        effect.effect_id = effectHeader.get(0);
+        effect.effect_name = effectHeader.get(1);
+        effect.effect_name = effect.effect_name.replaceAll("\"", "");
+
+        // Some effect mods have no icon
+        // (SEEINVIS-SHADE "See Invis")
+
+        if (effectHeader.size() == 3)
+            effect.icon = Integer.parseInt(effectHeader.get(2));
+        else
+            effect.icon = 0;
+
+        // Parse source entries
+
+        matcher = SOURCE_REGEX.matcher(effectData);
+
+        while (matcher.find())
+            effect.sources.add(matcher.group().trim());
+
+        // Parse modifier entries
+
+        matcher = MODS_REGEX.matcher(effectData);
+
+        // Iterate effect entries from .wpak config data
+
+        while (matcher.find()) {
+            ModifierEntry modifierEntry = parseModEntry(matcher.group());
+            effect.mods.add(modifierEntry);
+        }
+
+        // Parse Conditions
+
+        matcher = CONDITIONS_REGEX.matcher(effectData);
+
+        while (matcher.find()) {
+            String[] conditions = matcher.group().trim().split("\n");
+
+            for (String condition : conditions) {
+                List<String> parameters = Arrays.asList(condition.trim().split("\\s+"));
+                Iterator<String> iterator = parameters.iterator();
+
+                ConditionEntry conditionEntry = new ConditionEntry();
+                conditionEntry.condition = iterator.next();
+                conditionEntry.arg = Integer.parseInt(iterator.next());
+
+                if (iterator.hasNext())
+                    conditionEntry.curveType = mbEnums.CompoundCurveType.valueOf(iterator.next());
+
+                while (iterator.hasNext())
+                    conditionEntry.damageTypes.add(mbEnums.DamageType.valueOf(iterator.next().toUpperCase()));
+
+                effect.conditions.add(conditionEntry);
+            }
+        }
+
+        return effect;
+    }
+
+    private static ModifierEntry parseModEntry(String modData) {
+
+        ModifierEntry modifierEntry = new ModifierEntry();
+
+        String[] modEntries = modData.trim().split("\n");
+
+        for (String modEntry : modEntries) {
+
+            ArrayList<String> modValues = new ArrayList<>();
+            Matcher matcher = STRSPLIT_REGEX.matcher(modEntry.trim());
+
+            while (matcher.find())
+                modValues.add(matcher.group().trim());
+
+            modifierEntry.type = mbEnums.ModType.valueOf(modValues.get(0).trim());
+
+            switch (modifierEntry.type) {
+                case AnimOverride:
+                    modifierEntry.min = Float.parseFloat(modValues.get(1).trim());
+                    modifierEntry.max = Float.parseFloat(modValues.get(2).trim());
+                    break;
+                case Health:
+                case Mana:
+                case Stamina:
+                    modifierEntry.min = Float.parseFloat(modValues.get(1).trim());
+                    modifierEntry.max = Float.parseFloat(modValues.get(2).trim());
+                    modifierEntry.value = Float.parseFloat(modValues.get(3).trim());
+                    // Parameter 4 is always 0.
+                    modifierEntry.compoundCurveType = mbEnums.CompoundCurveType.valueOf(modValues.get(5).trim());
+                    modifierEntry.arg1 = modValues.get(6).trim();
+                    break;
+                case Attr:
+                case Resistance:
+                case Skill:
+                case HealthRecoverRate:
+                case ManaRecoverRate:
+                case StaminaRecoverRate:
+                case DamageShield:
+                case HealthFull:
+                case ManaFull:
+                case StaminaFull:
+                case Slay:
+                case Fade:
+                case Durability:
+                    modifierEntry.min = Float.parseFloat(modValues.get(1).trim());
+                    modifierEntry.max = Float.parseFloat(modValues.get(2).trim());
+                    modifierEntry.compoundCurveType = mbEnums.CompoundCurveType.valueOf(modValues.get(3).trim());
+
+                    if (modValues.size() > 4)
+                        modifierEntry.arg1 = modValues.get(4).trim();   // Some HeathFull entries do not have an argument
+                    break;
+                case MeleeDamageModifier:
+                case OCV:
+                case DCV:
+                case AttackDelay:
+                case AdjustAboveDmgCap:
+                case DamageCap:
+                case ArmorPiercing:
+                case Speed:
+                case PowerDamageModifier:
+                case DR:
+                case PassiveDefense:
+                case MaxDamage:
+                case Value:
+                case WeaponSpeed:
+                case MinDamage:
+                case PowerCost:
+                case Block:
+                case Parry:
+                case Dodge:
+                case WeaponRange:
+                case ScanRange:
+                case ScaleHeight:
+                case ScaleWidth:
+                    modifierEntry.min = Float.parseFloat(modValues.get(1).trim());
+                    modifierEntry.max = Float.parseFloat(modValues.get(2).trim());
+                    modifierEntry.compoundCurveType = mbEnums.CompoundCurveType.valueOf(modValues.get(3).trim());
+                    break;
+                case ItemName:
+                case BlockedPowerType:
+                case ImmuneTo:
+                case BlackMantle:
+                    modifierEntry.arg1 = modValues.get(1).trim();
+
+                    // Some BlockedPowerType entries have only one argument
+
+                    if (modValues.size() > 2)
+                        modifierEntry.arg2 = modValues.get(2).trim();
+                    break;
+                case NoMod:
+                case ConstrainedAmbidexterity:
+                case ProtectionFrom:
+                case ExclusiveDamageCap:
+                case IgnoreDamageCap:
+                    modifierEntry.arg1 = modValues.get(1).trim();
+                    break;
+                case WeaponProc:
+                    modifierEntry.min = Float.parseFloat(modValues.get(1).trim());
+                    modifierEntry.arg1 = modValues.get(2).trim();
+                    modifierEntry.max = Float.parseFloat(modValues.get(3).trim());
+                    break;
+                case BladeTrails:  // These tags have no parms or are not parsed
+                case ImmuneToAttack:
+                case ImmuneToPowers:
+                case Ambidexterity:
+                case Silenced:
+                case IgnorePassiveDefense:
+                case Stunned:
+                case PowerCostHealth:
+                case Charmed:
+                case Fly:
+                case CannotMove:
+                case CannotTrack:
+                case CannotAttack:
+                case CannotCast:
+                case SpireBlock:
+                case Invisible:
+                case SeeInvisible:
+                    break;
+                default:
+                    Logger.error("Unhandled type: " + modifierEntry.type);
+                    break;
+            }
+        }
+
+        return modifierEntry;
+    }
+
+}

src/engine/wpak/PowerActionParser.java

@@ -0,0 +1,305 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2024
+//                www.magicbane.com
+
+package engine.wpak;
+
+import engine.gameManager.ConfigManager;
+import engine.mbEnums;
+import engine.wpak.data.Effect;
+import engine.wpak.data.PowerAction;
+import engine.wpak.data.StatTransfer;
+import engine.wpak.data.TrackEntry;
+import org.pmw.tinylog.Logger;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class PowerActionParser {
+    private static final Pattern STRSPLIT_REGEX = Pattern.compile("([^\"]\\S*|\"[^\"]*\")\\s*");
+    private static final Pattern POWER_ACTION_REGEX = Pattern.compile("(?<=POWERACTIONBEGIN)(.+?)(?=POWERACTIONEND)", Pattern.DOTALL);
+    private static final String powerActionPath = ConfigManager.DEFAULT_DATA_DIR + "wpak/PowerActions.cfg";
+
+    public static void parseWpakFile() {
+
+        // Read .wpak file from disk
+
+        byte[] fileData;
+
+        try {
+            fileData = Files.readAllBytes(Paths.get(powerActionPath));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+        String fileContents = new String(fileData);
+
+        // Iterate over power entries from .wpak data
+
+        Matcher matcher = POWER_ACTION_REGEX.matcher(fileContents);
+
+        while (matcher.find()) {
+
+            PowerAction powerAction = parsePowerActionEntry(matcher.group().trim());
+
+        }
+    }
+
+    private static PowerAction parsePowerActionEntry(String powerActionData) {
+
+        PowerAction powerAction = new PowerAction();
+        Effect effect;
+        StatTransfer statTransfer;
+        TrackEntry trackEntry;
+
+        // Remove all lines that contain a # and leading/trailing blank lines
+
+        powerActionData = powerActionData.replaceAll("(?m)^(\\s*#.*|\\s*)\r?\n?", "").trim();
+
+        List<String> lineData = Arrays.asList(powerActionData.split("\n"));
+
+        // Parse effect entry header
+
+        Iterator<String> entryIterator = lineData.iterator();
+        String headerLine = entryIterator.next();
+        List<String> headerData = new ArrayList<>();
+
+        Matcher matcher = STRSPLIT_REGEX.matcher(headerLine.trim());
+
+        while (matcher.find())
+            headerData.add(matcher.group().trim());
+
+        Iterator<String> headerIterator = headerData.iterator();
+        powerAction.action_id = headerIterator.next();
+        powerAction.action_type = headerIterator.next();
+
+        switch (powerAction.action_type) {
+            case "RemoveEffect":
+                effect = new Effect();
+                effect.effect_id = headerIterator.next();
+                powerAction.effects.add(effect);
+                break;
+            case "CreateMob":
+                powerAction.petLevel = Integer.parseInt(headerIterator.next());
+                powerAction.petRace = Integer.parseInt(headerIterator.next());
+                break;
+            case "DamageOverTime":
+                effect = new Effect();
+                effect.effect_id = headerIterator.next();
+                effect.cycleDuration = Integer.parseInt(headerIterator.next());
+                effect.cycleDelay = Integer.parseInt(headerIterator.next());
+                powerAction.effects.add(effect);
+                break;
+            case "ApplyEffects":
+                int level = Integer.parseInt(headerIterator.next());
+
+                while (headerIterator.hasNext()) {
+                    effect = new Effect();
+                    effect.level = level;
+                    effect.effect_id = headerIterator.next();
+                    powerAction.effects.add(effect);
+                }
+                break;
+            case "Transform":
+            case "Invis":
+            case "ApplyEffect":
+            case "DeferredPower":
+            case "DirectDamage":
+            case "SpireDisable":
+                while (headerIterator.hasNext()) {
+                    effect = new Effect();
+                    effect.effect_id = headerIterator.next();
+
+                    // Some applyEffect entries are naked withot a level
+
+                    if (headerData.size() > 3)
+                        effect.level = Integer.parseInt(headerIterator.next());
+
+                    powerAction.effects.add(effect);
+                }
+                break;
+            case "TransferStat":
+                statTransfer = new StatTransfer();
+                statTransfer.fromStat = mbEnums.CostType.valueOf(headerIterator.next());
+                statTransfer.toStat = mbEnums.CostType.valueOf(headerIterator.next());
+                statTransfer.fromStatValue = Float.parseFloat(headerIterator.next());
+                statTransfer.fromCurve = mbEnums.CompoundCurveType.valueOf(headerIterator.next());
+                statTransfer.toStatValue = Float.parseFloat(headerIterator.next());
+                statTransfer.toCurve = mbEnums.CompoundCurveType.valueOf(headerIterator.next());
+                statTransfer.fromStatBool = Boolean.parseBoolean(headerIterator.next());
+                statTransfer.toStatBool = Boolean.parseBoolean(headerIterator.next());
+                powerAction.statTransfer = statTransfer;
+                break;
+            case "TransferStatOT":
+                statTransfer = new StatTransfer();
+                statTransfer.fromStat = mbEnums.CostType.valueOf(headerIterator.next());
+                statTransfer.toStat = mbEnums.CostType.valueOf(headerIterator.next());
+                statTransfer.fromStatValue = Float.parseFloat(headerIterator.next());
+                statTransfer.fromCurve = mbEnums.CompoundCurveType.valueOf(headerIterator.next());
+                statTransfer.toStatValue = Float.parseFloat(headerIterator.next());
+                statTransfer.toCurve = mbEnums.CompoundCurveType.valueOf(headerIterator.next());
+                statTransfer.fromStatBool = Boolean.parseBoolean(headerIterator.next());
+                statTransfer.toStatBool = Boolean.parseBoolean(headerIterator.next());
+                statTransfer.transfer_action = headerIterator.next();
+                statTransfer.transfer_ticks = Integer.parseInt(headerIterator.next());
+                powerAction.statTransfer = statTransfer;
+                break;
+            case "Charm":
+                effect = new Effect();
+                effect.effect_id = headerIterator.next();
+                effect.level = Integer.parseInt(headerIterator.next());
+                effect.type = headerIterator.next();
+                powerAction.effects.add(effect);
+                break;
+            case "Block":
+                effect = new Effect();
+                effect.effect_id = headerIterator.next();
+                effect.level = Integer.parseInt(headerIterator.next());
+                powerAction.effects.add(effect);
+                break;
+            case "Resurrect":
+                powerAction.levelCap = Integer.parseInt(headerIterator.next());
+                break;
+            case "SetItemFlag":
+                powerAction.itemFlag = mbEnums.ItemFlags.valueOf(headerIterator.next());
+                break;
+            case "Track":
+                trackEntry = new TrackEntry();
+                trackEntry.action_id = headerIterator.next();
+                trackEntry.unknown1 = Boolean.parseBoolean(headerIterator.next());
+                trackEntry.unknown2 = Boolean.parseBoolean(headerIterator.next());
+                trackEntry.type = headerIterator.next();
+                trackEntry.min = Integer.parseInt(headerIterator.next());
+                trackEntry.max = Integer.parseInt(headerIterator.next());
+                powerAction.trackEntry = trackEntry;
+                break;
+            case "Recall": // No arguments for these tags or not parsed
+            case "Summon":
+            case "Teleport":
+            case "TreeChoke":
+            case "SimpleDamage":
+            case "MobRecall": // One argument always zero
+            case "ClearAggro":
+            case "ClearNearbyAggro":
+            case "Peek":
+            case "ClaimMine":
+            case "RunegateTeleport":
+            case "Steal":
+                break;
+            default:
+                Logger.error("Unhandled type " + powerAction.action_type + " for Pow4erAction: " + powerAction.action_id);
+                break;
+        }
+
+        // Process key value pairs after header
+
+        while (entryIterator.hasNext()) {
+            String lineValue = entryIterator.next();
+            List<String> lineValues = Arrays.asList(lineValue.split("="));
+            String key = lineValues.get(0).trim();
+            List<String> arguments;
+
+            switch (key) {
+                case "BODYPARTS":
+                    arguments = Arrays.asList(lineValues.get(1).trim().split("\\s+"));
+
+                    for (String bodyPart : arguments)
+                        powerAction.bodyparts.add(Integer.parseInt(bodyPart));
+                    break;
+                case "FEMALEBODYPARTS":
+                    arguments = Arrays.asList(lineValues.get(1).trim().split("\\s+"));
+
+                    for (String bodyPart : arguments)
+                        powerAction.femaleBodyParts.add(Integer.parseInt(bodyPart));
+                    break;
+                case "SCALEFACTOR":
+                    arguments = Arrays.asList(lineValues.get(1).trim().split("\\s+"));
+
+                    for (String scaleFactor : arguments)
+                        powerAction.scaleFactor.add(Float.parseFloat(scaleFactor));
+                    break;
+                case "ISRESISTABLE":
+                    powerAction.isResistible = Boolean.parseBoolean(lineValues.get(1).trim());
+                    break;
+                case "ISAGGRESSIVE":
+                    powerAction.isAggressive = Boolean.parseBoolean(lineValues.get(1).trim());
+                    break;
+                case "BLADETRAILS":
+                    powerAction.bladeTrails = Boolean.parseBoolean(lineValues.get(1).trim());
+                    break;
+                case "SHOULDSHOWWEAPONS":
+                    powerAction.shouldShowWeapons = Boolean.parseBoolean(lineValues.get(1).trim());
+                    break;
+                case "SHOULDSHOWARMOR":
+                    powerAction.shouldShowArmor = Boolean.parseBoolean(lineValues.get(1).trim());
+                    break;
+                case "APPLYEFFECTBLANK":
+                    powerAction.applyEffectBlank = Boolean.parseBoolean(lineValues.get(1).trim());
+                    break;
+                case "WEAROFFEFFECTBLANK":
+                    powerAction.wearOffEffectBlank = Boolean.parseBoolean(lineValues.get(1).trim());
+                    break;
+                case "ATTACKANIMS":
+                    arguments = Arrays.asList(lineValues.get(1).trim().split("\\s+"));
+
+                    for (String animation : arguments)
+                        powerAction.attackAnimations.add(Integer.parseInt(animation));
+                    break;
+                case "REMOVEALL":
+                    powerAction.removeAll = Boolean.parseBoolean(lineValues.get(1).trim());
+                    break;
+                case "EFFECTID":
+                    effect = new Effect();
+                    effect.effect_id = lineValues.get(1).trim();
+                    powerAction.effects.add(effect);
+                    break;
+                case "LEVELCAP":
+                    arguments = Arrays.asList(lineValues.get(1).trim().split("\\s+"));
+                    powerAction.levelCap = Integer.parseInt(arguments.get(0));
+
+                    if (arguments.size() > 1)  // Not all level caps have a curve
+                        powerAction.levelCurve = mbEnums.CompoundCurveType.valueOf(arguments.get(1));
+                    break;
+                case "CLEARAGGRO":
+                    powerAction.clearAggro = Boolean.parseBoolean(lineValues.get(1).trim());
+                    break;
+                case "TARGETBECOMESPET":
+                    powerAction.targetBecomesPet = Boolean.parseBoolean(lineValues.get(1).trim());
+                    break;
+                case "DESTROYOLDPET":
+                    powerAction.destroyOldPet = Boolean.parseBoolean(lineValues.get(1).trim());
+                    break;
+                case "DAMAGETYPE":
+                    powerAction.damageType = mbEnums.DamageType.valueOf(lineValues.get(1).trim().toUpperCase());
+                    break;
+                case "ROOTFSMID":
+                    powerAction.rootFsmID = mbEnums.MobBehaviourType.valueOf(lineValues.get(1).trim());
+                    break;
+                case "SPLASHDAMAGE":
+                    arguments = Arrays.asList(lineValues.get(1).trim().split("\\s+"));
+                    powerAction.splashDamageMin = Integer.parseInt(arguments.get(0));
+                    powerAction.splashDamageMax = Integer.parseInt(arguments.get(1));
+                    break;
+                case "APPLYEFFECTOTHER":
+                case "APPLYEFFECTSELF":
+                case "WEAROFFEFFECTOTHER": // Keys not parsed go here.
+                case "WEAROFFEFFECTSELF":
+                    break;
+                default:
+                    Logger.error("Unhandled variable type:" + key + " for powerAction: " + powerAction.action_id);
+            }
+        }
+        return powerAction;
+    }
+}

src/engine/wpak/PowersParser.java

@@ -0,0 +1,314 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2024
+//                www.magicbane.com
+
+package engine.wpak;
+
+import engine.gameManager.ConfigManager;
+import engine.mbEnums;
+import engine.wpak.data.*;
+import org.pmw.tinylog.Logger;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class PowersParser {
+
+    private static final Pattern POWER_REGEX = Pattern.compile("(?<=POWERBEGIN)(.+?)(?=POWEREND)", Pattern.DOTALL);
+    private static final Pattern STRSPLIT_REGEX = Pattern.compile("([^\"]\\S*|\"[^\"]*\")\\s*");
+    private static final Pattern CONDITION_REGEX = Pattern.compile("(?<=CONDITIONBEGIN)(.+?)(?=CONDITIONEND)", Pattern.DOTALL);
+    private static final String powersPath = ConfigManager.DEFAULT_DATA_DIR + "wpak/Powers.cfg";
+
+    public static void parseWpakFile() {
+
+        // Read .wpak file from disk
+
+        byte[] fileData;
+
+        try {
+            fileData = Files.readAllBytes(Paths.get(powersPath));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+        String fileContents = new String(fileData);
+
+        // Iterate over power entries from .wpak data
+
+        Matcher matcher = POWER_REGEX.matcher(fileContents);
+
+        while (matcher.find()) {
+
+            Power power = parsePowerEntry(matcher.group().trim());
+
+        }
+    }
+
+    private static Power parsePowerEntry(String powerData) {
+
+        Power powerEntry = new Power();
+        StringBuilder conditionBuilder = new StringBuilder();
+        StringBuilder powerBuilder = new StringBuilder();
+        String conditionString;
+        String powerString;
+        java.util.Iterator<String> iterator;
+        java.util.Iterator<String> argumentIterator;
+        int endPos = 0;
+
+        // Separate out any conditions from the power data
+
+        Matcher matcher = CONDITION_REGEX.matcher(powerData);
+
+        while (matcher.find()) {
+            conditionBuilder.append(matcher.group().trim());
+            powerBuilder.append(powerData, endPos, matcher.start());
+            endPos = matcher.end();
+        }
+
+        powerBuilder.append(powerData.substring(endPos));
+
+        // Cleanup dangling tags and lines that contain a # and leading/trailing blank lines
+
+        powerString = powerBuilder.toString().replaceAll("CONDITIONBEGINCONDITIONEND", "")
+                .replaceAll("(?m)^(\\s*#.*|\\s*)\r?\n?", "");
+        conditionString = conditionBuilder.toString().replaceAll("(?m)^(\\s*#.*|\\s*)\r?\n?", "");
+
+        // Parse header line in power data
+
+        List<String> lineData = Arrays.asList(powerString.trim().split("\n"));
+        List<String> powerHeader = new ArrayList<>();
+
+        String headerString = lineData.get(0);
+        headerString = headerString.replace("\n", " ");
+
+        matcher = STRSPLIT_REGEX.matcher(headerString);
+
+        while (matcher.find())
+            powerHeader.add(matcher.group().trim());
+
+        iterator = powerHeader.iterator();
+
+        powerEntry.power_id = iterator.next();
+        powerEntry.power = iterator.next().replaceAll("\"", "");
+
+        PowerEntry power = new PowerEntry();
+        power.power_type = mbEnums.PowerType.valueOf(iterator.next());
+        power.icon = Integer.parseInt(iterator.next());
+        power.powerBase = iterator.next().replaceAll("\"", "");
+        powerEntry.powers.add(power);
+
+        String nextValue = iterator.next();
+
+        // Account for second definition
+
+        if (nextValue.equals("SPELL") || nextValue.equals("SKILL")) {
+            power = new PowerEntry();
+            power.power_type = mbEnums.PowerType.valueOf(nextValue);
+            power.icon = Integer.parseInt(iterator.next());
+            power.powerBase = iterator.next().replaceAll("\"", "");
+            powerEntry.powers.add(power);
+            powerEntry.target_type = mbEnums.PowerTargetType.valueOf(iterator.next());
+        } else
+            powerEntry.target_type = mbEnums.PowerTargetType.valueOf(nextValue);
+
+        powerEntry.range = Integer.parseInt(iterator.next());
+        powerEntry.areaType = mbEnums.AreaType.valueOf(iterator.next());
+        powerEntry.areaRange = Integer.parseInt(iterator.next());
+        powerEntry.excludeType = mbEnums.ExcludeType.valueOf(iterator.next());
+        powerEntry.costType = mbEnums.CostType.valueOf(iterator.next());
+        powerEntry.cost = Float.parseFloat(iterator.next());
+        powerEntry.difficulty = Float.parseFloat(iterator.next());
+        powerEntry.precision = Float.parseFloat(iterator.next());
+        // Cleanup init_time in client data which is 0.35.1 or some such
+        powerEntry.init_time = Float.parseFloat(iterator.next().replaceAll("(\\.0)+$", ""));
+        powerEntry.release_time = Float.parseFloat(iterator.next());
+        powerEntry.recycle_time = Float.parseFloat(iterator.next());
+        powerEntry.hitRollYN = Integer.parseInt(iterator.next());
+        powerEntry.castingMode = mbEnums.CastingModeType.valueOf(iterator.next());
+        powerEntry.initAmin = Integer.parseInt(iterator.next());
+        powerEntry.releaseAnim = Integer.parseInt(iterator.next());
+        powerEntry.targetSelect = mbEnums.TargetSelectType.valueOf(iterator.next());
+
+        // Process key value pairs after header
+
+        iterator = lineData.iterator();
+        iterator.next(); // Ignore header
+
+        while (iterator.hasNext()) {
+
+            String lineValue = iterator.next();
+            List<String> lineValues = Arrays.asList(lineValue.split("="));
+            String key = lineValues.get(0).trim();
+            ActionEntry actionEntry;
+            List<String> arguments;
+            Matcher argumentMatcher;
+
+            switch (key) {
+                case "ACTION":
+                    actionEntry = new ActionEntry();
+                    arguments = Arrays.asList(lineValues.get(1).trim().split("\\s+"));
+                    actionEntry.effect_id = arguments.get(0);
+                    actionEntry.minTrains = Integer.parseInt(arguments.get(1));
+                    actionEntry.maxTrains = Integer.parseInt(arguments.get(2));
+                    actionEntry.duration = Float.parseFloat(arguments.get(3));
+                    actionEntry.curve = mbEnums.CompoundCurveType.valueOf(arguments.get(4));
+                    actionEntry.stackingCategory = arguments.get(5);
+                    actionEntry.stackingPriority = Integer.parseInt(arguments.get(6));
+                    actionEntry.categoryToPower = mbEnums.CategoryToPowerType.valueOf(arguments.get(7));
+                    powerEntry.actionEntries.add(actionEntry);
+                    break;
+                case "MaxLevel":
+                    powerEntry.maxLevel = Integer.parseInt(lineValues.get(1).trim());
+                    break;
+                case "HateValue":
+                    arguments = Arrays.asList(lineValues.get(1).trim().split("\\s+"));
+                    powerEntry.hateValue = Integer.parseInt(arguments.get(0));
+
+                    // Not all entries have a curve.  Defaults to DefaultFlat;
+
+                    if (arguments.size() > 1)
+                        powerEntry.hateCurve = mbEnums.CompoundCurveType.valueOf(arguments.get(1));
+                    break;
+                case "LOOPANIMID":
+                    powerEntry.loopAnimID = Integer.parseInt(lineValues.get(1).trim());
+                    break;
+                case "GRANTOVERRIDEVAR":
+                    powerEntry.grantOverrideVar = lineValues.get(1).trim();
+                    break;
+                case "DESCRIPTION":
+                    powerEntry.description.add(lineValues.get(1).trim());
+                    break;
+                case "CATEGORY":
+                    powerEntry.category = lineValues.get(1).trim();
+                    break;
+                case "CURVE":
+                    arguments = Arrays.asList(lineValues.get(1).trim().split("\\s+"));
+                    powerEntry.curves.put(arguments.get(0), mbEnums.CompoundCurveType.valueOf(arguments.get(1)));
+                    break;
+                case "EQPREREQ":
+                    argumentMatcher = STRSPLIT_REGEX.matcher(lineValues.get(1).trim());
+                    arguments = new ArrayList<>();
+
+                    while (argumentMatcher.find())
+                        arguments.add(argumentMatcher.group().trim());
+
+                    argumentIterator = arguments.iterator();
+
+                    while (argumentIterator.hasNext()) {
+                        EquipmentPreReq equipmentPreReq = new EquipmentPreReq();
+                        equipmentPreReq.slot = mbEnums.EquipSlotType.valueOf(arguments.get(0));
+                        equipmentPreReq.skill = arguments.get(1).replaceAll("\"", "");
+                        equipmentPreReq.required = Integer.parseInt(arguments.get(2));
+                        powerEntry.equipmentPreReq.add(equipmentPreReq);
+                    }
+                    break;
+                case "CANCASTWHILEMOVING":
+                    powerEntry.canCastWhileMoving = Boolean.parseBoolean(lineValues.get(1).trim());
+                    break;
+                case "CANCASTWHILEFLYING":
+                    powerEntry.canCastWhileFlying = Boolean.parseBoolean(lineValues.get(1).trim());
+                    break;
+                case "BLADETRAILS":
+                    powerEntry.bladeTrails = Boolean.parseBoolean(lineValues.get(1).trim());
+                    break;
+                case "EFFECTPREREQ":
+                    Effect effectPreReq = new Effect();
+                    arguments = Arrays.asList(lineValues.get(1).trim().split("\\s+"));
+                    effectPreReq.effect_id = arguments.get(9);
+                    effectPreReq.level = Integer.parseInt(arguments.get(1));
+                    effectPreReq.message = arguments.get(2);
+                    powerEntry.effectPreReqs.add(effectPreReq);
+                    break;
+                case "MONSTERTYPERESTRICTS":
+                    arguments = Arrays.asList(lineValues.get(1).trim().split("\\s+"));
+
+                    for (String restriction : arguments)
+                        powerEntry.monsterRestricts.add(mbEnums.MonsterType.valueOf(restriction.trim()));
+                    break;
+                case "MONSTERTYPEPREREQS":
+                    arguments = Arrays.asList(lineValues.get(1).trim().split("\\s+"));
+
+                    for (String restriction : arguments)
+                        powerEntry.monsterPrereqs.add(mbEnums.MonsterType.valueOf(restriction.trim()));
+                    break;
+                case "SHOULDCHECKPATH":
+                    powerEntry.shouldCheckPath = Boolean.parseBoolean(lineValues.get(1).trim());
+                    break;
+                case "STICKY":
+                    powerEntry.sticky = Boolean.parseBoolean(lineValues.get(1).trim());
+                    break;
+                case "PULSEINFO":
+                    arguments = Arrays.asList(lineValues.get(1).trim().split("\\s+"));
+                    powerEntry.pulseCycle = Integer.parseInt(arguments.get(0));
+                    powerEntry.pulseDuration = Integer.parseInt(arguments.get(1));
+                    break;
+                case "MAXNUMMOBTARGETS":
+                    powerEntry.maxMobTargets = Integer.parseInt(lineValues.get(1).trim());
+                    break;
+                case "MAXNUMPLAYERTARGETS":
+                    powerEntry.maxPlayerTargets = Integer.parseInt(lineValues.get(1).trim());
+                    break;
+                case "ISADMINPOWER":
+                    powerEntry.isAdminPower = Boolean.parseBoolean(lineValues.get(1).trim());
+                    break;
+                case "ISPROJECTILE":
+                    powerEntry.isProjectile = Boolean.parseBoolean(lineValues.get(1).trim());
+                    break;
+                case "CASTERSPULSEPARTICLE":
+                    powerEntry.casterPulseParticle = Integer.parseInt(lineValues.get(1).trim());
+                    break;
+                case "TARGETEFFECTPREREQS_ORED":
+                    Effect preReq = new Effect();
+                    arguments = Arrays.asList(lineValues.get(1).trim().split("\\s+"));
+                    preReq.effect_id = arguments.get(0);
+                    preReq.level = Integer.parseInt(arguments.get(1));
+                    powerEntry.targetEffectPrereqs.add(preReq);
+                    break;
+                case "SOUNDS":   // Values not parsed
+                case "APPLYDAMAGESELF":
+                case "APPLYDAMAGECASTER":
+                case "APPLYDAMAGEOTHER":
+                case "APPLYDAMAGETARGET":
+                case "APPLYEFFECTSELF":
+                case "APPLYEFFECTOTHER":
+                case "APPLYEFFECTCASTER":
+                case "APPLYEFFECTTARGET":
+                case "FIZZLEOTHER":
+                case "FIZZLESELF":
+                case "INITSTRING":
+                case "SUCCESSOTHER":
+                case "SUCCESSSELF":
+                case "WEAROFFEFFECTOTHER":
+                case "WEAROFFEFFECTSELF":
+                    break;
+                default:
+                    Logger.error("Unhandled variable type:" + key + " for power: " + powerEntry.power_id);
+            }
+        }
+
+        // Parse power conditions
+
+        if (conditionString.isEmpty() == false) {
+
+            List<String> conditions = Arrays.asList(conditionString.split("\n"));
+
+            for (String condition : conditions) {
+                List<String> parameters = Arrays.asList(condition.trim().split("\\s+"));
+                powerEntry.conditions.put(parameters.get(0), Float.parseFloat(parameters.get(1)));
+            }
+        }
+        return powerEntry;
+    }
+
+}
+

src/engine/wpak/data/ActionEntry.java

@@ -0,0 +1,24 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2024
+//                www.magicbane.com
+
+package engine.wpak.data;
+
+import engine.mbEnums;
+
+public class ActionEntry {
+
+    public String effect_id;
+    public int minTrains;
+    public int maxTrains;
+    public float duration;
+    public String stackingCategory;
+    public mbEnums.CompoundCurveType curve;
+    public int stackingPriority;
+    public mbEnums.CategoryToPowerType categoryToPower;
+
+}

src/engine/wpak/data/ConditionEntry.java

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

src/engine/wpak/data/Effect.java

@@ -0,0 +1,35 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2024
+//                www.magicbane.com
+
+package engine.wpak.data;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+
+public class Effect {
+    public String effect_id;
+    public String effect_name;
+    public int icon;
+    public HashSet<String> sources = new HashSet<>();
+    public ArrayList<ModifierEntry> mods = new ArrayList<>();
+    public ArrayList<ConditionEntry> conditions = new ArrayList<>();
+
+    // Additional variables outside of tags or parsed
+    // elsewhere from Effects.cfg
+
+    public boolean isItemEffect;
+    public boolean isSpireEffect;
+    public boolean ignoreNoMod;
+    public boolean dontSave;
+
+    public String type;
+    public int level;
+    public String message;
+    public int cycleDuration;
+    public int cycleDelay;
+}

src/engine/wpak/data/EquipmentPreReq.java

@@ -0,0 +1,19 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2024
+//                www.magicbane.com
+
+package engine.wpak.data;
+
+import engine.mbEnums;
+
+public class EquipmentPreReq {
+
+    public mbEnums.EquipSlotType slot;
+    public String skill;
+    public int required;
+
+}

src/engine/wpak/data/ModifierEntry.java

@@ -0,0 +1,22 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2024
+//                www.magicbane.com
+
+package engine.wpak.data;
+
+import engine.mbEnums;
+
+public class ModifierEntry {
+    public mbEnums.ModType type;
+    public float min;
+    public float max;
+    public float value;
+    public mbEnums.CompoundCurveType compoundCurveType;
+    public String arg1; // ItemName "Masterwork" ""
+    public String arg2; // ItemName "" "of the Defender"
+
+}

src/engine/wpak/data/Power.java

@@ -0,0 +1,69 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2024
+//                www.magicbane.com
+
+package engine.wpak.data;
+
+import engine.mbEnums;
+
+import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.HashMap;
+
+public class Power {
+    public String power_id;
+    public String power;
+    public ArrayList<PowerEntry> powers = new ArrayList<>();
+    public mbEnums.PowerTargetType target_type;
+    public int range;
+    public mbEnums.AreaType areaType;
+    public int areaRange;
+    public mbEnums.ExcludeType excludeType;
+    public mbEnums.CostType costType;
+    public float cost;
+    public float difficulty;
+    public float precision;
+    public float init_time;
+    public float release_time;
+    public float recycle_time;
+    public int hitRollYN;
+    public mbEnums.CastingModeType castingMode;
+    public int initAmin;
+    public int releaseAnim;
+    public mbEnums.TargetSelectType targetSelect;
+
+    // Additional key/value type power entries
+
+    public ArrayList<ActionEntry> actionEntries = new ArrayList<>();
+    public int maxLevel;
+    public int hateValue;
+    public mbEnums.CompoundCurveType hateCurve = mbEnums.CompoundCurveType.DefaultFlat;
+    public int loopAnimID;
+    public String grantOverrideVar;
+    public ArrayList<String> description = new ArrayList<>();
+    public HashMap<String, mbEnums.CompoundCurveType> curves = new HashMap<>();
+    public String category;
+    public boolean canCastWhileMoving = false;
+    public boolean bladeTrails = false;
+    public ArrayList<Effect> effectPreReqs = new ArrayList<>();
+    public ArrayList<EquipmentPreReq> equipmentPreReq = new ArrayList<>();
+    public EnumSet<mbEnums.MonsterType> monsterRestricts = EnumSet.noneOf(mbEnums.MonsterType.class);
+    public EnumSet<mbEnums.MonsterType> monsterPrereqs = EnumSet.noneOf(mbEnums.MonsterType.class);
+    public boolean shouldCheckPath = false;
+    public boolean sticky = false;
+    public int pulseCycle;
+    public int pulseDuration;
+    public int maxMobTargets;
+    public int maxPlayerTargets;
+    public boolean isAdminPower = false;
+    public int casterPulseParticle;
+    public ArrayList<Effect> targetEffectPrereqs = new ArrayList<>();
+    public boolean canCastWhileFlying = false;
+    public boolean isProjectile = false;
+    public HashMap<String, Float> conditions = new HashMap<>();
+
+}

src/engine/wpak/data/PowerAction.java

@@ -0,0 +1,53 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2024
+//                www.magicbane.com
+
+package engine.wpak.data;
+
+import engine.mbEnums;
+
+import java.util.ArrayList;
+
+public class PowerAction {
+
+    // Header values
+
+    public String action_id;
+    public String action_type;
+    public ArrayList<Effect> effects = new ArrayList<>();
+    public int petLevel;
+    public int petRace;
+    public StatTransfer statTransfer;
+    public int levelCap;
+    public mbEnums.CompoundCurveType levelCurve;
+    public TrackEntry trackEntry;
+
+    // Additional variables after header go here.
+
+    public ArrayList<Integer> bodyparts = new ArrayList<>();
+    public ArrayList<Integer> femaleBodyParts = new ArrayList<>();
+    public boolean shouldShowWeapons = false;
+    public boolean shouldShowArmor = false;
+    public boolean bladeTrails = false;
+    public boolean isResistible = false;
+    public ArrayList<Float> scaleFactor = new ArrayList<>();
+    public ArrayList<Integer> attackAnimations = new ArrayList<>();
+    public boolean isAggressive;
+    public mbEnums.DamageType damageType;
+    public boolean applyEffectBlank = false;
+    public boolean wearOffEffectBlank = false;
+    public boolean removeAll = false;
+    public boolean clearAggro = false;
+    public boolean targetBecomesPet = false;
+    public boolean destroyOldPet = false;
+    public mbEnums.ItemFlags itemFlag;
+    public mbEnums.MobBehaviourType rootFsmID;
+    public int splashDamageMin;
+    public int splashDamageMax;
+
+
+}

src/engine/wpak/data/PowerEntry.java

@@ -0,0 +1,17 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2024
+//                www.magicbane.com
+
+package engine.wpak.data;
+
+import engine.mbEnums;
+
+public class PowerEntry {
+    public mbEnums.PowerType power_type;
+    public int icon;
+    public String powerBase;
+}

src/engine/wpak/data/StatTransfer.java

@@ -0,0 +1,24 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2024
+//                www.magicbane.com
+
+package engine.wpak.data;
+
+import engine.mbEnums;
+
+public class StatTransfer {
+    public mbEnums.CostType fromStat;
+    public float fromStatValue;
+    public mbEnums.CompoundCurveType fromCurve;
+    public mbEnums.CostType toStat;
+    public float toStatValue;
+    public mbEnums.CompoundCurveType toCurve;
+    public boolean fromStatBool;
+    public boolean toStatBool;
+    public String transfer_action;
+    public int transfer_ticks;
+}

src/engine/wpak/data/TrackEntry.java

@@ -0,0 +1,19 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2022
+//                www.magicbane.com
+
+package engine.wpak.data;
+
+public class TrackEntry {
+
+    public String action_id;
+    public Boolean unknown1;
+    public Boolean unknown2;
+    public String type;
+    public int min;
+    public int max;
+}