PowerActionEntry parsing work.

src/engine/db/handlers/dbHandlerBase.java

@@ -58,9 +58,6 @@ public abstract class dbHandlerBase {
 
                 int id = rs.getInt(1);
 
-                if (id == 39052)
-                    Logger.info(id);
-
                 if (DbManager.inCache(localObjectType, id)) {
                     objectList.add((T) DbManager.getFromCache(localObjectType, id));
                 } else {

src/engine/devcmd/cmds/InfoCmd.java

@@ -312,7 +312,7 @@ public class InfoCmd extends AbstractDevCmd {
                 if (targetPC.getGuild() != null) {
                     output += "Name: " + targetPC.getGuild().getName();
                     output += newline;
-                    output += "State: " + targetPC.getGuild().guildState;
+                    output += "State: " + targetPC.getGuild().getGuildState();
                     output += newline;
                     output += "Realms Owned:" + targetPC.getGuild().getRealmsOwned();
                     output += newline;
@@ -320,7 +320,7 @@ public class InfoCmd extends AbstractDevCmd {
                     output += newline;
                     output += "Nation Name: " + targetPC.getGuild().getNation().getName();
                     output += newline;
-                    output += "Nation State: " + targetPC.getGuild().getNation().guildState;
+                    output += "Nation State: " + targetPC.getGuild().getNation().getGuildState();
                     output += newline;
                     output += "Realms Owned:" + targetPC.getGuild().getNation().getRealmsOwned();
                     output += newline;

src/engine/gameManager/CombatManager.java

@@ -462,12 +462,11 @@ public enum CombatManager {
 
             if (damage > 0) {
 
-                if (AbstractCharacter.IsAbstractCharacter(target)) {
+                if (AbstractCharacter.IsAbstractCharacter(target))
                     ((AbstractCharacter) target).modifyHealth(-damage, attacker, true);
-                    ((AbstractCharacter) target).cancelOnTakeDamage();
+                else
-                }else {
                     ((Building) target).modifyHealth(-damage, attacker);
-                }
+
                 int attackAnim = getSwingAnimation(null, null, slot);
                 if (attacker.charItemManager.getEquipped().get(slot) != null) {
                     if (attacker.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)) {

src/engine/gameManager/ConfigManager.java

@@ -11,6 +11,8 @@ package engine.gameManager;
 import engine.mbEnums;
 import engine.server.login.LoginServer;
 import engine.server.world.WorldServer;
+import engine.wpak.EffectsParser;
+import engine.wpak.PowersParser;
 import org.pmw.tinylog.Logger;
 
 import java.io.BufferedReader;
@@ -167,11 +169,10 @@ public enum ConfigManager {
 
         Logger.info("Loading WPAK data");
 
-        // *** Needs powermanager collection
+
-        // defined before activation.
+        EffectsParser.parseWpakFile();
-        // EffectsParser.parseWpakFile();
+        PowersParser.parseWpakFile();
-        // PowersParser.parseWpakFile();
+
-        // PowerActionParser.parseWpakFile();
 
         return true;
     }

src/engine/gameManager/ForgeManager.java

@@ -49,15 +49,8 @@ public enum ForgeManager implements Runnable {
     public static final ConcurrentHashMap<NPC, ConcurrentHashMap.KeySetView<WorkOrder, Boolean>> vendorWorkOrderLookup = new ConcurrentHashMap<>();
     public static final ConcurrentHashMap<Item, WorkOrder> itemWorkOrderLookup = new ConcurrentHashMap<>();
 
-    public static void start() {
-
-        Thread forgeManager;
-        forgeManager = new Thread(FORGE_MANAGER);
-        forgeManager.setName("Forge Manager");
-        forgeManager.start();
-    }
-
     @Override
+
     public void run() {
 
         WorkOrder workOrder;
@@ -119,6 +112,14 @@ public enum ForgeManager implements Runnable {
         }
     }
 
+    public static void start() {
+
+        Thread forgeManager;
+        forgeManager = new Thread(FORGE_MANAGER);
+        forgeManager.setName("Forge Manager");
+        forgeManager.start();
+    }
+
     public static int submit(WorkOrder workOrder) {
 
         // Must have a city to roll anything

src/engine/gameManager/GuildManager.java

@@ -181,19 +181,6 @@ public enum GuildManager {
         }
     }
 
-    public static mbEnums.GuildState calcuateGuildState(Guild guild) {
-
-        if (guild.getNation() == guild)
-            return guild.getSubGuildList().isEmpty() ? mbEnums.GuildState.Sovereign : mbEnums.GuildState.Nation;
-
-        if (guild.getOwnedCity() == null)
-            return guild.getNation().isEmptyGuild() ? mbEnums.GuildState.Errant : mbEnums.GuildState.Sworn;
-
-        return (guild.getOwnedCity().getTOL().getRank() == 8)
-                ? mbEnums.GuildState.Province
-                : mbEnums.GuildState.Protectorate;
-    }
-
     //This updates tags for all online players in a guild.
     public static void updateAllGuildTags(Guild guild) {
 

src/engine/mbEnums.java

@@ -841,27 +841,15 @@ public class mbEnums {
         DRAIN;
 
         public static DamageType getDamageType(String modName) {
-
-            if (modName.isEmpty())
-                return DamageType.NONE;
-
             if(modName.toLowerCase().equals("blind"))
                 modName = "BLINDNESS";
 
             if(modName.toLowerCase().equals("powerblock"))
                 modName = "POWERINHIBITOR";
 
-            //validity check for not looking up damage type that doesn't exist
-            boolean valid = false;
-            for(DamageType type : DamageType.values()){
-                if(type.name().equals(modName))
-                    valid = true;
-            }
-
-            if(!valid)
-                return DamageType.NONE;
-
             DamageType damageType;
+            if (modName.isEmpty())
+                return DamageType.NONE;
 
             try {
                 damageType = DamageType.valueOf(modName.replace(",", "").toUpperCase());
@@ -2744,7 +2732,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),
@@ -3038,14 +3026,14 @@ public class mbEnums {
     public enum PowerType {
         None,
         SPELL,
-        SKILL
+        SKILL;
     }
 
     public enum CostType {
         NONE,
         HEALTH,
         MANA,
-        STAMINA
+        STAMINA;
     }
 
     public enum AreaType {
@@ -3054,7 +3042,7 @@ public class mbEnums {
         POINTBLANK,
         LINE,
         CONE,
-        WALL
+        WALL;
     }
 
     public enum ExcludeType {
@@ -3065,14 +3053,14 @@ public class mbEnums {
         NATION,
         PLAYERS,
         ALLBUTGROUP,
-        ALLBUTPETS
+        ALLBUTPETS;
     }
 
     public enum CastingModeType {
         NONE,
         COMBAT,
         NONCOMBAT,
-        BOTH
+        BOTH;
     }
 
     public enum TargetSelectType {
@@ -3081,7 +3069,7 @@ public class mbEnums {
         GROUP,
         GUILD,
         NEARBYMOBS,
-        NAME
+        NAME;
     }
 
     public enum CategoryToPowerType {
@@ -3091,29 +3079,5 @@ public class mbEnums {
         Always
     }
 
-    public enum ModificationType {
-        ADD,
-        MULTIPLY
-    }
-
-    public enum ServerConfig {
-        MBDB_108("AERYNTH", "ARAC", "MOURNING", 300000),
-        MBDB_192("DALGOTH", "ARAC", "GOOK", 300001),
-        MBDB_162("VORGINA", "LORE", "SAEDRON", 300002),
-        MBDB_164("VORGINA", "ARAC", "THURIN", 300002);
-
-        public final String mapType;
-        public final String ruleType;
-        public final String serverName;
-        public final int realmMap;
-
-        ServerConfig(String mapType, String ruleType, String serverName, int realmMap) {
-
-            this.mapType = mapType;
-            this.ruleType = ruleType;
-            this.serverName = serverName;
-            this.realmMap = realmMap;
-        }
-    }
 }
 

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

@@ -173,7 +173,7 @@ public class AbandonAssetMsgHandler extends AbstractClientMsgHandler {
         }
 
         sourceGuild.setCityUUID(0);
-        sourceGuild.guildState = GuildState.Errant;
+        sourceGuild.setGuildState(GuildState.Errant);
         sourceGuild.setNation(null);
 
         // Transfer the city assets

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

@@ -38,8 +38,8 @@ public class AcceptSubInviteHandler extends AbstractClientMsgHandler {
 
         AcceptSubInviteMsg msg = (AcceptSubInviteMsg) baseMsg;
         PlayerCharacter sourcePlayer;
-        Guild swornGuild;
+        Guild sourceGuild;
-        Guild nation;
+        Guild targetGuild;
         Dispatch dispatch;
 
         // get PlayerCharacter of person sending sub invite
@@ -49,21 +49,21 @@ public class AcceptSubInviteHandler extends AbstractClientMsgHandler {
         if (sourcePlayer == null)
             return true;
 
-        swornGuild = sourcePlayer.getGuild();
+        sourceGuild = sourcePlayer.getGuild();
-        nation = (Guild) DbManager.getObject(GameObjectType.Guild, msg.guildUUID());
+        targetGuild = (Guild) DbManager.getObject(GameObjectType.Guild, msg.guildUUID());
 
         //must be source guild to sub to
 
-        if (nation == null) {
+        if (targetGuild == null) {
             ErrorPopupMsg.sendErrorPopup(sourcePlayer, 45); // Failure to swear guild
             return true;
         }
-        if (swornGuild == null) {
+        if (sourceGuild == null) {
             ErrorPopupMsg.sendErrorPopup(sourcePlayer, 45); // Failure to swear guild
             return true;
         }
 
-        if (swornGuild.equals(nation))
+        if (sourceGuild.equals(targetGuild))
             return true;
 
         if (GuildStatusController.isGuildLeader(sourcePlayer.getGuildStatus()) == false) {
@@ -74,7 +74,7 @@ public class AcceptSubInviteHandler extends AbstractClientMsgHandler {
         //source guild is limited to 7 subs
         //TODO this should be based on TOL rank
 
-        if (!nation.canSubAGuild(swornGuild)) {
+        if (!targetGuild.canSubAGuild(sourceGuild)) {
             ErrorPopupMsg.sendErrorPopup(sourcePlayer, 45); // Failure to swear guild
             return true;
         }
@@ -82,20 +82,24 @@ public class AcceptSubInviteHandler extends AbstractClientMsgHandler {
         //all tests passed, let's Handle code
         //Update Target Guild State.
 
-        swornGuild.guildState = GuildState.Petitioner;
+        sourceGuild.upgradeGuildState(false);
 
         //Add sub so GuildMaster can Swear in.
 
-        ArrayList<Guild> subGuildList = nation.getSubGuildList();
+        ArrayList<Guild> subs = targetGuild.getSubGuildList();
-        subGuildList.add(swornGuild);
+        subs.add(sourceGuild);
+
+        targetGuild.setGuildState(GuildState.Nation);
+
 
         //Let's send the message back.
 
-        ChatManager.chatGuildInfo(sourcePlayer, "Your guild is now a " + swornGuild.guildState.name() + '.');
         msg.setUnknown02(1);
-        msg.setResponse("Your guild is now a " + swornGuild.guildState.name() + '.');
+        msg.setResponse("Your guild is now a " + sourceGuild.getGuildState().name() + '.');
         dispatch = Dispatch.borrow(sourcePlayer, msg);
         DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
+
+        ChatManager.chatSystemInfo(sourcePlayer, "Your guild is now a " + sourceGuild.getGuildState().name() + '.');
         return true;
     }
 }

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

@@ -35,8 +35,8 @@ public class BreakFealtyHandler extends AbstractClientMsgHandler {
 
         BreakFealtyMsg bfm;
         PlayerCharacter player;
-        Guild nation;
+        Guild toBreak;
-        Guild protectorate;
+        Guild guild;
         Dispatch dispatch;
 
         bfm = (BreakFealtyMsg) baseMsg;
@@ -49,100 +49,46 @@ public class BreakFealtyHandler extends AbstractClientMsgHandler {
         if (player == null)
             return true;
 
-        nation = (Guild) DbManager.getObject(GameObjectType.Guild, bfm.getGuildUUID());
+        toBreak = (Guild) DbManager.getObject(GameObjectType.Guild, bfm.getGuildUUID());
 
-        if (nation == null) {
+        if (toBreak == null) {
             ErrorPopupMsg.sendErrorMsg(player, "A Serious error has occured. Please post details for to ensure transaction integrity");
             return true;
         }
 
-        protectorate = player.getGuild();
+        guild = player.getGuild();
 
-        if (protectorate == null) {
+        if (guild == null) {
             ErrorPopupMsg.sendErrorMsg(player, "You do not belong to a guild!");
             return true;
         }
 
-        if (nation.isNPCGuild()) {
+        if (toBreak.isNPCGuild()) {
-            if (!GuildStatusController.isGuildLeader(player.getGuildStatus())) {
+            if (GuildStatusController.isGuildLeader(player.getGuildStatus()) == false) {
                 ErrorPopupMsg.sendErrorMsg(player, "Only guild leader can break fealty!");
                 return true;
             }
 
 
-            if (!DbManager.GuildQueries.UPDATE_PARENT(protectorate.getObjectUUID(), WorldServer.worldUUID)) {
+            if (!DbManager.GuildQueries.UPDATE_PARENT(guild.getObjectUUID(), WorldServer.worldUUID)) {
                 ErrorPopupMsg.sendErrorMsg(player, "A Serious error has occurred. Please post details for to ensure transaction integrity");
                 return true;
             }
 
-            switch (protectorate.guildState) {
+            switch (guild.getGuildState()) {
                 case Sworn:
-                    protectorate.setNation(Guild.getErrantNation());
+                    guild.setNation(null);
-                    GuildManager.updateAllGuildTags(protectorate);
+                    GuildManager.updateAllGuildTags(guild);
-                    GuildManager.updateAllGuildBinds(protectorate, null);
+                    GuildManager.updateAllGuildBinds(guild, null);
-                    protectorate.guildState = mbEnums.GuildState.Errant;
                     break;
                 case Province:
-                case Protectorate:
+                    guild.setNation(guild);
-                    protectorate.setNation(protectorate);
+                    GuildManager.updateAllGuildTags(guild);
-                    GuildManager.updateAllGuildTags(protectorate);
+                    GuildManager.updateAllGuildBinds(guild, guild.getOwnedCity());
-                    GuildManager.updateAllGuildBinds(protectorate, protectorate.getOwnedCity());
-                    protectorate.guildState = mbEnums.GuildState.Sovereign;
                     break;
             }
 
-            SendGuildEntryMsg msg = new SendGuildEntryMsg(player);
+            guild.downgradeGuildState();
-            dispatch = Dispatch.borrow(player, msg);
-            DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
-
-            City.lastCityUpdate = System.currentTimeMillis();
-            ArrayList<PlayerCharacter> guildMembers = SessionManager.getActivePCsInGuildID(protectorate.getObjectUUID());
-
-            for (PlayerCharacter member : guildMembers)
-                ChatManager.chatGuildInfo(member, protectorate.getName() + " has broke fealty from " + nation.getName() + '!');
-
-            ArrayList<PlayerCharacter> breakFealtyMembers = SessionManager.getActivePCsInGuildID(nation.getObjectUUID());
-
-            for (PlayerCharacter member : breakFealtyMembers)
-                ChatManager.chatGuildInfo(member, protectorate.getName() + " has broken fealty from " + nation.getName() + '!');
-
-            return true;
-        }
-
-        if (!nation.getSubGuildList().contains(protectorate)) {
-            ErrorPopupMsg.sendErrorMsg(player, "Failure to break fealty!");
-            return true;
-        }
-
-        if (!GuildStatusController.isGuildLeader(player.getGuildStatus())) {
-            ErrorPopupMsg.sendErrorMsg(player, "Only guild leader can break fealty!");
-            return true;
-        }
-
-        if (Bane.getBaneByAttackerGuild(protectorate) != null) {
-            ErrorPopupMsg.sendErrorMsg(player, "You may break fealty with active bane!");
-            return true;
-        }
-
-        if (!DbManager.GuildQueries.UPDATE_PARENT(protectorate.getObjectUUID(), WorldServer.worldUUID)) {
-            ErrorPopupMsg.sendErrorMsg(player, "A Serious error has occurred. Please post details for to ensure transaction integrity");
-            return true;
-        }
-
-        switch (protectorate.guildState) {
-            case Sworn:
-                protectorate.setNation(Guild.getErrantNation());
-                GuildManager.updateAllGuildTags(protectorate);
-                GuildManager.updateAllGuildBinds(protectorate, null);
-                break;
-            case Province:
-                protectorate.setNation(protectorate);
-                GuildManager.updateAllGuildTags(protectorate);
-                GuildManager.updateAllGuildBinds(protectorate, protectorate.getOwnedCity());
-                break;
-        }
-
-        nation.getSubGuildList().remove(protectorate);
 
             SendGuildEntryMsg msg = new SendGuildEntryMsg(player);
             dispatch = Dispatch.borrow(player, msg);
@@ -154,16 +100,84 @@ public class BreakFealtyHandler extends AbstractClientMsgHandler {
 
             City.lastCityUpdate = System.currentTimeMillis();
 
-        ArrayList<PlayerCharacter> guildMembers = SessionManager.getActivePCsInGuildID(protectorate.getObjectUUID());
+
+            ArrayList<PlayerCharacter> guildMembers = SessionManager.getActivePCsInGuildID(guild.getObjectUUID());
 
             for (PlayerCharacter member : guildMembers) {
-            ChatManager.chatGuildInfo(member, protectorate.getName() + " has broke fealty from " + nation.getName() + '!');
+                ChatManager.chatGuildInfo(member, guild.getName() + " has broke fealty from " + toBreak.getName() + '!');
             }
 
-        ArrayList<PlayerCharacter> breakFealtyMembers = SessionManager.getActivePCsInGuildID(nation.getObjectUUID());
+            ArrayList<PlayerCharacter> breakFealtyMembers = SessionManager.getActivePCsInGuildID(toBreak.getObjectUUID());
 
             for (PlayerCharacter member : breakFealtyMembers) {
-            ChatManager.chatGuildInfo(member, protectorate.getName() + " has broken fealty from " + nation.getName() + '!');
+                ChatManager.chatGuildInfo(member, guild.getName() + " has broken fealty from " + toBreak.getName() + '!');
+            }
+
+            return true;
+
+
+        }
+
+        if (!toBreak.getSubGuildList().contains(guild)) {
+            ErrorPopupMsg.sendErrorMsg(player, "Failure to break fealty!");
+            return true;
+        }
+
+        if (GuildStatusController.isGuildLeader(player.getGuildStatus()) == false) {
+            ErrorPopupMsg.sendErrorMsg(player, "Only guild leader can break fealty!");
+            return true;
+        }
+
+        if (Bane.getBaneByAttackerGuild(guild) != null) {
+            ErrorPopupMsg.sendErrorMsg(player, "You may break fealty with active bane!");
+            return true;
+        }
+
+        if (!DbManager.GuildQueries.UPDATE_PARENT(guild.getObjectUUID(), WorldServer.worldUUID)) {
+            ErrorPopupMsg.sendErrorMsg(player, "A Serious error has occurred. Please post details for to ensure transaction integrity");
+            return true;
+        }
+
+        switch (guild.getGuildState()) {
+            case Sworn:
+                guild.setNation(null);
+                GuildManager.updateAllGuildTags(guild);
+                GuildManager.updateAllGuildBinds(guild, null);
+                break;
+            case Province:
+                guild.setNation(guild);
+                GuildManager.updateAllGuildTags(guild);
+                GuildManager.updateAllGuildBinds(guild, guild.getOwnedCity());
+                break;
+        }
+
+        guild.downgradeGuildState();
+        toBreak.getSubGuildList().remove(guild);
+
+        if (toBreak.getSubGuildList().isEmpty())
+            toBreak.downgradeGuildState();
+
+        SendGuildEntryMsg msg = new SendGuildEntryMsg(player);
+        dispatch = Dispatch.borrow(player, msg);
+        DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
+
+        //Update Map.
+
+        final Session s = SessionManager.getSession(player);
+
+        City.lastCityUpdate = System.currentTimeMillis();
+
+
+        ArrayList<PlayerCharacter> guildMembers = SessionManager.getActivePCsInGuildID(guild.getObjectUUID());
+
+        for (PlayerCharacter member : guildMembers) {
+            ChatManager.chatGuildInfo(member, guild.getName() + " has broke fealty from " + toBreak.getName() + '!');
+        }
+
+        ArrayList<PlayerCharacter> breakFealtyMembers = SessionManager.getActivePCsInGuildID(toBreak.getObjectUUID());
+
+        for (PlayerCharacter member : breakFealtyMembers) {
+            ChatManager.chatGuildInfo(member, guild.getName() + " has broken fealty from " + toBreak.getName() + '!');
         }
 
         return true;

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

@@ -78,7 +78,7 @@ public class ChannelMuteMsgHandler extends AbstractClientMsgHandler {
         }
 
         sourceGuild.setCityUUID(0);
-        sourceGuild.guildState = GuildState.Errant;
+        sourceGuild.setGuildState(GuildState.Errant);
         sourceGuild.setNation(null);
 
         // Transfer the city assets

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

@@ -99,7 +99,7 @@ public class DisbandGuildHandler extends AbstractClientMsgHandler {
         player.setGuildLeader(false);
         player.setInnerCouncil(false);
         guild.setGuildLeaderUUID(0);
-        guild.setNation(Guild.getErrantNation());
+        guild.setNation(null);
 
         DbManager.GuildQueries.DELETE_GUILD(guild);
 

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

@@ -77,7 +77,7 @@ public class DismissGuildHandler extends AbstractClientMsgHandler {
             return true;
         }
 
-        switch (toDismiss.guildState) {
+        switch (toDismiss.getGuildState()) {
             case Sworn:
 
                 if (!DbManager.GuildQueries.UPDATE_PARENT(toDismiss.getObjectUUID(), WorldServer.worldUUID)) {
@@ -85,43 +85,35 @@ public class DismissGuildHandler extends AbstractClientMsgHandler {
                     return true;
                 }
                 nation.getSubGuildList().remove(toDismiss);
-                toDismiss.guildState = mbEnums.GuildState.Errant;
+                toDismiss.downgradeGuildState();
-                toDismiss.setNation(Guild.getErrantNation());
+                toDismiss.setNation(null);
                 GuildManager.updateAllGuildBinds(toDismiss, null);
 
                 break;
-            case Petitioner:
-
-                nation.getSubGuildList().remove(toDismiss);
-
-                if (toDismiss.getNation().isEmptyGuild())
-                    toDismiss.guildState = mbEnums.GuildState.Errant;
-                else
-                    toDismiss.guildState = mbEnums.GuildState.Sovereign;
-
-                break;
-            case Protectorate:
             case Province:
                 if (!DbManager.GuildQueries.UPDATE_PARENT(toDismiss.getObjectUUID(), WorldServer.worldUUID)) {
                     ErrorPopupMsg.sendErrorMsg(player, "A Serious error has occured. Please post details for to ensure transaction integrity");
                     return true;
                 }
                 nation.getSubGuildList().remove(toDismiss);
-                toDismiss.guildState = mbEnums.GuildState.Sovereign;
+                toDismiss.downgradeGuildState();
                 toDismiss.setNation(toDismiss);
+
+                break;
+            case Petitioner:
+                nation.getSubGuildList().remove(toDismiss);
+                toDismiss.downgradeGuildState();
+                break;
+            case Protectorate:
+                nation.getSubGuildList().remove(toDismiss);
+                toDismiss.downgradeGuildState();
                 break;
         }
 
         GuildManager.updateAllGuildTags(toDismiss);
 
-        boolean isNation = false;
+        if (nation.getSubGuildList().isEmpty())
-
+            nation.downgradeGuildState();
-        if (!nation.getSubGuildList().isEmpty())
-            for (Guild guild : nation.getSubGuildList())
-                if (guild.getOwnedCity() != null)
-                    isNation = true;
-
-        nation.guildState = isNation ? mbEnums.GuildState.Nation : mbEnums.GuildState.Sovereign;
 
         SendGuildEntryMsg msg = new SendGuildEntryMsg(player);
         dispatch = Dispatch.borrow(player, msg);

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

@@ -36,8 +36,8 @@ public class InviteToSubHandler extends AbstractClientMsgHandler {
 
         PlayerCharacter source;
         PlayerCharacter target;
-        Guild nation;
+        Guild sourceGuild;
-        Guild protectorate;
+        Guild targetGuild;
         InviteToSubMsg msg = (InviteToSubMsg) baseMsg;
         Dispatch dispatch;
 
@@ -58,17 +58,17 @@ public class InviteToSubHandler extends AbstractClientMsgHandler {
         if (target.isIgnoringPlayer(source))
             return true;
 
-        nation = source.getGuild();
+        sourceGuild = source.getGuild();
-        protectorate = target.getGuild();
+        targetGuild = target.getGuild();
 
         //source must be in guild
 
-        if (nation == null) {
+        if (sourceGuild == null) {
             sendChat(source, "You must be in a guild to invite to sub.");
             return true;
         }
 
-        if (nation.isEmptyGuild()) {
+        if (sourceGuild.isEmptyGuild()) {
             sendChat(source, "You must be in a guild to invite to sub.");
             return true;
         }
@@ -80,15 +80,15 @@ public class InviteToSubHandler extends AbstractClientMsgHandler {
             return true;
         }
 
-        if (nation.getNation().isEmptyGuild())
+        if (sourceGuild.getNation().isEmptyGuild())
             return true;
 
         //target must be in a guild
 
-        if (protectorate == null)
+        if (targetGuild == null)
             return true;
 
-        if (nation.equals(protectorate))
+        if (sourceGuild.equals(targetGuild))
             return true;
 
         //target must be GL or IC
@@ -98,21 +98,18 @@ public class InviteToSubHandler extends AbstractClientMsgHandler {
             return true;
         }
 
+        //Can't already be same nation or errant
+        //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 (protectorate.getSubGuildList() != null && protectorate.getSubGuildList().size() > 0) {
+        if(targetGuild.getSubGuildList() != null && targetGuild.getSubGuildList().size() > 0)
-            sendChat(source, "This Guild is already a nation!");
             return true;
-        }
 
-        if (!nation.canSubAGuild(protectorate)) {
+        if (!sourceGuild.canSubAGuild(targetGuild)) {
             sendChat(source, "This Guild can't be subbed.");
             return true;
         }
-
-        if (nation.getSubGuildList().size() >= nation.getOwnedCity().getRank()) {
-            sendChat(source, "Your TOL cannot support another subguild!");
-            return true;
-        }
         if (ConfigManager.MB_RULESET.getValue().equals("LORE")) {
             if (source.guild.getGuildType().equals(target.guild.getGuildType()) == false) {
                 sendChat(source, "You Must Be The Same Charter To Form A Nation.");
@@ -122,9 +119,9 @@ public class InviteToSubHandler extends AbstractClientMsgHandler {
         //all tests passed, let's send invite.
 
         if (target.getClientConnection() != null) {
-            msg.setGuildTag(nation.getGuildTag());
+            msg.setGuildTag(sourceGuild.getGuildTag());
-            msg.setGuildName(nation.getName());
+            msg.setGuildName(sourceGuild.getName());
-            msg.setGuildUUID(nation.getObjectUUID());
+            msg.setGuildUUID(sourceGuild.getObjectUUID());
             msg.setUnknown02(1);
 
             dispatch = Dispatch.borrow(target, msg);

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

@@ -79,14 +79,18 @@ public class MerchantMsgHandler extends AbstractClientMsgHandler {
             return;
         }
 
+
         GuildManager.updateAllGuildBinds(player.getGuild(), npc.getGuild().getOwnedCity());
 
+
         //update Guild state.
         player.getGuild().setNation(npc.getGuild());
         GuildManager.updateAllGuildTags(player.getGuild());
 
-        //update state
+        //update state twice, errant to petitioner, to sworn.
-        player.getGuild().guildState = mbEnums.GuildState.Sworn;
+        player.getGuild().upgradeGuildState(false);//to petitioner
+        player.getGuild().upgradeGuildState(false);//to sworn
+
 
     }
 

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

@@ -88,8 +88,8 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
         // Validate that the player is the leader of a guild
         // that is not currently Sovereign  *** BUG? Doesn't look right.  isGuildLeader()?
 
-        if ((playerCharacter.getGuild().guildState != GuildState.Sworn
+        if ((playerCharacter.getGuild().getGuildState() != GuildState.Sworn
-                || playerCharacter.getGuild().guildState != GuildState.Errant) == false) {
+                || playerCharacter.getGuild().getGuildState() != GuildState.Errant) == false) {
             PlaceAssetMsg.sendPlaceAssetError(origin, 17, ""); // Your is not an errant or soverign guild
             return false;
         }
@@ -161,7 +161,7 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
 
         // Errant guilds cannot place assets
 
-        if (player.getGuild().guildState == GuildState.Errant) {
+        if (player.getGuild().getGuildState() == GuildState.Errant) {
             PlaceAssetMsg.sendPlaceAssetError(origin, 1, "Only sovereign or sworn guilds may place assets.");
             return false;
         }
@@ -774,7 +774,7 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
 
         playerCharacter.getGuild().setNation(playerCharacter.getGuild());
         playerNation = playerCharacter.getGuild();
-        playerNation.guildState = GuildState.Sovereign;
+        playerNation.setGuildState(GuildState.Sovereign);
 
         // Update guild binds and tags
 

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

@@ -37,7 +37,7 @@ public class SwearInGuildHandler extends AbstractClientMsgHandler {
     protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
         PlayerCharacter player;
         SwearInGuildMsg swearInMsg;
-        Guild protectorate;
+        Guild targetGuild;
         Guild nation;
         Dispatch dispatch;
 
@@ -47,9 +47,9 @@ public class SwearInGuildHandler extends AbstractClientMsgHandler {
         if (player == null)
             return true;
 
-        protectorate = (Guild) DbManager.getObject(GameObjectType.Guild, swearInMsg.getGuildUUID());
+        targetGuild = (Guild) DbManager.getObject(GameObjectType.Guild, swearInMsg.getGuildUUID());
 
-        if (protectorate == null) {
+        if (targetGuild == null) {
             ErrorPopupMsg.sendErrorMsg(player, "A Serious error has occured. Please post details for to ensure transaction integrity");
             return true;
         }
@@ -66,14 +66,13 @@ public class SwearInGuildHandler extends AbstractClientMsgHandler {
                 ErrorPopupMsg.sendErrorMsg(player, "Your guild is not a nation!");
                 return true;
             }
-
+            if (!nation.getSubGuildList().contains(targetGuild)) {
-            if (!nation.getSubGuildList().contains(protectorate)) {
+                ErrorPopupMsg.sendErrorMsg(player, "Your do not have such authority!");
-                ErrorPopupMsg.sendErrorMsg(player, "Guild is not a petitioner!");
                 return true;
             }
 
-            if (protectorate.guildState.equals(GuildState.Petitioner) == false) {
+            if (!Guild.canSwearIn(targetGuild)) {
-                ErrorPopupMsg.sendErrorMsg(player, "Guild is not a petitioner!");
+                ErrorPopupMsg.sendErrorMsg(player, targetGuild.getGuildState().name() + "cannot be sworn in");
                 return true;
             }
 
@@ -82,30 +81,29 @@ public class SwearInGuildHandler extends AbstractClientMsgHandler {
                 return true;
             }
 
-            if (!DbManager.GuildQueries.UPDATE_PARENT(protectorate.getObjectUUID(), nation.getObjectUUID())) {
+            if (!DbManager.GuildQueries.UPDATE_PARENT(targetGuild.getObjectUUID(), nation.getObjectUUID())) {
                 ErrorPopupMsg.sendErrorMsg(player, "A Serious error has occured. Please post details for to ensure transaction integrity");
                 return true;
             }
 
-            // update Guild state.
+            switch (targetGuild.getGuildState()) {
-            // R8 is a province
+                case Petitioner:
+                    GuildManager.updateAllGuildBinds(targetGuild, nation.getOwnedCity());
+                    break;
+                case Protectorate:
+                    break;
+                default:
+                    //shouldn't get here.
+                    break;
+            }
 
-            if (protectorate.getNation().isEmptyGuild())
+            //update Guild state.
-                protectorate.guildState = GuildState.Sworn;
+            targetGuild.setNation(nation);
-            else
+            GuildManager.updateAllGuildTags(targetGuild);
-                protectorate.guildState = (protectorate.getOwnedCity().getTOL().getRank() == 8)
+            targetGuild.upgradeGuildState(false);
-                        ? GuildState.Province
-                        : GuildState.Protectorate;
 
-            protectorate.setNation(nation);
+            if (nation.getGuildState() == GuildState.Sovereign)
-            GuildManager.updateAllGuildTags(protectorate);
+                nation.upgradeGuildState(true);
-
-            // Upgrade to a nation if new sub is a landed guild
-
-            if (nation.guildState == GuildState.Sovereign)
-                if (protectorate.guildState.equals(GuildState.Protectorate) ||
-                        protectorate.guildState.equals(GuildState.Province))
-                    nation.guildState = GuildState.Nation;
 
             SendGuildEntryMsg msg = new SendGuildEntryMsg(player);
             dispatch = Dispatch.borrow(player, msg);
@@ -115,14 +113,15 @@ public class SwearInGuildHandler extends AbstractClientMsgHandler {
 
             ArrayList<PlayerCharacter> guildMembers = SessionManager.getActivePCsInGuildID(nation.getObjectUUID());
 
-            for (PlayerCharacter member : guildMembers)
+            for (PlayerCharacter member : guildMembers) {
-                ChatManager.chatGuildInfo(member, protectorate.getName() + " has sworn fealty to you.");
+                ChatManager.chatGuildInfo(member, "Your Guild is now a Nation!");
+            }
 
-            ArrayList<PlayerCharacter> swornMembers = SessionManager.getActivePCsInGuildID(protectorate.getObjectUUID());
+            ArrayList<PlayerCharacter> swornMembers = SessionManager.getActivePCsInGuildID(targetGuild.getObjectUUID());
-
-            for (PlayerCharacter member : swornMembers)
-                ChatManager.chatGuildInfo(member, "Your Guild has sworn fealty to " + nation.getName() + '.');
 
+            for (PlayerCharacter member : swornMembers) {
+                ChatManager.chatGuildInfo(member, "Your Guild has sword fealty to " + nation.getName() + '.');
+            }
         } catch (Exception e) {
             Logger.error(e.getMessage());
             return true;

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

@@ -437,7 +437,7 @@ public class ManageCityAssetsMsg extends ClientNetMsg {
             else
                 writer.putInt((int) timeLeft / 1000); // Time remaing until bane/Seconds
 
-            if (attackerGuild.guildState == GuildState.Sworn)
+            if (attackerGuild.getGuildState() == GuildState.Sworn)
                 writer.putInt(4); //3 capture/errant,4 capture/sworn, 5 destroy/soveirgn.
             else
                 writer.putInt(5);

src/engine/net/client/msg/guild/SendGuildEntryMsg.java

@@ -63,7 +63,7 @@ public class SendGuildEntryMsg extends ClientNetMsg {
         if (subsAndSovs.size() > 0) {
 
             for (Guild guild : subsAndSovs) {
-                int state = guild.guildState.getStateID();
+                int state = guild.getGuildState().getStateID();
 
                 writer.putInt(guild.getObjectType().ordinal());
                 writer.putInt(guild.getObjectUUID());

src/engine/objects/Building.java

@@ -602,10 +602,13 @@ public class Building extends AbstractWorldObject {
 
             this.isDeranking.compareAndSet(false, true);
 
-            if (bane.getOwner().getGuild().guildState == GuildState.Sworn)
+            if ((bane.getOwner().getGuild().getGuildState() == GuildState.Sovereign) ||
-                siegeResult = SiegeResult.CAPTURE;
+                    (bane.getOwner().getGuild().getGuildState() == GuildState.Protectorate) ||
-            else
+                    (bane.getOwner().getGuild().getGuildState() == GuildState.Province) ||
+                    (bane.getOwner().getGuild().getGuildState() == GuildState.Nation))
                 siegeResult = SiegeResult.DESTROY;
+            else
+                siegeResult = SiegeResult.CAPTURE;
 
             // Remove realm if city had one
 
@@ -956,7 +959,7 @@ public class Building extends AbstractWorldObject {
                 // Altitude of this building is derived from the heightmap engine.
 
                 Vector3fImmutable tempLoc = new Vector3fImmutable(this.statLat + this.parentZone.absX, 0, this.statLon + this.parentZone.absZ);
-                tempLoc = new Vector3fImmutable(tempLoc.x, Terrain.getWorldHeight(tempLoc) + this.statAlt, tempLoc.z);
+                tempLoc = new Vector3fImmutable(tempLoc.x, Terrain.getWorldHeight(tempLoc), tempLoc.z);
                 this.setLoc(tempLoc);
             }
         }

src/engine/objects/City.java

@@ -306,22 +306,8 @@ 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))
                 continue;
 
@@ -813,10 +799,10 @@ public class City extends AbstractWorldObject {
 
             // Determine if this city is a nation capitol
 
-            if (this.getGuild().guildState == GuildState.Nation)
+            if (this.getGuild().getGuildState() == GuildState.Nation)
                 for (Guild sub : this.getGuild().getSubGuildList()) {
 
-                    if ((sub.guildState == GuildState.Protectorate) || (sub.guildState == GuildState.Province)) {
+                    if ((sub.getGuildState() == GuildState.Protectorate) || (sub.getGuildState() == GuildState.Province)) {
                         this.isCapital = 1;
                         break;
                     }
@@ -1173,8 +1159,7 @@ public class City extends AbstractWorldObject {
             sourceNation.getSubGuildList().remove(sourceGuild);
 
             if (sourceNation.getSubGuildList().isEmpty())
-                sourceNation.guildState = GuildState.Sovereign;
+                sourceNation.downgradeGuildState();
-
         }
 
         // Link the mew guild with the tree
@@ -1187,7 +1172,7 @@ public class City extends AbstractWorldObject {
         sourceGuild.setCityUUID(this.getObjectUUID());
 
         sourceGuild.setNation(sourceGuild);
-        sourceGuild.guildState = GuildState.Sovereign;
+        sourceGuild.setGuildState(GuildState.Sovereign);
         GuildManager.updateAllGuildTags(sourceGuild);
         GuildManager.updateAllGuildBinds(sourceGuild, this);
 

src/engine/objects/Guild.java

@@ -63,7 +63,7 @@ public class Guild extends AbstractWorldObject {
     private ArrayList<Guild> recommendList = new ArrayList<>();
     private ArrayList<Guild> subGuildList;
     private int nationUUID = 0;
-    public GuildState guildState = GuildState.Errant;
+    private GuildState guildState = GuildState.Errant;
     private String hash;
     private boolean ownerIsNPC;
 
@@ -206,6 +206,23 @@ public class Guild extends AbstractWorldObject {
         return a.nation.getObjectUUID() == b.nation.getObjectUUID() && !a.nation.isEmptyGuild();
     }
 
+    public static boolean canSwearIn(Guild toSub) {
+
+        boolean canSwear = false;
+
+        switch (toSub.guildState) {
+
+            case Protectorate:
+            case Petitioner:
+                canSwear = true;
+                break;
+            default:
+                canSwear = false;
+        }
+
+        return canSwear;
+    }
+
     public static void _serializeForClientMsg(Guild guild, ByteBufferWriter writer) {
         Guild.serializeForClientMsg(guild, writer, null, false);
     }
@@ -627,15 +644,93 @@ public class Guild extends AbstractWorldObject {
 
     }
 
+    public void upgradeGuildState(boolean nation) {
+        if (nation) {
+            this.guildState = GuildState.Nation;
+            return;
+        }
+        switch (this.guildState) {
+
+            case Errant:
+                this.guildState = GuildState.Petitioner;
+                break;
+            case Sworn:
+                //Can't upgrade
+                break;
+            case Protectorate:
+                this.guildState = GuildState.Province;
+                break;
+            case Petitioner:
+                this.guildState = GuildState.Sworn;
+                break;
+            case Province:
+                //Can't upgrade
+                break;
+            case Nation:
+                //Can't upgrade
+                break;
+            case Sovereign:
+                this.guildState = GuildState.Protectorate;
+                break;
+        }
+
+    }
+
+    public void downgradeGuildState() {
+
+        switch (this.guildState) {
+            case Errant:
+                break;
+            case Sworn:
+                this.guildState = GuildState.Errant;
+                break;
+            case Protectorate:
+                this.guildState = GuildState.Sovereign;
+                break;
+            case Petitioner:
+                this.guildState = GuildState.Errant;
+                break;
+            case Province:
+                this.guildState = GuildState.Sovereign;
+                break;
+            case Nation:
+                this.guildState = GuildState.Sovereign;
+                break;
+            case Sovereign:
+                this.guildState = GuildState.Errant;
+                break;
+        }
+
+    }
+
     public boolean canSubAGuild(Guild toSub) {
 
+        boolean canSub;
+
         if (this.equals(toSub))
             return false;
+        switch (this.guildState) {
+            case Nation:
+            case Sovereign:
+                canSub = true;
+                break;
+            default:
+                canSub = false;
+        }
 
-        boolean validNation = (this.guildState == GuildState.Nation || this.guildState == GuildState.Sovereign);
+        switch (toSub.guildState) {
-        boolean validProtectorate = (toSub.guildState == GuildState.Errant || toSub.guildState == GuildState.Sovereign);
+            case Errant:
-
+            case Sovereign:
-        return validNation && validProtectorate;
+                canSub = true;
+                break;
+            default:
+                canSub = false;
+        }
+        City nationCap = City.getCity(nation.cityUUID);
+        if (nation.getSubGuildList().size() >= nationCap.getRank()) {
+            canSub = false;
+        }
+        return canSub;
     }
 
     public int getRealmsOwnedFlag() {
@@ -739,9 +834,18 @@ public class Guild extends AbstractWorldObject {
             Logger.error("FAILED TO LOAD SUB GUILDS FOR UUID " + this.getObjectUUID());
         }
 
-        this.guildState = GuildManager.calcuateGuildState(this);
+        if (this.nation == this && subGuildList.size() > 0)
+            this.guildState = GuildState.Nation;
+        else if (this.nation.equals(this))
+            this.guildState = GuildState.Sovereign;
+        else if (!this.nation.isEmptyGuild() && this.cityUUID != 0)
+            this.guildState = GuildState.Province;
+        else if (!this.nation.isEmptyGuild())
+            this.guildState = GuildState.Sworn;
+        else
+            this.guildState = GuildState.Errant;
 
-        if (this.getOwnedCity() == null)
+        if (this.cityUUID == 0)
             return;
 
         // Calculate number of realms this guild controls
@@ -797,6 +901,14 @@ public class Guild extends AbstractWorldObject {
         return motto;
     }
 
+    public GuildState getGuildState() {
+        return guildState;
+    }
+
+    public void setGuildState(GuildState guildState) {
+        this.guildState = guildState;
+    }
+
     /**
      * @return the realmsOwned
      */
@@ -818,18 +930,18 @@ public class Guild extends AbstractWorldObject {
         if (!DbManager.GuildQueries.UPDATE_PARENT(subGuild.getObjectUUID(), WorldServer.worldUUID))
             Logger.debug("Failed to set Nation Guild for Guild with UID " + subGuild.getObjectUUID());
 
-        switch (subGuild.guildState) {
+        // Guild without any subs is no longer a nation
-            case Sworn:
+
-                subGuild.guildState = GuildState.Errant;
+        if (subGuild.getOwnedCity() == null) {
-                subGuild.nation = Guild.getErrantNation();
+            subGuild.nation = null;
-                break;
+        } else {
-            case Protectorate:
-            case Petitioner:
             subGuild.nation = subGuild;
-                subGuild.guildState = GuildState.Sovereign;
-                break;
         }
 
+        // Downgrade guild
+
+        subGuild.downgradeGuildState();
+
         // Remove from collection
 
         subGuildList.remove(subGuild);

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

@@ -512,6 +512,29 @@ public class NPC extends AbstractCharacter {
         return MinionType.ContractToMinionMap.containsKey(contractID);
     }
 
+    public static boolean UpdateEquipSetID(NPC npc, int equipSetID) {
+
+        if (!LootManager._bootySetMap.containsKey(equipSetID))
+            return false;
+
+        if (!DbManager.NPCQueries.UPDATE_EQUIPSET(npc, equipSetID))
+            return false;
+
+        npc.equipmentSetID = equipSetID;
+
+        return true;
+    }
+
+    public static boolean UpdateRaceID(NPC npc, int raceID) {
+
+        if (!DbManager.NPCQueries.UPDATE_MOBBASE(npc, raceID))
+            return false;
+
+        npc.loadID = raceID;
+        npc.mobBase = MobBase.getMobBase(npc.loadID);
+        return true;
+    }
+
     public static NPCProfits GetNPCProfits(NPC npc) {
         return NPCProfits.ProfitCache.get(npc.currentID);
     }

src/engine/server/world/WorldServer.java

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

src/engine/workthreads/DestroyCityThread.java

@@ -63,8 +63,8 @@ public class DestroyCityThread implements Runnable {
 
             //Successful Update of guild
 
-            formerGuild.guildState = mbEnums.GuildState.Errant;
+            formerGuild.setGuildState(mbEnums.GuildState.Errant);
-            formerGuild.setNation(Guild.getErrantNation());
+            formerGuild.setNation(null);
             formerGuild.setCityUUID(0);
             GuildManager.updateAllGuildTags(formerGuild);
             GuildManager.updateAllGuildBinds(formerGuild, null);
@@ -95,12 +95,6 @@ public class DestroyCityThread implements Runnable {
             if (cityBuilding == null)
                 continue;
 
-            // check null bluepritn and log error
-            if (cityBuilding.getBlueprint() == null){
-                Logger.error("Null Blueprint for building ID: " + cityBuilding.getObjectUUID());
-                continue;
-            }
-
             // Do nothing with the banestone.  It will be removed elsewhere
 
             if (cityBuilding.getBlueprint().getBuildingGroup().equals(mbEnums.BuildingGroup.BANESTONE))

src/engine/workthreads/TransferCityThread.java

@@ -50,8 +50,8 @@ public class TransferCityThread implements Runnable {
 
         if (formerGuild != null)
             if (DbManager.GuildQueries.SET_GUILD_OWNED_CITY(formerGuild.getObjectUUID(), 0)) {
-                formerGuild.guildState = mbEnums.GuildState.Errant;
+                formerGuild.setGuildState(mbEnums.GuildState.Errant);
-                formerGuild.setNation(Guild.getErrantNation());
+                formerGuild.setNation(null);
                 formerGuild.setCityUUID(0);
                 GuildManager.updateAllGuildTags(formerGuild);
                 GuildManager.updateAllGuildBinds(formerGuild, null);
@@ -63,12 +63,14 @@ public class TransferCityThread implements Runnable {
 
             subGuildList = new ArrayList<>();
 
-            for (Guild subGuild : formerGuild.getSubGuildList())
+            for (Guild subGuild : formerGuild.getSubGuildList()) {
                 subGuildList.add(subGuild);
+            }
 
-            for (Guild subGuild : subGuildList)
+            for (Guild subGuild : subGuildList) {
                 formerGuild.removeSubGuild(subGuild);
             }
+        }
 
         //Reset TOL to rank 1
 

src/engine/wpak/EffectsParser.java

@@ -10,24 +10,22 @@ package engine.wpak;
 
 import engine.gameManager.ConfigManager;
 import engine.mbEnums;
-import engine.wpak.data.ConditionEntry;
+import engine.wpak.data.EffectEntry;
-import engine.wpak.data.Effect;
+import engine.wpak.data.EffectModifier;
-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.ArrayList;
-import java.util.Arrays;
+import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
 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, EffectEntry> 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);
@@ -38,14 +36,13 @@ public class EffectsParser {
 
         // Read .wpak file from disk
 
-        byte[] fileData;
+        byte[] fileData = null;
 
         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
@@ -53,25 +50,14 @@ public class EffectsParser {
         Matcher matcher = EFFECT_REGEX.matcher(fileContents);
 
         while (matcher.find()) {
-            try {
+            EffectEntry effectEntry = parseEffectEntry(matcher.group());
-                Effect effect = parseEffectEntry(matcher.group());
+            effect_data.put(effectEntry.effect_id, effectEntry);
-                // WpakPowerManager._effectsLookup.put(effect.effect_id, effect);
-            } catch (Exception e) {
-                Logger.error("EFFECT PARSE FAILED: " + e);
-            }
         }
     }
 
-    private static Effect parseEffectEntry(String effectData) {
+    private static EffectEntry parseEffectEntry(String effectData) {
         
-        Effect effect = new Effect();
+        EffectEntry effectEntry = new EffectEntry();
-
-        // 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
 
@@ -96,24 +82,24 @@ public class EffectsParser {
         while (matcher.find())
             effectHeader.add(matcher.group().trim());
 
-        effect.effect_id = effectHeader.get(0);
+        effectEntry.effect_id = effectHeader.get(0);
-        effect.effect_name = effectHeader.get(1);
+        effectEntry.effect_name = effectHeader.get(1);
-        effect.effect_name = effect.effect_name.replaceAll("\"", "");
+        effectEntry.effect_name = effectEntry.effect_name.replaceAll("\"", "");
 
         // Some effect mods have no icon
         // (SEEINVIS-SHADE "See Invis")
 
         if (effectHeader.size() == 3)
-            effect.icon = Integer.parseInt(effectHeader.get(2));
+            effectEntry.icon = Integer.parseInt(effectHeader.get(2));
         else
-            effect.icon = 0;
+            effectEntry.icon = 0;
 
         // Parse source entries
 
         matcher = SOURCE_REGEX.matcher(effectData);
 
         while (matcher.find())
-            effect.sources.add(matcher.group().trim());
+            effectEntry.sources.add(matcher.group().trim());
 
         // Parse modifier entries
 
@@ -122,8 +108,8 @@ public class EffectsParser {
         // Iterate effect entries from .wpak config data
 
         while (matcher.find()) {
-            ModifierEntry modifierEntry = parseModEntry(matcher.group());
+            EffectModifier effectModifier = parseModEntry(matcher.group());
-            effect.mods.add(modifierEntry);
+            effectEntry.mods.add(effectModifier);
         }
 
         // Parse Conditions
@@ -134,29 +120,17 @@ public class EffectsParser {
             String[] conditions = matcher.group().trim().split("\n");
 
             for (String condition : conditions) {
-                List<String> parameters = Arrays.asList(condition.trim().split("\\s+"));
+                String[] parameters = condition.trim().split("\\s+");
-                Iterator<String> iterator = parameters.iterator();
+                effectEntry.conditions.put(parameters[0], Float.parseFloat(parameters[1]));
-
-                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;
+        return effectEntry;
     }
 
-    private static ModifierEntry parseModEntry(String modData) {
+    private static EffectModifier parseModEntry(String modData) {
 
-        ModifierEntry modifierEntry = new ModifierEntry();
+        EffectModifier effectModifier = new EffectModifier();
 
         String[] modEntries = modData.trim().split("\n");
 
@@ -168,22 +142,40 @@ public class EffectsParser {
             while (matcher.find())
                 modValues.add(matcher.group().trim());
 
-            modifierEntry.type = mbEnums.ModType.valueOf(modValues.get(0).trim());
+            effectModifier.type = mbEnums.ModType.valueOf(modValues.get(0).trim());
 
-            switch (modifierEntry.type) {
+            switch (effectModifier.type) {
+                case BladeTrails:  // No parm modifiers
+                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;
                 case AnimOverride:
-                    modifierEntry.min = Float.parseFloat(modValues.get(1).trim());
+                    effectModifier.min = Float.parseFloat(modValues.get(1).trim());
-                    modifierEntry.max = Float.parseFloat(modValues.get(2).trim());
+                    effectModifier.max = Float.parseFloat(modValues.get(2).trim());
                     break;
                 case Health:
                 case Mana:
                 case Stamina:
-                    modifierEntry.min = Float.parseFloat(modValues.get(1).trim());
+                    effectModifier.min = Float.parseFloat(modValues.get(1).trim());
-                    modifierEntry.max = Float.parseFloat(modValues.get(2).trim());
+                    effectModifier.max = Float.parseFloat(modValues.get(2).trim());
-                    modifierEntry.percentage = Float.parseFloat(modValues.get(3).trim());
+                    effectModifier.scale = Float.parseFloat(modValues.get(3).trim());
-                    modifierEntry.value = Float.parseFloat(modValues.get(4).trim()); // Always zero
+                    // Parameter 4 is always 0.
-                    modifierEntry.compoundCurveType = mbEnums.CompoundCurveType.valueOf(modValues.get(5).trim());
+                    effectModifier.compoundCurveType = mbEnums.CompoundCurveType.valueOf(modValues.get(5).trim());
-                    modifierEntry.arg1 = modValues.get(6).trim();
+                    effectModifier.arg1 = modValues.get(6).trim();
                     break;
                 case Attr:
                 case Resistance:
@@ -198,12 +190,12 @@ public class EffectsParser {
                 case Slay:
                 case Fade:
                 case Durability:
-                    modifierEntry.min = Float.parseFloat(modValues.get(1).trim());
+                    effectModifier.min = Float.parseFloat(modValues.get(1).trim());
-                    modifierEntry.max = Float.parseFloat(modValues.get(2).trim());
+                    effectModifier.scale = Float.parseFloat(modValues.get(2).trim());
-                    modifierEntry.compoundCurveType = mbEnums.CompoundCurveType.valueOf(modValues.get(3).trim());
+                    effectModifier.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
+                        effectModifier.arg1 = modValues.get(4).trim();   // Some HeathFull entries do not have an argument
                     break;
                 case MeleeDamageModifier:
                 case OCV:
@@ -224,62 +216,44 @@ public class EffectsParser {
                 case Block:
                 case Parry:
                 case Dodge:
-                case WeaponRange:
                 case ScanRange:
                 case ScaleHeight:
                 case ScaleWidth:
-                    modifierEntry.min = Float.parseFloat(modValues.get(1).trim());
+                case WeaponRange:
-                    modifierEntry.max = Float.parseFloat(modValues.get(2).trim());
+                    effectModifier.min = Float.parseFloat(modValues.get(1).trim());
-                    modifierEntry.compoundCurveType = mbEnums.CompoundCurveType.valueOf(modValues.get(3).trim());
+                    effectModifier.scale = Float.parseFloat(modValues.get(2).trim());
+                    effectModifier.compoundCurveType = mbEnums.CompoundCurveType.valueOf(modValues.get(3).trim());
                     break;
                 case ItemName:
                 case BlockedPowerType:
                 case ImmuneTo:
                 case BlackMantle:
-                    modifierEntry.arg1 = modValues.get(1).trim();
+                    effectModifier.arg1 = modValues.get(1).trim();
 
                     // Some BlockedPowerType entries have only one argument
 
                     if (modValues.size() > 2)
-                        modifierEntry.arg2 = modValues.get(2).trim();
+                        effectModifier.arg2 = modValues.get(2).trim();
                     break;
                 case NoMod:
                 case ConstrainedAmbidexterity:
                 case ProtectionFrom:
                 case ExclusiveDamageCap:
                 case IgnoreDamageCap:
-                    modifierEntry.arg1 = modValues.get(1).trim();
+                    effectModifier.arg1 = modValues.get(1).trim();
                     break;
                 case WeaponProc:
-                    modifierEntry.min = Float.parseFloat(modValues.get(1).trim());
+                    effectModifier.min = Float.parseFloat(modValues.get(1).trim());
-                    modifierEntry.arg1 = modValues.get(2).trim();
+                    effectModifier.arg1 = modValues.get(2).trim();
-                    modifierEntry.max = Float.parseFloat(modValues.get(3).trim());
+                    effectModifier.scale = 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);
+                    Logger.error("Unhandled type: " + effectModifier.type);
                     break;
             }
         }
 
-        return modifierEntry;
+        return effectModifier;
     }
 
 }

src/engine/wpak/PowerActionParser.java

@@ -9,300 +9,11 @@
 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());
-            // WpakPowerManager._powerActionLookup.put(Hasher.SBStringHash(powerAction.action_id), powerAction);
-        }
-    }
-
-    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 = mbEnums.PowerActionType.valueOf(headerIterator.next());
-
-        switch (powerAction.action_type) {
-            case RemoveEffect:
-                effect = new Effect();
-                effect.effect_id = headerIterator.next();
-                powerAction.effects.add(effect);
-                break;
-            case CreateMob:
-                powerAction.petRace = Integer.parseInt(headerIterator.next());
-                powerAction.petLevel = 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.ramp = Float.parseFloat(headerIterator.next());
-                statTransfer.rampCurve = mbEnums.CompoundCurveType.valueOf(headerIterator.next());
-                statTransfer.efficiency = Float.parseFloat(headerIterator.next());
-                statTransfer.efficiencyCurve = mbEnums.CompoundCurveType.valueOf(headerIterator.next());
-                statTransfer.fromStatBool = Boolean.parseBoolean(headerIterator.next());
-                statTransfer.isDrain = 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.ramp = Float.parseFloat(headerIterator.next());
-                statTransfer.rampCurve = mbEnums.CompoundCurveType.valueOf(headerIterator.next());
-                statTransfer.efficiency = Float.parseFloat(headerIterator.next());
-                statTransfer.efficiencyCurve = mbEnums.CompoundCurveType.valueOf(headerIterator.next());
-                statTransfer.fromStatBool = Boolean.parseBoolean(headerIterator.next());
-                statTransfer.isDrain = 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.trackPlayer = Boolean.parseBoolean(headerIterator.next());
-                trackEntry.trackCorpse = Boolean.parseBoolean(headerIterator.next());
-                trackEntry.filter = mbEnums.MonsterType.valueOf(headerIterator.next());
-                trackEntry.min = Integer.parseInt(headerIterator.next());
-                trackEntry.max = Integer.parseInt(headerIterator.next());
-                powerAction.trackEntry = trackEntry;
-                break;
-            case Teleport:
-                if (headerIterator.hasNext())
-                    powerAction.ignoreNoTeleSpire = Boolean.parseBoolean(headerIterator.next());
-                break;
-            case Recall: // No arguments for these tags or not parsed
-            case Summon:
-            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.levelCapCurve = 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

@@ -18,7 +18,6 @@ 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;
 
@@ -49,20 +48,20 @@ public class PowersParser {
 
         while (matcher.find()) {
 
-            Power power = parsePowerEntry(matcher.group().trim());
+            PowerEntry powerEntry = parsePowerEntry(matcher.group().trim());
-            // @TODO WpakPowerManager._powersLookup.put(Hasher.SBStringHash(power.power_id), power);
+
         }
     }
 
-    private static Power parsePowerEntry(String powerData) {
+    private static PowerEntry parsePowerEntry(String powerData) {
+
+        PowerEntry powerEntry = new PowerEntry();
+
+        try {
+
+            StringBuilder conditionString = new StringBuilder();
+            StringBuilder powerString = new StringBuilder();
 
-        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
@@ -70,25 +69,26 @@ public class PowersParser {
             Matcher matcher = CONDITION_REGEX.matcher(powerData);
 
             while (matcher.find()) {
-            conditionBuilder.append(matcher.group().trim());
+                conditionString.append(matcher.group().trim());
-            powerBuilder.append(powerData, endPos, matcher.start());
+                powerString.append(powerData, endPos, matcher.start());
                 endPos = matcher.end();
             }
 
-        powerBuilder.append(powerData.substring(endPos));
+            powerString.append(powerData.substring(endPos));
 
             // Cleanup dangling tags and lines that contain a # and leading/trailing blank lines
 
-        powerString = powerBuilder.toString().replaceAll("CONDITIONBEGINCONDITIONEND", "")
+            powerString = new StringBuilder(powerString.toString().replaceAll("CONDITIONBEGINCONDITIONEND", ""));
-                .replaceAll("(?m)^(\\s*#.*|\\s*)\r?\n?", "");
+            powerString = new StringBuilder(powerString.toString().replaceAll("(?m)^(\\s*#.*|\\s*)\r?\n?", ""));
-        conditionString = conditionBuilder.toString().replaceAll("(?m)^(\\s*#.*|\\s*)\r?\n?", "");
+
+            conditionString = new StringBuilder(conditionString.toString().replaceAll("(?m)^(\\s*#.*|\\s*)\r?\n?", ""));
 
             // Parse header line in power data
 
-        List<String> lineData = Arrays.asList(powerString.trim().split("\n"));
+            String[] lineData = powerString.toString().trim().split("\n");
-        List<String> powerHeader = new ArrayList<>();
+            ArrayList<String> powerHeader = new ArrayList<>();
 
-        String headerString = lineData.get(0);
+            String headerString = lineData[0];
             headerString = headerString.replace("\n", " ");
 
             matcher = STRSPLIT_REGEX.matcher(headerString);
@@ -96,15 +96,15 @@ public class PowersParser {
             while (matcher.find())
                 powerHeader.add(matcher.group().trim());
 
-        iterator = powerHeader.iterator();
+            java.util.Iterator<String> iterator = powerHeader.iterator();
 
             powerEntry.power_id = iterator.next();
             powerEntry.power = iterator.next().replaceAll("\"", "");
 
-        PowerEntry power = new PowerEntry();
+            PowerData power = new PowerData();
             power.power_type = mbEnums.PowerType.valueOf(iterator.next());
             power.icon = Integer.parseInt(iterator.next());
-        power.focusLine = iterator.next().replaceAll("\"", "");
+            power.powerBase = iterator.next().replaceAll("\"", "");
             powerEntry.powers.add(power);
 
             String nextValue = iterator.next();
@@ -112,10 +112,10 @@ public class PowersParser {
             // Account for second definition
 
             if (nextValue.equals("SPELL") || nextValue.equals("SKILL")) {
-            power = new PowerEntry();
+                power = new PowerData();
                 power.power_type = mbEnums.PowerType.valueOf(nextValue);
                 power.icon = Integer.parseInt(iterator.next());
-            power.focusLine = iterator.next().replaceAll("\"", "");
+                power.powerBase = iterator.next().replaceAll("\"", "");
                 powerEntry.powers.add(power);
                 powerEntry.target_type = mbEnums.PowerTargetType.valueOf(iterator.next());
             } else
@@ -129,7 +129,6 @@ public class PowersParser {
             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());
@@ -141,142 +140,136 @@ public class PowersParser {
 
             // Process key value pairs after header
 
-        iterator = lineData.iterator();
+            iterator = Arrays.stream(lineData).iterator();
             iterator.next(); // Ignore header
 
             while (iterator.hasNext()) {
 
                 String lineValue = iterator.next();
-            List<String> lineValues = Arrays.asList(lineValue.split("="));
+                String[] lineValues = lineValue.split("=");
-            String key = lineValues.get(0).trim();
+                String key = lineValues[0].trim();
                 ActionEntry actionEntry;
-            List<String> arguments;
+                String[] arguments;
-            Matcher argumentMatcher;
+                Matcher matcher1;
+                ArrayList<String> args;
 
                 switch (key) {
                     case "ACTION":
                         actionEntry = new ActionEntry();
-                    arguments = Arrays.asList(lineValues.get(1).trim().split("\\s+"));
+                        arguments = lineValues[1].trim().split("\\s+");
-                    actionEntry.action_id = arguments.get(0);
+
-                    actionEntry.minTrains = Integer.parseInt(arguments.get(1));
+                        if (powerEntry.power_id.equals("HNT-050"))
-                    actionEntry.maxTrains = Integer.parseInt(arguments.get(2));
+                            Logger.error("debug");
-                    actionEntry.duration = Float.parseFloat(arguments.get(3));
+
-                    actionEntry.curve = mbEnums.CompoundCurveType.valueOf(arguments.get(4));
+                        actionEntry.effect_id = arguments[0];
-                    actionEntry.stackingCategory = arguments.get(5);
+                        actionEntry.minTrains = Integer.parseInt(arguments[1]);
-                    actionEntry.stackingPriority = Integer.parseInt(arguments.get(6));
+                        actionEntry.maxTrains = Integer.parseInt(arguments[2]);
-                    actionEntry.categoryToPower = mbEnums.CategoryToPowerType.valueOf(arguments.get(7));
+                        actionEntry.duration = Float.parseFloat(arguments[3]);
+                        actionEntry.curve = mbEnums.CompoundCurveType.valueOf(arguments[4]);
+                        actionEntry.stackingCategory = arguments[5];
+                        actionEntry.stackingPriority = Integer.parseInt(arguments[6]);
+                        actionEntry.categoryToPower = mbEnums.CategoryToPowerType.valueOf(arguments[7]);
                         powerEntry.actionEntries.add(actionEntry);
                         break;
                     case "MaxLevel":
-                    powerEntry.maxLevel = Integer.parseInt(lineValues.get(1).trim());
+                        powerEntry.maxLevel = Integer.parseInt(lineValues[1].trim());
                         break;
                     case "HateValue":
-                    arguments = Arrays.asList(lineValues.get(1).trim().split("\\s+"));
+                        arguments = lineValues[1].trim().split("\\s+");
-                    powerEntry.hateValue = Integer.parseInt(arguments.get(0));
+                        powerEntry.hateValue = Integer.parseInt(arguments[0]);
 
                         // Not all entries have a curve.  Defaults to DefaultFlat;
 
-                    if (arguments.size() > 1)
+                        if (arguments.length > 1)
-                        powerEntry.hateCurve = mbEnums.CompoundCurveType.valueOf(arguments.get(1));
+                            powerEntry.hateCurve = mbEnums.CompoundCurveType.valueOf(arguments[1]);
                         break;
                     case "LOOPANIMID":
-                    powerEntry.loopAnimID = Integer.parseInt(lineValues.get(1).trim());
+                        powerEntry.loopAnimID = Integer.parseInt(lineValues[1].trim());
                         break;
                     case "GRANTOVERRIDEVAR":
-                    powerEntry.grantOverrideVar = lineValues.get(1).trim();
+                        powerEntry.grantOverrideVar = lineValues[1].trim();
                         break;
                     case "DESCRIPTION":
-                    powerEntry.description.add(lineValues.get(1).trim());
+                        powerEntry.description.add(lineValues[1].trim());
                         break;
                     case "CATEGORY":
-                    powerEntry.category = mbEnums.PowerCategoryType.valueOf(lineValues.get(1).trim());
+                        powerEntry.category = lineValues[1].trim();
                         break;
                     case "CURVE":
-                    arguments = Arrays.asList(lineValues.get(1).trim().split("\\s+"));
+                        arguments = lineValues[1].trim().split("\\s+");
-                    powerEntry.curves.put(arguments.get(0), mbEnums.CompoundCurveType.valueOf(arguments.get(1)));
+                        powerEntry.curves.put(arguments[0], mbEnums.CompoundCurveType.valueOf(arguments[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(argumentIterator.next());
+                        matcher1 = STRSPLIT_REGEX.matcher(lineValues[1].trim());
-                        equipmentPreReq.skill = argumentIterator.next().replaceAll("\"", "");
+                        args = new ArrayList<>();
 
-                        if (argumentIterator.hasNext())
+                        while (matcher1.find())
-                            equipmentPreReq.required = Integer.parseInt(argumentIterator.next());
+                            args.add(matcher1.group().trim());
-                        else
-                            equipmentPreReq.required = 0;
 
-                        powerEntry.equipmentPreReq.add(equipmentPreReq);
+                        equipmentPreReq.slot = mbEnums.EquipSlotType.valueOf(args.get(0));
-                    }
+                        equipmentPreReq.skill = args.get(1).replaceAll("\"", "");
+                        equipmentPreReq.level = Integer.parseInt(args.get(2));
+                        powerEntry.equipmentPreReq = equipmentPreReq;
                         break;
                     case "CANCASTWHILEMOVING":
-                    powerEntry.canCastWhileMoving = Boolean.parseBoolean(lineValues.get(1).trim());
+                        powerEntry.canCastWhileMoving = Boolean.parseBoolean(lineValues[1].trim());
                         break;
                     case "CANCASTWHILEFLYING":
-                    powerEntry.canCastWhileFlying = Boolean.parseBoolean(lineValues.get(1).trim());
+                        powerEntry.canCastWhileFlying = Boolean.parseBoolean(lineValues[1].trim());
                         break;
                     case "BLADETRAILS":
-                    powerEntry.bladeTrails = Boolean.parseBoolean(lineValues.get(1).trim());
+                        powerEntry.bladeTrails = Boolean.parseBoolean(lineValues[1].trim());
                         break;
                     case "EFFECTPREREQ":
-                    Effect effectPreReq = new Effect();
+                        EffectDescription effectPreReq = new EffectDescription();
-                    arguments = Arrays.asList(lineValues.get(1).trim().split("\\s+"));
+                        arguments = lineValues[1].trim().split("\\s+");
-                    effectPreReq.effect_id = arguments.get(9);
+                        effectPreReq.effect_id = arguments[9];
-                    effectPreReq.level = Integer.parseInt(arguments.get(1));
+                        effectPreReq.level = Integer.parseInt(arguments[1]);
-                    effectPreReq.message = arguments.get(2);
+                        effectPreReq.message = arguments[2];
                         powerEntry.effectPreReqs.add(effectPreReq);
                         break;
                     case "MONSTERTYPERESTRICTS":
-                    arguments = Arrays.asList(lineValues.get(1).trim().split("\\s+"));
+                        arguments = lineValues[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+"));
+                        arguments = lineValues[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());
+                        powerEntry.shouldCheckPath = Boolean.parseBoolean(lineValues[1].trim());
                         break;
                     case "STICKY":
-                    powerEntry.sticky = Boolean.parseBoolean(lineValues.get(1).trim());
+                        powerEntry.sticky = Boolean.parseBoolean(lineValues[1].trim());
                         break;
                     case "PULSEINFO":
-                    arguments = Arrays.asList(lineValues.get(1).trim().split("\\s+"));
+                        arguments = lineValues[1].trim().split("\\s+");
-                    powerEntry.pulseCycle = Integer.parseInt(arguments.get(0));
+                        powerEntry.pulseCycle = Integer.parseInt(arguments[0]);
-                    powerEntry.pulseDuration = Integer.parseInt(arguments.get(1));
+                        powerEntry.pulseDuration = Integer.parseInt(arguments[1]);
                         break;
                     case "MAXNUMMOBTARGETS":
-                    powerEntry.maxMobTargets = Integer.parseInt(lineValues.get(1).trim());
+                        powerEntry.maxMobTargets = Integer.parseInt(lineValues[1].trim());
                         break;
                     case "MAXNUMPLAYERTARGETS":
-                    powerEntry.maxPlayerTargets = Integer.parseInt(lineValues.get(1).trim());
+                        powerEntry.maxPlayerTargets = Integer.parseInt(lineValues[1].trim());
                         break;
                     case "ISADMINPOWER":
-                    powerEntry.isAdminPower = Boolean.parseBoolean(lineValues.get(1).trim());
+                        powerEntry.isAdminPower = Boolean.parseBoolean(lineValues[1].trim());
                         break;
                     case "ISPROJECTILE":
-                    powerEntry.isProjectile = Boolean.parseBoolean(lineValues.get(1).trim());
+                        powerEntry.isProjectile = Boolean.parseBoolean(lineValues[1].trim());
                         break;
                     case "CASTERSPULSEPARTICLE":
-                    powerEntry.casterPulseParticle = Integer.parseInt(lineValues.get(1).trim());
+                        powerEntry.casterPulseParticle = Integer.parseInt(lineValues[1].trim());
                         break;
                     case "TARGETEFFECTPREREQS_ORED":
-                    Effect preReq = new Effect();
+                        EffectDescription preReq = new EffectDescription();
-                    arguments = Arrays.asList(lineValues.get(1).trim().split("\\s+"));
+                        arguments = lineValues[1].trim().split("\\s+");
-                    preReq.effect_id = arguments.get(0);
+                        preReq.effect_id = arguments[0];
-                    preReq.level = Integer.parseInt(arguments.get(1));
+                        preReq.level = Integer.parseInt(arguments[1]);
                         powerEntry.targetEffectPrereqs.add(preReq);
                         break;
                     case "SOUNDS":   // Values not parsed
@@ -303,15 +296,19 @@ public class PowersParser {
 
             // Parse power conditions
 
-        if (conditionString.isEmpty() == false) {
+            if (conditionString.toString().isEmpty() == false) {
-
+                String[] conditions = conditionString.toString().split("\n");
-            List<String> conditions = Arrays.asList(conditionString.split("\n"));
 
                 for (String condition : conditions) {
-                List<String> parameters = Arrays.asList(condition.trim().split("\\s+"));
+                    String[] parameters = condition.trim().split("\\s+");
-                powerEntry.conditions.put(parameters.get(0), Float.parseFloat(parameters.get(1)));
+                    powerEntry.conditions.put(parameters[0], Float.parseFloat(parameters[1]));
                 }
             }
+
+        } catch (Exception e) {
+            Logger.error(powerEntry.power_id + " " + e);
+        }
+
         return powerEntry;
     }
 

src/engine/wpak/data/ActionEntry.java

@@ -12,7 +12,7 @@ import engine.mbEnums;
 
 public class ActionEntry {
 
-    public String action_id;
+    public String effect_id;
     public int minTrains;
     public int maxTrains;
     public float duration;

src/engine/wpak/data/Effect.java

@@ -1,51 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2024
-//                www.magicbane.com
-
-package engine.wpak.data;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Objects;
-
-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;
-
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (o == null || getClass() != o.getClass())
-            return false;
-
-        Effect effect = (Effect) o;
-        return Objects.equals(effect_id, effect.effect_id);
-    }
-
-    @Override
-    public int hashCode() {
-        return effect_id.hashCode(); // Use only the id field for hashCode
-    }
-}

src/engine/wpak/data/EffectDescription.java

@@ -0,0 +1,15 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2024
+//                www.magicbane.com
+
+package engine.wpak.data;
+
+public class EffectDescription {
+    public String effect_id;
+    public int level;
+    public String message;
+}

src/engine/wpak/data/EffectEntry.java

@@ -8,17 +8,15 @@
 
 package engine.wpak.data;
 
-import engine.mbEnums;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
 
-public class StatTransfer {
+public class EffectEntry {
-    public mbEnums.CostType fromStat;
+    public String effect_id;
-    public float ramp;
+    public String effect_name;
-    public mbEnums.CompoundCurveType rampCurve;
+    public int icon;
-    public mbEnums.CostType toStat;
+    public HashSet<String> sources = new HashSet<>();
-    public float efficiency;
+    public ArrayList<EffectModifier> mods = new ArrayList<>();
-    public mbEnums.CompoundCurveType efficiencyCurve;
+    public HashMap<String, Float> conditions = new HashMap<>();
-    public boolean fromStatBool;
-    public boolean isDrain;
-    public String transfer_action;
-    public int transfer_ticks;
 }

src/engine/wpak/data/EffectModifier.java

@@ -10,12 +10,11 @@ package engine.wpak.data;
 
 import engine.mbEnums;
 
-public class ModifierEntry {
+public class EffectModifier {
     public mbEnums.ModType type;
     public float min;
     public float max;
-    public float percentage;
+    public float scale;
-    public float value;
     public mbEnums.CompoundCurveType compoundCurveType;
     public String arg1; // ItemName "Masterwork" ""
     public String arg2; // ItemName "" "of the Defender"

src/engine/wpak/data/EquipmentPreReq.java

@@ -14,6 +14,6 @@ public class EquipmentPreReq {
 
     public mbEnums.EquipSlotType slot;
     public String skill;
-    public int required;
+    public int level;
 
 }

src/engine/wpak/data/Power.java

@@ -1,96 +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;
-import java.util.Objects;
-
-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 mbEnums.PowerCategoryType 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<>();
-
-    public boolean isSpell() {
-        return true;
-    }
-
-    public boolean isSkill() {
-        return true;
-    }
-
-    public boolean isChant() {
-        return true;
-    }
-
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (o == null || getClass() != o.getClass())
-            return false;
-
-        Power power = (Power) o;
-        return Objects.equals(power_id, power.power_id);
-    }
-
-    @Override
-    public int hashCode() {
-        return power_id.hashCode(); // Use only the id field for hashCode
-    }
-}

src/engine/wpak/data/PowerAction.java

@@ -1,68 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2024
-//                www.magicbane.com
-
-package engine.wpak.data;
-
-import engine.mbEnums;
-
-import java.util.ArrayList;
-import java.util.Objects;
-
-public class PowerAction {
-
-    // Header values
-
-    public String action_id;
-    public mbEnums.PowerActionType action_type;
-    public ArrayList<Effect> effects = new ArrayList<>();
-    public int petLevel;
-    public int petRace;
-    public StatTransfer statTransfer;
-    public int levelCap;
-    public mbEnums.CompoundCurveType levelCapCurve;
-    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;
-    public boolean ignoreNoTeleSpire = false;
-
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (o == null || getClass() != o.getClass())
-            return false;
-
-        PowerAction powerAction = (PowerAction) o;
-        return Objects.equals(action_id, powerAction.action_id);
-    }
-
-    @Override
-    public int hashCode() {
-        return action_id.hashCode(); // Use only the id field for hashCode
-    }
-}

src/engine/wpak/data/PowerActionEntry.java

@@ -3,19 +3,16 @@
 // ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
 // ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
 // ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2022
+//      Magicbane Emulator Project © 2013 - 2024
 //                www.magicbane.com
 
 package engine.wpak.data;
 
-import engine.mbEnums;
+import java.util.ArrayList;
 
-public class TrackEntry {
+public class PowerActionEntry {
 
     public String action_id;
-    public Boolean trackPlayer;
+    public String action_type;
-    public Boolean trackCorpse;
+    public ArrayList<EffectDescription> effects;
-    public mbEnums.MonsterType filter;
-    public int min;
-    public int max;
 }

src/engine/wpak/data/PowerData.java

@@ -5,17 +5,13 @@
 // ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
 //      Magicbane Emulator Project © 2013 - 2024
 //                www.magicbane.com
-//
+
 package engine.wpak.data;
 
 import engine.mbEnums;
 
-import java.util.EnumSet;
+public class PowerData {
-
+    public mbEnums.PowerType power_type;
-public class ConditionEntry {
+    public int icon;
-    public String condition;
+    public String powerBase;
-    public int arg;
-    public mbEnums.CompoundCurveType curveType;
-    public EnumSet<mbEnums.DamageType> damageTypes = EnumSet.noneOf(mbEnums.DamageType.class);
-
 }

src/engine/wpak/data/PowerEntry.java

@@ -10,8 +10,60 @@ package engine.wpak.data;
 
 import engine.mbEnums;
 
+import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.HashMap;
+
 public class PowerEntry {
-    public mbEnums.PowerType power_type;
+    public String power_id;
-    public int icon;
+    public String power;
-    public String focusLine;
+    public ArrayList<PowerData> 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<EffectDescription> effectPreReqs = new ArrayList<>();
+    public EquipmentPreReq equipmentPreReq;
+    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<EffectDescription> targetEffectPrereqs = new ArrayList<>();
+    public boolean canCastWhileFlying = false;
+    public boolean isProjectile = false;
+    public HashMap<String, Float> conditions = new HashMap<>();
+
 }