Bronzewood mine_production updated.

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;
 
-        //admin characters can always access buildings
-        if (player.isCSR())
-            return true;
-
-        //owner can always access their own building
         if (IsOwner(building, player))
             return true;
 
-        //check for default IC access if building belongs to same guild
-        if(player.guild.equals(building.getGuild())) {
-            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;
-                }
-            }
-        }
+        //individual friend.
 
-        //check against friends list entries if any present
-        if (building.getFriends() != null) {
+        if (building.getFriends() != null && building.getFriends().get(player.getObjectUUID()) != null)
+            return true;
 
-            //check individuals
-            if (building.getFriends().get(player.getObjectUUID()) != null)
-                return true;
+        //Admins can access stuff
 
-            if (building.getFriends().get(player.guild.objectUUID) != null) {
+        if (player.isCSR())
+            return true;
 
-                //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;
+        //Guild stuff
+
+        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.
+        if (building.getGuild() != null && building.getGuild().isGuildLeader(player.getObjectUUID()))
+            return true;
+
+        if (!GuildStatusController.isGuildLeader(player.getGuildStatus()) && !GuildStatusController.isInnerCouncil(player.getGuildStatus()))
+            return false;
 
-                }
-            }
-        }
-        //did not meet access grant criteria, deny access
         return false;
+
     }
 
     public static synchronized boolean lootBuilding(PlayerCharacter player, Building building) {
@@ -468,14 +468,6 @@ public enum BuildingManager {
         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());
@@ -798,7 +790,7 @@ public enum BuildingManager {
         // Attempt to write to database or delete the building
         // if we are destroying it.
 
-        if (rank < 0)
+        if (rank == -1)
             success = DbManager.BuildingQueries.DELETE_FROM_DATABASE(building);
         else
             success = DbManager.BuildingQueries.updateBuildingRank(building, rank);

src/engine/gameManager/CombatManager.java

@@ -197,6 +197,8 @@ public enum CombatManager {
                 }
         }
 
+        checkForProc(attacker,target,weapon);
+
         //get delay for the auto attack job
         long delay = 5000;
 
@@ -221,16 +223,6 @@ 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()) {
@@ -367,9 +359,6 @@ public enum CombatManager {
                 }
             }
 
