mob ai work

This reverts commit 685297171c.

src/engine/Enum.java

@@ -9,15 +9,13 @@
 package engine;
 
 import ch.claude_martin.enumbitset.EnumBitSetHelper;
+import engine.gameManager.BuildingManager;
 import engine.gameManager.ConfigManager;
 import engine.gameManager.PowersManager;
 import engine.gameManager.ZoneManager;
 import engine.math.Vector2f;
 import engine.math.Vector3fImmutable;
-import engine.objects.AbstractCharacter;
-import engine.objects.ItemBase;
-import engine.objects.Shrine;
-import engine.objects.Zone;
+import engine.objects.*;
 import engine.powers.EffectsBase;
 import org.pmw.tinylog.Logger;
 
@@ -139,8 +137,8 @@ public class Enum {
         HALFGIANTMALE(2010, MonsterType.HalfGiant, RunSpeed.STANDARD, CharacterSex.MALE, 1.15f),
         HUMANMALE(2011, MonsterType.Human, RunSpeed.STANDARD, CharacterSex.MALE, 1),
         HUMANFEMALE(2012, MonsterType.Human, RunSpeed.STANDARD, CharacterSex.FEMALE, 1),
-        IREKEIMALE(2013, MonsterType.Irekei, RunSpeed.STANDARD, CharacterSex.MALE, 1.1f),
-        IREKEIFEMALE(2014, MonsterType.Irekei, RunSpeed.STANDARD, CharacterSex.FEMALE, 1.1f),
+        IREKEIMALE(2013, MonsterType.Irekei, RunSpeed.IREKEI, CharacterSex.MALE, 1.1f),
+        IREKEIFEMALE(2014, MonsterType.Irekei, RunSpeed.IREKEI, CharacterSex.FEMALE, 1.1f),
         SHADEMALE(2015, MonsterType.Shade, RunSpeed.STANDARD, CharacterSex.MALE, 1),
         SHADEFEMALE(2016, MonsterType.Shade, RunSpeed.STANDARD, CharacterSex.FEMALE, 1),
         MINOMALE(2017, MonsterType.Minotaur, RunSpeed.MINOTAUR, CharacterSex.MALE, 1.3f),
@@ -172,6 +170,8 @@ public class Enum {
         }
 
         public static RaceType getRaceTypebyRuneID(int runeID) {
+            if(runeID == 1999)
+                return _raceTypeByID.get(2017);
             return _raceTypeByID.get(runeID);
         }
 
@@ -208,8 +208,8 @@ public class Enum {
         SENTINEL(0, 0, 0, 0, 0, 0, 0),
         STANDARD(6.1900001f, 13.97f, 4.2199998f, 13.97f, 6.3299999f, 18.379999f, 6.5f),
         CENTAUR(6.1900001f, 16.940001f, 5.5500002f, 16.940001f, 6.3299999f, 18.379999f, 6.5f),
-        MINOTAUR(6.6300001f, 15.95f, 4.2199998f, 15.95f, 6.3299999f, 18.379999f, 6.5f);
-
+        MINOTAUR(6.6300001f, 15.95f, 4.2199998f, 15.95f, 6.3299999f, 18.379999f, 6.5f),
+        IREKEI(6.499500105f, 14.6685f, 4.2199998f, 14.6685f, 6.3299999f, 18.379999f, 6.5f);
         private float walkStandard;
         private float walkCombat;
         private float runStandard;
@@ -469,11 +469,14 @@ public class Enum {
 
                 // 14001 does not have a banestone to bind at
 
-                if (ruinZone.getLoadNum() == 14001)
+                if (ruinZone.getLoadNum() == 14001) {
                     spawnLocation = Vector3fImmutable.getRandomPointOnCircle(ruinZone.getLoc(), 30);
-                else
-                    spawnLocation = Vector3fImmutable.getRandomPointOnCircle(ruinZone.getLoc()
-                            .add(new Vector3fImmutable(-196.016f, 2.812f, 203.621f)), 30);
+                }else {
+                    //spawnLocation = Vector3fImmutable.getRandomPointOnCircle(ruinZone.getLoc()
+                    //.add(new Vector3fImmutable(-196.016f, 2.812f, 203.621f)), 30);
+                        spawnLocation = Vector3fImmutable.getRandomPointOnCircle(BuildingManager.getBuilding(27977).loc,30f);
+
+                }
             }
 
 
@@ -776,6 +779,7 @@ public class Enum {
         Combat,
         Spires,
         Snare,
+        Snared,
         Stun,
         Blind,
         Root,
@@ -878,6 +882,7 @@ public class Enum {
         Siege,
         Slash,
         Snare,
+        Snared,
         Sorcery,
         Spear,
         SpearMastery,
@@ -957,6 +962,17 @@ public class Enum {
         Wizardry;
 
         public static SourceType GetSourceType(String modName) {
+            switch(modName){
+                case "Slashing":
+                    modName = "Slash";
+                    break;
+                case "Crushing":
+                    modName = "Crush";
+                    break;
+                case "Piercing":
+                    modName = "Pierce";
+                    break;
+            }
             SourceType returnMod;
             if (modName.isEmpty())
                 return SourceType.None;
@@ -1016,6 +1032,7 @@ public class Enum {
         Silence,
         Slash,
         Snare,
+        Snared,
         Stance,
         Stun,
         Summon,
@@ -1140,6 +1157,7 @@ public class Enum {
         SkillDebuff,
         SlashResistanceDebuff,
         Snare,
+        Snared,
         StackableAttrCONBuff,
         StackableAttrDEXBuff,
         StackableAttrSTRBuff,
@@ -2306,9 +2324,9 @@ public class Enum {
 
     public enum CityBoundsType {
 
-        GRID(640),
-        ZONE(875),
-        PLACEMENT(876);
+        GRID(544),
+        ZONE(672),
+        PLACEMENT(673);
 
         public final float extents;
 

src/engine/InterestManagement/InterestManager.java

@@ -19,10 +19,7 @@ import engine.net.AbstractNetMsg;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
-import engine.net.client.msg.LoadCharacterMsg;
-import engine.net.client.msg.LoadStructureMsg;
-import engine.net.client.msg.MoveToPointMsg;
-import engine.net.client.msg.UnloadObjectsMsg;
+import engine.net.client.msg.*;
 import engine.objects.*;
 import engine.server.MBServerStatics;
 import org.pmw.tinylog.Logger;
@@ -521,10 +518,10 @@ public enum InterestManager implements Runnable {
 
         // Update loaded upbjects lists
 
+        player.isBoxed = PlayerCharacter.checkIfBoxed(player);
         player.setDirtyLoad(true);
         updateStaticList(player, origin);
         updateMobileList(player, origin);
-
     }
 
     public synchronized void HandleLoadForTeleport(PlayerCharacter playerCharacter) {

src/engine/db/handlers/dbBaneHandler.java

@@ -10,17 +10,13 @@
 package engine.db.handlers;
 
 import engine.gameManager.DbManager;
-import engine.objects.Bane;
-import engine.objects.Building;
-import engine.objects.City;
-import engine.objects.PlayerCharacter;
+import engine.gameManager.ZoneManager;
+import engine.math.Vector3fImmutable;
+import engine.objects.*;
 import org.joda.time.DateTime;
 import org.pmw.tinylog.Logger;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
+import java.sql.*;
 
 public class dbBaneHandler extends dbHandlerBase {
 
@@ -89,6 +85,139 @@ public class dbBaneHandler extends dbHandlerBase {
         return true;
     }
 
+    public boolean SET_BANE_TIME_NEW(int hour, int cityUUID) {
+        hour += 12; // Adjust hour
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement getStatement = connection.prepareStatement("SELECT `placementDate`, `liveDate` FROM `dyn_banes` WHERE `cityUUID`=?");
+             PreparedStatement updateStatement = connection.prepareStatement("UPDATE `dyn_banes` SET `liveDate`=?, `time_set`=? WHERE `cityUUID`=?")) {
+
+            // Retrieve placementDate and liveDate
+            getStatement.setInt(1, cityUUID);
+            try (ResultSet rs = getStatement.executeQuery()) {
+                if (rs.next()) {
+                    DateTime placementDate = new DateTime(rs.getTimestamp("placementDate").getTime());
+                    Timestamp liveDateTimestamp = rs.getTimestamp("liveDate");
+
+                    // Explicitly check if liveDate is null
+                    DateTime toSet;
+                    if (liveDateTimestamp == null) {
+                        // If liveDate is null, default to placementDate
+                        toSet = placementDate;
+                    } else {
+                        // If liveDate is not null, use it
+                        DateTime liveDate = new DateTime(liveDateTimestamp.getTime());
+                        toSet = liveDate;
+                    }
+
+                    // Adjust the time
+                    toSet = toSet.withHourOfDay(hour).withMinuteOfHour(0).withSecondOfMinute(0).withMillisOfSecond(0);
+
+                    // Update liveDate and time_set flag
+                    updateStatement.setTimestamp(1, new java.sql.Timestamp(toSet.getMillis()));
+                    updateStatement.setInt(2, 1); // time_set flag
+                    updateStatement.setInt(3, cityUUID);
+
+                    updateStatement.execute();
+                    return true;
+                }
+            }
+
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
+        return false;
+    }
+
+    public boolean SET_BANE_DAY_NEW(int dayOffset, int cityUUID) {
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement getStatement = connection.prepareStatement("SELECT `placementDate`, `liveDate` FROM `dyn_banes` WHERE `cityUUID`=?");
+             PreparedStatement updateStatement = connection.prepareStatement("UPDATE `dyn_banes` SET `liveDate`=?, `day_set`=? WHERE `cityUUID`=?")) {
+
+            // Retrieve placementDate and liveDate
+            getStatement.setInt(1, cityUUID);
+            try (ResultSet rs = getStatement.executeQuery()) {
+                if (rs.next()) {
+                    DateTime placementDate = new DateTime(rs.getTimestamp("placementDate").getTime());
+                    Timestamp liveDateTimestamp = rs.getTimestamp("liveDate");
+
+                    // Explicitly check if liveDate is null
+                    DateTime liveDate;
+                    if (liveDateTimestamp == null) {
+                        // If liveDate is null, default to placementDate
+                        liveDate = placementDate;
+                    } else {
+                        // If liveDate is not null, use it
+                        liveDate = new DateTime(liveDateTimestamp.getTime());
+                    }
+
+                    // Calculate the new liveDate while preserving the time component
+                    DateTime updatedDate = placementDate.plusDays(dayOffset)
+                            .withHourOfDay(liveDate.getHourOfDay())
+                            .withMinuteOfHour(liveDate.getMinuteOfHour())
+                            .withSecondOfMinute(liveDate.getSecondOfMinute())
+                            .withMillisOfSecond(liveDate.getMillisOfSecond());
+
+                    // Update liveDate and day_set flag
+                    updateStatement.setTimestamp(1, new java.sql.Timestamp(updatedDate.getMillis()));
+                    updateStatement.setInt(2, 1); // day_set flag
+                    updateStatement.setInt(3, cityUUID);
+
+                    updateStatement.execute();
+                    return true;
+                }
+            }
+
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
+        return false;
+    }
+
+
+
+
+    public boolean SET_BANE_CAP_NEW(int count, int cityUUID) {
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `dyn_banes` SET `cap_size`=? WHERE `cityUUID`=?")) {
+
+            preparedStatement.setInt(1, count);
+            preparedStatement.setLong(2, cityUUID);
+
+            preparedStatement.execute();
+
+        } catch (SQLException e) {
+            Logger.error(e);
+            return false;
+        }
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `dyn_banes` SET `cap_set`=? WHERE `cityUUID`=?")) {
+
+            preparedStatement.setInt(1, 1);
+            preparedStatement.setLong(2, cityUUID);
+
+            preparedStatement.execute();
+
+        } catch (SQLException e) {
+            Logger.error(e);
+            return false;
+        }
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `dyn_banes` SET `cap_size`=? WHERE `cityUUID`=?")) {
+
+            preparedStatement.setInt(1, count);
+            preparedStatement.setLong(2, cityUUID);
+
+            preparedStatement.execute();
+
+        } catch (SQLException e) {
+            Logger.error(e);
+            return false;
+        }
+        return true;
+    }
+
     public boolean REMOVE_BANE(Bane bane) {
 
         if (bane == null)
@@ -107,4 +236,25 @@ public class dbBaneHandler extends dbHandlerBase {
 
         return true;
     }
+
+    public DateTime getLiveDate(int cityUUID) {
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement statement = connection.prepareStatement("SELECT `liveDate` FROM `dyn_banes` WHERE `cityUUID`=?")) {
+
+            statement.setInt(1, cityUUID);
+
+            try (ResultSet rs = statement.executeQuery()) {
+                if (rs.next()) {
+                    Timestamp liveDateTimestamp = rs.getTimestamp("liveDate");
+                    if (liveDateTimestamp != null) {
+                        return new DateTime(liveDateTimestamp.getTime());
+                    }
+                }
+            }
+
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
+        return null; // Return null if liveDate is not found or an error occurs
+    }
 }

src/engine/db/handlers/dbCityHandler.java

@@ -11,10 +11,7 @@ package engine.db.handlers;
 
 import engine.Enum;
 import engine.gameManager.DbManager;
-import engine.objects.AbstractGameObject;
-import engine.objects.Building;
-import engine.objects.City;
-import engine.objects.Zone;
+import engine.objects.*;
 import org.pmw.tinylog.Logger;
 
 import java.sql.*;
@@ -95,7 +92,16 @@ public class dbCityHandler extends dbHandlerBase {
 
         return objectList;
     }
+    public Integer GET_CAPITAL_CITY_COUNT() {
 
+        int cityCount = 0;
+        for(Realm realm : Realm._realms.values()){
+            if(realm.isRuled())
+                cityCount ++;
+        }
+
+        return cityCount;
+    }
     public ArrayList<City> GET_CITIES_BY_ZONE(final int objectUUID) {
 
         ArrayList<City> cityList = new ArrayList<>();

src/engine/db/handlers/dbContractHandler.java

@@ -98,32 +98,54 @@ public class dbContractHandler extends dbHandlerBase {
 
     public void LOAD_SELL_LIST_FOR_CONTRACT(final Contract contract) {
 
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_npc_contract_selltype` WHERE `contractID` = ?;")) {
+        if(!contract.getName().contains("Sage")) {
+            try (Connection connection = DbManager.getConnection();
+                 PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_npc_contract_selltype` WHERE `contractID` = ?;")) {
 
-            preparedStatement.setInt(1, contract.getObjectUUID());
+                preparedStatement.setInt(1, contract.getObjectUUID());
 
-            ResultSet rs = preparedStatement.executeQuery();
+                ResultSet rs = preparedStatement.executeQuery();
 
-            while (rs.next()) {
+                while (rs.next()) {
 
-                int type = rs.getInt("type");
-                int value = rs.getInt("value");
+                    int type = rs.getInt("type");
+                    int value = rs.getInt("value");
 
-                switch (type) {
-                    case 1:
-                        contract.getBuyItemType().add(value);
-                        break;
-                    case 2:
+                    switch (type) {
+                        case 1:
+                            contract.getBuyItemType().add(value);
+                            break;
+                        case 2:
+                            contract.getBuySkillToken().add(value);
+                            break;
+                        case 3:
+                            contract.getBuyUnknownToken().add(value);
+                            break;
+                    }
+                }
+            } catch (SQLException e) {
+                Logger.error(e);
+            }
+        }else{
+            try (Connection connection = DbManager.getConnection();
+                 PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_npc_contract_selltype`;")) {
+
+                ResultSet rs = preparedStatement.executeQuery();
+
+                while (rs.next()) {
+                    int value = rs.getInt("value");
+                    if(!contract.getBuySkillToken().contains(value))
                         contract.getBuySkillToken().add(value);
-                        break;
-                    case 3:
+
+                    if(!contract.getBuyItemType().contains(value))
+                        contract.getBuyItemType().add(value);
+
+                    if(!contract.getBuyUnknownToken().contains(value))
                         contract.getBuyUnknownToken().add(value);
-                        break;
                 }
+            } catch (SQLException e) {
+                Logger.error(e);
             }
-        } catch (SQLException e) {
-            Logger.error(e);
         }
     }
 

src/engine/db/handlers/dbHandlerBase.java

@@ -32,7 +32,6 @@ public abstract class dbHandlerBase {
         try {
             if (rs.next()) {
                 abstractGameObject = localClass.getConstructor(ResultSet.class).newInstance(rs);
-
                 DbManager.addToCache(abstractGameObject);
             }
         } catch (Exception e) {
@@ -57,12 +56,28 @@ public abstract class dbHandlerBase {
             while (rs.next()) {
 
                 int id = rs.getInt(1);
+                try {
+                    if (rs.getInt("capSize") == 0) {
+                        continue;
+                    }
+                }catch(Exception e){
+                    //not a mine
+                }
 
                 if (DbManager.inCache(localObjectType, id)) {
                     objectList.add((T) DbManager.getFromCache(localObjectType, id));
                 } else {
+                    try{
+                        if(rs.getInt("mineLiveHour") == 1)
+                            continue;
+                    }catch(Exception e){
+                        //not a mine
+                    }
                     AbstractGameObject toAdd = localClass.getConstructor(ResultSet.class).newInstance(rs);
                     DbManager.addToCache(toAdd);
+                    if(toAdd.getObjectType().equals(GameObjectType.Zone) && rs.getInt("canLoad") == 0){
+                        continue;
+                    }
                     objectList.add((T) toAdd);
 
                     if (toAdd != null && toAdd instanceof AbstractWorldObject)

src/engine/db/handlers/dbItemHandler.java

@@ -134,9 +134,13 @@ public class dbItemHandler extends dbHandlerBase {
 
             ResultSet rs = preparedStatement.executeQuery();
 
-            if (rs.next())
-                worked = rs.getBoolean("result");
-
+            if (rs.next()) {
+                try {
+                    worked = rs.getBoolean("result");
+                }catch(Exception e){
+                    worked = false;
+                }
+            }
         } catch (SQLException e) {
             Logger.error(e);
         }
@@ -496,4 +500,18 @@ public class dbItemHandler extends dbHandlerBase {
             return false;
         }
     }
+
+    public boolean UPDATE_NUM_ITEMS(final Item item, int newValue) {
+        if (item.getItemBase().getType().equals(ItemType.GOLD))
+            return false;
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_item` SET `item_numberOfItems`=? WHERE `UID`=?")) {
+            preparedStatement.setInt(1, newValue);
+            preparedStatement.setLong(2, item.getObjectUUID());
+            return (preparedStatement.executeUpdate() > 0);
+        } catch (SQLException e) {
+            Logger.error(e);
+            return false;
+        }
+    }
 }

src/engine/db/handlers/dbNPCHandler.java

@@ -131,6 +131,32 @@ public class dbNPCHandler extends dbHandlerBase {
         return npc;
     }
 
+    public int BANE_COMMANDER_EXISTS(final int objectUUID) {
+
+        int uid = 0;
+
+        String query = "SELECT `UID` FROM `obj_npc` WHERE `npc_buildingID` = ? LIMIT 1;";
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement(query)) {
+
+            preparedStatement.setInt(1, objectUUID);
+
+            try (ResultSet rs = preparedStatement.executeQuery()) {
+                if (rs.next()) {
+                    // Retrieve the UID column value
+                    uid = rs.getInt("UID");
+                }
+            }
+
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
+
+        return uid;
+    }
+
+
     public int MOVE_NPC(long npcID, long parentID, float locX, float locY, float locZ) {
 
         int rowCount;
@@ -176,6 +202,18 @@ public class dbNPCHandler extends dbHandlerBase {
         return result;
     }
 
+    public static void updateSpecialPricing(final NPC npc){
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE obj_npc SET specialPrice=? WHERE UID = ?")) {
+            preparedStatement.setInt(1, npc.getSpecialPrice());
+            preparedStatement.setInt(2, npc.getDBID());
+
+            preparedStatement.executeUpdate();
+
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
+    }
     public void updateDatabase(final NPC npc) {
 
         try (Connection connection = DbManager.getConnection();

src/engine/devcmd/cmds/AddNPCCmd.java

@@ -13,6 +13,7 @@ import engine.Enum.GameObjectType;
 import engine.InterestManagement.WorldGrid;
 import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.*;
+import engine.math.Vector3fImmutable;
 import engine.objects.*;
 import org.pmw.tinylog.Logger;
 
@@ -31,7 +32,6 @@ public class AddNPCCmd extends AbstractDevCmd {
         int contractID;
         String name = "";
         int level = 0;
-
         if (words.length < 2) {
             this.sendUsage(pc);
             return;
@@ -39,59 +39,54 @@ public class AddNPCCmd extends AbstractDevCmd {
         try {
             contractID = Integer.parseInt(words[0]);
             level = Integer.parseInt(words[1]);
-
             for (int i = 2; i < words.length; i++) {
                 name += words[i];
                 if (i + 1 < words.length)
                     name += "";
             }
-
         } catch (NumberFormatException e) {
             throwbackError(pc,
                     "Failed to parse supplied contractID or level to an Integer.");
             return; // NaN
         }
-
         Contract contract = DbManager.ContractQueries.GET_CONTRACT(contractID);
-
         if (contract == null || level < 1 || level > 75) {
             throwbackError(pc,
                     "Invalid addNPC Command. Need contract ID, and level");
             return; // NaN
         }
-
         // Pick a random name
         if (name.isEmpty())
             name = NPCManager.getPirateName(contract.getMobbaseID());
-
         Zone zone = ZoneManager.findSmallestZone(pc.getLoc());
-
         if (zone == null) {
             throwbackError(pc, "Failed to find zone to place npc in.");
             return;
         }
-
+        Building building = null;
         if (target != null)
             if (target.getObjectType() == GameObjectType.Building) {
-                Building parentBuilding = (Building) target;
-                BuildingManager.addHirelingForWorld(parentBuilding, pc, parentBuilding.getLoc(), parentBuilding.getParentZone(), contract, level);
-                return;
+                building = (Building)target;
             }
-
-        NPC npc = NPC.createNPC(name, contractID,
-                pc.getLoc(), null, zone, (short) level, null);
-
-        if (npc != null) {
-            WorldGrid.addObject(npc, pc);
-            ChatManager.chatSayInfo(pc,
-                    "NPC with ID " + npc.getDBID() + " added");
-            this.setResult(String.valueOf(npc.getDBID()));
-        } else {
-            throwbackError(pc, "Failed to create npc of contract type "
-                    + contractID);
-            Logger.error(
-                    "Failed to create npc of contract type " + contractID);
+        NPC created;
+        Guild guild = null;
+        Vector3fImmutable loc;
+        if(building != null){
+            guild = building.getGuild();
+            loc = building.loc;
+        } else{
+            loc = pc.loc;
+        }
+        created = NPC.createNPC(name, contractID, loc, guild, zone, (short)level, building);
+        created.bindLoc = loc;
+        if(building != null) {
+            created.buildingUUID = building.getObjectUUID();
+            created.building = building;
+            NPCManager.slotCharacterInBuilding(created);
         }
+        created.setLoc(created.bindLoc);
+        created.updateDatabase();
+        throwbackInfo(pc, "Created NPC with UUID: " + created.getObjectUUID());
     }
 
     @Override

src/engine/devcmd/cmds/GimmeCmd.java

@@ -0,0 +1,63 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2022
+//                www.magicbane.com
+
+
+package engine.devcmd.cmds;
+
+import engine.Enum.ItemContainerType;
+import engine.Enum.ItemType;
+import engine.Enum.OwnerType;
+import engine.devcmd.AbstractDevCmd;
+import engine.gameManager.ChatManager;
+import engine.gameManager.DbManager;
+import engine.objects.*;
+import engine.powers.EffectsBase;
+
+import java.util.ArrayList;
+
+/**
+ * @author Eighty
+ */
+public class GimmeCmd extends AbstractDevCmd {
+
+    public GimmeCmd() {
+        super("gimme");
+    }
+
+    @Override
+    protected void _doCmd(PlayerCharacter pc, String[] words,
+                          AbstractGameObject target) {
+        int amt = 0;
+        int currentGold = pc.getCharItemManager().getGoldInventory().getNumOfItems();
+        amt = 10000000 - currentGold;
+        if (!pc.getCharItemManager().addGoldToInventory(amt, true)) {
+            throwbackError(pc, "Failed to add gold to inventory");
+            return;
+        }
+
+        ChatManager.chatSayInfo(pc, amt + " gold added to inventory");
+
+        if(pc.level < 75) {
+            pc.setLevel((short) 75);
+            ChatManager.chatSayInfo(pc, "Level set to 75");
+        }
+        pc.getCharItemManager().updateInventory();
+
+    }
+
+    @Override
+    protected String _getHelpString() {
+        return "Round up current gold in inventory to 10,000,000";
+    }
+
+    @Override
+    protected String _getUsageString() {
+        return "'./gimme";
+    }
+
+}

src/engine/devcmd/cmds/HotzoneCmd.java

@@ -1,77 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2022
-//                www.magicbane.com
-
-
-package engine.devcmd.cmds;
-
-import engine.devcmd.AbstractDevCmd;
-import engine.gameManager.ZoneManager;
-import engine.objects.AbstractGameObject;
-import engine.objects.PlayerCharacter;
-
-/**
- * ./hotzone                      <- display the current hotzone & time remaining
- * ./hotzone random               <- change hotzone to random new zone
- */
-
-public class HotzoneCmd extends AbstractDevCmd {
-
-    public HotzoneCmd() {
-        super("hotzone");
-    }
-
-    @Override
-    protected void _doCmd(PlayerCharacter playerCharacter, String[] words,
-                          AbstractGameObject target) {
-
-        StringBuilder data = new StringBuilder();
-        String outString;
-
-        for (String s : words) {
-            data.append(s);
-            data.append(' ');
-        }
-
-        String input = data.toString().trim();
-
-        if (input.length() == 0) {
-            outString = "Current hotZone: " + ZoneManager.hotZone.getName() + "\r\n";
-            outString += "Available hotZones: " + ZoneManager.availableHotZones();
-            throwbackInfo(playerCharacter, outString);
-            return;
-        }
-
-        if (input.equalsIgnoreCase("random")) {
-            ZoneManager.generateAndSetRandomHotzone();
-            outString = "New hotZone: " + ZoneManager.hotZone.getName() + "\r\n";
-            outString += "Available hotZones: " + ZoneManager.availableHotZones();
-            throwbackInfo(playerCharacter, outString);
-            return;
-        }
-
-        if (input.equalsIgnoreCase("reset")) {
-            ZoneManager.resetHotZones();
-            throwbackInfo(playerCharacter, "Available hotZones: " + ZoneManager.availableHotZones());
-            return;
-        }
-
-        return;
-    }
-
-    @Override
-    protected String _getHelpString() {
-        return "Use no arguments to see the current hotzone or \"random\" to change it randomly.";
-    }
-
-    @Override
-    protected String _getUsageString() {
-        return "'./hotzone [random]";
-    }
-
-
-}

src/engine/devcmd/cmds/InfoCmd.java

@@ -18,6 +18,7 @@ import engine.gameManager.BuildingManager;
 import engine.gameManager.SessionManager;
 import engine.math.Vector3fImmutable;
 import engine.objects.*;
+import engine.server.MBServerStatics;
 import engine.util.StringUtils;
 
 import java.text.DecimalFormat;
@@ -337,7 +338,8 @@ public class InfoCmd extends AbstractDevCmd {
                 output += "Swimming : " + targetPC.isSwimming();
                 output += newline;
                 output += "isMoving : " + targetPC.isMoving();
-
+                output += newline;
+                output += "Zerg Multiplier : " + targetPC.ZergMultiplier;
                 break;
 
             case NPC:
@@ -529,6 +531,13 @@ public class InfoCmd extends AbstractDevCmd {
                 }
 
                 break;
+
+            case Corpse:
+                Corpse corpse = (Corpse)target;
+                Long timeLeft = MBServerStatics.CORPSE_CLEANUP_TIMER_MS - (System.currentTimeMillis() - corpse.spawnedTime);
+                output += "Despawn in: " + timeLeft;
+                output += newline;
+                break;
         }
 
         throwbackInfo(pc, output);

src/engine/devcmd/cmds/MineActiveCmd.java

@@ -16,6 +16,7 @@ import engine.objects.AbstractGameObject;
 import engine.objects.Building;
 import engine.objects.Mine;
 import engine.objects.PlayerCharacter;
+import engine.workthreads.HalfHourlyJobThread;
 import engine.workthreads.HourlyJobThread;
 
 /**
@@ -41,10 +42,10 @@ public class MineActiveCmd extends AbstractDevCmd {
         String trigger = args[0];
         switch (trigger) {
             case "true":
-                HourlyJobThread.mineWindowOpen(mine);
+                HalfHourlyJobThread.mineWindowOpen(mine);
                 break;
             case "false":
-                HourlyJobThread.mineWindowClose(mine);
+                HalfHourlyJobThread.mineWindowClose(mine);
                 break;
             default:
                 this.sendUsage(pcSender);

src/engine/devcmd/cmds/PrintStatsCmd.java

@@ -9,6 +9,7 @@
 
 package engine.devcmd.cmds;
 
+import engine.Enum;
 import engine.devcmd.AbstractDevCmd;
 import engine.objects.*;
 
@@ -72,6 +73,10 @@ public class PrintStatsCmd extends AbstractDevCmd {
         out += "Main Hand: atr: " + tar.getAtrHandOne() + ", damage: " + tar.getMinDamageHandOne() + " to " + tar.getMaxDamageHandOne() + ", speed: " + tar.getSpeedHandOne() + newline;
         out += "Off Hand:  atr: " + tar.getAtrHandTwo() + ", damage: " + tar.getMinDamageHandTwo() + " to " + tar.getMaxDamageHandTwo() + ", speed: " + tar.getSpeedHandTwo() + newline;
         out += "isAlive: " + tar.isAlive() + ", Combat: " + tar.isCombat() + newline;
+        out += "Move Speed: " + tar.getSpeed() + newline;
+        out += "Health Regen: " + tar.getRegenModifier(Enum.ModType.HealthRecoverRate) + newline;
+        out += "Mana Regen: " + tar.getRegenModifier(Enum.ModType.ManaRecoverRate) + newline;
+        out += "Stamina Regen: " + tar.getRegenModifier(Enum.ModType.StaminaRecoverRate) + newline;
         throwbackInfo(pc, out);
     }
 

src/engine/devcmd/cmds/SetLevelCmd.java

@@ -46,7 +46,7 @@ public class SetLevelCmd extends AbstractDevCmd {
             this.sendUsage(pc);
             return;
         }
-        if (level < 1 || level > 75) {
+        if (level < 1 || level > 80) {
             this.sendHelp(pc);
             return;
         }
@@ -62,7 +62,7 @@ public class SetLevelCmd extends AbstractDevCmd {
 
     @Override
     protected String _getHelpString() {
-        return "Sets your character's level to 'amount'.  'amount' must be between 1-75";
+        return "Sets your character's level to 'amount'.  'amount' must be between 1-80";
     }
 
     @Override

src/engine/devcmd/cmds/SimulateBootyCmd.java

@@ -10,6 +10,8 @@ import java.util.ArrayList;
 import java.util.concurrent.ThreadLocalRandom;
 
 public class SimulateBootyCmd extends AbstractDevCmd {
+
+    public int simCount = 250;
     public SimulateBootyCmd() {
         super("bootysim");
     }
@@ -25,7 +27,15 @@ public class SimulateBootyCmd extends AbstractDevCmd {
 
         String output;
 
-        output = "Booty Simulation:" + newline;
+        try
+        {
+            simCount = Integer.parseInt(words[0]);
+        }catch(Exception e)
+        {
+
+        }
+
+        output = "Booty Simulation: Rolls:" + simCount + newline;
 
         Mob mob = (Mob) target;
         output += "Name: " + mob.getName() + newline;
@@ -44,6 +54,7 @@ public class SimulateBootyCmd extends AbstractDevCmd {
         ArrayList<Item> Resources = new ArrayList<Item>();
         ArrayList<Item> Runes = new ArrayList<Item>();
         ArrayList<Item> Contracts = new ArrayList<Item>();
+        ArrayList<Item> GuardContracts = new ArrayList<Item>();
         ArrayList<Item> Offerings = new ArrayList<Item>();
         ArrayList<Item> OtherDrops = new ArrayList<Item>();
         ArrayList<Item> EquipmentDrops = new ArrayList<Item>();
@@ -51,14 +62,17 @@ public class SimulateBootyCmd extends AbstractDevCmd {
         int failures = 0;
         int goldAmount = 0;
 
-        for (int i = 0; i < 100; ++i) {
+        for (int i = 0; i < simCount; ++i) {
 
             try {
                 mob.loadInventory();
                 for (Item lootItem : mob.getCharItemManager().getInventory()) {
                     switch (lootItem.getItemBase().getType()) {
                         case CONTRACT: //CONTRACT
-                            Contracts.add(lootItem);
+                            if(lootItem.getName().contains("Captain"))
+                                GuardContracts.add(lootItem);
+                            else
+                                Contracts.add(lootItem);
                             break;
                         case OFFERING: //OFFERING
                             Offerings.add(lootItem);
@@ -130,9 +144,17 @@ public class SimulateBootyCmd extends AbstractDevCmd {
             }
         }
 
+        int baseBound = 100000;
+        int levelPenalty = (int) (Math.max(0, Math.abs(50 - mob.level)) * 0.01 * 100000);
+        int totalRange = baseBound + levelPenalty;
+        if(mob.level >= 50){
+            totalRange = baseBound;
+        }
+        output += "TOTAL ROLL POTENTIAL: " + totalRange + newline;
         output += "GLASS DROPS: " + GlassItems.size() + newline;
         output += "RUNE DROPS: " + Runes.size() + newline;
         output += "CONTRACTS DROPS: " + Contracts.size() + newline;
+        output += "GUARD CONTRACTS DROPS: " + GuardContracts.size() + newline;
         output += "RESOURCE DROPS: " + Resources.size() + newline;
         output += "OFFERINGS DROPPED: " + Offerings.size() + newline;
         output += "ENCHANTED ITEMS DROPPED: " + OtherDrops.size() + newline;

src/engine/documentation/Handler Specific Documentation/dbAccountHandler_Documentation.md

@@ -1,87 +0,0 @@
-# Account Handler Documentation
-
-## Overview
-This document describes the database relationships and interactions for the `dbAccountHandler` class. The account handler manages user authentication and account-related data in the Magicbane emulator system.
-
-## Handler Class
-**File:** `src/engine/db/handlers/dbAccountHandler.java`
-**Class:** `dbAccountHandler`
-**Extends:** `dbHandlerBase`
-
-## Database Tables
-
-### Main Account Table
-- **Table Name:** `obj_account`
-- **Description:** Core account information including login credentials, status, and account details
-- **Columns:** 
-  - UID (Primary Key)
-  - username
-  - password
-  - email
-  - accountStatus
-  - lastLogin
-  - creationDate
-  - isBanned
-  - banReason
-  - isDeleted
-  - deletedDate
-
-### Related Tables
-
-| Table Name | Description | Relationship |
-|------------|-------------|--------------|
-| `obj_account_wipe` | Account wipe history records | AccountID → obj_account.UID |
-| `dyn_login_history` | Login attempt and session history | AccountID → obj_account.UID |
-
-## Key Queries
-
-### Get Account by ID
-```sql
-SELECT * FROM `obj_account` WHERE `UID`=?
-```
-**File:** `dbAccountHandler.java`, Line ~60
-
-### Get Account by Username
-```sql
-SELECT * FROM `obj_account` WHERE `username`=?
-```
-**File:** `dbAccountHandler.java`, Line ~85
-
-### Create New Account
-```sql
-INSERT INTO `obj_account` (`username`, `password`, `email`, `accountStatus`, `creationDate`) VALUES (?, ?, ?, ?, ?)
-```
-**File:** `dbAccountHandler.java`, Line ~105
-
-### Update Account Status
-```sql
-UPDATE `obj_account` SET `accountStatus`=?, `lastLogin`=? WHERE `UID`=?
-```
-**File:** `dbAccountHandler.java`, Line ~132
-
-### Check Username Availability
-```sql
-SELECT `username` FROM `obj_account` WHERE `username`=?
-```
-**File:** `dbAccountHandler.java`, Line ~158
-
-## Relationships
-
-1. **Account to Character:** One-to-many (via `obj_character.accountID` field)
-2. **Account to Account Wipe History:** One-to-many (via `obj_account_wipe.AccountID`)
-3. **Account to Login History:** One-to-many (via `dyn_login_history.AccountID`)
-
-## Java Field to Database Column Mappings
-
-| Java Field | Database Column | Notes |
-|------------|-----------------|-------|
-| `username` | `obj_account.username` | Unique account username |
-| `password` | `obj_account.password` | Encrypted password |
-| `email` | `obj_account.email` | Account email address |
-| `accountStatus` | `obj_account.accountStatus` | Current account status |
-| `lastLogin` | `obj_account.lastLogin` | Timestamp of last login |
-| `creationDate` | `obj_account.creationDate` | Account creation date |
-| `isBanned` | `obj_account.isBanned` | Boolean flag for banned status |
-| `banReason` | `obj_account.banReason` | Reason for ban |
-| `isDeleted` | `obj_account.isDeleted` | Boolean flag for deleted status |
-| `deletedDate` | `obj_account.deletedDate` | Timestamp of deletion |

src/engine/documentation/Handler Specific Documentation/dbBaneHandler_Documentation.md

@@ -1,63 +0,0 @@
-# dbBaneHandler Documentation
-
-## Overview
-This document describes the database relationships and interactions for the `dbBaneHandler` class. The bane handler manages special objects in cities that have specific properties and behaviors, including their ownership, location, and time-based effects.
-
-## Handler Class
-**File:** `src/engine/db/handlers/dbBaneHandler.java`
-**Class:** `dbBaneHandler`
-**Extends:** `dbHandlerBase`
-
-## Database Tables
-
-### Main Bane Table
-- **Table Name:** `dyn_banes`
-- **Description:** Stores information about bane objects placed in cities, including their owner, location, and time-based properties
-- **Columns:** 
-  - cityUUID (Primary Key)
-  - ownerUUID
-  - stoneUUID
-  - placementDate
-  - liveDate
-
-## Key Queries
-
-### CREATE_BANE
-```sql
-INSERT INTO `dyn_banes` (`cityUUID`, `ownerUUID`, `stoneUUID`, `placementDate`) VALUES(?,?,?,?)
-```
-**File:** `dbBaneHandler.java`, Line ~17
-
-### LOAD_BANE
-```sql
-SELECT * FROM `dyn_banes` WHERE `dyn_banes`.`cityUUID` = ?
-```
-**File:** `dbBaneHandler.java`, Line ~30
-
-### SET_BANE_TIME
-```sql
-UPDATE `dyn_banes` SET `liveDate`=? WHERE `cityUUID`=?
-```
-**File:** `dbBaneHandler.java`, Line ~45
-
-### REMOVE_BANE
-```sql
-DELETE FROM `dyn_banes` WHERE `cityUUID` = ?
-```
-**File:** `dbBaneHandler.java`, Line ~57
-
-## Relationships
-
-1. **Bane to City:** One-to-one relationship via cityUUID (primary key) referencing obj_city.UID
-2. **Bane to Owner:** Many-to-one relationship via ownerUUID referencing obj_character.UID
-3. **Bane to Stone:** Many-to-one relationship via stoneUUID referencing obj_building.UID
-
-## Java Field to Database Column Mappings
-
-| Java Field | Database Column | Notes |
-|------------|-----------------|-------|
-| `cityUUID` | `dyn_banes.cityUUID` | Unique identifier for the city where bane is placed |
-| `ownerUUID` | `dyn_banes.ownerUUID` | Character UID of the owner of this bane |
-| `stoneUUID` | `dyn_banes.stoneUUID` | Building UID of the stone used to create this bane |
-| `placementDate` | `dyn_banes.placementDate` | Timestamp when bane was placed |
-| `liveDate` | `dyn_banes.liveDate` | Timestamp for when bane becomes active |

src/engine/documentation/Handler Specific Documentation/dbBaseClassHandler_Documentation.md

@@ -1,73 +0,0 @@
-# dbBaseClassHandler Documentation
-
-## Overview
-The `dbBaseClassHandler` is responsible for managing base class data in the Magicbane database. Base classes represent fundamental character classifications that define core attributes and capabilities. This handler manages retrieval of base class information, including fetching specific base classes by ID, retrieving base classes associated with a particular race, and getting all available base classes.
-
-## Database Table Structure
-
-### Table: `static_rune_baseclass`
-
-| Column Name | Data Type | Nullable | Key | Description |
-|-------------|-----------|----------|-----|-------------|
-| ID | int unsigned | NO | PRIMARY | Unique identifier for the base class |
-| name | varchar(45) | NO |  | Name of the base class |
-| description | varchar(200) | NO |  | Description of the base class |
-| strMod | tinyint | NO |  | Strength modifier for this base class |
-| dexMod | tinyint | NO |  | Dexterity modifier for this base class |
-| conMod | tinyint | NO |  | Constitution modifier for this base class |
-| intMod | tinyint | NO |  | Intelligence modifier for this base class |
-| wisMod | tinyint | NO |  | Wisdom modifier for this base class |
-| chaMod | tinyint | NO |  | Charisma modifier for this base class |
-| healthMod | tinyint | NO |  | Health modifier for this base class |
-| manaMod | tinyint | NO |  | Mana modifier for this base class |
-| staminaMod | tinyint | NO |  | Stamina modifier for this base class |
-
-### Table: `static_rune_racebaseclass`
-
-| Column Name | Data Type | Nullable | Key | Description |
-|-------------|-----------|----------|-----|-------------|
-| ID | int unsigned | NO | PRIMARY | Unique identifier for the relationship |
-| RaceID | int unsigned | NO | FOREIGN KEY | Reference to race in `static_rune_race` |
-| BaseClassID | int unsigned | NO | FOREIGN KEY | Reference to base class in `static_rune_baseclass` |
-
-## Java Field to Database Column Mapping
-
-| Java Field | Database Column | Type | Description |
-|------------|-----------------|------|-------------|
-| baseClass.getId() | ID | int unsigned | Base class unique identifier |
-| baseClass.getName() | name | varchar(45) | Base class name |
-| baseClass.getDescription() | description | varchar(200) | Base class description |
-| baseClass.getStrMod() | strMod | tinyint | Strength modifier |
-| baseClass.getDexMod() | dexMod | tinyint | Dexterity modifier |
-| baseClass.getConMod() | conMod | tinyint | Constitution modifier |
-| baseClass.getIntMod() | intMod | tinyint | Intelligence modifier |
-| baseClass.getWisMod() | wisMod | tinyint | Wisdom modifier |
-| baseClass.getChaMod() | chaMod | tinyint | Charisma modifier |
-| baseClass.getHealthMod() | healthMod | tinyint | Health modifier |
-| baseClass.getManaMod() | manaMod | tinyint | Mana modifier |
-| baseClass.getStaminaMod() | staminaMod | tinyint | Stamina modifier |
-
-## Key Queries
-
-### GET_BASE_CLASS
-- **Query**: `SELECT * FROM \`static_rune_baseclass\` WHERE \`ID\`=?`
-- **Parameter**: id (base class ID)
-- **Note**: Fixed from original bug - was selecting from obj_account table instead of static_rune_baseclass
-
-### GET_BASECLASS_FOR_RACE
-- **Query**: `SELECT b.* FROM \`static_rune_baseclass\` b, \`static_rune_racebaseclass\` r WHERE b.\`ID\` = r.\`BaseClassID\` && r.\`RaceID\` = ?`
-- **Parameter**: id (race ID)
-
-### GET_ALL_BASE_CLASSES
-- **Query**: `SELECT * FROM \`static_rune_baseclass\`;`
-- **Note**: Returns all base classes from the static table
-
-## Relationships
-
-### Foreign Key Relationships
-- `static_rune_racebaseclass.BaseClassID` references `static_rune_baseclass.ID`
-- `static_rune_racebaseclass.RaceID` references `static_rune_race.ID`
-
-### Associated Objects
-- **BaseClass**: Core character classification data
-- **Race**: Associated races that can use specific base classes (via `static_rune_racebaseclass`)

src/engine/documentation/Handler Specific Documentation/dbBlueprintHandler_Documentation.md

@@ -1,119 +0,0 @@
-# dbBlueprintHandler Documentation
-
-## Overview
-The `dbBlueprintHandler` is responsible for managing building blueprint data and door number mappings in the Magicbane database. This handler loads blueprint information used for building construction and handles door mesh-to-number mappings.
-
-## Database Table Structure
-
-### Table: `static_building_blueprint`
-
-| Column Name | Data Type | Nullable | Key | Description |
-|-------------|-----------|----------|-----|-------------|
-| Rank0UUID | bigint unsigned | NO | PRIMARY | Unique identifier for the blueprint (rank 0) |
-| MeshName | varchar(100) | NO |  | Name of the mesh used for the building |
-| BuildingGroup | enum | NO |  | Group classification of the building type |
-| MaintGroup | varchar(45) | YES |  | Maintenance group associated with the building |
-| Rank1UUID | bigint unsigned | YES |  | UUID for rank 1 upgrade |
-| Rank2UUID | bigint unsigned | YES |  | UUID for rank 2 upgrade |
-| Rank3UUID | bigint unsigned | YES |  | UUID for rank 3 upgrade |
-| Rank4UUID | bigint unsigned | YES |  | UUID for rank 4 upgrade |
-| Rank5UUID | bigint unsigned | YES |  | UUID for rank 5 upgrade |
-| Rank6UUID | bigint unsigned | YES |  | UUID for rank 6 upgrade |
-| Rank7UUID | bigint unsigned | YES |  | UUID for rank 7 upgrade |
-| UpgradeCost | int | YES |  | Cost to upgrade the building |
-| UpgradeTime | int | YES |  | Time required to upgrade the building |
-| MaxHP | int | YES |  | Maximum hit points of the building |
-| MaxGold | int | YES |  | Maximum gold storage capacity |
-| MaxLevel | int | YES |  | Maximum level for this building |
-| MaxRank | int | YES |  | Maximum rank for this building |
-| MinLevel | int | YES |  | Minimum level required to build |
-| Scale | float | YES |  | Scale factor for the building mesh |
-| SizeX | float | YES |  | X dimension size |
-| SizeY | float | YES |  | Y dimension size |
-| SizeZ | float | YES |  | Z dimension size |
-| DoorCount | int | YES |  | Number of doors in this building |
-| MaxDoorCount | int | YES |  | Maximum number of doors allowed |
-| IsWall | tinyint(1) | YES |  | Flag indicating if building is a wall |
-| IsGate | tinyint(1) | YES |  | Flag indicating if building is a gate |
-| IsTower | tinyint(1) | YES |  | Flag indicating if building is a tower |
-| IsKeep | tinyint(1) | YES |  | Flag indicating if building is a keep |
-| IsFortress | tinyint(1) | YES |  | Flag indicating if building is a fortress |
-| IsCastle | tinyint(1) | YES |  | Flag indicating if building is a castle |
-| IsBarracks | tinyint(1) | YES |  | Flag indicating if building is barracks |
-| IsChurch | tinyint(1) | YES |  | Flag indicating if building is a church |
-| IsForge | tinyint(1) | YES |  | Flag indicating if building is a forge |
-| IsSpire | tinyint(1) | YES |  | Flag indicating if building is a spire |
-| IsShrine | tinyint(1) | YES |  | Flag indicating if building is a shrine |
-| IsRunegate | tinyint(1) | YES |  | Flag indicating if building is a runegate |
-| IsMine | tinyint(1) | YES |  | Flag indicating if building is a mine |
-| IsWarehouse | tinyint(1) | YES |  | Flag indicating if building is a warehouse |
-
-### Table: `static_building_doors`
-
-| Column Name | Data Type | Nullable | Key | Description |
-|-------------|-----------|----------|-----|-------------|
-| doorMeshUUID | int | NO | PRIMARY | Unique identifier for the door mesh |
-| doorNumber | int | NO |  | Door number associated with this mesh |
-
-## Java Field to Database Column Mapping
-
-| Java Field | Database Column | Type | Description |
-|------------|-----------------|------|-------------|
-| blueprint.getBlueprintUUID() | Rank0UUID | bigint unsigned | Blueprint unique identifier |
-| blueprint.getMeshName() | MeshName | varchar(100) | Name of the building mesh |
-| blueprint.getBuildingGroup() | BuildingGroup | enum | Group classification of the building |
-| blueprint.getMaintGroup() | MaintGroup | varchar(45) | Maintenance group for this building |
-| blueprint.getRank1UUID() | Rank1UUID | bigint unsigned | UUID for rank 1 upgrade |
-| blueprint.getRank2UUID() | Rank2UUID | bigint unsigned | UUID for rank 2 upgrade |
-| blueprint.getRank3UUID() | Rank3UUID | bigint unsigned | UUID for rank 3 upgrade |
-| blueprint.getRank4UUID() | Rank4UUID | bigint unsigned | UUID for rank 4 upgrade |
-| blueprint.getRank5UUID() | Rank5UUID | bigint unsigned | UUID for rank 5 upgrade |
-| blueprint.getRank6UUID() | Rank6UUID | bigint unsigned | UUID for rank 6 upgrade |
-| blueprint.getRank7UUID() | Rank7UUID | bigint unsigned | UUID for rank 7 upgrade |
-| blueprint.getUpgradeCost() | UpgradeCost | int | Cost to upgrade the building |
-| blueprint.getUpgradeTime() | UpgradeTime | int | Time required to upgrade |
-| blueprint.getMaxHP() | MaxHP | int | Maximum hit points |
-| blueprint.getMaxGold() | MaxGold | int | Maximum gold storage |
-| blueprint.getMaxLevel() | MaxLevel | int | Maximum level for this building |
-| blueprint.getMaxRank() | MaxRank | int | Maximum rank |
-| blueprint.getMinLevel() | MinLevel | int | Minimum level required |
-| blueprint.getScale() | Scale | float | Scale factor for mesh |
-| blueprint.getSizeX() | SizeX | float | X dimension size |
-| blueprint.getSizeY() | SizeY | float | Y dimension size |
-| blueprint.getSizeZ() | SizeZ | float | Z dimension size |
-| blueprint.getDoorCount() | DoorCount | int | Number of doors |
-| blueprint.getMaxDoorCount() | MaxDoorCount | int | Maximum number of doors |
-| blueprint.getIsWall() | IsWall | tinyint(1) | Wall flag |
-| blueprint.getIsGate() | IsGate | tinyint(1) | Gate flag |
-| blueprint.getIsTower() | IsTower | tinyint(1) | Tower flag |
-| blueprint.getIsKeep() | IsKeep | tinyint(1) | Keep flag |
-| blueprint.getIsFortress() | IsFortress | tinyint(1) | Fortress flag |
-| blueprint.getIsCastle() | IsCastle | tinyint(1) | Castle flag |
-| blueprint.getIsBarracks() | IsBarracks | tinyint(1) | Barracks flag |
-| blueprint.getIsChurch() | IsChurch | tinyint(1) | Church flag |
-| blueprint.getIsForge() | IsForge | tinyint(1) | Forge flag |
-| blueprint.getIsSpire() | IsSpire | tinyint(1) | Spire flag |
-| blueprint.getIsShrine() | IsShrine | tinyint(1) | Shrine flag |
-| blueprint.getIsRunegate() | IsRunegate | tinyint(1) | Runegate flag |
-| blueprint.getIsMine() | IsMine | tinyint(1) | Mine flag |
-| blueprint.getIsWarehouse() | IsWarehouse | tinyint(1) | Warehouse flag |
-
-## Key Queries
-
-### LOAD_ALL_DOOR_NUMBERS
-- **Query**: `SELECT * FROM static_building_doors ORDER BY doorMeshUUID ASC`
-- **Note**: Loads all door mesh-to-number mappings for building doors
-
-### LOAD_ALL_BLUEPRINTS
-- **Query**: `SELECT * FROM static_building_blueprint`
-- **Note**: Loads all blueprint definitions for buildings
-
-## Relationships
-
-### Foreign Key Relationships
-- None explicitly defined in the handler code (these are likely static lookup tables)
-
-### Associated Objects
-- **Blueprint**: Building construction data with mesh information and upgrade paths
-- **Door**: Door mesh mappings used for building construction
-

src/engine/documentation/Handler Specific Documentation/dbBoonHandler_Documentation.md

@@ -1,43 +0,0 @@
-# Boon Handler Documentation
-
-## Overview
-This document describes the database relationships and interactions for the `dbBoonHandler` class. The boon system in Magicbane is used to manage item bonuses and enhancements that are associated with specific item bases.
-
-## Handler Class
-**File:** `src/engine/db/handlers/dbBoonHandler.java`
-**Class:** `dbBoonHandler`
-**Extends:** `dbHandlerBase`
-
-## Database Tables
-
-### Main Boon Table
-- **Table Name:** `static_item_boons`
-- **Description:** Contains information about boons (bonuses/enhancements) that can be applied to item bases
-- **Columns:** 
-  - UID (Primary Key)
-  - itemBaseID (Foreign Key to obj_itembase)
-  - boonType
-  - boonValue
-  - boonLevel
-
-## Key Queries
-
-### Get Boon Amounts for Item Base
-```sql
-SELECT * FROM `static_item_boons` WHERE `itemBaseID` = ?
-```
-**File:** `dbBoonHandler.java`, Line ~28
-
-## Relationships
-
-1. **Item Base to Boons:** One-to-many relationship where each item base can have multiple boons associated with it
-   - Foreign key: `static_item_boons.itemBaseID` references `obj_itembase.UID`
-
-## Java Field to Database Column Mappings
-
-| Java Field | Database Column | Notes |
-|------------|-----------------|-------|
-| `itemBaseID` | `static_item_boons.itemBaseID` | References the item base this boon belongs to |
-| `boonType` | `static_item_boons.boonType` | Type of boon (e.g., damage, defense) |
-| `boonValue` | `static_item_boons.boonValue` | Value of the boon |
-| `boonLevel` | `static_item_boons.boonLevel` | Level of the boon |

src/engine/documentation/Handler Specific Documentation/dbBuildingHandler_Documentation.md

@@ -1,98 +0,0 @@
-# Building Handler Documentation
-
-## Overview
-This document describes the database relationships and interactions for the `dbBuildingHandler` class. The building handler manages all aspects of building objects in Magicbane, including creation, modification, deletion, and various properties like health, protection state, and ownership.
-
-## Handler Class
-**File:** `src/engine/db/handlers/dbBuildingHandler.java`
-**Class:** `dbBuildingHandler`
-**Extends:** `dbHandlerBase`
-
-## Database Tables
-
-### Main Building Table
-- **Table Name:** `obj_building`
-- **Description:** Core building information including location, mesh, health, and ownership details
-- **Columns:** 
-  - UID (Primary Key)
-  - parent (Foreign Key to obj_zone)
-  - ownerUUID (Foreign Key to obj_character)
-  - name
-  - meshUUID (Foreign Key to static_building_mesh)
-  - locX, locY, locZ (Location coordinates)
-  - meshScale
-  - currentHP
-  - protectionState
-  - currentGold
-  - rank
-  - upgradeDate
-  - blueprintUUID (Foreign Key to static_building_blueprint)
-  - w, rotY (Rotation data)
-  - isDeleted
-
-### Related Tables
-
-| Table Name | Description | Relationship |
-|------------|-------------|--------------|
-| `dyn_building_friendslist` | Stores friends that can access this building | BuildingID → obj_building.UID |
-| `dyn_building_condemnedlist` | Stores characters/guilds marked as condemned for this building | BuildingID → obj_building.UID |
-| `dyn_building_patrolpoints` | Stores patrol points for building guards | BuildingID → obj_building.UID |
-| `dyn_building_regions` | Stores region information for buildings | BuildingID → obj_building.UID |
-
-## Key Queries
-
-### Create Building (Stored Procedure)
-```sql
-CALL `building_CREATE`(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-```
-**File:** `dbBuildingHandler.java`, Line ~38
-
-### Get All Buildings for Zone
-```sql
-SELECT * FROM `obj_building` WHERE `parent` = ?
-```
-**File:** `dbBuildingHandler.java`, Line ~91
-
-### Get Building by UUID
-```sql
-SELECT * FROM `obj_building` WHERE `UID` = ?
-```
-**File:** `dbBuildingHandler.java`, Line ~110
-
-### Get Building by Mesh
-```sql
-SELECT * FROM `obj_building` WHERE `meshUUID` = ?
-```
-**File:** `dbBuildingHandler.java`, Line ~135
-
-## Relationships
-
-1. **Building to Zone:** Many-to-one relationship through `obj_building.parent` field
-2. **Building to Owner:** Many-to-one relationship through `obj_building.ownerUUID` field (references obj_character.UID)
-3. **Building to Blueprint:** Many-to-one relationship through `obj_building.blueprintUUID` field (references static_building_blueprint.Rank0UUID)
-4. **Building to Mesh:** Many-to-one relationship through `obj_building.meshUUID` field (references static_building_mesh.UID)
-5. **Building to Friends List:** One-to-many relationship through `dyn_building_friendslist.BuildingID`
-6. **Building to Condemned List:** One-to-many relationship through `dyn_building_condemnedlist.BuildingID`
-7. **Building to Patrol Points:** One-to-many relationship through `dyn_building_patrolpoints.BuildingID`
-8. **Building to Regions:** One-to-many relationship through `dyn_building_regions.BuildingID`
-
-## Java Field to Database Column Mappings
-
-| Java Field | Database Column | Notes |
-|------------|-----------------|-------|
-| `parent` | `obj_building.parent` | Zone parent ID |
-| `ownerUUID` | `obj_building.ownerUUID` | Owner character UID |
-| `name` | `obj_building.name` | Building name |
-| `meshUUID` | `obj_building.meshUUID` | Mesh identifier |
-| `locX` | `obj_building.locX` | X coordinate |
-| `locY` | `obj_building.locY` | Y coordinate |
-| `locZ` | `obj_building.locZ` | Z coordinate |
-| `meshScale` | `obj_building.meshScale` | Scale of mesh |
-| `currentHP` | `obj_building.currentHP` | Current health points |
-| `protectionState` | `obj_building.protectionState` | Protection state |
-| `currentGold` | `obj_building.currentGold` | Current gold amount |
-| `rank` | `obj_building.rank` | Building rank |
-| `upgradeDate` | `obj_building.upgradeDate` | Upgrade timestamp |
-| `blueprintUUID` | `obj_building.blueprintUUID` | Blueprint identifier |
-| `w` | `obj_building.w` | Rotation data |
-| `rotY` | `obj_building.rotY` | Y rotation angle |

src/engine/documentation/Handler Specific Documentation/dbBuildingLocationHandler_Documentation.md

@@ -1,61 +0,0 @@
-# Building Location Handler Documentation
-
-## Overview
-This document describes the database relationships and interactions for the `dbBuildingLocationHandler` class. This handler manages building location data, specifically loading locations for buildings based on type and slot.
-
-## Handler Class
-**File:** `src/engine/db/handlers/dbBuildingLocationHandler.java`
-**Class:** `dbBuildingLocationHandler`
-**Extends:** `dbHandlerBase`
-
-## Database Tables
-
-### Main Table
-- **Table Name:** `static_building_location`
-- **Description:** Stores location data for building components including position and rotation information
-- **Columns:** 
-  - ID (Primary Key)
-  - BuildingID
-  - type
-  - slot
-  - unknown
-  - locX
-  - locY
-  - locZ
-  - w
-  - rotX
-  - rotY
-  - rotZ
-
-## Key Queries
-
-### Load Building Locations
-```sql
-SELECT `ID`, `BuildingID`, `type`, `slot`, `unknown`, `locX`, `locY`, `locZ`, `w`,  `rotX`, `rotY`, `rotZ` 
-FROM static_building_location 
-WHERE type = 6 OR type = 8 
-GROUP BY buildingID, slot 
-ORDER BY buildingID, slot ASC;
-```
-**File:** `dbBuildingLocationHandler.java`, Line ~17
-
-## Relationships
-
-1. **Building Location to Building:** Many-to-one relationship via `BuildingID` field referencing `obj_building.UID`
-
-## Java Field to Database Column Mappings
-
-| Java Field | Database Column | Notes |
-|------------|-----------------|-------|
-| `id` | `static_building_location.ID` | Unique identifier |
-| `buildingID` | `static_building_location.BuildingID` | Reference to building |
-| `type` | `static_building_location.type` | Location type |
-| `slot` | `static_building_location.slot` | Slot number |
-| `unknown` | `static_building_location.unknown` | Unknown field |
-| `locX` | `static_building_location.locX` | X coordinate |
-| `locY` | `static_building_location.locY` | Y coordinate |
-| `locZ` | `static_building_location.locZ` | Z coordinate |
-| `w` | `static_building_location.w` | W rotation value |
-| `rotX` | `static_building_location.rotX` | X rotation |
-| `rotY` | `static_building_location.rotY` | Y rotation |
-| `rotZ` | `static_building_location.rotZ` | Z rotation |

src/engine/documentation/Handler Specific Documentation/dbCSSessionHandler_Documentation.md

@@ -1,77 +0,0 @@
-# dbCSSessionHandler Documentation
-
-## Overview
-This document describes the database relationships and interactions for the `dbCSSessionHandler` class. The session handler manages user login sessions, tracking account activity, character associations, and session-based authentication.
-
-## Handler Class
-**File:** `src/engine/db/handlers/dbCSSessionHandler.java`
-**Class:** `dbCSSessionHandler`
-**Extends:** `dbHandlerBase`
-
-## Database Tables
-
-### Main Session Table
-- **Table Name:** `dyn_cs_session`
-- **Description:** Stores information about active and inactive user sessions, including account associations and character details
-- **Columns:** 
-  - UID (Primary Key)
-  - accountID
-  - characterID
-  - sessionKey
-  - lastLoginDate
-  - lastLogoutDate
-
-### Related Tables
-
-| Table Name | Description | Relationship |
-|------------|-------------|--------------|
-| `obj_account` | Accounts associated with sessions | accountID → obj_account.UID |
-| `obj_character` | Characters associated with sessions | characterID → obj_character.UID |
-
-## Key Queries
-
-### Create Session
-```sql
-INSERT INTO `dyn_cs_session` (`accountID`, `characterID`, `sessionKey`, `lastLoginDate`) VALUES(?,?,?,?)
-```
-**File:** `dbCSSessionHandler.java`, Line ~35
-
-### Load Session by Account
-```sql
-SELECT * FROM `dyn_cs_session` WHERE `accountID` = ?
-```
-**File:** `dbCSSessionHandler.java`, Line ~50
-
-### Load Session by Character
-```sql
-SELECT * FROM `dyn_cs_session` WHERE `characterID` = ?
-```
-**File:** `dbCSSessionHandler.java`, Line ~65
-
-### Update Session Last Login
-```sql
-UPDATE `dyn_cs_session` SET `lastLoginDate`=? WHERE `UID`=?
-```
-**File:** `dbCSSessionHandler.java`, Line ~80
-
-### Update Session Last Logout
-```sql
-UPDATE `dyn_cs_session` SET `lastLogoutDate`=? WHERE `UID`=?
-```
-**File:** `dbCSSessionHandler.java`, Line ~95
-
-## Relationships
-
-1. **Session to Account:** Many-to-one relationship via accountID field referencing obj_account.UID
-2. **Session to Character:** Many-to-one relationship via characterID field referencing obj_character.UID
-3. **Session to Login History:** One-to-many relationship via session UID (via dyn_login_history table)
-
-## Java Field to Database Column Mappings
-
-| Java Field | Database Column | Notes |
-|------------|-----------------|-------|
-| `accountID` | `dyn_cs_session.accountID` | Account UID associated with this session |
-| `characterID` | `dyn_cs_session.characterID` | Character UID associated with this session |
-| `sessionKey` | `dyn_cs_session.sessionKey` | Session identifier for authentication |
-| `lastLoginDate` | `dyn_cs_session.lastLoginDate` | Timestamp of last login |
-| `lastLogoutDate` | `dyn_cs_session.lastLogoutDate` | Timestamp of last logout |

src/engine/documentation/Handler Specific Documentation/dbCharacterPowerHandler_Documentation.md

@@ -1,71 +0,0 @@
-# Character Power Handler Documentation
-
-## Overview
-This document describes the database relationships and interactions for the `dbCharacterPowerHandler` class. This handler manages character power data, including adding, deleting, retrieving, and updating character powers.
-
-## Handler Class
-**File:** `src/engine/db/handlers/dbCharacterPowerHandler.java`
-**Class:** `dbCharacterPowerHandler`
-**Extends:** `dbHandlerBase`
-
-## Database Tables
-
-### Main Table
-- **Table Name:** `dyn_character_power`
-- **Description:** Stores dynamic power information for characters including power token, character ID, and training levels
-- **Columns:** 
-  - UID (Primary Key)
-  - CharacterID
-  - powersBaseToken
-  - trains
-
-## Key Queries
-
-### Add Character Power
-```sql
-INSERT INTO `dyn_character_power` (`CharacterID`, `powersBaseToken`, `trains`) VALUES (?, ?, ?);
-```
-**File:** `dbCharacterPowerHandler.java`, Line ~20
-
-### Delete Character Power
-```sql
-DELETE FROM `dyn_character_power` WHERE `UID` = ?
-```
-**File:** `dbCharacterPowerHandler.java`, Line ~41
-
-### Get Character Power by ID
-```sql
-SELECT * FROM `dyn_character_power` WHERE `UID` = ?
-```
-**File:** `dbCharacterPowerHandler.java`, Line ~57
-
-### Get All Powers for Character
-```sql
-SELECT * FROM `dyn_character_power` WHERE CharacterID = ?
-```
-**File:** `dbCharacterPowerHandler.java`, Line ~76
-
-### Update Trains
-```sql
-UPDATE `dyn_character_power` SET `trains`=? WHERE `UID`=?
-```
-**File:** `dbCharacterPowerHandler.java`, Line ~98
-
-### Update Database
-```sql
-UPDATE `dyn_character_power` SET `PowersBaseToken`=?, `CharacterID`=?, `trains`=? WHERE `UID`=?
-```
-**File:** `dbCharacterPowerHandler.java`, Line ~115
-
-## Relationships
-
-1. **Character Power to Character:** Many-to-one relationship via `CharacterID` field referencing `obj_character.UID`
-2. **Character Power to Power Base:** Many-to-one relationship via `powersBaseToken` field referencing `static_powers_base.token`
-
-## Java Field to Database Column Mappings
-
-| Java Field | Database Column | Notes |
-|------------|-----------------|-------|
-| `characterID` | `dyn_character_power.CharacterID` | Reference to character |
-| `powerToken` | `dyn_character_power.powersBaseToken` | Reference to power base |
-| `trains` | `dyn_character_power.trains` | Training level |

src/engine/documentation/Handler Specific Documentation/dbCharacterRuneHandler_Documentation.md

@@ -1,63 +0,0 @@
-# Character Rune Handler Documentation
-
-## Overview
-This document describes the database relationships and interactions for the `dbCharacterRuneHandler` class. This handler manages character rune data, including adding, retrieving, deleting, and updating character runes.
-
-## Handler Class
-**File:** `src/engine/db/handlers/dbCharacterRuneHandler.java`
-**Class:** `dbCharacterRuneHandler`
-**Extends:** `dbHandlerBase`
-
-## Database Tables
-
-### Main Table
-- **Table Name:** `dyn_character_rune`
-- **Description:** Stores dynamic rune information for characters including character ID and rune base ID
-- **Columns:** 
-  - UID (Primary Key)
-  - CharacterID
-  - RuneBaseID
-
-## Key Queries
-
-### Add Character Rune
-```sql
-INSERT INTO `dyn_character_rune` (`CharacterID`, `RuneBaseID`) VALUES (?, ?);
-```
-**File:** `dbCharacterRuneHandler.java`, Line ~20
-
-### Get Character Rune by ID
-```sql
-SELECT * FROM `dyn_character_rune` WHERE `UID`=?
-```
-**File:** `dbCharacterRuneHandler.java`, Line ~43
-
-### Delete Character Rune
-```sql
-DELETE FROM `dyn_character_rune` WHERE `UID`=?;
-```
-**File:** `dbCharacterRuneHandler.java`, Line ~61
-
-### Get All Runes for Character
-```sql
-SELECT * FROM `dyn_character_rune` WHERE `CharacterID` = ?
-```
-**File:** `dbCharacterRuneHandler.java`, Line ~74
-
-### Update Database
-```sql
-UPDATE `dyn_character_rune` SET `CharacterID`=?, `RuneBaseID`=? WHERE `UID` = ?
-```
-**File:** `dbCharacterRuneHandler.java`, Line ~91
-
-## Relationships
-
-1. **Character Rune to Character:** Many-to-one relationship via `CharacterID` field referencing `obj_character.UID`
-2. **Character Rune to Rune Base:** Many-to-one relationship via `RuneBaseID` field referencing `static_rune_base.ID`
-
-## Java Field to Database Column Mappings
-
-| Java Field | Database Column | Notes |
-|------------|-----------------|-------|
-| `playerID` | `dyn_character_rune.CharacterID` | Reference to character |
-| `runeBaseID` | `dyn_character_rune.RuneBaseID` | Reference to rune base |

src/engine/documentation/Handler Specific Documentation/dbCharacterSkillHandler_Documentation.md

@@ -1,71 +0,0 @@
-# Character Skill Handler Documentation
-
-## Overview
-This document describes the database relationships and interactions for the `dbCharacterSkillHandler` class. This handler manages character skill data, including adding, deleting, retrieving, and updating character skills.
-
-## Handler Class
-**File:** `src/engine/db/handlers/dbCharacterSkillHandler.java`
-**Class:** `dbCharacterSkillHandler`
-**Extends:** `dbHandlerBase`
-
-## Database Tables
-
-### Main Table
-- **Table Name:** `dyn_character_skill`
-- **Description:** Stores dynamic skill information for characters including skill base ID, character ID, and training levels
-- **Columns:** 
-  - UID (Primary Key)
-  - CharacterID
-  - skillsBaseID
-  - trains
-
-## Key Queries
-
-### Add Skill
-```sql
-INSERT INTO `dyn_character_skill` (`CharacterID`, `skillsBaseID`, `trains`) VALUES (?, ?, ?);
-```
-**File:** `dbCharacterSkillHandler.java`, Line ~20
-
-### Delete Skill
-```sql
-DELETE FROM `dyn_character_skill` WHERE `UID` = ?
-```
-**File:** `dbCharacterSkillHandler.java`, Line ~43
-
-### Get Skill by ID
-```sql
-SELECT * FROM `dyn_character_skill` WHERE `UID` = ?
-```
-**File:** `dbCharacterSkillHandler.java`, Line ~59
-
-### Get All Skills for Character
-```sql
-SELECT * FROM `dyn_character_skill` WHERE `CharacterID` = ?
-```
-**File:** `dbCharacterSkillHandler.java`, Line ~80
-
-### Update Trains
-```sql
-UPDATE `dyn_character_skill` SET `trains`=? WHERE `UID` = ?
-```
-**File:** `dbCharacterSkillHandler.java`, Line ~104
-
-### Update Database
-```sql
-UPDATE `dyn_character_skill` SET `skillsBaseID`=?, `CharacterID`=?, `trains`=? WHERE `UID`=?
-```
-**File:** `dbCharacterSkillHandler.java`, Line ~123
-
-## Relationships
-
-1. **Character Skill to Character:** Many-to-one relationship via `CharacterID` field referencing `obj_character.UID`
-2. **Character Skill to Skill Base:** Many-to-one relationship via `skillsBaseID` field referencing `static_skills_base.ID`
-
-## Java Field to Database Column Mappings
-
-| Java Field | Database Column | Notes |
-|------------|-----------------|-------|
-| `characterID` | `dyn_character_skill.CharacterID` | Reference to character |
-| `skillBaseID` | `dyn_character_skill.skillsBaseID` | Reference to skill base |
-| `trains` | `dyn_character_skill.trains` | Training level |

src/engine/documentation/Handler Specific Documentation/dbCityHandler_Documentation.md

@@ -1,97 +0,0 @@
-# City Handler Documentation
-
-## Overview
-This document describes the database relationships and interactions for the `dbCityHandler` class. The city handler manages city-related data including city creation, zone information, and building structures within the Magicbane emulator system.
-
-## Handler Class
-**File:** `src/engine/db/handlers/dbCityHandler.java`
-**Class:** `dbCityHandler`
-**Extends:** `dbHandlerBase`
-
-## Database Tables
-
-### Main City Table
-- **Table Name:** `obj_city`
-- **Description:** Core city information including name, motto, and metadata
-- **Columns:** 
-  - UID (Primary Key)
-  - name
-  - motto
-  - treeOfLifeUUID
-  - established
-  - realmTaxDate
-  - population
-  - siegesWithstood
-  - isNpc
-  - isCapital
-  - isNoobIsle
-  - bindX
-  - bindZ
-  - bindRadius
-  - radiusType
-  - forceRename
-  - open
-  - hash
-
-### Related Tables
-
-| Table Name | Description | Relationship |
-|------------|-------------|--------------|
-| `obj_zone` | Zone information within cities | CityID → obj_city.UID |
-| `obj_building` | Building information within zones | ZoneID → obj_zone.UID |
-| `object` | Base object table that links to obj_city | UID → obj_city.UID |
-
-## Key Queries
-
-### Load City Data
-```sql
-SELECT * FROM `object` o 
-JOIN `obj_city` c ON o.`UID` = c.`UID` 
-WHERE o.`type` = 'city' AND o.`parent` = ?
-```
-**File:** `dbCityHandler.java`, Line ~45
-
-### Load Zones for City
-```sql
-SELECT * FROM `object` o 
-JOIN `obj_zone` z ON o.`UID` = z.`UID` 
-WHERE o.`type` = 'zone' AND o.`parent` = ?
-```
-**File:** `dbCityHandler.java`, Line ~60
-
-### Load Buildings for Zone
-```sql
-SELECT * FROM `object` o 
-JOIN `obj_building` b ON o.`UID` = b.`UID` 
-WHERE o.`type` = 'building' AND o.`parent` = ?
-```
-**File:** `dbCityHandler.java`, Line ~75
-
-### Create New City
-```sql
-CALL `city_CREATE`(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-```
-**File:** `dbCityHandler.java`, Line ~90
-
-## Relationships
-
-1. **City to Object:** One-to-one (City is a type of object)
-2. **Zone to City:** Many-to-one (Multiple zones per city)
-3. **Building to Zone:** Many-to-one (Multiple buildings per zone)
-4. **City to Zones:** One-to-many (via `obj_zone.parent` field)
-5. **Zone to Buildings:** One-to-many (via `obj_building.parent` field)
-
-## Java Field to Database Column Mappings
-
-| Java Field | Database Column | Notes |
-|------------|-----------------|-------|
-| `name` | `obj_city.name` | City name |
-| `motto` | `obj_city.motto` | City motto |
-| `established` | `obj_city.established` | Date established |
-| `population` | `obj_city.population` | Population count |
-| `isNpc` | `obj_city.isNpc` | NPC flag |
-| `bindX` | `obj_city.bindX` | X binding coordinate |
-| `bindZ` | `obj_city.bindZ` | Z binding coordinate |
-| `bindRadius` | `obj_city.bindRadius` | Binding radius |
-| `isCapital` | `obj_city.isCapital` | Capital city flag |
-| `isNoobIsle` | `obj_city.isNoobIsle` | Noob island flag |

src/engine/documentation/Handler Specific Documentation/dbContractHandler_Documentation.md

@@ -1,82 +0,0 @@
-# Contract Handler Documentation
-
-## Overview
-This document describes the database relationships and interactions for the `dbContractHandler` class. This handler manages contract data for NPCs, including loading contracts, their inventory sets, and sell lists.
-
-## Handler Class
-**File:** `src/engine/db/handlers/dbContractHandler.java`
-**Class:** `dbContractHandler`
-**Extends:** `dbHandlerBase`
-
-## Database Tables
-
-### Main Table
-- **Table Name:** `static_npc_contract`
-- **Description:** Stores static contract information for NPCs including contract ID, name, mob base ID, class ID, vendor dialog, and icon ID
-- **Columns:** 
-  - ID (Primary Key)
-  - contractID
-  - name
-  - mobbaseID
-  - classID
-  - vendorDialog
-  - iconID
-  - allowedBuildingTypeID
-
-### Related Tables
-
-| Table Name | Description | Relationship |
-|------------|-------------|--------------|
-| `static_npc_inventoryset` | Stores inventory items for contracts | inventorySet → static_npc_contract.inventorySet |
-| `static_npc_contract_selltype` | Stores sell type information for contracts | contractID → static_npc_contract.ID |
-
-## Key Queries
-
-### Get Contract by ID
-```sql
-SELECT * FROM `static_npc_contract` WHERE `ID` = ?
-```
-**File:** `dbContractHandler.java`, Line ~17
-
-### Load Contract Inventory
-```sql
-SELECT * FROM `static_npc_inventoryset` WHERE `inventorySet` = ?;
-```
-**File:** `dbContractHandler.java`, Line ~43
-
-### Load Sell List for Contract
-```sql
-SELECT * FROM `static_npc_contract_selltype` WHERE `contractID` = ?;
-```
-**File:** `dbContractHandler.java`, Line ~65
-
-### Update Allowed Buildings
-```sql
-UPDATE `static_npc_contract` SET `allowedBuildingTypeID`=? WHERE `contractID`=?
-```
-**File:** `dbContractHandler.java`, Line ~87
-
-### Update Database
-```sql
-UPDATE `static_npc_contract` SET `contractID`=?, `name`=?, `mobbaseID`=?, `classID`=?, vendorDialog=?, iconID=?, allowedBuildingTypeID=? WHERE `ID`=?
-```
-**File:** `dbContractHandler.java`, Line ~100
-
-## Relationships
-
-1. **Contract to Mob Base:** Many-to-one relationship via `mobbaseID` field referencing `obj_mobbase.ID`
-2. **Contract to Vendor Dialog:** Many-to-one relationship via `vendorDialog` field referencing `obj_vendor_dialog.UID`
-3. **Contract to Inventory Set:** One-to-many relationship via `inventorySet` field
-4. **Contract to Sell Types:** One-to-many relationship via `contractID` field
-
-## Java Field to Database Column Mappings
-
-| Java Field | Database Column | Notes |
-|------------|-----------------|-------|
-| `contractID` | `static_npc_contract.contractID` | Contract identifier |
-| `name` | `static_npc_contract.name` | Contract name |
-| `mobbaseID` | `static_npc_contract.mobbaseID` | Reference to mob base |
-| `classID` | `static_npc_contract.classID` | Class identifier |
-| `vendorDialogID` | `static_npc_contract.vendorDialog` | Reference to vendor dialog |
-| `iconID` | `static_npc_contract.iconID` | Icon identifier |
-| `allowedBuildings` | `static_npc_contract.allowedBuildingTypeID` | Allowed building types |

src/engine/documentation/Handler Specific Documentation/dbEffectsBaseHandler_Documentation.md

@@ -1,57 +0,0 @@
-# dbEffectsBaseHandler Documentation
-
-## Overview
-This document describes the database relationships and interactions for the `dbEffectsBaseHandler` class. This handler manages static data about power effects in Magicbane, including their base properties and modifiers.
-
-## Handler Class
-**File:** `src/engine/db/handlers/dbEffectsBaseHandler.java`
-**Class:** `dbEffectsBaseHandler`
-**Extends:** `dbHandlerBase`
-
-## Database Tables
-
-### Main Effect Base Table
-- **Table Name:** `static_power_effectbase`
-- **Description:** Core table containing base information about power effects, including names and types
-- **Columns:** 
-  - IDString (Primary Key)
-  - name
-  - description
-  - effectType
-
-### Modifier Tables
-
-| Table Name | Description | Relationship |
-|------------|-------------|--------------|
-| `static_power_effectmod` | Stores modifier properties for effects | EffectBaseID → static_power_effectbase.IDString |
-
-## Key Queries
-
-### Get All Effects Base
-```sql
-SELECT * FROM static_power_effectbase ORDER BY `IDString` DESC
-```
-**File:** `dbEffectsBaseHandler.java`, Line ~25
-
-### Get Effect Modifiers
-```sql
-SELECT * FROM static_power_effectmod WHERE `effectBaseID` = ?
-```
-**File:** `dbEffectsBaseHandler.java`, Line ~40
-
-## Relationships
-
-1. **Effect Base to Modifiers:** One-to-many relationship via effectBaseID field in static_power_effectmod referencing static_power_effectbase.IDString
-2. **Effect Base to Resources Cost:** Many-to-many relationship through static_power_effectcost table
-
-## Java Field to Database Column Mappings
-
-| Java Field | Database Column | Notes |
-|------------|-----------------|-------|
-| `IDString` | `static_power_effectbase.IDString` | Unique identifier for the effect |
-| `name` | `static_power_effectbase.name` | Display name of the effect |
-| `description` | `static_power_effectbase.description` | Description of the effect |
-| `effectType` | `static_power_effectbase.effectType` | Type of effect |
-| `modType` | `static_power_effectmod.modType` | Modifier type for effect modifiers |
-| `modValue` | `static_power_effectmod.modValue` | Value of the modifier |
-| `other fields...` | Various columns | Other properties related to effects and modifiers |

src/engine/documentation/Handler Specific Documentation/dbEffectsResourceCostHandler_Documentation.md

@@ -1,40 +0,0 @@
-# dbEffectsResourceCostHandler Documentation
-
-## Overview
-This document describes the database relationships and interactions for the `dbEffectsResourceCostHandler` class. This handler manages the resource costs associated with power effects, including mana, health, and other resource types required to use specific powers.
-
-## Handler Class
-**File:** `src/engine/db/handlers/dbEffectsResourceCostHandler.java`
-**Class:** `dbEffectsResourceCostHandler`
-**Extends:** `dbHandlerBase`
-
-## Database Tables
-
-### Main Resource Cost Table
-- **Table Name:** `static_power_effectcost`
-- **Description:** Stores resource cost information for power effects, defining what resources are required to use specific effects
-- **Columns:** 
-  - IDString (Primary Key)
-  - resourceType
-  - resourceAmount
-
-## Key Queries
-
-### Get Resource Cost by Effect ID
-```sql
-SELECT * FROM static_power_effectcost WHERE `IDString` = ?
-```
-**File:** `dbEffectsResourceCostHandler.java`, Line ~25
-
-## Relationships
-
-1. **Effect Cost to Effect Base:** Many-to-one relationship via IDString field referencing static_power_effectbase.IDString
-
-## Java Field to Database Column Mappings
-
-| Java Field | Database Column | Notes |
-|------------|-----------------|-------|
-| `idString` | `static_power_effectcost.IDString` | Unique identifier linking to effect base |
-| `resourceType` | `static_power_effectcost.resourceType` | Type of resource required (mana, health, etc.) |
-| `resourceAmount` | `static_power_effectcost.resourceAmount` | Amount of resource required |
-| `other fields...` | Various columns | Other properties related to resource costs |

src/engine/documentation/Handler Specific Documentation/dbEnchantmentHandler_Documentation.md

@@ -1,46 +0,0 @@
-# dbEnchantmentHandler Documentation
-
-## Overview
-This document describes the database relationships and interactions for the `dbEnchantmentHandler` class. This handler manages item enchantments, which are special properties applied to items that modify their attributes or provide additional abilities.
-
-## Handler Class
-**File:** `src/engine/db/handlers/dbEnchantmentHandler.java`
-**Class:** `dbEnchantmentHandler`
-**Extends:** `dbHandlerBase`
-
-## Database Tables
-
-### Main Enchantment Table
-- **Table Name:** `dyn_item_enchantment`
-- **Description:** Stores enchantment information for items, including the type of power action and rank level
-- **Columns:** 
-  - itemID (Primary Key)
-  - powerAction
-  - rank
-
-## Key Queries
-
-### Get Enchantments by Item ID
-```sql
-SELECT * FROM dyn_item_enchantment WHERE `itemID` = ?
-```
-**File:** `dbEnchantmentHandler.java`, Line ~25
-
-### Save Enchantment
-```sql
-INSERT INTO `dyn_item_enchantment` (`itemID`, `powerAction`, `rank`) VALUES(?,?,?)
-```
-**File:** `dbEnchantmentHandler.java`, Line ~40
-
-## Relationships
-
-1. **Enchantment to Item:** Many-to-one relationship via itemID field referencing obj_item.UID
-
-## Java Field to Database Column Mappings
-
-| Java Field | Database Column | Notes |
-|------------|-----------------|-------|
-| `itemID` | `dyn_item_enchantment.itemID` | Unique identifier for the item |
-| `powerAction` | `dyn_item_enchantment.powerAction` | The power action associated with the enchantment |
-| `rank` | `dyn_item_enchantment.rank` | The rank or strength level of the enchantment |
-| `other fields...` | Various columns | Other properties related to item enchantments |

src/engine/documentation/Handler Specific Documentation/dbGuildHandler_Documentation.md

@@ -1,118 +0,0 @@
-# Guild Handler Documentation
-
-## Overview
-This document describes the database relationships and interactions for the `dbGuildHandler` class. The guild system in Magicbane is complex, involving multiple related tables for managing guilds, their history, alliances, enemies, and member management.
-
-## Handler Class
-**File:** `src/engine/db/handlers/dbGuildHandler.java`
-**Class:** `dbGuildHandler`
-**Extends:** `dbHandlerBase`
-
-## Database Tables
-
-### Main Guild Table
-- **Table Name:** `obj_guild`
-- **Description:** Core guild information including name, leader, tags, charter, and ownership details
-- **Columns:** 
-  - UID (Primary Key)
-  - name
-  - leaderUID
-  - backgroundColor01
-  - backgroundColor02
-  - symbolColor
-  - backgroundDesign
-  - symbol
-  - charter
-  - leadershipType
-  - motto
-  - ownedCity
-
-### Related Tables
-
-| Table Name | Description | Relationship |
-|------------|-------------|--------------|
-| `dyn_character_guildhistory` | Tracks character's guild membership history | CharacterID → obj_character.UID, GuildID → obj_guild.UID |
-| `dyn_guild_allianceenemylist` | Stores alliance/enemy relationships between guilds | GuildID → obj_guild.UID, OtherGuildID → obj_guild.UID |
-| `dyn_guild_banishlist` | Lists characters banned from guilds | GuildID → obj_guild.UID, CharacterID → obj_character.UID |
-| `dyn_guild_characterkoslist` | Stores characters marked as KOS (Kill on Sight) for guilds | GuildID → obj_guild.UID, KOSCharacterID → obj_character.UID |
-| `dyn_guild_guildkoslist` | Stores guilds marked as KOS for other guilds | GuildID → obj_guild.UID, KOSGuildID → obj_guild.UID |
-| `object` | Base object table that links to obj_guild | UID → obj_guild.UID |
-
-## Key Queries
-
-### Get Guild by ID
-```sql
-SELECT `obj_guild`.*, `object`.`parent` 
-FROM `obj_guild` 
-INNER JOIN `object` ON `object`.`UID` = `obj_guild`.`UID` 
-WHERE `object`.`UID`=?
-```
-**File:** `dbGuildHandler.java`, Line ~450
-
-### Get Guild History of Player
-```sql
-SELECT g.* FROM `obj_guild` g, `dyn_character_guildhistory` l 
-WHERE  g.`UID` = l.`GuildID` && l.`CharacterID` = ?
-```
-**File:** `dbGuildHandler.java`, Line ~200
-
-### Get Guild Allies
-```sql
-SELECT g.* FROM `obj_guild` g, `dyn_guild_allianceenemylist` l 
-WHERE l.isAlliance = 1 && l.OtherGuildID = g.UID && l.GuildID=?
-```
-**File:** `dbGuildHandler.java`, Line ~230
-
-### Get Guild Enemies
-```sql
-SELECT g.* FROM `obj_guild` g, `dyn_guild_allianceenemylist` l 
-WHERE l.isAlliance = 0 && l.OtherGuildID = g.UID && l.GuildID=?
-```
-**File:** `dbGuildHandler.java`, Line ~253
-
-### Get Guild KOS Characters
-```sql
-SELECT c.* FROM `obj_character` c, `dyn_guild_characterkoslist` l 
-WHERE c.`char_isActive` = 1 && l.`KOSCharacterID` = c.`UID` && l.`GuildID`=?
-```
-**File:** `dbGuildHandler.java`, Line ~273
-
-### Get Guild KOS Guilds
-```sql
-SELECT g.* FROM `obj_guild` g, `dyn_guild_guildkoslist` l 
-WHERE l.KOSGuildID = g.UID && l.GuildID = ?
-```
-**File:** `dbGuildHandler.java`, Line ~295
-
-### Save Guild (Stored Procedure)
-```sql
-CALL `guild_CREATE`(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-```
-**File:** `dbGuildHandler.java`, Line ~483
-
-## Relationships
-
-1. **Guild to Character:** Many-to-many through `obj_character.guildUID` field
-2. **Guild to Guild History:** One-to-many (via `dyn_character_guildhistory.GuildID`)
-3. **Guild to Alliances/Enemies:** Many-to-many (via `dyn_guild_allianceenemylist`)
-4. **Guild to Bans List:** One-to-many (via `dyn_guild_banishlist.GuildID`)
-5. **Guild to KOS Characters:** One-to-many (via `dyn_guild_characterkoslist.GuildID`)
-6. **Guild to KOS Guilds:** One-to-many (via `dyn_guild_guildkoslist.GuildID`)
-7. **Guild to Sub-Guilds:** Parent-child relationship via `object.parent` field
-
-
-## Java Field to Database Column Mappings
-
-| Java Field | Database Column | Notes |
-|------------|-----------------|-------|
-| `name` | `obj_guild.name` | Guild name |
-| `leaderUID` | `obj_guild.leaderUID` | Leader character UID |
-| `backgroundColor01` | `obj_guild.backgroundColor01` | First background color |
-| `backgroundColor02` | `obj_guild.backgroundColor02` | Second background color |
-| `symbolColor` | `obj_guild.symbolColor` | Symbol color |
-| `backgroundDesign` | `obj_guild.backgroundDesign` | Background design ID |
-| `symbol` | `obj_guild.symbol` | Guild symbol ID |
-| `charter` | `obj_guild.charter` | Charter information |
-| `leadershipType` | `obj_guild.leadershipType` | Leadership type |
-| `motto` | `obj_guild.motto` | Guild motto |
-| `ownedCity` | `obj_guild.ownedCity` | Owned city ID |

src/engine/documentation/Handler Specific Documentation/dbHeightMapHandler_Documentation.md

@@ -1,42 +0,0 @@
-# dbHeightMapHandler Documentation
-
-## Overview
-This document describes the database relationships and interactions for the `dbHeightMapHandler` class. This handler manages height map data for zones, which is used to determine terrain elevation in the game world.
-
-## Handler Class
-**File:** `src/engine/db/handlers/dbHeightMapHandler.java`
-**Class:** `dbHeightMapHandler`
-**Extends:** `dbHandlerBase`
-
-## Database Tables
-
-### Main Height Map Table
-- **Table Name:** `static_zone_heightmap`
-- **Description:** Stores raw height map data for zones, representing terrain elevation information
-- **Columns:** 
-  - zoneLoadID (Primary Key)
-  - heightMapData
-  - width
-  - height
-
-## Key Queries
-
-### Get Height Map by Zone Load ID
-```sql
-SELECT * FROM static_zone_heightmap WHERE `zoneLoadID` = ?
-```
-**File:** `dbHeightMapHandler.java`, Line ~25
-
-## Relationships
-
-1. **Height Map to Zone:** Many-to-one relationship via zoneLoadID field referencing static_zone_load.zoneLoadID
-
-## Java Field to Database Column Mappings
-
-| Java Field | Database Column | Notes |
-|------------|-----------------|-------|
-| `zoneLoadID` | `static_zone_heightmap.zoneLoadID` | Unique identifier for the zone |
-| `heightMapData` | `static_zone_heightmap.heightMapData` | Raw height map data for terrain elevation |
-| `width` | `static_zone_size.width` | Width dimension of the zone |
-| `height` | `static_zone_size.height` | Height dimension of the zone |
-| `other fields...` | Various columns | Other properties related to height maps |

src/engine/documentation/Handler Specific Documentation/dbItemBaseHandler_Documentation.md

@@ -1,71 +0,0 @@
-# dbItemBaseHandler Documentation
-
-## Overview
-This document describes the database relationships and interactions for the `dbItemBaseHandler` class. This handler manages static item base data, including item properties, stats, and appearance information.
-
-## Handler Class
-**File:** `src/engine/db/handlers/dbItemBaseHandler.java`
-**Class:** `dbItemBaseHandler`
-**Extends:** `dbHandlerBase`
-
-## Database Tables
-
-### Main Item Base Table
-- **Table Name:** `static_itembase`
-- **Description:** Core table storing base properties of items, including names, descriptions, and appearance settings
-- **Columns:** 
-  - UID (Primary Key)
-  - name
-  - description
-  - itemClass
-  - icon
-  - mesh
-
-### Related Tables
-
-| Table Name | Description | Relationship |
-|------------|-------------|--------------|
-| `static_item_bakedinstat` | Stores stat information for items | ItemBaseID → static_itembase.UID |
-| `static_itembase_animations` | Stores animation settings for items | ItemBaseID → static_itembase.UID |
-
-## Key Queries
-
-### Get Item Base by UID
-```sql
-SELECT * FROM static_itembase WHERE `UID` = ?
-```
-**File:** `dbItemBaseHandler.java`, Line ~25
-
-### Get Item Stats
-```sql
-SELECT * FROM static_item_bakedinstat WHERE `itemBaseID` = ?
-```
-**File:** `dbItemBaseHandler.java`, Line ~40
-
-### Get Item Animations
-```sql
-SELECT * FROM static_itembase_animations WHERE `itemBaseID` = ?
-```
-**File:** `dbItemBaseHandler.java`, Line ~55
-
-## Relationships
-
-1. **Item Base to Stats:** One-to-many relationship via itemBaseID field in static_item_bakedinstat referencing static_itembase.UID
-2. **Item Base to Animations:** One-to-many relationship via itemBaseID field in static_itembase_animations referencing static_itembase.UID
-
-## Java Field to Database Column Mappings
-
-| Java Field | Database Column | Notes |
-|------------|-----------------|-------|
-| `UID` | `static_itembase.UID` | Unique identifier for the item |
-| `name` | `static_itembase.name` | Name of the item |
-| `description` | `static_itembase.description` | Description of the item |
-| `itemClass` | `static_itembase.itemClass` | Class of the item |
-| `icon` | `static_itembase.icon` | Icon identifier for the item |
-| `mesh` | `static_itembase.mesh` | Mesh identifier for the item |
-| `fromUse` | `static_item_bakedinstat.fromUse` | Flag indicating if stat is from use |
-| `animation` | `static_itembase_animations.animation` | Animation associated with the item |
-| `rightHand` | `static_itembase_animations.rightHand` | Flag indicating right hand animation |
-| `runeSet` | `static_npc_runeSet.runeSet` | NPC rune set identifier |
-| `runeBase` | `static_npc_runeSet.runeBase` | Base rune identifier |
-| `other fields...` | Various columns | Other properties related to item base data |

src/engine/documentation/Handler Specific Documentation/dbItemHandler_Documentation.md

@@ -1,64 +0,0 @@
-# dbItemHandler Documentation
-
-## Overview
-This document describes the database relationships and interactions for the `dbItemHandler` class. This handler manages item data in players' inventories, including item properties, location information, and ownership details.
-
-## Handler Class
-**File:** `src/engine/db/handlers/dbItemHandler.java`
-**Class:** `dbItemHandler`
-**Extends:** `dbHandlerBase`
-
-## Database Tables
-
-### Main Item Table
-- **Table Name:** `obj_item`
-- **Description:** Stores information about items in player inventories, including location, ownership, and attributes
-- **Columns:** 
-  - UID (Primary Key)
-  - ownerUID
-  - containerID
-  - itemBaseID
-  - item_container
-  - equipSlot
-  - flags
-  - customName
-
-## Key Queries
-
-### Get Item by UID
-```sql
-SELECT * FROM obj_item WHERE `UID` = ?
-```
-**File:** `dbItemHandler.java`, Line ~25
-
-### Save Item
-```sql
-INSERT INTO `obj_item` (`ownerUID`, `containerID`, `itemBaseID`, `item_container`, `equipSlot`, `flags`, `customName`) VALUES(?,?,?,?,?,?,?)
-```
-**File:** `dbItemHandler.java`, Line ~40
-
-### Get Items by Owner
-```sql
-SELECT * FROM obj_item WHERE `ownerUID` = ?
-```
-**File:** `dbItemHandler.java`, Line ~55
-
-## Relationships
-
-1. **Item to Owner:** Many-to-one relationship via ownerUID field referencing obj_character.UID
-2. **Item to Container:** Many-to-one relationship via containerID field referencing obj_container.UID
-3. **Item to Item Base:** Many-to-one relationship via itemBaseID field referencing static_itembase.UID
-
-## Java Field to Database Column Mappings
-
-| Java Field | Database Column | Notes |
-|------------|-----------------|-------|
-| `UID` | `obj_item.UID` | Unique identifier for the item |
-| `ownerUID` | `obj_item.ownerUID` | UID of the character who owns this item |
-| `containerID` | `obj_item.containerID` | Container ID where item is stored |
-| `itemBaseID` | `obj_item.itemBaseID` | UID of the base item definition |
-| `item_container` | `obj_item.item_container` | Container type (inventory, equip, bank, etc.) |
-| `equipSlot` | `obj_item.equipSlot` | Slot where item is equipped |
-| `flags` | `obj_item.flags` | Item flags for special properties |
-| `customName` | `obj_item.customName` | Custom name of the item |
-| `other fields...` | Various columns | Other item-specific properties |

src/engine/documentation/Handler Specific Documentation/dbKitHandler_Documentation.md

@@ -1,54 +0,0 @@
-# dbKitHandler Documentation
-
-## Overview
-This document describes the database relationships and interactions for the `dbKitHandler` class. The kit handler manages static data about game kits, which are predefined sets of items or abilities that players can obtain or use in the game.
-
-## Handler Class
-**File:** `src/engine/db/handlers/dbKitHandler.java`
-**Class:** `dbKitHandler`
-**Extends:** `dbHandlerBase`
-
-## Database Tables
-
-### Main Kit Table
-- **Table Name:** `static_rune_validkit`
-- **Description:** Stores information about valid kits available in the game, including their properties and restrictions
-- **Columns:** 
-  - UID (Primary Key)
-  - kitName
-  - description
-  - raceRestriction
-  - classRestriction
-  - itemLimit
-  - isAvailable
-
-## Key Queries
-
-### GET_ALL_KITS
-```sql
-SELECT * FROM `static_rune_validkit`
-```
-**File:** `dbKitHandler.java`, Line ~29
-
-### GET_KIT_BY_NAME
-```sql
-SELECT * FROM `static_rune_validkit` WHERE `kitName`=?
-```
-**File:** `dbKitHandler.java`, Line ~45
-
-## Relationships
-
-1. **Kit to Race Restrictions:** Many-to-many relationship through raceRestriction field
-2. **Kit to Class Restrictions:** Many-to-many relationship through classRestriction field
-3. **Kit to Items:** One-to-many relationship via itemLimit referencing items in the game
-
-## Java Field to Database Column Mappings
-
-| Java Field | Database Column | Notes |
-|------------|-----------------|-------|
-| `kitName` | `static_rune_validkit.kitName` | Unique name identifier for the kit |
-| `description` | `static_rune_validkit.description` | Description of the kit's purpose and benefits |
-| `raceRestriction` | `static_rune_validkit.raceRestriction` | Race restriction for the kit |
-| `classRestriction` | `static_rune_validkit.classRestriction` | Class restriction for the kit |
-| `itemLimit` | `static_rune_validkit.itemLimit` | Maximum number of items allowed in this kit |
-| `isAvailable` | `static_rune_validkit.isAvailable` | Boolean flag indicating if kit is currently available |

src/engine/documentation/Handler Specific Documentation/dbLootHandler_Documentation.md

@@ -1,91 +0,0 @@
-# dbLootHandler Documentation
-
-## Overview
-This document describes the database relationships and interactions for the `dbLootHandler` class. The loot handler manages static loot tables and item generation data used in the game's loot system, including general tables, item tables, modifier tables, and booty sets.
-
-## Handler Class
-**File:** `src/engine/db/handlers/dbLootHandler.java`
-**Class:** `dbLootHandler`
-**Extends:** `dbHandlerBase`
-
-## Database Tables
-
-### Main Tables
-- **Table Name:** `static_loot_gen`
-- **Description:** Stores general loot table entries for item generation
-- **Columns:** 
-  - genTable (Primary Key)
-  - itemID
-  - weight
-  - minLevel
-  - maxLevel
-
-### Related Tables
-
-| Table Name | Description | Relationship |
-|------------|-------------|--------------|
-| `static_loot_item` | Stores item-specific loot table entries | One-to-many with genTable |
-| `static_loot_mod` | Stores modifier information for loot items | One-to-many with modTable |
-| `static_loot_modtype` | Defines modifier types used in loot systems | One-to-many with modType |
-| `static_loot_bootySet` | Stores booty set definitions for loot generation | One-to-many with bootySet |
-
-## Key Queries
-
-### LOAD_GEN_ITEM_TABLES
-```sql
-SELECT * FROM `static_loot_gen`
-```
-**File:** `dbLootHandler.java`, Line ~32
-
-### LOAD_ITEM_TABLES
-```sql
-SELECT * FROM `static_loot_item`
-```
-**File:** `dbLootHandler.java`, Line ~64
-
-### LOAD_MOD_TABLES
-```sql
-SELECT * FROM `static_loot_mod`
-```
-**File:** `dbLootHandler.java`, Line ~96
-
-### LOAD_MOD_TYPE_TABLES
-```sql
-SELECT * FROM `static_loot_modtype`
-```
-**File:** `dbLootHandler.java`, Line ~128
-
-### LOAD_BOOTY_TABLES
-```sql
-SELECT * FROM static_loot_bootySet
-```
-**File:** `dbLootHandler.java`, Line ~160
-
-### LOAD_ENCHANT_VALUES
-```sql
-SELECT `IDString`, `minMod` FROM `static_power_effectmod` WHERE `modType` = ?
-```
-**File:** `dbLootHandler.java`, Line ~192
-
-## Relationships
-
-1. **Loot Generation Tables:** The main loot tables are related through the genTable, itemTable, and modTable fields to form a hierarchical loot generation system
-2. **Item Tables:** Connected to general tables through itemID fields for specific item definitions
-3. **Modifier Tables:** Linked through modTable and modType fields for modifier definitions
-4. **Booty Sets:** Connected through bootySet field for specific booty set configurations
-
-## Java Field to Database Column Mappings
-
-| Java Field | Database Column | Notes |
-|------------|-----------------|-------|
-| `genTableID` | `static_loot_gen.genTable` | Unique identifier for the loot table |
-| `itemID` | `static_loot_gen.itemID` | Item ID for this loot entry |
-| `weight` | `static_loot_gen.weight` | Weight for random selection |
-| `minLevel` | `static_loot_gen.minLevel` | Minimum level requirement |
-| `maxLevel` | `static_loot_gen.maxLevel` | Maximum level requirement |
-| `itemTableID` | `static_loot_item.itemTable` | Item table identifier |
-| `modTableID` | `static_loot_mod.modTable` | Modifier table identifier |
-| `modTypeID` | `static_loot_modtype.modType` | Modifier type identifier |
-| `bootySetID` | `static_loot_bootySet.bootySet` | Booty set identifier |
-| `IDString` | `static_power_effectmod.IDString` | ID string for effect modifiers |
-| `minMod` | `static_power_effectmod.minMod` | Minimum modifier value |

src/engine/documentation/Handler Specific Documentation/dbMenuHandler_Documentation.md

@@ -1,49 +0,0 @@
-# dbMenuHandler Documentation
-
-## Overview
-This document describes the database relationships and interactions for the `dbMenuHandler` class. The menu handler manages NPC menu options and their associated data, providing functionality to retrieve menu options based on menu IDs.
-
-## Handler Class
-**File:** `src/engine/db/handlers/dbMenuHandler.java`
-**Class:** `dbMenuHandler`
-**Extends:** `dbHandlerBase`
-
-## Database Tables
-
-### Main Table
-- **Table Name:** `static_npc_menuoption`
-- **Description:** Stores NPC menu option data including text, actions, and relationships to parent menus
-- **Columns:** 
-  - menuID (Primary Key)
-  - optionText
-  - actionType
-  - actionValue
-  - nextMenuID
-  - conditionType
-  - conditionValue
-
-## Key Queries
-
-### GET_MENU_OPTIONS
-```sql
-SELECT * FROM `static_npc_menuoption` WHERE menuID = ?
-```
-**File:** `dbMenuHandler.java`, Line ~25
-
-## Relationships
-
-1. **Menu Options to Menu:** One-to-many relationship via menuID field referencing parent menu structure
-2. **Menu Options to Next Menu:** Many-to-one relationship via nextMenuID field for navigation between menus
-3. **Menu Options to Conditions:** Zero-to-many relationship via conditionType and conditionValue fields for dynamic menu display
-
-## Java Field to Database Column Mappings
-
-| Java Field | Database Column | Notes |
-|------------|-----------------|-------|
-| `menuID` | `static_npc_menuoption.menuID` | Unique identifier for the parent menu |
-| `optionText` | `static_npc_menuoption.optionText` | Text displayed for this menu option |
-| `actionType` | `static_npc_menuoption.actionType` | Type of action to perform when selected |
-| `actionValue` | `static_npc_menuoption.actionValue` | Value associated with the action |
-| `nextMenuID` | `static_npc_menuoption.nextMenuID` | ID of the menu to navigate to when selected |
-| `conditionType` | `static_npc_menuoption.conditionType` | Type of condition for displaying this option |
-| `conditionValue` | `static_npc_menuoption.conditionValue` | Value associated with the condition |

src/engine/documentation/Handler Specific Documentation/dbMineHandler_Documentation.md

@@ -1,83 +0,0 @@
-# dbMineHandler Documentation
-
-## Overview
-This document describes the database relationships and interactions for the `dbMineHandler` class. The mine handler manages mine objects and their properties, including ownership, resource types, production types, and flags for various mine behaviors.
-
-## Handler Class
-**File:** `src/engine/db/handlers/dbMineHandler.java`
-**Class:** `dbMineHandler`
-**Extends:** `dbHandlerBase`
-
-## Database Tables
-
-### Main Table
-- **Table Name:** `obj_mine`
-- **Description:** Stores mine-specific data including owner, resource type, production type, and flags
-- **Columns:** 
-  - UID (Primary Key)
-  - mine_ownerUID
-  - mine_resource
-  - mine_type
-  - flags
-
-### Related Tables
-
-| Table Name | Description | Relationship |
-|------------|-------------|--------------|
-| `obj_building` | Base building data for mines | One-to-one with obj_mine via UID |
-| `object` | Generic object data including parent relationships | One-to-one with obj_mine via UID |
-
-## Key Queries
-
-### GET_MINE
-```sql
-SELECT `obj_building`.*, `object`.`parent` FROM `object` INNER JOIN `obj_building` ON `obj_building`.`UID` = `object`.`UID` WHERE `object`.`UID` = ?
-```
-**File:** `dbMineHandler.java`, Line ~25
-
-### GET_ALL_MINES_FOR_SERVER
-```sql
-SELECT `obj_mine`.*, `object`.`parent` FROM `object` INNER JOIN `obj_mine` ON `obj_mine`.`UID` = `object`.`UID`
-```
-**File:** `dbMineHandler.java`, Line ~43
-
-### CHANGE_OWNER
-```sql
-UPDATE `obj_mine` SET `mine_ownerUID`=? WHERE `UID`=?
-```
-**File:** `dbMineHandler.java`, Line ~57
-
-### CHANGE_RESOURCE
-```sql
-UPDATE `obj_mine` SET `mine_resource`=? WHERE `UID`=?
-```
-**File:** `dbMineHandler.java`, Line ~71
-
-### CHANGE_TYPE
-```sql
-UPDATE `obj_mine` SET `mine_type`=? WHERE `UID`=?
-```
-**File:** `dbMineHandler.java`, Line ~85
-
-### SET_FLAGS
-```sql
-UPDATE `obj_mine` SET `flags`=? WHERE `UID`=?
-```
-**File:** `dbMineHandler.java`, Line ~99
-
-## Relationships
-
-1. **Mine to Building:** One-to-one relationship via UID field (mine data extends building data)
-2. **Mine to Owner:** Many-to-one relationship via mine_ownerUID referencing obj_character.UID
-3. **Mine to Resource:** Many-to-one relationship via mine_resource field linking to resource definitions
-4. **Mine to Parent Object:** One-to-one relationship through object table for parent-child hierarchies
-
-## Java Field to Database Column Mappings
-
-| Java Field | Database Column | Notes |
-|------------|-----------------|-------|
-| `mine_ownerUID` | `obj_mine.mine_ownerUID` | Character UID of the mine owner |
-| `mine_resource` | `obj_mine.mine_resource` | Resource type being mined |
-| `mine_type` | `obj_mine.mine_type` | Production type of the mine |
-| `flags` | `obj_mine.flags` | Bit flags for mine properties |
-| `UID` | `obj_mine.UID` | Unique identifier for the mine object |

src/engine/documentation/Handler Specific Documentation/dbMobBaseHandler_Documentation.md

@@ -1,66 +0,0 @@
-# dbMobBaseHandler Documentation
-
-## Overview
-This document describes the database relationships and interactions for the `dbMobBaseHandler` class. This handler manages static data about mob (monster) base properties in Magicbane, including their characteristics, stats, and behaviors.
-
-## Handler Class
-**File:** `src/engine/db/handlers/dbMobBaseHandler.java`
-**Class:** `dbMobBaseHandler`
-**Extends:** `dbHandlerBase`
-
-## Database Tables
-
-### Main Mob Base Table
-- **Table Name:** `static_mob_base`
-- **Description:** Core table storing base properties of mobs, including names, descriptions, and basic characteristics
-- **Columns:** 
-  - UID (Primary Key)
-  - name
-  - description
-  - mobType
-  - level
-  - health
-
-### Related Tables
-
-| Table Name | Description | Relationship |
-|------------|-------------|--------------|
-| `static_mob_stats` | Stores stat information for mobs | MobBaseID → static_mob_base.UID |
-| `static_mob_loot` | Stores loot information for mobs | MobBaseID → static_mob_base.UID |
-
-## Key Queries
-
-### Get Mob Base by UID
-```sql
-SELECT * FROM static_mob_base WHERE `UID` = ?
-```
-**File:** `dbMobBaseHandler.java`, Line ~25
-
-### Get Mob Stats
-```sql
-SELECT * FROM static_mob_stats WHERE `mobBaseID` = ?
-```
-**File:** `dbMobBaseHandler.java`, Line ~40
-
-### Get Mob Loot
-```sql
-SELECT * FROM static_mob_loot WHERE `mobBaseID` = ?
-```
-**File:** `dbMobBaseHandler.java`, Line ~55
-
-## Relationships
-
-1. **Mob Base to Stats:** One-to-many relationship via mobBaseID field in static_mob_stats referencing static_mob_base.UID
-2. **Mob Base to Loot:** One-to-many relationship via mobBaseID field in static_mob_loot referencing static_mob_base.UID
-
-## Java Field to Database Column Mappings
-
-| Java Field | Database Column | Notes |
-|------------|-----------------|-------|
-| `UID` | `static_mob_base.UID` | Unique identifier for the mob |
-| `name` | `static_mob_base.name` | Name of the mob |
-| `description` | `static_mob_base.description` | Description of the mob |
-| `mobType` | `static_mob_base.mobType` | Type of mob |
-| `level` | `static_mob_base.level` | Level of the mob |
-| `health` | `static_mob_base.health` | Base health of the mob |
-| `other fields...` | Various columns | Other properties related to mob base data |

src/engine/documentation/Handler Specific Documentation/dbMobHandler_Documentation.md

@@ -1,70 +0,0 @@
-# dbMobHandler Documentation
-
-## Overview
-This document describes the database relationships and interactions for the `dbMobHandler` class. This handler manages dynamic mob data in the game world, including their current state, location, and behavior.
-
-## Handler Class
-**File:** `src/engine/db/handlers/dbMobHandler.java`
-**Class:** `dbMobHandler`
-**Extends:** `dbHandlerBase`
-
-## Database Tables
-
-### Main Mob Table
-- **Table Name:** `dyn_mob`
-- **Description:** Stores current state information for mobs in the game world, including location, health, and status
-- **Columns:** 
-  - UID (Primary Key)
-  - mobBaseID
-  - zoneUUID
-  - x
-  - y
-  - z
-  - health
-  - isAlive
-
-### Related Tables
-
-| Table Name | Description | Relationship |
-|------------|-------------|--------------|
-| `obj_character` | Characters that may interact with mobs | OwnerUID → obj_character.UID |
-
-## Key Queries
-
-### Get Mob by UID
-```sql
-SELECT * FROM dyn_mob WHERE `UID` = ?
-```
-**File:** `dbMobHandler.java`, Line ~25
-
-### Save Mob
-```sql
-INSERT INTO `dyn_mob` (`mobBaseID`, `zoneUUID`, `x`, `y`, `z`, `health`, `isAlive`) VALUES(?,?,?,?,?,?,?)
-```
-**File:** `dbMobHandler.java`, Line ~40
-
-### Get Mobs by Zone
-```sql
-SELECT * FROM dyn_mob WHERE `zoneUUID` = ?
-```
-**File:** `dbMobHandler.java`, Line ~55
-
-## Relationships
-
-1. **Mob to Mob Base:** Many-to-one relationship via mobBaseID field referencing static_mob_base.UID
-2. **Mob to Zone:** Many-to-one relationship via zoneUUID field referencing obj_zone.UID
-3. **Mob to Owner:** Many-to-one relationship via ownerUID field referencing obj_character.UID (if applicable)
-
-## Java Field to Database Column Mappings
-
-| Java Field | Database Column | Notes |
-|------------|-----------------|-------|
-| `UID` | `dyn_mob.UID` | Unique identifier for the mob |
-| `mobBaseID` | `dyn_mob.mobBaseID` | UID of the base mob definition |
-| `zoneUUID` | `dyn_mob.zoneUUID` | Zone where the mob is located |
-| `x` | `dyn_mob.x` | X coordinate of mob position |
-| `y` | `dyn_mob.y` | Y coordinate of mob position |
-| `z` | `dyn_mob.z` | Z coordinate of mob position |
-| `health` | `dyn_mob.health` | Current health of the mob |
-| `isAlive` | `dyn_mob.isAlive` | Flag indicating if mob is alive |
-| `other fields...` | Various columns | Other properties related to mob state |

src/engine/documentation/Handler Specific Documentation/dbNPCHandler_Documentation.md

@@ -1,71 +0,0 @@
-# dbNPCHandler Documentation
-
-## Overview
-This document describes the database relationships and interactions for the `dbNPCHandler` class. This handler manages non-player character (NPC) data, including their base properties, current state, and behaviors in the game world.
-
-## Handler Class
-**File:** `src/engine/db/handlers/dbNPCHandler.java`
-**Class:** `dbNPCHandler`
-**Extends:** `dbHandlerBase`
-
-## Database Tables
-
-### Main NPC Table
-- **Table Name:** `dyn_npc`
-- **Description:** Stores current state information for NPCs, including location, health, and behavior flags
-- **Columns:** 
-  - UID (Primary Key)
-  - npcBaseID
-  - zoneUUID
-  - x
-  - y
-  - z
-  - health
-  - isAlive
-  - behavior
-
-### Related Tables
-
-| Table Name | Description | Relationship |
-|------------|-------------|--------------|
-| `static_npc_base` | Base properties of NPCs | npcBaseID → static_npc_base.UID |
-
-## Key Queries
-
-### Get NPC by UID
-```sql
-SELECT * FROM dyn_npc WHERE `UID` = ?
-```
-**File:** `dbNPCHandler.java`, Line ~25
-
-### Save NPC
-```sql
-INSERT INTO `dyn_npc` (`npcBaseID`, `zoneUUID`, `x`, `y`, `z`, `health`, `isAlive`, `behavior`) VALUES(?,?,?,?,?,?,?,?)
-```
-**File:** `dbNPCHandler.java`, Line ~40
-
-### Get NPCs by Zone
-```sql
-SELECT * FROM dyn_npc WHERE `zoneUUID` = ?
-```
-**File:** `dbNPCHandler.java`, Line ~55
-
-## Relationships
-
-1. **NPC to NPC Base:** Many-to-one relationship via npcBaseID field referencing static_npc_base.UID
-2. **NPC to Zone:** Many-to-one relationship via zoneUUID field referencing obj_zone.UID
-
-## Java Field to Database Column Mappings
-
-| Java Field | Database Column | Notes |
-|------------|-----------------|-------|
-| `UID` | `dyn_npc.UID` | Unique identifier for the NPC |
-| `npcBaseID` | `dyn_npc.npcBaseID` | UID of the base NPC definition |
-| `zoneUUID` | `dyn_npc.zoneUUID` | Zone where the NPC is located |
-| `x` | `dyn_npc.x` | X coordinate of NPC position |
-| `y` | `dyn_npc.y` | Y coordinate of NPC position |
-| `z` | `dyn_npc.z` | Z coordinate of NPC position |
-| `health` | `dyn_npc.health` | Current health of the NPC |
-| `isAlive` | `dyn_npc.isAlive` | Flag indicating if NPC is alive |
-| `behavior` | `dyn_npc.behavior` | Behavior type or state of the NPC |
-| `other fields...` | Various columns | Other properties related to NPC state |

src/engine/documentation/Handler Specific Documentation/dbPetitionHandler_Documentation.md

@@ -1,72 +0,0 @@
-# dbPetitionHandler Documentation
-
-## Overview
-This document describes the database relationships and interactions for the `dbPetitionHandler` class. This handler manages player petitions, which are requests or complaints submitted by players to game administrators.
-
-## Handler Class
-**File:** `src/engine/db/handlers/dbPetitionHandler.java`
-**Class:** `dbPetitionHandler`
-**Extends:** `dbHandlerBase`
-
-## Database Tables
-
-### Main Petition Table
-- **Table Name:** `dyn_petition`
-- **Description:** Stores information about player petitions, including submission details, status, and resolution
-- **Columns:** 
-  - UID (Primary Key)
-  - characterID
-  - petitionType
-  - description
-  - status
-  - submittedDate
-  - resolvedDate
-
-### Related Tables
-
-| Table Name | Description | Relationship |
-|------------|-------------|--------------|
-| `obj_character` | Characters who submitted petitions | characterID → obj_character.UID |
-
-## Key Queries
-
-### Get Petition by UID
-```sql
-SELECT * FROM dyn_petition WHERE `UID` = ?
-```
-**File:** `dbPetitionHandler.java`, Line ~25
-
-### Save Petition
-```sql
-INSERT INTO `dyn_petition` (`characterID`, `petitionType`, `description`, `status`, `submittedDate`) VALUES(?,?,?,?,?)
-```
-**File:** `dbPetitionHandler.java`, Line ~40
-
-### Get Petitions by Character
-```sql
-SELECT * FROM dyn_petition WHERE `characterID` = ?
-```
-**File:** `dbPetitionHandler.java`, Line ~55
-
-### Update Petition Status
-```sql
-UPDATE `dyn_petition` SET `status`=?, `resolvedDate`=? WHERE `UID`=?
-```
-**File:** `dbPetitionHandler.java`, Line ~70
-
-## Relationships
-
-1. **Petition to Character:** Many-to-one relationship via characterID field referencing obj_character.UID
-
-## Java Field to Database Column Mappings
-
-| Java Field | Database Column | Notes |
-|------------|-----------------|-------|
-| `UID` | `dyn_petition.UID` | Unique identifier for the petition |
-| `characterID` | `dyn_petition.characterID` | UID of the character who submitted the petition |
-| `petitionType` | `dyn_petition.petitionType` | Type or category of the petition |
-| `description` | `dyn_petition.description` | Description of the petition |
-| `status` | `dyn_petition.status` | Current status of the petition (open, in progress, resolved) |
-| `submittedDate` | `dyn_petition.submittedDate` | Timestamp when petition was submitted |
-| `resolvedDate` | `dyn_petition.resolvedDate` | Timestamp when petition was resolved |
-| `other fields...` | Various columns | Other properties related to petition data |

src/engine/documentation/Handler Specific Documentation/dbPlayerCharacterHandler_Documentation.md

@@ -1,149 +0,0 @@
-# Player Character Handler Documentation
-
-## Overview
-This document describes the database relationships and interactions for the `dbPlayerCharacterHandler` class. The player character handler manages all aspects of character data including creation, updates, and retrieval operations within the Magicbane emulator system.
-
-## Handler Class
-**File:** `src/engine/db/handlers/dbPlayerCharacterHandler.java`
-**Class:** `dbPlayerCharacterHandler`
-**Extends:** `dbHandlerBase`
-
-## Database Tables
-
-### Main Character Table
-- **Table Name:** `obj_character`
-- **Description:** Core character information including attributes, stats, and personal details
-- **Columns:** 
-  - UID (Primary Key)
-  - char_firstname
-  - char_lastname
-  - char_isActive
-  - char_raceID
-  - char_baseClassID
-  - char_promotionClassID
-  - char_strMod
-  - char_dexMod
-  - char_conMod
-  - char_intMod
-  - char_spiMod
-  - char_experience
-  - char_skinColor
-  - char_hairColor
-  - char_hairStyle
-  - char_beardColor
-  - char_beardStyle
-  - char_bindBuilding
-  - guildUID
-  - guild_isInnerCouncil
-  - guild_isRecruiter
-  - guild_isTaxCollector
-  - guild_isFullMember
-  - guild_title
-  - anniversery
-  - hash
-
-### Related Tables
-
-| Table Name | Description | Relationship |
-|------------|-------------|--------------|
-| `dyn_character_ignore` | Stores character ignore lists for players | accountUID → obj_account.UID |
-| `dyn_character_friends` | Manages friendship relationships between characters | CharacterID → obj_character.UID |
-| `dyn_character_guildhistory` | Tracks character's guild membership history | CharacterID → obj_character.UID, GuildID → obj_guild.UID |
-| `dyn_character_heraldy` | Stores heraldry information for characters | CharacterID → obj_character.UID |
-| `dyn_character_killmap` | Records kill statistics for characters | CharacterID → obj_character.UID |
-| `dyn_character_murdermap` | Tracks murder statistics for characters | CharacterID → obj_character.UID |
-| `dyn_character_power` | Manages character powers/abilities | CharacterID → obj_character.UID |
-| `dyn_character_rune` | Stores rune information for characters | CharacterID → obj_character.UID |
-| `dyn_character_skill` | Manages character skills and training | CharacterID → obj_character.UID |
-
-## Key Queries
-
-### Create New Character
-```sql
-CALL `character_CREATE`(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-```
-**File:** `dbPlayerCharacterHandler.java`, Line ~35
-
-### Get Characters for Account
-```sql
-SELECT `obj_character`.*, `object`.`parent` FROM `object` INNER JOIN `obj_character` ON `obj_character`.`UID` = `object`.`UID` WHERE `object`.`parent`=? && `obj_character`.`char_isActive`='1';
-```
-**File:** `dbPlayerCharacterHandler.java`, Line ~109
-
-### Get All Active Characters
-```sql
-SELECT `obj_character`.*, `object`.`parent` FROM `object` INNER JOIN `obj_character` ON `obj_character`.`UID` = `object`.`UID` WHERE `obj_character`.`char_isActive`='1';
-```
-**File:** `dbPlayerCharacterHandler.java`, Line ~127
-
-### Get Character by UID
-```sql
-SELECT `obj_character`.*, `object`.`parent` FROM `object` INNER JOIN `obj_character` ON `obj_character`.`UID` = `object`.`UID` WHERE `object`.`UID` = ?
-```
-**File:** `dbPlayerCharacterHandler.java`, Line ~185
-
-### Get Character by Name
-```sql
-SELECT `char_firstname` FROM `obj_character` WHERE `char_isActive`=1 && `char_firstname`=?
-```
-**File:** `dbPlayerCharacterHandler.java`, Line ~203
-
-### Update Character Name
-```sql
-UPDATE `obj_character` SET `char_firstname`=?, `char_lastname`=? WHERE `char_firstname`=? AND `char_isActive`='1'
-```
-**File:** `dbPlayerCharacterHandler.java`, Line ~222
-
-### Set Character Ignore List
-```sql
-INSERT INTO `dyn_character_ignore` (`accountUID`, `ignoringUID`, `characterName`) VALUES (?, ?, ?)
-```
-**File:** `dbPlayerCharacterHandler.java`, Line ~83
-
-### Get Character Ignore List
-```sql
-SELECT * FROM `dyn_character_ignore` WHERE `accountUID` = ?
-```
-**File:** `dbPlayerCharacterHandler.java`, Line ~151
-
-## Relationships
-
-1. **Character to Account:** Many-to-one (via `obj_character.parent` field referencing `obj_account.UID`)
-2. **Character to Guild:** Many-to-one (via `obj_character.guildUID` field)
-3. **Character to Ignore List:** One-to-many (via `dyn_character_ignore.accountUID`)
-4. **Character to Friends List:** One-to-many (via `dyn_character_friends.CharacterID`)
-5. **Character to Guild History:** One-to-many (via `dyn_character_guildhistory.CharacterID`)
-6. **Character to Heraldry:** One-to-one (via `dyn_character_heraldy.CharacterID`)
-7. **Character to Skills:** One-to-many (via `dyn_character_skill.CharacterID`)
-8. **Character to Powers:** One-to-many (via `dyn_character_power.CharacterID`)
-9. **Character to Runes:** One-to-many (via `dyn_character_rune.CharacterID`)
-
-## Java Field to Database Column Mappings
-
-| Java Field | Database Column | Notes |
-|------------|-----------------|-------|
-| `firstName` | `obj_character.char_firstname` | Character's first name |
-| `lastName` | `obj_character.char_lastname` | Character's last name |
-| `isActive` | `obj_character.char_isActive` | Boolean flag for active status |
-| `race` | `obj_character.char_raceID` | Race identifier |
-| `baseClass` | `obj_character.char_baseClassID` | Base class identifier |
-| `promotionClass` | `obj_character.char_promotionClassID` | Promotion class identifier |
-| `strMod` | `obj_character.char_strMod` | Strength modifier |
-| `dexMod` | `obj_character.char_dexMod` | Dexterity modifier |
-| `conMod` | `obj_character.char_conMod` | Constitution modifier |
-| `intMod` | `obj_character.char_intMod` | Intelligence modifier |
-| `spiMod` | `obj_character.char_spiMod` | Spirit modifier |
-| `exp` | `obj_character.char_experience` | Experience points |
-| `skinColor` | `obj_character.char_skinColor` | Skin color value |
-| `hairColor` | `obj_character.char_hairColor` | Hair color value |
-| `hairStyle` | `obj_character.char_hairStyle` | Hair style identifier |
-| `beardColor` | `obj_character.char_beardColor` | Beard color value |
-| `beardStyle` | `obj_character.char_beardStyle` | Beard style identifier |
-| `bindBuilding` | `obj_character.char_bindBuilding` | Bind building UID |
-| `guildUID` | `obj_character.guildUID` | Guild identifier |
-| `isInnerCouncil` | `obj_character.guild_isInnerCouncil` | Inner council status |
-| `isRecruiter` | `obj_character.guild_isRecruiter` | Recruiter status |
-| `isTaxCollector` | `obj_character.guild_isTaxCollector` | Tax collector status |
-| `isFullMember` | `obj_character.guild_isFullMember` | Full member status |
-| `guildTitle` | `obj_character.guild_title` | Guild title identifier |
-| `anniversery` | `obj_character.anniversery` | Anniversary flag |

src/engine/documentation/Handler Specific Documentation/dbPowerHandler_Documentation.md

@@ -1,81 +0,0 @@
-# Power Handler Documentation
-
-## Overview
-This document describes the database relationships and interactions for the `dbPowerHandler` class. The power handler manages game powers and abilities that characters can possess and use in the Magicbane emulator system.
-
-## Handler Class
-**File:** `src/engine/db/handlers/dbPowerHandler.java`
-**Class:** `dbPowerHandler`
-**Extends:** `dbHandlerBase`
-
-## Database Tables
-
-### Main Table(s)
-- **Table Name:** `obj_power`
-- **Description:** Core power information including name, description, and activation properties
-- **Columns:** 
-  - UID (Primary Key)
-  - name
-  - description
-  - powerType
-  - activationType
-  - cooldownTime
-  - duration
-  - maxLevel
-  - cost
-  - iconID
-
-### Related Tables
-
-| Table Name | Description | Relationship |
-|------------|-------------|--------------|
-| `obj_character_power` | Tracks character-specific power levels and status | CharacterID → obj_character.UID, PowerID → obj_power.UID |
-| `static_power_requirement` | Stores requirements for unlocking powers | PowerID → obj_power.UID |
-
-## Key Queries
-
-### Get Power by ID
-```sql
-SELECT * FROM `obj_power` WHERE `UID`=?
-```
-**File:** `dbPowerHandler.java`, Line ~60
-
-### Get Character's Powers
-```sql
-SELECT p.*, cp.level, cp.isUnlocked 
-FROM `obj_power` p 
-INNER JOIN `obj_character_power` cp ON p.`UID` = cp.`PowerID` 
-WHERE cp.`CharacterID`=?
-```
-**File:** `dbPowerHandler.java`, Line ~85
-
-### Get Power Requirements
-```sql
-SELECT * FROM `static_power_requirement` WHERE `PowerID`=?
-```
-**File:** `dbPowerHandler.java`, Line ~120
-
-## Relationships
-
-1. **Power to Character:** Many-to-many through `obj_character_power` table
-2. **Power to Requirements:** One-to-many (via `static_power_requirement.PowerID`)
-3. **Power to Static Data:** Power definitions are stored in static tables
-
-## Java Field to Database Column Mappings
-
-| Java Field | Database Column | Notes |
-|------------|-----------------|-------|
-| `name` | `obj_power.name` | Power name |
-| `description` | `obj_power.description` | Power description |
-| `powerType` | `obj_power.powerType` | Type of power (active, passive) |
-| `activationType` | `obj_power.activationType` | How the power is activated |
-| `cooldownTime` | `obj_power.cooldownTime` | Cooldown period in seconds |
-| `duration` | `obj_power.duration` | Duration of power effect |
-| `maxLevel` | `obj_power.maxLevel` | Maximum level for this power |
-| `cost` | `obj_power.cost` | Resource cost to use power |
-| `iconID` | `obj_power.iconID` | Icon identifier for UI display |
-
-## Notes
-- The power system is designed to support both active and passive abilities
-- Power requirements are stored separately to allow flexible unlocking mechanisms
-- Character-specific power data is tracked in the `obj_character_power` table

src/engine/documentation/Handler Specific Documentation/dbPromotionClassHandler_Documentation.md

@@ -1,77 +0,0 @@
-# Promotion Class Handler Documentation
-
-## Overview
-This document describes the database relationships and interactions for the `dbPromotionClassHandler` class. The promotion class handler manages character class promotions and advancement systems in the Magicbane emulator.
-
-## Handler Class
-**File:** `src/engine/db/handlers/dbPromotionClassHandler.java`
-**Class:** `dbPromotionClassHandler`
-**Extends:** `dbHandlerBase`
-
-## Database Tables
-
-### Main Table(s)
-- **Table Name:** `obj_promotionclass`
-- **Description:** Core promotion class information including name, requirements, and advancement paths
-- **Columns:** 
-  - UID (Primary Key)
-  - name
-  - description
-  - baseClassID
-  - requiredLevel
-  - requiredItems
-  - statBonuses
-  - skillBonus
-
-### Related Tables
-
-| Table Name | Description | Relationship |
-|------------|-------------|--------------|
-| `obj_character_promotionclass` | Tracks character-specific promotion class status | CharacterID → obj_character.UID, PromotionClassID → obj_promotionclass.UID |
-| `static_promotion_requirement` | Stores requirements for class promotions | PromotionClassID → obj_promotionclass.UID |
-
-## Key Queries
-
-### Get Promotion Class by ID
-```sql
-SELECT * FROM `obj_promotionclass` WHERE `UID`=?
-```
-**File:** `dbPromotionClassHandler.java`, Line ~60
-
-### Get Character's Promotion Classes
-```sql
-SELECT pc.*, cpc.isUnlocked 
-FROM `obj_promotionclass` pc 
-INNER JOIN `obj_character_promotionclass` cpc ON pc.`UID` = cpc.`PromotionClassID` 
-WHERE cpc.`CharacterID`=?
-```
-**File:** `dbPromotionClassHandler.java`, Line ~85
-
-### Get Promotion Requirements
-```sql
-SELECT * FROM `static_promotion_requirement` WHERE `PromotionClassID`=?
-```
-**File:** `dbPromotionClassHandler.java`, Line ~120
-
-## Relationships
-
-1. **Promotion Class to Character:** Many-to-many through `obj_character_promotionclass` table
-2. **Promotion Class to Requirements:** One-to-many (via `static_promotion_requirement.PromotionClassID`)
-3. **Promotion Class to Base Class:** Many-to-one relationship via baseClassID
-
-## Java Field to Database Column Mappings
-
-| Java Field | Database Column | Notes |
-|------------|-----------------|-------|
-| `name` | `obj_promotionclass.name` | Promotion class name |
-| `description` | `obj_promotionclass.description` | Description of the promotion class |
-| `baseClassID` | `obj_promotionclass.baseClassID` | Reference to base class |
-| `requiredLevel` | `obj_promotionclass.requiredLevel` | Level required for promotion |
-| `requiredItems` | `obj_promotionclass.requiredItems` | Items required for promotion |
-| `statBonuses` | `obj_promotionclass.statBonuses` | Stat bonuses granted |
-| `skillBonus` | `obj_promotionclass.skillBonus` | Skill bonuses granted |
-
-## Notes
-- Promotion classes are tied to base classes and provide advancement paths for characters
-- The system supports both unlocked and locked promotion classes
-- Requirements are stored separately to allow flexible advancement mechanics

src/engine/documentation/Handler Specific Documentation/dbRaceHandler_Documentation.md

@@ -1,45 +0,0 @@
-# Race Handler Documentation
-
-## Overview
-This document describes the database relationships and interactions for the `dbRaceHandler` class. The race handler manages race-related data including beard colors and styles for different races in the Magicbane emulator.
-
-## Handler Class
-**File:** `src/engine/db/handlers/dbRaceHandler.java`
-**Class:** `dbRaceHandler`
-**Extends:** `dbHandlerBase`
-
-## Database Tables
-
-### Race-related Tables
-- **Table Name:** `static_rune_racebeardcolor`
-- **Description:** Stores beard color information for different races
-- **Columns:** 
-  - RaceID (Foreign Key)
-  - color
-
-## Key Queries
-
-### Get Beard Colors for Race
-```sql
-SELECT `color` FROM `static_rune_racebeardcolor` WHERE `RaceID` = ?
-```
-**File:** `dbRaceHandler.java`, Line ~25
-
-### Get Beard Styles for Race
-```sql
-SELECT `style` FROM `static_rune_racebeardstyle` WHERE `RaceID` = ?
-```
-**File:** `dbRaceHandler.java`, Line ~40
-
-## Relationships
-
-1. **Race to Beard Colors:** One-to-many (via `static_rune_racebeardcolor.RaceID`)
-2. **Race to Beard Styles:** One-to-many (via `static_rune_racebeardstyle.RaceID`)
-
-
-## Java Field to Database Column Mappings
-
-| Java Field | Database Column | Notes |
-|------------|-----------------|-------|
-| `RaceID` | `static_rune_racebeardcolor.RaceID` | Foreign key to race |
-| `color` | `static_rune_racebeardcolor.color` | Beard color value |

src/engine/documentation/Handler Specific Documentation/dbRealmHandler_Documentation.md

@@ -1,78 +0,0 @@
-# Realm Handler Documentation
-
-## Overview
-This document describes the database relationships and interactions for the `dbRealmHandler` class. The realm handler manages different game realms or worlds within the Magicbane emulator system.
-
-## Handler Class
-**File:** `src/engine/db/handlers/dbRealmHandler.java`
-**Class:** `dbRealmHandler`
-**Extends:** `dbHandlerBase`
-
-## Database Tables
-
-### Main Table(s)
-- **Table Name:** `obj_realm`
-- **Description:** Core realm information including name, status, and configuration settings
-- **Columns:** 
-  - UID (Primary Key)
-  - name
-  - description
-  - status
-  - maxPlayers
-  - serverIP
-  - serverPort
-  - isPublic
-  - creationDate
-
-### Related Tables
-
-| Table Name | Description | Relationship |
-|------------|-------------|--------------|
-| `dyn_realm_playerlist` | Tracks active players in each realm | RealmID → obj_realm.UID, CharacterID → obj_character.UID |
-| `obj_realm_config` | Configuration settings for each realm | RealmID → obj_realm.UID |
-
-## Key Queries
-
-### Get Realm by ID
-```sql
-SELECT * FROM `obj_realm` WHERE `UID`=?
-```
-**File:** `dbRealmHandler.java`, Line ~60
-
-### Get All Active Realms
-```sql
-SELECT * FROM `obj_realm` WHERE `status`='active'
-```
-**File:** `dbRealmHandler.java`, Line ~85
-
-### Get Realm Players
-```sql
-SELECT c.* FROM `obj_character` c 
-INNER JOIN `dyn_realm_playerlist` rpl ON c.`UID` = rpl.`CharacterID` 
-WHERE rpl.`RealmID`=?
-```
-**File:** `dbRealmHandler.java`, Line ~120
-
-## Relationships
-
-1. **Realm to Character:** Many-to-many through `dyn_realm_playerlist` table
-2. **Realm to Configuration:** One-to-one (via `obj_realm_config.RealmID`)
-3. **Realm to Player Status:** Real-time tracking of active players
-
-## Java Field to Database Column Mappings
-
-| Java Field | Database Column | Notes |
-|------------|-----------------|-------|
-| `name` | `obj_realm.name` | Realm name |
-| `description` | `obj_realm.description` | Description of the realm |
-| `status` | `obj_realm.status` | Current status (active, inactive) |
-| `maxPlayers` | `obj_realm.maxPlayers` | Maximum number of players allowed |
-| `serverIP` | `obj_realm.serverIP` | Server IP address |
-| `serverPort` | `obj_realm.serverPort` | Server port number |
-| `isPublic` | `obj_realm.isPublic` | Whether realm is publicly accessible |
-| `creationDate` | `obj_realm.creationDate` | When the realm was created |
-
-## Notes
-- Realms represent different game worlds or instances
-- Players can move between realms based on configuration
-- The system tracks real-time player presence in each realm

src/engine/documentation/Handler Specific Documentation/dbResistHandler_Documentation.md

@@ -1,69 +0,0 @@
-# Resist Handler Documentation
-
-## Overview
-This document describes the database relationships and interactions for the `dbResistHandler` class. The resist handler manages character resistance values against various damage types and effects in the Magicbane emulator system.
-
-## Handler Class
-**File:** `src/engine/db/handlers/dbResistHandler.java`
-**Class:** `dbResistHandler`
-**Extends:** `dbHandlerBase`
-
-## Database Tables
-
-### Main Table(s)
-- **Table Name:** `obj_resist`
-- **Description:** Core resistance information including damage type and resistance values
-- **Columns:** 
-  - UID (Primary Key)
-  - resistType
-  - value
-  - description
-
-### Related Tables
-
-| Table Name | Description | Relationship |
-|------------|-------------|--------------|
-| `obj_character_resist` | Tracks character-specific resistance values | CharacterID → obj_character.UID, ResistID → obj_resist.UID |
-| `static_resist_type` | Static definitions of resistance types | ResistTypeID → obj_resist.UID |
-
-## Key Queries
-
-### Get Resist by ID
-```sql
-SELECT * FROM `obj_resist` WHERE `UID`=?
-```
-**File:** `dbResistHandler.java`, Line ~60
-
-### Get Character's Resistances
-```sql
-SELECT r.*, cr.value as characterValue 
-FROM `obj_resist` r 
-INNER JOIN `obj_character_resist` cr ON r.`UID` = cr.`ResistID` 
-WHERE cr.`CharacterID`=?
-```
-**File:** `dbResistHandler.java`, Line ~85
-
-### Get Resist by Type
-```sql
-SELECT * FROM `obj_resist` WHERE `resistType`=?
-```
-**File:** `dbResistHandler.java`, Line ~120
-
-## Relationships
-
-1. **Resist to Character:** Many-to-many through `obj_character_resist` table
-2. **Resist to Static Types:** One-to-many (via `static_resist_type.ResistTypeID`)
-3. **Resist to Damage Types:** Direct mapping to game damage types
-
-## Java Field to Database Column Mappings
-
-| Java Field | Database Column | Notes |
-|------------|-----------------|-------|
-| `resistType` | `obj_resist.resistType` | Type of resistance (fire, ice, etc.) |
-| `value` | `obj_resist.value` | Resistance value |
-| `description` | `obj_resist.description` | Description of the resistance type |
-
-## Notes
-- Resistances are applied to various damage types in combat
-- Character-specific resistances can be modified through equipment or abilities
-- The system supports multiple resistance types for comprehensive damage mitigation

src/engine/documentation/Handler Specific Documentation/dbRuneBaseAttributeHandler_Documentation.md

@@ -1,77 +0,0 @@
-# Rune Base Attribute Handler Documentation
-
-## Overview
-This document describes the database relationships and interactions for the `dbRuneBaseAttributeHandler` class. The rune base attribute handler manages the fundamental attributes and properties of rune base items in the Magicbane emulator system.
-
-## Handler Class
-**File:** `src/engine/db/handlers/dbRuneBaseAttributeHandler.java`
-**Class:** `dbRuneBaseAttributeHandler`
-**Extends:** `dbHandlerBase`
-
-## Database Tables
-
-### Main Table(s)
-- **Table Name:** `obj_runebaseattribute`
-- **Description:** Core rune base attribute information including name, description, and property values
-- **Columns:** 
-  - UID (Primary Key)
-  - name
-  - description
-  - attributeType
-  - minValue
-  - maxValue
-  - defaultValue
-  - isStackable
-
-### Related Tables
-
-| Table Name | Description | Relationship |
-|------------|-------------|--------------|
-| `obj_rune_baseattribute` | Links rune base items to their attributes | RuneBaseID → obj_runebase.UID, AttributeID → obj_runebaseattribute.UID |
-| `static_rune_attribute_type` | Static definitions of attribute types | AttributeTypeID → obj_runebaseattribute.UID |
-
-## Key Queries
-
-### Get Rune Base Attribute by ID
-```sql
-SELECT * FROM `obj_runebaseattribute` WHERE `UID`=?
-```
-**File:** `dbRuneBaseAttributeHandler.java`, Line ~60
-
-### Get Attributes for Rune Base
-```sql
-SELECT rba.*, rbaa.attributeValue 
-FROM `obj_runebaseattribute` rba 
-INNER JOIN `obj_rune_baseattribute` rbaa ON rba.`UID` = rbaa.`AttributeID` 
-WHERE rbaa.`RuneBaseID`=?
-```
-**File:** `dbRuneBaseAttributeHandler.java`, Line ~85
-
-### Get Attribute by Type
-```sql
-SELECT * FROM `obj_runebaseattribute` WHERE `attributeType`=?
-```
-**File:** `dbRuneBaseAttributeHandler.java`, Line ~120
-
-## Relationships
-
-1. **Rune Base Attribute to Rune Base:** Many-to-many through `obj_rune_baseattribute` table
-2. **Rune Base Attribute to Static Types:** One-to-many (via `static_rune_attribute_type.AttributeTypeID`)
-3. **Attribute to Property Values:** Defines the range and default values for each attribute
-
-## Java Field to Database Column Mappings
-
-| Java Field | Database Column | Notes |
-|------------|-----------------|-------|
-| `name` | `obj_runebaseattribute.name` | Attribute name |
-| `description` | `obj_runebaseattribute.description` | Description of the attribute |
-| `attributeType` | `obj_runebaseattribute.attributeType` | Type of attribute (stat, effect, etc.) |
-| `minValue` | `obj_runebaseattribute.minValue` | Minimum value allowed |
-| `maxValue` | `obj_runebaseattribute.maxValue` | Maximum value allowed |
-| `defaultValue` | `obj_runebaseattribute.defaultValue` | Default value for the attribute |
-| `isStackable` | `obj_runebaseattribute.isStackable` | Whether the attribute can stack |
-
-## Notes
-- Rune base attributes define the core properties of rune items
-- Attributes can be applied to different rune base types
-- The system supports both fixed and variable attribute values

src/engine/documentation/Handler Specific Documentation/dbRuneBaseEffectHandler_Documentation.md

@@ -1,77 +0,0 @@
-# Rune Base Effect Handler Documentation
-
-## Overview
-This document describes the database relationships and interactions for the `dbRuneBaseEffectHandler` class. The rune base effect handler manages the effects and abilities that rune base items can provide in the Magicbane emulator system.
-
-## Handler Class
-**File:** `src/engine/db/handlers/dbRuneBaseEffectHandler.java`
-**Class:** `dbRuneBaseEffectHandler`
-**Extends:** `dbHandlerBase`
-
-## Database Tables
-
-### Main Table(s)
-- **Table Name:** `obj_runebaseeffect`
-- **Description:** Core rune base effect information including name, description, and activation properties
-- **Columns:** 
-  - UID (Primary Key)
-  - name
-  - description
-  - effectType
-  - activationType
-  - duration
-  - cooldownTime
-  - powerValue
-
-### Related Tables
-
-| Table Name | Description | Relationship |
-|------------|-------------|--------------|
-| `obj_rune_baseeffect` | Links rune base items to their effects | RuneBaseID → obj_runebase.UID, EffectID → obj_runebaseeffect.UID |
-| `static_rune_effect_type` | Static definitions of effect types | EffectTypeID → obj_runebaseeffect.UID |
-
-## Key Queries
-
-### Get Rune Base Effect by ID
-```sql
-SELECT * FROM `obj_runebaseeffect` WHERE `UID`=?
-```
-**File:** `dbRuneBaseEffectHandler.java`, Line ~60
-
-### Get Effects for Rune Base
-```sql
-SELECT rbe.*, rba.effectValue 
-FROM `obj_runebaseeffect` rbe 
-INNER JOIN `obj_rune_baseeffect` rba ON rbe.`UID` = rba.`EffectID` 
-WHERE rba.`RuneBaseID`=?
-```
-**File:** `dbRuneBaseEffectHandler.java`, Line ~85
-
-### Get Effect by Type
-```sql
-SELECT * FROM `obj_runebaseeffect` WHERE `effectType`=?
-```
-**File:** `dbRuneBaseEffectHandler.java`, Line ~120
-
-## Relationships
-
-1. **Rune Base Effect to Rune Base:** Many-to-many through `obj_rune_baseeffect` table
-2. **Rune Base Effect to Static Types:** One-to-many (via `static_rune_effect_type.EffectTypeID`)
-3. **Effect to Activation Properties:** Defines how effects are triggered and applied
-
-## Java Field to Database Column Mappings
-
-| Java Field | Database Column | Notes |
-|------------|-----------------|-------|
-| `name` | `obj_runebaseeffect.name` | Effect name |
-| `description` | `obj_runebaseeffect.description` | Description of the effect |
-| `effectType` | `obj_runebaseeffect.effectType` | Type of effect (damage, healing, buff, etc.) |
-| `activationType` | `obj_runebaseeffect.activationType` | How the effect is activated |
-| `duration` | `obj_runebaseeffect.duration` | Duration of effect in seconds |
-| `cooldownTime` | `obj_runebaseeffect.cooldownTime` | Cooldown period between activations |
-| `powerValue` | `obj_runebaseeffect.powerValue` | Strength or power value of the effect |
-
-## Notes
-- Rune base effects define the abilities and powers that runes can provide
-- Effects have various activation methods (passive, active, triggered)
-- The system supports duration-based and cooldown-based effects

src/engine/documentation/Handler Specific Documentation/dbRuneBaseHandler_Documentation.md

@@ -1,76 +0,0 @@
-# Rune Base Handler Documentation
-
-## Overview
-This document describes the database relationships and interactions for the `dbRuneBaseHandler` class. The rune base handler manages the base definitions and properties of rune items in the Magicbane emulator system.
-
-## Handler Class
-**File:** `src/engine/db/handlers/dbRuneBaseHandler.java`
-**Class:** `dbRuneBaseHandler`
-**Extends:** `dbHandlerBase`
-
-## Database Tables
-
-### Main Table(s)
-- **Table Name:** `obj_runebase`
-- **Description:** Core rune base item information including name, description, and basic properties
-- **Columns:** 
-  - UID (Primary Key)
-  - name
-  - description
-  - itemType
-  - rarity
-  - iconID
-  - value
-  - weight
-
-### Related Tables
-
-| Table Name | Description | Relationship |
-|------------|-------------|--------------|
-| `obj_rune_baseattribute` | Links rune base items to their attributes | RuneBaseID → obj_runebase.UID, AttributeID → obj_runebaseattribute.UID |
-| `obj_rune_baseeffect` | Links rune base items to their effects | RuneBaseID → obj_runebase.UID, EffectID → obj_runebaseeffect.UID |
-| `static_rune_type` | Static definitions of rune types | RuneTypeID → obj_runebase.UID |
-
-## Key Queries
-
-### Get Rune Base by ID
-```sql
-SELECT * FROM `obj_runebase` WHERE `UID`=?
-```
-**File:** `dbRuneBaseHandler.java`, Line ~60
-
-### Get All Rune Bases
-```sql
-SELECT * FROM `obj_runebase`
-```
-**File:** `dbRuneBaseHandler.java`, Line ~85
-
-### Get Rune Base by Type
-```sql
-SELECT * FROM `obj_runebase` WHERE `itemType`=?
-```
-**File:** `dbRuneBaseHandler.java`, Line ~120
-
-## Relationships
-
-1. **Rune Base to Attributes:** Many-to-many through `obj_rune_baseattribute` table
-2. **Rune Base to Effects:** Many-to-many through `obj_rune_baseeffect` table
-3. **Rune Base to Static Types:** One-to-many (via `static_rune_type.RuneTypeID`)
-4. **Rune Base to Item Properties:** Defines the core characteristics of rune items
-
-## Java Field to Database Column Mappings
-
-| Java Field | Database Column | Notes |
-|------------|-----------------|-------|
-| `name` | `obj_runebase.name` | Rune base name |
-| `description` | `obj_runebase.description` | Description of the rune |
-| `itemType` | `obj_runebase.itemType` | Type of rune (weapon, armor, etc.) |
-| `rarity` | `obj_runebase.rarity` | Rarity level of the rune |
-| `iconID` | `obj_runebase.iconID` | Icon identifier for UI display |
-| `value` | `obj_runebase.value` | Value or worth of the rune |
-| `weight` | `obj_runebase.weight` | Weight of the rune item |
-
-## Notes
-- Rune bases define the fundamental properties of all rune items in the game
-- Each rune base can have multiple attributes and effects associated with it
-- The system supports various rune types with different characteristics

src/engine/documentation/Handler Specific Documentation/dbRunegateHandler_Documentation.md

@@ -1,78 +0,0 @@
-# Runegate Handler Documentation
-
-## Overview
-This document describes the database relationships and interactions for the `dbRunegateHandler` class. The runegate handler manages runegate structures and their properties in the Magicbane emulator system.
-
-## Handler Class
-**File:** `src/engine/db/handlers/dbRunegateHandler.java`
-**Class:** `dbRunegateHandler`
-**Extends:** `dbHandlerBase`
-
-## Database Tables
-
-### Main Table(s)
-- **Table Name:** `obj_runegate`
-- **Description:** Core runegate information including location, properties, and activation status
-- **Columns:** 
-  - UID (Primary Key)
-  - name
-  - description
-  - locationX
-  - locationY
-  - locationZ
-  - isActive
-  - activationTime
-  - cooldownPeriod
-  - destinationRealmID
-
-### Related Tables
-
-| Table Name | Description | Relationship |
-|------------|-------------|--------------|
-| `obj_runegate_connection` | Links runegates to their destinations | SourceRunegateID → obj_runegate.UID, DestinationRunegateID → obj_runegate.UID |
-| `dyn_runegate_usage` | Tracks usage history of runegates | RunegateID → obj_runegate.UID, CharacterID → obj_character.UID |
-
-## Key Queries
-
-### Get Runegate by ID
-```sql
-SELECT * FROM `obj_runegate` WHERE `UID`=?
-```
-**File:** `dbRunegateHandler.java`, Line ~60
-
-### Get Active Runegates
-```sql
-SELECT * FROM `obj_runegate` WHERE `isActive`=1
-```
-**File:** `dbRunegateHandler.java`, Line ~85
-
-### Get Runegate by Location
-```sql
-SELECT * FROM `obj_runegate` WHERE `locationX`=? AND `locationY`=? AND `locationZ`=?
-```
-**File:** `dbRunegateHandler.java`, Line ~120
-
-## Relationships
-
-1. **Runegate to Connections:** Many-to-many through `obj_runegate_connection` table
-2. **Runegate to Usage History:** One-to-many (via `dyn_runegate_usage.RunegateID`)
-3. **Runegate to Destination Realms:** Links runegates to different game realms
-
-## Java Field to Database Column Mappings
-
-| Java Field | Database Column | Notes |
-|------------|-----------------|-------|
-| `name` | `obj_runegate.name` | Runegate name |
-| `description` | `obj_runegate.description` | Description of the runegate |
-| `locationX` | `obj_runegate.locationX` | X coordinate of runegate location |
-| `locationY` | `obj_runegate.locationY` | Y coordinate of runegate location |
-| `locationZ` | `obj_runegate.locationZ` | Z coordinate of runegate location |
-| `isActive` | `obj_runegate.isActive` | Whether the runegate is currently active |
-| `activationTime` | `obj_runegate.activationTime` | Time when runegate was last activated |
-| `cooldownPeriod` | `obj_runegate.cooldownPeriod` | Cooldown period between uses |
-| `destinationRealmID` | `obj_runegate.destinationRealmID` | Realm ID for destination |
-
-## Notes
-- Runegates function as teleportation devices in the game world
-- They can connect to other runegates in different locations or realms
-- The system tracks usage history for balance and maintenance purposes

src/engine/documentation/Handler Specific Documentation/dbShrineHandler_Documentation.md

@@ -1,78 +0,0 @@
-# Shrine Handler Documentation
-
-## Overview
-This document describes the database relationships and interactions for the `dbShrineHandler` class. The shrine handler manages shrine structures and their properties in the Magicbane emulator system.
-
-## Handler Class
-**File:** `src/engine/db/handlers/dbShrineHandler.java`
-**Class:** `dbShrineHandler`
-**Extends:** `dbHandlerBase`
-
-## Database Tables
-
-### Main Table(s)
-- **Table Name:** `obj_shrine`
-- **Description:** Core shrine information including location, properties, and effects
-- **Columns:** 
-  - UID (Primary Key)
-  - name
-  - description
-  - locationX
-  - locationY
-  - locationZ
-  - shrineType
-  - isActive
-  - effectDuration
-  - effectPower
-
-### Related Tables
-
-| Table Name | Description | Relationship |
-|------------|-------------|--------------|
-| `obj_shrine_effect` | Defines effects provided by shrines | ShrineID → obj_shrine.UID, EffectID → obj_shrineeffect.UID |
-| `dyn_shrine_usage` | Tracks usage history of shrines | ShrineID → obj_shrine.UID, CharacterID → obj_character.UID |
-
-## Key Queries
-
-### Get Shrine by ID
-```sql
-SELECT * FROM `obj_shrine` WHERE `UID`=?
-```
-**File:** `dbShrineHandler.java`, Line ~60
-
-### Get Active Shrines
-```sql
-SELECT * FROM `obj_shrine` WHERE `isActive`=1
-```
-**File:** `dbShrineHandler.java`, Line ~85
-
-### Get Shrine by Location
-```sql
-SELECT * FROM `obj_shrine` WHERE `locationX`=? AND `locationY`=? AND `locationZ`=?
-```
-**File:** `dbShrineHandler.java`, Line ~120
-
-## Relationships
-
-1. **Shrine to Effects:** Many-to-many through `obj_shrine_effect` table
-2. **Shrine to Usage History:** One-to-many (via `dyn_shrine_usage.ShrineID`)
-3. **Shrine to Shrine Types:** Different types of shrines with different effects
-
-## Java Field to Database Column Mappings
-
-| Java Field | Database Column | Notes |
-|------------|-----------------|-------|
-| `name` | `obj_shrine.name` | Shrine name |
-| `description` | `obj_shrine.description` | Description of the shrine |
-| `locationX` | `obj_shrine.locationX` | X coordinate of shrine location |
-| `locationY` | `obj_shrine.locationY` | Y coordinate of shrine location |
-| `locationZ` | `obj_shrine.locationZ` | Z coordinate of shrine location |
-| `shrineType` | `obj_shrine.shrineType` | Type of shrine (healing, buff, etc.) |
-| `isActive` | `obj_shrine.isActive` | Whether the shrine is currently active |
-| `effectDuration` | `obj_shrine.effectDuration` | Duration of shrine effects |
-| `effectPower` | `obj_shrine.effectPower` | Power level of shrine effects |
-
-## Notes
-- Shrines provide various beneficial effects to players who interact with them
-- They can be healing shrines, buff shrines, or other special effect shrines
-- The system tracks usage history for balance and maintenance purposes

src/engine/documentation/Handler Specific Documentation/dbSkillBaseHandler_Documentation.md

@@ -1,81 +0,0 @@
-# Skill Base Handler Documentation
-
-## Overview
-This document describes the database relationships and interactions for the `dbSkillBaseHandler` class. The skill base handler manages the fundamental definitions and properties of skills in the Magicbane emulator system.
-
-## Handler Class
-**File:** `src/engine/db/handlers/dbSkillBaseHandler.java`
-**Class:** `dbSkillBaseHandler`
-**Extends:** `dbHandlerBase`
-
-## Database Tables
-
-### Main Table(s)
-- **Table Name:** `obj_skillbase`
-- **Description:** Core skill base information including name, description, and activation properties
-- **Columns:** 
-  - UID (Primary Key)
-  - name
-  - description
-  - skillType
-  - activationType
-  - cooldownTime
-  - duration
-  - maxLevel
-  - cost
-  - iconID
-
-### Related Tables
-
-| Table Name | Description | Relationship |
-|------------|-------------|--------------|
-| `obj_character_skill` | Tracks character-specific skill levels and status | CharacterID → obj_character.UID, SkillID → obj_skillbase.UID |
-| `static_skill_requirement` | Stores requirements for unlocking skills | SkillID → obj_skillbase.UID |
-
-## Key Queries
-
-### Get Skill Base by ID
-```sql
-SELECT * FROM `obj_skillbase` WHERE `UID`=?
-```
-**File:** `dbSkillBaseHandler.java`, Line ~60
-
-### Get Character's Skills
-```sql
-SELECT s.*, cs.level, cs.isUnlocked 
-FROM `obj_skillbase` s 
-INNER JOIN `obj_character_skill` cs ON s.`UID` = cs.`SkillID` 
-WHERE cs.`CharacterID`=?
-```
-**File:** `dbSkillBaseHandler.java`, Line ~85
-
-### Get Skill Requirements
-```sql
-SELECT * FROM `static_skill_requirement` WHERE `SkillID`=?
-```
-**File:** `dbSkillBaseHandler.java`, Line ~120
-
-## Relationships
-
-1. **Skill Base to Character:** Many-to-many through `obj_character_skill` table
-2. **Skill Base to Requirements:** One-to-many (via `static_skill_requirement.SkillID`)
-3. **Skill Base to Static Data:** Skill definitions are stored in static tables
-
-## Java Field to Database Column Mappings
-
-| Java Field | Database Column | Notes |
-|------------|-----------------|-------|
-| `name` | `obj_skillbase.name` | Skill name |
-| `description` | `obj_skillbase.description` | Skill description |
-| `skillType` | `obj_skillbase.skillType` | Type of skill (attack, defense, support) |
-| `activationType` | `obj_skillbase.activationType` | How the skill is activated |
-| `cooldownTime` | `obj_skillbase.cooldownTime` | Cooldown period in seconds |
-| `duration` | `obj_skillbase.duration` | Duration of skill effect |
-| `maxLevel` | `obj_skillbase.maxLevel` | Maximum level for this skill |
-| `cost` | `obj_skillbase.cost` | Resource cost to use skill |
-| `iconID` | `obj_skillbase.iconID` | Icon identifier for UI display |
-
-## Notes
-- Skill bases define the core properties of all skills in the game
-- Skills can be activated in various ways (instant, channeling, etc.)
-- The system supports both unlocked and locked skill progression

src/engine/documentation/Handler Specific Documentation/dbSkillReqHandler_Documentation.md

@@ -1,75 +0,0 @@
-# Skill Requirement Handler Documentation
-
-## Overview
-This document describes the database relationships and interactions for the `dbSkillReqHandler` class. The skill requirement handler manages the prerequisites and conditions needed to unlock or use various skills in the Magicbane emulator system.
-
-## Handler Class
-**File:** `src/engine/db/handlers/dbSkillReqHandler.java`
-**Class:** `dbSkillReqHandler`
-**Extends:** `dbHandlerBase`
-
-## Database Tables
-
-### Main Table(s)
-- **Table Name:** `static_skill_requirement`
-- **Description:** Core skill requirement information including type, value, and conditions
-- **Columns:** 
-  - UID (Primary Key)
-  - skillID
-  - requirementType
-  - requirementValue
-  - prerequisiteSkillID
-  - prerequisiteLevel
-  - prerequisiteStat
-
-### Related Tables
-
-| Table Name | Description | Relationship |
-|------------|-------------|--------------|
-| `obj_skillbase` | Links to the skill that has requirements | SkillID → obj_skillbase.UID |
-| `obj_character_skill` | Tracks character-specific skill status | CharacterID → obj_character.UID, SkillID → obj_skillbase.UID |
-
-## Key Queries
-
-### Get Skill Requirements by Skill ID
-```sql
-SELECT * FROM `static_skill_requirement` WHERE `skillID`=?
-```
-**File:** `dbSkillReqHandler.java`, Line ~60
-
-### Get Specific Requirement by ID
-```sql
-SELECT * FROM `static_skill_requirement` WHERE `UID`=?
-```
-**File:** `dbSkillReqHandler.java`, Line ~85
-
-### Get Requirements for Character Skill
-```sql
-SELECT sr.*, cs.level as characterLevel 
-FROM `static_skill_requirement` sr 
-LEFT JOIN `obj_character_skill` cs ON sr.`prerequisiteSkillID` = cs.`SkillID` 
-WHERE sr.`skillID`=?
-```
-**File:** `dbSkillReqHandler.java`, Line ~120
-
-## Relationships
-
-1. **Skill Requirement to Skill Base:** Many-to-one (via `skillID` → obj_skillbase.UID)
-2. **Skill Requirement to Prerequisite Skills:** Many-to-one (via `prerequisiteSkillID` → obj_skillbase.UID)
-3. **Skill Requirement to Character Skills:** One-to-many through character skill tracking
-
-## Java Field to Database Column Mappings
-
-| Java Field | Database Column | Notes |
-|------------|-----------------|-------|
-| `skillID` | `static_skill_requirement.skillID` | Reference to the skill that requires this condition |
-| `requirementType` | `static_skill_requirement.requirementType` | Type of requirement (level, skill, stat) |
-| `requirementValue` | `static_skill_requirement.requirementValue` | Value needed for requirement |
-| `prerequisiteSkillID` | `static_skill_requirement.prerequisiteSkillID` | Prerequisite skill ID if applicable |
-| `prerequisiteLevel` | `static_skill_requirement.prerequisiteLevel` | Required level of prerequisite skill |
-| `prerequisiteStat` | `static_skill_requirement.prerequisiteStat` | Required stat value if applicable |
-
-## Notes
-- Skill requirements define the conditions needed to unlock or use skills
-- Requirements can be based on character level, other skills, or specific stats
-- The system supports complex requirement chains for advanced skill trees

src/engine/documentation/Handler Specific Documentation/dbVendorDialogHandler_Documentation.md

@@ -1,72 +0,0 @@
-# Vendor Dialog Handler Documentation
-
-## Overview
-This document describes the database relationships and interactions for the `dbVendorDialogHandler` class. The vendor dialog handler manages the dialog systems and interaction options for NPC vendors in the Magicbane emulator system.
-
-## Handler Class
-**File:** `src/engine/db/handlers/dbVendorDialogHandler.java`
-**Class:** `dbVendorDialogHandler`
-**Extends:** `dbHandlerBase`
-
-## Database Tables
-
-### Main Table(s)
-- **Table Name:** `static_npc_dialog`
-- **Description:** Core vendor dialog information including text, options, and responses
-- **Columns:** 
-  - UID (Primary Key)
-  - npcID
-  - dialogText
-  - responseType
-  - nextDialogID
-  - isFinal
-  - triggerEvent
-
-### Related Tables
-
-| Table Name | Description | Relationship |
-|------------|-------------|--------------|
-| `static_npc_dialog_option` | Defines available options for each dialog | DialogID → static_npc_dialog.UID |
-| `obj_npc` | Links to the NPC that has this dialog system | npcID → obj_npc.UID |
-
-## Key Queries
-
-### Get Dialog by ID
-```sql
-SELECT * FROM `static_npc_dialog` WHERE `UID`=?
-```
-**File:** `dbVendorDialogHandler.java`, Line ~60
-
-### Get Dialog Options for Dialog
-```sql
-SELECT * FROM `static_npc_dialog_option` WHERE `dialogID`=?
-```
-**File:** `dbVendorDialogHandler.java`, Line ~85
-
-### Get Initial Dialog for NPC
-```sql
-SELECT * FROM `static_npc_dialog` WHERE `npcID`=? AND `nextDialogID` IS NULL
-```
-**File:** `dbVendorDialogHandler.java`, Line ~120
-
-## Relationships
-
-1. **Dialog to Options:** One-to-many (via `dialogID` → static_npc_dialog.UID)
-2. **Dialog to NPC:** Many-to-one (via `npcID` → obj_npc.UID)
-3. **Dialog to Next Dialog:** Chain of dialog progression through `nextDialogID`
-
-## Java Field to Database Column Mappings
-
-| Java Field | Database Column | Notes |
-|------------|-----------------|-------|
-| `npcID` | `static_npc_dialog.npcID` | Reference to the NPC this dialog belongs to |
-| `dialogText` | `static_npc_dialog.dialogText` | Text displayed in the dialog |
-| `responseType` | `static_npc_dialog.responseType` | Type of response expected (buy, sell, quest) |
-| `nextDialogID` | `static_npc_dialog.nextDialogID` | ID of next dialog in sequence |
-| `isFinal` | `static_npc_dialog.isFinal` | Whether this is the final dialog in chain |
-| `triggerEvent` | `static_npc_dialog.triggerEvent` | Event that triggers this dialog |
-
-## Notes
-- Vendor dialogs provide interactive communication with NPCs
-- Dialog systems support branching conversations and quest progression
-- The system handles complex dialog chains with multiple options and outcomes

src/engine/documentation/Handler Specific Documentation/dbWarehouseHandler_Documentation.md

@@ -1,83 +0,0 @@
-# Warehouse Handler Documentation
-
-## Overview
-This document describes the database relationships and interactions for the `dbWarehouseHandler` class. The warehouse handler manages storage systems and inventory management for characters in the Magicbane emulator system.
-
-## Handler Class
-**File:** `src/engine/db/handlers/dbWarehouseHandler.java`
-**Class:** `dbWarehouseHandler`
-**Extends:** `dbHandlerBase`
-
-## Database Tables
-
-### Main Table(s)
-- **Table Name:** `obj_warehouse`
-- **Description:** Core warehouse information including storage capacity and location
-- **Columns:** 
-  - UID (Primary Key)
-  - name
-  - description
-  - characterID
-  - storageCapacity
-  - currentStorage
-  - locationX
-  - locationY
-  - locationZ
-  - isPublic
-
-### Related Tables
-
-| Table Name | Description | Relationship |
-|------------|-------------|--------------|
-| `obj_warehouse_item` | Tracks items stored in warehouses | WarehouseID → obj_warehouse.UID, ItemID → obj_item.UID |
-| `obj_character_warehouse` | Links characters to their warehouse access | CharacterID → obj_character.UID, WarehouseID → obj_warehouse.UID |
-
-## Key Queries
-
-### Get Warehouse by ID
-```sql
-SELECT * FROM `obj_warehouse` WHERE `UID`=?
-```
-**File:** `dbWarehouseHandler.java`, Line ~60
-
-### Get Character's Warehouses
-```sql
-SELECT w.* FROM `obj_warehouse` w 
-INNER JOIN `obj_character_warehouse` cw ON w.`UID` = cw.`WarehouseID` 
-WHERE cw.`CharacterID`=?
-```
-**File:** `dbWarehouseHandler.java`, Line ~85
-
-### Get Warehouse Items
-```sql
-SELECT i.*, wi.quantity 
-FROM `obj_item` i 
-INNER JOIN `obj_warehouse_item` wi ON i.`UID` = wi.`ItemID` 
-WHERE wi.`WarehouseID`=?
-```
-**File:** `dbWarehouseHandler.java`, Line ~120
-
-## Relationships
-
-1. **Warehouse to Items:** Many-to-many through `obj_warehouse_item` table
-2. **Warehouse to Characters:** Many-to-many through `obj_character_warehouse` table
-3. **Warehouse to Storage Capacity:** Tracks current and maximum storage limits
-
-## Java Field to Database Column Mappings
-
-| Java Field | Database Column | Notes |
-|------------|-----------------|-------|
-| `name` | `obj_warehouse.name` | Warehouse name |
-| `description` | `obj_warehouse.description` | Description of the warehouse |
-| `characterID` | `obj_warehouse.characterID` | Character who owns this warehouse |
-| `storageCapacity` | `obj_warehouse.storageCapacity` | Maximum storage capacity |
-| `currentStorage` | `obj_warehouse.currentStorage` | Current amount of stored items |
-| `locationX` | `obj_warehouse.locationX` | X coordinate of warehouse location |
-| `locationY` | `obj_warehouse.locationY` | Y coordinate of warehouse location |
-| `locationZ` | `obj_warehouse.locationZ` | Z coordinate of warehouse location |
-| `isPublic` | `obj_warehouse.isPublic` | Whether the warehouse is publicly accessible |
-
-## Notes
-- Warehouses provide extended storage for character inventories
-- Multiple characters can access shared warehouses
-- The system tracks both storage capacity and current usage

src/engine/documentation/Handler_Documentation_Index.md

@@ -1,201 +0,0 @@
-# Magicbane Database Handler Documentation Index
-
-This index provides an overview of all database handler documentation files created for the Magicbane emulator project.
-
-## Available Documentation Files
-
-1. **dbAccountHandler_Documentation.md**
-   - Documents account management functionality including authentication and account status tracking
-   - Covers `obj_account` table and its relationships to character objects
-
-2. **dbCityHandler_Documentation.md**
-   - Documents city management functionality including city creation, zones, and buildings
-   - Covers `obj_city`, `obj_zone`, and `obj_building` tables
-
-3. **dbPlayerCharacterHandler_Documentation.md**
-   - Describes player character handling including creation, updates, and retrieval operations
-   - Covers `obj_character` table and related dynamic tables
-
-4. **dbRaceHandler_Documentation.md**
-   - Describes race-related data handling for beard colors and styles
-   - Focuses on static race data tables
-
-5. **dbGuildHandler_Documentation.md**
-   - Describes the complex guild system with relationships to history, alliances, enemies, and member management
-   - Covers multiple related tables including `obj_guild`, `dyn_character_guildhistory`, `dyn_guild_allianceenemylist`, etc.
-
-6. **dbBaneHandler_Documentation.md**
-   - Documents bane management functionality for city-based special objects
-   - Covers `dyn_banes` table and its relationships to cities, players, and buildings
-
-7. **dbCSSessionHandler_Documentation.md**
-   - Documents client session management including session creation, retrieval, updating, and deletion
-   - Covers `dyn_session` table and its relationships to accounts and characters
-
-8. **dbKitHandler_Documentation.md**
-   - Documents kit management functionality for static kit data
-   - Covers `static_rune_validkit` table and its relationships to races, classes, and items
-
-9. **dbLootHandler_Documentation.md**
-   - Documents loot system functionality including general tables, item tables, modifier tables, and booty sets
-   - Covers `static_loot_gen`, `static_loot_item`, `static_loot_mod`, `static_loot_modtype`, and `static_loot_bootySet` tables
-
-10. **dbMenuHandler_Documentation.md**
-    - Documents NPC menu option handling including retrieval of menu options by menu ID
-    - Covers `static_npc_menuoption` table
-
-11. **dbContractHandler_Documentation.md**
-    - Documents contract management functionality for player contracts and quest tracking
-    - Covers `dyn_contract` table and its relationships to characters and quests
-
-12. **dbEffectsBaseHandler_Documentation.md**
-    - Documents effect base data handling including effect types, categories, and properties
-    - Covers `static_effect_base` table and related lookup tables
-
-13. **dbEffectsResourceCostHandler_Documentation.md**
-    - Documents resource cost handling for game effects and abilities
-    - Covers `static_effect_resourcecost` table and its relationships to effects and resources
-
-14. **dbEnchantmentHandler_Documentation.md**
-    - Documents enchantment management functionality for item enhancements
-    - Covers `dyn_enchantment` table and related data structures
-
-15. **dbHeightMapHandler_Documentation.md**
-    - Documents height map data handling for terrain and elevation information
-    - Covers `static_heightmap` table and its spatial data relationships
-
-16. **dbItemBaseHandler_Documentation.md**
-    - Documents base item data handling including item properties, types, and categories
-    - Covers `static_item_base` table and related lookup tables
-
-17. **dbItemHandler_Documentation.md**
-    - Documents item management functionality for player inventory and items
-    - Covers `dyn_item` table and its relationships to characters and locations
-
-18. **dbMineHandler_Documentation.md**
-    - Documents mine management functionality including resource extraction and mining operations
-    - Covers `dyn_mine` table and related mining data structures
-
-19. **dbMobBaseHandler_Documentation.md**
-    - Documents base mob data handling including mob types, stats, and behaviors
-    - Covers `static_mob_base` table and related lookup tables
-
-20. **dbMobHandler_Documentation.md**
-    - Documents mob management functionality for NPC creatures and monster behavior
-    - Covers `dyn_mob` table and its relationships to zones and character data
-
-21. **dbNPCHandler_Documentation.md**
-    - Documents NPC handling including conversation systems and NPC properties
-    - Covers `dyn_npc` table and related interaction data
-
-22. **dbPetitionHandler_Documentation.md**
-    - Documents petition management functionality for player support requests
-    - Covers `dyn_petition` table and its relationships to accounts and characters
-
-23. **dbPowerHandler_Documentation.md**
-    - Documents power handling including character abilities, skills, and power systems
-    - Covers `static_power_base`, `dyn_character_power`, and related tables
-
-24. **dbPromotionClassHandler_Documentation.md**
-    - Documents promotion class handling for character advancement and class changes
-    - Covers `static_promotion_class` table and related data structures
-
-25. **dbRealmHandler_Documentation.md**
-    - Documents realm management functionality including realm data and server information
-    - Covers `obj_realm` table and its relationships to accounts and characters
-
-26. **dbResistHandler_Documentation.md**
-    - Documents resistance handling for character stats and damage mitigation
-    - Covers `static_resist` table and related resistance data structures
-
-27. **dbRuneBaseAttributeHandler_Documentation.md**
-    - Documents rune base attribute handling for magical properties and modifiers
-    - Covers `static_rune_baseattribute` table and related lookup tables
-
-28. **dbRuneBaseEffectHandler_Documentation.md**
-    - Documents rune base effect handling including effect types and properties
-    - Covers `static_rune_baseeffect` table and related data structures
-
-29. **dbRuneBaseHandler_Documentation.md**
-    - Documents rune base data handling for rune creation and properties
-    - Covers `static_rune_base` table and related lookup tables
-
-30. **dbRunegateHandler_Documentation.md**
-    - Documents runegate management functionality for magical portal systems
-    - Covers `dyn_runegate` table and its relationships to characters and locations
-
-31. **dbShrineHandler_Documentation.md**
-    - Documents shrine management functionality including shrine effects and locations
-    - Covers `dyn_shrine` table and related data structures
-
-32. **dbSkillBaseHandler_Documentation.md**
-    - Documents skill base data handling for character abilities and skills
-    - Covers `static_skill_base` table and related lookup tables
-
-33. **dbSkillReqHandler_Documentation.md**
-    - Documents skill requirement handling for character advancement and skill unlocks
-    - Covers `static_skill_requirement` table and related data structures
-
-34. **dbVendorDialogHandler_Documentation.md**
-    - Documents vendor dialog handling for NPC merchant interactions
-    - Covers `static_npc_dialog` table and related conversation data
-
-35. **dbWarehouseHandler_Documentation.md**
-    - Documents warehouse management functionality for player storage systems
-    - Covers `dyn_warehouse` table and its relationships to characters and items
-
-36. **dbBaseClassHandler_Documentation.md**
-    - Documents base class handling for character race and class structures
-    - Covers `static_rune_racebaseclass` table and related data structures
-
-37. **dbBlueprintHandler_Documentation.md**
-    - Documents blueprint handling for building and construction systems
-    - Covers `static_building_blueprint` and `static_building_doors` tables
-
-38. **dbBoonHandler_Documentation.md**
-    - Documents boon handling for item and character enhancements
-    - Covers `static_item_boons` table and related data structures
-
-39. **dbBuildingHandler_Documentation.md**
-    - Documents building management functionality including construction and ownership
-    - Covers `obj_building`, `dyn_building_friendslist`, and related tables
-
-40. **dbBuildingLocationHandler_Documentation.md**
-    - Documents building location handling for spatial positioning and placement
-    - Covers `static_building_location` table and related data structures
-
-41. **dbCharacterPowerHandler_Documentation.md**
-    - Documents character power handling for ability and skill management
-    - Covers `dyn_character_power` table and related data structures
-
-42. **dbCharacterRuneHandler_Documentation.md**
-    - Documents character rune handling for magical rune systems
-    - Covers `dyn_character_rune` table and related data structures
-
-43. **dbCharacterSkillHandler_Documentation.md**
-    - Documents character skill handling for ability progression and skill management
-    - Covers `dyn_character_skill` table and related data structures
-
-44. **dbZoneHandler_Documentation.md**
-    - Documents zone management functionality including world zones and area definitions
-    - Covers `obj_zone` table and its relationships to cities and buildings
-
-## Documentation Structure
-
-All documentation files follow a consistent format with the following sections:
-- Overview
-- Handler Class information
-- Database Tables involved
-- Key Queries with line references
-- Relationships between entities
-- Java Field to Database Column Mappings
-
-## Usage Notes
-
-These documents are intended for:
-- Developers working on the Magicbane emulator
-- Wiki documentation for project maintainers
-- Database schema understanding and maintenance
-- Future reference when code changes may affect database relationships
-
-The files are located in: `src/engine/documentation/Handler Specific Documentation/`

src/engine/gameManager/ArenaManager.java

@@ -0,0 +1,168 @@
+package engine.gameManager;
+
+import engine.Enum;
+import engine.InterestManagement.WorldGrid;
+import engine.exception.MsgSendException;
+import engine.math.Vector3f;
+import engine.math.Vector3fImmutable;
+import engine.objects.*;
+import engine.server.MBServerStatics;
+import org.pmw.tinylog.Logger;
+
+import java.util.*;
+import java.util.concurrent.ThreadLocalRandom;
+
+public class ArenaManager {
+    private static final List<Arena> activeArenas = new ArrayList<>();
+    public static final List<PlayerCharacter> playerQueue = new ArrayList<>();
+    public static Long pulseDelay = 180000L;
+    public static Long lastExecution = 0L;
+
+    public static void pulseArenas() {
+        if(lastExecution == 0L){
+            lastExecution = System.currentTimeMillis();
+        }
+
+        if(activeArenas.isEmpty() && playerQueue.isEmpty())
+            return;
+
+        Iterator<Arena> iterator = activeArenas.iterator();
+
+        while (iterator.hasNext()) {
+            Arena arena = iterator.next();
+            if (arena.checkToComplete()) {
+                iterator.remove();
+            }
+        }
+
+        if(lastExecution + pulseDelay > System.currentTimeMillis())
+            return;
+
+        lastExecution = System.currentTimeMillis();
+
+        while (playerQueue.size() > 1) {
+            createArena();
+        }
+    }
+
+    public static void joinQueue(PlayerCharacter player) {
+        if (!playerQueue.contains(player)) {
+            playerQueue.add(player);
+        }
+        for(PlayerCharacter pc : playerQueue){
+            if(pc.equals(player))
+                continue;
+            ChatManager.chatSystemInfo(pc, player.getName() + " has joined the arena que. There are now " + playerQueue.size() + " players queued.");
+        }
+    }
+
+    public static void leaveQueue(PlayerCharacter player) {
+        playerQueue.remove(player);
+        for(PlayerCharacter pc : playerQueue){
+            if(pc.equals(player))
+                continue;
+            ChatManager.chatSystemInfo(pc, player.getName() + " has left the arena que. There are now " + playerQueue.size() + " players queued.");
+        }
+    }
+
+    private static void createArena() {
+        if (playerQueue.size() > 1) {
+
+            Collections.shuffle(playerQueue);
+            Arena newArena = new Arena();
+
+            //set starting time
+            newArena.startTime = System.currentTimeMillis();
+
+            //decide an arena location
+            newArena.loc = selectRandomArenaLocation();
+
+            // Assign players to the arena
+            newArena.player1 = playerQueue.remove(0);
+            newArena.player2 = playerQueue.remove(0);
+
+            // Teleport players to the arena location
+            Zone sdr = ZoneManager.getZoneByUUID(656);
+            MovementManager.translocate(newArena.player1, Vector3fImmutable.getRandomPointOnCircle(newArena.loc,75f), null);
+            MovementManager.translocate(newArena.player2, Vector3fImmutable.getRandomPointOnCircle(newArena.loc,75f), null);
+
+            // Add the new arena to the active arenas list
+            activeArenas.add(newArena);
+        }
+    }
+
+    public static void endArena(Arena arena, PlayerCharacter winner, PlayerCharacter loser, String condition){
+        if (winner != null && loser != null) {
+            Logger.info("[ARENA] The fight between {} and {} is concluded. Victor: {}",
+                    arena.player1.getName(), arena.player2.getName(), winner.getName());
+        } else {
+            Logger.info("[ARENA] The fight between {} and {} is concluded. No Winner Declared.",
+                    arena.player1.getName(), arena.player2.getName());
+        }
+        // Teleport players to the arena location
+        Zone sdr = ZoneManager.getZoneByUUID(656);
+        MovementManager.translocate(arena.player1, Vector3fImmutable.getRandomPointOnCircle(sdr.getLoc(),50f), null);
+        MovementManager.translocate(arena.player2, Vector3fImmutable.getRandomPointOnCircle(sdr.getLoc(),50f), null);
+
+
+
+        activeArenas.remove(arena);
+
+        if(winner != null){
+            ChatManager.chatPVP("[ARENA] " + winner.getName() + " has slain " + loser.getName() + " in the arena!");
+            //handle prize distribution
+            //ItemBase specialLoot = ItemBase.getItemBase(866);
+            //Item promoted = new MobLoot(winner, specialLoot, 1, false).promoteToItem(winner);
+            //promoted.setNumOfItems(21235);
+            //promoted.setName("Special Banker(21235)");
+            //DbManager.ItemQueries.UPDATE_NUM_ITEMS(promoted,21235);
+            //winner.getCharItemManager().addItemToInventory(promoted);
+            //winner.getCharItemManager().updateInventory();
+        }
+    }
+
+    public static Vector3fImmutable selectRandomArenaLocation() {
+        boolean locSet = false;
+        Vector3fImmutable loc = Vector3fImmutable.ZERO;
+
+        while (!locSet) {
+            try {
+                float x = ThreadLocalRandom.current().nextInt(114300, 123600);
+                float z = ThreadLocalRandom.current().nextInt(82675, 91700);
+                float y = 0; // Y coordinate is always 0
+
+                loc = new Vector3fImmutable(x, y, z * -1);
+                HashSet<AbstractWorldObject> inRange = WorldGrid.getObjectsInRangePartial(loc,500f, MBServerStatics.MASK_PLAYER);
+                if(inRange.isEmpty() && !isUnderWater(loc))
+                    locSet = true;
+                //}
+            }catch(Exception e){
+
+            }
+        }
+
+        return loc;
+    }
+
+    public static boolean isUnderWater(Vector3fImmutable loc) {
+
+        try {
+
+            Zone zone = ZoneManager.findSmallestZone(loc);
+
+            if (zone.getSeaLevel() != 0) {
+
+                float localAltitude = loc.y;
+                if (localAltitude < zone.getSeaLevel())
+                    return true;
+            } else {
+                if (loc.y < 0)
+                    return true;
+            }
+        } catch (Exception e) {
+
+        }
+
+        return false;
+    }
+}

src/engine/gameManager/BuildingManager.java

@@ -438,6 +438,18 @@ public enum BuildingManager {
 
     public static boolean IsPlayerHostile(Building building, PlayerCharacter player) {
 
+        if(building.getBlueprint() != null && building.getBlueprint().getBuildingGroup() != null && building.getBlueprint().getBuildingGroup().equals(BuildingGroup.BANESTONE))
+        {
+            Guild playerNation = player.guild.getNation();
+            City banedCity = ZoneManager.getCityAtLocation(building.loc);
+            if(banedCity != null){
+                if(banedCity.getGuild().getNation().equals(playerNation)){
+                    return false;
+                }else{
+                    return true;
+                }
+            }
+        }
         //Nation Members and Guild members are not hostile.
         //		if (building.getGuild() != null){
         //			if (pc.getGuild() != null)
@@ -520,7 +532,30 @@ public enum BuildingManager {
         if (building.getBlueprintUUID() == 0)
             return false;
 
-        if (building.getBlueprint().getMaxSlots() == building.getHirelings().size())
+        if(building.getBlueprint().getBuildingGroup().equals(BuildingGroup.TOL)){
+            if(contract.getContractID() == 850) {
+                boolean hasRunemaster = false;
+                for (AbstractCharacter npc : building.getHirelings().keySet()) {
+
+                    if (npc.getObjectType() != GameObjectType.NPC)
+                        continue;
+
+                    if(npc.contractUUID == 850)
+                        hasRunemaster = true;
+                }
+
+                if(hasRunemaster)
+                    return false;
+            }
+        }
+
+
+        int maxSlots = building.getBlueprint().getMaxSlots();
+        if(building.getBlueprint().getBuildingGroup() != null) {
+            maxSlots = building.getBlueprint().getSlotsForRank(building.getRank());
+        }
+
+        if (maxSlots == building.getHirelings().size())
             return false;
 
         String pirateName = NPCManager.getPirateName(contract.getMobbaseID());

src/engine/gameManager/CombatManager.java

@@ -646,24 +646,25 @@ public enum CombatManager {
 
             //Get hit chance
 
-            int chance;
+            //int chance;
             float dif = atr - defense;
 
-            if (dif > 100)
-                chance = 94;
-            else if (dif < -100)
-                chance = 4;
-            else
-                chance = (int) ((0.45 * dif) + 49);
+            //if (dif > 100)
+            //    chance = 94;
+            //else if (dif < -100)
+            //    chance = 4;
+            //else
+            //    chance = (int) ((0.45 * dif) + 49);
 
             errorTrack = 5;
 
             //calculate hit/miss
 
-            int roll = ThreadLocalRandom.current().nextInt(100);
             DeferredPowerJob dpj = null;
 
-            if (roll < chance) {
+
+
+            if (LandHit((int)atr,(int)defense)) {
 
                 if (ac.getObjectType().equals(GameObjectType.PlayerCharacter))
                     updateAttackTimers((PlayerCharacter) ac, target, true);
@@ -1054,6 +1055,10 @@ public enum CombatManager {
                 if (eff.getPower() != null && (eff.getPower().getToken() == 429506943 || eff.getPower().getToken() == 429408639 || eff.getPower().getToken() == 429513599 || eff.getPower().getToken() == 429415295))
                     swingAnimation = 0;
 
+        if(source != null && source.getObjectType().equals(GameObjectType.PlayerCharacter)){
+            damage *= ((PlayerCharacter)source).ZergMultiplier;
+        } // Health modifications are modified by the ZergMechanic
+
         TargetedActionMsg cmm = new TargetedActionMsg(source, target, damage, swingAnimation);
         DispatchMessage.sendToAllInRange(target, cmm);
     }
@@ -1237,14 +1242,17 @@ public enum CombatManager {
         DispatchMessage.dispatchMsgToInterestArea(pc, rwss, DispatchChannel.PRIMARY, MBServerStatics.CHARACTER_LOAD_RANGE, false, false);
     }
 
-    private static void toggleSit(boolean toggle, ClientConnection origin) {
+    public static void toggleSit(boolean toggle, ClientConnection origin) {
 
         PlayerCharacter pc = SessionManager.getPlayerCharacter(origin);
 
         if (pc == null)
             return;
 
-        pc.setSit(toggle);
+        if(pc.isFlying())
+            pc.setSit(false);
+        else
+            pc.setSit(toggle);
 
         UpdateStateMsg rwss = new UpdateStateMsg();
         rwss.setPlayer(pc);
@@ -1322,6 +1330,13 @@ public enum CombatManager {
                 return;
 
             retaliater.setCombatTarget(ac);
+            if(retaliater.isPlayerGuard && (retaliater.BehaviourType.equals(MobBehaviourType.GuardMinion) || retaliater.BehaviourType.equals(MobBehaviourType.GuardCaptain))){
+                for(Mob guard : retaliater.guardedCity.getParent().zoneMobSet){
+                    if(guard.isPlayerGuard && guard.combatTarget == null){
+                        guard.setCombatTarget(ac);
+                    }
+                }
+            }
 
         }
     }
@@ -1438,4 +1453,17 @@ public enum CombatManager {
             ((AbstractCharacter) awo).getCharItemManager().damageRandomArmor(1);
     }
 
+    public static boolean LandHit(int C5, int D5){
+
+        float chance = (C5-((C5+D5)*.315f)) / ((D5-((C5+D5)*.315f)) + (C5-((C5+D5)*.315f)));
+        int convertedChance = Math.round(chance * 100);
+        //convertedChance = Math.max(5, Math.min(95, convertedChance));
+
+        int roll = ThreadLocalRandom.current().nextInt(101);
+
+        if(roll < 5)//always 5% chance ot miss
+            return false;
+
+        return roll <= convertedChance;
+    }
 }

src/engine/gameManager/ConfigManager.java

@@ -65,6 +65,7 @@ public enum ConfigManager {
     MB_WORLD_MAINTENANCE,
     MB_WORLD_GREETING,
     MB_WORLD_KEYCLONE_MAX,
+    MB_WORLD_TESTMODE,
     MB_USE_RUINS,
 
     // Mobile AI modifiers

src/engine/gameManager/DevCmdManager.java

@@ -79,7 +79,6 @@ public enum DevCmdManager {
         DevCmdManager.registerDevCmd(new AddGoldCmd());
         DevCmdManager.registerDevCmd(new ZoneInfoCmd());
         DevCmdManager.registerDevCmd(new DebugMeleeSyncCmd());
-        DevCmdManager.registerDevCmd(new HotzoneCmd());
         DevCmdManager.registerDevCmd(new MineActiveCmd());
         // Dev
         DevCmdManager.registerDevCmd(new ApplyStatModCmd());
@@ -103,6 +102,7 @@ public enum DevCmdManager {
         DevCmdManager.registerDevCmd(new SetAdminRuneCmd());
         DevCmdManager.registerDevCmd(new SetInvulCmd());
         DevCmdManager.registerDevCmd(new MakeItemCmd());
+        DevCmdManager.registerDevCmd(new GimmeCmd());
         DevCmdManager.registerDevCmd(new EnchantCmd());
         DevCmdManager.registerDevCmd(new SetSubRaceCmd());
         // Admin
@@ -179,8 +179,23 @@ public enum DevCmdManager {
 
         //kill any commands not available to everyone on production server
         //only admin level can run dev commands on production
-
-        if (a.status.equals(Enum.AccountStatus.ADMIN) == false) {
+        boolean playerAllowed = false;
+        if(ConfigManager.MB_WORLD_TESTMODE.getValue().equals("true")) {
+            switch (adc.getMainCmdString()) {
+                case "printresists":
+                case "printstats":
+                case "printskills":
+                case "printpowers":
+                case "gimme":
+                case "goto":
+                case "teleportmode":
+                    playerAllowed = true;
+                    if (!a.status.equals(Enum.AccountStatus.ADMIN))
+                        target = pcSender;
+                    break;
+            }
+        }
+        if (!playerAllowed && !a.status.equals(Enum.AccountStatus.ADMIN)) {
             Logger.info("Account " + a.getUname() + "attempted to use dev command " + cmd);
             return false;
         }

src/engine/gameManager/LootManager.java

@@ -17,7 +17,9 @@ import engine.objects.*;
 import org.pmw.tinylog.Logger;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
+import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;
 
 /**
@@ -34,6 +36,12 @@ public enum LootManager {
     public static HashMap<Integer, ArrayList<ModTableEntry>> _modTables = new HashMap<>();
     public static HashMap<Integer, ArrayList<ModTypeTableEntry>> _modTypeTables = new HashMap<>();
 
+    public static final ArrayList<Integer> vorg_ha_uuids = new ArrayList<>(Arrays.asList(27580, 27590, 188500, 188510, 188520, 188530, 188540, 188550, 189510));
+    public static final ArrayList<Integer> vorg_ma_uuids = new ArrayList<>(Arrays.asList(27570,188900,188910,188920,188930,188940,188950,189500));
+    public static final ArrayList<Integer> vorg_la_uuids = new ArrayList<>(Arrays.asList(27550,27560,189100,189110,189120,189130,189140,189150));
+    public static final ArrayList<Integer> vorg_cloth_uuids = new ArrayList<>(Arrays.asList(27600,188700,188720,189550,189560));
+    public static final ArrayList<Integer> racial_guard_uuids = new ArrayList<>(Arrays.asList(841,951,952,1050,1052,1180,1182,1250,1252,1350,1352,1450,1452,1500,1502,1525,1527,1550,1552,1575,1577,1600,1602,1650,1652,1700,980100,980102));
+
     // Drop Rates
 
     public static float NORMAL_DROP_RATE;
@@ -67,41 +75,111 @@ public enum LootManager {
     }
 
     public static void GenerateMobLoot(Mob mob) {
-
         //determine if mob is in hotzone
-        boolean inHotzone = ZoneManager.inHotZone(mob.getLoc());
+        boolean inHotzone = false;
 
         //iterate the booty sets
 
-        if (mob.getMobBase().bootySet != 0 && _bootySetMap.containsKey(mob.getMobBase().bootySet) == true)
+        if(mob.mobBase == null || mob.getMobBaseID() == 253003){
+            int i = 0;
+        }
+
+        if (mob.getMobBase().bootySet != 0 && _bootySetMap.containsKey(mob.getMobBase().bootySet))
             RunBootySet(_bootySetMap.get(mob.getMobBase().bootySet), mob, inHotzone);
 
-        if (mob.bootySet != 0 && _bootySetMap.containsKey(mob.bootySet) == true)
+        if (mob.bootySet != 0 && _bootySetMap.containsKey(mob.bootySet)) {
             RunBootySet(_bootySetMap.get(mob.bootySet), mob, inHotzone);
+        }else if(mob.bootySet != 0 && ItemBase.getItemBase(mob.bootySet) != null){
+            MobLoot specialDrop = null;
+            specialDrop = new MobLoot(mob,ItemBase.getItemBase(mob.bootySet),true);
+            if(specialDrop != null) {
+                ChatSystemMsg chatMsg = new ChatSystemMsg(null, mob.getName() + " in " + mob.getParentZone().getName() + " has found the " + specialDrop.getName() + ". Are you tough enough to take it?");
+                chatMsg.setMessageType(10);
+                chatMsg.setChannel(Enum.ChatChannelType.SYSTEM.getChannelID());
+                DispatchMessage.dispatchMsgToAll(chatMsg);
+                mob.getCharItemManager().addItemToInventory(specialDrop);
+                mob.setResists(new Resists("Dropper"));
+                if(!Mob.discDroppers.contains(mob))
+                    Mob.AddDiscDropper(mob);
+            }
 
-        //lastly, check mobs inventory for godly or disc runes to send a server announcement
-            for (Item it : mob.getInventory()) {
+        }
 
-                ItemBase ib = it.getItemBase();
-                if(ib == null)
-                    break;
-                if (ib.isDiscRune() || ib.getName().toLowerCase().contains("of the gods")) {
-                    ChatSystemMsg chatMsg = new ChatSystemMsg(null, mob.getName() + " in " + mob.getParentZone().getName() + " has found the " + ib.getName() + ". Are you tough enough to take it?");
-                    chatMsg.setMessageType(10);
-                    chatMsg.setChannel(Enum.ChatChannelType.SYSTEM.getChannelID());
-                    DispatchMessage.dispatchMsgToAll(chatMsg);
-                }
+        //lastly, check mobs inventory for godly or disc runes to send a server announcement
+        for (Item it : mob.getInventory()) {
+
+            ItemBase ib = it.getItemBase();
+            if (ib == null)
+                break;
+            if (ib.isDiscRune() || ib.getName().toLowerCase().contains("of the gods")) {
+                ChatSystemMsg chatMsg = new ChatSystemMsg(null, mob.getName() + " in " + mob.getParentZone().getName() + " has found the " + ib.getName() + ". Are you tough enough to take it?");
+                chatMsg.setMessageType(10);
+                chatMsg.setChannel(Enum.ChatChannelType.SYSTEM.getChannelID());
+                DispatchMessage.dispatchMsgToAll(chatMsg);
             }
+        }
 
     }
 
     private static void RunBootySet(ArrayList<BootySetEntry> entries, Mob mob, boolean inHotzone) {
 
         boolean hotzoneWasRan = false;
-        float dropRate = 1.0f;
+        float dropRate;
+
+        if (!mob.getSafeZone()) {
+            int contractLow = 1, contractHigh = 400;
+            int runeLow = 401, runeHigh = 800;
+            int resourceLow = 801, resourceHigh = 900;
+            int glassLow = 901, glassHigh = 910;
+            int guardLow = 911, guardHigh = 920;
+
+            // Pre-compute adjusted high values
+            int contractAdjust = 0, runeAdjust = 0, resourceAdjust = 0, glassAdjust = 0, guardAdjust = 0;
+            if (mob.level < 50) {
+                int dif = 50 - mob.level;
+                contractAdjust = (int)(400 * (dif * 0.02f));
+                runeAdjust = (int)(400 * (dif * 0.02f));
+                resourceAdjust = (int)(100 * (dif * 0.02f));
+                glassAdjust = (int)(10 * (dif * 0.02f));
+                guardAdjust = (int)(10 * (dif * 0.02f));
+            }
+
+            // Generate a single random roll
+            int specialCaseRoll = ThreadLocalRandom.current().nextInt(1, 100001);
+
+            // Calculate adjusted high values once
+            int contractHighAdjusted = contractHigh - contractAdjust;
+            int runeHighAdjusted = runeHigh - runeAdjust;
+            int resourceHighAdjusted = resourceHigh - resourceAdjust;
+            int glassHighAdjusted = glassHigh - glassAdjust;
+            int guardHighAdjusted = guardHigh - guardAdjust;
+
+            // Check the roll range and handle accordingly
+            if (specialCaseRoll >= contractLow && specialCaseRoll <= contractHighAdjusted) {
+                SpecialCaseContractDrop(mob, entries);
+            } else if (specialCaseRoll >= runeLow && specialCaseRoll <= runeHighAdjusted) {
+                SpecialCaseRuneDrop(mob, entries);
+            } else if (specialCaseRoll >= resourceLow && specialCaseRoll <= resourceHighAdjusted) {
+                SpecialCaseResourceDrop(mob, entries);
+            } else if (specialCaseRoll >= glassLow && specialCaseRoll <= glassHighAdjusted) {
+                int glassID = rollRandomItem(126);
+                ItemBase glassItem = ItemBase.getItemBase(glassID);
+                if (glassItem != null) {
+                    MobLoot toAddGlass = new MobLoot(mob, glassItem, false);
+                    mob.getCharItemManager().addItemToInventory(toAddGlass);
+                }
+            } else if (specialCaseRoll >= guardLow && specialCaseRoll <= guardHighAdjusted) {
+                int guardContractID = racial_guard_uuids.get(new java.util.Random().nextInt(racial_guard_uuids.size()));
+                ItemBase guardContract = ItemBase.getItemBase(guardContractID);
+                if (guardContract != null) {
+                    MobLoot toAddContract = new MobLoot(mob, guardContract, false);
+                    mob.getCharItemManager().addItemToInventory(toAddContract);
+                }
+            }
+        }
 
-        // Iterate all entries in this bootySet and process accordingly
 
+        // Iterate all entries in this bootySet and process accordingly
         for (BootySetEntry bse : entries) {
             switch (bse.bootyType) {
                 case "GOLD":
@@ -109,8 +187,10 @@ public enum LootManager {
                     break;
                 case "LOOT":
 
-                    if (mob.getSafeZone() == false)
-                        dropRate = LootManager.NORMAL_DROP_RATE;
+                    if (mob.getSafeZone())
+                        return; // no loot to drop in safezones
+
+                    dropRate = LootManager.NORMAL_DROP_RATE;
 
                     if (inHotzone == true)
                         dropRate = LootManager.HOTZONE_DROP_RATE;
@@ -135,6 +215,109 @@ public enum LootManager {
         }
     }
 
+    public static void SpecialCaseContractDrop(Mob mob,ArrayList<BootySetEntry> entries){
+
+        int lootTableID = 0;
+        for(BootySetEntry entry : entries){
+            if(entry.bootyType.equals("LOOT")){
+                lootTableID = entry.genTable;
+                break;
+            }
+        }
+
+        if(lootTableID == 0)
+            return;
+
+        int ContractTableID = 0;
+        for(GenTableEntry entry : _genTables.get(lootTableID)){
+            try {
+                if (ItemBase.getItemBase(_itemTables.get(entry.itemTableID).get(0).cacheID).getType().equals(Enum.ItemType.CONTRACT)) {
+                    ContractTableID = entry.itemTableID;
+                    break;
+                }
+            }catch(Exception e){
+
+            }
+        }
+
+        if(ContractTableID == 0)
+            return;
+
+        ItemBase ib = ItemBase.getItemBase(rollRandomItem(ContractTableID));
+        if(ib != null){
+            MobLoot toAdd = new MobLoot(mob,ib,false);
+            mob.getCharItemManager().addItemToInventory(toAdd);
+        }
+    }
+
+    public static void SpecialCaseRuneDrop(Mob mob,ArrayList<BootySetEntry> entries){
+        int lootTableID = 0;
+        for(BootySetEntry entry : entries){
+            if(entry.bootyType.equals("LOOT")){
+                lootTableID = entry.genTable;
+                break;
+            }
+        }
+
+        if(lootTableID == 0)
+            return;
+
+        int RuneTableID = 0;
+        for(GenTableEntry entry : _genTables.get(lootTableID)){
+            try {
+                if (ItemBase.getItemBase(_itemTables.get(entry.itemTableID).get(0).cacheID).getType().equals(Enum.ItemType.RUNE)) {
+                    RuneTableID = entry.itemTableID;
+                    break;
+                }
+            }catch(Exception e){
+
+            }
+        }
+
+        if(RuneTableID == 0)
+            return;
+
+        ItemBase ib = ItemBase.getItemBase(rollRandomItem(RuneTableID));
+        if(ib != null){
+            MobLoot toAdd = new MobLoot(mob,ib,false);
+            mob.getCharItemManager().addItemToInventory(toAdd);
+        }
+    }
+
+    public static void SpecialCaseResourceDrop(Mob mob,ArrayList<BootySetEntry> entries){
+        int lootTableID = 0;
+        for(BootySetEntry entry : entries){
+            if(entry.bootyType.equals("LOOT")){
+                lootTableID = entry.genTable;
+                break;
+            }
+        }
+
+        if(lootTableID == 0)
+            return;
+
+        int ResourceTableID = 0;
+        for(GenTableEntry entry : _genTables.get(lootTableID)){
+            try {
+                if (ItemBase.getItemBase(_itemTables.get(entry.itemTableID).get(0).cacheID).getType().equals(Enum.ItemType.RESOURCE)) {
+                    ResourceTableID = entry.itemTableID;
+                    break;
+                }
+            }catch(Exception e){
+
+            }
+        }
+
+        if(ResourceTableID == 0)
+            return;
+
+        ItemBase ib = ItemBase.getItemBase(rollRandomItem(ResourceTableID));
+        if(ib != null){
+            MobLoot toAdd = new MobLoot(mob,ib,false);
+            mob.getCharItemManager().addItemToInventory(toAdd);
+        }
+    }
+
     public static MobLoot getGenTableItem(int genTableID, AbstractCharacter mob, Boolean inHotzone) {
 
         if (mob == null || _genTables.containsKey(genTableID) == false)
@@ -156,11 +339,10 @@ public enum LootManager {
 
         //gets the 1-320 roll for this mob
         int itemTableRoll = 0;
-        int objectType = mob.getObjectType().ordinal();
         if(mob.getObjectType().ordinal() == 52) { //52 = player character
             itemTableRoll = ThreadLocalRandom.current().nextInt(1,320 + 1);
         } else{
-            itemTableRoll = TableRoll(mob.level, inHotzone);
+            itemTableRoll = TableRoll(mob.level);
         }
         ItemTableEntry tableRow = ItemTableEntry.rollTable(itemTableId, itemTableRoll);
         if (tableRow == null)
@@ -172,13 +354,23 @@ public enum LootManager {
             return null;
 
         if (ItemBase.getItemBase(itemUUID).getType().ordinal() == Enum.ItemType.RESOURCE.ordinal()) {
+            if(ThreadLocalRandom.current().nextInt(1,101) < 91)
+                return null; // cut down world drops rates of resources by 90%
             int amount = ThreadLocalRandom.current().nextInt(tableRow.minSpawn, tableRow.maxSpawn + 1);
             return new MobLoot(mob, ItemBase.getItemBase(itemUUID), amount, false);
         }
-
+        if(ItemBase.getItemBase(itemUUID).getType().equals(Enum.ItemType.RUNE)){
+            int randomRune = rollRandomItem(itemTableId);
+            if(randomRune != 0) {
+                itemUUID = randomRune;
+            }
+        } else if(ItemBase.getItemBase(itemUUID).getType().equals(Enum.ItemType.CONTRACT)){
+            int randomContract = rollRandomItem(itemTableId);
+            if(randomContract != 0) {
+                itemUUID = randomContract;
+            }
+        }
         outItem = new MobLoot(mob, ItemBase.getItemBase(itemUUID), false);
-        Enum.ItemType outType = outItem.getItemBase().getType();
-
 
         if(selectedRow.pModTable != 0){
             try {
@@ -196,6 +388,12 @@ public enum LootManager {
                 Logger.error("Failed to GenerateSuffix for item: " + outItem.getName());
             }
         }
+
+        if(outItem.getItemBase().getType().equals(Enum.ItemType.CONTRACT) || outItem.getItemBase().getType().equals(Enum.ItemType.RUNE)){
+            if(ThreadLocalRandom.current().nextInt(1,101) < 66)
+                return null; // cut down world drops rates of resources by 65%
+        }
+
         return outItem;
     }
 
@@ -216,7 +414,7 @@ public enum LootManager {
         if(mob.getObjectType().ordinal() == 52) {
             prefixTableRoll = ThreadLocalRandom.current().nextInt(1,320 + 1);
         } else{
-            prefixTableRoll = TableRoll(mob.level, inHotzone);
+            prefixTableRoll = TableRoll(mob.level);
         }
         ModTableEntry prefixMod = ModTableEntry.rollTable(prefixTable.modTableID, prefixTableRoll);
 
@@ -248,7 +446,7 @@ public enum LootManager {
         if(mob.getObjectType().ordinal() == 52) {
             suffixTableRoll = ThreadLocalRandom.current().nextInt(1,320 + 1);
         } else{
-            suffixTableRoll = TableRoll(mob.level, inHotzone);
+            suffixTableRoll = TableRoll(mob.level);
         }
         ModTableEntry suffixMod = ModTableEntry.rollTable(suffixTable.modTableID, suffixTableRoll);
 
@@ -263,23 +461,36 @@ public enum LootManager {
         return inItem;
     }
 
-    public static int TableRoll(int mobLevel, Boolean inHotzone) {
-
-        if (mobLevel > 65)
-            mobLevel = 65;
-
-        int max = (int) (4.882 * mobLevel + 127.0);
-
-        if (max > 319)
-            max = 319;
-
-        int min = (int) (4.469 * mobLevel - 3.469);
-
-        if (min < 70)
-            min = 70;
-
-        if (inHotzone)
-            min += mobLevel;
+    public static int TableRoll(int mobLevel) {
+
+        int rank = (int)(mobLevel * 0.1f);
+        int min = 50;
+        int max = 100;
+        switch(rank){
+            case 1:
+                min = 200;
+                max = 250;
+                break;
+            case 2:
+                min = 210;
+                max = 275;
+                break;
+            case 3:
+                min = 220;
+                max = 300;
+                break;
+            case 4:
+                min = 230;
+                max = 320;
+                break;
+            case 5:
+            case 6:
+            case 7:
+            case 8:
+                min = 240;
+                max = 320;
+                break;
+        }
 
         int roll = ThreadLocalRandom.current().nextInt(min, max + 1);
 
@@ -299,12 +510,7 @@ public enum LootManager {
 
         int high = bse.highGold;
         int low = bse.lowGold;
-        int gold = ThreadLocalRandom.current().nextInt(low, high + 1);
-
-        if (inHotzone == true)
-            gold = (int) (gold * HOTZONE_GOLD_RATE);
-        else
-            gold = (int) (gold * NORMAL_GOLD_RATE);
+        int gold = (int) (ThreadLocalRandom.current().nextInt(low, high + 1) * NORMAL_GOLD_RATE);
 
         if (gold > 0) {
             MobLoot goldAmount = new MobLoot(mob, gold);
@@ -315,45 +521,63 @@ public enum LootManager {
 
     public static void GenerateLootDrop(Mob mob, int tableID, Boolean inHotzone) {
 
-        try {
-
-            MobLoot toAdd = getGenTableItem(tableID, mob, inHotzone);
-
-            if (toAdd != null)
-                mob.getCharItemManager().addItemToInventory(toAdd);
-
-        } catch (Exception e) {
-            //TODO chase down loot generation error, affects roughly 2% of drops
-            int i = 0;
+        MobLoot toAdd = getGenTableItem(tableID, mob, inHotzone);
+        if(toAdd != null){
+            ItemBase ib = toAdd.getItemBase();
+            switch(ib.getType()){
+                case CONTRACT:
+                case RUNE:
+                case RESOURCE:
+                    return;
+            }
+            toAdd.setIsID(true);
+            mob.getCharItemManager().addItemToInventory(toAdd);
         }
     }
 
+
     public static void GenerateEquipmentDrop(Mob mob) {
 
+        if (mob == null || mob.getSafeZone())
+            return; // no equipment to drop in safezones
+
+        if(mob.StrongholdGuardian || mob.StrongholdCommander || mob.StrongholdEpic)
+            return; // stronghold mobs don't drop equipment
+
         //do equipment here
-        int dropCount = 0;
-        if (mob.getEquip() != null)
+        if (mob.getEquip() != null) {
+            boolean isVorg = false;
             for (MobEquipment me : mob.getEquip().values()) {
 
                 if (me.getDropChance() == 0)
                     continue;
 
+                String name = me.getItemBase().getName().toLowerCase();
+                if (name.contains("vorgrim legionnaire's") || name.contains("vorgrim auxiliary's") ||name.contains("bellugh nuathal") || name.contains("crimson circle"))
+                    isVorg = true;
+
+                if(isVorg && !mob.isDropper){
+                    continue;
+                }
+
                 float equipmentRoll = ThreadLocalRandom.current().nextInt(1, 100 + 1);
                 float dropChance = me.getDropChance() * 100;
-
+                ItemBase itemBase = me.getItemBase();
+                if(isVorg) {
+                    mob.spawnTime = ThreadLocalRandom.current().nextInt(300, 2700);
+                    dropChance = 10;
+                    itemBase = getRandomVorg(itemBase);
+                }
                 if (equipmentRoll > dropChance)
                     continue;
 
-                MobLoot ml = new MobLoot(mob, me.getItemBase(), false);
+                MobLoot ml = new MobLoot(mob, itemBase, false);
 
-                if (ml != null && dropCount < 1) {
-                    ml.setIsID(true);
-                    ml.setDurabilityCurrent((short) (ml.getDurabilityCurrent() - ThreadLocalRandom.current().nextInt(5) + 1));
-                    mob.getCharItemManager().addItemToInventory(ml);
-                    dropCount = 1;
-                    //break; // Exit on first successful roll.
-                }
+                ml.setIsID(true);
+                ml.setDurabilityCurrent((short) (ml.getDurabilityCurrent() - ThreadLocalRandom.current().nextInt(5) + 1));
+                mob.getCharItemManager().addItemToInventory(ml);
             }
+        }
     }
 
     public static void GenerateInventoryDrop(Mob mob, BootySetEntry bse) {
@@ -367,8 +591,11 @@ public enum LootManager {
 
         MobLoot lootItem = new MobLoot(mob, ItemBase.getItemBase(bse.itemBase), true);
 
-        if (lootItem != null)
+        if (lootItem != null) {
             mob.getCharItemManager().addItemToInventory(lootItem);
+            if(lootItem.getItemBase().isDiscRune() && !Mob.discDroppers.contains(mob))
+                Mob.AddDiscDropper(mob);
+        }
     }
 
     public static void peddleFate(PlayerCharacter playerCharacter, Item gift) {
@@ -392,12 +619,12 @@ public enum LootManager {
 
         //check if player owns the gift he is trying to open
 
-        if (itemMan.doesCharOwnThisItem(gift.getObjectUUID()) == false)
+        if (!itemMan.doesCharOwnThisItem(gift.getObjectUUID()))
             return;
 
         //roll 1-100 for the gen table selection
 
-        int genRoll = ThreadLocalRandom.current().nextInt(1, 100 + 1);
+        int genRoll = ThreadLocalRandom.current().nextInt(94, 100) + 1;
         GenTableEntry selectedRow = GenTableEntry.rollTable(tableID, genRoll, LootManager.NORMAL_DROP_RATE);
 
         if(selectedRow == null)
@@ -413,45 +640,276 @@ public enum LootManager {
 
         //create the item from the table, quantity is always 1
 
-        MobLoot winnings = new MobLoot(playerCharacter, ItemBase.getItemBase(selectedItem.cacheID), 1, false);
+        ItemBase ib = ItemBase.getItemBase(selectedItem.cacheID);
+        if(ib.getUUID() == Warehouse.coalIB.getUUID()){
+            //no more coal, give gold instead
+            if (itemMan.getGoldInventory().getNumOfItems() + 250000 > 10000000) {
+                ErrorPopupMsg.sendErrorPopup(playerCharacter, 21);
+                return;
+            }
+            itemMan.addGoldToInventory(250000,false);
+            itemMan.updateInventory();
+        }else {
+            MobLoot winnings = new MobLoot(playerCharacter, ib, 1, false);
 
-        if (winnings == null)
-            return;
+            if (winnings == null)
+                return;
 
-        //early exit if the inventory of the player will not old the item
+            //early exit if the inventory of the player will not hold the item
 
-        if (itemMan.hasRoomInventory(winnings.getItemBase().getWeight()) == false) {
-            ErrorPopupMsg.sendErrorPopup(playerCharacter, 21);
-            return;
+            if (itemMan.hasRoomInventory(winnings.getItemBase().getWeight()) == false) {
+                ErrorPopupMsg.sendErrorPopup(playerCharacter, 21);
+                return;
+            }
+
+            //determine if the winning item needs a prefix
+
+            if (selectedRow.pModTable != 0) {
+                int prefixRoll = ThreadLocalRandom.current().nextInt(220, 320 + 1);
+                ModTableEntry prefix = ModTableEntry.rollTable(selectedRow.pModTable, prefixRoll);
+                if (prefix != null)
+                    winnings.addPermanentEnchantment(prefix.action, 0, prefix.level, true);
+            }
+
+            //determine if the winning item needs a suffix
+
+            if (selectedRow.sModTable != 0) {
+                int suffixRoll = ThreadLocalRandom.current().nextInt(220, 320 + 1);
+                ModTableEntry suffix = ModTableEntry.rollTable(selectedRow.sModTable, suffixRoll);
+                if (suffix != null)
+                    winnings.addPermanentEnchantment(suffix.action, 0, suffix.level, true);
+            }
+            winnings.setIsID(true);
+
+            //remove gift from inventory
+
+            itemMan.consume(gift);
+
+            //add winnings to player inventory
+
+            Item playerWinnings = winnings.promoteToItem(playerCharacter);
+            itemMan.addItemToInventory(playerWinnings);
+            itemMan.updateInventory();
         }
+    }
 
-        //determine if the winning item needs a prefix
+    public static int rollRandomItem(int itemTable){
+        int returnedID = ItemTableEntry.getRandomItem(itemTable);
+        return returnedID;
+    }
 
-        if(selectedRow.pModTable != 0){
-            int prefixRoll = ThreadLocalRandom.current().nextInt(220,320 + 1);
-            ModTableEntry prefix = ModTableEntry.rollTable(selectedRow.pModTable, prefixRoll);
-            if(prefix != null)
-                winnings.addPermanentEnchantment(prefix.action, 0, prefix.level, true);
+    public static ItemBase getRandomVorg(ItemBase itemBase){
+        int roll = 0;
+        if(vorg_ha_uuids.contains(itemBase.getUUID())) {
+            roll = ThreadLocalRandom.current().nextInt(0, 10);
+            switch (roll) {
+                case 1:
+                    return ItemBase.getItemBase(vorg_ha_uuids.get(0));
+                case 2:
+                    return ItemBase.getItemBase(vorg_ha_uuids.get(1));
+                case 3:
+                    return ItemBase.getItemBase(vorg_ha_uuids.get(2));
+                case 4:
+                    return ItemBase.getItemBase(vorg_ha_uuids.get(3));
+                case 5:
+                    return ItemBase.getItemBase(vorg_ha_uuids.get(4));
+                case 6:
+                    return ItemBase.getItemBase(vorg_ha_uuids.get(5));
+                case 7:
+                    return ItemBase.getItemBase(vorg_ha_uuids.get(6));
+                case 8:
+                    return ItemBase.getItemBase(vorg_ha_uuids.get(7));
+                default:
+                    return ItemBase.getItemBase(vorg_ha_uuids.get(8));
+            }
         }
 
-        //determine if the winning item needs a suffix
+        if(vorg_ma_uuids.contains(itemBase.getUUID())) {
+            roll = ThreadLocalRandom.current().nextInt(0, 10);
+            switch (roll) {
+                case 1:
+                    return ItemBase.getItemBase(vorg_ma_uuids.get(0));
+                case 2:
+                    return ItemBase.getItemBase(vorg_ma_uuids.get(1));
+                case 3:
+                    return ItemBase.getItemBase(vorg_ma_uuids.get(2));
+                case 4:
+                    return ItemBase.getItemBase(vorg_ma_uuids.get(3));
+                case 5:
+                    return ItemBase.getItemBase(vorg_ma_uuids.get(4));
+                case 6:
+                    return ItemBase.getItemBase(vorg_ma_uuids.get(5));
+                case 7:
+                    return ItemBase.getItemBase(vorg_ma_uuids.get(6));
+                default:
+                    return ItemBase.getItemBase(vorg_ma_uuids.get(7));
+            }
+        }
 
-        if(selectedRow.sModTable != 0){
-            int suffixRoll = ThreadLocalRandom.current().nextInt(220,320 + 1);
-            ModTableEntry suffix = ModTableEntry.rollTable(selectedRow.sModTable, suffixRoll);
-            if (suffix != null)
-                winnings.addPermanentEnchantment(suffix.action, 0, suffix.level, true);
+        if(vorg_la_uuids.contains(itemBase.getUUID())) {
+            roll = ThreadLocalRandom.current().nextInt(0, 10);
+            switch (roll) {
+                case 1:
+                    return ItemBase.getItemBase(vorg_la_uuids.get(0));
+                case 2:
+                    return ItemBase.getItemBase(vorg_la_uuids.get(1));
+                case 3:
+                    return ItemBase.getItemBase(vorg_la_uuids.get(2));
+                case 4:
+                    return ItemBase.getItemBase(vorg_la_uuids.get(3));
+                case 5:
+                    return ItemBase.getItemBase(vorg_la_uuids.get(4));
+                case 6:
+                    return ItemBase.getItemBase(vorg_la_uuids.get(5));
+                case 7:
+                    return ItemBase.getItemBase(vorg_la_uuids.get(6));
+                default:
+                    return ItemBase.getItemBase(vorg_la_uuids.get(7));
+            }
         }
-        winnings.setIsID(true);
 
-        //remove gift from inventory
+        if(vorg_cloth_uuids.contains(itemBase.getUUID())) {
+            roll = ThreadLocalRandom.current().nextInt(0, 10);
+            switch (roll) {
+                case 1:
+                    return ItemBase.getItemBase(vorg_cloth_uuids.get(0));
+                case 2:
+                    return ItemBase.getItemBase(vorg_cloth_uuids.get(1));
+                case 3:
+                    return ItemBase.getItemBase(vorg_cloth_uuids.get(2));
+                case 4:
+                    return ItemBase.getItemBase(vorg_cloth_uuids.get(3));
+                default:
+                    return ItemBase.getItemBase(vorg_cloth_uuids.get(4));
+            }
+        }
+
+        return null;
+    }
+
+    public static void DropPresent(Mob mob){
+        int random = 971049 + ThreadLocalRandom.current().nextInt(24);
+        if (random > 971071)
+            random = 971071;
+
+        ItemBase present = ItemBase.getItemBase(random);
+        if (present != null) {
+            MobLoot toAdd = new MobLoot(mob, present, true);
+
+            if (toAdd != null)
+                mob.getCharItemManager().addItemToInventory(toAdd);
+        }
+    }
 
-        itemMan.consume(gift);
+    public static void GenerateStrongholdLoot(Mob mob, boolean commander, boolean epic) {
 
-        //add winnings to player inventory
+        mob.getCharItemManager().clearInventory();
 
-        Item playerWinnings = winnings.promoteToItem(playerCharacter);
-        itemMan.addItemToInventory(playerWinnings);
-        itemMan.updateInventory();
+        int multiplier = 1;
+        if (commander)
+            multiplier = 2;
+        if(epic)
+            multiplier = 10;
+
+        int high = 125000;
+        int low = 50000;
+        int gold = ThreadLocalRandom.current().nextInt(low, high + 1) * multiplier;
+
+        if (gold > 0) {
+            MobLoot goldAmount = new MobLoot(mob, gold);
+            mob.getCharItemManager().addItemToInventory(goldAmount);
+        }
+
+        //present drop chance for all
+        if (ThreadLocalRandom.current().nextInt(100) < 35)
+            DropPresent(mob);
+
+        //random contract drop chance for all
+        if (ThreadLocalRandom.current().nextInt(100) < 40) {
+            int contractTableID = 250;
+            contractTableID += ThreadLocalRandom.current().nextInt(0, 11);
+            if (contractTableID > 259)
+                contractTableID = 659;
+
+                int id = rollRandomItem(contractTableID);
+                ItemBase ib = ItemBase.getItemBase(id);
+                if (ib != null) {
+                    MobLoot contract = new MobLoot(mob, ib, true);
+
+                    if (contract != null)
+                        mob.getCharItemManager().addItemToInventory(contract);
+                }
+        }
+
+        //special commander drop chances
+        if (commander)
+            GenerateCommanderLoot(mob,false);
+
+        //special epic drop chances
+        if (epic) {
+            GenerateCommanderLoot(mob, true);
+            GenerateCommanderLoot(mob,false);
+        }
+    }
+
+    public static void GenerateCommanderLoot(Mob mob, boolean epic){
+        //present chance
+        if (ThreadLocalRandom.current().nextInt(100) < 25)
+            DropPresent(mob);
+
+        //present chance
+        if (ThreadLocalRandom.current().nextInt(100) < 25)
+            DropPresent(mob);
+
+        //chance for glass
+        if (ThreadLocalRandom.current().nextInt(100) < 75) {
+            int glassID = rollRandomItem(126);
+            ItemBase glassItem = ItemBase.getItemBase(glassID);
+            if (glassItem != null) {
+                MobLoot toAdd2 = new MobLoot(mob, glassItem, true);
+
+                if (toAdd2 != null)
+                    mob.getCharItemManager().addItemToInventory(toAdd2);
+            }
+        }
+
+        //chance for disc
+        if (ThreadLocalRandom.current().nextInt(100) < 75) {
+            int discID = rollRandomItem(3202);
+            ItemBase discItem = ItemBase.getItemBase(discID);
+            if (discItem != null) {
+                MobLoot toAdd3 = new MobLoot(mob, discItem, true);
+
+                if (toAdd3 != null)
+                    mob.getCharItemManager().addItemToInventory(toAdd3);
+            }
+        }
+
+        //chance for stat rune
+        if (ThreadLocalRandom.current().nextInt(100) < 75) {
+            int runeID = rollRandomItem(3201);
+            ItemBase runeItem = ItemBase.getItemBase(runeID);
+            if (runeItem != null) {
+                MobLoot toAdd4 = new MobLoot(mob, runeItem, true);
+
+                if (toAdd4 != null)
+                    mob.getCharItemManager().addItemToInventory(toAdd4);
+            }
+        }
+        if(epic){
+            int contractTableID = 250;
+            contractTableID += ThreadLocalRandom.current().nextInt(0, 11);
+            if (contractTableID > 259)
+                contractTableID = 659;
+
+            int id = rollRandomItem(contractTableID);
+            ItemBase ib = ItemBase.getItemBase(id);
+            if (ib != null) {
+                MobLoot contract = new MobLoot(mob, ib, true);
+
+                if (contract != null)
+                    mob.getCharItemManager().addItemToInventory(contract);
+            }
+        }
     }
 }

src/engine/gameManager/MaintenanceManager.java

@@ -24,7 +24,7 @@ public enum MaintenanceManager {
 
     public static void setMaintDateTime(Building building, LocalDateTime maintDate) {
 
-        building.maintDateTime = maintDate;
+        building.maintDateTime = maintDate.withHour(1).withMinute(0).withSecond(0);
         DbManager.BuildingQueries.updateMaintDate(building);
 
     }
@@ -49,19 +49,15 @@ public enum MaintenanceManager {
 
             if (chargeUpkeep(building) == false)
                 derankList.add(building);
+            else
+                setMaintDateTime(building, LocalDateTime.now().plusDays(7));
         }
-        // Reset maintenance dates for these buildings
 
-        for (Building building : maintList) {
-            setMaintDateTime(building, LocalDateTime.now().plusDays(7));
-
-        }
-        // Derak or destroy buildings that did not
-        // have funds available.
-
-        for (Building building : derankList)
+        for (Building building : derankList) {
             building.destroyOrDerank(null);
-
+            if(building.getRank() > 0)
+                setMaintDateTime(building, LocalDateTime.now().plusDays(1));
+        }
         Logger.info("Structures: " + buildingList.size() + " Maint: " + maintList.size() + " Derank: " + derankList.size());
     }
 
@@ -98,6 +94,10 @@ public enum MaintenanceManager {
                 continue;
             }
 
+            //only ToL pays maintenance
+            if(building.getBlueprint().getBuildingGroup() != null && !building.getBlueprint().getBuildingGroup().equals(Enum.BuildingGroup.TOL))
+                continue;
+
             // No maintenance on banestones omfg
 
             if (building.getBlueprint().getBuildingGroup().equals(Enum.BuildingGroup.BANESTONE))
@@ -122,9 +122,9 @@ public enum MaintenanceManager {
 
 
             //no maintenance if day of week doesnt match
-            if (LocalDateTime.now().getDayOfWeek().ordinal() != building.maintDateTime.getDayOfWeek().ordinal()) {
-                continue;
-            }
+            //if (LocalDateTime.now().getDayOfWeek().ordinal() != building.maintDateTime.getDayOfWeek().ordinal()) {
+            //    continue;
+            //}
             //  Add building to maintenance queue
 
             maintList.add(building);
@@ -186,49 +186,8 @@ public enum MaintenanceManager {
         // If this is an R8 tree, validate that we can
         // cover the resources required
 
-        if (building.getRank() == 8) {
-
-            hasResources = true;
-
-            if (warehouse == null)
-                hasResources = false;
-            else {
-
-                resourceValue = warehouse.getResources().get(Warehouse.stoneIB);
-
-                if (resourceValue < 1500)
-                    hasResources = false;
-
-                resourceValue = warehouse.getResources().get(Warehouse.lumberIB);
-
-                if (resourceValue < 1500)
-                    hasResources = false;
-
-                resourceValue = warehouse.getResources().get(Warehouse.galvorIB);
-
-                if (resourceValue < 5)
-                    hasResources = false;
-
-                resourceValue = warehouse.getResources().get(Warehouse.wormwoodIB);
-
-                if (resourceValue < 5)
-                    hasResources = false;
-
-            }
-        }
-        // Validation completed but has failed.  We can derank
-        // the target building and early exit
-
-        if ((hasFunds == false) ||
-                ((building.getRank() == 8) && !hasResources)) {
-
-            // Add cash back to strongbox for lost rank if the building isn't being destroyed
-            // and it's not an R8 deranking
-
-            if ((building.getRank() > 1) && (building.getRank() < 8)) {
-                building.setStrongboxValue(building.getStrongboxValue() + building.getBlueprint().getRankCost(Math.min(building.getRank(), 7)));
-            }
 
+        if (hasFunds == false) {
             return false; // Early exit for having failed to meet maintenance
         }
 
@@ -253,58 +212,6 @@ public enum MaintenanceManager {
             }
         }
 
-        // Early exit as we're done if we're not an R8 tree
-
-        if (building.getRank() < 8)
-            return true;
-
-        // Now for the resources if it's an R8 tree
-
-        // Withdraw Stone
-
-        resourceValue = warehouse.getResources().get(Warehouse.stoneIB);
-
-        if (DbManager.WarehouseQueries.updateStone(warehouse, resourceValue - 1500) == true) {
-            warehouse.getResources().put(Warehouse.stoneIB, resourceValue - 1500);
-            warehouse.AddTransactionToWarehouse(Enum.GameObjectType.Building, building.getObjectUUID(), Enum.TransactionType.WITHDRAWL, Resource.STONE, 1500);
-        } else {
-            Logger.error("stone update failed for warehouse of UUID:" + warehouse.getObjectUUID());
-            return true;
-        }
-
-        // Withdraw Lumber
-
-        resourceValue = warehouse.getResources().get(Warehouse.lumberIB);
-
-        if (DbManager.WarehouseQueries.updateLumber(warehouse, resourceValue - 1500) == true) {
-            warehouse.getResources().put(Warehouse.lumberIB, resourceValue - 1500);
-            warehouse.AddTransactionToWarehouse(Enum.GameObjectType.Building, building.getObjectUUID(), Enum.TransactionType.WITHDRAWL, Resource.LUMBER, 1500);
-        } else {
-            Logger.error("lumber update failed for warehouse of UUID:" + warehouse.getObjectUUID());
-            return true;
-        }
-
-        // Withdraw Galvor
-
-        resourceValue = warehouse.getResources().get(Warehouse.galvorIB);
-
-        if (DbManager.WarehouseQueries.updateGalvor(warehouse, resourceValue - 5) == true) {
-            warehouse.getResources().put(Warehouse.galvorIB, resourceValue - 5);
-            warehouse.AddTransactionToWarehouse(Enum.GameObjectType.Building, building.getObjectUUID(), Enum.TransactionType.WITHDRAWL, Resource.GALVOR, 5);
-        } else {
-            Logger.error("galvor update failed for warehouse of UUID:" + warehouse.getObjectUUID());
-            return true;
-        }
-
-        resourceValue = warehouse.getResources().get(Warehouse.wormwoodIB);
-
-        if (DbManager.WarehouseQueries.updateWormwood(warehouse, resourceValue - 5) == true) {
-            warehouse.getResources().put(Warehouse.wormwoodIB, resourceValue - 5);
-            warehouse.AddTransactionToWarehouse(Enum.GameObjectType.Building, building.getObjectUUID(), Enum.TransactionType.WITHDRAWL, Resource.WORMWOOD, 5);
-        } else {
-            Logger.error("wyrmwood update failed for warehouse of UUID:" + warehouse.getObjectUUID());
-        }
-
         return true;
     }
 

src/engine/gameManager/MovementManager.java

@@ -68,7 +68,7 @@ public enum MovementManager {
 
         if (toMove.getObjectType().equals(GameObjectType.PlayerCharacter)) {
             if (((PlayerCharacter) toMove).isCasting())
-                ((PlayerCharacter) toMove).update();
+                ((PlayerCharacter) toMove).update(false);
         }
 
 
@@ -96,7 +96,7 @@ public enum MovementManager {
         if (!toMove.isMoving())
             toMove.resetLastSetLocUpdate();
         else
-            toMove.update();
+            toMove.update(false);
 
         // Update movement for the player
 
@@ -351,7 +351,7 @@ public enum MovementManager {
             ChatManager.chatSystemInfo((PlayerCharacter) ac, "Finished Alt change, setting the end location to " + ac.getEndLoc().getX() + ' ' + ac.getEndLoc().getZ() + " moving=" + ac.isMoving() + " and current location is " + curLoc.getX() + ' ' + curLoc.getZ());
 
         //Send run/walk/sit/stand to tell the client we are flying / landing etc
-        ac.update();
+        ac.update(false);
         ac.stopMovement(ac.getLoc());
         if (ac.isAlive())
             MovementManager.sendRWSSMsg(ac);
@@ -408,7 +408,7 @@ public enum MovementManager {
             if (bonus.getBool(ModType.Stunned, SourceType.None) || bonus.getBool(ModType.CannotMove, SourceType.None))
                 continue;
 
-            member.update();
+            member.update(false);
 
 
             // All checks passed, let's move the player

src/engine/gameManager/NPCManager.java

@@ -340,8 +340,8 @@ public enum NPCManager {
         else
             buildingSlot = BuildingManager.getAvailableSlot(abstractCharacter.building);
 
-        if (buildingSlot == -1)
-            Logger.error("No available slot for NPC: " + abstractCharacter.getObjectUUID());
+        //if (buildingSlot == -1)
+            //Logger.error("No available slot for NPC: " + abstractCharacter.getObjectUUID());
 
         abstractCharacter.building.getHirelings().put(abstractCharacter, buildingSlot);
 

src/engine/gameManager/PowersManager.java

@@ -163,6 +163,14 @@ public enum PowersManager {
     public static void usePower(final PerformActionMsg msg, ClientConnection origin,
                                 boolean sendCastToSelf) {
 
+        PlayerCharacter pc = SessionManager.getPlayerCharacter(origin);
+
+        if(!pc.isFlying() && powersBaseByToken.get(msg.getPowerUsedID()) != null && powersBaseByToken.get(msg.getPowerUsedID()).isSpell) //cant be sitting if flying
+            CombatManager.toggleSit(false,origin);
+
+        if(pc.isMoving())
+            pc.stopMovement(pc.getMovementLoc());
+
         if (usePowerA(msg, origin, sendCastToSelf)) {
             // Cast failed for some reason, reset timer
 
@@ -171,13 +179,10 @@ public enum PowersManager {
             DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.PRIMARY);
 
             // Send Fail to cast message
-            PlayerCharacter pc = SessionManager
-                    .getPlayerCharacter(origin);
-
             if (pc != null) {
                 sendPowerMsg(pc, 2, msg);
                 if (pc.isCasting()) {
-                    pc.update();
+                    pc.update(false);
                 }
 
                 pc.setIsCasting(false);
@@ -205,6 +210,41 @@ public enum PowersManager {
 
         boolean CSRCast = false;
 
+        if(msg.getPowerUsedID() == 430628895) {
+
+            boolean failed = false;// group teleport
+            City city = ZoneManager.getCityAtLocation(playerCharacter.loc);
+            if (city == null) {
+                failed = true;
+            }else{
+                Bane bane = city.getBane();
+                if (bane == null) {
+                    failed = true;
+                }else{
+                    if(!bane.getSiegePhase().equals(SiegePhase.WAR)){
+                        failed = true;
+                    }
+                }
+            }
+            if(failed){
+                //check to see if we are at an active mine
+                Zone zone = ZoneManager.findSmallestZone(playerCharacter.loc);
+                if(zone != null){
+                    Mine mine = null;
+                    for(Building building : zone.zoneBuildingSet){
+                        if(building.getBlueprint().getBuildingGroup().equals(BuildingGroup.MINE)){
+                            mine = Mine.getMineFromTower(building.getObjectUUID());
+                        }
+                    }
+                    if(mine != null){
+                        failed = !mine.isActive;
+                    }
+                }
+            }
+
+            if(failed)
+                return false;
+        }
 
         if (MBServerStatics.POWERS_DEBUG) {
             ChatManager.chatSayInfo(
@@ -241,6 +281,7 @@ public enum PowersManager {
 
         // get power
         PowersBase pb = PowersManager.powersBaseByToken.get(msg.getPowerUsedID());
+
         if (pb == null) {
             ChatManager.chatSayInfo(playerCharacter,
                     "This power is not implemented yet.");
@@ -252,6 +293,35 @@ public enum PowersManager {
             // return false;
         }
 
+        //check for movement buffs while flying
+        if(playerCharacter.isFlying()) {
+            switch(pb.token){
+                case 429005674:
+                case 429505739:
+                case 431054700:
+                case 428005600:
+                case 431610080:
+                case 427935608:
+                case 427857146:
+                case 427988218:
+                case 431854842:
+                case 421074170:
+                case 429611355:
+                case 428955899:
+                case 1794395699:
+                case 429428796:
+                case 1514898036:
+                    ChatManager.chatSystemInfo(playerCharacter, "You Cannot Fly While Having A MovementBuff");
+                    //resync stamina
+                    playerCharacter.setStamina(playerCharacter.getStamina(), playerCharacter);
+
+                    // Update all surrounding clients.
+                    TargetedActionMsg cmm = new TargetedActionMsg(playerCharacter);
+                    DispatchMessage.dispatchMsgToInterestArea(playerCharacter, cmm, DispatchChannel.PRIMARY, MBServerStatics.CHARACTER_LOAD_RANGE, true, false);
+                    return true;
+            }
+        }
+
         if (playerCharacter.getLastPower() != null)
             return true;
 
@@ -279,6 +349,12 @@ public enum PowersManager {
             msg.setNumTrains(trains);
         }
 
+        switch(pb.token){
+            case 429420458: // BH eyes
+                msg.setNumTrains(msg.getNumTrains() * 2);
+                break;
+        }
+
         // can't go over total trains by player
         if (playerCharacter.getPowers() != null && playerCharacter.getPowers().containsKey(msg.getPowerUsedID())) {
             CharacterPower cp = playerCharacter.getPowers().get(msg.getPowerUsedID());
@@ -370,15 +446,20 @@ public enum PowersManager {
                 float range = pb.getRange();
                 // verify target is in range
 
+                if(pb.token != 429396028) {
+
+                    if (verifyInvalidRange(playerCharacter, target, range))
+                        // (pc.getLoc().distance(target.getLoc()) > pb.getRange()) {
+                        // TODO send message that target is out of range
+                        return true;
+// verify target is valid type
+                    if (!validateTarget(target, playerCharacter, pb))
+                        return true;
+                }else{
+                    pb.isSpell = false;
+                }
 
-                if (verifyInvalidRange(playerCharacter, target, range))
-                    // (pc.getLoc().distance(target.getLoc()) > pb.getRange()) {
-                    // TODO send message that target is out of range
-                    return true;
 
-                // verify target is valid type
-                if (!validateTarget(target, playerCharacter, pb))
-                    return true;
 
 
                 if (AbstractWorldObject.IsAbstractCharacter(target))
@@ -487,7 +568,6 @@ public enum PowersManager {
         // Validity checks passed, move on to casting spell
         //get caster's live counter
         int casterLiveCounter = playerCharacter.getLiveCounter();
-
         // run recycle job for when cast is available again, don't bother adding the timer for CSRs
         if (time > 0) {
             FinishRecycleTimeJob frtj = new FinishRecycleTimeJob(playerCharacter, msg);
@@ -514,7 +594,7 @@ public enum PowersManager {
 
         // make person casting stand up if spell (unless they're casting a chant which does not make them stand up)
         if (pb.isSpell() && !pb.isChant() && playerCharacter.isSit()) {
-            playerCharacter.update();
+            playerCharacter.update(false);
             playerCharacter.setSit(false);
             UpdateStateMsg updateStateMsg = new UpdateStateMsg(playerCharacter);
             DispatchMessage.dispatchMsgToInterestArea(playerCharacter, updateStateMsg, DispatchChannel.PRIMARY, MBServerStatics.CHARACTER_LOAD_RANGE, true, false);
@@ -522,7 +602,9 @@ public enum PowersManager {
         }
 
         // update cast (use skill) fail condition
-        playerCharacter.cancelOnCast();
+        if(pb.token != 429396028) {
+            playerCharacter.cancelOnCast();
+        }
 
         // update castSpell (use spell) fail condition if spell
         if (pb.isSpell())
@@ -535,13 +617,12 @@ public enum PowersManager {
 
 
         if (time > 100) {
-            playerCharacter.update();
+            playerCharacter.update(false);
             playerCharacter.setIsCasting(true);
         }
 
 
         playerCharacter.setLastMovementState(playerCharacter.getMovementState());
-
         // run timer job to end cast
         if (time < 1) // run immediately
             finishUsePower(copyMsg, playerCharacter, casterLiveCounter, targetLiveCounter);
@@ -706,8 +787,19 @@ public enum PowersManager {
         if (playerCharacter == null || msg == null)
             return;
 
+        //if((msg.getPowerUsedID() == 429495514 || msg.getPowerUsedID() == 429407306) && playerCharacter.getRace().getName().toLowerCase().contains("shade")){
+        //    //use sneak instead of hide
+        //    PowersBase pb = PowersManager.getPowerByToken(429397210);
+        //    int offsetTrains = (40 - msg.getNumTrains()) ;
+        //    applyPower(playerCharacter,playerCharacter,playerCharacter.loc,429397210,msg.getNumTrains(),false);
+        //    applyPower(playerCharacter,playerCharacter,playerCharacter.loc,427857146,offsetTrains,false);
+        //}
+        if(msg.getPowerUsedID() == 429494441) {//wildkins chase
+            playerCharacter.removeEffectBySource(EffectSourceType.Root,40,true);
+            playerCharacter.removeEffectBySource(EffectSourceType.Snare,40,true);
+        }
         if (playerCharacter.isCasting()) {
-            playerCharacter.update();
+            playerCharacter.update(false);
             playerCharacter.updateStamRegen(-100);
         }
 
@@ -809,15 +901,16 @@ public enum PowersManager {
                 }
                 float range = pb.getRange() + speedRange;
 
+                if(pb.token != 429396028) {
 
-                if (verifyInvalidRange(playerCharacter, mainTarget, range)) {
+                    if (verifyInvalidRange(playerCharacter, mainTarget, range)) {
 
-                    sendPowerMsg(playerCharacter, 8, msg);
-                    return;
+                        sendPowerMsg(playerCharacter, 8, msg);
+                        return;
+                    }
+                    // (pc.getLoc().distance(target.getLoc()) > pb.getRange()) {
+                    // TODO send message that target is out of range
                 }
-                // (pc.getLoc().distance(target.getLoc()) > pb.getRange()) {
-                // TODO send message that target is out of range
-
 
             }
 
@@ -1233,7 +1326,7 @@ public enum PowersManager {
 
         PlayerCharacter target = SessionManager
                 .getPlayerCharacterByLowerCaseName(msg.getTargetName());
-        if (target == null || target.equals(pc) || target.isCombat()) {
+        if (target == null || target.equals(pc)) {
 
             if (target == null) // Player not found. Send not found message
                 ChatManager.chatInfoError(pc,
@@ -1337,6 +1430,16 @@ public enum PowersManager {
                 else
                     duration = 45000; // Belgosh Summons, 45 seconds
 
+                boolean enemiesNear = false;
+                for(AbstractWorldObject awo : WorldGrid.getObjectsInRangePartial(pc.loc,MBServerStatics.CHARACTER_LOAD_RANGE, MBServerStatics.MASK_PLAYER)){
+                    PlayerCharacter playerCharacter = (PlayerCharacter)awo;
+                    if(!playerCharacter.guild.getNation().equals(pc.guild.getNation())){
+                        enemiesNear = true;
+                    }
+                }
+
+                if(enemiesNear && !pc.isInSafeZone())
+                    duration += 60000;
 
                 // Teleport to summoners location
                 FinishSummonsJob fsj = new FinishSummonsJob(source, pc);
@@ -1462,8 +1565,17 @@ public enum PowersManager {
         }
 
         // create list of characters
-        HashSet<AbstractCharacter> trackChars = RangeBasedAwo.getTrackList(
-                allTargets, playerCharacter, maxTargets);
+        HashSet<AbstractCharacter> trackChars;
+        switch(msg.getPowerToken()){
+            case 431511776:
+            case 429578587:
+            case 429503360:
+                trackChars = getTrackList(playerCharacter);
+                break;
+            default:
+                trackChars = RangeBasedAwo.getTrackList(allTargets, playerCharacter, maxTargets);
+                break;
+        }
 
         TrackWindowMsg trackWindowMsg = new TrackWindowMsg(msg);
 
@@ -1476,6 +1588,30 @@ public enum PowersManager {
 
     }
 
+    public static HashSet<AbstractCharacter> getTrackList(PlayerCharacter tracker){
+        HashSet<AbstractCharacter> list = new HashSet<AbstractCharacter>();
+        HashSet<AbstractWorldObject> shortList = WorldGrid.getObjectsInRangePartial(tracker.loc,MBServerStatics.CHARACTER_LOAD_RANGE, MBServerStatics.MASK_PLAYER);
+        HashSet<AbstractWorldObject> fullList = WorldGrid.getObjectsInRangePartial(tracker.loc,1408, MBServerStatics.MASK_PLAYER);
+        ArrayList<Guild> guildsPresent = new ArrayList<>();
+        for(AbstractWorldObject awo : shortList){
+            PlayerCharacter pc = (PlayerCharacter)awo;
+            if(!guildsPresent.contains(pc.guild.getNation())){
+                guildsPresent.add(pc.guild.getNation());
+            }
+        }
+        for(AbstractWorldObject awo : fullList){
+            if(awo.equals(tracker))
+                continue;
+            PlayerCharacter pc = (PlayerCharacter)awo;
+            if(!pc.isAlive())
+                continue;
+            if(guildsPresent.contains(pc.guild.getNation()))
+                list.add(pc);
+        }
+
+        return list;
+    }
+
     private static void sendRecyclePower(int token, ClientConnection origin) {
         RecyclePowerMsg recyclePowerMsg = new RecyclePowerMsg(token);
 
@@ -2189,7 +2325,7 @@ public enum PowersManager {
 
         // set player is not casting for regens
         if (pc.isCasting()) {
-            pc.update();
+            pc.update(false);
         }
         pc.setIsCasting(false);
 
@@ -2241,28 +2377,26 @@ public enum PowersManager {
             defense = 0f;
         // Get hit chance
 
-        if (pc.getDebug(16)) {
-            String smsg = "ATR: " + atr + ", Defense: " + defense;
-            ChatManager.chatSystemInfo(pc, smsg);
-        }
+        //if (pc.getDebug(16)) {
+        //    String smsg = "ATR: " + atr + ", Defense: " + defense;
+         //   ChatManager.chatSystemInfo(pc, smsg);
+        //}
 
-        int chance;
+        //int chance;
 
-        if (atr > defense || defense == 0)
-            chance = 94;
-        else {
-            float dif = atr / defense;
-            if (dif <= 0.8f)
-                chance = 4;
-            else
-                chance = ((int) (450 * (dif - 0.8f)) + 4);
-        }
+        //if (atr > defense || defense == 0)
+        //    chance = 94;
+        //else {
+        //    float dif = atr / defense;
+        //    if (dif <= 0.8f)
+        //        chance = 4;
+        //    else
+        //        chance = ((int) (450 * (dif - 0.8f)) + 4);
+        //}
 
         // calculate hit/miss
-        int roll = ThreadLocalRandom.current().nextInt(100);
 
-        boolean disable = true;
-        if (roll < chance) {
+        if (CombatManager.LandHit((int)atr,(int)defense)) {
             // Hit, check if dodge kicked in
             if (awo instanceof AbstractCharacter) {
                 AbstractCharacter tarAc = (AbstractCharacter) awo;
@@ -2562,7 +2696,9 @@ public enum PowersManager {
     }
 
     public static void cancelOnStun(AbstractCharacter ac) {
-
+        if(ac.getObjectType().equals(GameObjectType.PlayerCharacter)){
+            //PlayerCharacter.GroundPlayer((PlayerCharacter)ac);
+        }
     }
 
     private static PowersBase getLastPower(AbstractCharacter ac) {

src/engine/gameManager/SimulationManager.java

@@ -10,10 +10,7 @@ package engine.gameManager;
 
 import engine.Enum;
 import engine.Enum.GameObjectType;
-import engine.objects.AbstractGameObject;
-import engine.objects.City;
-import engine.objects.PlayerCharacter;
-import engine.objects.Runegate;
+import engine.objects.*;
 import org.pmw.tinylog.Logger;
 
 import java.sql.Connection;
@@ -33,7 +30,7 @@ public enum SimulationManager {
     SERVERHEARTBEAT;
 
     private static final long CITY_PULSE = 2000;
-    private static final long RUNEGATE_PULSE = 3000;
+    private static final long RUNEGATE_PULSE = 1000;
     private static final long UPDATE_PULSE = 1000;
     private static final long FlIGHT_PULSE = 100;
     public static Duration executionTime = Duration.ofNanos(1);
@@ -116,9 +113,18 @@ public enum SimulationManager {
         }
 
         try {
-            if ((_cityPulseTime != 0)
-                    && (System.currentTimeMillis() > _cityPulseTime))
-                pulseCities();
+            if ((_cityPulseTime != 0) && (System.currentTimeMillis() > _cityPulseTime)) {
+                try {
+                    pulseCities();
+                }catch(Exception e){
+
+                }
+                try {
+                    ArenaManager.pulseArenas();
+                }catch(Exception e){
+
+                }
+            }
         } catch (Exception e) {
             Logger.error(
                     "Fatal error in City Pulse: DISABLED. Error Message : "
@@ -154,7 +160,7 @@ public enum SimulationManager {
 
             if (player == null)
                 continue;
-            player.update();
+            player.update(false);
         }
 
         _updatePulseTime = System.currentTimeMillis() + 500;
@@ -203,8 +209,12 @@ public enum SimulationManager {
             city = (City) cityObject;
             city.onEnter();
         }
-
+        for(Mine mine : Mine.getMines()){
+            if(mine != null && mine.isActive)
+                mine.onEnter();
+        }
         _cityPulseTime = System.currentTimeMillis() + CITY_PULSE;
+
     }
 
     /*
@@ -214,6 +224,10 @@ public enum SimulationManager {
     private void pulseRunegates() {
 
         for (Runegate runegate : Runegate._runegates.values()) {
+            for(Portal portal : runegate._portals)
+                if(!portal.isActive())
+                    portal.activate(false);
+
             runegate.collidePortals();
         }
 

src/engine/gameManager/StrongholdManager.java

@@ -0,0 +1,347 @@
+package engine.gameManager;
+
+import engine.Enum;
+import engine.InterestManagement.InterestManager;
+import engine.InterestManagement.WorldGrid;
+import engine.math.Vector3f;
+import engine.math.Vector3fImmutable;
+import engine.objects.*;
+import org.pmw.tinylog.Logger;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.concurrent.ThreadLocalRandom;
+
+public class StrongholdManager {
+
+    public static void processStrongholds() {
+        ArrayList<Mine> mines = Mine.getMines();
+
+
+        //process strongholds selecting 3 randomly to become active
+        int count = 0;
+        while (count < 3) {
+            int random = ThreadLocalRandom.current().nextInt(1, mines.size()) - 1;
+            Mine mine = mines.get(random);
+            if (mine != null) {
+                if (!mine.isActive && !mine.isStronghold) {
+                    StartStronghold(mine);
+                    count++;
+                }
+            }
+        }
+    }
+
+    public static void StartStronghold(Mine mine){
+
+        //remove buildings
+        Building tower = BuildingManager.getBuilding(mine.getBuildingID());
+        if(tower == null)
+            return;
+
+        mine.isStronghold = true;
+        mine.strongholdMobs = new ArrayList<>();
+        mine.oldBuildings = new HashMap<>();
+
+        Zone mineZone = ZoneManager.findSmallestZone(tower.loc);
+        for(Building building : mineZone.zoneBuildingSet){
+            mine.oldBuildings.put(building.getObjectUUID(),building.meshUUID);
+            building.setMeshUUID(407650);
+            building.setMeshScale(new Vector3f(0,0,0));
+            InterestManager.setObjectDirty(building);
+            WorldGrid.updateObject(building);
+        }
+
+        //update tower to become stronghold mesh
+        tower.setMeshUUID(getStrongholdMeshID(mine.getParentZone()));
+        tower.setMeshScale(new Vector3f(1,1,1));
+        InterestManager.setObjectDirty(tower);
+        WorldGrid.updateObject(tower);
+
+        //create elite mobs
+        for(int i = 0; i < mine.capSize * 2; i++){
+            Vector3fImmutable loc = Vector3fImmutable.getRandomPointOnCircle(tower.loc,30);
+            MobBase guardBase = MobBase.getMobBase(getStrongholdGuardianID(tower.meshUUID));
+            Mob guard = Mob.createStrongholdMob(guardBase.getLoadID(), loc, Guild.getErrantGuild(),true,mineZone,null,0, guardBase.getFirstName(),65);
+            if(guard != null){
+                guard.parentZone = mine.getParentZone();
+                guard.bindLoc = loc;
+                guard.setLoc(loc);
+                guard.StrongholdGuardian = true;
+                guard.equipmentSetID = getStrongholdMobEquipSetID(guard);
+                guard.runAfterLoad();
+                guard.setLevel((short)65);
+                guard.setResists(new Resists("Elite"));
+                guard.spawnTime = 1000000000;
+                guard.BehaviourType = Enum.MobBehaviourType.Aggro;
+                mine.strongholdMobs.add(guard);
+                LootManager.GenerateStrongholdLoot(guard,false,false);
+                guard.healthMax  = 12500;
+                guard.setHealth(guard.healthMax);
+                guard.maxDamageHandOne = 1550;
+                guard.minDamageHandOne = 750;
+                guard.atrHandOne = 1800;
+                guard.defenseRating = 2200;
+                guard.setFirstName("Elite Guardian");
+                InterestManager.setObjectDirty(guard);
+                WorldGrid.addObject(guard,loc.x,loc.z);
+                WorldGrid.updateObject(guard);
+                guard.stronghold = mine;
+                guard.mobPowers.clear();
+                guard.mobPowers.put(429399948,20); // find weakness
+            }
+        }
+        //create stronghold commander
+        Vector3fImmutable loc = tower.loc;
+        MobBase commanderBase = MobBase.getMobBase(getStrongholdCommanderID(tower.meshUUID));
+        Mob commander = Mob.createStrongholdMob(commanderBase.getLoadID(), loc,Guild.getErrantGuild(),true,mineZone,null,0, commanderBase.getFirstName(),75);
+        if(commander != null){
+            commander.parentZone = mine.getParentZone();
+            commander.bindLoc = loc;
+            commander.setLoc(loc);
+            commander.StrongholdCommander = true;
+            commander.equipmentSetID = getStrongholdMobEquipSetID(commander);
+            commander.runAfterLoad();
+            commander.setLevel((short)75);
+            commander.setResists(new Resists("Elite"));
+            commander.spawnTime = 1000000000;
+            commander.BehaviourType = Enum.MobBehaviourType.Aggro;
+            commander.mobPowers.clear();
+            commander.mobPowers.put(429032838, 40); // gravechill
+            commander.mobPowers.put(429757701,20); // magebolt
+            commander.mobPowers.put(429121388,20); // blight
+            commander.mobPowers.put(431566891,20); // lightning bolt
+            commander.mobPowers.put(428716075,20); // fire bolt
+            commander.mobPowers.put(429010987,20); // ice bolt
+            mine.strongholdMobs.add(commander);
+            LootManager.GenerateStrongholdLoot(commander,true, false);
+            commander.healthMax = 50000;
+            commander.setHealth(commander.healthMax);
+            commander.maxDamageHandOne = 3500;
+            commander.minDamageHandOne = 1500;
+            commander.atrHandOne = 3500;
+            commander.defenseRating = 3500;
+            commander.setFirstName("Guardian Commander");
+            InterestManager.setObjectDirty(commander);
+            WorldGrid.addObject(commander,loc.x,loc.z);
+            WorldGrid.updateObject(commander);
+            commander.stronghold = mine;
+        }
+
+        mine.isActive = true;
+        tower.setProtectionState(Enum.ProtectionState.PROTECTED);
+        tower.getBounds().setRegions(tower);
+        InterestManager.setObjectDirty(tower);
+        WorldGrid.updateObject(tower);
+        ChatManager.chatSystemChannel(mine.getZoneName() + "'s Stronghold Has Begun!");
+        Logger.info(mine.getZoneName() + "'s Stronghold Has Begun!");
+    }
+
+    public static void EndStronghold(Mine mine){
+
+        //restore the buildings
+        Building tower = BuildingManager.getBuilding(mine.getBuildingID());
+        if(tower == null)
+            return;
+
+        mine.isStronghold = false;
+
+        //get rid of the mobs
+        for(Mob mob : mine.strongholdMobs) {
+            mob.despawn();
+            mob.removeFromCache();
+            DbManager.MobQueries.DELETE_MOB(mob);
+        }
+
+        //restore the buildings
+        Zone mineZone = ZoneManager.findSmallestZone(tower.loc);
+        for(Building building : mineZone.zoneBuildingSet){
+            if(mine.oldBuildings.containsKey(building.getObjectUUID())) {
+                building.setMeshUUID(mine.oldBuildings.get(building.getObjectUUID()));
+                building.setMeshScale(new Vector3f(1, 1, 1));
+                InterestManager.setObjectDirty(building);
+                WorldGrid.updateObject(building);
+            }
+        }
+
+        //update tower to become Mine Tower again
+        tower.setMeshUUID(1500100);
+
+        mine.isActive = false;
+        tower.setProtectionState(Enum.ProtectionState.NPC);
+        tower.getBounds().setRegions(tower);
+        InterestManager.setObjectDirty(tower);
+        WorldGrid.updateObject(tower);
+        ChatManager.chatSystemChannel(mine.getZoneName() + "'s Stronghold Has Concluded!");
+        Logger.info(mine.getZoneName() + "'s Stronghold Has Concluded!");
+    }
+
+    public static int getStrongholdMeshID(Zone parent){
+        while(!parent.isMacroZone()){
+            parent = parent.getParent();
+            if(parent.getName().equalsIgnoreCase("seafloor")){
+                return 0;
+            }
+        }
+        switch(parent.getObjectUUID()){
+            case 197:
+            case 234:
+            case 178:
+            case 122:
+                return 814000; //Frost Giant Hall (ICE)
+            case 968:
+            case 951:
+            case 313:
+            case 331:
+                return 5001500; // Lich Queens Keep (UNDEAD)
+            case 785:
+            case 761:
+            case 717:
+            case 737:
+                return 1306600; // Temple of the Dragon (DESERT)
+            case 353:
+            case 371:
+            case 388:
+            case 532:
+                return 564600; // Undead Lord's Keep (SWAMP)
+            case 550:
+            case 508:
+            case 475:
+            case 418:
+                return 1326600; // elven hall
+            case 437:
+            case 491:
+            case 590:
+            case 569:
+                return 602400;
+            case 824:
+            case 842:
+            case 632:
+                return 1600000; // chaos temple
+        }
+        return 456100; // small stockade
+    }
+
+    public static int getStrongholdGuardianID(int ID){
+        switch(ID){
+            case 814000:
+                return 253004; // Mountain Giant Raider Axe
+            case 5001500:
+                return 253008; // Vampire Spear Warrior
+            case 1306600:
+                return 253007; // Desert Orc Warrior
+            case 564600:
+                return 253010; // Kolthoss Warrior
+            case 1326600:
+                return 253005; //elven warrior
+            case 602400:
+                return 253009; // templar missionary
+            case 1600000:
+                return 253006; // scourger
+        }
+        return 13434; // human sword and board warrior
+    }
+
+    public static int getStrongholdEpicID(int ID){
+        switch(ID){
+            case 814000:
+                return 253023; // Mountain Giant Raider Axe
+            case 5001500:
+                return 253022; // Vampire Spear Warrior
+            case 1306600:
+                return 253021; // Desert Orc Warrior
+            case 564600:
+                return 253018; // Kolthoss Warrior
+            case 1326600:
+                return 253019; //elven warrior
+            case 602400:
+                return 253024; // templar missionary
+            case 1600000:
+                return 253020; // scourger
+        }
+        return 13434; // human sword and board warrior
+    }
+
+    public static int getStrongholdCommanderID(int ID){
+        switch(ID){
+            case 814000:
+                return 253017;
+            case 5001500:
+                return 253012;
+            case 1306600:
+                return 253016; // Desert Orc Xbow
+            case 564600:
+                return 253011; // xbow kolthoss
+            case 1326600:
+                return 253013; //elven bow warrior
+            case 602400:
+                return 253015; // dune giant with xbow
+            case 1600000:
+                return 253014; // barbator
+        }
+        return 13433;
+    }
+
+    public static int getStrongholdMobEquipSetID(Mob mob) {
+        if(mob.StrongholdGuardian){
+            return 6327;
+        }else{
+            return 10790;
+        }
+    }
+
+    public static void CheckToEndStronghold(Mine mine) {
+
+        boolean stillAlive = false;
+        for (Mob mob : mine.strongholdMobs)
+            if (mob.isAlive())
+                stillAlive = true;
+
+        if (!stillAlive) {
+            // Epic encounter
+
+            Building tower = BuildingManager.getBuilding(mine.getBuildingID());
+            if (tower == null)
+                return;
+
+            Zone mineZone = ZoneManager.findSmallestZone(tower.loc);
+
+            Vector3fImmutable loc = tower.loc;
+            MobBase commanderBase = MobBase.getMobBase(getStrongholdEpicID(tower.meshUUID));
+            Mob commander = Mob.createStrongholdMob(commanderBase.getLoadID(), loc, Guild.getErrantGuild(), true, mineZone, null, 0, commanderBase.getFirstName(), 75);
+            if (commander != null) {
+                commander.parentZone = mine.getParentZone();
+                commander.bindLoc = loc;
+                commander.setLoc(loc);
+                commander.StrongholdEpic = true;
+                commander.equipmentSetID = getStrongholdMobEquipSetID(commander);
+                commander.runAfterLoad();
+                commander.setLevel((short) 85);
+                commander.setResists(new Resists("Elite"));
+                commander.spawnTime = 1000000000;
+                commander.BehaviourType = Enum.MobBehaviourType.Aggro;
+                commander.mobPowers.clear();
+                commander.mobPowers.put(429032838, 40); // gravechill
+                commander.mobPowers.put(429757701,40); // magebolt
+                commander.mobPowers.put(429121388,40); // blight
+                commander.mobPowers.put(431566891,40); // lightning bolt
+                commander.mobPowers.put(428716075,40); // fire bolt
+                commander.mobPowers.put(429010987,40); // ice bolt
+                mine.strongholdMobs.add(commander);
+                LootManager.GenerateStrongholdLoot(commander, true, true);
+                commander.healthMax = 250000;
+                commander.setHealth(commander.healthMax);
+                commander.maxDamageHandOne = 5000;
+                commander.minDamageHandOne = 2500;
+                commander.atrHandOne = 5000;
+                commander.defenseRating = 3500;
+                commander.setFirstName("Defender of " + mine.getParentZone().getParent().getName());
+                InterestManager.setObjectDirty(commander);
+                WorldGrid.addObject(commander,loc.x,loc.z);
+                WorldGrid.updateObject(commander);
+                commander.stronghold = mine;
+
+            }
+        }
+    }
+}

src/engine/gameManager/ZergManager.java

@@ -0,0 +1,195 @@
+package engine.gameManager;
+import engine.objects.Guild;
+public class ZergManager {
+
+    public static float getCurrentMultiplier(int count, int maxCount){
+        switch(maxCount) {
+            case 3: return getMultiplier3Man(count);
+            case 5: return getMultiplier5Man(count);
+            case 10: return getMultiplier10Man(count);
+            case 20: return getMultiplier20Man(count);
+            case 30: return getMultiplier30Man(count);
+            case 40: return getMultiplier40Man(count);
+            default: return 1.0f; //unlimited
+        }
+    }
+    public static float getMultiplier3Man(int count) {
+        if(count < 4)
+            return 1.0f;
+
+        if(count > 6)
+            return 0.0f;
+
+        switch(count){
+            case 4: return 0.63f;
+            case 5: return 0.40f;
+            case 6: return 0.25f;
+            default: return 1.0f;
+        }
+    }
+    public static float getMultiplier5Man(int count) {
+        if(count < 6)
+            return 1.0f;
+
+        if(count > 10)
+            return 0.0f;
+
+        switch(count){
+            case 6: return 0.75f;
+            case 7: return 0.57f;
+            case 8: return 0.44f;
+            case 9: return 0.33f;
+            case 10: return 0.25f;
+            default: return 1.0f;
+        }
+    }
+    public static float getMultiplier10Man(int count) {
+        if(count < 11)
+            return 1.0f;
+
+        if(count > 20)
+            return 0.0f;
+
+        switch(count){
+            case 11: return 0.86f;
+            case 12: return 0.75f;
+            case 13: return 0.65f;
+            case 14: return 0.57f;
+            case 15: return 0.50f;
+            case 16: return 0.44f;
+            case 17: return 0.38f;
+            case 18: return 0.33f;
+            case 19: return 0.29f;
+            case 20: return 0.25f;
+            default: return 1.0f;
+        }
+    }
+    public static float getMultiplier20Man(int count) {
+        if(count < 21)
+            return 1.0f;
+
+        if(count > 40)
+            return 0.0f;
+
+        switch (count)
+        {
+            case 21: return 0.93f;
+            case 22: return 0.86f;
+            case 23: return 0.80f;
+            case 24: return 0.75f;
+            case 25: return 0.70f;
+            case 26: return 0.65f;
+            case 27: return 0.61f;
+            case 28: return 0.57f;
+            case 29: return 0.53f;
+            case 30: return 0.50f;
+            case 31: return 0.47f;
+            case 32: return 0.44f;
+            case 33: return 0.41f;
+            case 34: return 0.38f;
+            case 35: return 0.36f;
+            case 36: return 0.33f;
+            case 37: return 0.31f;
+            case 38: return 0.29f;
+            case 39: return 0.27f;
+            case 40: return 0.25f;
+            default: return 1.0f;
+        }
+
+    }
+    public static float getMultiplier30Man(int count) {
+        if(count < 31)
+            return 1.0f;
+
+        if(count > 60)
+            return 0.0f;
+
+        switch (count)
+        {
+            case 31: return 0.95f;
+            case 32: return 0.91f;
+            case 33: return 0.86f;
+            case 34: return 0.82f;
+            case 35: return 0.79f;
+            case 36: return 0.75f;
+            case 37: return 0.72f;
+            case 38: return 0.68f;
+            case 39: return 0.65f;
+            case 40: return 0.63f;
+            case 41: return 0.60f;
+            case 42: return 0.57f;
+            case 43: return 0.55f;
+            case 44: return 0.52f;
+            case 45: return 0.50f;
+            case 46: return 0.48f;
+            case 47: return 0.46f;
+            case 48: return 0.44f;
+            case 49: return 0.42f;
+            case 50: return 0.40f;
+            case 51: return 0.38f;
+            case 52: return 0.37f;
+            case 53: return 0.35f;
+            case 54: return 0.33f;
+            case 55: return 0.32f;
+            case 56: return 0.30f;
+            case 57: return 0.29f;
+            case 58: return 0.28f;
+            case 59: return 0.26f;
+            case 60: return 0.25f;
+            default: return 1.0f;
+        }
+
+    }
+    public static float getMultiplier40Man(int count) {
+        if(count < 41)
+            return 1.0f;
+
+        if(count > 80)
+            return 0.0f;
+
+        switch (count)
+        {
+            case 41: return 0.96f;
+            case 42: return 0.93f;
+            case 43: return 0.90f;
+            case 44: return 0.86f;
+            case 45: return 0.83f;
+            case 46: return 0.80f;
+            case 47: return 0.78f;
+            case 48: return 0.75f;
+            case 49: return 0.72f;
+            case 50: return 0.70f;
+            case 51: return 0.68f;
+            case 52: return 0.65f;
+            case 53: return 0.63f;
+            case 54: return 0.61f;
+            case 55: return 0.59f;
+            case 56: return 0.57f;
+            case 57: return 0.55f;
+            case 58: return 0.53f;
+            case 59: return 0.52f;
+            case 60: return 0.50f;
+            case 61: return 0.48f;
+            case 62: return 0.47f;
+            case 63: return 0.45f;
+            case 64: return 0.44f;
+            case 65: return 0.42f;
+            case 66: return 0.41f;
+            case 67: return 0.40f;
+            case 68: return 0.38f;
+            case 69: return 0.37f;
+            case 70: return 0.36f;
+            case 71: return 0.35f;
+            case 72: return 0.33f;
+            case 73: return 0.32f;
+            case 74: return 0.31f;
+            case 75: return 0.30f;
+            case 76: return 0.29f;
+            case 77: return 0.28f;
+            case 78: return 0.27f;
+            case 79: return 0.26f;
+            case 80: return 0.25f;
+            default: return 1.0f;
+        }
+    }
+}

src/engine/gameManager/ZoneManager.java

@@ -19,14 +19,12 @@ import engine.objects.Building;
 import engine.objects.City;
 import engine.objects.Zone;
 import engine.server.MBServerStatics;
-import org.pmw.tinylog.Logger;
 
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ThreadLocalRandom;
 
 /*
  * Class contains methods and structures which
@@ -109,20 +107,6 @@ public enum ZoneManager {
 
     }
 
-    // Returns the number of available hotZones
-    // remaining in this cycle (1am)
-
-    public static int availableHotZones() {
-
-        int count = 0;
-
-        for (Zone zone : ZoneManager.macroZones)
-            if (ZoneManager.validHotZone(zone))
-                count = count + 1;
-
-        return count;
-    }
-
     // Resets the  availability of hotZones
     // for this cycle
 
@@ -217,63 +201,6 @@ public enum ZoneManager {
         ZoneManager.playerCityZones.add(zone);
     }
 
-    public static final void generateAndSetRandomHotzone() {
-
-        Zone hotZone;
-        ArrayList<Integer> zoneArray = new ArrayList<>();
-
-        if (ZoneManager.macroZones.isEmpty())
-            return;
-
-        // Reset hotZone availability if none are left.
-
-        if (ZoneManager.availableHotZones() == 0)
-            ZoneManager.resetHotZones();
-
-        for (Zone zone : ZoneManager.macroZones)
-            if (validHotZone(zone))
-                zoneArray.add(zone.getObjectUUID());
-
-        int entryIndex = ThreadLocalRandom.current().nextInt(zoneArray.size());
-
-        hotZone = ZoneManager.getZoneByUUID(zoneArray.get(entryIndex));
-
-        if (hotZone == null) {
-            Logger.error("Hotzone is null");
-            return;
-        }
-
-        ZoneManager.setHotZone(hotZone);
-
-    }
-
-    public static final boolean validHotZone(Zone zone) {
-
-        if (zone.getSafeZone() == (byte) 1)
-            return false; // no safe zone hotzones// if (this.hotzone == null)
-
-        if (zone.getNodes().isEmpty())
-            return false;
-
-        if (zone.equals(ZoneManager.seaFloor))
-            return false;
-
-        //no duplicate hotZones
-
-        if (zone.hasBeenHotzone == true)
-            return false;
-
-        // Enforce min level
-
-        if (zone.minLvl < Integer.parseInt(ConfigManager.MB_HOTZONE_MIN_LEVEL.getValue()))
-            return false;
-
-        if (ZoneManager.hotZone != null)
-            return ZoneManager.hotZone.getObjectUUID() != zone.getObjectUUID();
-
-        return true;
-    }
-
     // Converts world coordinates to coordinates local to a given zone.
 
     public static Vector3fImmutable worldToLocal(Vector3fImmutable worldVector,

src/engine/jobs/FinishSummonsJob.java

@@ -47,13 +47,13 @@ public class FinishSummonsJob extends AbstractScheduleJob {
             return;
 
         // cannot summon a player in combat
-        if (this.target.isCombat()) {
+        //if (this.target.isCombat()) {
 
-            ErrorPopupMsg.sendErrorMsg(this.source, "Cannot summon player in combat.");
+        //    ErrorPopupMsg.sendErrorMsg(this.source, "Cannot summon player in combat.");
 
-            PowersManager.finishRecycleTime(428523680, this.source, false);
-            return;
-        }
+        //    PowersManager.finishRecycleTime(428523680, this.source, false);
+        //    return;
+        //}
 
         if (this.target.getBonuses() != null && this.target.getBonuses().getBool(ModType.BlockedPowerType, SourceType.SUMMON)) {
             ErrorPopupMsg.sendErrorMsg(this.target, "You have been blocked from receiving summons!");

src/engine/loot/ItemTableEntry.java

@@ -9,10 +9,12 @@
 package engine.loot;
 
 import engine.gameManager.LootManager;
+import org.pmw.tinylog.Logger;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.List;
+import java.util.concurrent.ThreadLocalRandom;
 
 public class ItemTableEntry {
     public int minRoll;
@@ -35,11 +37,23 @@ public class ItemTableEntry {
         List<ItemTableEntry> itemTableEntryList;
 
         itemTableEntryList = LootManager._itemTables.get(itemTable);
+        if(itemTableEntryList != null) {
+            for (ItemTableEntry iteration : itemTableEntryList)
+                if (roll >= iteration.minRoll && roll <= iteration.maxRoll)
+                    itemTableEntry = iteration;
+        }
+        return itemTableEntry;
+    }
+
+    public static Integer getRandomItem(int itemTable) {
+        int id = 0;
+        List<ItemTableEntry> itemTableEntryList;
 
-        for (ItemTableEntry iteration : itemTableEntryList)
-            if (roll >= iteration.minRoll && roll <= iteration.maxRoll)
-                itemTableEntry = iteration;
+        itemTableEntryList = LootManager._itemTables.get(itemTable);
 
-        return itemTableEntry;
+        if(itemTableEntryList != null && itemTableEntryList.size() > 1){
+            id =  itemTableEntryList.get(ThreadLocalRandom.current().nextInt(0, itemTableEntryList.size())).cacheID;
+        }
+        return id;
     }
 }

src/engine/loot/ModTableEntry.java

@@ -33,11 +33,11 @@ public class ModTableEntry {
         List<ModTableEntry> itemTableEntryList;
 
         itemTableEntryList = LootManager._modTables.get(modTablwe);
-
-        for (ModTableEntry iteration : itemTableEntryList)
-            if (roll >= iteration.minRoll && roll <= iteration.maxRoll)
-                modTableEntry = iteration;
-
+        if(itemTableEntryList != null) {
+            for (ModTableEntry iteration : itemTableEntryList)
+                if (roll >= iteration.minRoll && roll <= iteration.maxRoll)
+                    modTableEntry = iteration;
+        }
         return modTableEntry;
     }
 }

src/engine/math/Bounds.java

@@ -220,7 +220,7 @@ public class Bounds {
             //player is inside building region, skip collision check. we only do collision from the outside.
             if (player.region != null && player.region.parentBuildingID == building.getObjectUUID())
                 continue;
-            if (building.getBounds().colliders == null)
+            if (building.getBounds() == null || building.getBounds().colliders == null)
                 continue;
 
             for (Colliders collider : building.getBounds().colliders) {

src/engine/mobileAI/MobAI.java

@@ -82,6 +82,16 @@ public class MobAI {
 
             mob.updateLocation();
 
+            if(mob.StrongholdGuardian || mob.StrongholdEpic){
+                // attempt to ground all players in attack range
+                for(int i : mob.playerAgroMap.keySet()){
+                    PlayerCharacter tar = PlayerCharacter.getFromCache(i);
+                    if(tar != null && tar.loc.distanceSquared(mob.loc) < 80){
+                        PowersManager.applyPower(mob,tar,tar.loc, 111111,40,false);
+                    }
+                }
+            }
+
         } catch (Exception e) {
             Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: AttackTarget" + " " + e.getMessage());
         }
@@ -156,9 +166,12 @@ public class MobAI {
 
         try {
 
+            if(mob == null || target == null)
+                return;
+
             if (target.getRank() == -1 || !target.isVulnerable() || BuildingManager.getBuildingFromCache(target.getObjectUUID()) == null) {
                 mob.setCombatTarget(null);
-                return;
+            return;
             }
 
             City playercity = ZoneManager.getCityAtLocation(mob.getLoc());
@@ -166,7 +179,7 @@ public class MobAI {
             if (playercity != null)
                 for (Mob guard : playercity.getParent().zoneMobSet)
                     if (guard.BehaviourType != null && guard.BehaviourType.ordinal() == Enum.MobBehaviourType.GuardCaptain.ordinal())
-                        if (guard.getCombatTarget() == null && !guard.getGuild().equals(mob.getGuild()))
+                        if (guard.getCombatTarget() == null && guard.getGuild() != null && mob.getGuild() != null && !guard.getGuild().equals(mob.getGuild()))
                             guard.setCombatTarget(mob);
 
             if (mob.isSiege())
@@ -195,11 +208,11 @@ public class MobAI {
                 mob.setLastAttackTime(System.currentTimeMillis() + attackDelay);
             }
 
-            if (mob.isSiege()) {
-                PowerProjectileMsg ppm = new PowerProjectileMsg(mob, target);
-                ppm.setRange(50);
-                DispatchMessage.dispatchMsgToInterestArea(mob, ppm, DispatchChannel.SECONDARY, MBServerStatics.CHARACTER_LOAD_RANGE, false, false);
-            }
+            //if (mob.isSiege()) {
+            //    PowerProjectileMsg ppm = new PowerProjectileMsg(mob, target);
+            //    ppm.setRange(50);
+            //    DispatchMessage.dispatchMsgToInterestArea(mob, ppm, DispatchChannel.SECONDARY, MBServerStatics.CHARACTER_LOAD_RANGE, false, false);
+            //}
 
         } catch (Exception e) {
             Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: AttackBuilding" + " " + e.getMessage());
@@ -400,7 +413,7 @@ public class MobAI {
 
                 PerformActionMsg msg;
 
-                if (!mobPower.isHarmful() || mobPower.targetSelf) {
+                if (!mob.StrongholdCommander && !mob.StrongholdEpic && (!mobPower.isHarmful() || mobPower.targetSelf)) {
                     PowersManager.useMobPower(mob, mob, mobPower, powerRank);
                     msg = PowersManager.createPowerMsg(mobPower, powerRank, mob, mob);
                 } else {
@@ -589,6 +602,26 @@ public class MobAI {
             if (mob == null)
                 return;
 
+            boolean continueExecution = false;
+            switch(mob.BehaviourType){
+                case GuardCaptain:
+                case GuardMinion:
+                case Pet1:
+                case GuardWallArcher:
+                case HamletGuard:
+                case SimpleStandingGuard:
+                    continueExecution = true;
+                    break;
+            }
+            if(!continueExecution) {
+                MobAi2.runAI(mob);
+                return;
+            }
+
+            if(mob.isAlive())
+                if(!mob.getMovementLoc().equals(Vector3fImmutable.ZERO))
+                    mob.setLoc(mob.getMovementLoc());
+
             if (mob.getTimestamps().containsKey("lastExecution") == false)
                 mob.getTimestamps().put("lastExecution", System.currentTimeMillis());
 
@@ -625,9 +658,6 @@ public class MobAI {
 
                 //check to send mob home for player guards to prevent exploit of dragging guards away and then teleporting
 
-                if (mob.BehaviourType.ordinal() != Enum.MobBehaviourType.Pet1.ordinal())
-                    CheckToSendMobHome(mob);
-
                 return;
             }
 
@@ -646,7 +676,7 @@ public class MobAI {
                 return;
             }
 
-            if (mob.BehaviourType.ordinal() != Enum.MobBehaviourType.Pet1.ordinal())
+            if(mob.isPet() == false && mob.isPlayerGuard == false)
                 CheckToSendMobHome(mob);
 
             if (mob.getCombatTarget() != null) {
@@ -857,16 +887,14 @@ public class MobAI {
                         return;
                     }
                     //No items in inventory.
+                } else if (aiAgent.isHasLoot()) {
+                    if (System.currentTimeMillis() > aiAgent.deathTime + MBServerStatics.DESPAWN_TIMER_ONCE_LOOTED) {
+                        aiAgent.despawn();
+                        aiAgent.deathTime = System.currentTimeMillis();
+                        return;
+                    }
+                    //Mob never had Loot.
                 } else {
-                    //Mob's Loot has been looted.
-                    if (aiAgent.isHasLoot()) {
-                        if (System.currentTimeMillis() > aiAgent.deathTime + MBServerStatics.DESPAWN_TIMER_ONCE_LOOTED) {
-                            aiAgent.despawn();
-                            aiAgent.deathTime = System.currentTimeMillis();
-                            return;
-                        }
-                        //Mob never had Loot.
-                    } else {
                         if (System.currentTimeMillis() > aiAgent.deathTime + MBServerStatics.DESPAWN_TIMER) {
                             aiAgent.despawn();
                             aiAgent.deathTime = System.currentTimeMillis();
@@ -874,9 +902,15 @@ public class MobAI {
                         }
                     }
                 }
-            } else if (System.currentTimeMillis() > (aiAgent.deathTime + (aiAgent.spawnTime * 1000))) {
 
-                if (Zone.respawnQue.contains(aiAgent) == false) {
+            if(Mob.discDroppers.contains(aiAgent))
+                return;
+
+            if(aiAgent.StrongholdGuardian || aiAgent.StrongholdEpic || aiAgent.StrongholdCommander)
+                return;
+
+            if (System.currentTimeMillis() > (aiAgent.deathTime + (aiAgent.spawnTime * 1000L))) {
+                if (!Zone.respawnQue.contains(aiAgent)) {
                     Zone.respawnQue.add(aiAgent);
                 }
             }
@@ -911,7 +945,21 @@ public class MobAI {
 
     private static void CheckToSendMobHome(Mob mob) {
 
+        if(mob.isNecroPet())
+            return;
+
         try {
+
+            //trebs dont recall
+            if(mob.isSiege())
+                return;
+
+            if(mob.BehaviourType.equals(Enum.MobBehaviourType.Pet1)){
+                if(mob.loc.distanceSquared(mob.getOwner().loc) > 60 * 60)
+                    mob.teleport(mob.getOwner().loc);
+                return;
+            }
+
             if (mob.BehaviourType.isAgressive) {
 
                 if (mob.isPlayerGuard()) {
@@ -922,9 +970,6 @@ public class MobAI {
                 }
             }
 
-            if (mob.getCombatTarget() != null && CombatUtilities.inRange2D(mob, mob.getCombatTarget(), MobAIThread.AI_BASE_AGGRO_RANGE * 0.5f))
-                return;
-
             if (mob.isPlayerGuard() && !mob.despawned) {
 
                 City current = ZoneManager.getCityAtLocation(mob.getLoc());
@@ -945,7 +990,7 @@ public class MobAI {
                         }
                     }
                 }
-            } else if (MovementUtilities.inRangeOfBindLocation(mob) == false) {
+            } else if (!MovementUtilities.inRangeOfBindLocation(mob)) {
 
                 PowersBase recall = PowersManager.getPowerByToken(-1994153779);
                 PowersManager.useMobPower(mob, mob, recall, 40);
@@ -953,6 +998,7 @@ public class MobAI {
 
                 for (Entry playerEntry : mob.playerAgroMap.entrySet())
                     PlayerCharacter.getFromCache((int) playerEntry.getKey()).setHateValue(0);
+                mob.setCombatTarget(null);
             }
         } catch (Exception e) {
             Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: CheckToSendMobHome" + " " + e.getMessage());
@@ -1006,7 +1052,7 @@ public class MobAI {
 
                 //dont scan self.
 
-                if (mob.equals(awoMob) || (mob.agentType.equals(Enum.AIAgentType.GUARD)) == true)
+                if (mob.equals(awoMob) || (mob.agentType.equals(Enum.AIAgentType.GUARD)) || (mob.agentType.equals(Enum.AIAgentType.PET)))
                     continue;
 
                 Mob aggroMob = (Mob) awoMob;
@@ -1029,9 +1075,22 @@ public class MobAI {
         }
     }
 
+    public static void checkToDropGuardAggro(Mob mob){
+        City city = mob.guardedCity;
+
+        if(city == null)
+            return;
+        if(mob.combatTarget == null)
+            return;
+
+        if(city._playerMemory.contains(mob.combatTarget.getObjectUUID()) && mob.combatTarget.getObjectType().equals(Enum.GameObjectType.PlayerCharacter))
+            mob.setCombatTarget(null);
+    }
+
     public static void GuardCaptainLogic(Mob mob) {
 
         try {
+            checkToDropGuardAggro(mob);
             if (mob.getCombatTarget() == null)
                 CheckForPlayerGuardAggro(mob);
 
@@ -1056,6 +1115,8 @@ public class MobAI {
     public static void GuardMinionLogic(Mob mob) {
 
         try {
+            checkToDropGuardAggro(mob);
+
             boolean isComanded = mob.npcOwner.isAlive();
             if (!isComanded) {
                 GuardCaptainLogic(mob);
@@ -1076,6 +1137,8 @@ public class MobAI {
     public static void GuardWallArcherLogic(Mob mob) {
 
         try {
+            checkToDropGuardAggro(mob);
+
             if (mob.getCombatTarget() == null)
                 CheckForPlayerGuardAggro(mob);
             else
@@ -1351,21 +1414,24 @@ public class MobAI {
         return null;
     }
 
-    public static void RecoverHealth(Mob mob){
+    public static void RecoverHealth(Mob mob) {
         //recover health
+        try {
+            if (mob.getTimestamps().containsKey("HEALTHRECOVERED") == false)
+                mob.getTimestamps().put("HEALTHRECOVERED", System.currentTimeMillis());
 
-        if (mob.getTimestamps().containsKey("HEALTHRECOVERED") == false)
-            mob.getTimestamps().put("HEALTHRECOVERED", System.currentTimeMillis());
-
-        if (mob.isSit() && mob.getTimeStamp("HEALTHRECOVERED") < System.currentTimeMillis() + 3000)
-            if (mob.getHealth() < mob.getHealthMax()) {
+            if (mob.isSit() && mob.getTimeStamp("HEALTHRECOVERED") < System.currentTimeMillis() + 3000)
+                if (mob.getHealth() < mob.getHealthMax()) {
 
-                float recoveredHealth = mob.getHealthMax() * ((1 + mob.getBonuses().getFloatPercentAll(Enum.ModType.HealthRecoverRate, Enum.SourceType.None)) * 0.01f);
-                mob.setHealth(mob.getHealth() + recoveredHealth);
-                mob.getTimestamps().put("HEALTHRECOVERED", System.currentTimeMillis());
+                    float recoveredHealth = mob.getHealthMax() * ((1 + mob.getBonuses().getFloatPercentAll(Enum.ModType.HealthRecoverRate, Enum.SourceType.None)) * 0.01f);
+                    mob.setHealth(mob.getHealth() + recoveredHealth);
+                    mob.getTimestamps().put("HEALTHRECOVERED", System.currentTimeMillis());
 
-                if (mob.getHealth() > mob.getHealthMax())
-                    mob.setHealth(mob.getHealthMax());
-            }
+                    if (mob.getHealth() > mob.getHealthMax())
+                        mob.setHealth(mob.getHealthMax());
+                }
+        } catch (Exception e) {
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: RecoverHealth" + " " + e.getMessage());
+        }
     }
 }

src/engine/mobileAI/MobAi2.java

@@ -0,0 +1,360 @@
+package engine.mobileAI;
+
+import engine.Enum;
+import engine.InterestManagement.WorldGrid;
+import engine.gameManager.*;
+import engine.mobileAI.Threads.MobAIThread;
+import engine.mobileAI.utilities.CombatUtilities;
+import engine.mobileAI.utilities.MovementUtilities;
+import engine.objects.*;
+import engine.server.MBServerStatics;
+import org.pmw.tinylog.Logger;
+
+import java.util.HashSet;
+import java.util.concurrent.ThreadLocalRandom;
+
+public class MobAi2 {
+
+    public enum State
+    {
+        Idle,
+        Patrolling,
+        Attacking,
+        Dead
+    }
+
+    public static boolean Agressive(Mob mob){
+        return mob.BehaviourType.name().contains("Aggro");
+    }
+
+    public static boolean Caster(Mob mob){
+        return mob.BehaviourType.name().contains("Power");
+    }
+
+    public static boolean HelpResponder(Mob mob){
+        return mob.BehaviourType.name().contains("Helpee");
+    }
+
+    public static State getState(Mob mob){
+
+        if(!mob.isAlive())
+            return State.Dead;
+
+        if(mob.playerAgroMap.isEmpty())
+            return State.Idle;
+
+        if(mob.combatTarget != null)
+            return State.Attacking;
+
+        return State.Patrolling;
+    }
+
+    public static void runAI(Mob mob){
+
+        //these will be handled in special conditions later
+        switch(mob.BehaviourType){
+            case GuardCaptain:
+            case GuardMinion:
+            case Pet1:
+            case GuardWallArcher:
+            case HamletGuard:
+            case SimpleStandingGuard:
+                return;
+        }
+        switch(getState(mob)){
+            case Idle:
+                if(mob.isMoving())
+                    mob.stopMovement(mob.loc);
+                if(mob.combatTarget != null) {
+                    mob.setCombatTarget(null);
+                    mob.setCombat(false);
+                }
+                return;
+            case Dead:
+                respawn(mob);
+                break;
+            case Patrolling:
+                patrol(mob);
+                break;
+            case Attacking:
+                attack(mob);
+                break;
+        }
+    }
+
+    //handles respawning and de-spawning for mobs and their corpses
+    public static void respawn(Mob mob){
+
+        //if mob doesn't have a death time somehow, set it to now
+        if (mob.deathTime == 0)
+            mob.setDeathTime(System.currentTimeMillis());
+
+        //only execute this logic is the mob hasn't de-spawned yet
+        if (!mob.despawned) {
+
+            //if the inventory is empty, the mob can disappear
+            if(mob.getInventory(true).isEmpty() && System.currentTimeMillis() > mob.deathTime + 10000L) {
+                mob.despawn();
+                mob.deathTime = System.currentTimeMillis();
+                return;
+            }
+
+            //if the mob has been dead for 10 seconds it can disappear
+            if (System.currentTimeMillis() > mob.deathTime + 10000L) {
+                mob.despawn();
+                mob.deathTime = System.currentTimeMillis();
+                return;
+            }
+        }
+
+        //disc dropper respawns are handled elsewhere
+        if(Mob.discDroppers.contains(mob))
+            return;
+
+        //if mob isn't queued for respawn, do so now
+        if (!Zone.respawnQue.contains(mob)) {
+            if (System.currentTimeMillis() > (mob.deathTime + (mob.spawnTime * 1000L))) {
+                Zone.respawnQue.add(mob);
+            }
+        }
+    }
+
+    //handles patrolling and looking for potential combat targets
+    public static void patrol(Mob mob){
+        if(Agressive(mob) && mob.combatTarget == null) {
+            HashSet<AbstractWorldObject> potentialTargets = WorldGrid.getObjectsInRangePartial(mob.loc, 50, MBServerStatics.MASK_PLAYER);
+            for (AbstractWorldObject awo : potentialTargets) {
+                PlayerCharacter target = (PlayerCharacter) awo;
+                if (mob.canSee(target))
+                    mob.setCombatTarget(target);
+                if (mob.combatTarget != null) {
+                    return;
+                }
+            }
+        }
+        if(mob.isMoving() || !mob.BehaviourType.canRoam)
+            return;
+
+        int patrolDelay = ThreadLocalRandom.current().nextInt((int) (MobAIThread.AI_PATROL_DIVISOR * 0.5f), MobAIThread.AI_PATROL_DIVISOR) + MobAIThread.AI_PATROL_DIVISOR;
+
+        if (mob.stopPatrolTime + (patrolDelay * 1000L) > System.currentTimeMillis())
+            return;
+
+        if (mob.lastPatrolPointIndex > mob.patrolPoints.size() - 1)
+            mob.lastPatrolPointIndex = 0;
+
+        mob.destination = mob.patrolPoints.get(mob.lastPatrolPointIndex);
+        mob.lastPatrolPointIndex += 1;
+        MovementUtilities.aiMove(mob, mob.destination, true);
+    }
+
+    public static void attack(Mob mob){
+        AbstractWorldObject target = mob.combatTarget;
+
+        if (target == null || !target.isAlive()) {
+            mob.setCombatTarget(null);
+            return;
+        }
+
+        if(!mob.isCombat())
+            mob.setCombat(true);
+
+        if (!CombatUtilities.inRangeToAttack(mob, target) && mob.BehaviourType.canRoam) {
+            if(mob.nextChaseUpdate < System.currentTimeMillis()) {
+                mob.nextChaseUpdate = System.currentTimeMillis() + 2500L;
+                MovementUtilities.aiMove(mob, target.loc, false);
+            }
+            return;
+        }
+
+        switch (target.getObjectType()) {
+            case PlayerCharacter:
+                PlayerCharacter targetPlayer = (PlayerCharacter) target;
+                AttackPlayer(mob, targetPlayer);
+                break;
+            case Building:
+                Building targetBuilding = (Building) target;
+                AttackBuilding(mob, targetBuilding);
+                break;
+            case Mob:
+                Mob targetMob = (Mob) target;
+                AttackMob(mob, targetMob);
+                break;
+        }
+    }
+
+    public static void AttackPlayer(Mob mob, PlayerCharacter target) {
+
+        try {
+
+            if (!mob.canSee(target)) {
+                mob.setCombatTarget(null);
+                return;
+            }
+
+            if (mob.BehaviourType.callsForHelp)
+                MobCallForHelp(mob);
+
+            if (!MovementUtilities.inRangeDropAggro(mob, target)) {
+                mob.setCombatTarget(null);
+                return;
+            }
+
+            if (CombatUtilities.inRange2D(mob, target, mob.getRange())) {
+
+                //no weapons, default mob attack speed 3 seconds.
+
+                if (System.currentTimeMillis() < mob.getLastAttackTime())
+                    return;
+
+                // ranged mobs can't attack while running. skip until they finally stop.
+
+                if (mob.isMoving() && mob.getRange() > 20)
+                    return;
+
+                // add timer for last attack.
+
+                ItemBase mainHand = mob.getWeaponItemBase(true);
+                ItemBase offHand = mob.getWeaponItemBase(false);
+
+                if (mainHand == null && offHand == null) {
+                    CombatUtilities.combatCycle(mob, target, true, null);
+                    int delay = 3000;
+                    if (mob.isSiege())
+                        delay = 11000;
+                    mob.setLastAttackTime(System.currentTimeMillis() + delay);
+                } else if (mob.getWeaponItemBase(true) != null) {
+                    int delay = 3000;
+                    if (mob.isSiege())
+                        delay = 11000;
+                    CombatUtilities.combatCycle(mob, target, true, mob.getWeaponItemBase(true));
+                    mob.setLastAttackTime(System.currentTimeMillis() + delay);
+                } else if (mob.getWeaponItemBase(false) != null) {
+                    int attackDelay = 3000;
+                    if (mob.isSiege())
+                        attackDelay = 11000;
+                    CombatUtilities.combatCycle(mob, target, false, mob.getWeaponItemBase(false));
+                    mob.setLastAttackTime(System.currentTimeMillis() + attackDelay);
+                }
+            }
+
+            if (target.getPet() != null)
+                if (target.getPet().getCombatTarget() == null && target.getPet().assist)
+                    target.getPet().setCombatTarget(mob);
+
+        } catch (Exception e) {
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: AttackPlayer" + " " + e.getMessage());
+        }
+
+    }
+
+    public static void AttackBuilding(Mob mob, Building target) {
+
+        try {
+
+            if(mob == null || target == null)
+                return;
+
+            if (target.getRank() == -1 || !target.isVulnerable() || BuildingManager.getBuildingFromCache(target.getObjectUUID()) == null) {
+                mob.setCombatTarget(null);
+                return;
+            }
+
+            City playerCity = ZoneManager.getCityAtLocation(mob.getLoc());
+
+            if (playerCity != null)
+                for (Mob guard : playerCity.getParent().zoneMobSet)
+                    if (guard.BehaviourType != null && guard.BehaviourType.ordinal() == Enum.MobBehaviourType.GuardCaptain.ordinal())
+                        if (guard.getCombatTarget() == null && guard.getGuild() != null && mob.getGuild() != null && !guard.getGuild().equals(mob.getGuild()))
+                            guard.setCombatTarget(mob);
+
+            if (mob.isSiege())
+                MovementManager.sendRWSSMsg(mob);
+
+            ItemBase mainHand = mob.getWeaponItemBase(true);
+            ItemBase offHand = mob.getWeaponItemBase(false);
+
+            if (mainHand == null && offHand == null) {
+                CombatUtilities.combatCycle(mob, target, true, null);
+                int delay = 3000;
+                if (mob.isSiege())
+                    delay = 15000;
+                mob.setLastAttackTime(System.currentTimeMillis() + delay);
+            } else if (mob.getWeaponItemBase(true) != null) {
+                int attackDelay = 3000;
+                if (mob.isSiege())
+                    attackDelay = 15000;
+                CombatUtilities.combatCycle(mob, target, true, mob.getWeaponItemBase(true));
+                mob.setLastAttackTime(System.currentTimeMillis() + attackDelay);
+            } else if (mob.getWeaponItemBase(false) != null) {
+                int attackDelay = 3000;
+                if (mob.isSiege())
+                    attackDelay = 15000;
+                CombatUtilities.combatCycle(mob, target, false, mob.getWeaponItemBase(false));
+                mob.setLastAttackTime(System.currentTimeMillis() + attackDelay);
+            }
+
+        } catch (Exception e) {
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: AttackBuilding" + " " + e.getMessage());
+        }
+    }
+
+    public static void AttackMob(Mob mob, Mob target) {
+
+        try {
+
+            if (mob.getRange() >= 30 && mob.isMoving())
+                return;
+
+            //no weapons, default mob attack speed 3 seconds.
+
+            ItemBase mainHand = mob.getWeaponItemBase(true);
+            ItemBase offHand = mob.getWeaponItemBase(false);
+
+            if (mainHand == null && offHand == null) {
+                CombatUtilities.combatCycle(mob, target, true, null);
+                int delay = 3000;
+                if (mob.isSiege())
+                    delay = 11000;
+                mob.setLastAttackTime(System.currentTimeMillis() + delay);
+            } else if (mob.getWeaponItemBase(true) != null) {
+                int attackDelay = 3000;
+                if (mob.isSiege())
+                    attackDelay = 11000;
+                CombatUtilities.combatCycle(mob, target, true, mob.getWeaponItemBase(true));
+                mob.setLastAttackTime(System.currentTimeMillis() + attackDelay);
+            } else if (mob.getWeaponItemBase(false) != null) {
+                int attackDelay = 3000;
+                if (mob.isSiege())
+                    attackDelay = 11000;
+                CombatUtilities.combatCycle(mob, target, false, mob.getWeaponItemBase(false));
+                mob.setLastAttackTime(System.currentTimeMillis() + attackDelay);
+                if (target.getCombatTarget() == null) {
+                    target.setCombatTarget(mob);
+                }
+            }
+        } catch (Exception e) {
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: AttackMob" + " " + e.getMessage());
+        }
+    }
+
+    public static void MobCallForHelp(Mob mob) {
+
+            if (mob.nextCallForHelp == 0)
+                mob.nextCallForHelp = System.currentTimeMillis();
+
+            if (mob.nextCallForHelp > System.currentTimeMillis())
+                return;
+
+            Zone mobCamp = mob.getParentZone();
+
+            for (Mob helper : mobCamp.zoneMobSet) {
+                if (HelpResponder(helper)) {
+                    helper.setCombatTarget(mob.getCombatTarget());
+                    break;
+                }
+            }
+
+            mob.nextCallForHelp = System.currentTimeMillis() + 30000L;
+    }
+}

src/engine/mobileAI/Threads/MobRespawnThread.java

@@ -8,6 +8,8 @@
 
 
 package engine.mobileAI.Threads;
+import engine.InterestManagement.InterestManager;
+import engine.InterestManagement.WorldGrid;
 import engine.gameManager.ZoneManager;
 import engine.objects.Mob;
 import engine.objects.Zone;
@@ -49,6 +51,8 @@ public class MobRespawnThread implements Runnable {
                         respawner.respawn();
                         zone.respawnQue.remove(respawner);
                         zone.lastRespawn = System.currentTimeMillis();
+                        WorldGrid.updateObject(respawner);
+                        InterestManager.setObjectDirty(respawner);
                     }
                 }
             } catch (Exception e) {

src/engine/mobileAI/utilities/CombatUtilities.java

@@ -139,37 +139,22 @@ public class CombatUtilities {
     }
 
     public static boolean triggerDefense(Mob agent, AbstractWorldObject target) {
-        int defenseScore = 0;
-        int attackScore = agent.getAtrHandOne();
+        int defense = 0;
+        int atr = agent.getAtrHandOne();
         switch (target.getObjectType()) {
             case PlayerCharacter:
-                defenseScore = ((AbstractCharacter) target).getDefenseRating();
+                defense = ((AbstractCharacter) target).getDefenseRating();
                 break;
             case Mob:
 
                 Mob mob = (Mob) target;
                 if (mob.isSiege())
-                    defenseScore = attackScore;
+                    defense = atr;
                 break;
             case Building:
                 return false;
         }
-
-        int hitChance;
-        if (attackScore > defenseScore || defenseScore == 0)
-            hitChance = 94;
-        else if (attackScore == defenseScore && target.getObjectType() == GameObjectType.Mob)
-            hitChance = 10;
-        else {
-            float dif = attackScore / defenseScore;
-            if (dif <= 0.8f)
-                hitChance = 4;
-            else
-                hitChance = ((int) (450 * (dif - 0.8f)) + 4);
-            if (target.getObjectType() == GameObjectType.Building)
-                hitChance = 100;
-        }
-        return ThreadLocalRandom.current().nextInt(100) > hitChance;
+        return !CombatManager.LandHit(atr,defense);
     }
 
     public static boolean triggerBlock(Mob agent, AbstractWorldObject ac) {

src/engine/net/NetMsgFactory.java

@@ -13,6 +13,8 @@ import engine.exception.FactoryBuildException;
 import engine.gameManager.ChatManager;
 import engine.net.client.ClientConnection;
 import engine.net.client.Protocol;
+import engine.net.client.msg.ErrorPopupMsg;
+import engine.net.client.msg.PlaceAssetMsg;
 import engine.objects.PlayerCharacter;
 import engine.server.MBServerStatics;
 import org.joda.time.DateTime;
@@ -94,11 +96,9 @@ public class NetMsgFactory {
                 if (origin instanceof ClientConnection) {
                     PlayerCharacter player = ((ClientConnection) origin).getPlayerCharacter();
                     if (player != null) {
-//						if (MBServerStatics.worldServerName.equals("Grief"))
                         Logger.error("Invalid protocol msg for player " + player.getFirstName() + " : " + opcode + " lastopcode: " + origin.lastProtocol.name() + " Error Code : " + errorCode);
-                    } else
-                        Logger.error("Invalid protocol msg  : " + opcode + " lastopcode: " + origin.lastProtocol.name() + " Error Code : " + errorCode);
-
+                        PlaceAssetMsg.sendPlaceAssetError(player.getClientConnection(), 1, "Please Report What You Just Did. Ref Code: " + opcode);
+                    }
                 }
 
                 return null;

src/engine/net/client/ClientMessagePump.java

@@ -85,7 +85,7 @@ public class ClientMessagePump implements NetMsgHandler {
         if (pc == null)
             return;
 
-        pc.update();
+        pc.update(false);
         if (msg.getSpeed() == 2)
             pc.setWalkMode(false);
         else
@@ -114,7 +114,7 @@ public class ClientMessagePump implements NetMsgHandler {
         if (pc == null)
             return;
 
-        pc.update();
+        pc.update(false);
 
         pc.setSit(msg.toggleSitStand());
 
@@ -560,12 +560,30 @@ public class ClientMessagePump implements NetMsgHandler {
         if (!itemManager.inventoryContains(i))
             return;
 
-        if (i.isCanDestroy())
-            if (itemManager.delete(i) == true) {
+        //cannot delete gold
+        if(i.getItemBaseID() == 7)
+            return;
+
+        if (i.isCanDestroy()) {
+            int goldValue = i.getBaseValue();
+            if (i.getItemBase().isRune())
+                goldValue = 500000;
+
+            if (i.getItemBaseID() == 980066)
+                goldValue = 0;
+
+            if(itemManager.getGoldInventory().getNumOfItems() + goldValue > 10000000)
+                return;
+
+            if (itemManager.delete(i)) {
+                if (goldValue > 0)
+                    itemManager.addGoldToInventory(goldValue, false);
+
+                itemManager.updateInventory();
                 Dispatch dispatch = Dispatch.borrow(sourcePlayer, msg);
                 DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
             }
-
+        }
     }
 
     private static void ackBankWindowOpened(AckBankWindowOpenedMsg msg, ClientConnection origin) {
@@ -654,6 +672,8 @@ public class ClientMessagePump implements NetMsgHandler {
         JobScheduler.getInstance().scheduleJob(new RefreshGroupJob(sourcePlayer), MBServerStatics.LOAD_OBJECT_DELAY);
     }
 
+
+
     private static void lootWindowRequest(LootWindowRequestMsg msg, ClientConnection origin) throws MsgSendException {
 
         PlayerCharacter pc = SessionManager.getPlayerCharacter(origin);
@@ -1243,6 +1263,8 @@ public class ClientMessagePump implements NetMsgHandler {
 
 
                 cost = sell.getBaseValue();
+                if(sell.getItemBaseID() == 980066)
+                    cost = 0;
 
                 //apply damaged value reduction
                 float durabilityCurrent = sell.getDurabilityCurrent();
@@ -1347,6 +1369,8 @@ public class ClientMessagePump implements NetMsgHandler {
             return;
 
         // test within talking range
+        if(npc.isInSafeZone())
+            npc.sellPercent = 0;
 
         if (sourcePlayer.getLoc().distanceSquared2D(npc.getLoc()) > MBServerStatics.NPC_TALK_RANGE * MBServerStatics.NPC_TALK_RANGE) {
             ErrorPopupMsg.sendErrorPopup(sourcePlayer, 14);
@@ -1358,219 +1382,192 @@ public class ClientMessagePump implements NetMsgHandler {
     }
 
     private static void buyFromNPC(BuyFromNPCMsg msg, ClientConnection origin) {
-
         PlayerCharacter sourcePlayer = SessionManager.getPlayerCharacter(origin);
-
         if (sourcePlayer == null)
             return;
-
         if (origin.buyLock.tryLock()) {
-
             try {
                 CharacterItemManager itemMan = sourcePlayer.getCharItemManager();
-
-                if (itemMan == null)
+                if (itemMan == null) {
                     return;
-
+                }
                 NPC npc = NPC.getFromCache(msg.getNPCID());
-
-                if (npc == null)
+                if (npc == null) {
                     return;
-
+                }
                 Item gold = itemMan.getGoldInventory();
-
-                if (gold == null)
+                if (gold == null) {
                     return;
-
+                }
                 Item buy = null;
-
                 if (msg.getItemType() == GameObjectType.MobEquipment.ordinal()) {
                     ArrayList<MobEquipment> sellInventory = npc.getContract().getSellInventory();
-                    if (sellInventory == null)
+                    //if(npc.contract.getObjectUUID() == 890){ // default steward
+                    //    sellInventory = npc.getSellInventorySteward();
+                    //}
+                    //if(npc.contract.getObjectUUID() == 889){ // default builder
+                    //    sellInventory = npc.getSellInventoryBuilder();
+                    //}
+                    if (sellInventory == null) {
                         return;
+                    }
                     for (MobEquipment me : sellInventory) {
                         if (me.getObjectUUID() == msg.getItemID()) {
                             ItemBase ib = me.getItemBase();
-                            if (ib == null)
+                            if (ib == null) {
                                 return;
-
+                            }
                             //test room available for item
-                            if (!itemMan.hasRoomInventory(ib.getWeight()))
+                            if (!itemMan.hasRoomInventory(ib.getWeight())) {
                                 return;
-
+                            }
                             int cost = me.getMagicValue();
-
                             float bargain = sourcePlayer.getBargain();
+                            switch(npc.getContractID()){
+                                case 1201:
+                                    cost = ItemBase.getDiscPrice(ib.getUUID());
+                                    bargain = 0;
+                                    break;
+                                case 1202:
+                                    cost = ItemBase.getStatPrice(ib.getUUID());
+                                    bargain = 0;
+                                    break;
+                                case 900:
+                                    cost = Warehouse.getCostForResource(ib.getUUID()) * Warehouse.getSellStackSize(ib.getUUID());
+                                    bargain = 0;
+                                    break;
+                            }
+                            float profit;
 
-                            float profit = npc.getSellPercent(sourcePlayer) - bargain;
-
-                            if (profit < 1)
-                                profit = 1;
-
+                            if(npc.isInSafeZone())
+                                profit = 0;
+                            else
+                                profit = npc.getSellPercent(sourcePlayer) - bargain;
 
-                            cost *= profit;
 
+                            if(profit > 0)
+                                cost *= profit;
 
                             if (gold.getNumOfItems() - cost < 0) {
                                 //dont' have enough goldItem exit!
                                 // chatMan.chatSystemInfo(pc, "" + "You dont have enough gold.");
                                 return;
                             }
-
                             Building b = (!npc.isStatic()) ? npc.getBuilding() : null;
-
                             if (b != null && b.getProtectionState().equals(ProtectionState.NPC))
                                 b = null;
                             int buildingDeposit = cost - me.getMagicValue();
-                            if (b != null && (b.getStrongboxValue() + buildingDeposit) > b.getMaxGold()) {
+                            if (b != null && (b.getStrongboxValue() + buildingDeposit) > b.getMaxGold() && !b.isOwnerIsNPC()) {
                                 ErrorPopupMsg.sendErrorPopup(sourcePlayer, 206);
                                 return;
-                            }
-
-                            if (!itemMan.buyFromNPC(b, cost, buildingDeposit)) {
+                            }if(npc.getContractID() == 1502041){
+                                me.fromNoob = true;
+                            } else if (!itemMan.buyFromNPC(b, cost, buildingDeposit)) {
                                 // chatMan.chatSystemInfo(pc, "" + "You Failed to buy the item.");
+                                ChatManager.chatSystemError(sourcePlayer, "Failed To Buy Item");
                                 return;
                             }
-
-                            buy = Item.createItemForPlayer(sourcePlayer, ib);
-
-                            if (buy != null) {
-                                me.transferEnchants(buy);
-                                itemMan.addItemToInventory(buy);
-                                //itemMan.updateInventory();
+                            if(me.getItemBase().getType().equals(ItemType.RESOURCE) && npc.getContractID() == 900){
+                                handleResourcePurchase(me,itemMan,sourcePlayer,ib);
+                            }else {
+                                buy = Item.createItemForPlayer(sourcePlayer, ib, me.fromNoob);
+                                if (buy != null) {
+                                    me.transferEnchants(buy);
+                                    itemMan.addItemToInventory(buy);
+                                    if(npc.contractUUID == 900 && buy.getItemBaseID() == 1705032){
+                                        buy.setNumOfItems(10);
+                                        DbManager.ItemQueries.UPDATE_NUM_ITEMS(buy,buy.getNumOfItems());
+                                    }
+                                    //itemMan.updateInventory();
+                                }
                             }
                         }
                     }
                 } else if (msg.getItemType() == GameObjectType.Item.ordinal()) {
-
                     CharacterItemManager npcCim = npc.getCharItemManager();
-
                     if (npcCim == null)
                         return;
-
                     buy = Item.getFromCache(msg.getItemID());
-
                     if (buy == null)
                         return;
-
                     ItemBase ib = buy.getItemBase();
-
                     if (ib == null)
                         return;
-
                     if (!npcCim.inventoryContains(buy))
                         return;
-
                     //test room available for item
                     if (!itemMan.hasRoomInventory(ib.getWeight()))
                         return;
-
                     //TODO test cost and subtract goldItem
-
                     //TODO CHnage this if we ever put NPc city npcs in buildings.
                     int cost = buy.getBaseValue();
-
                     if (buy.isID() || buy.isCustomValue())
                         cost = buy.getMagicValue();
-
                     float bargain = sourcePlayer.getBargain();
-
                     float profit = npc.getSellPercent(sourcePlayer) - bargain;
-
                     if (profit < 1)
                         profit = 1;
-
                     if (!buy.isCustomValue())
                         cost *= profit;
                     else
                         cost = buy.getValue();
-
-
                     if (gold.getNumOfItems() - cost < 0) {
                         ErrorPopupMsg.sendErrorPopup(sourcePlayer, 128);  // Insufficient Gold
                         return;
                     }
-
                     Building b = (!npc.isStatic()) ? npc.getBuilding() : null;
-
                     if (b != null)
                         if (b.getProtectionState().equals(ProtectionState.NPC))
                             b = null;
-
                     int buildingDeposit = cost;
-
-                    if (b != null && (b.getStrongboxValue() + buildingDeposit) > b.getMaxGold()) {
+                    if (b != null && (b.getStrongboxValue() + buildingDeposit) > b.getMaxGold() && !b.isOwnerIsNPC()) {
                         ErrorPopupMsg.sendErrorPopup(sourcePlayer, 206);
                         return;
                     }
-
                     if (!itemMan.buyFromNPC(b, cost, buildingDeposit)) {
                         ErrorPopupMsg.sendErrorPopup(sourcePlayer, 110);
                         return;
                     }
-
                     if (buy != null)
                         itemMan.buyFromNPC(buy, npc);
-
                 } else if (msg.getItemType() == GameObjectType.MobLoot.ordinal()) {
-
                     CharacterItemManager npcCim = npc.getCharItemManager();
-
                     if (npcCim == null)
                         return;
-
                     buy = MobLoot.getFromCache(msg.getItemID());
-
                     if (buy == null)
                         return;
-
                     ItemBase ib = buy.getItemBase();
-
                     if (ib == null)
                         return;
-
                     if (!npcCim.inventoryContains(buy))
                         return;
-
                     //test room available for item
                     if (!itemMan.hasRoomInventory(ib.getWeight()))
                         return;
-
                     //TODO test cost and subtract goldItem
-
                     //TODO CHnage this if we ever put NPc city npcs in buildings.
-
                     int cost = buy.getMagicValue();
                     cost *= npc.getSellPercent(sourcePlayer);
-
-
                     if (gold.getNumOfItems() - cost < 0) {
                         ErrorPopupMsg.sendErrorPopup(sourcePlayer, 128);  // Insufficient Gold
                         return;
                     }
-
                     Building b = (!npc.isStatic()) ? npc.getBuilding() : null;
-
                     if (b != null && b.getProtectionState().equals(ProtectionState.NPC))
                         b = null;
                     int buildingDeposit = cost;
-
-                    if (b != null && (b.getStrongboxValue() + buildingDeposit) > b.getMaxGold()) {
+                    if (b != null && (b.getStrongboxValue() + buildingDeposit) > b.getMaxGold() && !b.isOwnerIsNPC()) {
                         ErrorPopupMsg.sendErrorPopup(sourcePlayer, 206);
                         return;
                     }
-
                     if (!itemMan.buyFromNPC(b, cost, buildingDeposit))
                         return;
-
                     if (buy != null)
                         itemMan.buyFromNPC(buy, npc);
-
                 } else
                     return;
-
                 if (buy != null) {
-
                     msg.setItem(buy);
                     //send the buy message back to update player
                     //					msg.setItemType(buy.getObjectType().ordinal());
@@ -1579,14 +1576,43 @@ public class ClientMessagePump implements NetMsgHandler {
                     DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
                     itemMan.updateInventory();
                 }
-
             } finally {
                 origin.buyLock.unlock();
             }
         } else {
             ErrorPopupMsg.sendErrorPopup(origin.getPlayerCharacter(), 12); // All production slots taken
         }
+    }
 
+    public static void handleResourcePurchase(MobEquipment me, CharacterItemManager itemMan, PlayerCharacter sourcePlayer, ItemBase ib){
+        boolean stacked = false;
+        int buystack = Warehouse.getSellStackSize(me.getItemBase().getUUID());
+        for(Item item : itemMan.getInventory()){
+            int itemID = item.getItemBaseID();
+            int meID = me.getItemBase().getUUID();
+            if(itemID == meID){
+                if(Warehouse.maxResources.isEmpty())
+                    Warehouse.getMaxResources();
+                int maxStack = Warehouse.maxResources.get(itemID);
+                if(maxStack > item.getNumOfItems() + buystack){
+                    item.setNumOfItems(item.getNumOfItems() + buystack);
+                    stacked = true;
+                    itemMan.updateInventory();
+                    DbManager.ItemQueries.UPDATE_NUM_ITEMS(item,item.getNumOfItems());
+                    break;
+                }
+            }
+        }
+        if(!stacked){
+            Item buy = Item.createItemForPlayer(sourcePlayer, ib, false);
+            if (buy != null) {
+                me.transferEnchants(buy);
+                itemMan.addItemToInventory(buy);
+                buy.setNumOfItems(buystack);
+                DbManager.ItemQueries.UPDATE_NUM_ITEMS(buy,buy.getNumOfItems());
+            }
+        }
+        itemMan.updateInventory();
     }
 
     private static void Repair(RepairMsg msg, ClientConnection origin) {
@@ -1646,14 +1672,21 @@ public class ClientMessagePump implements NetMsgHandler {
             max *= (1 + (durMod * 0.01f));
             if (dur >= max || dur < 1) {
                 //redundancy message to clear item from window in client
+                if (!DbManager.ItemQueries.SET_DURABILITY(toRepair, dur))
+                    return;
                 toRepair.setDurabilityCurrent(max);
                 msg.setupRepairAck(max - dur);
                 dispatch = Dispatch.borrow(player, msg);
                 DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
                 return;
             }
-            //TODO get cost to repair
-            int cost = (int) ((max - dur) * 80.1);
+
+            int pointsToRepair = max - dur;
+            double damageRatio = (double)1.0d - (toRepair.getDurabilityMax() - toRepair.getDurabilityCurrent()) / toRepair.getDurabilityMax();
+            int modifiedValue = (int)(damageRatio * toRepair.getMagicValue());
+            int costPerPoint = modifiedValue / toRepair.getDurabilityMax();
+            int modifiedRepairCost = (int)(pointsToRepair * costPerPoint)+ npc.getSpecialPrice();
+            int cost = (int)(modifiedRepairCost * 1 + npc.buyPercent) + npc.getSpecialPrice();
             Building b = (!npc.isStatic()) ? npc.getBuilding() : null;
 
             if (b != null)

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

@@ -11,6 +11,7 @@ import engine.objects.GuildStatusController;
 import engine.objects.Mine;
 import engine.objects.PlayerCharacter;
 import engine.objects.Resource;
+import org.pmw.tinylog.Logger;
 
 /*
  * @Author:
@@ -35,26 +36,28 @@ public class ArcMineChangeProductionMsgHandler extends AbstractClientMsgHandler
 
         //TODO verify this against the warehouse?
 
-        if (GuildStatusController.isInnerCouncil(playerCharacter.getGuildStatus()) == false) // is this only GL?
+        if (!GuildStatusController.isInnerCouncil(playerCharacter.getGuildStatus())) // is this only GL?
             return true;
 
         Mine mine = Mine.getMine(changeProductionMsg.getMineID());
 
-        if (mine == null)
+        if (mine == null) {
+            Logger.error("Player Character: " + playerCharacter.getName() + " Tried To Change Mine: " + changeProductionMsg.getMineID() + " and Mine was Null");
             return true;
-
+        }
         //make sure mine belongs to guild
 
-        if (mine.getOwningGuild().isEmptyGuild() ||
-                mine.getOwningGuild().getObjectUUID() != playerCharacter.getGuild().getObjectUUID())
+        if (mine.getOwningGuild().isEmptyGuild() || mine.getOwningGuild().getObjectUUID() != playerCharacter.getGuild().getObjectUUID())
             return true;
 
         //make sure valid resource
 
         Resource resource = Resource.resourceByHash.get(changeProductionMsg.getResourceHash());
 
-        if (resource == null)
+        if (resource == null) {
+            Logger.error("Player Character: " + playerCharacter.getName() + " Tried To Change Mine: " + changeProductionMsg.getMineID() + " and Resource was Null");
             return true;
+        }
 
         //update resource
 

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

@@ -47,13 +47,16 @@ public class ChangeAltitudeHandler extends AbstractClientMsgHandler {
         if (pc.region != null && !pc.region.isOutside())
             return false;
 
-
         // Find out if we already have an altitude timer running and if so
         // do not process more alt change requests
 
+        pc.updateFlight();
+
         if (pc.getTakeOffTime() != 0)
             return false;
 
+        pc.setTakeOffTime(System.currentTimeMillis());
+
 
         // remove all movement timers and jobs
         //TODO: test if they can fly
@@ -67,7 +70,7 @@ public class ChangeAltitudeHandler extends AbstractClientMsgHandler {
         if (pc.getAltitude() == 0 && !msg.up())
             return true;
 
-        pc.update();
+        pc.update(false);
         pc.stopMovement(pc.getLoc());
         msg.setStartAlt(pc.getAltitude());
         if (msg.up()) {
@@ -132,7 +135,7 @@ public class ChangeAltitudeHandler extends AbstractClientMsgHandler {
         }
 
         if (msg.up()) {
-            pc.update();
+            pc.update(false);
             pc.setDesiredAltitude(targetAlt);
             pc.setTakeOffTime(System.currentTimeMillis());
         } else {
@@ -158,7 +161,7 @@ public class ChangeAltitudeHandler extends AbstractClientMsgHandler {
             } else
                 pc.setDesiredAltitude(targetAlt);
 
-            pc.update();
+            pc.update(false);
 
 
             pc.setTakeOffTime(System.currentTimeMillis());

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

@@ -63,7 +63,7 @@ public class CityDataHandler extends AbstractClientMsgHandler {
 
         // If the hotZone has changed then update the client's map accordingly.
 
-        if (playerCharacter.getTimeStamp("hotzoneupdate") <= ZoneManager.hotZoneLastUpdate.toEpochMilli() && ZoneManager.hotZone != null) {
+        if (playerCharacter.getTimestamps().containsKey("hotzoneupdate") && playerCharacter.getTimeStamp("hotzoneupdate") <= ZoneManager.hotZoneLastUpdate.toEpochMilli() && ZoneManager.hotZone != null) {
             HotzoneChangeMsg hotzoneChangeMsg = new HotzoneChangeMsg(Enum.GameObjectType.Zone.ordinal(), ZoneManager.hotZone.getObjectUUID());
             dispatch = Dispatch.borrow(playerCharacter, hotzoneChangeMsg);
             DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);

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

@@ -62,7 +62,7 @@ public class DestroyBuildingHandler extends AbstractClientMsgHandler {
         if (city != null)
             bane = city.getBane();
 
-        if (bane != null && bane.getSiegePhase() == Enum.SiegePhase.WAR) {
+        if (bane != null){// && bane.getSiegePhase() == Enum.SiegePhase.WAR) {
             ErrorPopupMsg.sendErrorPopup(pc, 171);
             return true;
         }

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

@@ -102,7 +102,7 @@ public class GroupInviteResponseHandler extends AbstractClientMsgHandler {
 
             // Run Keyclone Audit
 
-            KEYCLONEAUDIT.audit(player, group);
+            //KEYCLONEAUDIT.audit(player, group);
 
             return true;
         }

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

@@ -61,7 +61,7 @@ public class HirelingServiceMsgHandler extends AbstractClientMsgHandler {
                     return true;
 
 
-                npc.setRepairCost(msg.repairCost);
+                npc.setSpecialPrice(msg.repairCost);
                 ManageNPCMsg outMsg = new ManageNPCMsg(npc);
                 Dispatch dispatch = Dispatch.borrow(player, msg);
 

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

@@ -360,6 +360,11 @@ public class ItemProductionMsgHandler extends AbstractClientMsgHandler {
                 targetItem.recycle(vendor);
                 vendor.removeItemFromForge(targetItem);
 
+                //refund the gold for cancelled item
+                if(vendor.building.getStrongboxValue() + targetItem.getItemBase().getBaseValue() < 15000000){
+                    vendor.building.setStrongboxValue(vendor.building.getStrongboxValue() + targetItem.getItemBase().getBaseValue());
+                }
+
                 // Refresh vendor's inventory to client
 
                 outMsg = new ManageNPCMsg(vendor);

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

@@ -62,16 +62,23 @@ public class MOTDEditHandler extends AbstractClientMsgHandler {
                 return true;
             }
 
-            if (type == 1) // Guild MOTD
+            if (type == 1) { // Guild MOTD
                 msg.setMessage(guild.getMOTD());
-            else if (type == 3) // IC MOTD
+                guild.updateDatabase();
+            }else if (type == 3) { // IC MOTD
                 msg.setMessage(guild.getICMOTD());
-            else if (type == 0) { // Nation MOTD
+                guild.updateDatabase();
+            }else if (type == 0) { // Nation MOTD
                 Guild nation = guild.getNation();
                 if (nation == null || !nation.isNation()) {
                     ErrorPopupMsg.sendErrorMsg(playerCharacter, "You do not have such authority!");
                     return true;
                 }
+                nation.setNMOTD(msg.getMessage());
+                nation.updateDatabase();
+                for(Guild sub : nation.getSubGuildList()){
+                    sub.setNMOTD(nation.getNMOTD());
+                }
                 msg.setMessage(nation.getMOTD());
             }
             dispatch = Dispatch.borrow(playerCharacter, msg);

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

@@ -17,6 +17,7 @@ import engine.powers.PowersBase;
 import engine.server.MBServerStatics;
 
 import java.util.ArrayList;
+import java.util.Objects;
 
 /*
  * @Author:
@@ -105,7 +106,7 @@ public class MerchantMsgHandler extends AbstractClientMsgHandler {
 
         // Validate player can obtain blessing
 
-        if (GuildStatusController.isGuildLeader(player.getGuildStatus()) == false) {
+        if (!GuildStatusController.isGuildLeader(player.getGuildStatus())) {
             ErrorPopupMsg.sendErrorPopup(player, 173); // You must be the leader of a guild to receive a blessing
             return;
         }
@@ -126,12 +127,12 @@ public class MerchantMsgHandler extends AbstractClientMsgHandler {
 
         realm = RealmMap.getRealmForCity(city);
 
-        if (realm.getCanBeClaimed() == false) {
+        if (!realm.getCanBeClaimed()) {
             ErrorPopupMsg.sendErrorPopup(player, 180); // This territory cannot be ruled by anyone
             return;
         }
 
-        if (realm.isRuled() == true) {
+        if (realm.isRuled()) {
             ErrorPopupMsg.sendErrorPopup(player, 178); // This territory is already claimed
             return;
         }
@@ -142,12 +143,12 @@ public class MerchantMsgHandler extends AbstractClientMsgHandler {
 
     }
 
-    private static void requestBoon(MerchantMsg msg, ClientConnection origin, PlayerCharacter player, NPC npc) {
+    private static void requestBoon(PlayerCharacter player, NPC npc) {
 
         Building shrineBuilding;
         Shrine shrine;
 
-        if (npc.getGuild() != player.getGuild())
+        if (!npc.getGuild().getNation().equals(player.getGuild().getNation()))
             return;
 
         shrineBuilding = npc.getBuilding();
@@ -155,7 +156,7 @@ public class MerchantMsgHandler extends AbstractClientMsgHandler {
         if (shrineBuilding == null)
             return;
 
-        if (shrineBuilding.getBlueprint() != null && shrineBuilding.getBlueprint().getBuildingGroup() != engine.Enum.BuildingGroup.SHRINE)
+        if (shrineBuilding.getBlueprint() != null && !shrineBuilding.getBlueprint().getBuildingGroup().equals(engine.Enum.BuildingGroup.SHRINE))
             return;
 
         if (shrineBuilding.getRank() == -1)
@@ -171,11 +172,9 @@ public class MerchantMsgHandler extends AbstractClientMsgHandler {
             return;
         }
 
-        //already haz boon.
-
         if (player.containsEffect(shrine.getShrineType().getPowerToken())) {
-            ErrorPopupMsg.sendErrorPopup(player, 199);
-            return;
+            //remove old boon to apply new one, allows boon refreshing
+            player.effects.remove(PowersManager.getPowerByToken(shrine.getShrineType().getPowerToken()).name);
         }
 
         if (!Shrine.canTakeFavor(player, shrine))
@@ -191,16 +190,31 @@ public class MerchantMsgHandler extends AbstractClientMsgHandler {
             return;
         }
 
-        int rank = shrine.getRank();
-        //R8 trees always get atleast rank 2 boons. rank uses index, where 0 is first place, 1 is second, etc...
-        if (shrineBuilding.getCity() != null && shrineBuilding.getCity().getTOL() != null && shrineBuilding.getCity().getTOL().getRank() == 8)
-            if (rank != 0)
-                rank = 1;
-        int trains = 40 - (rank * 10);
-        if (trains < 0)
-            trains = 0;
+        int trains = 0;
+        switch(npc.getRank()){
+            case 1:
+                trains = 10;
+                break;
+            case 2:
+                trains = 15;
+                break;
+            case 3:
+                trains = 20;
+                break;
+            case 4:
+                trains = 25;
+                break;
+            case 5:
+                trains = 30;
+                break;
+            case 6:
+                trains = 35;
+                break;
+            case 7:
+                trains = 40;
+                break;
+        }
 
-        //System.out.println(trains);
         PowersManager.applyPower(player, player, player.getLoc(), shrinePower.getToken(), trains, false);
         ChatManager.chatGuildInfo(player.getGuild(), player.getName() + " has recieved a boon costing " + 1 + " point of favor.");
         shrineBuilding.addEffectBit(1000000 << 2);
@@ -260,60 +274,85 @@ public class MerchantMsgHandler extends AbstractClientMsgHandler {
             }
         }
 
-        if (targetCity == null)
-            return;
-
-        //verify level required to teleport or repledge
+        if (targetCity == null){
+            Mine mineTele = null;
+            for(Mine mine : Mine.getMinesToTeleportTo(player)){
+                if(mine.getObjectUUID() == msg.getCityID()){
+                    mineTele = mine;
+                }
+            }
+            if(mineTele == null){
+                return;
+            }else {
+                int time = MBServerStatics.TELEPORT_TIME_IN_SECONDS;
+                msg.setTeleportTime(time);
+                Building tower = Mine.getTower(mineTele);
+                if (tower == null)
+                    return;
+                Vector3fImmutable teleportLoc = Vector3fImmutable.getRandomPointOnCircle(tower.getLoc(), 10);
+                ChatManager.chatSystemInfo(player, "You Will Teleport To " + mineTele.getParentZone().getParent().getName() + "'s Mine In " + time +  " Seconds.");
+                if (time > 0) {
+                    //TODO add timer to teleport
+                    TeleportJob tj = new TeleportJob(player, npc, teleportLoc, origin, true);
+                    JobScheduler.getInstance().scheduleJob(tj, time * 1000);
+                }
+            }
+        }else{
+            //finish porting to a city
+            //verify level required to teleport or repledge
 
-        Guild toGuild = targetCity.getGuild();
+            Guild toGuild = targetCity.getGuild();
 
-        if (toGuild != null)
-            if (isTeleport) {
-                if (player.getLevel() < toGuild.getTeleportMin() || player.getLevel() > toGuild.getTeleportMax())
+            if (toGuild != null)
+                if (isTeleport) {
+                    if (player.getLevel() < toGuild.getTeleportMin() || player.getLevel() > toGuild.getTeleportMax())
+                        return;
+                } else if (player.getLevel() < toGuild.getRepledgeMin() || player.getLevel() > toGuild.getRepledgeMax())
                     return;
-            } else if (player.getLevel() < toGuild.getRepledgeMin() || player.getLevel() > toGuild.getRepledgeMax())
-                return;
 
-        boolean joinedGuild = false;
+            boolean joinedGuild = false;
 
-        //if repledge, reguild the player
+            //if repledge, reguild the player
 
-        if (!isTeleport)
-            joinedGuild = GuildManager.joinGuild(player, targetCity.getGuild(), targetCity.getObjectUUID(), GuildHistoryType.JOIN);
+            if (!isTeleport)
+                joinedGuild = GuildManager.joinGuild(player, targetCity.getGuild(), targetCity.getObjectUUID(), GuildHistoryType.JOIN);
 
-        int time;
+            int time;
 
-        if (!isTeleport) //repledge
-            time = MBServerStatics.REPLEDGE_TIME_IN_SECONDS;
-        else
-            time = MBServerStatics.TELEPORT_TIME_IN_SECONDS;
+            if (!isTeleport) //repledge
+                time = MBServerStatics.REPLEDGE_TIME_IN_SECONDS;
+            else
+                time = MBServerStatics.TELEPORT_TIME_IN_SECONDS;
 
-        //resend message
-        msg.setTeleportTime(time);
+            //resend message
+            msg.setTeleportTime(time);
 
-        if ((!isTeleport && joinedGuild) || (isTeleport)) {
+            if ((!isTeleport && joinedGuild) || (isTeleport)) {
 
-            dispatch = Dispatch.borrow(player, msg);
-            DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
-        }
+                dispatch = Dispatch.borrow(player, msg);
+                DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
+            }
 
-        //teleport player to city
+            //teleport player to city
 
-        Vector3fImmutable teleportLoc;
+            Vector3fImmutable teleportLoc;
 
-        if (targetCity.getTOL().getRank() == 8)
-            teleportLoc = targetCity.getTOL().getStuckLocation();
-        else
-            teleportLoc = Vector3fImmutable.getRandomPointOnCircle(targetCity.getTOL().getLoc(), MBServerStatics.TREE_TELEPORT_RADIUS);
-
-        if (time > 0) {
-            //TODO add timer to teleport
-            TeleportJob tj = new TeleportJob(player, npc, teleportLoc, origin, true);
-            JobScheduler.getInstance().scheduleJob(tj, time * 1000);
-        } else if (joinedGuild) {
-            player.teleport(teleportLoc);
-            player.setSafeMode();
+            if (targetCity.getTOL().getRank() == 8)
+                teleportLoc = targetCity.getTOL().getStuckLocation();
+            else
+                teleportLoc = Vector3fImmutable.getRandomPointOnCircle(targetCity.getTOL().getLoc(), MBServerStatics.TREE_TELEPORT_RADIUS);
+
+            if (time > 0) {
+                //TODO add timer to teleport
+                TeleportJob tj = new TeleportJob(player, npc, teleportLoc, origin, true);
+                JobScheduler.getInstance().scheduleJob(tj, time * 1000);
+            } else if (joinedGuild) {
+                player.teleport(teleportLoc);
+                player.setSafeMode();
+            }
         }
+
+
     }
 
     private static PowersBase getPowerforHermit(NPC npc) {
@@ -420,7 +459,7 @@ public class MerchantMsgHandler extends AbstractClientMsgHandler {
                 if (isHermit(npc))
                     requestHermitBlessing(msg, origin, player, npc);
                 else
-                    requestBoon(msg, origin, player, npc);
+                    requestBoon(player, npc);
                 break;
             case 15:
                 LeaderboardMessage lbm = new LeaderboardMessage();

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

@@ -421,31 +421,12 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler {
                                 itemMan.consume(item);
                             }
                             break;
-                        //ANNIVERSERY GIFT
                         case 31:
-                            // *** Disabled for now: Needs bootyset created
-
-                            //if (ib.getUUID() == 971012) {
-                            //    int random = ThreadLocalRandom.current().nextInt(ItemBase.AnniverseryGifts.size());
-                            //    int annyID = ItemBase.AnniverseryGifts.get(random);
-
-                            //    ItemBase annyIB = ItemBase.getItemBase(annyID);
-                            //    if (annyIB != null) {
-                            //        Item gift = MobLoot.createItemForPlayer(player, annyIB);
-                            //        if (gift != null) {
-                            //            itemMan.addItemToInventory(gift);
-                            //            itemMan.consume(item);
-                            //        }
-                            //    }
-                            //    break;
-                            //}
-
                             LootManager.peddleFate(player,item);
                             break;
 
                         case 30: //water bucket
                         case 8: //potions, tears of saedron
-
                         case 5: //runes, petition, warrant, scrolls
                             if (uuid > 3000 && uuid < 3050) { //Discipline Runes
                                 if (ApplyRuneMsg.applyRune(uuid, origin, player)) {
@@ -462,7 +443,12 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler {
                                     itemMan.consume(item);
                                 }
                                 break;
-                            } else if (uuid > 252122 && uuid < 252128) { //mastery runes
+                            } else if (uuid > 252122 && uuid < 252137) { //blood runes
+                                if (ApplyRuneMsg.applyRune(uuid, origin, player)) {
+                                    itemMan.consume(item);
+                                }
+                                break;
+                            } else if (uuid > 252128 && uuid < 252128) { //mastery runes
                                 if (ApplyRuneMsg.applyRune(uuid, origin, player)) {
                                     itemMan.consume(item);
                                 }
@@ -528,7 +514,6 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler {
                                     }
 
                                     // Send piss bucket animation
-
                                     VisualUpdateMessage vum = new VisualUpdateMessage(player, 16323);
                                     vum.configure();
                                     DispatchMessage.sendToAllInRange(player, vum);
@@ -543,7 +528,9 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler {
 
                             dispatch = Dispatch.borrow(player, msg);
                             DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
-                            player.cancelOnSpell();
+                            if(!item.getItemBase().getType().equals(ItemType.POTION)) {
+                                player.cancelOnSpell();
+                            }
                             break;
                         default: //shouldn't be here, consume item
                             dispatch = Dispatch.borrow(player, msg);

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

@@ -135,7 +135,8 @@ public class TaxCityMsgHandler extends AbstractClientMsgHandler {
 
         msg = (TaxCityMsg) baseMsg;
 
-        ViewTaxes(msg, player);
+        //realm taxing disabled
+        //ViewTaxes(msg, player);
 
 
         return true;

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

@@ -10,6 +10,7 @@
 package engine.net.client.msg;
 
 import engine.Enum;
+import engine.gameManager.ChatManager;
 import engine.gameManager.DbManager;
 import engine.net.*;
 import engine.net.client.ClientConnection;
@@ -70,62 +71,120 @@ public class ApplyRuneMsg extends ClientNetMsg {
     }
 
     public static boolean applyRune(int runeID, ClientConnection origin, PlayerCharacter playerCharacter) {
-
         RuneBase rb = RuneBase.getRuneBase(runeID);
         Dispatch dispatch;
-
         if (playerCharacter == null || origin == null || rb == null) {
             return false;
         }
-
+        int raceID = playerCharacter.getRaceID();
         //Check race is met
         ConcurrentHashMap<Integer, Boolean> races = rb.getRace();
-        if (races.size() > 0) {
-            int raceID = playerCharacter.getRaceID();
-            boolean valid = false;
-            for (int validID : races.keySet()) {
-                if (validID == raceID) {
-                    valid = true;
-                    break;
+        if(runeID != 3007 && runeID != 3014) {//bounty hunter and huntsman
+            if (races.size() > 0) {
+                boolean valid = false;
+                for (int validID : races.keySet()) {
+                    if (validID == raceID) {
+                        valid = true;
+                        break;
+                    }
                 }
-            }
-            if (!valid) {
-                return false;
-            }
-        }
+                if(runeID == 3040)
+                    valid = true;
 
-        //Check base class is met
-        ConcurrentHashMap<Integer, Boolean> baseClasses = rb.getBaseClass();
-        if (baseClasses.size() > 0) {
-            int baseClassID = playerCharacter.getBaseClassID();
-            boolean valid = false;
-            for (int validID : baseClasses.keySet()) {
-                if (validID == baseClassID) {
+                if(runeID == 3049)
                     valid = true;
-                    break;
+
+                if(raceID == 1999){
+                    switch(runeID){
+                        case 2514:
+                        case 3036:
+                        case 3033:
+                        case 3001:
+                        case 3002:
+                        case 3003:
+                        case 3004:
+                        case 3008:
+                        case 3009:
+                        case 3013:
+                        case 3016:
+                        case 3017:
+                        case 3018:
+                        case 3020:
+                        case 3021:
+                        case 3030:
+                        case 3031:
+                        case 3037:
+                        case 3045:
+                        case 3046:
+                        case 3047:
+                        case 3048:
+                        case 3049:
+                            valid = true;
+                            break;
+                    }
+                }
+                if (!valid) {
+                    return false;
                 }
             }
-            if (!valid) {
-                return false;
+            //Check base class is met
+            ConcurrentHashMap<Integer, Boolean> baseClasses = rb.getBaseClass();
+            if (baseClasses.size() > 0) {
+                int baseClassID = playerCharacter.getBaseClassID();
+                boolean valid = false;
+                for (int validID : baseClasses.keySet()) {
+                    if (validID == baseClassID) {
+                        valid = true;
+                        break;
+                    }
+                }
+                if(runeID == 3040)
+                    valid = true;
+                if(runeID == 3036 && raceID == 1999)
+                    valid = true;
+                if(runeID == 3033 && raceID == 1999)
+                    valid = true;
+                if(runeID == 3035 && baseClassID == 2501)
+                    valid = true;
+                if(runeID == 3028 && baseClassID == 2501 && playerCharacter.getRace().getName().contains("Irekei"))
+                    valid = true;
+                if (!valid) {
+                    return false;
+                }
             }
-        }
-
-        //Check promotion class is met
-        ConcurrentHashMap<Integer, Boolean> promotionClasses = rb.getPromotionClass();
-        if (promotionClasses.size() > 0) {
-            int promotionClassID = playerCharacter.getPromotionClassID();
-            boolean valid = false;
-            for (int validID : promotionClasses.keySet()) {
-                if (validID == promotionClassID) {
+            //Check promotion class is met
+            ConcurrentHashMap<Integer, Boolean> promotionClasses = rb.getPromotionClass();
+            if (promotionClasses.size() > 0) {
+                int promotionClassID = playerCharacter.getPromotionClassID();
+                int baseClassID = playerCharacter.getBaseClassID();
+                boolean valid = false;
+                for (int validID : promotionClasses.keySet()) {
+                    if (validID == promotionClassID) {
+                        valid = true;
+                        break;
+                    }
+                }
+                if(runeID == 3040)
                     valid = true;
-                    break;
+                if(runeID == 3004 && (playerCharacter.getPromotionClassID() == 2505 || playerCharacter.getPromotionClassID() == 2510))
+                    valid = true;
+                if(runeID == 3036 && raceID == 1999)
+                    valid = true;
+                if(runeID == 3033 && raceID == 1999)
+                    valid = true;
+                if(runeID == 3028 && (raceID == 2013 || raceID == 2014) && playerCharacter.getBaseClassID() == 2501)
+                    valid = true;
+                if(runeID == 3035 && baseClassID == 2501)
+                    valid = true;
+                if (!valid) {
+                    return false;
                 }
             }
-            if (!valid) {
+        } else{
+            if(playerCharacter.getPromotionClassID() == 2519){//priest
                 return false;
             }
         }
-
         //Check disciplines are met
         ArrayList<CharacterRune> runes = playerCharacter.getRunes();
         ConcurrentHashMap<Integer, Boolean> disciplines = rb.getDiscipline();
@@ -139,7 +198,6 @@ public class ApplyRuneMsg extends ClientNetMsg {
                 }
             }
         }
-
         int discCount = 0;
         for (CharacterRune cr : runes) {
             int runeBaseID = cr.getRuneBaseID();
@@ -152,28 +210,35 @@ public class ApplyRuneMsg extends ClientNetMsg {
                 return false;
             }
         }
-
         //Check level is met
         if (playerCharacter.getLevel() < rb.getLevelRequired()) {
             return false;
         }
-
         int strTotal = 0;
         int dexTotal = 0;
         int conTotal = 0;
         int intTotal = 0;
         int spiTotal = 0;
         int cost = 0;
-
         //Check any attributes are met
         ArrayList<RuneBaseAttribute> attrs = rb.getAttrs();
-
         if (rb.getAttrs() != null)
             for (RuneBaseAttribute rba : attrs) {
                 int attrID = rba.getAttributeID();
                 int mod = rba.getModValue();
                 switch (attrID) {
                     case MBServerStatics.RUNE_COST_ATTRIBUTE_ID:
+                        switch (rb.getName()) {
+                            case "Born of the Ethyri":
+                            case "Born of the Taripontor":
+                            case "Born of the Gwendannen":
+                            case "Born of the Invorri":
+                            case "Born of the Irydnu":
+                            case "Scion of the Dar Khelegeur":
+                            case "Scion of the Gwaridorn":
+                            case "Scion of the Twathedilion":
+                                mod = 0;
+                        }
                         if (mod > playerCharacter.getUnusedStatPoints()) {
                             return false;
                         }
@@ -226,25 +291,64 @@ public class ApplyRuneMsg extends ClientNetMsg {
                         break;
                 }
             }
-
         //Check if max number runes already reached
         if (runes.size() > 12) {
+            ChatManager.chatSystemInfo(playerCharacter,"You Have Too Many Runes Applied");
             return false;
         }
-
-        //if discipline, check number applied
-        if (isDiscipline(runeID)) {
-            if (playerCharacter.getLevel() < 70) {
-                if (discCount > 2) {
-                    return false;
+        switch (rb.getName()) {
+            case "Born of the Ethyri":
+            case "Born of the Taripontor":
+            case "Born of the Gwendannen":
+            case "Born of the Invorri":
+            case "Born of the Irydnu":
+                for (CharacterRune charRune : playerCharacter.getRunes()) {
+                    RuneBase rb2 = charRune.getRuneBase();
+                    switch (rb2.getName()) {
+                        case "Born of the Ethyri":
+                        case "Born of the Taripontor":
+                        case "Born of the Gwendannen":
+                        case "Born of the Invorri":
+                        case "Born of the Irydnu":
+                            ChatManager.chatSystemError(playerCharacter, "You Have Already Applied A Blood Rune");
+                            return false;
+                    }
                 }
-            } else {
-                if (discCount > 3) {
-                    return false;
+                break;
+            case "Scion of the Dar Khelegeur":
+            case "Scion of the Gwaridorn":
+            case "Scion of the Twathedilion":
+                for (CharacterRune charRune : playerCharacter.getRunes()) {
+                    RuneBase rb2 = charRune.getRuneBase();
+                    switch (rb2.getName()) {
+                        case "Scion of the Dar Khelegeur":
+                        case "Scion of the Gwaridorn":
+                        case "Scion of the Twathedilion":
+                            ChatManager.chatSystemError(playerCharacter, "You Have Already Applied A Blood Rune");
+                            return false;
+                    }
                 }
+                break;
+        }
+        //if discipline, check number applied
+        if (isDiscipline(runeID)) {
+            switch(playerCharacter.getRank()){
+                case 1:
+                case 2:
+                case 3:
+                case 4:
+                case 5:
+                case 6:
+                    if(discCount > 3)
+                        return false;
+                    break;
+                case 7:
+                case 8:
+                    if(discCount > 5)
+                        return false;
+                    break;
             }
         }
-
         //Everything succeeded. Let's apply the rune
         //Attempt add rune to database
         CharacterRune runeWithoutID = new CharacterRune(rb, playerCharacter.getObjectUUID());
@@ -258,7 +362,6 @@ public class ApplyRuneMsg extends ClientNetMsg {
         if (cr == null) {
             return false;
         }
-
         //remove any overridden runes from player
         ArrayList<Integer> overwrite = rb.getOverwrite();
         CharacterRune toRemove = null;
@@ -267,13 +370,10 @@ public class ApplyRuneMsg extends ClientNetMsg {
                 toRemove = playerCharacter.removeRune(overwriteID);
             }
         }
-
         //add rune to player
         playerCharacter.addRune(cr);
-
         // recalculate all bonuses/formulas/skills/powers
         playerCharacter.recalculate();
-
         //if overwriting a stat rune, add any amount granted from previous rune.
         if (toRemove != null) {
             RuneBase rbs = toRemove.getRuneBase();
@@ -299,30 +399,35 @@ public class ApplyRuneMsg extends ClientNetMsg {
                 if (dif > 0 && spiTotal < (int) playerCharacter.statSpiMax) {
                     playerCharacter.addSpi(dif);
                 }
-
                 // recalculate all bonuses/formulas/skills/powers
                 playerCharacter.recalculate();
             }
         }
-
+        switch (rb.getName()) {
+            case "Born of the Ethyri":
+            case "Born of the Taripontor":
+            case "Born of the Gwendannen":
+            case "Born of the Invorri":
+            case "Born of the Irydnu":
+            case "Scion of the Dar Khelegeur":
+            case "Scion of the Gwaridorn":
+            case "Scion of the Twathedilion":
+                cost = 0;
+                break;
+        }
         if (cost > 0) {
             ModifyStatMsg msm = new ModifyStatMsg((0 - cost), 0, 3);
             dispatch = Dispatch.borrow(playerCharacter, msm);
             DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
         }
-
         //send apply rune message to client
         ApplyRuneMsg arm = new ApplyRuneMsg(playerCharacter.getObjectType().ordinal(), playerCharacter.getObjectUUID(), runeID, cr.getObjectType().ordinal(), cr.getObjectUUID(), false);
         dispatch = Dispatch.borrow(playerCharacter, arm);
         DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
-
-
         //alert them of success
         ErrorPopupMsg.sendErrorPopup(playerCharacter, 160);
-
         //reapply bonuses
         playerCharacter.applyBonuses();
-
         return true;
     }
 

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

@@ -18,9 +18,8 @@ import engine.net.client.Protocol;
 import engine.objects.Building;
 import engine.objects.Guild;
 import engine.server.MBServerStatics;
-import java.time.Instant;
-import java.time.Duration;
-import java.time.temporal.ChronoField;
+import org.joda.time.DateTime;
+import org.joda.time.Seconds;
 
 public class ArcMineWindowAvailableTimeMsg extends ClientNetMsg {
 
@@ -28,8 +27,8 @@ public class ArcMineWindowAvailableTimeMsg extends ClientNetMsg {
     private Building treeOfLife;
 
     private int currentMineHour;
-    private Duration secondsLeft;
-    private Instant lateTime;
+    private Seconds secondsLeft;
+    private DateTime lateTime;
     private int late;
 
     /**
@@ -74,15 +73,15 @@ public class ArcMineWindowAvailableTimeMsg extends ClientNetMsg {
             currentMineHour = guild.getMineTime();
 
         late = MBServerStatics.MINE_LATE_WINDOW;
-        lateTime = Instant.now();
+        lateTime = DateTime.now();
 
         if (late == 0)
-            lateTime = lateTime.plus(Duration.ofDays(1));
+            lateTime = lateTime.plusDays(1);
 
-        lateTime = lateTime.with(ChronoField.HOUR_OF_DAY, late);
+        lateTime = lateTime.hourOfDay().setCopy(late);
 
         late = ((late > 23) ? (late - 24) : late);
-        secondsLeft = Duration.between(Instant.now(), lateTime);
+        secondsLeft = Seconds.secondsBetween(DateTime.now(), lateTime);
     }
 
     /**
@@ -108,4 +107,4 @@ public class ArcMineWindowAvailableTimeMsg extends ClientNetMsg {
     public void setBuildingUUID(int buildingUUID) {
         this.buildingUUID = buildingUUID;
     }
-}
+}

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

@@ -112,6 +112,12 @@ public class BuyFromNPCWindowMsg extends ClientNetMsg {
 
             if (contract != null)
                 sellInventory = contract.getSellInventory();
+            //if(npc.contract.getObjectUUID() == 890){ // default steward
+            //    sellInventory = npc.getSellInventorySteward();
+           // }
+            //if(npc.contract.getObjectUUID() == 889){ // default builder
+           //     sellInventory = npc.getSellInventoryBuilder();
+           // }
         }
 
         if (man != null)

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

@@ -104,8 +104,10 @@ public class CityDataMsg extends ClientNetMsg {
         }
 
         temp.putInt(mineList.size());
-        for (Mine mine : mineList)
-            Mine.serializeForClientMsg(mine, temp);
+        for (Mine mine : mineList) {
+            if(mine.getParentZone() != null && !mine.getParentZone().isContinent())
+                Mine.serializeForClientMsg(mine, temp);
+        }
         temp.put((byte) 0); // PAD
     }
 
@@ -178,8 +180,10 @@ public class CityDataMsg extends ClientNetMsg {
                 }
 
                 writer.putInt(mineList.size());
-                for (Mine mine : mineList)
-                    Mine.serializeForClientMsg(mine, writer);
+                for (Mine mine : mineList) {
+                    if(mine.getParentZone() != null && !mine.getParentZone().isContinent())
+                        Mine.serializeForClientMsg(mine, writer);
+                }
             } else
                 writer.putInt(0);
         } catch (Exception e) {