Merge remote-tracking branch 'origin/feature-server-restrictions' into feature-lore-ruleset

Using a string instead of a set.
Lore Rules
2024-02-18 08:26:27 -05:00 · 2024-02-18 08:20:34 -05:00 · 2024-02-15 19:46:41 -06:00 · 2024-02-15 18:47:43 -06:00 · 2024-02-15 11:31:22 -05:00 · 2024-02-14 12:29:42 -05:00
196 changed files with 4860 additions and 18053 deletions
@@ -46,7 +46,7 @@ public class Enum {
        EXPLOIT,
        BUG,
        GAME_STOPPER,
-        TECH_SUPPORT;
+        TECH_SUPPORT

    }

@@ -112,7 +112,7 @@ public class Enum {
        Undead,
        Nephilim,
        Vampire,
-        SiegeEngineer;
+        SiegeEngineer

    }

@@ -120,7 +120,7 @@ public class Enum {
        MALE,
        FEMALE,
        FUZZY,
-        OTHER;
+        OTHER
    }

    public enum RaceType {
@@ -155,13 +155,13 @@ public class Enum {
        VAMPFEMALE(2029, MonsterType.Vampire, RunSpeed.STANDARD, CharacterSex.FEMALE, 1);

        @SuppressWarnings("unchecked")
-        private static HashMap<Integer, RaceType> _raceTypeByID = new HashMap<>();
+        private static final HashMap<Integer, RaceType> _raceTypeByID = new HashMap<>();

        int runeID;
-        private MonsterType monsterType;
-        private CharacterSex characterSex;
-        private RunSpeed runSpeed;
-        private float scaleHeight;
+        private final MonsterType monsterType;
+        private final CharacterSex characterSex;
+        private final RunSpeed runSpeed;
+        private final float scaleHeight;

        RaceType(int runeID, MonsterType aggroType, RunSpeed runspeed, CharacterSex characterSex, float scaleHeight) {
            this.runeID = runeID;
@@ -210,13 +210,13 @@ public class Enum {
        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);

-        private float walkStandard;
-        private float walkCombat;
-        private float runStandard;
-        private float runCombat;
-        private float swim;
-        private float flyRun;
-        private float flyWalk;
+        private final float walkStandard;
+        private final float walkCombat;
+        private final float runStandard;
+        private final float runCombat;
+        private final float swim;
+        private final float flyRun;
+        private final float flyWalk;

        RunSpeed(float walkStandard, float runStandard, float walkCombat, float runCombat, float flyWalk, float flyRun, float swim) {
            this.walkStandard = walkStandard;
@@ -310,13 +310,13 @@ public class Enum {

    public enum PvpHistoryType {
        KILLS,
-        DEATHS;
+        DEATHS
    }

    public enum ChatMessageType {
        ERROR,
        INFO,
-        MOTD;
+        MOTD
    }

    public enum DataRecordType {
@@ -327,7 +327,7 @@ public class Enum {
        CITY,
        ZONE,
        REALM,
-        MINE;
+        MINE
    }

    public enum RecordEventType {
@@ -338,7 +338,7 @@ public class Enum {
        TRANSFER,
        PENDING,
        DEFEND,
-        LOST; // Realm event
+        LOST // Realm event
    }

    public enum CharterType {
@@ -346,8 +346,8 @@ public class Enum {
        MERCANTILE(-15978914, 5060400),
        BELLIGERENT(762228431, 5060800);

-        private int charterID;
-        private int meshID;
+        private final int charterID;
+        private final int meshID;

        CharterType(int charterID, int meshID) {
            this.charterID = charterID;
@@ -402,7 +402,7 @@ public class Enum {
        Npc,
        PlayerCharacter,
        Account,
-        Mob;
+        Mob
    }

    public enum SiegePhase {
@@ -410,20 +410,20 @@ public class Enum {
        CHALLENGE,
        STANDOFF,
        WAR,
-        CEASEFIRE;
+        CEASEFIRE
    }

    public enum SiegeResult {
        PENDING,
        DEFEND,
        DESTROY,
-        CAPTURE;
+        CAPTURE
    }

    public enum TaxType {
        PROFIT,
        WEEKLY,
-        NONE;
+        NONE

    }

@@ -469,7 +469,7 @@ public class Enum {

                // 14001 does not have a banestone to bind at

-                if (ruinZone.getLoadNum() == 14001)
+                if (ruinZone.templateID == 14001)
                    spawnLocation = Vector3fImmutable.getRandomPointOnCircle(ruinZone.getLoc(), 30);
                else
                    spawnLocation = Vector3fImmutable.getRandomPointOnCircle(ruinZone.getLoc()
@@ -1261,7 +1261,7 @@ public class Enum {
        SITTING,
        RUNNING,
        FLYING,
-        SWIMMING;
+        SWIMMING
    }

    public enum DoorState {
@@ -1269,7 +1269,7 @@ public class Enum {
        OPEN,
        CLOSED,
        LOCKED,
-        UNLOCKED;
+        UNLOCKED
    }

    // Used with stored procedure GET_UID_ENUM() for
@@ -1290,11 +1290,9 @@ public class Enum {
        SHRINE,
        WORLDSERVER,
        ZONE,
-        WAREHOUSE;
+        WAREHOUSE
    }

-    ;
-
    /**
     * Enumeration of Building Protection Status stored in the database as a
     * mysql enumfield. WARNING: This enumeration is fragile. Do not rename. Do
@@ -1309,11 +1307,64 @@ public class Enum {
        CONTRACT,
        DESTROYED,
        PENDING,
-        NPC;
+        NPC
+    }
+
+    public enum DisciplineType {
+
+        Alchemist,
+        Animator,
+        Archer,
+        Berserker,
+        BlackMask,
+        Blacksmith,
+        BladeMaster,
+        BladeWeaver,
+        BloodProphet,
+        BountyHunter,
+        Clanwarden,
+        Commander,
+        DarkKnight,
+        Duelist,
+        ForgeMaster,
+        GiantKiller,
+        Gladiator,
+        Huntsman,
+        Knight,
+        RatCatcher,
+        RuneCaster,
+        Enchanter,
+        StormLord,
+        Summoner,
+        Sundancer,
+        Trainer,
+        Traveler,
+        UndeadHunter,
+        Werebear,
+        Wererat,
+        Werewolf,
+        Wyrmslayer,
+        Conjurer,
+        Darksworn,
+        Valkyr,
+        BloodHorn,
+        Shroudborne,
+        Archmage,
+        Thrall,
+        Artillerist,
+        Savant,
+        SkyDancer,
+        Prospector,
+        Belgosch,
+        Drannok,
+        Gorgoi,
+        Strigoi,
+        Sapper,
+        Saboteur,
+        BattleMagus,
+        Sanctifier,
    }

-    ;
-
    public enum CharacterSkills {

        Archery((1L << 1), -529201545, 20),
@@ -1382,7 +1433,7 @@ public class Enum {

        private long flag;
        private int token;
-        private int reqLvl;
+        private final int reqLvl;

        CharacterSkills(long flag, int token, int reqLvl) {
            this.flag = flag;
@@ -1421,8 +1472,6 @@ public class Enum {
        }
    }

-    ;
-
    public enum GuildHistoryType {
        JOIN(1),
        LEAVE(4),
@@ -1443,17 +1492,14 @@ public class Enum {
    public enum SexType {
        NONE,
        MALE,
-        FEMALE;
+        FEMALE
    }

    public enum ClassType {
-        FIGHTER,
-        HEALER,
-        ROGUE,
-        MAGE;
-    }
-
-    public enum PromoteType {
+        Fighter(SexType.NONE),
+        Healer(SexType.NONE),
+        Rogue(SexType.NONE),
+        Mage(SexType.NONE),
        Assassin(SexType.NONE),
        Barbarian(SexType.NONE),
        Bard(SexType.NONE),
@@ -1478,9 +1524,9 @@ public class Enum {
        Necromancer(SexType.NONE),
        ;

-        private SexType sexRestriction;
+        private final SexType sexRestriction;

-        PromoteType(SexType sexRestriction) {
+        ClassType(SexType sexRestriction) {
            this.sexRestriction = sexRestriction;
        }

@@ -1660,13 +1706,13 @@ public class Enum {
        REGEN,
        FLIGHT,
        LOCATION,
-        MOVEMENTSTATE;
+        MOVEMENTSTATE
    }

    public enum ServerType {
        WORLDSERVER,
        LOGINSERVER,
-        NONE;
+        NONE
    }

    public enum ChatChannel implements EnumBitSetHelper<ChatChannel> {
@@ -1720,7 +1766,7 @@ public class Enum {
        Thief,
        Warlock,
        Warrior,
-        Wizard;
+        Wizard

    }

@@ -1728,13 +1774,13 @@ public class Enum {
        RecommendedAlly,
        RecommendedEnemy,
        Ally,
-        Enemy;
+        Enemy
    }

    public enum FriendStatus {
        Available,
        Away,
-        Busy;
+        Busy
    }

    public enum ProfitType {
@@ -1749,7 +1795,7 @@ public class Enum {

        public String dbField;

-        private ProfitType(String dbField) {
+        ProfitType(String dbField) {
            this.dbField = dbField;
        }
    }
@@ -1842,17 +1888,15 @@ public class Enum {
        WorldServerInfoSnapshot,
        Shrine,
        Zone,
-        Transaction;
+        Transaction
    }

    public enum ContainerType {
        BANK,
        INVENTORY,
-        VAULT;
+        VAULT
    }

-    ;
-
    public enum CompoundCurveType {
        DefaultFlat(0),
        DefaultSlope(1),
@@ -2160,7 +2204,7 @@ public class Enum {

        private final double value;

-        private CompoundCurveType(double value) {
+        CompoundCurveType(double value) {

            this.value = value;
        }
@@ -2183,7 +2227,7 @@ public class Enum {
        Sit,
        TakeDamage,
        TerritoryClaim,
-        UnEquip;
+        UnEquip
    }

    public enum PowerSubType {
@@ -2193,7 +2237,7 @@ public class Enum {
        DamageType1,
        DamageType2,
        DamageType3,
-        Cancel;
+        Cancel
    }

    public enum PowerCategoryType {
@@ -2228,7 +2272,7 @@ public class Enum {
        RECALL,
        SPIREPROOFTELEPORT,
        SPIREDISABLE,
-        THIEF;
+        THIEF
    }

    public enum PowerTargetType {
@@ -2247,7 +2291,7 @@ public class Enum {
        JEWELRY,
        WEAPONARMOR,
        ARMOR,
-        ITEM;
+        ITEM
    }

    public enum objectMaskType {
@@ -2280,7 +2324,7 @@ public class Enum {
        BANK,
        VAULT,
        FORGE,
-        WAREHOUSE;
+        WAREHOUSE
    }

    public enum ItemSlotType implements EnumBitSetHelper<ItemSlotType> {
@@ -2301,7 +2345,7 @@ public class Enum {
        UPARM,
        WINGS,
        BEARD,
-        HAIR;
+        HAIR
    }

    public enum CityBoundsType {
@@ -2310,15 +2354,19 @@ public class Enum {
        ZONE(875),
        PLACEMENT(876);

-        public final float extents;
+        public final float halfExtents;

-        CityBoundsType(float extents) {
-            this.extents = extents;
+        CityBoundsType(float halfExtents) {
+            this.halfExtents = halfExtents;
        }
    }

-    public enum GuildType {
-        NONE("None", new String[][]{{"None"}}, new String[]{"Thearchy", "Common Rule", "Theocracy", "Republic Rule"}),
+    public enum GuildCharterType {
+        NONE("None", new String[][]{{"None"}}, new String[]{"Thearchy", "Common Rule", "Theocracy", "Republic Rule"},
+                EnumSet.noneOf(ClassType.class),
+                EnumSet.noneOf(MonsterType.class),
+                EnumSet.noneOf(SexType.class)),
+
        CATHEDRAL("Church of the All-Father", new String[][]{
                {"Acolyte", "Acolyte"},
                {"Catechist"},
@@ -2328,7 +2376,12 @@ public class Enum {
                {"Bishop", "Bishop"},
                {"Lord Cardinal", "Lady Cardinal"},
                {"Patriarch", "Matriarch"}},
-                new String[]{"Thearchy", "Common Rule", "Theocracy", "Republic Rule"}),
+                new String[]{"Thearchy", "Common Rule", "Theocracy", "Republic Rule"},
+                EnumSet.of(ClassType.Bard, ClassType.Channeler, ClassType.Crusader, ClassType.Nightstalker,
+                        ClassType.Prelate, ClassType.Priest, ClassType.Sentinel, ClassType.Scout),
+                EnumSet.of(MonsterType.Aelfborn, MonsterType.Centaur, MonsterType.Elf, MonsterType.HalfGiant,
+                        MonsterType.Human),
+                EnumSet.allOf(SexType.class)),
        MILITARY("Military", new String[][]{
                {"Recruit"},
                {"Footman"},
@@ -2338,7 +2391,11 @@ public class Enum {
                {"Captain"},
                {"General"},
                {"Lord Marshall", "Lady Marshall"}},
-                new String[]{"Autocracy", "Common Rule", "Council Rule", "Militocracy"}),
+                new String[]{"Autocracy", "Common Rule", "Council Rule", "Militocracy"},
+                EnumSet.of(ClassType.Bard, ClassType.Priest, ClassType.Scout, ClassType.Warlock,
+                        ClassType.Warrior, ClassType.Wizard),
+                EnumSet.of(MonsterType.Centaur, MonsterType.HalfGiant, MonsterType.Human),
+                EnumSet.allOf(SexType.class)),
        TEMPLE("Temple of the Cleansing Flame", new String[][]{
                {"Aspirant"},
                {"Novice"},
@@ -2349,7 +2406,11 @@ public class Enum {
                {"Lictor"},
                {"Justiciar"},
                {"Pontifex", "Pontifectrix"}},
-                new String[]{"Despot Rule", "Common Rule", "Protectorship", "Republic Rule"}),
+                new String[]{"Despot Rule", "Common Rule", "Protectorship", "Republic Rule"},
+                EnumSet.of(ClassType.Assassin, ClassType.Bard, ClassType.Channeler, ClassType.Confessor,
+                        ClassType.Nightstalker, ClassType.Priest, ClassType.Scout, ClassType.Templar),
+                EnumSet.of(MonsterType.HalfGiant, MonsterType.Human),
+                EnumSet.allOf(SexType.class)),
        BARBARIAN("Barbarian Clan", new String[][]{
                {"Barbarian"},
                {"Skald"},
@@ -2358,7 +2419,11 @@ public class Enum {
                {"Jarl"},
                {"Chieftain"},
                {"Thane"}},
-                new String[]{"Chiefdom", "Common Rule", "Council Rule", "Republic Rule"}),
+                new String[]{"Chiefdom", "Common Rule", "Council Rule", "Republic Rule"},
+                EnumSet.of(ClassType.Barbarian, ClassType.Bard, ClassType.Doomsayer, ClassType.Fury,
+                        ClassType.Priest, ClassType.Scout, ClassType.Thief, ClassType.Warrior),
+                EnumSet.of(MonsterType.Aelfborn, MonsterType.HalfGiant, MonsterType.Human, MonsterType.Minotaur),
+                EnumSet.allOf(SexType.class)),
        RANGER("Ranger's Brotherhood", new String[][]{
                {"Yeoman"},
                {"Pathfinder"},
@@ -2367,7 +2432,11 @@ public class Enum {
                {"Protector"},
                {"Guardian"},
                {"Lord Protector", "Lady Protector"}},
-                new String[]{"Despot Rule", "Collectivism", "Council Rule", "Republic Rule"}),
+                new String[]{"Despot Rule", "Collectivism", "Council Rule", "Republic Rule"},
+                EnumSet.of(ClassType.Bard, ClassType.Channeler, ClassType.Druid, ClassType.Priest,
+                        ClassType.Ranger, ClassType.Scout, ClassType.Warrior),
+                EnumSet.of(MonsterType.Aelfborn, MonsterType.Elf, MonsterType.HalfGiant, MonsterType.Human, MonsterType.Shade),
+                EnumSet.allOf(SexType.class)),
        AMAZON("Amazon Temple", new String[][]{
                {"Amazon Thrall", "Amazon"},
                {"Amazon Slave", "Amazon Warrior"},
@@ -2375,7 +2444,11 @@ public class Enum {
                {"Amazon Consort", "Amazon Princess"},
                {"Amazon Seneschal", "Majestrix"},
                {"Amazon Regent", "Imperatrix"}},
-                new String[]{"Despot Rule", "Common Rule", "Gynarchy", "Gynocracy"}),
+                new String[]{"Despot Rule", "Common Rule", "Gynarchy", "Gynocracy"},
+                EnumSet.of(ClassType.Bard, ClassType.Druid, ClassType.Fury, ClassType.Huntress,
+                        ClassType.Priest, ClassType.Scout, ClassType.Warrior, ClassType.Wizard),
+                EnumSet.of(MonsterType.Aelfborn, MonsterType.Elf, MonsterType.HalfGiant, MonsterType.Human),
+                EnumSet.of(SexType.FEMALE)),
        NOBLE("Noble House", new String[][]{
                {"Serf"},
                {"Vassal"},
@@ -2386,7 +2459,11 @@ public class Enum {
                {"Duke", "Duchess"},
                {"King", "Queen"},
                {"Emperor", "Empress"}},
-                new String[]{"Monarchy", "Common Rule", "Feodality", "Republic"}),
+                new String[]{"Monarchy", "Common Rule", "Feodality", "Republic"},
+                EnumSet.of(ClassType.Assassin, ClassType.Bard, ClassType.Channeler, ClassType.Priest,
+                        ClassType.Scout, ClassType.Thief, ClassType.Warlock, ClassType.Warrior, ClassType.Wizard),
+                EnumSet.of(MonsterType.Aelfborn, MonsterType.HalfGiant, MonsterType.Human),
+                EnumSet.allOf(SexType.class)),
        WIZARD("Wizard's Conclave", new String[][]{
                {"Apprentice"},
                {"Neophyte"},
@@ -2395,7 +2472,11 @@ public class Enum {
                {"Magus"},
                {"High Magus"},
                {"Archmagus"}},
-                new String[]{"Despot Rule", "Common Rule", "Council Rule", "Magocracy"}),
+                new String[]{"Despot Rule", "Common Rule", "Council Rule", "Magocracy"},
+                EnumSet.of(ClassType.Assassin, ClassType.Bard, ClassType.Channeler, ClassType.Doomsayer,
+                        ClassType.Fury, ClassType.Necromancer, ClassType.Priest, ClassType.Warlock, ClassType.Wizard),
+                EnumSet.of(MonsterType.Aelfborn, MonsterType.Elf, MonsterType.Human, MonsterType.Nephilim, MonsterType.Shade),
+                EnumSet.allOf(SexType.class)),
        MERCENARY("Mercenary Company", new String[][]{
                {"Soldier"},
                {"Man-at-Arms"},
@@ -2405,7 +2486,11 @@ public class Enum {
                {"Commander"},
                {"High Commander"},
                {"Warlord"}},
-                new String[]{"Magistrature", "Mob Law", "Council Rule", "Republic Rule"}),
+                new String[]{"Magistrature", "Mob Law", "Council Rule", "Republic Rule"},
+                EnumSet.of(ClassType.Assassin, ClassType.Bard, ClassType.Priest, ClassType.Scout,
+                        ClassType.Thief, ClassType.Warlock, ClassType.Warrior),
+                EnumSet.of(MonsterType.Aelfborn, MonsterType.Aracoix, MonsterType.HalfGiant, MonsterType.Human, MonsterType.Shade),
+                EnumSet.allOf(SexType.class)),
        THIEVES("Thieve's Den", new String[][]{
                {"Urchin"},
                {"Footpad"},
@@ -2416,7 +2501,12 @@ public class Enum {
                {"Treasurer"},
                {"Grandmaster Thief"},
                {"Grandfather"}},
-                new String[]{"Despot Rule", "Common Rule", "Oligarchy", "Republic Rule"}),
+                new String[]{"Despot Rule", "Common Rule", "Oligarchy", "Republic Rule"},
+                EnumSet.of(ClassType.Assassin, ClassType.Barbarian, ClassType.Bard, ClassType.Priest,
+                        ClassType.Scout, ClassType.Thief, ClassType.Wizard),
+                EnumSet.of(MonsterType.Aelfborn, MonsterType.Aracoix, MonsterType.Elf, MonsterType.Human, MonsterType.Irekei,
+                        MonsterType.Nephilim, MonsterType.Shade, MonsterType.Vampire),
+                EnumSet.allOf(SexType.class)),
        DWARF("Dwarf Hold", new String[][]{
                {"Citizen"},
                {"Master"},
@@ -2424,7 +2514,11 @@ public class Enum {
                {"Thane"},
                {"Great Thane"},
                {"High Thane"}},
-                new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"}),
+                new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"},
+                EnumSet.of(ClassType.Crusader, ClassType.Prelate, ClassType.Priest, ClassType.Sentinel,
+                        ClassType.Warrior),
+                EnumSet.of(MonsterType.Dwarf),
+                EnumSet.allOf(SexType.class)),
        HIGHCOURT("High Court", new String[][]{
                {"Eccekebe"},
                {"Saedulor"},
@@ -2435,7 +2529,12 @@ public class Enum {
                {"Dar Thaelostor", "Dar Thaelostril"},
                {"Aglaeron"},
                {"Ellestor", "Elestril"}},
-                new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"}),
+                new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"},
+                EnumSet.of(ClassType.Assassin, ClassType.Bard, ClassType.Channeler, ClassType.Druid,
+                        ClassType.Necromancer, ClassType.Priest, ClassType.Ranger, ClassType.Scout,
+                        ClassType.Thief, ClassType.Warrior, ClassType.Wizard),
+                EnumSet.of(MonsterType.Elf, MonsterType.Minotaur),
+                EnumSet.allOf(SexType.class)),
        VIRAKT("Virakt", new String[][]{
                {"Jov'uus"},
                {"Urikhan"},
@@ -2445,7 +2544,12 @@ public class Enum {
                {"Khal'uvho"},
                {"Khar'uus"},
                {"Kryqh'khalin"}},
-                new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"}),
+                new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"},
+                EnumSet.of(ClassType.Assassin, ClassType.Bard, ClassType.Channeler, ClassType.Fury,
+                        ClassType.Huntress, ClassType.Nightstalker, ClassType.Priest, ClassType.Ranger,
+                        ClassType.Scout, ClassType.Thief, ClassType.Warrior, ClassType.Wizard),
+                EnumSet.of(MonsterType.Irekei),
+                EnumSet.allOf(SexType.class)),
        BRIALIA("Coven of Brialia", new String[][]{ // Unknown Rank names
                {"Devotee"},
                {"Initiated"},
@@ -2455,7 +2559,11 @@ public class Enum {
                {"Elder"},
                {"Hierophant"},
                {"Witch King", "Witch Queen"}},
-                new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"}),
+                new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"},
+                EnumSet.allOf(ClassType.class),
+                EnumSet.allOf(MonsterType.class),
+                EnumSet.allOf(SexType.class)),
+
        UNHOLY("Unholy Legion", new String[][]{ // Unknown Rank names
                {"Footman"},
                {"Fell Legionaire"},
@@ -2465,14 +2573,23 @@ public class Enum {
                {"Dark Master", "Dark Mistress"},
                {"Dread Master", "Dread Mistress"},
                {"Dread Lord", "Dread Lady"}},
-                new String[]{"Despot Rule", "Despot Rule", "Council Rule", "Republic Rule"}),
+                new String[]{"Despot Rule", "Despot Rule", "Council Rule", "Republic Rule"},
+                EnumSet.of(ClassType.Assassin, ClassType.Channeler, ClassType.Necromancer, ClassType.Priest,
+                        ClassType.Scout, ClassType.Thief, ClassType.Warlock, ClassType.Warrior,
+                        ClassType.Wizard),
+                EnumSet.of(MonsterType.Human, MonsterType.Shade, MonsterType.Vampire),
+                EnumSet.allOf(SexType.class)),
        SCOURGE("Cult of the Scourge", new String[][]{
                {"Thrall"},
                {"Mudir"},
                {"Dark Brother", "Dark Sister"},
                {"Hand of the Dark"},
                {"Dark Father", "Dark Mother"}},
-                new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"}),
+                new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"},
+                EnumSet.of(ClassType.Bard, ClassType.Channeler, ClassType.Doomsayer, ClassType.Priest,
+                        ClassType.Scout, ClassType.Warrior, ClassType.Wizard),
+                EnumSet.of(MonsterType.Aelfborn, MonsterType.Human, MonsterType.Minotaur, MonsterType.Nephilim),
+                EnumSet.allOf(SexType.class)),
        PIRATE("Pirate Crew", new String[][]{
                {"Midshipman", "Midshipwoman"},
                {"Sailor"},
@@ -2480,7 +2597,10 @@ public class Enum {
                {"Second Mat"},
                {"First Mate"},
                {"Captain"}},
-                new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"}),
+                new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"},
+                EnumSet.allOf(ClassType.class),
+                EnumSet.allOf(MonsterType.class),
+                EnumSet.allOf(SexType.class)),
        HERALD("Academy of Heralds", new String[][]{
                {"Pupil"},
                {"Scribe"},
@@ -2490,7 +2610,10 @@ public class Enum {
                {"Scholar"},
                {"Archivist"},
                {"Loremaster"}},
-                new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"}),
+                new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"},
+                EnumSet.allOf(ClassType.class),
+                EnumSet.allOf(MonsterType.class),
+                EnumSet.allOf(SexType.class)),
        CENTAUR("Centaur Cohort", new String[][]{
                {"Hoplite"},
                {"Peltast"},
@@ -2500,7 +2623,12 @@ public class Enum {
                {"Septenrion"},
                {"Praetorian"},
                {"Paragon"}},
-                new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"}),
+                new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"},
+                EnumSet.of(ClassType.Barbarian, ClassType.Crusader, ClassType.Druid, ClassType.Huntress,
+                        ClassType.Prelate, ClassType.Priest, ClassType.Ranger, ClassType.Sentinel,
+                        ClassType.Warrior),
+                EnumSet.of(MonsterType.Centaur),
+                EnumSet.allOf(SexType.class)),
        KHREE("Aracoix Kh'ree", new String[][]{
                {"Duriacor"},
                {"Exarch"},
@@ -2512,101 +2640,108 @@ public class Enum {
                {"Erentar"},
                {"Araceos"},
                {"Hierarch"}},
-
-                new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"});
-
+                new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"},
+                EnumSet.of(ClassType.Assassin, ClassType.Barbarian, ClassType.Bard, ClassType.Huntress,
+                        ClassType.Priest, ClassType.Ranger, ClassType.Scout, ClassType.Thief,
+                        ClassType.Warlock, ClassType.Warrior),
+                EnumSet.of(MonsterType.Aracoix),
+                EnumSet.allOf(SexType.class));
+
+        public final EnumSet<ClassType> requiredClasses;
+        public final EnumSet<MonsterType> requiredRaces;
+        public final EnumSet<SexType> sexRequired;
        private final String name;
        private final String[][] ranks;    //Stored Rank#->Gender(M,F)
        private final String[] leadershipTypes;

-        GuildType(String name, String[][] ranks, String[] leadershipTypes) {
+        GuildCharterType(String name, String[][] ranks, String[] leadershipTypes, EnumSet<ClassType> requiredClasses,
+                         EnumSet<MonsterType> requiredRaces, EnumSet<SexType> sexRequired) {
            this.name = name;
            this.ranks = ranks;
            this.leadershipTypes = leadershipTypes;
+            this.requiredClasses = requiredClasses;
+            this.requiredRaces = requiredRaces;
+            this.sexRequired = sexRequired;
        }

-        public static GuildType getGuildTypeFromCharter(ItemBase itemBase) {
+        public static GuildCharterType getGuildTypeFromCharter(ItemBase itemBase) {

-            GuildType charterType;
+            GuildCharterType charterType;

            // Must be a valid charter object

            if (itemBase.getType().equals(ItemType.GUILDCHARTER) == false)
-                return GuildType.NONE;    //No guild Type
-
-            // No switches on long in java.  Cast to int
-            // when refactor to long uuid's.  Loss won't matter
-            // with values this small.
+                return GuildCharterType.NONE;    //No guild Type

            switch (itemBase.getUUID()) {

                case 559:
-                    charterType = GuildType.CATHEDRAL;
+                    charterType = GuildCharterType.CATHEDRAL;
                    break;
                case 560:
-                    charterType = GuildType.MILITARY;
+                    charterType = GuildCharterType.MILITARY;
                    break;
                case 561:
-                    charterType = GuildType.TEMPLE;
+                    charterType = GuildCharterType.TEMPLE;
                    break;
                case 562:
-                    charterType = GuildType.BARBARIAN;
+                    charterType = GuildCharterType.BARBARIAN;
                    break;
                case 563:
-                    charterType = GuildType.RANGER;
+                    charterType = GuildCharterType.RANGER;
                    break;
                case 564:
-                    charterType = GuildType.AMAZON;
+                    charterType = GuildCharterType.AMAZON;
                    break;
                case 565:
-                    charterType = GuildType.NOBLE;
+                    charterType = GuildCharterType.NOBLE;
                    break;
                case 566:
-                    charterType = GuildType.WIZARD;
+                    charterType = GuildCharterType.WIZARD;
                    break;
                case 567:
-                    charterType = GuildType.MERCENARY;
+                    charterType = GuildCharterType.MERCENARY;
                    break;
                case 568:
-                    charterType = GuildType.THIEVES;
+                    charterType = GuildCharterType.THIEVES;
                    break;
                case 569:
-                    charterType = GuildType.DWARF;
+                    charterType = GuildCharterType.DWARF;
                    break;
                case 570:
-                    charterType = GuildType.HIGHCOURT;
+                    charterType = GuildCharterType.HIGHCOURT;
                    break;
                case 571:
-                    charterType = GuildType.VIRAKT;
+                    charterType = GuildCharterType.VIRAKT;
                    break;
                case 572:
-                    charterType = GuildType.SCOURGE;
+                    charterType = GuildCharterType.SCOURGE;
                    break;
                case 573:
-                    charterType = GuildType.KHREE;
+                    charterType = GuildCharterType.KHREE;
                    break;
                case 574:
-                    charterType = GuildType.CENTAUR;
+                    charterType = GuildCharterType.CENTAUR;
                    break;
                case 575:
-                    charterType = GuildType.UNHOLY;
+                    charterType = GuildCharterType.UNHOLY;
                    break;
                case 576:
-                    charterType = GuildType.PIRATE;
+                    charterType = GuildCharterType.PIRATE;
                    break;
                case 577:
-                    charterType = GuildType.BRIALIA;
+                    charterType = GuildCharterType.BRIALIA;
                    break;

                default:
-                    charterType = GuildType.HERALD;
+                    charterType = GuildCharterType.HERALD;
            }

            return charterType;
        }

-        public static GuildType getGuildTypeFromInt(int i) {
-            return GuildType.values()[i];
+        public static GuildCharterType getGuildTypeFromInt(int i) {
+            return GuildCharterType.values()[i];
        }

        public String getCharterName() {
@@ -2632,12 +2767,15 @@ public class Enum {
            return leadershipTypes[i];
        }

+        public boolean canJoin(AbstractCharacter character){
+            return this.requiredRaces.contains(character.absRace) && this.requiredClasses.contains(character.absPromotionClass) && this.sexRequired.contains(character.absGender);
+        }
    }

    public enum MinionClass {
        MELEE,
        ARCHER,
-        MAGE;
+        MAGE
    }

    public enum MinionType {
@@ -2707,14 +2845,14 @@ public class Enum {
            return race;
        }

-        public Boolean isMage(){
+        public Boolean isMage() {
            return this.minionClass.ordinal() == MinionClass.MAGE.ordinal();
        }
    }

    public enum GridObjectType {
        STATIC,
-        DYNAMIC;
+        DYNAMIC
    }

    public enum SupportMsgType {
@@ -2817,12 +2955,11 @@ public class Enum {
    public enum AccountStatus {
        BANNED,
        ACTIVE,
-        ADMIN;
+        ADMIN
    }

    public enum MobBehaviourType {
        None(null, false, false, false, false, false),
-        //Power
        Power(null, false, true, true, true, false),
        PowerHelpee(Power, false, true, true, false, true),
        PowerHelpeeWimpy(Power, true, false, true, false, false),
@@ -2847,6 +2984,7 @@ public class Enum {
        //Independent Types
        SimpleStandingGuard(null, false, false, false, false, false),
        Pet1(null, false, false, true, false, false),
+        SiegeEngine(null, false, false, false, false, false),
        Simple(null, false, false, true, false, false),
        Helpee(null, false, true, true, false, true),
        HelpeeWimpy(null, true, false, true, false, false),
@@ -2857,13 +2995,12 @@ public class Enum {
        HamletGuard(null, false, true, false, false, false),
        AggroWanderer(null, false, false, true, false, false);

-        private static HashMap<Integer, MobBehaviourType> _behaviourTypes = new HashMap<>();
-        public MobBehaviourType BehaviourHelperType;
-        public boolean isWimpy;
-        public boolean isAgressive;
-        public boolean canRoam;
-        public boolean callsForHelp;
-        public boolean respondsToCallForHelp;
+        public final MobBehaviourType BehaviourHelperType;
+        public final boolean isWimpy;
+        public final boolean isAgressive;
+        public final boolean canRoam;
+        public final boolean callsForHelp;
+        public final boolean respondsToCallForHelp;

        MobBehaviourType(MobBehaviourType helpeebehaviourType, boolean wimpy, boolean agressive, boolean canroam, boolean callsforhelp, boolean respondstocallforhelp) {
            this.BehaviourHelperType = helpeebehaviourType;
@@ -2878,8 +3015,11 @@ public class Enum {

    public enum AIAgentType {
        MOBILE,
+        GUARDCAPTAIN,
+        GUARDMINION,
+        GUARDWALLARCHER,
        PET,
        CHARMED,
-        GUARD;
+        SIEGEENGINE
    }
 }
@@ -1,706 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2022
-//                www.magicbane.com
-
-package engine.InterestManagement;
-
-import engine.Enum;
-import engine.gameManager.ConfigManager;
-import engine.gameManager.DbManager;
-import engine.gameManager.ZoneManager;
-import engine.math.Vector2f;
-import engine.math.Vector3fImmutable;
-import engine.objects.AbstractWorldObject;
-import engine.objects.Zone;
-import engine.util.MapLoader;
-import org.pmw.tinylog.Logger;
-
-import javax.imageio.ImageIO;
-import java.awt.*;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.HashMap;
-
-public class HeightMap {
-
-    // Class variables
-
-    // Heightmap data for all zones.
-
-    public static final HashMap<Integer, HeightMap> heightmapByLoadNum = new HashMap<>();
-
-    // Bootstrap Tracking
-
-    public static int heightMapsCreated = 0;
-    public static HeightMap PlayerCityHeightMap;
-
-    // Heightmap data for this heightmap
-
-    public BufferedImage heightmapImage;
-
-    private int heightMapID;
-    private int maxHeight;
-    private int fullExtentsX;
-    private int fullExtentsY;
-
-    private float bucketWidthX;
-    private float bucketWidthY;
-    private int zoneLoadID;
-    private float seaLevel = 0;
-    private float outsetX;
-    private float outsetZ;
-    private int[][] pixelColorValues;
-
-    public HeightMap(ResultSet rs) throws SQLException {
-
-        this.heightMapID = rs.getInt("heightMapID");
-        this.maxHeight = rs.getInt("maxHeight");
-        int halfExtentsX = rs.getInt("xRadius");
-        int halfExtentsY = rs.getInt("zRadius");
-        this.zoneLoadID = rs.getInt("zoneLoadID");
-        this.seaLevel = rs.getFloat("seaLevel");
-        this.outsetX = rs.getFloat("outsetX");
-        this.outsetZ = rs.getFloat("outsetZ");
-
-
-        // Cache the full extents to avoid the calculation
-
-        this.fullExtentsX = halfExtentsX * 2;
-        this.fullExtentsY = halfExtentsY * 2;
-
-        this.heightmapImage = null;
-        File imageFile = new File(ConfigManager.DEFAULT_DATA_DIR + "heightmaps/" + this.heightMapID + ".bmp");
-
-        // early exit if no image file was found.  Will log in caller.
-
-        if (!imageFile.exists())
-            return;
-
-        // load the heightmap image.
-
-        try {
-            this.heightmapImage = ImageIO.read(imageFile);
-        } catch (IOException e) {
-            Logger.error("***Error loading heightmap data for heightmap " + this.heightMapID + e.toString());
-        }
-
-        // We needed to flip the image as OpenGL and Shadowbane both use the bottom left corner as origin.
-
-        this.heightmapImage = MapLoader.flipImage(this.heightmapImage);
-
-        // Calculate the data we do not load from table
-
-        float numOfBuckets = this.heightmapImage.getWidth() - 1;
-        float calculatedWidth = this.fullExtentsX / numOfBuckets;
-        this.bucketWidthX = calculatedWidth;
-        this.bucketWidthY = this.bucketWidthX; // This makes no sense.
-
-        // Generate pixel array from image data
-
-        generatePixelData();
-
-        HeightMap.heightmapByLoadNum.put(this.zoneLoadID, this);
-
-        heightMapsCreated++;
-    }
-
-    //Created for PlayerCities
-    public HeightMap() {
-
-        this.heightMapID = 999999;
-        this.maxHeight = 5; // for real...
-        int halfExtentsX = (int) Enum.CityBoundsType.ZONE.extents;
-        int halfExtentsY = (int) Enum.CityBoundsType.ZONE.extents;
-        this.zoneLoadID = 0;
-        this.seaLevel = 0;
-        this.outsetX = 128;
-        this.outsetZ = 128;
-
-
-        // Cache the full extents to avoid the calculation
-
-        this.fullExtentsX = halfExtentsX * 2;
-        this.fullExtentsY = halfExtentsY * 2;
-
-
-        // load the heightmap image.
-
-
-        // We needed to flip the image as OpenGL and Shadowbane both use the bottom left corner as origin.
-
-        this.heightmapImage = null;
-
-        // Calculate the data we do not load from table
-
-        this.bucketWidthX = 1;
-        this.bucketWidthY = 1;
-
-        this.pixelColorValues = new int[this.fullExtentsX + 1][this.fullExtentsY + 1];
-
-        for (int y = 0; y <= this.fullExtentsY; y++) {
-            for (int x = 0; x <= this.fullExtentsX; x++) {
-                pixelColorValues[x][y] = 255;
-            }
-        }
-
-
-        HeightMap.heightmapByLoadNum.put(this.zoneLoadID, this);
-    }
-
-    public HeightMap(Zone zone) {
-
-        this.heightMapID = 999999;
-        this.maxHeight = 0;
-        int halfExtentsX = (int) zone.getBounds().getHalfExtents().x;
-        int halfExtentsY = (int) zone.getBounds().getHalfExtents().y;
-        this.zoneLoadID = 0;
-        this.seaLevel = 0;
-        this.outsetX = 0;
-        this.outsetZ = 0;
-
-        // Cache the full extents to avoid the calculation
-
-        this.fullExtentsX = halfExtentsX * 2;
-        this.fullExtentsY = halfExtentsY * 2;
-
-
-        // We needed to flip the image as OpenGL and Shadowbane both use the bottom left corner as origin.
-
-        this.heightmapImage = null;
-
-        // Calculate the data we do not load from table
-
-        this.bucketWidthX = 1;
-        this.bucketWidthY = 1;
-
-        this.pixelColorValues = new int[this.fullExtentsX + 1][this.fullExtentsY + 1];
-
-        for (int y = 0; y <= this.fullExtentsY; y++) {
-            for (int x = 0; x <= this.fullExtentsX; x++) {
-                pixelColorValues[x][y] = 255;
-            }
-        }
-
-
-        HeightMap.heightmapByLoadNum.put(this.zoneLoadID, this);
-    }
-
-    public static void GeneratePlayerCityHeightMap() {
-
-        HeightMap.PlayerCityHeightMap = new HeightMap();
-
-    }
-
-    public static void GenerateCustomHeightMap(Zone zone) {
-
-        HeightMap heightMap = new HeightMap(zone);
-
-        HeightMap.heightmapByLoadNum.put(zone.getLoadNum(), heightMap);
-
-    }
-
-    public static Zone getNextZoneWithTerrain(Zone zone) {
-
-        Zone nextZone = zone;
-
-        if (zone.getHeightMap() != null)
-            return zone;
-
-        if (zone.equals(ZoneManager.getSeaFloor()))
-            return zone;
-
-        while (nextZone.getHeightMap() == null)
-            nextZone = nextZone.getParent();
-
-        return nextZone;
-    }
-
-    public static float getWorldHeight(AbstractWorldObject worldObject) {
-
-        Vector2f parentLoc = new Vector2f(-1, -1);
-        Zone currentZone = ZoneManager.findSmallestZone(worldObject.getLoc());
-
-        if (currentZone == null)
-            return worldObject.getAltitude();
-
-        currentZone = getNextZoneWithTerrain(currentZone);
-
-        if (currentZone == ZoneManager.getSeaFloor())
-            return currentZone.getAbsY() + worldObject.getAltitude();
-
-        Zone parentZone = getNextZoneWithTerrain(currentZone.getParent());
-        HeightMap heightMap = currentZone.getHeightMap();
-
-        Vector2f zoneLoc = ZoneManager.worldToZoneSpace(worldObject.getLoc(), currentZone);
-        Vector3fImmutable localLocFromCenter = ZoneManager.worldToLocal(worldObject.getLoc(), currentZone);
-
-        if ((parentZone != null) && (parentZone.getHeightMap() != null))
-            parentLoc = ZoneManager.worldToZoneSpace(worldObject.getLoc(), parentZone);
-
-        float interaltitude = currentZone.getHeightMap().getInterpolatedTerrainHeight(zoneLoc);
-
-        float worldAltitude = currentZone.getWorldAltitude();
-
-        float realWorldAltitude = interaltitude + worldAltitude;
-
-        //OUTSET
-
-        if (parentZone != null) {
-
-            float parentXRadius = currentZone.getBounds().getHalfExtents().x;
-            float parentZRadius = currentZone.getBounds().getHalfExtents().y;
-
-            float offsetX = Math.abs((localLocFromCenter.x / parentXRadius));
-            float offsetZ = Math.abs((localLocFromCenter.z / parentZRadius));
-
-            float bucketScaleX = heightMap.outsetX / parentXRadius;
-            float bucketScaleZ = heightMap.outsetZ / parentZRadius;
-
-            if (bucketScaleX <= 0.40000001)
-                bucketScaleX = heightMap.outsetZ / parentXRadius;
-
-            if (bucketScaleX > 0.40000001)
-                bucketScaleX = 0.40000001f;
-
-            if (bucketScaleZ <= 0.40000001)
-                bucketScaleZ = heightMap.outsetX / parentZRadius;
-
-            if (bucketScaleZ > 0.40000001)
-                bucketScaleZ = 0.40000001f;
-
-            float outsideGridSizeX = 1 - bucketScaleX; //32/256
-            float outsideGridSizeZ = 1 - bucketScaleZ;
-            float weight;
-
-            double scale;
-
-            if (offsetX > outsideGridSizeX && offsetX > offsetZ) {
-                weight = (offsetX - outsideGridSizeX) / bucketScaleX;
-                scale = Math.atan2((.5 - weight) * 3.1415927, 1);
-
-                float scaleChild = (float) ((scale + 1) * .5);
-                float scaleParent = 1 - scaleChild;
-
-                float parentAltitude = parentZone.getHeightMap().getInterpolatedTerrainHeight(parentLoc);
-                float parentCenterAltitude = parentZone.getHeightMap().getInterpolatedTerrainHeight(ZoneManager.worldToZoneSpace(currentZone.getLoc(), parentZone));
-
-                parentCenterAltitude += currentZone.getYCoord();
-                parentCenterAltitude += interaltitude;
-
-                float firstScale = parentAltitude * scaleParent;
-                float secondScale = parentCenterAltitude * scaleChild;
-                float outsetALt = firstScale + secondScale;
-
-                outsetALt += currentZone.getParent().getWorldAltitude();
-                realWorldAltitude = outsetALt;
-
-            } else if (offsetZ > outsideGridSizeZ) {
-
-                weight = (offsetZ - outsideGridSizeZ) / bucketScaleZ;
-                scale = Math.atan2((.5 - weight) * 3.1415927, 1);
-
-                float scaleChild = (float) ((scale + 1) * .5);
-                float scaleParent = 1 - scaleChild;
-                float parentAltitude = parentZone.getHeightMap().getInterpolatedTerrainHeight(parentLoc);
-                float parentCenterAltitude = parentZone.getHeightMap().getInterpolatedTerrainHeight(ZoneManager.worldToZoneSpace(currentZone.getLoc(), parentZone));
-
-                parentCenterAltitude += currentZone.getYCoord();
-                parentCenterAltitude += interaltitude;
-                float firstScale = parentAltitude * scaleParent;
-                float secondScale = parentCenterAltitude * scaleChild;
-                float outsetALt = firstScale + secondScale;
-
-                outsetALt += currentZone.getParent().getWorldAltitude();
-                realWorldAltitude = outsetALt;
-            }
-        }
-
-        return realWorldAltitude;
-    }
-
-    public static float getWorldHeight(Vector3fImmutable worldLoc) {
-
-        Vector2f parentLoc = new Vector2f(-1, -1);
-        Zone currentZone = ZoneManager.findSmallestZone(worldLoc);
-
-        if (currentZone == null)
-            return 0;
-
-        currentZone = getNextZoneWithTerrain(currentZone);
-
-        if (currentZone == ZoneManager.getSeaFloor())
-            return currentZone.getAbsY();
-
-        Zone parentZone = getNextZoneWithTerrain(currentZone.getParent());
-        HeightMap heightMap = currentZone.getHeightMap();
-
-        if ((heightMap == null) || (currentZone == ZoneManager.getSeaFloor()))
-            return currentZone.getAbsY();
-
-        Vector2f zoneLoc = ZoneManager.worldToZoneSpace(worldLoc, currentZone);
-        Vector3fImmutable localLocFromCenter = ZoneManager.worldToLocal(worldLoc, currentZone);
-
-        if ((parentZone != null) && (parentZone.getHeightMap() != null))
-            parentLoc = ZoneManager.worldToZoneSpace(worldLoc, parentZone);
-
-        float interaltitude = currentZone.getHeightMap().getInterpolatedTerrainHeight(zoneLoc);
-
-        float worldAltitude = currentZone.getWorldAltitude();
-
-        float realWorldAltitude = interaltitude + worldAltitude;
-
-        //OUTSET
-
-        if (parentZone != null) {
-
-            //			if (currentZone.getHeightMap() != null && parentZone.getHeightMap() != null && parentZone.getParent() != null && parentZone.getParent().getHeightMap() != null)
-            //				return realWorldAltitude;
-
-            float parentXRadius = currentZone.getBounds().getHalfExtents().x;
-            float parentZRadius = currentZone.getBounds().getHalfExtents().y;
-
-            float offsetX = Math.abs((localLocFromCenter.x / parentXRadius));
-            float offsetZ = Math.abs((localLocFromCenter.z / parentZRadius));
-
-            float bucketScaleX = heightMap.outsetX / parentXRadius;
-            float bucketScaleZ = heightMap.outsetZ / parentZRadius;
-
-            float outsideGridSizeX = 1 - bucketScaleX; //32/256
-            float outsideGridSizeZ = 1 - bucketScaleZ;
-            float weight;
-
-            double scale;
-
-
-            if (offsetX > outsideGridSizeX && offsetX > offsetZ) {
-                weight = (offsetX - outsideGridSizeX) / bucketScaleX;
-                scale = Math.atan2((.5 - weight) * 3.1415927, 1);
-
-                float scaleChild = (float) ((scale + 1) * .5);
-                float scaleParent = 1 - scaleChild;
-
-                float parentAltitude = parentZone.getHeightMap().getInterpolatedTerrainHeight(parentLoc);
-                float parentCenterAltitude = parentZone.getHeightMap().getInterpolatedTerrainHeight(ZoneManager.worldToZoneSpace(currentZone.getLoc(), parentZone));
-
-                parentCenterAltitude += currentZone.getYCoord();
-                parentCenterAltitude += interaltitude;
-
-                float firstScale = parentAltitude * scaleParent;
-                float secondScale = parentCenterAltitude * scaleChild;
-                float outsetALt = firstScale + secondScale;
-
-                outsetALt += currentZone.getParent().getWorldAltitude();
-                realWorldAltitude = outsetALt;
-
-            } else if (offsetZ > outsideGridSizeZ) {
-
-                weight = (offsetZ - outsideGridSizeZ) / bucketScaleZ;
-                scale = Math.atan2((.5 - weight) * 3.1415927, 1);
-
-                float scaleChild = (float) ((scale + 1) * .5);
-                float scaleParent = 1 - scaleChild;
-                float parentAltitude = parentZone.getHeightMap().getInterpolatedTerrainHeight(parentLoc);
-                float parentCenterAltitude = parentZone.getHeightMap().getInterpolatedTerrainHeight(ZoneManager.worldToZoneSpace(currentZone.getLoc(), parentZone));
-
-                parentCenterAltitude += currentZone.getYCoord();
-                parentCenterAltitude += interaltitude;
-                float firstScale = parentAltitude * scaleParent;
-                float secondScale = parentCenterAltitude * scaleChild;
-                float outsetALt = firstScale + secondScale;
-
-                outsetALt += currentZone.getParent().getWorldAltitude();
-                realWorldAltitude = outsetALt;
-            }
-        }
-
-        return realWorldAltitude;
-    }
-
-    public static float getOutsetHeight(float interpolatedAltitude, Zone zone, Vector3fImmutable worldLocation) {
-
-        Vector2f parentLoc;
-        float outsetALt = 0;
-
-        if (zone.getParent() == null || zone.getParent().getHeightMap() == null)
-            return interpolatedAltitude + zone.getWorldAltitude();
-
-        if (zone.getParent() != null && zone.getParent().getHeightMap() != null) {
-
-            parentLoc = ZoneManager.worldToZoneSpace(worldLocation, zone.getParent());
-
-            Vector3fImmutable localLocFromCenter = ZoneManager.worldToLocal(worldLocation, zone);
-
-            float parentXRadius = zone.getBounds().getHalfExtents().x;
-            float parentZRadius = zone.getBounds().getHalfExtents().y;
-
-            float bucketScaleX = zone.getHeightMap().outsetX / parentXRadius;
-            float bucketScaleZ = zone.getHeightMap().outsetZ / parentZRadius;
-
-            float outsideGridSizeX = 1 - bucketScaleX; //32/256
-            float outsideGridSizeZ = 1 - bucketScaleZ;
-
-            float weight;
-            double scale;
-
-            float offsetX = Math.abs((localLocFromCenter.x / parentXRadius));
-            float offsetZ = Math.abs((localLocFromCenter.z / parentZRadius));
-
-            if (offsetX > outsideGridSizeX && offsetX > offsetZ) {
-                weight = (offsetX - outsideGridSizeX) / bucketScaleX;
-                scale = Math.atan2((.5 - weight) * 3.1415927, 1);
-
-                float scaleChild = (float) ((scale + 1) * .5);
-                float scaleParent = 1 - scaleChild;
-
-                float parentAltitude = zone.getParent().getHeightMap().getInterpolatedTerrainHeight(parentLoc);
-                float parentCenterAltitude = zone.getParent().getHeightMap().getInterpolatedTerrainHeight(ZoneManager.worldToZoneSpace(zone.getLoc(), zone.getParent()));
-
-                parentCenterAltitude += zone.getYCoord();
-                parentCenterAltitude += interpolatedAltitude;
-
-                float firstScale = parentAltitude * scaleParent;
-                float secondScale = parentCenterAltitude * scaleChild;
-                outsetALt = firstScale + secondScale;
-
-                outsetALt += zone.getParent().getAbsY();
-
-            } else if (offsetZ > outsideGridSizeZ) {
-
-                weight = (offsetZ - outsideGridSizeZ) / bucketScaleZ;
-                scale = Math.atan2((.5 - weight) * 3.1415927, 1);
-
-                float scaleChild = (float) ((scale + 1) * .5);
-                float scaleParent = 1 - scaleChild;
-                float parentAltitude = zone.getParent().getHeightMap().getInterpolatedTerrainHeight(parentLoc);
-                float parentCenterAltitude = zone.getHeightMap().getInterpolatedTerrainHeight(ZoneManager.worldToZoneSpace(zone.getLoc(), zone));
-
-                parentCenterAltitude += zone.getYCoord();
-                parentCenterAltitude += interpolatedAltitude;
-
-                float firstScale = parentAltitude * scaleParent;
-                float secondScale = parentCenterAltitude * scaleChild;
-                outsetALt = firstScale + secondScale;
-
-                outsetALt += zone.getParent().getAbsY();
-            }
-
-        }
-
-        return outsetALt;
-    }
-
-    public static Vector2f getGridOffset(Vector2f gridSquare) {
-
-        int floorX = (int) gridSquare.x;
-        int floorY = (int) gridSquare.y;
-
-        return new Vector2f(gridSquare.x - floorX, gridSquare.y - floorY);
-
-    }
-
-    public static void loadAlHeightMaps() {
-
-        // Load the heightmaps into staging hashmap keyed by HashMapID
-
-        DbManager.HeightMapQueries.LOAD_ALL_HEIGHTMAPS();
-
-        //generate static player city heightmap.
-
-        HeightMap.GeneratePlayerCityHeightMap();
-
-
-        // Clear all heightmap image data as it's no longer needed.
-
-        for (HeightMap heightMap : HeightMap.heightmapByLoadNum.values()) {
-            heightMap.heightmapImage = null;
-        }
-
-        Logger.info(HeightMap.heightmapByLoadNum.size() + " Heightmaps cached.");
-    }
-
-    public static boolean isLocUnderwater(Vector3fImmutable currentLoc) {
-
-        float localAltitude = HeightMap.getWorldHeight(currentLoc);
-        Zone zone = ZoneManager.findSmallestZone(currentLoc);
-
-        if (localAltitude < zone.getSeaLevel())
-            return true;
-
-        return false;
-    }
-
-    public Vector2f getGridSquare(Vector2f zoneLoc) {
-
-        if (zoneLoc.x < 0)
-            zoneLoc.setX(0);
-
-        if (zoneLoc.x > this.fullExtentsX - 1)
-            zoneLoc.setX((this.fullExtentsX - 1) + .9999999f);
-
-        if (zoneLoc.y < 0)
-            zoneLoc.setY(0);
-
-        if (zoneLoc.y > this.fullExtentsY - 1)
-            zoneLoc.setY((this.fullExtentsY - 1) + .9999999f);
-
-        float xBucket = (zoneLoc.x / this.bucketWidthX);
-        float yBucket = (zoneLoc.y / this.bucketWidthY);
-
-        return new Vector2f(xBucket, yBucket);
-    }
-
-    public float getInterpolatedTerrainHeight(Vector2f zoneLoc) {
-
-        Vector2f gridSquare;
-
-        if (zoneLoc.x < 0 || zoneLoc.x > this.fullExtentsX)
-            return -1;
-
-        if (zoneLoc.y < 0 || zoneLoc.y > this.fullExtentsY)
-            return -1;
-
-        int maxX = (int) (this.fullExtentsX / this.bucketWidthX);
-        int maxY = (int) (this.fullExtentsY / this.bucketWidthY);
-
-        //flip the Y so it grabs from the bottom left instead of top left.
-        //zoneLoc.setY(maxZoneHeight - zoneLoc.y);
-
-        gridSquare = getGridSquare(zoneLoc);
-
-        int gridX = (int) gridSquare.x;
-        int gridY = (int) (gridSquare.y);
-
-        if (gridX > maxX)
-            gridX = maxX;
-        if (gridY > maxY)
-            gridY = maxY;
-
-        float offsetX = (gridSquare.x - gridX);
-        float offsetY = gridSquare.y - gridY;
-
-        //get height of the 4 vertices.
-
-        float topLeftHeight = 0;
-        float topRightHeight = 0;
-        float bottomLeftHeight = 0;
-        float bottomRightHeight = 0;
-
-        int nextY = gridY + 1;
-        int nextX = gridX + 1;
-
-        if (nextY > maxY)
-            nextY = gridY;
-
-        if (nextX > maxX)
-            nextX = gridX;
-
-        topLeftHeight = pixelColorValues[gridX][gridY];
-        topRightHeight = pixelColorValues[nextX][gridY];
-        bottomLeftHeight = pixelColorValues[gridX][nextY];
-        bottomRightHeight = pixelColorValues[nextX][nextY];
-
-        float interpolatedHeight;
-
-        interpolatedHeight = topRightHeight * (1 - offsetY) * (offsetX);
-        interpolatedHeight += (bottomRightHeight * offsetY * offsetX);
-        interpolatedHeight += (bottomLeftHeight * (1 - offsetX) * offsetY);
-        interpolatedHeight += (topLeftHeight * (1 - offsetX) * (1 - offsetY));
-
-        interpolatedHeight *= (float) this.maxHeight / 256;  // Scale height
-
-        return interpolatedHeight;
-    }
-
-    public float getInterpolatedTerrainHeight(Vector3fImmutable zoneLoc3f) {
-
-        Vector2f zoneLoc = new Vector2f(zoneLoc3f.x, zoneLoc3f.z);
-
-        Vector2f gridSquare;
-
-        if (zoneLoc.x < 0 || zoneLoc.x > this.fullExtentsX)
-            return -1;
-
-        if (zoneLoc.y < 0 || zoneLoc.y > this.fullExtentsY)
-            return -1;
-
-        //flip the Y so it grabs from the bottom left instead of top left.
-        //zoneLoc.setY(maxZoneHeight - zoneLoc.y);
-
-        gridSquare = getGridSquare(zoneLoc);
-
-        int gridX = (int) gridSquare.x;
-        int gridY = (int) (gridSquare.y);
-
-        float offsetX = (gridSquare.x - gridX);
-        float offsetY = gridSquare.y - gridY;
-
-        //get height of the 4 vertices.
-
-        float topLeftHeight = pixelColorValues[gridX][gridY];
-        float topRightHeight = pixelColorValues[gridX + 1][gridY];
-        float bottomLeftHeight = pixelColorValues[gridX][gridY + 1];
-        float bottomRightHeight = pixelColorValues[gridX + 1][gridY + 1];
-
-        float interpolatedHeight;
-
-        interpolatedHeight = topRightHeight * (1 - offsetY) * (offsetX);
-        interpolatedHeight += (bottomRightHeight * offsetY * offsetX);
-        interpolatedHeight += (bottomLeftHeight * (1 - offsetX) * offsetY);
-        interpolatedHeight += (topLeftHeight * (1 - offsetX) * (1 - offsetY));
-
-        interpolatedHeight *= (float) this.maxHeight / 256;  // Scale height
-
-        return interpolatedHeight;
-    }
-
-    private void generatePixelData() {
-
-        Color color;
-
-        // Generate altitude lookup table for this heightmap
-
-        this.pixelColorValues = new int[this.heightmapImage.getWidth()][this.heightmapImage.getHeight()];
-
-        for (int y = 0; y < this.heightmapImage.getHeight(); y++) {
-            for (int x = 0; x < this.heightmapImage.getWidth(); x++) {
-
-                color = new Color(this.heightmapImage.getRGB(x, y));
-                pixelColorValues[x][y] = color.getRed();
-            }
-        }
-
-    }
-
-    public float getScaledHeightForColor(float color) {
-
-        return (color / 256) * this.maxHeight;
-    }
-
-    public float getBucketWidthX() {
-        return bucketWidthX;
-    }
-
-    public float getBucketWidthY() {
-        return bucketWidthY;
-    }
-
-    public int getHeightMapID() {
-        return heightMapID;
-    }
-
-    public BufferedImage getHeightmapImage() {
-        return heightmapImage;
-    }
-
-    public float getSeaLevel() {
-        return seaLevel;
-    }
-
-}
@@ -140,7 +140,7 @@ public enum InterestManager implements Runnable {

            else {
                if (pc != null)
-                    if (pcc.getSeeInvis() < pc.getHidden())
+                    if (pcc.getSeeInvis() < pc.hidden)
                        continue;

                if (!cc.sendMsg(uom)) {
@@ -340,7 +340,7 @@ public enum InterestManager implements Runnable {
                    if (loadedPlayer.getObjectUUID() == player.getObjectUUID())
                        continue;

-                    if (player.getSeeInvis() < loadedPlayer.getHidden())
+                    if (player.getSeeInvis() < loadedPlayer.hidden)
                        continue;

                    if (loadedPlayer.safemodeInvis())
@@ -372,7 +372,7 @@ public enum InterestManager implements Runnable {

            if (playerLoadedObject.getObjectType().equals(GameObjectType.PlayerCharacter)) {
                PlayerCharacter loadedPlayer = (PlayerCharacter) playerLoadedObject;
-                if (player.getSeeInvis() < loadedPlayer.getHidden())
+                if (player.getSeeInvis() < loadedPlayer.hidden)
                    toRemove.add(playerLoadedObject);
                else if (loadedPlayer.safemodeInvis())
                    toRemove.add(playerLoadedObject);
@@ -437,7 +437,7 @@ public enum InterestManager implements Runnable {

                    // dont load if invis

-                    if (player.getSeeInvis() < awopc.getHidden())
+                    if (player.getSeeInvis() < awopc.hidden)
                        continue;

                    lcm = new LoadCharacterMsg(awopc, PlayerCharacter.hideNonAscii());
@@ -467,7 +467,7 @@ public enum InterestManager implements Runnable {
                    if (awonpc.despawned == true)
                        continue;

-                    awonpc.playerAgroMap.put(player.getObjectUUID(), false);
+                    awonpc.playerAgroMap.put(player.getObjectUUID(), 0f);
                    ((Mob) awonpc).setCombatTarget(null);
                    lcm = new LoadCharacterMsg(awonpc, PlayerCharacter.hideNonAscii());

@@ -480,7 +480,7 @@ public enum InterestManager implements Runnable {
                    if (!awonpc.isAlive())
                        continue;

-                    awonpc.playerAgroMap.put(player.getObjectUUID(), false);
+                    awonpc.playerAgroMap.put(player.getObjectUUID(), 0f);

                    if ((awonpc.agentType.equals(Enum.AIAgentType.MOBILE)))
                        ((Mob) awonpc).setCombatTarget(null);
@@ -0,0 +1,230 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2022
+//                www.magicbane.com
+
+package engine.InterestManagement;
+
+import engine.gameManager.ZoneManager;
+import engine.math.Vector2f;
+import engine.math.Vector3fImmutable;
+import engine.objects.Zone;
+import org.pmw.tinylog.Logger;
+
+import java.util.HashMap;
+
+import static java.lang.Math.PI;
+
+public class Terrain {
+    public static final HashMap<Integer, short[][]> _heightmap_pixel_cache = new HashMap<>();
+    public short[][] terrain_pixel_data;
+    public Vector2f terrain_size = new Vector2f();
+    public Vector2f cell_size = new Vector2f();
+    public Vector2f cell_count = new Vector2f();
+    public float terrain_scale;
+    public Vector2f blend_values = new Vector2f();
+    public Vector2f blend_ratio = new Vector2f();
+    public int heightmap;
+    Zone zone;
+
+    public Terrain(Zone zone) {
+
+        this.zone = zone;
+        this.heightmap = this.zone.template.terrain_image;
+
+        // Configure PLANAR zones to use the same 16x16 pixel image
+        // that all similar terrains share.  (See JSON)
+
+        if (this.zone.template.terrain_type.equals("PLANAR"))
+            this.heightmap = 1006300;  // all 0
+
+        // Load pixel data for this terrain from cache
+
+        this.terrain_pixel_data = Terrain._heightmap_pixel_cache.get(heightmap);
+
+        if (terrain_pixel_data == null)
+            Logger.error("Pixel map empty for zone: " + this.zone.getObjectUUID() + ":" + this.zone.zoneName);
+
+        // Configure terrain based on zone properties
+
+        this.terrain_size.x = this.zone.major_radius * 2;
+        this.terrain_size.y = this.zone.minor_radius * 2;
+
+        this.cell_count.x = this.terrain_pixel_data.length - 1;
+        this.cell_count.y = this.terrain_pixel_data[0].length - 1;
+
+        this.cell_size.x = terrain_size.x / this.cell_count.x;
+        this.cell_size.y = terrain_size.y / this.cell_count.y;
+
+        // Blending configuration. These ratios are used to calculate
+        // the blending area between child and parent terrains when
+        // they are stitched together.
+
+        this.blend_values.x = this.zone.template.max_blend;
+        this.blend_values.y = this.zone.template.min_blend;
+
+        Vector2f major_blend = new Vector2f(this.blend_values.x / this.zone.major_radius,
+                this.blend_values.y / this.zone.major_radius);
+
+        Vector2f minor_blend = new Vector2f(this.blend_values.x / this.zone.minor_radius,
+                this.blend_values.y / this.zone.minor_radius);
+
+        if (major_blend.y > 0.4f)
+            blend_ratio.x = major_blend.y;
+        else
+            blend_ratio.x = Math.min(major_blend.x, 0.4f);
+
+        if (minor_blend.y > 0.4f)
+            blend_ratio.y = minor_blend.y;
+        else
+            blend_ratio.y = Math.min(minor_blend.x, 0.4f);
+
+        // Scale coefficient for this terrain
+
+        this.terrain_scale = this.zone.template.terrain_max_y / 255f;
+    }
+
+    public static Zone getNextZoneWithTerrain(Zone zone) {
+
+        // Not all zones have a terrain.  Some are for display only
+        // and heights returned are from the parent heightmap.  This
+        // is controlled in the JSON via the has_terrain_gen field.
+
+        Zone terrain_zone = zone;
+
+        if (zone == null)
+            return ZoneManager.seaFloor;
+
+        if (zone.terrain != null)
+            return zone;
+
+        if (zone.equals(ZoneManager.seaFloor))
+            return zone;
+
+        while (terrain_zone.terrain == null)
+            terrain_zone = terrain_zone.parent;
+
+        return terrain_zone;
+    }
+
+    public static float getWorldHeight(Zone zone, Vector3fImmutable world_loc) {
+
+        // Retrieve the next zone with a terrain defined.
+
+        Zone terrainZone = getNextZoneWithTerrain(zone);
+        Zone parentZone = getNextZoneWithTerrain(zone.parent);
+
+        // Transform world loc into zone space coordinate system
+
+        Vector2f terrainLoc = ZoneManager.worldToTerrainSpace(world_loc, terrainZone);
+        Vector2f parentLoc = ZoneManager.worldToTerrainSpace(world_loc, parentZone);
+
+        // Offset from origin needed for blending function
+
+        Vector2f terrainOffset = ZoneManager.worldToZoneOffset(world_loc, terrainZone);
+
+        // Interpolate height for this position in both terrains
+
+        float interpolatedChildHeight = terrainZone.terrain.getInterpolatedTerrainHeight(terrainLoc);
+        interpolatedChildHeight += terrainZone.global_height;
+
+        float interpolatedParentTerrainHeight = parentZone.terrain.getInterpolatedTerrainHeight(parentLoc);
+        interpolatedParentTerrainHeight += parentZone.global_height;
+
+        // Blend between terrains
+
+        float blendCoefficient = terrainZone.terrain.getTerrainBlendCoefficient(terrainOffset);
+
+        float terrainHeight = interpolatedChildHeight * blendCoefficient;
+        terrainHeight += interpolatedParentTerrainHeight * (1 - blendCoefficient);
+
+        return terrainHeight;
+
+    }
+
+    public static float getWorldHeight(Vector3fImmutable world_loc) {
+
+        Zone currentZone = ZoneManager.findSmallestZone(world_loc);
+
+        return getWorldHeight(currentZone, world_loc);
+
+    }
+
+    public Vector2f getTerrainCell(Vector2f terrain_loc) {
+
+        // Calculate terrain cell with offset
+
+        Vector2f terrain_cell = new Vector2f(terrain_loc.x / this.cell_size.x, terrain_loc.y / this.cell_size.y);
+
+        // Clamp values when standing directly on pole
+
+        terrain_cell.x = Math.max(0, Math.min(this.cell_count.x - 1, terrain_cell.x));
+        terrain_cell.y = Math.max(0, Math.min(this.cell_count.y - 1, terrain_cell.y));
+
+        return terrain_cell;
+    }
+
+    public float getInterpolatedTerrainHeight(Vector2f terrain_loc) {
+
+        float interpolatedHeight;
+
+        // Early exit for guild zones
+
+        if (this.zone.guild_zone)
+            return 5.0f;
+
+        // Determine terrain and offset from top left vertex
+
+        Vector2f terrain_cell = getTerrainCell(terrain_loc);
+
+        int pixel_x = (int) Math.floor(terrain_cell.x);
+        int pixel_y = (int) Math.floor(terrain_cell.y);
+
+        Vector2f pixel_offset = new Vector2f(terrain_cell.x % 1, terrain_cell.y % 1);
+
+        // 4 surrounding vertices from the pixel array.
+
+        short top_left_pixel = terrain_pixel_data[pixel_x][pixel_y];
+        short top_right_pixel = terrain_pixel_data[pixel_x + 1][pixel_y];
+        short bottom_left_pixel = terrain_pixel_data[pixel_x][pixel_y + 1];
+        short bottom_right_pixel = terrain_pixel_data[pixel_x + 1][pixel_y + 1];
+
+        // Interpolate between the 4 vertices
+
+        interpolatedHeight = top_left_pixel * (1 - pixel_offset.x) * (1 - pixel_offset.y);
+        interpolatedHeight += top_right_pixel * (1 - pixel_offset.y) * (pixel_offset.x);
+        interpolatedHeight += (bottom_left_pixel * (1 - pixel_offset.x) * pixel_offset.y);
+        interpolatedHeight += (bottom_right_pixel * pixel_offset.y * pixel_offset.x);
+
+        interpolatedHeight *= this.terrain_scale; // Scale height
+
+        return interpolatedHeight;
+
+    }
+
+    public float getTerrainBlendCoefficient(Vector2f zone_offset) {
+
+        // Normalize terrain offset
+
+        Vector2f normalizedOffset = new Vector2f(Math.abs(zone_offset.x) / this.zone.template.major_radius,
+                Math.abs(zone_offset.y) / this.zone.template.minor_radius);
+
+        float blendCoefficient;
+
+        if (normalizedOffset.x <= 1 - blend_ratio.x || normalizedOffset.x <= normalizedOffset.y) {
+
+            if (normalizedOffset.y < 1 - blend_ratio.y)
+                return 1;
+
+            blendCoefficient = (normalizedOffset.y - (1 - blend_ratio.y)) / blend_ratio.y;
+        } else
+            blendCoefficient = (normalizedOffset.x - (1 - blend_ratio.x)) / blend_ratio.x;
+
+        blendCoefficient = (float) Math.atan((0.5f - blendCoefficient) * PI);
+
+        return (blendCoefficient + 1) * 0.5f;
+    }
+}
@@ -67,7 +67,7 @@ public class CityRecord extends DataRecord {
        cityRecord.locX = cityRecord.city.getTOL().getLoc().x;
        cityRecord.locY = -cityRecord.city.getTOL().getLoc().z; // flip sign on 'y' coordinate

-        cityRecord.zoneHash = cityRecord.city.getParent().getHash();
+        cityRecord.zoneHash = cityRecord.city.getParent().hash;

        if (cityRecord.eventType.equals(Enum.RecordEventType.CREATE))
            cityRecord.establishedDatetime = cityRecord.city.established;
@@ -89,7 +89,7 @@ public class GuildRecord extends DataRecord {
        guildRecord.guildHash = guildRecord.guild.getHash();
        guildRecord.guildID = guildRecord.guild.getObjectUUID();
        guildRecord.guildName = guildRecord.guild.getName();
-        guildRecord.charterName = Enum.GuildType.getGuildTypeFromInt(guildRecord.guild.getCharter()).getCharterName();
+        guildRecord.charterName = Enum.GuildCharterType.getGuildTypeFromInt(guildRecord.guild.getCharter()).getCharterName();

        guildRecord.GLHash = DataWarehouse.hasher.encrypt(guildRecord.guild.getGuildLeaderUUID());

@@ -52,7 +52,7 @@ public class MineRecord extends DataRecord {
            mineRecord.eventType = eventType;
        }

-        mineRecord.zoneHash = mine.getParentZone().getHash();
+        mineRecord.zoneHash = mine.getParentZone().hash;

        if (character.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) {
            player = (PlayerCharacter) character;
@@ -281,7 +281,7 @@ public class PvpRecord extends DataRecord {
        outStatement.setInt(8, this.victim.getLevel());

        outStatement.setString(9, DataWarehouse.hasher.encrypt(zone.getObjectUUID()));
-        outStatement.setString(10, zone.getName());
+        outStatement.setString(10, zone.zoneName);
        outStatement.setFloat(11, this.location.getX());
        outStatement.setFloat(12, -this.location.getZ()); // flip sign on 'y' coordinate
        outStatement.setBoolean(13, this.pvpExp);
@@ -13,6 +13,7 @@ import engine.Enum;
 import engine.Enum.DbObjectType;
 import engine.Enum.ProtectionState;
 import engine.Enum.TaxType;
+import engine.gameManager.BuildingManager;
 import engine.gameManager.DbManager;
 import engine.math.Vector3fImmutable;
 import engine.objects.*;
@@ -27,6 +28,7 @@ import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.concurrent.ConcurrentHashMap;

 public class dbBuildingHandler extends dbHandlerBase {

@@ -88,14 +90,12 @@ public class dbBuildingHandler extends dbHandlerBase {
        return removeFromBuildings(b);
    }

-    public ArrayList<Building> GET_ALL_BUILDINGS_FOR_ZONE(Zone zone) {
+    public ArrayList<Building> GET_ALL_BUILDINGS() {

        ArrayList<Building> buildings = new ArrayList<>();

        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_building`.*, `object`.`parent` FROM `object` INNER JOIN `obj_building` ON `obj_building`.`UID` = `object`.`UID` WHERE `object`.`parent` = ?;")) {
-
-            preparedStatement.setLong(1, zone.getObjectUUID());
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_building`.*, `object`.`parent` FROM `object` INNER JOIN `obj_building` ON `obj_building`.`UID` = `object`.`UID` ORDER BY  `object`.`UID` ASC;")) {

            ResultSet rs = preparedStatement.executeQuery();
            buildings = getObjectsFromRs(rs, 1000);
@@ -425,26 +425,28 @@ public class dbBuildingHandler extends dbHandlerBase {
        return false;
    }

-    public void LOAD_ALL_FRIENDS_FOR_BUILDING(Building building) {
-
-        if (building == null)
-            return;
+    public void LOAD_BUILDING_FRIENDS() {

        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `dyn_building_friends` WHERE `buildingUID` = ?")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `dyn_building_friends`")) {

-            preparedStatement.setInt(1, building.getObjectUUID());
            ResultSet rs = preparedStatement.executeQuery();

            while (rs.next()) {
                BuildingFriends friend = new BuildingFriends(rs);
-                switch (friend.getFriendType()) {
+
+                // Create map if it does not yet exist
+
+                if (!BuildingManager._buildingFriends.containsKey(friend.buildingUID))
+                    BuildingManager._buildingFriends.put(friend.buildingUID, new ConcurrentHashMap<>());
+
+                switch (friend.friendType) {
                    case 7:
-                        building.getFriends().put(friend.getPlayerUID(), friend);
+                        BuildingManager._buildingFriends.get(friend.buildingUID).put(friend.playerUID, friend);
                        break;
                    case 8:
                    case 9:
-                        building.getFriends().put(friend.getGuildUID(), friend);
+                        BuildingManager._buildingFriends.get(friend.buildingUID).put(friend.guildUID, friend);
                        break;
                }
            }
@@ -455,26 +457,29 @@ public class dbBuildingHandler extends dbHandlerBase {

    }

-    public void LOAD_ALL_CONDEMNED_FOR_BUILDING(Building building) {
-
-        if (building == null)
-            return;
+    public void LOAD_BUILDING_CONDEMNED() {

        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `dyn_building_condemned` WHERE `buildingUID` = ?")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `dyn_building_condemned`")) {

-            preparedStatement.setInt(1, building.getObjectUUID());
            ResultSet rs = preparedStatement.executeQuery();

            while (rs.next()) {
+
                Condemned condemned = new Condemned(rs);
-                switch (condemned.getFriendType()) {
+
+                // Create map if it does not yet exist
+
+                if (!BuildingManager._buildingCondemned.containsKey(condemned.buildingUUID))
+                    BuildingManager._buildingCondemned.put(condemned.buildingUUID, new ConcurrentHashMap<>());
+
+                switch (condemned.friendType) {
                    case 2:
-                        building.getCondemned().put(condemned.getPlayerUID(), condemned);
+                        BuildingManager._buildingCondemned.get(condemned.buildingUUID).put(condemned.playerUID, condemned);
                        break;
                    case 4:
                    case 5:
-                        building.getCondemned().put(condemned.getGuildUID(), condemned);
+                        BuildingManager._buildingCondemned.get(condemned.buildingUUID).put(condemned.guildUID, condemned);
                        break;
                }
            }
@@ -484,35 +489,27 @@ public class dbBuildingHandler extends dbHandlerBase {
        }
    }

-    public ArrayList<Vector3fImmutable> LOAD_PATROL_POINTS(Building building) {
-
-        if (building == null)
-            return null;
-
-        ArrayList<Vector3fImmutable> patrolPoints = new ArrayList<>();
+    public void LOAD_BARRACKS_PATROL_POINTS() {

        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `dyn_building_patrol_points` WHERE `buildingUID` = ?")) {
-
-            preparedStatement.setInt(1, building.getObjectUUID());
-
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `dyn_building_patrol_points`")) {

            ResultSet rs = preparedStatement.executeQuery();

            while (rs.next()) {
-                float x1 = rs.getFloat("patrolX");
-                float y1 = rs.getFloat("patrolY");
-                float z1 = rs.getFloat("patrolZ");
-                Vector3fImmutable patrolPoint = new Vector3fImmutable(x1, y1, z1);
-                patrolPoints.add(patrolPoint);
+
+                int buildingUUID = rs.getInt("buildingUID");
+
+                if (!BuildingManager._buildingPatrolPoints.containsKey(buildingUUID))
+                    BuildingManager._buildingPatrolPoints.put(buildingUUID, new ArrayList<>());
+
+                Vector3fImmutable patrolPoint = new Vector3fImmutable(rs.getFloat("patrolX"), rs.getFloat("patrolY"), rs.getFloat("patrolZ"));
+                BuildingManager._buildingPatrolPoints.get(buildingUUID).add(patrolPoint);
            }

        } catch (SQLException e) {
            Logger.error(e);
        }
-
-        return patrolPoints;
-
    }

    public boolean ADD_TO_CONDEMNLIST(final long parentUID, final long playerUID, final long guildID, final int friendType) {
@@ -722,10 +719,10 @@ public class dbBuildingHandler extends dbHandlerBase {
                     + "WHERE`buildingUID` = ? AND `playerUID` = ? AND `guildUID` = ? AND `friendType` = ?")) {

            preparedStatement.setBoolean(1, active);
-            preparedStatement.setInt(2, condemn.getParent());
-            preparedStatement.setInt(3, condemn.getPlayerUID());
-            preparedStatement.setInt(4, condemn.getGuildUID());
-            preparedStatement.setInt(5, condemn.getFriendType());
+            preparedStatement.setInt(2, condemn.buildingUUID);
+            preparedStatement.setInt(3, condemn.playerUID);
+            preparedStatement.setInt(4, condemn.guildUID);
+            preparedStatement.setInt(5, condemn.friendType);

            return (preparedStatement.executeUpdate() > 0);

@@ -34,16 +34,19 @@ public class dbCityHandler extends dbHandlerBase {
            case "zone":
                Zone zone = new Zone(rs);
                DbManager.addToCache(zone);
+                zone.runAfterLoad();
                list.add(zone);
                break;
            case "building":
                Building building = new Building(rs);
                DbManager.addToCache(building);
+                building.runAfterLoad();
                list.add(building);
                break;
            case "city":
                City city = new City(rs);
                DbManager.addToCache(city);
+                city.runAfterLoad();
                list.add(city);
                break;
        }
@@ -96,14 +99,12 @@ public class dbCityHandler extends dbHandlerBase {
        return objectList;
    }

-    public ArrayList<City> GET_CITIES_BY_ZONE(final int objectUUID) {
+    public ArrayList<City> GET_ALL_CITIES() {

        ArrayList<City> cityList = new ArrayList<>();

        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_city`.*, `object`.`parent` FROM `obj_city` INNER JOIN `object` ON `object`.`UID` = `obj_city`.`UID` WHERE `object`.`parent`=?;")) {
-
-            preparedStatement.setLong(1, objectUUID);
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_city`.*, `object`.`parent` FROM `obj_city` INNER JOIN `object` ON `object`.`UID` = `obj_city`.`UID` ORDER BY `object`.`UID` ASC;")) {

            ResultSet rs = preparedStatement.executeQuery();
            cityList = getObjectsFromRs(rs, 100);
@@ -695,24 +695,4 @@ public class dbGuildHandler extends dbHandlerBase {
        }
    }

-    //TODO uncomment this when finished with guild history warehouse integration
-//	public HashMap<Integer, GuildRecord> GET_WAREHOUSE_GUILD_HISTORY(){
-//		
-//		HashMap<Integer, GuildRecord> tempMap = new HashMap<>();
-//		prepareCallable("SELECT * FROM `warehouse_guildhistory` WHERE `eventType` = 'CREATE'");
-//		try {
-//			ResultSet rs = executeQuery();
-//			
-//			while (rs.next()) {
-//				GuildRecord guildRecord = new GuildRecord(rs);
-//				tempMap.put(guildRecord.guildID, guildRecord);
-//			}
-//		}catch (Exception e){
-//			Logger.error(e);
-//		}
-//		return tempMap;
-//		
-//	}
-
-
 }
@@ -1,43 +0,0 @@
-package engine.db.handlers;
-
-import engine.InterestManagement.HeightMap;
-import engine.gameManager.DbManager;
-import org.pmw.tinylog.Logger;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-public class dbHeightMapHandler extends dbHandlerBase {
-
-    public dbHeightMapHandler() {
-
-
-    }
-
-    public void LOAD_ALL_HEIGHTMAPS() {
-
-        HeightMap thisHeightmap;
-        HeightMap.heightMapsCreated = 0;
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_zone_heightmap INNER JOIN static_zone_size ON static_zone_size.loadNum = static_zone_heightmap.zoneLoadID")) {
-
-            ResultSet rs = preparedStatement.executeQuery();
-
-            while (rs.next()) {
-                thisHeightmap = new HeightMap(rs);
-
-                if (thisHeightmap.getHeightmapImage() == null) {
-                    Logger.info("Imagemap for " + thisHeightmap.getHeightMapID() + " was null");
-                    continue;
-                }
-            }
-
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-    }
-
-}
@@ -86,6 +86,7 @@ public class dbItemBaseHandler extends dbHandlerBase {
            while (rs.next()) {
                recordsRead++;
                itemBase = new ItemBase(rs);
+
                ItemBase.addToCache(itemBase);
            }

@@ -11,7 +11,6 @@ package engine.db.handlers;

 import engine.gameManager.DbManager;
 import engine.objects.Mob;
-import engine.objects.Zone;
 import org.joda.time.DateTime;
 import org.pmw.tinylog.Logger;

@@ -28,31 +27,27 @@ public class dbMobHandler extends dbHandlerBase {
        this.localObjectType = engine.Enum.GameObjectType.valueOf(this.localClass.getSimpleName());
    }

-    public Mob ADD_MOB(Mob toAdd) {
+    public Mob PERSIST(Mob toAdd) {

        Mob mobile = null;

        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("CALL `mob_CREATE`(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);")) {
-
-            preparedStatement.setLong(1, toAdd.getParentZoneID());
-            preparedStatement.setInt(2, toAdd.getMobBaseID());
-            preparedStatement.setInt(3, toAdd.getGuildUUID());
-            preparedStatement.setFloat(4, toAdd.getSpawnX());
-            preparedStatement.setFloat(5, toAdd.getSpawnY());
-            preparedStatement.setFloat(6, toAdd.getSpawnZ());
+             PreparedStatement preparedStatement = connection.prepareStatement("CALL `mob_CREATE`(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);")) {
+
+            preparedStatement.setLong(1, toAdd.parentZoneUUID);
+            preparedStatement.setInt(2, toAdd.loadID);
+            preparedStatement.setInt(3, toAdd.guildUUID);
+            preparedStatement.setFloat(4, toAdd.bindLoc.x);
+            preparedStatement.setFloat(5, toAdd.bindLoc.y);
+            preparedStatement.setFloat(6, toAdd.bindLoc.z);
            preparedStatement.setInt(7, 0);
-            preparedStatement.setFloat(8, toAdd.getSpawnRadius());
-            preparedStatement.setInt(9, toAdd.getTrueSpawnTime());
-
-            if (toAdd.getContract() != null)
-                preparedStatement.setInt(10, toAdd.getContract().getContractID());
-            else
-                preparedStatement.setInt(10, 0);
-
-            preparedStatement.setInt(11, toAdd.getBuildingID());
-            preparedStatement.setInt(12, toAdd.getLevel());
-            preparedStatement.setString(13, toAdd.getFirstName());
+            preparedStatement.setFloat(8, toAdd.spawnRadius);
+            preparedStatement.setInt(9, toAdd.spawnDelay);
+            preparedStatement.setInt(10, toAdd.contractUUID);
+            preparedStatement.setInt(11, toAdd.buildingUUID);
+            preparedStatement.setInt(12, toAdd.level);
+            preparedStatement.setString(13, toAdd.firstName);
+            preparedStatement.setString(14, toAdd.behaviourType.toString());

            ResultSet rs = preparedStatement.executeQuery();

@@ -69,6 +64,23 @@ public class dbMobHandler extends dbHandlerBase {
        return mobile;
    }

+    public ArrayList<Mob> GET_ALL_MOBS() {
+
+        ArrayList<Mob> mobileList = new ArrayList<>();
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_mob`.*, `object`.`parent` FROM `object` INNER JOIN `obj_mob` ON `obj_mob`.`UID` = `object`.`UID` ORDER BY `object`.`UID` ASC;")) {
+
+            ResultSet rs = preparedStatement.executeQuery();
+            mobileList = getObjectsFromRs(rs, 1000);
+
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
+
+        return mobileList;
+    }
+
    public boolean updateUpgradeTime(Mob mob, DateTime upgradeDateTime) {

        try (Connection connection = DbManager.getConnection();
@@ -106,17 +118,17 @@ public class dbMobHandler extends dbHandlerBase {
        return row_count;
    }

-    public void LOAD_PATROL_POINTS(Mob captain) {
+    public void LOAD_GUARD_MINIONS(Mob guardCaptain) {

        try (Connection connection = DbManager.getConnection();
             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `dyn_guards` WHERE `captainUID` = ?")) {

-            preparedStatement.setInt(1, captain.getObjectUUID());
+            preparedStatement.setInt(1, guardCaptain.getObjectUUID());
            ResultSet rs = preparedStatement.executeQuery();

            while (rs.next()) {
-                String name = rs.getString("name");
-                Mob toCreate = Mob.createGuardMob(captain, captain.getGuild(), captain.getParentZone(), captain.building.getLoc(), captain.getLevel(), name);
+                String minionName = rs.getString("minionName");
+                Mob toCreate = Mob.createGuardMinion(guardCaptain, guardCaptain.getLevel(), minionName);

                if (toCreate == null)
                    return;
@@ -131,15 +143,13 @@ public class dbMobHandler extends dbHandlerBase {
        }
    }

-    public boolean ADD_TO_GUARDS(final long captainUID, final int mobBaseID, final String name, final int slot) {
+    public boolean ADD_GUARD_MINION(final long captainUID, final String minionName) {

        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("INSERT INTO `dyn_guards` (`captainUID`, `mobBaseID`,`name`, `slot`) VALUES (?,?,?,?)")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("INSERT INTO `dyn_guards` (`captainUID`, `minionName`) VALUES (?,?)")) {

            preparedStatement.setLong(1, captainUID);
-            preparedStatement.setInt(2, mobBaseID);
-            preparedStatement.setString(3, name);
-            preparedStatement.setInt(4, slot);
+            preparedStatement.setString(2, minionName);

            return (preparedStatement.executeUpdate() > 0);

@@ -149,14 +159,13 @@ public class dbMobHandler extends dbHandlerBase {
        }
    }

-    public boolean REMOVE_FROM_GUARDS(final long captainUID, final int mobBaseID, final int slot) {
+    public boolean REMOVE_GUARD_MINION(final long captainUID, final String minionName) {

        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("DELETE FROM `dyn_guards` WHERE `captainUID`=? AND `mobBaseID`=? AND `slot` =?")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("DELETE FROM `dyn_guards` WHERE `captainUID`=? AND `minionName`=? LIMIT 1;")) {

            preparedStatement.setLong(1, captainUID);
-            preparedStatement.setInt(2, mobBaseID);
-            preparedStatement.setInt(3, slot);
+            preparedStatement.setString(2, minionName);

            return (preparedStatement.executeUpdate() > 0);

@@ -166,24 +175,19 @@ public class dbMobHandler extends dbHandlerBase {
        }
    }

-
-    public ArrayList<Mob> GET_ALL_MOBS_FOR_ZONE(Zone zone) {
-
-        ArrayList<Mob> mobileList = new ArrayList<>();
+    public boolean REMOVE_ALL_MINIONS(final long captainUID) {

        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_mob`.*, `object`.`parent` FROM `object` INNER JOIN `obj_mob` ON `obj_mob`.`UID` = `object`.`UID` WHERE `object`.`parent` = ?;")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("DELETE FROM `dyn_guards` WHERE `captainUID`=?;")) {

-            preparedStatement.setLong(1, zone.getObjectUUID());
+            preparedStatement.setLong(1, captainUID);

-            ResultSet rs = preparedStatement.executeQuery();
-            mobileList = getObjectsFromRs(rs, 1000);
+            return (preparedStatement.executeUpdate() > 0);

        } catch (SQLException e) {
            Logger.error(e);
+            return false;
        }
-
-        return mobileList;
    }

    public Mob GET_MOB(final int objectUUID) {
@@ -15,7 +15,6 @@ import engine.math.Vector3fImmutable;
 import engine.objects.NPC;
 import engine.objects.NPCProfits;
 import engine.objects.ProducedItem;
-import engine.objects.Zone;
 import org.joda.time.DateTime;
 import org.pmw.tinylog.Logger;

@@ -94,14 +93,12 @@ public class dbNPCHandler extends dbHandlerBase {
        return row_count;
    }

-    public ArrayList<NPC> GET_ALL_NPCS_FOR_ZONE(Zone zone) {
+    public ArrayList<NPC> GET_ALL_NPCS() {

        ArrayList<NPC> npcList = new ArrayList<>();

        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_npc`.*, `object`.`parent` FROM `object` INNER JOIN `obj_npc` ON `obj_npc`.`UID` = `object`.`UID` WHERE `object`.`parent` = ?;")) {
-
-            preparedStatement.setLong(1, zone.getObjectUUID());
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_npc`.*, `object`.`parent` FROM `object` INNER JOIN `obj_npc` ON `obj_npc`.`UID` = `object`.`UID` ORDER BY `object`.`UID` ASC;")) {

            ResultSet rs = preparedStatement.executeQuery();
            npcList = getObjectsFromRs(rs, 1000);
@@ -15,15 +15,9 @@ import engine.gameManager.PowersManager;
 import engine.objects.Mob;
 import engine.objects.PreparedStatementShared;
 import engine.powers.EffectsBase;
-import engine.powers.MobPowerEntry;
 import org.pmw.tinylog.Logger;

-import java.sql.Connection;
-import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;

 public class dbPowerHandler extends dbHandlerBase {
@@ -86,43 +80,4 @@ public class dbPowerHandler extends dbHandlerBase {
        }
    }

-    public static HashMap<Integer, ArrayList<MobPowerEntry>> LOAD_MOB_POWERS() {
-
-        HashMap<Integer, ArrayList<MobPowerEntry>> mobPowers = new HashMap<>();
-        MobPowerEntry mobPowerEntry;
-
-        int mobbaseID;
-        int recordsRead = 0;
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_npc_mobbase_powers ORDER BY `id` ASC;")) {
-
-            ResultSet rs = preparedStatement.executeQuery();
-
-            while (rs.next()) {
-
-                recordsRead++;
-
-                mobbaseID = rs.getInt("mobbaseUUID");
-                mobPowerEntry = new MobPowerEntry(rs);
-
-                if (mobPowers.get(mobbaseID) == null) {
-                    ArrayList<MobPowerEntry> powerList = new ArrayList<>();
-                    powerList.add(mobPowerEntry);
-                    mobPowers.put(mobbaseID, powerList);
-                } else {
-                    ArrayList<MobPowerEntry> powerList = mobPowers.get(mobbaseID);
-                    powerList.add(mobPowerEntry);
-                    mobPowers.put(mobbaseID, powerList);
-                }
-            }
-        } catch (SQLException e) {
-            Logger.error(e);
-            return mobPowers;
-        }
-
-        Logger.info("read: " + recordsRead + " cached: " + mobPowers.size());
-        return mobPowers;
-    }
-
 }
@@ -11,6 +11,8 @@ package engine.db.handlers;

 import engine.gameManager.DbManager;
 import engine.objects.RuneBase;
+import engine.powers.RunePowerEntry;
+import engine.powers.RuneSkillAdjustEntry;
 import org.pmw.tinylog.Logger;

 import java.sql.Connection;
@@ -27,6 +29,84 @@ public class dbRuneBaseHandler extends dbHandlerBase {
        this.localObjectType = engine.Enum.GameObjectType.valueOf(this.localClass.getSimpleName());
    }

+    public static HashMap<Integer, ArrayList<RunePowerEntry>> LOAD_RUNE_POWERS() {
+
+        HashMap<Integer, ArrayList<RunePowerEntry>> mobPowers = new HashMap<>();
+        RunePowerEntry runePowerEntry;
+
+        int rune_id;
+        int recordsRead = 0;
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_rune_powers")) {
+
+            ResultSet rs = preparedStatement.executeQuery();
+
+            while (rs.next()) {
+
+                recordsRead++;
+
+                rune_id = rs.getInt("rune_id");
+                runePowerEntry = new RunePowerEntry(rs);
+
+                if (mobPowers.get(rune_id) == null) {
+                    ArrayList<RunePowerEntry> runePowerList = new ArrayList<>();
+                    runePowerList.add(runePowerEntry);
+                    mobPowers.put(rune_id, runePowerList);
+                } else {
+                    ArrayList<RunePowerEntry> powerList = mobPowers.get(rune_id);
+                    powerList.add(runePowerEntry);
+                    mobPowers.put(rune_id, powerList);
+                }
+            }
+        } catch (SQLException e) {
+            Logger.error(e);
+            return mobPowers;
+        }
+
+        Logger.info("read: " + recordsRead + " cached: " + mobPowers.size());
+        return mobPowers;
+    }
+
+    public static HashMap<Integer, ArrayList<RuneSkillAdjustEntry>> LOAD_RUNE_SKILL_ADJUSTS() {
+
+        HashMap<Integer, ArrayList<RuneSkillAdjustEntry>> runeSkillAdjusts = new HashMap<>();
+        RuneSkillAdjustEntry runeSkillAdjustEntry;
+
+        int rune_id;
+        int recordsRead = 0;
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_rune_skill_adjusts")) {
+
+            ResultSet rs = preparedStatement.executeQuery();
+
+            while (rs.next()) {
+
+                recordsRead++;
+
+                rune_id = rs.getInt("rune_id");
+                runeSkillAdjustEntry = new RuneSkillAdjustEntry(rs);
+
+                if (runeSkillAdjusts.get(rune_id) == null) {
+                    ArrayList<RuneSkillAdjustEntry> skillAdjustList = new ArrayList<>();
+                    skillAdjustList.add(runeSkillAdjustEntry);
+                    runeSkillAdjusts.put(rune_id, skillAdjustList);
+                } else {
+                    ArrayList<RuneSkillAdjustEntry> powerList = runeSkillAdjusts.get(rune_id);
+                    powerList.add(runeSkillAdjustEntry);
+                    runeSkillAdjusts.put(rune_id, powerList);
+                }
+            }
+        } catch (SQLException e) {
+            Logger.error(e);
+            return runeSkillAdjusts;
+        }
+
+        Logger.info("read: " + recordsRead + " cached: " + runeSkillAdjusts.size());
+        return runeSkillAdjusts;
+    }
+
    public void GET_RUNE_REQS(final RuneBase rb) {

        try (Connection connection = DbManager.getConnection();
@@ -109,7 +109,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_locks`=? WHERE `UID` = ?")) {

            preparedStatement.setLong(1, locks);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -125,7 +125,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_gold`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -141,7 +141,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_stone`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -157,7 +157,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_truesteel`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -173,7 +173,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_iron`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -189,7 +189,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_adamant`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -205,7 +205,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_lumber`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -221,7 +221,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_oak`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -237,7 +237,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_bronzewood`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -253,7 +253,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_mandrake`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -269,7 +269,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_coal`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -285,7 +285,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_agate`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -301,7 +301,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_diamond`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -317,7 +317,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_onyx`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -333,7 +333,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_azoth`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -349,7 +349,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_orichalk`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -365,7 +365,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_antimony`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -381,7 +381,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_sulfur`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -397,7 +397,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_quicksilver`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -413,7 +413,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_galvor`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -429,7 +429,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_wormwood`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -445,7 +445,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_obsidian`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -461,7 +461,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_bloodstone`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -477,7 +477,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_mithril`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -545,7 +545,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
            while (rs.next()) {
                warehouse = new Warehouse(rs);
                warehouse.runAfterLoad();
-                warehouse.loadAllTransactions();
+                Warehouse.loadAllTransactions(warehouse);
            }

        } catch (SQLException e) {
@@ -12,8 +12,8 @@ package engine.db.handlers;
 import engine.Enum;
 import engine.gameManager.DbManager;
 import engine.gameManager.ZoneManager;
-import engine.math.Vector2f;
 import engine.objects.Zone;
+import engine.objects.ZoneTemplate;
 import org.pmw.tinylog.Logger;

 import java.sql.Connection;
@@ -29,25 +29,21 @@ public class dbZoneHandler extends dbHandlerBase {
        this.localObjectType = Enum.GameObjectType.valueOf(this.localClass.getSimpleName());
    }

-    public ArrayList<Zone> GET_ALL_NODES(Zone zone) {
-        ArrayList<Zone> wsmList = new ArrayList<>();
-        wsmList.addAll(zone.getNodes());
-        if (zone.absX == 0.0f) {
-            zone.absX = zone.getXCoord();
-        }
-        if (zone.absY == 0.0f) {
-            zone.absY = zone.getYCoord();
-        }
-        if (zone.absZ == 0.0f) {
-            zone.absZ = zone.getZCoord();
-        }
-        for (Zone child : zone.getNodes()) {
-            child.absX = child.getXCoord() + zone.absX;
-            child.absY = child.getYCoord() + zone.absY;
-            child.absZ = child.getZCoord() + zone.absZ;
-            wsmList.addAll(this.GET_ALL_NODES(child));
+    public ArrayList<Zone> GET_ALL_ZONES() {
+
+        ArrayList<Zone> zoneList = new ArrayList<>();
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_zone`.*, `object`.`parent` FROM `object` INNER JOIN `obj_zone` ON `obj_zone`.`UID` = `object`.`UID` ORDER BY `object`.`UID` ASC;")) {
+
+            ResultSet rs = preparedStatement.executeQuery();
+            zoneList = getObjectsFromRs(rs, 2000);
+
+        } catch (SQLException e) {
+            Logger.error(e);
        }
-        return wsmList;
+
+        return zoneList;
    }

    public Zone GET_BY_UID(long ID) {
@@ -72,43 +68,38 @@ public class dbZoneHandler extends dbHandlerBase {
        return zone;
    }

-    public ArrayList<Zone> GET_MAP_NODES(final int objectUUID) {
-
-        ArrayList<Zone> zoneList = new ArrayList<>();
+    public void LOAD_ALL_ZONE_TEMPLATES() {

        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_zone`.*, `object`.`parent` FROM `object` INNER JOIN `obj_zone` ON `obj_zone`.`UID` = `object`.`UID` WHERE `object`.`parent` = ?;")) {
-
-            preparedStatement.setLong(1, objectUUID);
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_zone_templates")) {

            ResultSet rs = preparedStatement.executeQuery();
-            zoneList = getObjectsFromRs(rs, 2000);
-
-        } catch (SQLException e) {
-            Logger.error(e);
-        }

-        return zoneList;
-    }
+            while (rs.next()) {
+                ZoneTemplate zoneTemplate = new ZoneTemplate(rs);
+                ZoneManager._zone_templates.put(zoneTemplate.templateID, zoneTemplate);
+            }

-    public void LOAD_ZONE_EXTENTS() {
+            // Add player city

-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_zone_size`;")) {
+            ZoneTemplate zoneTemplate = new ZoneTemplate();

-            ResultSet rs = preparedStatement.executeQuery();
+            zoneTemplate.templateID = 0;
+            zoneTemplate.sea_level_type = "PARENT";
+            zoneTemplate.sea_level = 0;
+            zoneTemplate.max_blend = 128;
+            zoneTemplate.min_blend = 128;
+            zoneTemplate.terrain_max_y = 5;
+            zoneTemplate.major_radius = (int) Enum.CityBoundsType.ZONE.halfExtents;
+            zoneTemplate.minor_radius = (int) Enum.CityBoundsType.ZONE.halfExtents;
+            zoneTemplate.terrain_type = "PLANAR";

-            while (rs.next()) {
-                Vector2f zoneSize = new Vector2f();
-                int loadNum = rs.getInt("loadNum");
-                zoneSize.x = rs.getFloat("xRadius");
-                zoneSize.y = rs.getFloat("zRadius");
-                ZoneManager._zone_size_data.put(loadNum, zoneSize);
-            }
+            ZoneManager._zone_templates.put(zoneTemplate.templateID, zoneTemplate);

        } catch (SQLException e) {
            Logger.error(e);
        }
+
    }

    public boolean DELETE_ZONE(final Zone zone) {
@@ -9,18 +9,16 @@

 package engine.devcmd.cmds;

-import engine.Enum.GameObjectType;
+import engine.Enum;
 import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.ChatManager;
-import engine.gameManager.DbManager;
 import engine.gameManager.ZoneManager;
-import engine.math.Vector3fImmutable;
-import engine.objects.*;
+import engine.objects.AbstractGameObject;
+import engine.objects.Mob;
+import engine.objects.PlayerCharacter;
+import engine.objects.Zone;
 import org.pmw.tinylog.Logger;

-/**
- * @author Eighty
- */
 public class AddMobCmd extends AbstractDevCmd {

    public AddMobCmd() {
@@ -37,27 +35,8 @@ public class AddMobCmd extends AbstractDevCmd {

        Zone zone = ZoneManager.findSmallestZone(pc.getLoc());

-        if (words[0].equals("all")) {
-
-            for (AbstractGameObject mobbaseAGO : DbManager.getList(GameObjectType.MobBase)) {
-                MobBase mb = (MobBase) mobbaseAGO;
-                int loadID = mb.getObjectUUID();
-                Mob mob = Mob.createMob(loadID, Vector3fImmutable.getRandomPointInCircle(pc.getLoc(), 100),
-                        null, true, zone, null, 0, "", 1);
-                if (mob != null) {
-                    mob.updateDatabase();
-                    this.setResult(String.valueOf(mob.getDBID()));
-                } else {
-                    throwbackError(pc, "Failed to create mob of type " + loadID);
-                    Logger.error("Failed to create mob of type "
-                            + loadID);
-                }
-            }
-            return;
-        }
-
-
        int loadID;
+
        try {
            loadID = Integer.parseInt(words[0]);
        } catch (NumberFormatException e) {
@@ -71,20 +50,19 @@ public class AddMobCmd extends AbstractDevCmd {
            return; // NaN
        }

-
        if (zone == null) {
            throwbackError(pc, "Failed to find zone to place mob in.");
            return;
        }

-        if (zone.isPlayerCity()) {
+        if (zone.guild_zone) {
            throwbackError(pc, "Cannot use ./mob on Player cities. Try ./servermob instead.");
            return;
        }

-
        Mob mob = Mob.createMob(loadID, pc.getLoc(),
-                null, true, zone, null, 0, "", 1);
+                null, zone, null, null, "", 1, Enum.AIAgentType.MOBILE);
+
        if (mob != null) {
            mob.updateDatabase();
            ChatManager.chatSayInfo(pc,
@@ -1,70 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2022
-//                www.magicbane.com
-
-
-package engine.devcmd.cmds;
-
-import engine.InterestManagement.HeightMap;
-import engine.devcmd.AbstractDevCmd;
-import engine.gameManager.ZoneManager;
-import engine.math.Vector2f;
-import engine.math.Vector3fImmutable;
-import engine.objects.AbstractGameObject;
-import engine.objects.PlayerCharacter;
-import engine.objects.Zone;
-
-public class AuditHeightMapCmd extends AbstractDevCmd {
-
-    public AuditHeightMapCmd() {
-        super("auditheightmap");
-    }
-
-    @Override
-    protected void _doCmd(PlayerCharacter pcSender, String[] words,
-                          AbstractGameObject target) {
-
-        int count = Integer.parseInt(words[0]);
-        long start = System.currentTimeMillis();
-        for (int i = 0; i < count; i++) {
-
-
-            Zone currentZone = ZoneManager.findSmallestZone(pcSender.getLoc());
-
-
-            Vector3fImmutable currentLoc = Vector3fImmutable.getRandomPointInCircle(currentZone.getLoc(), currentZone.getBounds().getHalfExtents().x < currentZone.getBounds().getHalfExtents().y ? currentZone.getBounds().getHalfExtents().x : currentZone.getBounds().getHalfExtents().y);
-
-            Vector2f zoneLoc = ZoneManager.worldToZoneSpace(currentLoc, currentZone);
-
-            if (currentZone != null && currentZone.getHeightMap() != null) {
-                float altitude = currentZone.getHeightMap().getInterpolatedTerrainHeight(zoneLoc);
-                float outsetAltitude = HeightMap.getOutsetHeight(altitude, currentZone, pcSender.getLoc());
-            }
-
-        }
-        long end = System.currentTimeMillis();
-
-        long delta = end - start;
-
-        this.throwbackInfo(pcSender, "Audit Heightmap took " + delta + " ms to run " + count + " times!");
-
-
-    }
-
-
-    @Override
-    protected String _getUsageString() {
-        return "' /auditmobs [zone.UUID]'";
-    }
-
-    @Override
-    protected String _getHelpString() {
-        return "Audits all the mobs in a zone.";
-
-    }
-
-}
@@ -40,8 +40,8 @@ public class AuditMobsCmd extends AbstractDevCmd {

                    if (size >= count) {
                        plusplus++;
-                        throwbackInfo(pcSender, zoneMicro.getName() + " at location  " + zoneMicro.getLoc().toString() + " has " + size + " mobs. ");
-                        System.out.println(zoneMicro.getName() + " at location  " + zoneMicro.getLoc().toString() + " has " + size + " mobs. ");
+                        throwbackInfo(pcSender, zoneMicro.zoneName + " at location  " + zoneMicro.getLoc().toString() + " has " + size + " mobs. ");
+                        System.out.println(zoneMicro.zoneName + " at location  " + zoneMicro.getLoc().toString() + " has " + size + " mobs. ");
                    }


@@ -80,7 +80,7 @@ public class AuditMobsCmd extends AbstractDevCmd {
        //ConcurrentHashMap<Mob, Long> respawnMap = Mob.getRespawnMap();
        //		ConcurrentHashMap<Mob, Long> despawnMap = Mob.getDespawnMap();

-        throwbackInfo(pcSender, zone.getName() + ", numMobs: " + zone.zoneMobSet.size());
+        throwbackInfo(pcSender, zone.zoneName + ", numMobs: " + zone.zoneMobSet.size());
        throwbackInfo(pcSender, "UUID, dbID, inRespawnMap, isAlive, activeAI, Loc");


@@ -9,11 +9,10 @@

 package engine.devcmd.cmds;

-import engine.InterestManagement.HeightMap;
+import engine.InterestManagement.Terrain;
 import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.ZoneManager;
 import engine.math.Vector2f;
-import engine.math.Vector3fImmutable;
 import engine.objects.AbstractGameObject;
 import engine.objects.PlayerCharacter;
 import engine.objects.Zone;
@@ -22,205 +21,79 @@ public class GetHeightCmd extends AbstractDevCmd {

    public GetHeightCmd() {
        super("getHeight");
-        this.addCmdString("height");
    }

    @Override
-    protected void _doCmd(PlayerCharacter pc, String[] words,
+    protected void _doCmd(PlayerCharacter playerCharacter, String[] words,
                          AbstractGameObject target) {

-        boolean end = true;
+        Zone currentZone;
+        Zone parentZone;
+        Zone heightmapZone;

-        float height = HeightMap.getWorldHeight(pc);
+        currentZone = ZoneManager.findSmallestZone(playerCharacter.getLoc());
+        heightmapZone = Terrain.getNextZoneWithTerrain(currentZone);
+        parentZone = Terrain.getNextZoneWithTerrain(currentZone.parent);

-        this.throwbackInfo(pc, "Altitude : " + height);
+        Vector2f childZoneLoc = ZoneManager.worldToTerrainSpace(playerCharacter.getLoc(), heightmapZone);
+        Vector2f childZoneOffset = ZoneManager.worldToZoneOffset(playerCharacter.getLoc(), heightmapZone);
+        Vector2f normalizedOffset = new Vector2f(Math.abs(childZoneOffset.x) / heightmapZone.template.major_radius,
+                Math.abs(childZoneOffset.y) / heightmapZone.template.minor_radius);
+        Vector2f parentZoneLoc = ZoneManager.worldToTerrainSpace(playerCharacter.getLoc(), parentZone);

-        this.throwbackInfo(pc, "Character Height: " + pc.getCharacterHeight());
-        this.throwbackInfo(pc, "Character Height to start swimming: " + pc.centerHeight);
+        float childHeight = heightmapZone.terrain.getInterpolatedTerrainHeight(childZoneLoc);
+        childHeight = childHeight + heightmapZone.global_height;

-        Zone zone = ZoneManager.findSmallestZone(pc.getLoc());
-        this.throwbackInfo(pc, "Water Level : " + zone.getSeaLevel());
-        this.throwbackInfo(pc, "Character Water Level Above : " + (pc.getCharacterHeight() + height - zone.getSeaLevel()));
+        float parentHeight = parentZone.terrain.getInterpolatedTerrainHeight(parentZoneLoc);
+        parentHeight += parentZone.global_height;

-        if (end)
-            return;
+        float blendedHeight = Terrain.getWorldHeight(currentZone, playerCharacter.getLoc());

-        Vector2f gridSquare;
-        Vector2f gridOffset;
-        Vector2f parentGrid;
-        Vector2f parentLoc = new Vector2f(-1, -1);
+        Vector2f terrainCell = heightmapZone.terrain.getTerrainCell(childZoneLoc);
+        Vector2f cell_offset = new Vector2f(terrainCell.x % 1, terrainCell.y % 1);

-        Zone currentZone = ZoneManager.findSmallestZone(pc.getLoc());
+        terrainCell.x = (float) Math.floor(terrainCell.x);
+        terrainCell.y = (float) Math.floor(terrainCell.y);

-        if (currentZone == null)
-            return;

-        Zone parentZone = currentZone.getParent();
+        short top_left_pixel = heightmapZone.terrain.terrain_pixel_data[(int) terrainCell.x][(int) terrainCell.y];
+        short top_right_pixel = heightmapZone.terrain.terrain_pixel_data[(int) terrainCell.x + 1][(int) terrainCell.y];
+        short bottom_left_pixel = heightmapZone.terrain.terrain_pixel_data[(int) terrainCell.x][(int) terrainCell.y + 1];
+        short bottom_right_pixel = heightmapZone.terrain.terrain_pixel_data[(int) terrainCell.x + 1][(int) terrainCell.y + 1];

-        HeightMap heightMap = currentZone.getHeightMap();
+        this.throwbackInfo(playerCharacter, "Current Zone : " + currentZone.zoneName);
+        this.throwbackInfo(playerCharacter, "Heightmap Zone : " + heightmapZone.zoneName);
+        this.throwbackInfo(playerCharacter, "Parent Zone: " + parentZone.zoneName);

+        this.throwbackInfo(playerCharacter, "Player loc: " + "[" + playerCharacter.loc.x + "]" + "[" + playerCharacter.loc.y + "]" + "[" + playerCharacter.loc.z + "]");

-        //find the next parents heightmap if the currentzone heightmap is null.
-        while (heightMap == null) {
+        this.throwbackInfo(playerCharacter, "Terrain Cell : " + "[" + terrainCell.x + "]" + "[" + terrainCell.y + "]");
+        this.throwbackInfo(playerCharacter, "Cell Offset : " + "[" + cell_offset.x + "]" + "[" + cell_offset.y + "]");
+        this.throwbackInfo(playerCharacter, "Pixels : " + "[" + top_left_pixel + "]" + "[" + top_right_pixel + "]");
+        this.throwbackInfo(playerCharacter, "Pixels : " + "[" + bottom_left_pixel + "]" + "[" + bottom_right_pixel + "]");

-            if (currentZone == ZoneManager.getSeaFloor()) {
-                this.throwbackInfo(pc, "Could not find a heightmap to get height.");
-                break;
-            }
+        this.throwbackInfo(playerCharacter, "Child Zone Offset: " + "[" + childZoneOffset.x + "]" + "[" + childZoneOffset.y + "]");
+        this.throwbackInfo(playerCharacter, "Normalized offset: " + "[" + normalizedOffset.x + "]" + "[" + normalizedOffset.y + "]");
+        this.throwbackInfo(playerCharacter, "template blend Values: (max/min): " + heightmapZone.template.max_blend + " /" + heightmapZone.template.min_blend);
+        this.throwbackInfo(playerCharacter, "terrain values (max/min): " + heightmapZone.terrain.blend_values.x + " /" + heightmapZone.terrain.blend_values.y);
+        this.throwbackInfo(playerCharacter, "Blend coefficient: " + heightmapZone.terrain.getTerrainBlendCoefficient(childZoneOffset));

-            this.throwbackError(pc, "Heightmap does not exist for " + currentZone.getName());
-            this.throwbackInfo(pc, "Using parent zone instead: ");
-            currentZone = currentZone.getParent();
-            heightMap = currentZone.getHeightMap();
-        }
-
-
-        if ((heightMap == null) || (currentZone == ZoneManager.getSeaFloor())) {
-            this.throwbackInfo(pc, currentZone.getName() + " has no heightmap ");
-            this.throwbackInfo(pc, "Current altitude: " + currentZone.absY);
-            return;
-        }
-
-        Vector2f zoneLoc = ZoneManager.worldToZoneSpace(pc.getLoc(), currentZone);
-
-        Vector3fImmutable seaFloorLocalLoc = ZoneManager.worldToLocal(pc.getLoc(), ZoneManager.getSeaFloor());
-        this.throwbackInfo(pc, "SeaFloor Local : " + seaFloorLocalLoc.x + " , " + seaFloorLocalLoc.y);
-
-
-        this.throwbackInfo(pc, "Local Zone Location : " + zoneLoc.x + " , " + zoneLoc.y);
-        Vector3fImmutable localLocFromCenter = ZoneManager.worldToLocal(pc.getLoc(), currentZone);
-        Vector3fImmutable parentLocFromCenter = ZoneManager.worldToLocal(pc.getLoc(), currentZone.getParent());
-        this.throwbackInfo(pc, "Local Zone Location from center : " + localLocFromCenter);
-        this.throwbackInfo(pc, "parent Zone Location from center : " + parentLocFromCenter);
-
-        Vector2f parentZoneLoc = ZoneManager.worldToZoneSpace(pc.getLoc(), currentZone.getParent());
-        this.throwbackInfo(pc, "Parent Zone Location from Bottom Left : " + parentZoneLoc);
-
-        if ((parentZone != null) && (parentZone.getHeightMap() != null)) {
-            parentLoc = ZoneManager.worldToZoneSpace(pc.getLoc(), parentZone);
-            parentGrid = parentZone.getHeightMap().getGridSquare(parentLoc);
-        } else
-            parentGrid = new Vector2f(-1, -1);
-
-        gridSquare = heightMap.getGridSquare(zoneLoc);
-        gridOffset = HeightMap.getGridOffset(gridSquare);
-
-        float interaltitude = currentZone.getHeightMap().getInterpolatedTerrainHeight(zoneLoc);
-
-        this.throwbackInfo(pc, currentZone.getName());
-        this.throwbackInfo(pc, "Current Grid Square: " + gridSquare.x + " , " + gridSquare.y);
-        this.throwbackInfo(pc, "Grid Offset: " + gridOffset.x + " , " + gridOffset.y);
-        this.throwbackInfo(pc, "Parent Grid: " + parentGrid.x + " , " + parentGrid.y);
-
-        if (parentGrid.x != -1) {
-            float parentAltitude = parentZone.getHeightMap().getInterpolatedTerrainHeight(parentLoc);
-            this.throwbackInfo(pc, "Parent ALTITUDE: " + (parentAltitude));
-            this.throwbackInfo(pc, "Parent Interpolation: " + (parentAltitude + parentZone.getWorldAltitude()));
-        }
-        this.throwbackInfo(pc, "interpolated height: " + interaltitude);
-
-        this.throwbackInfo(pc, "interpolated height with World: " + (interaltitude + currentZone.getWorldAltitude()));
-
-        float realWorldAltitude = interaltitude + currentZone.getWorldAltitude();
-
-        //OUTSET
-        if (parentZone != null) {
-            float parentXRadius = currentZone.getBounds().getHalfExtents().x;
-            float parentZRadius = currentZone.getBounds().getHalfExtents().y;
-
-            float offsetX = Math.abs((localLocFromCenter.x / parentXRadius));
-            float offsetZ = Math.abs((localLocFromCenter.z / parentZRadius));
-
-            float bucketScaleX = 100 / parentXRadius;
-            float bucketScaleZ = 200 / parentZRadius;
-
-            float outsideGridSizeX = 1 - bucketScaleX; //32/256
-            float outsideGridSizeZ = 1 - bucketScaleZ;
-            float weight;
-
-            double scale;
-
-
-            if (offsetX > outsideGridSizeX && offsetX > offsetZ) {
-                weight = (offsetX - outsideGridSizeX) / bucketScaleX;
-                scale = Math.atan2((.5 - weight) * 3.1415927, 1);
-
-                float scaleChild = (float) ((scale + 1) * .5);
-                float scaleParent = 1 - scaleChild;
-
-
-                float parentAltitude = parentZone.getHeightMap().getInterpolatedTerrainHeight(parentLoc);
-                float parentCenterAltitude = parentZone.getHeightMap().getInterpolatedTerrainHeight(ZoneManager.worldToZoneSpace(currentZone.getLoc(), parentZone));
-
-                parentCenterAltitude += currentZone.getYCoord();
-                parentCenterAltitude += interaltitude;
-
-                float firstScale = parentAltitude * scaleParent;
-                float secondScale = parentCenterAltitude * scaleChild;
-                float outsetALt = firstScale + secondScale;
-
-                outsetALt += currentZone.getParent().getAbsY();
-                realWorldAltitude = outsetALt;
-
-            } else if (offsetZ > outsideGridSizeZ) {
-
-                weight = (offsetZ - outsideGridSizeZ) / bucketScaleZ;
-                scale = Math.atan2((.5 - weight) * 3.1415927, 1);
-
-                float scaleChild = (float) ((scale + 1) * .5);
-                float scaleParent = 1 - scaleChild;
-                float parentAltitude = parentZone.getHeightMap().getInterpolatedTerrainHeight(parentLoc);
-                float parentCenterAltitude = parentZone.getHeightMap().getInterpolatedTerrainHeight(ZoneManager.worldToZoneSpace(currentZone.getLoc(), parentZone));
-
-                parentCenterAltitude += currentZone.getYCoord();
-                parentCenterAltitude += interaltitude;
-                float firstScale = parentAltitude * scaleParent;
-                float secondScale = parentCenterAltitude * scaleChild;
-                float outsetALt = firstScale + secondScale;
-
-                outsetALt += currentZone.getParent().getAbsY();
-                realWorldAltitude = outsetALt;
-
-
-            }
-        }
-
-        float strMod = pc.statStrBase - 40;
-
-        strMod *= .00999999998f;
-
-        strMod += 1f;
-
-        float radius = 0;
-        switch (pc.getRaceID()) {
-            case 2017:
-                radius = 3.1415927f;
-            case 2000:
-
-
-        }
-        strMod *= 1.5707964f;
-
-        strMod += 3.1415927f;
-
-        strMod -= .5f;
-
-
-        realWorldAltitude += strMod;
-
-        this.throwbackInfo(pc, "interpolated height with World: " + realWorldAltitude);
+        this.throwbackInfo(playerCharacter, "------------");

+        this.throwbackInfo(playerCharacter, "Child Height at loc: " + Math.ceil(childHeight));
+        this.throwbackInfo(playerCharacter, "Parent Height at loc: " + Math.ceil(parentHeight));
+        this.throwbackInfo(playerCharacter, "Blended Height (Ceil): " + blendedHeight + " (" + Math.ceil(blendedHeight) + ")");

    }

    @Override
    protected String _getHelpString() {
-        return "Temporarily Changes SubRace";
+        return "Queries heightmap engine";
    }

    @Override
    protected String _getUsageString() {
-        return "' /subrace mobBaseID";
+        return "' /getheight";
    }

 }
@@ -48,7 +48,7 @@ public class GetOffsetCmd extends AbstractDevCmd {
        float difY = pcSender.getLoc().y - zone.absY;
        float difZ = pcSender.getLoc().z - zone.absZ;

-        throwbackInfo(pcSender, zone.getName() + ": (x: " + difX + ", y: " + difY + ", z: " + difZ + ')');
+        throwbackInfo(pcSender, zone.zoneName + ": (x: " + difX + ", y: " + difY + ", z: " + difZ + ')');
    }

    @Override
@@ -51,7 +51,7 @@ public class GetZoneCmd extends AbstractDevCmd {
        }

        for (Zone zone : allIn)
-            throwbackInfo(pcSender, zone.getName() + "; UUID: " + zone.getObjectUUID() + ", loadNum: " + zone.getLoadNum());
+            throwbackInfo(pcSender, zone.zoneName + "; UUID: " + zone.getObjectUUID() + ", loadNum: " + zone.templateID);
    }

    @Override
@@ -81,7 +81,7 @@ public class GotoCmd extends AbstractDevCmd {
                continue;
            Zone zone = city.getParent();
            if (zone != null) {
-                if (zone.isNPCCity() || zone.isPlayerCity())
+                if (zone.isNPCCity || zone.guild_zone)
                    loc = Vector3fImmutable.getRandomPointOnCircle(zone.getLoc(), MBServerStatics.TREE_TELEPORT_RADIUS);
                else
                    loc = zone.getLoc();
@@ -97,10 +97,10 @@ public class GotoCmd extends AbstractDevCmd {
                Zone zone = (Zone) zoneAgo;
                if (zone == null)
                    continue;
-                if (!zone.getName().equalsIgnoreCase(cityName))
+                if (!zone.zoneName.equalsIgnoreCase(cityName))
                    continue;
                if (zone != null) {
-                    if (zone.isNPCCity() || zone.isPlayerCity())
+                    if (zone.isNPCCity || zone.guild_zone)
                        loc = Vector3fImmutable.getRandomPointOnCircle(zone.getLoc(), MBServerStatics.TREE_TELEPORT_RADIUS);
                    else
                        loc = zone.getLoc();
@@ -40,7 +40,7 @@ public class HotzoneCmd extends AbstractDevCmd {
        String input = data.toString().trim();

        if (input.length() == 0) {
-            outString = "Current hotZone: " + ZoneManager.hotZone.getName() + "\r\n";
+            outString = "Current hotZone: " + ZoneManager.hotZone.zoneName + "\r\n";
            outString += "Available hotZones: " + ZoneManager.availableHotZones();
            throwbackInfo(playerCharacter, outString);
            return;
@@ -48,7 +48,7 @@ public class HotzoneCmd extends AbstractDevCmd {

        if (input.equalsIgnoreCase("random")) {
            ZoneManager.generateAndSetRandomHotzone();
-            outString = "New hotZone: " + ZoneManager.hotZone.getName() + "\r\n";
+            outString = "New hotZone: " + ZoneManager.hotZone.zoneName + "\r\n";
            outString += "Available hotZones: " + ZoneManager.availableHotZones();
            throwbackInfo(playerCharacter, outString);
            return;
@@ -387,7 +387,7 @@ public class InfoCmd extends AbstractDevCmd {
                    output += newline;
                    output += "EquipSet: " + targetNPC.getEquipmentSetID();
                    output += newline;
-                    output += "Parent Zone LoadNum : " + targetNPC.getParentZone().getLoadNum();
+                    output += "Parent Zone LoadNum : " + targetNPC.getParentZone().templateID;

                }

@@ -440,7 +440,9 @@ public class InfoCmd extends AbstractDevCmd {
                        output += "isSummonedPet: true";
                    else
                        output += "isSummonedPet: false";
-                    PlayerCharacter owner = targetMob.getOwner();
+
+
+                    PlayerCharacter owner = (PlayerCharacter) targetMob.guardCaptain;
                    if (owner != null)
                        output += "     owner: " + owner.getObjectUUID();
                    output += newline;
@@ -471,7 +473,7 @@ public class InfoCmd extends AbstractDevCmd {
                output += "EquipSet: " + targetMob.equipmentSetID;
                output += newline;
                try {
-                    output += "Parent Zone LoadNum : " + targetMob.getParentZone().getLoadNum();
+                    output += "Parent Zone LoadNum : " + targetMob.getParentZone().templateID;
                } catch (Exception ex) {
                    //who cares
                }
@@ -0,0 +1,80 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2022
+//                www.magicbane.com
+
+
+package engine.devcmd.cmds;
+
+import engine.Enum;
+import engine.Enum.BuildingGroup;
+import engine.Enum.GameObjectType;
+import engine.Enum.TargetColor;
+import engine.devcmd.AbstractDevCmd;
+import engine.gameManager.BuildingManager;
+import engine.gameManager.SessionManager;
+import engine.math.Vector3fImmutable;
+import engine.objects.*;
+import engine.util.StringUtils;
+
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.concurrent.ConcurrentHashMap;
+
+
+/**
+ * @author
+ */
+public class ItemInfoCmd extends AbstractDevCmd {
+
+    public ItemInfoCmd() {
+        super("iteminfo");
+    }
+
+    @Override
+    protected void _doCmd(PlayerCharacter pc, String[] words,AbstractGameObject target) {
+        if (pc == null) {
+            return;
+        }
+        if(target.getObjectType().equals(GameObjectType.Item) == false){
+            throwbackInfo(pc, "Must Select An Item");
+            return;
+        }
+        Item item = (Item)target;
+        String newline = "\r\n ";
+        String output = "";
+        output += "Required Races:" + newline;
+        for(Enum.MonsterType required : item.getItemBase().requiredRaces)
+            output += "     " + required.name() + newline;
+        output += "Restricted Races:" + newline;
+        for(Enum.MonsterType required : item.getItemBase().restrictedRaces)
+            output += "     " + required.name() + newline;
+        output += "Required Classes:" + newline;
+        for(Enum.ClassType required : item.getItemBase().requiredClasses)
+            output += "     " + required.name() + newline;
+        output += "Restricted Classes:" + newline;
+        for(Enum.ClassType required : item.getItemBase().restrictedClasses)
+            output += "     " + required.name() + newline;
+        output += "Required Disciplines:" + newline;
+        for(Enum.DisciplineType required : item.getItemBase().requiredDiscs)
+            output += "     " + required.name() + newline;
+        output += "Restricted Disciplines:" + newline;
+        for(Enum.DisciplineType required : item.getItemBase().restrictedDiscs)
+            output += "     " + required.name() + newline;
+        throwbackInfo(pc, output);
+    }
+
+    @Override
+    protected String _getHelpString() {
+        return "Gets information on an Object.";
+    }
+
+    @Override
+    protected String _getUsageString() {
+        return "' /iteminfo'";
+    }
+
+}
@@ -111,12 +111,12 @@ public class MakeBaneCmd extends AbstractDevCmd {
            return;
        }

-        if (!zone.isPlayerCity()) {
+        if (!zone.guild_zone) {
            throwbackError(pc, "This is not a player city.");
            return;
        }

-        City city = City.getCity(zone.getPlayerCityUUID());
+        City city = City.getCity(zone.playerCityUUID);
        if (city == null) {
            throwbackError(pc, "Unable to find the city associated with this zone.");
            return;
@@ -167,7 +167,7 @@ public class MakeBaneCmd extends AbstractDevCmd {
            return;
        }
        stone.addEffectBit((1 << 19));
-        stone.setRank((byte) rank);
+        BuildingManager.setRank(stone, (byte) rank);
        stone.setMaxHitPoints(blueprint.getMaxHealth(stone.getRank()));
        stone.setCurrentHitPoints(stone.getMaxHitPoints());
        BuildingManager.setUpgradeDateTime(stone, null, 0);
@@ -0,0 +1,67 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2022
+//                www.magicbane.com
+
+
+package engine.devcmd.cmds;
+
+import engine.devcmd.AbstractDevCmd;
+import engine.objects.*;
+
+import java.util.HashMap;
+
+/**
+ *
+ */
+
+public class PrintEffectsCmd extends AbstractDevCmd {
+
+    public PrintEffectsCmd() {
+        super("printeffects");
+        //		super("printstats", MBServerStatics.ACCESS_LEVEL_ADMIN);
+    }
+
+    public static ItemBase getWeaponBase(int slot, HashMap<Integer, MobEquipment> equip) {
+        if (equip.containsKey(slot)) {
+            MobEquipment item = equip.get(slot);
+            if (item != null && item.getItemBase() != null) {
+                return item.getItemBase();
+            }
+        }
+        return null;
+    }
+
+    @Override
+    protected void _doCmd(PlayerCharacter pc, String[] words,
+                          AbstractGameObject target) {
+
+        AbstractCharacter tar;
+
+        if (target != null && target instanceof AbstractCharacter) {
+            tar = (AbstractCharacter) target;
+
+            String newline = "\r\n ";
+            String output = "Effects For Character: " + tar.getName() + newline;
+
+            for(String effect : tar.effects.keySet()){
+                output += effect + newline;
+            }
+            throwbackInfo(pc, output);
+        }
+    }
+
+    @Override
+    protected String _getHelpString() {
+        return "Returns the player's current stats";
+    }
+
+    @Override
+    protected String _getUsageString() {
+        return "' /printstats'";
+    }
+
+}
@@ -0,0 +1,67 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2022
+//                www.magicbane.com
+
+
+package engine.devcmd.cmds;
+
+import engine.devcmd.AbstractDevCmd;
+import engine.objects.*;
+
+import java.util.HashMap;
+
+/**
+ *
+ */
+
+public class PrintRunesCmd extends AbstractDevCmd {
+
+    public PrintRunesCmd() {
+        super("printrunes");
+        //		super("printstats", MBServerStatics.ACCESS_LEVEL_ADMIN);
+    }
+
+    public static ItemBase getWeaponBase(int slot, HashMap<Integer, MobEquipment> equip) {
+        if (equip.containsKey(slot)) {
+            MobEquipment item = equip.get(slot);
+            if (item != null && item.getItemBase() != null) {
+                return item.getItemBase();
+            }
+        }
+        return null;
+    }
+
+    @Override
+    protected void _doCmd(PlayerCharacter pc, String[] words,
+                          AbstractGameObject target) {
+
+        AbstractCharacter tar;
+
+        if (target != null && target instanceof AbstractCharacter) {
+            tar = (AbstractCharacter) target;
+
+            String newline = "\r\n ";
+            String output = "Applied Runes For Character: " + ((AbstractCharacter) target).getName() + newline;
+
+            for(CharacterRune rune : ((AbstractCharacter)target).runes){
+                output += rune.getRuneBaseID() + " " + rune.getRuneBase().getName() + newline;
+            }
+            throwbackInfo(pc, output);
+        }
+    }
+
+    @Override
+    protected String _getHelpString() {
+        return "Returns the player's current stats";
+    }
+
+    @Override
+    protected String _getUsageString() {
+        return "' /printstats'";
+    }
+
+}
@@ -103,15 +103,19 @@ public class PrintStatsCmd extends AbstractDevCmd {
            main = getWeaponBase(1, equip);
        ItemBase off = null;

-        if (equip != null)
-            getWeaponBase(2, equip);
-        if (main == null && off == null) {
-            out += "Main Hand: atr: " + tar.getAtrHandOne() + ", damage: " + tar.getMinDamageHandOne() + " to " + tar.getMaxDamageHandOne() + ", speed: " + tar.getSpeedHandOne() + ", range: 6" + newline;
-        } else {
-            if (main != null)
-                out += "Main Hand: atr: " + tar.getAtrHandOne() + ", damage: " + tar.getMinDamageHandOne() + " to " + tar.getMaxDamageHandOne() + ", speed: " + tar.getSpeedHandOne() + ", range: " + main.getRange() + newline;
-            if (off != null)
-                out += "Main Hand: atr: " + tar.getAtrHandTwo() + ", damage: " + tar.getMinDamageHandTwo() + " to " + tar.getMaxDamageHandTwo() + ", speed: " + tar.getSpeedHandTwo() + ", range: " + off.getRange() + newline;
+        if(equip != null){
+           if(equip.get(2) != null && !equip.get(2).getItemBase().isShield()){
+                //off hand weapon
+                out += "Attack Rating: " + tar.atrHandTwo + newline;
+                out += "Damage: " + tar.minDamageHandTwo + " - " + tar.maxDamageHandTwo + newline;
+                out += "Range: " + tar.rangeHandTwo + newline;
+               out += "Attack Speed: " + tar.speedHandTwo + newline;
+            } else{
+               out += "Attack Rating: " + tar.atrHandOne + newline;
+               out += "Damage: " + tar.minDamageHandOne + " - " + tar.maxDamageHandOne + newline;
+               out += "Range: " + tar.rangeHandOne + newline;
+               out += "Attack Speed: " + tar.speedHandOne + newline;
+            }
        }
        out += "isAlive: " + tar.isAlive() + ", Combat: " + tar.isCombat() + newline;

@@ -42,7 +42,7 @@ public class PurgeObjectsCmd extends AbstractDevCmd {

    private static void PurgeWalls(Zone zone, PlayerCharacter pc) {

-        if (!zone.isPlayerCity())
+        if (!zone.guild_zone)
            return;

        for (Building building : zone.zoneBuildingSet) {
@@ -59,22 +59,25 @@ public class PurgeObjectsCmd extends AbstractDevCmd {


                if (npc != null) {
-                    for (Mob mob : npc.getSiegeMinionMap().keySet()) {
+                    for (Integer minionUUID : npc.minions) {
+                        Mob mob = Mob.getMob(minionUUID);
                        WorldGrid.RemoveWorldObject(mob);
                        WorldGrid.removeObject(mob, pc);
-                        //Mob.getRespawnMap().remove(mob);
+
                        if (mob.getParentZone() != null)
                            mob.getParentZone().zoneMobSet.remove(mob);
                    }
+
                    DbManager.NPCQueries.DELETE_NPC(npc);
                    DbManager.removeFromCache(GameObjectType.NPC,
                            npc.getObjectUUID());
                    WorldGrid.RemoveWorldObject(npc);
                } else if (mobA != null) {
-                    for (Mob mob : mobA.getSiegeMinionMap().keySet()) {
+                    for (Integer minionUUID : mobA.minions) {
+                        Mob mob = Mob.getMob(minionUUID);
                        WorldGrid.RemoveWorldObject(mob);
                        WorldGrid.removeObject(mob, pc);
-                        //Mob.getRespawnMap().remove(mob);
+
                        if (mob.getParentZone() != null)
                            mob.getParentZone().zoneMobSet.remove(mob);
                    }
@@ -151,10 +154,11 @@ public class PurgeObjectsCmd extends AbstractDevCmd {


            if (npc != null) {
-                for (Mob mob : npc.getSiegeMinionMap().keySet()) {
+                for (Integer minionUUID : npc.minions) {
+                    Mob mob = Mob.getMob(minionUUID);
                    WorldGrid.RemoveWorldObject(mob);
                    WorldGrid.removeObject(mob, pc);
-                    //Mob.getRespawnMap().remove(mob);
+
                    if (mob.getParentZone() != null)
                        mob.getParentZone().zoneMobSet.remove(mob);
                }
@@ -163,10 +167,11 @@ public class PurgeObjectsCmd extends AbstractDevCmd {
                        npc.getObjectUUID());
                WorldGrid.RemoveWorldObject(npc);
            } else if (mobA != null) {
-                for (Mob mob : mobA.getSiegeMinionMap().keySet()) {
+                for (Integer minionUUID : mobA.minions) {
+                    Mob mob = Mob.getMob(minionUUID);
                    WorldGrid.RemoveWorldObject(mob);
                    WorldGrid.removeObject(mob, pc);
-                    //Mob.getRespawnMap().remove(mob);
+
                    if (mob.getParentZone() != null)
                        mob.getParentZone().zoneMobSet.remove(mob);
                }
@@ -60,12 +60,12 @@ public class RealmInfoCmd extends AbstractDevCmd {
        outString += ")";
        outString += newline;

-        outString += " Zone: " + serverZone.getName();
+        outString += " Zone: " + serverZone.zoneName;

        outString += newline;

-        if (serverZone.getParent() != null)
-            outString += " Parent: " + serverZone.getParent().getName();
+        if (serverZone.parent != null)
+            outString += " Parent: " + serverZone.parent.zoneName;
        else
            outString += "Parent: NONE";

@@ -9,9 +9,10 @@

 package engine.devcmd.cmds;

+import engine.Enum;
 import engine.devcmd.AbstractDevCmd;
-import engine.objects.AbstractGameObject;
-import engine.objects.PlayerCharacter;
+import engine.gameManager.BuildingManager;
+import engine.objects.*;

 import java.lang.reflect.Field;

@@ -25,42 +26,28 @@ public class RegionCmd extends AbstractDevCmd {
    protected void _doCmd(PlayerCharacter pc, String[] words,
                          AbstractGameObject target) {

+        String newline = "\r\n ";
+        String output;
+        output = "Target Region Information:" + newline;

-        if (pc.region == null) {
+        Building building = BuildingManager.getBuildingAtLocation(((AbstractCharacter) target).loc);
+        if(building == null){
+            this.throwbackInfo(pc, "No Building At This Location.") ;
+        }
+        Regions region = ((AbstractCharacter)target).region;
+        if (region == null) {
            this.throwbackInfo(pc, "No Region Found.");
            return;
        }

-
-        String newLine = System.getProperty("line.separator");
-        String result = "";
-        result += (pc.region.getClass().getSimpleName());
-        result += (" {");
-        result += (newLine);
-        Field[] fields = pc.region.getClass().getDeclaredFields();
-
-        //print field names paired with their values
-        for (Field field : fields) {
-            field.setAccessible(true);
-            result += (" ");
-            try {
-
-                if (field.getName().contains("Furniture"))
-                    continue;
-                result += (field.getName());
-                result += (": ");
-                //requires access to private field:
-                result += (field.get(pc.region).toString());
-            } catch (IllegalAccessException ex) {
-                System.out.println(ex);
-            }
-            result.trim();
-            result += (newLine);
+        if(region != null) {
+            output += "Player Info: " + ((AbstractCharacter) target).getName() + newline;
+            output +=  "Region Building: " + building.getName() + newline;
+            output +=  "Region Height: " + region.lerpY((AbstractCharacter)target) + newline;
+            output +=  "is Stairs: " + region.isStairs() + newline;
+            output += "is Outside: " + region.isOutside();
+            this.throwbackInfo(pc, output);
        }
-        result += ("}");
-
-        this.throwbackInfo(pc, result.toString());
-

    }

@@ -34,12 +34,12 @@ public class RemoveBaneCmd extends AbstractDevCmd {
            return;
        }

-        if (!zone.isPlayerCity()) {
+        if (!zone.guild_zone) {
            throwbackError(pc, "This is not a player city.");
            return;
        }

-        City city = City.getCity(zone.getPlayerCityUUID());
+        City city = City.getCity(zone.playerCityUUID);
        if (city == null) {
            throwbackError(pc, "Unable to find the city associated with this zone.");
            return;
@@ -11,13 +11,9 @@ package engine.devcmd.cmds;

 import engine.Enum.BuildingGroup;
 import engine.Enum.DbObjectType;
-import engine.Enum.GameObjectType;
 import engine.InterestManagement.WorldGrid;
 import engine.devcmd.AbstractDevCmd;
-import engine.gameManager.BuildingManager;
-import engine.gameManager.ChatManager;
-import engine.gameManager.DbManager;
-import engine.gameManager.ZoneManager;
+import engine.gameManager.*;
 import engine.math.Vector3fImmutable;
 import engine.objects.*;

@@ -131,56 +127,23 @@ public class RemoveObjectCmd extends AbstractDevCmd {
            building.disableSpire(false);

        if ((building.getBlueprint() != null) && (building.getBlueprint().getBuildingGroup() == BuildingGroup.WAREHOUSE)) {
-            City city = City.getCity(building.getParentZone().getPlayerCityUUID());
+            City city = City.getCity(building.getParentZone().playerCityUUID);
            if (city != null) {
                city.setWarehouseBuildingID(0);
            }
            Warehouse.warehouseByBuildingUUID.remove(building.getObjectUUID());
        }

-
        //remove cached shrines.
        if ((building.getBlueprintUUID() != 0)
                && (building.getBlueprint().getBuildingGroup() == BuildingGroup.SHRINE))
            Shrine.RemoveShrineFromCacheByBuilding(building);

-        for (AbstractCharacter ac : building.getHirelings().keySet()) {
-            NPC npc = null;
-            Mob mobA = null;
-
-            if (ac.getObjectType() == GameObjectType.NPC)
-                npc = (NPC) ac;
-            else if (ac.getObjectType() == GameObjectType.Mob)
-                mobA = (Mob) ac;
-
-            if (npc != null) {
-                for (Mob mob : npc.getSiegeMinionMap().keySet()) {
-                    WorldGrid.RemoveWorldObject(mob);
-                    WorldGrid.removeObject(mob, pc);
-                    //Mob.getRespawnMap().remove(mob);
-                    if (mob.getParentZone() != null)
-                        mob.getParentZone().zoneMobSet.remove(mob);
-                }
-                DbManager.NPCQueries.DELETE_NPC(npc);
-                DbManager.removeFromCache(npc);
-                WorldGrid.RemoveWorldObject(npc);
-                WorldGrid.removeObject(npc, pc);
-            } else if (mobA != null) {
-                for (Mob mob : mobA.getSiegeMinionMap().keySet()) {
-                    WorldGrid.RemoveWorldObject(mob);
-                    WorldGrid.removeObject(mob, pc);
-                    //Mob.getRespawnMap().remove(mob);
-                    if (mob.getParentZone() != null)
-                        mob.getParentZone().zoneMobSet.remove(mob);
-                }
-                DbManager.MobQueries.DELETE_MOB(mobA);
-                DbManager.removeFromCache(mobA);
-                WorldGrid.RemoveWorldObject(mobA);
-                WorldGrid.removeObject(mobA, pc);
-            }
+        // Remove hirelings for this building

+        for (AbstractCharacter abstractCharacter : building.getHirelings().keySet())
+            BuildingManager.removeHireling(building, abstractCharacter);

-        }
        Zone zone = building.getParentZone();
        DbManager.BuildingQueries.DELETE_FROM_DATABASE(building);
        DbManager.removeFromCache(building);
@@ -209,11 +172,13 @@ public class RemoveObjectCmd extends AbstractDevCmd {
        if (npc.building != null)
            npc.building.getHirelings().remove(npc);

-        for (Mob mob : npc.getSiegeMinionMap().keySet()) {
-            WorldGrid.RemoveWorldObject(mob);
-            WorldGrid.removeObject(mob, pc);
-            if (mob.getParentZone() != null)
-                mob.getParentZone().zoneMobSet.remove(mob);
+        for (Integer minionUUID : npc.minions) {
+            Mob minionMob = Mob.getMob(minionUUID);
+            WorldGrid.RemoveWorldObject(minionMob);
+            WorldGrid.removeObject(minionMob, pc);
+
+            if (minionMob.getParentZone() != null)
+                minionMob.getParentZone().zoneMobSet.remove(minionMob);
        }

        DbManager.NPCQueries.DELETE_NPC(npc);
@@ -41,12 +41,12 @@ public class SetBaneActiveCmd extends AbstractDevCmd {
            return;
        }

-        if (!zone.isPlayerCity()) {
+        if (!zone.guild_zone) {
            throwbackError(pc, "This is not a player city.");
            return;
        }

-        City city = City.getCity(zone.getPlayerCityUUID());
+        City city = City.getCity(zone.playerCityUUID);
        if (city == null) {
            throwbackError(pc, "Unable to find the city associated with this zone.");
            return;
@@ -31,9 +31,9 @@ public class SetForceRenameCityCmd extends AbstractDevCmd {
        if (zone == null)
            return;
        boolean rename = words[0].equalsIgnoreCase("true") ? true : false;
-        if (zone.getPlayerCityUUID() == 0)
+        if (zone.playerCityUUID == 0)
            return;
-        City city = City.getCity(zone.getPlayerCityUUID());
+        City city = City.getCity(zone.playerCityUUID);
        if (city == null)
            return;
        city.setForceRename(rename);
@@ -57,7 +57,7 @@ public class SetRankCmd extends AbstractDevCmd {
                    Blueprint blueprint = targetBuilding.getBlueprint();

                    if (blueprint == null) {
-                        targetBuilding.setRank(targetRank);
+                        BuildingManager.setRank(targetBuilding, targetRank);
                        ChatManager.chatSayInfo(player, "Building ranked without blueprint" + targetBuilding.getObjectUUID());
                        return;
                    }
@@ -68,9 +68,8 @@ public class SetRankCmd extends AbstractDevCmd {
                    }

                    // Set the current targetRank
-                    int lastMeshID = targetBuilding.getMeshUUID();
-                    targetBuilding.setRank(targetRank);

+                    BuildingManager.setRank(targetBuilding, targetRank);
                    ChatManager.chatSayInfo(player, "Rank set for building with ID " + targetBuilding.getObjectUUID() + " to rank " + targetRank);
                    break;
                case NPC:
@@ -114,7 +113,7 @@ public class SetRankCmd extends AbstractDevCmd {

            // Set the current targetRank
            int lastMeshID = targetBuilding.getMeshUUID();
-            targetBuilding.setRank(targetRank);
+            BuildingManager.setRank(targetBuilding, targetRank);

            if (lastMeshID != targetBuilding.getMeshUUID())
                targetBuilding.refresh(true);
@@ -159,7 +159,7 @@ public class SetSubRaceCmd extends AbstractDevCmd {
        //			pum.setEffectID(token);
        //			pum.setSourceType(pc.getObjectType().ordinal());
        //			pum.setSourceID(pc.getObjectUUID());
-        //			pum.setTargetType(pc.getObjectType().ordinal());
+        //			pum.setStartLocType(pc.getObjectType().ordinal());
        //			pum.setTargetID(pc.getObjectUUID());
        //			pum.setNumTrains(40);
        //			pum.setDuration(-1);
@@ -53,7 +53,7 @@ public class SlotNpcCmd extends AbstractDevCmd {
        if (stringIndex == -1)
            return false;

-        // Validate we have a corrent building group name
+        // Validate we have a correct building group name

        for (BuildingGroup group : BuildingGroup.values()) {
            if (group.name().equals(userInput[0].toUpperCase()))
@@ -114,8 +114,7 @@ public class SlotNpcCmd extends AbstractDevCmd {

                if (!DbManager.ContractQueries.updateAllowedBuildings(contract, contract.getAllowedBuildings().toLong())) {
                    Logger.error("Failed to update Database for Contract Allowed buildings");
-                    ChatManager.chatSystemError(pc, "Failed to update Database for Contract Allowed buildings. " +
-                            "Contact A CCR, oh wait, you are a CCR. You're Fubared.");
+                    ChatManager.chatSystemError(pc, "Failed to update Database for Contract Allowed buildings. ");
                    return;
                }

@@ -125,8 +124,7 @@ public class SlotNpcCmd extends AbstractDevCmd {
                contract.getAllowedBuildings().remove(buildingGroup);
                if (!DbManager.ContractQueries.updateAllowedBuildings(contract, contract.getAllowedBuildings().toLong())) {
                    Logger.error("Failed to update Database for Contract Allowed buildings");
-                    ChatManager.chatSystemError(pc, "Failed to update Database for Contract Allowed buildings. " +
-                            "Contact A CCR, oh wait, you are a CCR. You're Fubared.");
+                    ChatManager.chatSystemError(pc, "Failed to update Database for Contract Allowed buildings. ");
                    return;
                }

@@ -138,14 +136,14 @@ public class SlotNpcCmd extends AbstractDevCmd {

    @Override
    protected String _getHelpString() {
-        return "Sets a building slot on a targeted npc";
+        return "Toggles a building group on a targeted npc";
    }

    // Class methods

    @Override
    protected String _getUsageString() {
-        String usage = "/npcslot [BuildingType] on-off \n";
+        String usage = "/npcslot [BuildingGroup] on-off \n";

        for (BuildingGroup group : BuildingGroup.values()) {
            usage += group.name() + ' ';
@@ -1,5 +1,6 @@
 package engine.devcmd.cmds;

+import engine.Enum;
 import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.ZoneManager;
 import engine.math.Vector3fImmutable;
@@ -110,7 +111,7 @@ public class SplatMobCmd extends AbstractDevCmd {

                mobile = Mob.createMob(_mobileUUID,
                        Vector3fImmutable.getRandomPointInCircle(_currentLocation, _targetRange),
-                        null, true, serverZone, null, 0, "", 1);
+                        null, serverZone, null, null, "", 1, Enum.AIAgentType.MOBILE);

                if (mobile != null) {
                    mobile.updateDatabase();
@@ -40,7 +40,7 @@ public class SummonCmd extends AbstractDevCmd {
                Zone zone = ZoneManager.findSmallestZone(pc.getLoc());
                String location = "Somewhere";
                if (zone != null)
-                    location = zone.getName();
+                    location = zone.zoneName;
                RecvSummonsRequestMsg rsrm = new RecvSummonsRequestMsg(pc.getObjectType().ordinal(), pc.getObjectUUID(), pc.getFirstName(),
                        location, false);
                toSummon.getClientConnection().sendMsg(rsrm);
@@ -73,44 +73,41 @@ public class ZoneInfoCmd extends AbstractDevCmd {
        output = "Target Information:" + newline;
        output += StringUtils.addWS("UUID: " + objectUUID, 20);
        output += newline;
-        output += "name: " + zone.getName();
+        output += "name: " + zone.zoneName;
        output += newline;
-        output += "loadNum: " + zone.getLoadNum();
-        if (zone.getParent() != null) {
-            output += StringUtils.addWS(", parent: " + zone.getParent().getObjectUUID(), 30);
-            output += "Parentabs: x: " + zone.getParent().getAbsX() + ", y: " + zone.getParent().getAbsY() + ", z: " + zone.getParent().getAbsZ();
+        output += "loadNum: " + zone.templateID;
+        if (zone.parent != null) {
+            output += StringUtils.addWS(", parent: " + zone.parent.getObjectUUID(), 30);
+            output += "Parentabs: x: " + zone.parent.absX + ", y: " + zone.parent.absY + ", z: " + zone.parent.absZ;

        } else
            output += StringUtils.addWS(", parent: none", 30);
        output += newline;
-        output += "absLoc: x: " + zone.getAbsX() + ", y: " + zone.getAbsY() + ", z: " + zone.getAbsZ();
+        output += "absLoc: x: " + zone.absX + ", y: " + zone.absY + ", z: " + zone.absZ;
        output += newline;
-        output += "offset: x: " + zone.getXCoord() + ", y: " + zone.getYCoord() + ", z: " + zone.getZCoord();
+        output += "offset: x: " + zone.xOffset + ", y: " + zone.yOffset + ", z: " + zone.zOffset;
        output += newline;
-        output += "radius: x: " + zone.getBounds().getHalfExtents().x + ", z: " + zone.getBounds().getHalfExtents().y;
+        output += "radius: x: " + zone.bounds.getHalfExtents().x + ", z: " + zone.bounds.getHalfExtents().y;
        output += newline;

-        if (zone.getHeightMap() != null) {
-            output += "HeightMap ID: " + zone.getHeightMap().getHeightMapID();
+        if (zone.terrain != null) {
+            output += "Terrain image: " + zone.template.terrain_image;
            output += newline;
-            output += "Bucket Width X : " + zone.getHeightMap().getBucketWidthX();
-            output += newline;
-            output += "Bucket Width Y : " + zone.getHeightMap().getBucketWidthY();
-
        }
-        output += "radius: x: " + zone.getBounds().getHalfExtents().x + ", z: " + zone.getBounds().getHalfExtents().y;
+
+        output += "radius: x: " + zone.bounds.getHalfExtents().x + ", z: " + zone.bounds.getHalfExtents().y;
        output += newline;
        //		output += "minLvl = " + zone.getMinLvl() + " | maxLvl = " + zone.getMaxLvl();
        output += newline;
-        output += "Sea Level = " + zone.getSeaLevel();
+        output += "Sea Level = " + zone.sea_level;
        output += newline;
-        output += "World Altitude = " + zone.getWorldAltitude();
+        output += "World Altitude = " + zone.global_height;
        throwbackInfo(player, output);

        City city = ZoneManager.getCityAtLocation(player.getLoc());

        output += newline;
-        output += (city == null) ? "None" : city.getParent().getName();
+        output += (city == null) ? "None" : city.getParent().zoneName;

        if (city != null) {

@@ -123,14 +120,14 @@ public class ZoneInfoCmd extends AbstractDevCmd {
        } else {
            output = "children:";

-            ArrayList<Zone> nodes = zone.getNodes();
+            ArrayList<Zone> nodes = zone.nodes;

            if (nodes.isEmpty())
                output += " none";

            for (Zone child : nodes) {
                output += newline;
-                output += child.getName() + " (" + child.getLoadNum() + ')';
+                output += child.zoneName + " (" + child.templateID + ')';
            }
        }
        throwbackInfo(player, output);
@@ -40,7 +40,7 @@ public class ZoneSetCmd extends AbstractDevCmd {

        zone = ZoneManager.findSmallestZone(playerCharacter.getLoc());

-        throwbackInfo(playerCharacter, zone.getName() + " (" + zone.getLoadNum() + ") " + zone.getObjectUUID());
+        throwbackInfo(playerCharacter, zone.zoneName + " (" + zone.templateID + ") " + zone.getObjectUUID());

        // NPC

@@ -9,12 +9,17 @@

 package engine.devcmd.cmds;

+import engine.Enum;
 import engine.Enum.GameObjectType;
 import engine.devcmd.AbstractDevCmd;
+import engine.gameManager.PowersManager;
+import engine.mobileAI.MobAI;
 import engine.objects.AbstractGameObject;
 import engine.objects.Mob;
 import engine.objects.PlayerCharacter;
+import engine.powers.RunePowerEntry;

+import java.util.ArrayList;
 import java.util.Map;


@@ -56,36 +61,95 @@ public class aiInfoCmd extends AbstractDevCmd {
        Mob mob = (Mob) target;
        output = "Mob AI Information:" + newline;
        output += mob.getName() + newline;
-        if (mob.BehaviourType != null) {
-            output += "BehaviourType: " + mob.BehaviourType.toString() + newline;
-            if (mob.BehaviourType.BehaviourHelperType != null) {
-                output += "Behaviour Helper Type: " + mob.BehaviourType.BehaviourHelperType.toString() + newline;
+        output += mob.agentType.toString() + newline;
+
+        int contractID = 0;
+
+        if (mob.isPlayerGuard() == true) {
+
+            if (mob.agentType.equals(Enum.AIAgentType.GUARDMINION))
+                contractID = mob.guardCaptain.contract.getContractID();
+            else
+                contractID = mob.contract.getContractID();
+        }
+
+        if (contractID != 0) {
+
+            if (mob.agentType.equals(Enum.AIAgentType.GUARDMINION)) {
+                output += "Captain Contract: " + contractID + newline;
+                output += "Captain UUID: " + mob.guardCaptain.getObjectUUID() + newline;
+            } else
+                output += "Contract: " + contractID + newline;
+        }
+
+        if (mob.behaviourType != null) {
+            output += "BehaviourType: " + mob.behaviourType.toString() + newline;
+            if (mob.behaviourType.BehaviourHelperType != null) {
+                output += "Behaviour Helper Type: " + mob.behaviourType.BehaviourHelperType.toString() + newline;
            } else {
                output += "Behaviour Helper Type: NULL" + newline;
-                }
-                output += "Wimpy: " + mob.BehaviourType.isWimpy + newline;
-                output += "Agressive: " + mob.BehaviourType.isAgressive + newline;
-                output += "Can Roam: " + mob.BehaviourType.canRoam + newline;
-                output += "Calls For Help: " + mob.BehaviourType.callsForHelp + newline;
-                output += "Responds To Call For Help: " + mob.BehaviourType.respondsToCallForHelp + newline;
-            } else {
-                output += "BehaviourType: NULL" + newline;
+            }
+            output += "Wimpy: " + mob.behaviourType.isWimpy + newline;
+            output += "Agressive: " + mob.behaviourType.isAgressive + newline;
+            output += "Can Roam: " + mob.behaviourType.canRoam + newline;
+            output += "Calls For Help: " + mob.behaviourType.callsForHelp + newline;
+            output += "Responds To Call For Help: " + mob.behaviourType.respondsToCallForHelp + newline;
+        } else {
+            output += "BehaviourType: NULL" + newline;
            }
            output += "Aggro Range: " + mob.getAggroRange() + newline;
            output += "Player Aggro Map Size: " + mob.playerAgroMap.size() + newline;
        if (mob.playerAgroMap.size() > 0) {
            output += "Players Loaded:" + newline;
        }
-        for (Map.Entry<Integer, Boolean> entry : mob.playerAgroMap.entrySet()) {
-            output += "Player ID: " + entry.getKey() + " Hate Value: " + (PlayerCharacter.getPlayerCharacter(entry.getKey())).getHateValue() + newline;
+        for (Map.Entry<Integer, Float> entry : mob.playerAgroMap.entrySet()) {
+            output += "Player ID: " + entry.getKey() + " Hate Value: " + entry.getValue() + newline;
        }
        if (mob.getCombatTarget() != null)
            output += "Current Target: " + mob.getCombatTarget().getName() + newline;
        else
            output += "Current Target: NULL" + newline;

-        for (int token : mob.mobPowers.keySet())
-            output += token + newline;
+        if (mob.guardedCity != null)
+            output += "Patrolling: " + mob.guardedCity.getCityName() + newline;
+        output += "See Invis Level: "  + mob.mobBase.getSeeInvis() + newline;
+        output += "Can Cast: " + MobAI.canCast(mob) + newline;
+        output += "Powers:" + newline;
+
+        ArrayList<RunePowerEntry> powerEntries = new ArrayList<>(PowersManager.getPowersForRune(mob.getMobBaseID()));
+
+        // Additional powers may come from the contract ID.  This is to support
+        // powers for player guards irrespective of the mobbase used.
+
+        if (mob.isPlayerGuard()) {
+
+            ArrayList<RunePowerEntry> contractEntries = new ArrayList<>();
+
+            if (mob.contract != null)
+                contractEntries = new ArrayList<>(PowersManager.getPowersForRune(mob.contractUUID));
+
+            if (mob.agentType.equals(Enum.AIAgentType.GUARDMINION))
+                contractEntries = new ArrayList<>(PowersManager.getPowersForRune(mob.guardCaptain.contractUUID));
+
+            powerEntries.addAll(contractEntries);
+
+        }
+
+        for (RunePowerEntry runePowerEntry : powerEntries)
+            output += PowersManager.getPowerByToken(runePowerEntry.token).getName() + newline;
+
+        // List outlaws defined for this player guard's city
+
+        if (mob.isPlayerGuard()) {
+
+            ArrayList<Integer> outlaws = new ArrayList(mob.guardedCity.cityOutlaws);
+
+            if (outlaws.isEmpty() == false)
+                output += "Outlaws: " + newline;
+
+            for (Integer outlawUUID : outlaws)
+                output += outlawUUID + newline;
+        }

        throwbackInfo(playerCharacter, output);
    }
@@ -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 |
@@ -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 |
@@ -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`)
@@ -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
-
@@ -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 |
@@ -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 |
@@ -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 |
@@ -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 |
@@ -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 |
@@ -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 |
@@ -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 |
@@ -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 |
@@ -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 |
@@ -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 |
@@ -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 |
@@ -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 |
@@ -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 |
@@ -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 |
@@ -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 |
@@ -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 |
@@ -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 |
@@ -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 |
@@ -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 |
@@ -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 |
@@ -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 |
@@ -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 |
@@ -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 |
@@ -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 |
@@ -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 |
@@ -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
@@ -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
@@ -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 |
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/`
@@ -31,6 +31,7 @@ import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ThreadLocalRandom;

 public enum BuildingManager {
@@ -40,6 +41,9 @@ public enum BuildingManager {
    public static HashMap<Integer, ArrayList<BuildingLocation>> _stuckLocations = new HashMap<>();
    public static HashMap<Integer, ArrayList<BuildingLocation>> _slotLocations = new HashMap<>();

+    public static HashMap<Integer, ConcurrentHashMap<Integer, BuildingFriends>> _buildingFriends = new HashMap<>();
+    public static HashMap<Integer, ConcurrentHashMap<Integer, Condemned>> _buildingCondemned = new HashMap<>();
+    public static HashMap<Integer, ArrayList<Vector3fImmutable>> _buildingPatrolPoints = new HashMap<>();
    public static int getAvailableSlot(Building building) {

        ArrayList<BuildingLocation> slotLocations = _slotLocations.get(building.meshUUID);
@@ -104,7 +108,6 @@ public enum BuildingManager {
        if (building == null)
            return false;

-
        if (building.getRank() == -1)
            return false;

@@ -112,26 +115,25 @@ public enum BuildingManager {
            return true;

        //individual friend.
-        if (building.getFriends().get(player.getObjectUUID()) != null)
+        if (building.getFriends() != null && building.getFriends().get(player.getObjectUUID()) != null)
            return true;

-        //Admin's can access stuff
+        //Admins can access stuff

        if (player.isCSR())
            return true;

        //Guild stuff

-
-        if (building.getGuild() != null && building.getGuild().isGuildLeader(player.getObjectUUID()))
+        if (building.getGuild().isGuildLeader(player.getObjectUUID()))
            return true;

        if (building.getFriends().get(player.getGuild().getObjectUUID()) != null
-                && building.getFriends().get(player.getGuild().getObjectUUID()).getFriendType() == 8)
+                && building.getFriends().get(player.getGuild().getObjectUUID()).friendType == 8)
            return true;

        if (building.getFriends().get(player.getGuild().getObjectUUID()) != null
-                && building.getFriends().get(player.getGuild().getObjectUUID()).getFriendType() == 9
+                && building.getFriends().get(player.getGuild().getObjectUUID()).friendType == 9
                && GuildStatusController.isInnerCouncil(player.getGuildStatus()))
            return true;

@@ -232,15 +234,15 @@ public enum BuildingManager {
                        ChatManager.chatSystemInfo(player, "You can not carry any more of that item.");
                        return false;
                    }
-                    if (warehouse.getResources().get(resourceBase) == null)
+                    if (warehouse.resources.get(resourceBase) == null)
                        continue;

-                    int resourceAmount = warehouse.getResources().get(resourceBase);
+                    int resourceAmount = warehouse.resources.get(resourceBase);

                    if (resourceAmount <= 0)
                        continue;

-                    if (warehouse.loot(player, resourceBase, resourceAmount, true))
+                    if (Warehouse.loot(warehouse, player, resourceBase, resourceAmount, true))
                        ChatManager.chatInfoInfo(player, "You have looted " + resourceAmount + ' ' + resourceBase.getName());
                }
                break;
@@ -308,6 +310,72 @@ public enum BuildingManager {

    }

+    public static void removeHireling(Building building, AbstractCharacter hireling) {
+
+        if (hireling.getObjectType().equals(GameObjectType.Mob)) {
+
+            Mob guardCaptain = (Mob) hireling;
+
+            // Clear minions from database if a guard captain
+
+            if (guardCaptain.agentType.equals(Enum.AIAgentType.GUARDCAPTAIN))
+                DbManager.MobQueries.REMOVE_ALL_MINIONS(hireling.getObjectUUID());
+        }
+
+        // Clear minions from world
+
+        for (Integer minionUUID : hireling.minions) {
+            Mob minionMob = Mob.getMob(minionUUID);
+            DbManager.removeFromCache(minionMob);
+            WorldGrid.RemoveWorldObject(minionMob);
+            WorldGrid.unloadObject(minionMob);
+
+            if (minionMob.getParentZone() != null)
+                minionMob.getParentZone().zoneMobSet.remove(minionMob);
+        }
+
+        // Remove hireling from building
+
+        building.getHirelings().remove(hireling);
+
+        // Remove from zone mob set
+
+        if (hireling.getObjectType().equals(GameObjectType.Mob)) {
+
+            Mob hirelingMob = (Mob) hireling;
+
+            if (hirelingMob.getParentZone() != null)
+                if (hirelingMob.getParentZone().zoneMobSet.contains(hirelingMob))
+                    hirelingMob.getParentZone().zoneMobSet.remove(hireling);
+
+        }
+
+        if (hireling.getObjectType().equals(GameObjectType.NPC)) {
+
+            NPC hirelingNPC = (NPC) hireling;
+
+            if (hirelingNPC.getParentZone() != null)
+                if (hirelingNPC.getParentZone().zoneNPCSet.contains(hirelingNPC))
+                    hirelingNPC.getParentZone().zoneNPCSet.remove(hireling);
+
+        }
+
+        // Unload hireling from world
+
+        DbManager.removeFromCache(hireling);
+        WorldGrid.RemoveWorldObject(hireling);
+        WorldGrid.removeObject(hireling);
+
+        // Delete hireling from database
+
+        if (hireling.getObjectType().equals(GameObjectType.Mob))
+            DbManager.MobQueries.DELETE_MOB((Mob) hireling);
+        else
+            DbManager.NPCQueries.DELETE_NPC((NPC) hireling);
+
+    }
+
+
    public static void cleanupHirelings(Building building) {

        // Early exit:  Cannot have hirelings in a building
@@ -320,42 +388,18 @@ public enum BuildingManager {

        if (building.getRank() < 1) {

-            for (AbstractCharacter slottedNPC : building.getHirelings().keySet()) {
+            for (AbstractCharacter slottedNPC : building.getHirelings().keySet())
+                BuildingManager.removeHireling(building, slottedNPC);

-                if (slottedNPC.getObjectType() == Enum.GameObjectType.NPC)
-                    ((NPC) slottedNPC).remove();
-                else if (slottedNPC.getObjectType() == Enum.GameObjectType.Mob)
-                    NPCManager.removeMobileFromBuilding(((Mob) slottedNPC), building);
-            }
            return;
        }

        // Delete hireling if building has deranked.
-        for (AbstractCharacter hireling : building.getHirelings().keySet()) {
-
-            NPC npc = null;
-            Mob mob = null;

-            if (hireling.getObjectType() == Enum.GameObjectType.NPC)
-                npc = (NPC) hireling;
-            else if (hireling.getObjectType() == Enum.GameObjectType.Mob)
-                mob = (Mob) hireling;
+        for (AbstractCharacter hireling : building.getHirelings().keySet()) {

            if (building.getHirelings().get(hireling) > building.getBlueprint().getSlotsForRank(building.getRank()))
-
-                if (npc != null) {
-                    if (!npc.remove())
-                        Logger.error("Failed to remove npc " + npc.getObjectUUID()
-                                + "from Building " + building.getObjectUUID());
-                    else
-                        building.getHirelings().remove(npc);
-                } else if (mob != null) {
-                    if (!NPCManager.removeMobileFromBuilding(mob, building))
-                        Logger.error("Failed to remove npc " + npc.getObjectUUID()
-                                + "from Building " + building.getObjectUUID());
-                    else
-                        building.getHirelings().remove(npc);
-                }
+                BuildingManager.removeHireling(building, hireling);

        }

@@ -452,18 +496,18 @@ public enum BuildingManager {

            Condemned condemn = building.getCondemned().get(player.getObjectUUID());

-            if (condemn != null && condemn.isActive())
+            if (condemn != null && condemn.active)
                return true;

            if (player.getGuild() != null) {

                Condemned guildCondemn = building.getCondemned().get(player.getGuild().getObjectUUID());

-                if (guildCondemn != null && guildCondemn.isActive())
+                if (guildCondemn != null && guildCondemn.active)
                    return true;

                Condemned nationCondemn = building.getCondemned().get(player.getGuild().getNation().getObjectUUID());
-                return nationCondemn != null && nationCondemn.isActive() && nationCondemn.getFriendType() == Condemned.NATION;
+                return nationCondemn != null && nationCondemn.active && nationCondemn.friendType == Condemned.NATION;
            } else {
                //TODO ADD ERRANT KOS CHECK
            }
@@ -471,18 +515,18 @@ public enum BuildingManager {

            Condemned condemn = building.getCondemned().get(player.getObjectUUID());

-            if (condemn != null && condemn.isActive())
+            if (condemn != null && condemn.active)
                return false;

            if (player.getGuild() != null) {

                Condemned guildCondemn = building.getCondemned().get(player.getGuild().getObjectUUID());

-                if (guildCondemn != null && guildCondemn.isActive())
+                if (guildCondemn != null && guildCondemn.active)
                    return false;

                Condemned nationCondemn = building.getCondemned().get(player.getGuild().getNation().getObjectUUID());
-                return nationCondemn == null || !nationCondemn.isActive() || nationCondemn.getFriendType() != Condemned.NATION;
+                return nationCondemn == null || !nationCondemn.active || nationCondemn.friendType != Condemned.NATION;
            } else {
                //TODO ADD ERRANT KOS CHECK
            }
@@ -501,7 +545,7 @@ public enum BuildingManager {

        NPC npc = null;

-        npc = NPC.createNPC(pirateName, NpcID.getObjectUUID(), NpcLoc, null, zone, (short) rank, building);
+        npc = NPC.createNPC(pirateName, NpcID.getObjectUUID(), NpcLoc, building.getGuild(), zone, (short) rank, building);

        if (npc == null)
            return false;
@@ -530,41 +574,63 @@ public enum BuildingManager {
        else
            rank = 10;

-        Mob mob;
+        Mob mobile;
        NPC npc;

        if (NPC.ISWallArcher(contract)) {

-            mob = Mob.createMob(contract.getMobbaseID(), Vector3fImmutable.ZERO, contractOwner.getGuild(), true, zone, building, contract.getContractID(), pirateName, rank);
+            mobile = Mob.createMob(contract.getMobbaseID(), Vector3fImmutable.ZERO, contractOwner.getGuild(), zone, building, contract, pirateName, rank, Enum.AIAgentType.GUARDWALLARCHER);

-            if (mob == null)
+            if (mobile == null)
                return false;

-            mob.setLoc(mob.getLoc());
+            // Configure AI and write new mobile to disk
+
+            mobile.behaviourType = Enum.MobBehaviourType.GuardWallArcher;
+            mobile = DbManager.MobQueries.PERSIST(mobile);
+
+            // Spawn new mobile
+
+            mobile.setLoc(mobile.getLoc());

            return true;
        }

        if (NPC.ISGuardCaptain(contract.getContractID())) {

-            mob = Mob.createMob(contract.getMobbaseID(), Vector3fImmutable.ZERO, contractOwner.getGuild(), true, zone, building, contract.getContractID(), pirateName, rank);
+            mobile = Mob.createMob(contract.getMobbaseID(), Vector3fImmutable.ZERO, contractOwner.getGuild(), zone, building, contract, pirateName, rank, Enum.AIAgentType.GUARDCAPTAIN);

-            if (mob == null)
+            if (mobile == null)
                return false;

-            mob.setLoc(mob.getLoc());
+            // Configure AI and write new mobile to disk
+
+            mobile.behaviourType = Enum.MobBehaviourType.GuardCaptain;
+            mobile = DbManager.MobQueries.PERSIST(mobile);
+
+            // Spawn new mobile
+
+            mobile.setLoc(mobile.getLoc());

            return true;
        }
+
        if (contract.getContractID() == 910) {

            //guard dog
-            mob = Mob.createMob(contract.getMobbaseID(), Vector3fImmutable.ZERO, contractOwner.getGuild(), true, zone, building, contract.getContractID(), pirateName, rank);
+            mobile = Mob.createMob(contract.getMobbaseID(), Vector3fImmutable.ZERO, contractOwner.getGuild(), zone, building, contract, pirateName, rank, Enum.AIAgentType.GUARDCAPTAIN);

-            if (mob == null)
+            if (mobile == null)
                return false;

-            mob.setLoc(mob.getLoc());
+            // Configure AI and write new mobile to disk
+
+            mobile.behaviourType = Enum.MobBehaviourType.GuardCaptain;
+            mobile = DbManager.MobQueries.PERSIST(mobile);
+
+            // Spawn new mobile
+
+            mobile.setLoc(mobile.getLoc());

            return true;
        }
@@ -787,4 +853,111 @@ public enum BuildingManager {
        }

    }
+
+    public static void rebuildMine(Building mineBuilding) {
+        setRank(mineBuilding, 1);
+        mineBuilding.meshUUID = mineBuilding.getBlueprint().getMeshForRank(mineBuilding.rank);
+
+        // New rank mean new max hit points.
+
+        mineBuilding.healthMax = mineBuilding.getBlueprint().getMaxHealth(mineBuilding.rank);
+        mineBuilding.setCurrentHitPoints(mineBuilding.healthMax);
+        mineBuilding.getBounds().setBounds(mineBuilding);
+    }
+
+    public static void setRank(Building building, int rank) {
+
+        int newMeshUUID;
+        boolean success;
+
+
+        // If this building has no blueprint then set rank and exit immediatly.
+
+        if (building.blueprintUUID == 0 || building.getBlueprint() != null && building.getBlueprint().getBuildingGroup().equals(BuildingGroup.MINE)) {
+            building.rank = rank;
+            DbManager.BuildingQueries.CHANGE_RANK(building.getObjectUUID(), rank);
+            return;
+        }
+
+        // Delete any upgrade jobs before doing anything else.  It won't quite work
+        // if in a few lines we happen to delete this building.
+
+        JobContainer jc = building.getTimers().get("UPGRADE");
+
+        if (jc != null) {
+            if (!JobScheduler.getInstance().cancelScheduledJob(jc))
+                Logger.error("failed to cancel existing upgrade job.");
+        }
+
+        // Attempt write to database, or delete the building
+        // if we are destroying it.
+
+        if (rank == -1)
+            success = DbManager.BuildingQueries.DELETE_FROM_DATABASE(building);
+        else
+            success = DbManager.BuildingQueries.updateBuildingRank(building, rank);
+
+        if (success == false) {
+            Logger.error("Error writing to database UUID: " + building.getObjectUUID());
+            return;
+        }
+
+        building.isDeranking.compareAndSet(false, true);
+
+        // Change the building's rank
+
+        building.rank = rank;
+
+        // New rank means new mesh
+
+        newMeshUUID = building.getBlueprint().getMeshForRank(building.rank);
+        building.meshUUID = newMeshUUID;
+
+        // New rank mean new max hitpoints.
+
+        building.healthMax = building.getBlueprint().getMaxHealth(building.rank);
+        building.setCurrentHitPoints(building.healthMax);
+
+        if (building.getUpgradeDateTime() != null)
+            setUpgradeDateTime(building, null, 0);
+
+        // If we destroyed this building make sure to turn off
+        // protection
+
+        if (building.rank == -1)
+            building.protectionState = Enum.ProtectionState.NONE;
+
+        if ((building.getBlueprint().getBuildingGroup() == BuildingGroup.TOL)
+                && (building.rank == 8))
+            building.meshUUID = Realm.getRealmMesh(building.getCity());
+
+        // update object to clients
+
+        building.refresh(true);
+
+        if (building.getBounds() != null)
+            building.getBounds().setBounds(building);
+
+        // Cleanup hirelings resulting from rank change
+
+        cleanupHirelings(building);
+
+        building.isDeranking.compareAndSet(true, false);
+    }
+
+    public static Building getBuildingAtLocation(Vector3fImmutable loc) {
+
+        for (AbstractWorldObject awo : WorldGrid.getObjectsInRangePartial(loc, 64, MBServerStatics.MASK_BUILDING)) {
+            Building building = (Building) awo;
+
+            if (building == null)
+                continue;
+
+            if (Bounds.collide(loc, building.getBounds()))
+                return building;
+
+        }
+        return null;
+    }
+
 }
@@ -788,7 +788,7 @@ public enum ChatManager {
                        it.remove();
                    else {
                        PlayerCharacter pcc = (PlayerCharacter) awo;
-                        if (pcc.getSeeInvis() < pc.getHidden())
+                        if (pcc.getSeeInvis() < pc.hidden)
                            it.remove();
                    }
                }
@@ -30,8 +30,6 @@ import java.util.HashSet;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ThreadLocalRandom;

-import static engine.math.FastMath.sqr;
-
 public enum CombatManager {

    COMBATMANAGER;
@@ -41,63 +39,6 @@ public enum CombatManager {
    /**
     * Message sent by player to attack something.
     */
-    public static void setAttackTarget(AttackCmdMsg msg, ClientConnection origin) throws MsgSendException {
-
-        PlayerCharacter player;
-        int targetType;
-        AbstractWorldObject target;
-
-        if (TargetedActionMsg.un2cnt == 60 || TargetedActionMsg.un2cnt == 70)
-            return;
-
-        player = SessionManager.getPlayerCharacter(origin);
-
-        if (player == null)
-            return;
-
-        //source must match player this account belongs to
-
-        if (player.getObjectUUID() != msg.getSourceID() || player.getObjectType().ordinal() != msg.getSourceType()) {
-            Logger.error("Msg Source ID " + msg.getSourceID() + " Does not Match Player ID " + player.getObjectUUID());
-            return;
-        }
-
-        targetType = msg.getTargetType();
-
-        if (targetType == GameObjectType.PlayerCharacter.ordinal()) {
-            target = PlayerCharacter.getFromCache(msg.getTargetID());
-        } else if (targetType == GameObjectType.Building.ordinal()) {
-            target = BuildingManager.getBuildingFromCache(msg.getTargetID());
-        } else if (targetType == GameObjectType.Mob.ordinal()) {
-            target = Mob.getFromCache(msg.getTargetID());
-        } else {
-            player.setCombatTarget(null);
-            return; //not valid type to attack
-        }
-
-        // quit of the combat target is already the current combat target
-        // or there is no combat target
-
-        if (target == null)
-            return;
-
-        //set sources target
-
-        player.setCombatTarget(target);
-
-        //put in combat if not already
-
-        if (!player.isCombat())
-            toggleCombat(true, origin);
-
-        //make character stand if sitting
-
-        if (player.isSit())
-            toggleSit(false, origin);
-
-        AttackTarget(player, target);
-
-    }

    public static void AttackTarget(PlayerCharacter playerCharacter, AbstractWorldObject target) {

@@ -141,11 +82,6 @@ public enum CombatManager {
            if (off == null)
                CombatManager.createTimer(playerCharacter, MBServerStatics.SLOT_OFFHAND, 1, true); // attack in 0.1 of a second
        }
-
-        City playerCity = ZoneManager.getCityAtLocation(playerCharacter.getLoc());
-
-        if (playerCity != null && playerCity.getGuild().getNation().equals(playerCharacter.getGuild().getNation()) == false && playerCity.cityOutlaws.contains(playerCharacter.getObjectUUID()) == false)
-            playerCity.cityOutlaws.add(playerCharacter.getObjectUUID());
    }

    public static void setAttackTarget(PetAttackMsg msg, ClientConnection origin) throws MsgSendException {
@@ -523,7 +459,7 @@ public enum CombatManager {
    /**
     * Attempt to attack target
     */
-    private static void attack(AbstractCharacter ac, AbstractWorldObject target, Item weapon, ItemBase wb, boolean mainHand) {
+    private static void attack(AbstractCharacter attacker, AbstractWorldObject target, Item weapon, ItemBase wb, boolean mainHand) {

        float atr;
        int minDamage, maxDamage;
@@ -531,20 +467,20 @@ public enum CombatManager {

        try {

-            if (ac == null)
+            if (attacker == null)
                return;

            if (target == null)
                return;

            if (mainHand) {
-                atr = ac.getAtrHandOne();
-                minDamage = ac.getMinDamageHandOne();
-                maxDamage = ac.getMaxDamageHandOne();
+                atr = attacker.getAtrHandOne();
+                minDamage = attacker.getMinDamageHandOne();
+                maxDamage = attacker.getMaxDamageHandOne();
            } else {
-                atr = ac.getAtrHandTwo();
-                minDamage = ac.getMinDamageHandTwo();
-                maxDamage = ac.getMaxDamageHandTwo();
+                atr = attacker.getAtrHandTwo();
+                minDamage = attacker.getMinDamageHandTwo();
+                maxDamage = attacker.getMaxDamageHandTwo();
            }

            boolean tarIsRat = false;
@@ -563,9 +499,9 @@ public enum CombatManager {
            //Dont think we need to do this anymore.

            if (tarIsRat)
-                if (ac.getBonuses().getFloatPercentAll(ModType.Slay, SourceType.Rat) != 0) {   //strip away current % dmg buffs then add with rat %
+                if (attacker.getBonuses().getFloatPercentAll(ModType.Slay, SourceType.Rat) != 0) {   //strip away current % dmg buffs then add with rat %

-                    float percent = 1 + ac.getBonuses().getFloatPercentAll(ModType.Slay, SourceType.Rat);
+                    float percent = 1 + attacker.getBonuses().getFloatPercentAll(ModType.Slay, SourceType.Rat);

                    minDamage *= percent;
                    maxDamage *= percent;
@@ -576,24 +512,24 @@ public enum CombatManager {
            //subtract stamina

            if (wb == null)
-                ac.modifyStamina(-0.5f, ac, true);
+                attacker.modifyStamina(-0.5f, attacker, true);
            else {
                float stam = wb.getWeight() / 3;
                stam = (stam < 1) ? 1 : stam;
-                ac.modifyStamina(-(stam), ac, true);
+                attacker.modifyStamina(-(stam), attacker, true);
            }

-            ac.cancelOnAttackSwing();
+            attacker.cancelOnAttackSwing();

            errorTrack = 2;

            //set last time this player has attacked something.

-            if (target.getObjectType().equals(GameObjectType.PlayerCharacter) && target.getObjectUUID() != ac.getObjectUUID() && ac.getObjectType() == GameObjectType.PlayerCharacter) {
-                ac.setTimeStamp("LastCombatPlayer", System.currentTimeMillis());
+            if (target.getObjectType().equals(GameObjectType.PlayerCharacter) && target.getObjectUUID() != attacker.getObjectUUID() && attacker.getObjectType() == GameObjectType.PlayerCharacter) {
+                attacker.setTimeStamp("LastCombatPlayer", System.currentTimeMillis());
                ((PlayerCharacter) target).setTimeStamp("LastCombatPlayer", System.currentTimeMillis());
            } else
-                ac.setTimeStamp("LastCombatMob", System.currentTimeMillis());
+                attacker.setTimeStamp("LastCombatMob", System.currentTimeMillis());

            errorTrack = 3;

@@ -604,42 +540,16 @@ public enum CombatManager {
            if (target.getObjectType().equals(GameObjectType.Building)) {

                if (BuildingManager.getBuildingFromCache(target.getObjectUUID()) == null) {
-                    ac.setCombatTarget(null);
+                    attacker.setCombatTarget(null);
                    return;
                }

                defense = 0;

-                Building building = (Building) target;
-
-                if (building.getParentZone() != null && building.getParentZone().isPlayerCity()) {
-
-                    if (System.currentTimeMillis() > building.getTimeStamp("CallForHelp")) {
-
-                        building.getTimestamps().put("CallForHelp", System.currentTimeMillis() + 15000);
-
-                        for (Mob mob : building.getParentZone().zoneMobSet) {
-                            if (!mob.isPlayerGuard())
-                                continue;
-
-                            if (mob.getCombatTarget() != null)
-                                continue;
-
-                            if (mob.getGuild() != null && building.getGuild() != null)
-                                if (!Guild.sameGuild(mob.getGuild().getNation(), building.getGuild().getNation()))
-                                    continue;
-
-                            if (mob.getLoc().distanceSquared2D(building.getLoc()) > sqr(300))
-                                continue;
-
-                            mob.setCombatTarget(ac);
-                        }
-                    }
-                }
            } else {
                AbstractCharacter tar = (AbstractCharacter) target;
                defense = tar.getDefenseRating();
-                handleRetaliate(tar, ac);   //Handle target attacking back if in combat and has no other target
+                handleRetaliate(tar, attacker);   //Handle target attacking back if in combat and has no other target
            }

            errorTrack = 4;
@@ -665,11 +575,11 @@ public enum CombatManager {

            if (roll < chance) {

-                if (ac.getObjectType().equals(GameObjectType.PlayerCharacter))
-                    updateAttackTimers((PlayerCharacter) ac, target, true);
+                if (attacker.getObjectType().equals(GameObjectType.PlayerCharacter))
+                    updateAttackTimers((PlayerCharacter) attacker, target, true);

                boolean skipPassives = false;
-                PlayerBonuses bonuses = ac.getBonuses();
+                PlayerBonuses bonuses = attacker.getBonuses();

                if (bonuses != null && bonuses.getBool(ModType.IgnorePassiveDefense, SourceType.None))
                    skipPassives = true;
@@ -684,26 +594,26 @@ public enum CombatManager {
                // Apply Weapon power effect if any. don't try to apply twice if
                // dual wielding. Perform after passive test for sync purposes.

-                if (ac.getObjectType().equals(GameObjectType.PlayerCharacter) && (mainHand || wb.isTwoHanded())) {
+                if (attacker.getObjectType().equals(GameObjectType.PlayerCharacter) && (mainHand || wb.isTwoHanded())) {

-                    dpj = ((PlayerCharacter) ac).getWeaponPower();
+                    dpj = ((PlayerCharacter) attacker).getWeaponPower();

                    if (dpj != null) {

-                        PlayerBonuses bonus = ac.getBonuses();
+                        PlayerBonuses bonus = attacker.getBonuses();
                        float attackRange = getWeaponRange(wb, bonus);
                        dpj.attack(target, attackRange);

                        if (dpj.getPower() != null && (dpj.getPowerToken() == -1851459567 || dpj.getPowerToken() == -1851489518))
-                            ((PlayerCharacter) ac).setWeaponPower(dpj);
+                            ((PlayerCharacter) attacker).setWeaponPower(dpj);
                    }
                }

                //check to apply second backstab.

-                if (ac.getObjectType().equals(GameObjectType.PlayerCharacter) && !mainHand) {
+                if (attacker.getObjectType().equals(GameObjectType.PlayerCharacter) && !mainHand) {

-                    dpj = ((PlayerCharacter) ac).getWeaponPower();
+                    dpj = ((PlayerCharacter) attacker).getWeaponPower();

                    if (dpj != null && dpj.getPower() != null && (dpj.getPowerToken() == -1851459567 || dpj.getPowerToken() == -1851489518)) {
                        float attackRange = getWeaponRange(wb, bonuses);
@@ -723,24 +633,24 @@ public enum CombatManager {

                        //Handle Block passive

-                        if (testPassive(ac, tarAc, "Block") && canTestBlock(ac, target)) {
+                        if (testPassive(attacker, tarAc, "Block") && canTestBlock(attacker, target)) {

                            if (!target.isAlive())
                                return;

-                            sendPassiveDefenseMessage(ac, wb, target, MBServerStatics.COMBAT_SEND_BLOCK, dpj, mainHand);
+                            sendPassiveDefenseMessage(attacker, wb, target, MBServerStatics.COMBAT_SEND_BLOCK, dpj, mainHand);
                            passiveFired = true;
                        }

                        //Handle Parry passive

                        if (!passiveFired)
-                            if (canTestParry(ac, target) && testPassive(ac, tarAc, "Parry")) {
+                            if (canTestParry(attacker, target) && testPassive(attacker, tarAc, "Parry")) {

                                if (!target.isAlive())
                                    return;

-                                sendPassiveDefenseMessage(ac, wb, target, MBServerStatics.COMBAT_SEND_PARRY, dpj, mainHand);
+                                sendPassiveDefenseMessage(attacker, wb, target, MBServerStatics.COMBAT_SEND_PARRY, dpj, mainHand);
                                passiveFired = true;
                            }

@@ -751,12 +661,12 @@ public enum CombatManager {
                    //Handle Dodge passive

                    if (!passiveFired)
-                        if (testPassive(ac, tarAc, "Dodge")) {
+                        if (testPassive(attacker, tarAc, "Dodge")) {

                            if (!target.isAlive())
                                return;

-                            sendPassiveDefenseMessage(ac, wb, target, MBServerStatics.COMBAT_SEND_DODGE, dpj, mainHand);
+                            sendPassiveDefenseMessage(attacker, wb, target, MBServerStatics.COMBAT_SEND_DODGE, dpj, mainHand);
                            passiveFired = true;
                        }
                }
@@ -772,7 +682,7 @@ public enum CombatManager {
                //if target is player, set last attack timestamp

                if (target.getObjectType().equals(GameObjectType.PlayerCharacter))
-                    updateAttackTimers((PlayerCharacter) target, ac, false);
+                    updateAttackTimers((PlayerCharacter) target, attacker, false);

                //Get damage Type

@@ -780,7 +690,7 @@ public enum CombatManager {

                if (wb != null)
                    damageType = wb.getDamageType();
-                else if (ac.getObjectType().equals(GameObjectType.Mob) && ((Mob) ac).isSiege())
+                else if (attacker.getObjectType().equals(GameObjectType.Mob) && ((Mob) attacker).isSiege())
                    damageType = DamageType.Siege;
                else
                    damageType = DamageType.Crush;
@@ -799,7 +709,7 @@ public enum CombatManager {
                //make sure target is not immune to damage type;

                if (resists != null && resists.immuneTo(damageType)) {
-                    sendCombatMessage(ac, target, 0f, wb, dpj, mainHand);
+                    sendCombatMessage(attacker, target, 0f, wb, dpj, mainHand);
                    return;
                }

@@ -810,9 +720,9 @@ public enum CombatManager {
                float damage;

                if (wb != null)
-                    damage = calculateDamage(ac, tarAc, minDamage, maxDamage, damageType, resists);
+                    damage = calculateDamage(attacker, tarAc, minDamage, maxDamage, damageType, resists);
                else
-                    damage = calculateDamage(ac, tarAc, minDamage, maxDamage, damageType, resists);
+                    damage = calculateDamage(attacker, tarAc, minDamage, maxDamage, damageType, resists);

                float d = 0f;

@@ -825,40 +735,35 @@ public enum CombatManager {
                    if (tarAc.isSit())
                        damage *= 2.5f; //increase damage if sitting

-                    if (tarAc.getObjectType() == GameObjectType.Mob) {
-                        ac.setHateValue(damage * MBServerStatics.PLAYER_COMBAT_HATE_MODIFIER);
-                        ((Mob) tarAc).handleDirectAggro(ac);
-                    }
-
                    if (tarAc.getHealth() > 0)
-                        d = tarAc.modifyHealth(-damage, ac, false);
+                        d = tarAc.modifyHealth(-damage, attacker, false);

                } else if (target.getObjectType().equals(GameObjectType.Building)) {

                    if (BuildingManager.getBuildingFromCache(target.getObjectUUID()) == null) {
-                        ac.setCombatTarget(null);
+                        attacker.setCombatTarget(null);
                        return;
                    }

                    if (target.getHealth() > 0)
-                        d = ((Building) target).modifyHealth(-damage, ac);
+                        d = ((Building) target).modifyHealth(-damage, attacker);
                }

                errorTrack = 13;

                //Test to see if any damage needs done to weapon or armor

-                testItemDamage(ac, target, weapon, wb);
+                testItemDamage(attacker, target, weapon, wb);

                // if target is dead, we got the killing blow, remove attack timers on our weapons

                if (tarAc != null && !tarAc.isAlive())
-                    removeAttackTimers(ac);
+                    removeAttackTimers(attacker);

                //test double death fix

                if (d != 0)
-                    sendCombatMessage(ac, target, damage, wb, dpj, mainHand); //send damage message
+                    sendCombatMessage(attacker, target, damage, wb, dpj, mainHand); //send damage message

                errorTrack = 14;

@@ -885,7 +790,7 @@ public enum CombatManager {
                                    int procChance = ThreadLocalRandom.current().nextInt(100);

                                    if (procChance < MBServerStatics.PROC_CHANCE)
-                                        ((WeaponProcEffectModifier) aem).applyProc(ac, target);
+                                        ((WeaponProcEffectModifier) aem).applyProc(attacker, target);

                                }
                            }
@@ -897,52 +802,52 @@ public enum CombatManager {

                //handle damage shields

-                if (ac.isAlive() && tarAc != null && tarAc.isAlive())
-                    handleDamageShields(ac, tarAc, damage);
+                if (attacker.isAlive() && tarAc != null && tarAc.isAlive())
+                    handleDamageShields(attacker, tarAc, damage);

            } else {

                // Apply Weapon power effect if any.
                // don't try to apply twice if dual wielding.

-                if (ac.getObjectType().equals(GameObjectType.PlayerCharacter) && (mainHand || wb.isTwoHanded())) {
-                    dpj = ((PlayerCharacter) ac).getWeaponPower();
+                if (attacker.getObjectType().equals(GameObjectType.PlayerCharacter) && (mainHand || wb.isTwoHanded())) {
+                    dpj = ((PlayerCharacter) attacker).getWeaponPower();

                    if (dpj != null) {

                        PowersBase wp = dpj.getPower();

                        if (wp.requiresHitRoll() == false) {
-                            PlayerBonuses bonus = ac.getBonuses();
+                            PlayerBonuses bonus = attacker.getBonuses();
                            float attackRange = getWeaponRange(wb, bonus);
                            dpj.attack(target, attackRange);
                        } else
-                            ((PlayerCharacter) ac).setWeaponPower(null);
+                            ((PlayerCharacter) attacker).setWeaponPower(null);
                    }
                }

                if (target.getObjectType() == GameObjectType.Mob)
-                    ((Mob) target).handleDirectAggro(ac);
+                    ((Mob) target).handleDirectAggro(attacker);

                errorTrack = 17;

                //miss, Send miss message

-                sendCombatMessage(ac, target, 0f, wb, dpj, mainHand);
+                sendCombatMessage(attacker, target, 0f, wb, dpj, mainHand);

                //if attacker is player, set last attack timestamp

-                if (ac.getObjectType().equals(GameObjectType.PlayerCharacter))
-                    updateAttackTimers((PlayerCharacter) ac, target, true);
+                if (attacker.getObjectType().equals(GameObjectType.PlayerCharacter))
+                    updateAttackTimers((PlayerCharacter) attacker, target, true);
            }

            errorTrack = 18;

            //cancel effects that break on attack or attackSwing
-            ac.cancelOnAttack();
+            attacker.cancelOnAttack();

        } catch (Exception e) {
-            Logger.error(ac.getName() + ' ' + errorTrack + ' ' + e);
+            Logger.error(attacker.getName() + ' ' + errorTrack + ' ' + e);
        }
    }

@@ -1220,7 +1125,7 @@ public enum CombatManager {
        toggleCombat(msg.getToggle(), origin);
    }

-    private static void toggleCombat(boolean toggle, ClientConnection origin) {
+    public static void toggleCombat(boolean toggle, ClientConnection origin) {

        PlayerCharacter pc = SessionManager.getPlayerCharacter(origin);

@@ -1237,7 +1142,7 @@ 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);

@@ -1267,61 +1172,69 @@ public enum CombatManager {
    }

    //Called when character takes damage.
-    public static void handleRetaliate(AbstractCharacter tarAc, AbstractCharacter ac) {
+    public static void handleRetaliate(AbstractCharacter target, AbstractCharacter attacker) {

-        if (ac == null || tarAc == null)
+        if (attacker == null || target == null)
            return;

-        if (ac.equals(tarAc))
+        if (attacker.equals(target))
            return;

-        if (tarAc.isMoving() && tarAc.getObjectType().equals(GameObjectType.PlayerCharacter))
+        if (target.isMoving() && target.getObjectType().equals(GameObjectType.PlayerCharacter))
            return;

-        if (!tarAc.isAlive() || !ac.isAlive())
+        if (!target.isAlive() || !attacker.isAlive())
            return;

-        boolean isCombat = tarAc.isCombat();
+        boolean isCombat = target.isCombat();

        //If target in combat and has no target, then attack back

-        AbstractWorldObject awoCombTar = tarAc.getCombatTarget();
+        AbstractWorldObject awoCombTar = target.getCombatTarget();

-        if ((tarAc.isCombat() && awoCombTar == null) || (isCombat && awoCombTar != null && (!awoCombTar.isAlive() || tarAc.isCombat() && NotInRange(tarAc, awoCombTar, tarAc.getRange()))) || (tarAc != null && tarAc.getObjectType() == GameObjectType.Mob && ((Mob) tarAc).isSiege()))
-            if (tarAc.getObjectType().equals(GameObjectType.PlayerCharacter)) {  // we are in combat with no valid target
+        if ((target.isCombat() && awoCombTar == null) || (isCombat && awoCombTar != null && (!awoCombTar.isAlive() || target.isCombat() && NotInRange(target, awoCombTar, target.getRange()))) || (target != null && target.getObjectType() == GameObjectType.Mob && ((Mob) target).isSiege()))
+            if (target.getObjectType().equals(GameObjectType.PlayerCharacter)) {  // we are in combat with no valid target

-                PlayerCharacter pc = (PlayerCharacter) tarAc;
-                tarAc.setCombatTarget(ac);
-                pc.setLastTarget(ac.getObjectType(), ac.getObjectUUID());
+                PlayerCharacter pc = (PlayerCharacter) target;
+                target.setCombatTarget(attacker);
+                pc.setLastTarget(attacker.getObjectType(), attacker.getObjectUUID());

-                if (tarAc.getTimers() != null)
-                    if (!tarAc.getTimers().containsKey("Attack" + MBServerStatics.SLOT_MAINHAND))
-                        CombatManager.AttackTarget((PlayerCharacter) tarAc, tarAc.getCombatTarget());
+                if (target.getTimers() != null)
+                    if (!target.getTimers().containsKey("Attack" + MBServerStatics.SLOT_MAINHAND))
+                        CombatManager.AttackTarget((PlayerCharacter) target, target.getCombatTarget());
            }

        //Handle pet retaliate if assist is on and pet doesn't have a target.

-        if (tarAc.getObjectType().equals(GameObjectType.PlayerCharacter)) {
+        if (target.getObjectType().equals(GameObjectType.PlayerCharacter)) {

-            Mob pet = ((PlayerCharacter) tarAc).getPet();
+            Mob pet = ((PlayerCharacter) target).getPet();

            if (pet != null && pet.assist && pet.getCombatTarget() == null)
-                pet.setCombatTarget(ac);
+                pet.setCombatTarget(attacker);
        }

        //Handle Mob Retaliate.

-        if (tarAc.getObjectType() == GameObjectType.Mob) {
+        if (target.getObjectType() == GameObjectType.Mob) {

-            Mob retaliater = (Mob) tarAc;
+            Mob attackedMobile = (Mob) target;

-            if (retaliater.getCombatTarget() != null && !retaliater.isSiege())
-                return;
+            //handle minion informing his captain of an attack
+
+            if (attackedMobile.agentType.equals(AIAgentType.GUARDMINION) && attackedMobile.guardCaptain != null && attackedMobile.guardCaptain.isAlive()) {
+
+                if (attackedMobile.guardCaptain.combatTarget == null)
+                    attackedMobile.guardCaptain.setCombatTarget(attacker);
+
+            }
+
+            // Mobile already has a target; don't switch.

-            if (ac.getObjectType() == GameObjectType.Mob && retaliater.isSiege())
+            if (attackedMobile.getCombatTarget() != null && !attackedMobile.isSiege())
                return;

-            retaliater.setCombatTarget(ac);
+            attackedMobile.setCombatTarget(attacker);

        }
    }
@@ -30,6 +30,7 @@ public enum ConfigManager {

    MB_BIND_ADDR,
    MB_EXTERNAL_ADDR,
+
    // Database connection config

    MB_DATABASE_ADDRESS,
@@ -66,6 +67,7 @@ public enum ConfigManager {
    MB_WORLD_GREETING,
    MB_WORLD_KEYCLONE_MAX,
    MB_USE_RUINS,
+    MB_RULESET,

    // Mobile AI modifiers
    MB_AI_CAST_FREQUENCY,
@@ -134,7 +136,6 @@ public enum ConfigManager {
        File file = new File("mbbranch.sh");

        if (file.exists() && !file.isDirectory()) {
-
            String[] command = {"./mbbranch.sh"};

            try {
@@ -22,6 +22,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.util.EnumMap;
+import java.util.EnumSet;
 import java.util.concurrent.ConcurrentHashMap;

 public enum DbManager {
@@ -70,7 +71,6 @@ public enum DbManager {
    public static final dbBlueprintHandler BlueprintQueries = new dbBlueprintHandler();
    public static final dbBoonHandler BoonQueries = new dbBoonHandler();
    public static final dbShrineHandler ShrineQueries = new dbShrineHandler();
-    public static final dbHeightMapHandler HeightMapQueries = new dbHeightMapHandler();
    public static final dbRunegateHandler RunegateQueries = new dbRunegateHandler();

    public static final dbPowerHandler PowerQueries = new dbPowerHandler();
@@ -267,6 +267,40 @@ public enum DbManager {

    }

+    public static <E extends java.lang.Enum<E>> EnumSet<E> parseEnumSet(String mysqlSet, Class<E> enumClass) {
+
+        // Create empty output set of the passed Enum class
+
+        EnumSet<E> enumSet = EnumSet.noneOf(enumClass);
+
+        // Early exit for empty sets
+
+        if (mysqlSet.isEmpty())
+            return enumSet;
+
+        // Split set string and trim each element
+
+        String[] elements = mysqlSet.split(";");
+
+        for (String element : elements) {
+
+            element = element.trim();
+
+            // Parse the element into an enum; add to the output set
+
+            try {
+                E enumConstant = java.lang.Enum.valueOf(enumClass, element);
+                enumSet.add(enumConstant);
+            } catch (Exception e) {
+                Logger.error(" Parse error: " + mysqlSet);
+            }
+        }
+
+        // Return the output set
+
+        return enumSet;
+    }
+
    public static void printCacheCount(PlayerCharacter pc) {
        ChatManager.chatSystemInfo(pc, "Cache Lists");

@@ -325,4 +359,5 @@ public enum DbManager {

        Logger.info("Database configured with " + connectionCount + " connections");
    }
+
 }
@@ -46,9 +46,11 @@ public enum DevCmdManager {
        DevCmdManager.registerDevCmd(new GetZoneCmd());
        DevCmdManager.registerDevCmd(new ZoneSetCmd());
        DevCmdManager.registerDevCmd(new PrintBankCmd());
+        DevCmdManager.registerDevCmd(new PrintEffectsCmd());
        DevCmdManager.registerDevCmd(new PrintEquipCmd());
        DevCmdManager.registerDevCmd(new PrintInventoryCmd());
        DevCmdManager.registerDevCmd(new PrintVaultCmd());
+        DevCmdManager.registerDevCmd(new PrintRunesCmd());
        DevCmdManager.registerDevCmd(new PrintStatsCmd());
        DevCmdManager.registerDevCmd(new PrintSkillsCmd());
        DevCmdManager.registerDevCmd(new PrintPowersCmd());
@@ -56,6 +58,7 @@ public enum DevCmdManager {
        DevCmdManager.registerDevCmd(new PrintResistsCmd());
        DevCmdManager.registerDevCmd(new PrintLocationCmd());
        DevCmdManager.registerDevCmd(new InfoCmd());
+        DevCmdManager.registerDevCmd(new ItemInfoCmd());
        DevCmdManager.registerDevCmd(new aiInfoCmd());
        DevCmdManager.registerDevCmd(new SimulateBootyCmd());
        DevCmdManager.registerDevCmd(new GetHeightCmd());
@@ -128,7 +131,6 @@ public enum DevCmdManager {
        DevCmdManager.registerDevCmd(new SetForceRenameCityCmd());
        DevCmdManager.registerDevCmd(new GotoObj());
        DevCmdManager.registerDevCmd(new convertLoc());
-        DevCmdManager.registerDevCmd(new AuditHeightMapCmd());
        DevCmdManager.registerDevCmd(new UnloadFurnitureCmd());
        DevCmdManager.registerDevCmd(new SetNpcEquipSetCmd());
        DevCmdManager.registerDevCmd(new SetBuildingAltitudeCmd());
@@ -143,7 +145,6 @@ public enum DevCmdManager {
        DevCmdManager.registerDevCmd(new ApplyBonusCmd());
        DevCmdManager.registerDevCmd(new AuditFailedItemsCmd());
        DevCmdManager.registerDevCmd(new SlotTestCmd());
-
    }

    private static void registerDevCmd(AbstractDevCmd cmd) {
@@ -200,5 +200,13 @@ public enum GuildManager {

        }
    }
-
+    public static Boolean meetsLoreRequirements(Guild guild, PlayerCharacter player){
+        Enum.GuildCharterType charter = guild.getGuildType();
+        if(charter.requiredClasses.contains(player.absPromotionClass))
+            if(charter.requiredRaces.contains(player.absRace))
+                if(charter.sexRequired.contains(player.absGender))
+                    return true;
+
+        return false;
+    }
 }
--- a/Show More
+++ b/Show More