-            //check for proccing
-            checkForProc(attacker,target,weapon);
-
             //calculate the base damage
             int damage = ThreadLocalRandom.current().nextInt(min, max + 1);
             if (damage == 0) {

src/engine/gameManager/ConfigManager.java

@@ -11,9 +11,6 @@ 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;
@@ -167,13 +164,6 @@ 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

@@ -265,12 +265,12 @@ public enum ForgeManager implements Runnable {
 
         // Assign a prefix and suffix to this item if random rolled
 
-        if (workOrder.prefixToken == 0 && workOrder.vendor.getItemModTable().contains((template.modTable)))
+        if (workOrder.prefixToken == 0)
             forgedItem.prefixToken = calcRandomMod(workOrder.vendor, mbEnums.ItemModType.PREFIX, template.modTable);
         else
             forgedItem.prefixToken = workOrder.prefixToken;
 
-        if (workOrder.suffixToken == 0 && workOrder.vendor.getItemModTable().contains((template.modTable)))
+        if (workOrder.suffixToken == 0)
             forgedItem.suffixToken = calcRandomMod(workOrder.vendor, mbEnums.ItemModType.SUFFIX, template.modTable);
         else
             forgedItem.suffixToken = workOrder.suffixToken;

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,10 +31,6 @@ 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;
@@ -116,30 +112,10 @@ 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() {
 
-        EffectsParser.parseWpakFile();
-        PowersParser.parseWpakFile();
-        PowerActionParser.parseWpakFile();
-
-        //InitializeEffects();
-
+        // Add EffectsBase
         ArrayList<EffectsBase> ebList = dbEffectsBaseHandler.getAllEffectsBase();
 
         for (EffectsBase eb : ebList) {
@@ -950,6 +926,21 @@ public enum PowersManager {
                     mobTarget.handleDirectAggro(playerCharacter);
             }
 
+            //Check for immunities
+            if (target.getObjectType() == GameObjectType.PlayerCharacter) {
+                PlayerCharacter pcTarget = (PlayerCharacter) target;
+                PlayerBonuses tarBonus = pcTarget.getBonuses();
+                SourceType source = SourceType.GetSourceType(pb.category);
+                boolean immune = tarBonus.getBool(ModType.ImmuneTo, source);
+                if(!immune){
+                    DamageType damageType = DamageType.getDamageType(pb.category);
+                    immune = pcTarget.getResists().immuneTo(damageType);
+                }
+                if(immune){
+                    return;
+                }
+            }
+
             // update target of used power timer
 
             if (pb.isHarmful())
@@ -970,7 +961,8 @@ public enum PowersManager {
                     continue;
                 // If something blocks the action, then stop
 
-                if (ab.blocked(target,pb.vampDrain)) {
+                if (ab.blocked(target, pb, trains)) {
+
                     PowersManager.sendEffectMsg(playerCharacter, 5, ab, pb);
                     continue;
                 }
@@ -981,7 +973,7 @@ public enum PowersManager {
                 //				if (!stackType.equals("IgnoreStack")) {
                 if (target.getEffects().containsKey(stackType)) {
                     // remove any existing power that overrides
-                    engine.objects.Effect ef = target.getEffects().get(stackType);
+                    Effect ef = target.getEffects().get(stackType);
                     AbstractEffectJob effect = null;
                     if (ef != null) {
                         JobContainer jc = ef.getJobContainer();
@@ -1145,7 +1137,7 @@ public enum PowersManager {
                     continue;
                 // If something blocks the action, then stop
 
-                if (ab.blocked(target,pb.vampDrain))
+                if (ab.blocked(target, pb, trains))
                     continue;
                 // TODO handle overwrite stack order here
                 String stackType = ab.getStackType();
@@ -1153,7 +1145,7 @@ public enum PowersManager {
                 //				if (!stackType.equals("IgnoreStack")) {
                 if (target.getEffects().containsKey(stackType)) {
                     // remove any existing power that overrides
-                    engine.objects.Effect ef = target.getEffects().get(stackType);
+                    Effect ef = target.getEffects().get(stackType);
                     AbstractEffectJob effect = null;
                     if (ef != null) {
                         JobContainer jc = ef.getJobContainer();
@@ -1459,7 +1451,7 @@ public enum PowersManager {
             if (trains < ab.getMinTrains() || trains > ab.getMaxTrains())
                 continue;
             // If something blocks the action, then stop
-            if (ab.blocked(target,pb.vampDrain))
+            if (ab.blocked(target, pb, trains))
                 // sendPowerMsg(pc, 5, msg);
                 continue;
             // TODO handle overwrite stack order here
@@ -1467,7 +1459,7 @@ public enum PowersManager {
             stackType = (stackType.equals("IgnoreStack")) ? Integer.toString(ab.getUUID()) : stackType;
             if (target.getEffects().containsKey(stackType)) {
                 // remove any existing power that overrides
-                engine.objects.Effect ef = target.getEffects().get(stackType);
+                Effect ef = target.getEffects().get(stackType);
                 AbstractEffectJob effect = null;
                 if (ef != null) {
                     JobContainer jc = ef.getJobContainer();
@@ -1914,7 +1906,7 @@ public enum PowersManager {
         stackType = (stackType.equals("IgnoreStack")) ? Integer
                 .toString(toRemove.getUUID()) : stackType;
         if (fromChant) {
-            engine.objects.Effect eff = awo.getEffects().get(stackType);
+            Effect eff = awo.getEffects().get(stackType);
             if (eff != null)
                 eff.cancelJob(true);
         } else

src/engine/loot/WorkOrder.java

@@ -135,8 +135,7 @@ public class WorkOrder implements Delayed {
         if (!workOrder.vendor.charItemManager.hasRoomInventory(template.item_wt))
             return 30;  //30: That person cannot carry that item
 
-        if ((workOrder.prefixToken != 0 || workOrder.suffixToken != 0) &&
-                !workOrder.vendor.getItemModTable().contains((template.modTable)))
+        if (!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,22 +831,16 @@ public class mbEnums {
         SPIRES,
         SNARE,
         STUN,
-        BLINDNESS,
+        BLIND,
         ROOT,
         FEAR,
         CHARM,
-        POWERINHIBITOR,
+        POWERBLOCK,
         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;
@@ -2732,7 +2726,7 @@ public class mbEnums {
         DIAMOND(1580010, 1540225085, -1730704107, 2000, 20),
         GALVOR(1580017, -1683992404, -1596311545, 2000, 5),
         IRON(1580002, -1673518119, 2504297, 2000, 20),
-        LUMBER(1580004, -1628412684, -1603256692, 10000, 100),
+        LUMBER(1580004, 1628412684, -1603256692, 10000, 100),
         MANDRAKE(1580007, 1519910613, 1191391799, 1000, 10),
         MITHRIL(1580021, 626743397, -1761257186, 500, 5),
         OAK(1580005, -1653034775, 74767, 3000, 30),
@@ -2747,7 +2741,6 @@ public class mbEnums {
 
         public static HashMap<Integer, ResourceType> templateLookup = 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 resourceHash;
@@ -2769,7 +2762,6 @@ public class mbEnums {
             for (ResourceType resourceType : ResourceType.values()) {
                 templateLookup.put(resourceType.templateID, resourceType);
                 templateHashLookup.put(resourceType.templateHash, resourceType);
-                resourceHashLookup.put(resourceType.resourceHash, resourceType);
             }
 
         }
@@ -3022,62 +3014,5 @@ 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/net/client/handlers/ArcMineChangeProductionMsgHandler.java

@@ -50,7 +50,7 @@ public class ArcMineChangeProductionMsgHandler extends AbstractClientMsgHandler
 
         //make sure valid resource
 
-        mbEnums.ResourceType resource = mbEnums.ResourceType.resourceHashLookup.get(changeProductionMsg.getResourceHash());
+        mbEnums.ResourceType resource = mbEnums.ResourceType.templateHashLookup.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 (!BuildingManager.playerCanManage(sourcePlayer, building))
+                    if (!ManageCityAssetMsgHandler.playerCanManageNotFriends(sourcePlayer, building))
                         return true;
 
 
@@ -159,7 +159,7 @@ public class ClaimGuildTreeMsgHandler extends AbstractClientMsgHandler {
                             (building == null) || playerZone == null || playerCity == null)
                         return true;
 
-                    if (!BuildingManager.playerCanManage(sourcePlayer, building))
+                    if (!ManageCityAssetMsgHandler.playerCanManageNotFriends(sourcePlayer, building))
                         return true;
 
                     boolean open = (msg.getMessageType() == OPEN_CITY);

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

@@ -102,9 +102,6 @@ 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,6 +28,30 @@ 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/OrderNPCMsgHandler.java

@@ -183,7 +183,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
         if (building == null)
             return;
 
-        if (BuildingManager.playerCanManage(player, building) == false)
+        if (ManageCityAssetMsgHandler.playerCanManageNotFriends(player, building) == false)
             return;
 
         if (orderNpcMsg.getPatrolSize() >= 20)
@@ -411,7 +411,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
                 case 2:
                     player = SessionManager.getPlayerCharacter(origin);
 
-                    if (BuildingManager.playerCanManage(player, building) == false)
+                    if (ManageCityAssetMsgHandler.playerCanManageNotFriends(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 52: //player character
+            case 53: //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 (!BuildingManager.playerCanManage(player, building))
+            if (!ManageCityAssetMsgHandler.playerCanManageNotFriends(player, building))
                 return true;
             if (building.setReserve(msg.getUnknown01(), player)) {
                 dispatch = Dispatch.borrow(player, msg);

src/engine/objects/Building.java

@@ -163,11 +163,6 @@ 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);
         }
@@ -561,7 +556,7 @@ public class Building extends AbstractWorldObject {
                 BuildingManager.setRank(barracksBuilding, -1);
         }
 
-        // If the tree is R8 and deranking, we need to update the
+        // If the tree is R8 and deranking, we need to update it's
         // mesh along with buildings losing their health bonus
 
         if (this.rank == 8) {
@@ -1452,7 +1447,7 @@ public class Building extends AbstractWorldObject {
 
     public synchronized boolean setReserve(int amount, PlayerCharacter player) {
 
-        if (!BuildingManager.playerCanManage(player, this))
+        if (!BuildingManager.playerCanManageNotFriends(player, this))
             return false;
 
         if (amount < 0)

src/engine/objects/CharacterItemManager.java

@@ -1400,7 +1400,6 @@ 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,7 +41,6 @@ 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 {
@@ -81,7 +80,6 @@ public class City extends AbstractWorldObject {
     private String hash;
     public Warehouse warehouse;
     public Realm realm;
-    public AtomicBoolean isDestroyed = new AtomicBoolean(false);
 
     /**
      * ResultSet Constructor
@@ -308,21 +306,6 @@ public class City extends AbstractWorldObject {
             if (city.parentZone == null)
                 continue;
 
-            // Can't teleport to something without a tree
-
-            if (city.getTOL() == null)
-                continue;
-
-            // No abandoned cities
-
-            if (city.getTOL().getGuild().isEmptyGuild())
-                continue;
-
-            // No destroyed cities
-
-            if (city.getTOL().getRank() == -1)
-                continue;
-
             //can't repledge to a guild you're already part of
 
             if (repledge && city.getGuild().equals(playerCharacter.guild))
@@ -1119,21 +1102,17 @@ public class City extends AbstractWorldObject {
 
     public final void destroy() {
 
-        if (this.isDestroyed.compareAndSet(false, true)) {
+        Thread destroyCityThread = new Thread(new DestroyCityThread(this));
 
-            Thread destroyCityThread = new Thread(new DestroyCityThread(this));
-
-            destroyCityThread.setName("destroyCity:" + this.getParent().zoneName);
-            destroyCityThread.start();
-        } else
-            Logger.error("Attempt to destroy destroyed city");
+        destroyCityThread.setName("destroyCity:" + this.getName());
+        destroyCityThread.start();
     }
 
     public final void transfer(AbstractCharacter newOwner) {
 
         Thread transferCityThread = new Thread(new TransferCityThread(this, newOwner));
 
-        transferCityThread.setName("TransferCity:" + this.getParent().zoneName);
+        transferCityThread.setName("TransferCity:" + this.getName());
         transferCityThread.start();
     }
 
@@ -1218,18 +1197,14 @@ public class City extends AbstractWorldObject {
             // these assets are autoprotected.
 
             if ((cityBuilding.getBlueprint().getBuildingGroup() == BuildingGroup.TOL) || (cityBuilding.getBlueprint().getBuildingGroup() == BuildingGroup.SPIRE) || (cityBuilding.getBlueprint().getBuildingGroup() == BuildingGroup.BARRACK) || (cityBuilding.getBlueprint().isWallPiece()) || (cityBuilding.getBlueprint().getBuildingGroup() == BuildingGroup.SHRINE)) {
-                PlayerCharacter guildLeader = PlayerCharacter.getPlayerCharacter(sourcePlayer.guild.getGuildLeaderUUID());
-                if(guildLeader != null)
-                    cityBuilding.claim(guildLeader);
-                else
-                    cityBuilding.claim(sourcePlayer);
+
+                cityBuilding.claim(sourcePlayer);
                 cityBuilding.setProtectionState(ProtectionState.PROTECTED);
             }
         }
 
         this.setForceRename(true);
 
-
         // Reset city timer for map update
 
         City.lastCityUpdate = System.currentTimeMillis();

src/engine/objects/Mine.java

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

src/engine/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.BLINDNESS, true);
+                this.immuneTo.put(mbEnums.DamageType.BLIND, 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.POWERINHIBITOR, true);
+                this.immuneTo.put(mbEnums.DamageType.POWERBLOCK, true);
             if (rb.getBool(ModType.ImmuneTo, SourceType.DeBuff))
                 this.immuneTo.put(mbEnums.DamageType.DEBUFF, true);
             if (rb.getBool(ModType.ImmuneTo, SourceType.Fear))

src/engine/powers/ActionsBase.java

@@ -11,11 +11,13 @@ 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.*;
+import engine.objects.AbstractCharacter;
+import engine.objects.AbstractWorldObject;
+import engine.objects.PlayerBonuses;
+import engine.objects.Runegate;
 import engine.powers.poweractions.AbstractPowerAction;
 import org.pmw.tinylog.Logger;
 
@@ -242,23 +244,32 @@ public class ActionsBase {
     }
 
     //Add blocked types here
-    public boolean blocked(AbstractWorldObject awo, boolean vampDrain) {
-        //Check for immunities
-        if (AbstractCharacter.IsAbstractCharacter(awo)){
-            AbstractCharacter pcTarget = (AbstractCharacter) awo;
-            PlayerBonuses bonus = pcTarget.getBonuses();
+    public boolean blocked(AbstractWorldObject awo, PowersBase pb, int trains) {
+        if (AbstractWorldObject.IsAbstractCharacter(awo)) {
+            AbstractCharacter ac = (AbstractCharacter) awo;
+            PlayerBonuses bonus = ac.getBonuses();
+            if (bonus == null)
+                return false;
 
-            if(vampDrain)
-                return bonus.getBool(ModType.BlockedPowerType, SourceType.VAMPDRAIN);
-
-            if ((this.stackType.equals("Flight") && bonus.getBool(ModType.NoMod, SourceType.Fly)) ||
-                    (this.stackType.equals("Track") && bonus.getBool(ModType.CannotTrack, SourceType.None))) {
+            //TODO make this more efficient then testing strings
+            if (this.stackType.equals("Stun") && bonus.getBool(ModType.ImmuneTo, SourceType.STUN))
+                return true; //Currently stun immune. Skip stun
+            else if (this.stackType.equals("Snare") && bonus.getBool(ModType.ImmuneTo, SourceType.Snare))
+                return true; //Currently snare immune. Skip snare
+            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;
-            }
-
-            mbEnums.DamageType damageType = mbEnums.DamageType.getDamageType(this.stackType.toUpperCase());
-            return pcTarget.getResists().immuneTo(damageType);
-
+                //			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))
+                return true;
+            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,11 +26,10 @@ 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;
@@ -63,7 +62,7 @@ public class EffectsBase {
     // flags
     private boolean isItemEffect;
     private boolean isSpireEffect;
-    private boolean ignoreNoMod;
+    private boolean ignoreMod;
     private boolean dontSave;
     private boolean cancelOnAttack = false;
     private boolean cancelOnAttackSwing = false;
@@ -92,33 +91,6 @@ 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++;
@@ -130,7 +102,7 @@ public class EffectsBase {
             int flags = 0;
             this.isItemEffect = ((flags & 1) != 0) ? true : false;
             this.isSpireEffect = ((flags & 2) != 0) ? true : false;
-            this.ignoreNoMod = ((flags & 4) != 0) ? true : false;
+            this.ignoreMod = ((flags & 4) != 0) ? true : false;
             this.dontSave = ((flags & 8) != 0) ? true : false;
 
             if (this.IDString.startsWith("PRE-"))
@@ -145,7 +117,7 @@ public class EffectsBase {
         this.amountRamp = copyEffect.amountRamp;
         this.isItemEffect = copyEffect.isItemEffect;
         this.isSpireEffect = copyEffect.isSpireEffect;
-        this.ignoreNoMod = copyEffect.ignoreNoMod;
+        this.ignoreMod = copyEffect.ignoreMod;
         this.dontSave = copyEffect.dontSave;
         this.cancelOnAttack = copyEffect.cancelOnAttack;
         this.cancelOnAttackSwing = copyEffect.cancelOnAttackSwing;
@@ -191,7 +163,7 @@ public class EffectsBase {
         int flags = rs.getInt("flags");
         this.isItemEffect = ((flags & 1) != 0) ? true : false;
         this.isSpireEffect = ((flags & 2) != 0) ? true : false;
-        this.ignoreNoMod = ((flags & 4) != 0) ? true : false;
+        this.ignoreMod = ((flags & 4) != 0) ? true : false;
         this.dontSave = ((flags & 8) != 0) ? true : false;
 
         if (this.IDString.startsWith("PRE-"))
@@ -379,7 +351,7 @@ public class EffectsBase {
     }
 
     public boolean ignoreMod() {
-        return this.ignoreNoMod;
+        return this.ignoreMod;
     }
 
     public boolean dontSave() {
@@ -432,7 +404,7 @@ public class EffectsBase {
                 float duration = ab.getDurationInSeconds(trains);
                 if (pb.getToken() == 1672601862) {
 
-                    engine.objects.Effect eff = awo.getEffects().get("DeathShroud");
+                    Effect eff = awo.getEffects().get("DeathShroud");
 
 
                     if (eff != null) {

src/engine/server/world/WorldServer.java

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

src/engine/workthreads/DestroyCityThread.java

@@ -53,117 +53,123 @@ public class DestroyCityThread implements Runnable {
 
         // Member variable assignment
 
-        try {
-            cityZone = city.getParent();
-            newParent = cityZone.parent;
-            formerGuild = city.getTOL().getGuild();
+        cityZone = city.getParent();
+        newParent = cityZone.parent;
+        formerGuild = city.getTOL().getGuild();
 
-            Logger.info("Destroy city thread started for: " + cityZone.zoneName);
+        // Former guild loses it's tree!
 
-            // Former guild loses tree!
+        if (DbManager.GuildQueries.SET_GUILD_OWNED_CITY(formerGuild.getObjectUUID(), 0)) {
 
-            if (DbManager.GuildQueries.SET_GUILD_OWNED_CITY(formerGuild.getObjectUUID(), 0)) {
+            //Successful Update of guild
 
-                //Successful Update of guild
-
-                formerGuild.setGuildState(mbEnums.GuildState.Errant);
-                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.
-
-            if (!formerGuild.getSubGuildList().isEmpty()) {
-
-                subGuildList = new ArrayList<>();
-
-                subGuildList.addAll(formerGuild.getSubGuildList());
-
-                for (Guild subGuild : subGuildList) {
-                    formerGuild.removeSubGuild(subGuild);
-                }
-            }
-
-            // 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);
+            formerGuild.setGuildState(mbEnums.GuildState.Errant);
+            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.
+
+        if (!formerGuild.getSubGuildList().isEmpty()) {
+
+            subGuildList = new ArrayList<>();
+
+            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
+            // 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;
+            }
+
+            // 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);
+            }
+        }
+
+        // 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/wpak/EffectsParser.java

@@ -1,279 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      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

@@ -1,305 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      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

@@ -1,314 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      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

@@ -1,24 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      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

@@ -1,21 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      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

@@ -1,35 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      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

@@ -1,19 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      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

@@ -1,22 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      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

@@ -1,69 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      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

@@ -1,53 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      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

@@ -1,17 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      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

@@ -1,24 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      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

@@ -1,19 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      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;
-}