Indices added to command output.

Login check modified for testing.
Devcmd output updated.
2023-09-15 17:29:51 -04:00 · 2023-09-15 14:23:34 -04:00 · 2023-09-14 14:11:26 -04:00 · 2023-09-14 13:54:22 -04:00 · 2023-09-14 13:41:07 -04:00 · 2023-09-14 13:30:46 -04:00
70 changed files with 2513 additions and 3315 deletions
@@ -2822,7 +2822,6 @@ public class Enum {

    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 +2846,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 +2857,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 +2877,11 @@ public class Enum {

    public enum AIAgentType {
        MOBILE,
+        GUARDCAPTAIN,
+        GUARDMINION,
+        GUARDWALLARCHER,
        PET,
        CHARMED,
-        GUARD;
+        SIEGEENGINE;
    }
 }
@@ -14,9 +14,7 @@ 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;
@@ -32,6 +30,7 @@ public class HeightMap {

    // Class variables

+    public static float SCALEVALUE = 1.0f / 256;
    // Heightmap data for all zones.

    public static final HashMap<Integer, HeightMap> heightmapByLoadNum = new HashMap<>();
@@ -45,17 +44,17 @@ public class HeightMap {

    public BufferedImage heightmapImage;

-    private int heightMapID;
-    private int maxHeight;
-    private int fullExtentsX;
-    private int fullExtentsY;
+    private final int heightMapID;
+    private final int maxHeight;
+    private final int fullExtentsX;
+    private final int fullExtentsY;

    private float bucketWidthX;
    private float bucketWidthY;
-    private int zoneLoadID;
+    private final int zoneLoadID;
    private float seaLevel = 0;
-    private float outsetX;
-    private float outsetZ;
+    private final float outsetX;
+    private final float outsetZ;
    private int[][] pixelColorValues;

    public HeightMap(ResultSet rs) throws SQLException {
@@ -88,12 +87,12 @@ public class HeightMap {
        try {
            this.heightmapImage = ImageIO.read(imageFile);
        } catch (IOException e) {
-            Logger.error("***Error loading heightmap data for heightmap " + this.heightMapID + e.toString());
+            Logger.error("***Error loading heightmap data for heightmap " + this.heightMapID + e);
        }

        // We needed to flip the image as OpenGL and Shadowbane both use the bottom left corner as origin.

-        this.heightmapImage = MapLoader.flipImage(this.heightmapImage);
+        // this.heightmapImage = MapLoader.flipImage(this.heightmapImage);

        // Calculate the data we do not load from table

@@ -104,7 +103,7 @@ public class HeightMap {

        // Generate pixel array from image data

-        generatePixelData();
+        generatePixelData(this);

        HeightMap.heightmapByLoadNum.put(this.zoneLoadID, this);

@@ -123,35 +122,26 @@ public class HeightMap {
        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.bucketWidthX = halfExtentsX;
+        this.bucketWidthY = halfExtentsY;

-        this.pixelColorValues = new int[this.fullExtentsX + 1][this.fullExtentsY + 1];
+        this.pixelColorValues = new int[this.fullExtentsX][this.fullExtentsY];

-        for (int y = 0; y <= this.fullExtentsY; y++) {
-            for (int x = 0; x <= this.fullExtentsX; x++) {
+        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) {
@@ -170,26 +160,21 @@ public class HeightMap {
        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.bucketWidthX = halfExtentsX;
+        this.bucketWidthY = halfExtentsY;

-        this.pixelColorValues = new int[this.fullExtentsX + 1][this.fullExtentsY + 1];
+        this.pixelColorValues = new int[this.fullExtentsX][this.fullExtentsY];

-        for (int y = 0; y <= this.fullExtentsY; y++) {
-            for (int x = 0; x <= this.fullExtentsX; x++) {
-                pixelColorValues[x][y] = 255;
+        for (int y = 0; y < this.fullExtentsY; y++) {
+            for (int x = 0; x < this.fullExtentsX; x++) {
+                pixelColorValues[x][y] = 0;
            }
        }

-
-        HeightMap.heightmapByLoadNum.put(this.zoneLoadID, this);
    }

    public static void GeneratePlayerCityHeightMap() {
@@ -222,113 +207,9 @@ public class HeightMap {
        return nextZone;
    }

-    public static float getWorldHeight(AbstractWorldObject worldObject) {
+    public static float getWorldHeight(Zone currentZone, Vector3fImmutable worldLoc) {

        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;
@@ -352,7 +233,7 @@ public class HeightMap {

        float interaltitude = currentZone.getHeightMap().getInterpolatedTerrainHeight(zoneLoc);

-        float worldAltitude = currentZone.getWorldAltitude();
+        float worldAltitude = currentZone.worldAltitude;

        float realWorldAltitude = interaltitude + worldAltitude;

@@ -360,9 +241,6 @@ public class HeightMap {

        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;

@@ -378,7 +256,6 @@ public class HeightMap {

            double scale;

-
            if (offsetX > outsideGridSizeX && offsetX > offsetZ) {
                weight = (offsetX - outsideGridSizeX) / bucketScaleX;
                scale = Math.atan2((.5 - weight) * 3.1415927, 1);
@@ -396,7 +273,7 @@ public class HeightMap {
                float secondScale = parentCenterAltitude * scaleChild;
                float outsetALt = firstScale + secondScale;

-                outsetALt += currentZone.getParent().getWorldAltitude();
+                outsetALt += currentZone.getParent().worldAltitude;
                realWorldAltitude = outsetALt;

            } else if (offsetZ > outsideGridSizeZ) {
@@ -415,7 +292,7 @@ public class HeightMap {
                float secondScale = parentCenterAltitude * scaleChild;
                float outsetALt = firstScale + secondScale;

-                outsetALt += currentZone.getParent().getWorldAltitude();
+                outsetALt += currentZone.getParent().worldAltitude;
                realWorldAltitude = outsetALt;
            }
        }
@@ -423,85 +300,13 @@ public class HeightMap {
        return realWorldAltitude;
    }

-    public static float getOutsetHeight(float interpolatedAltitude, Zone zone, Vector3fImmutable worldLocation) {
+    public static float getWorldHeight(Vector3fImmutable worldLoc) {

-        Vector2f parentLoc;
-        float outsetALt = 0;
+        Zone currentZone = ZoneManager.findSmallestZone(worldLoc);

-        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);
+        if (currentZone == null)
+            return 0;
+        return getWorldHeight(currentZone, worldLoc);

    }

@@ -515,7 +320,6 @@ public class HeightMap {

        HeightMap.GeneratePlayerCityHeightMap();

-
        // Clear all heightmap image data as it's no longer needed.

        for (HeightMap heightMap : HeightMap.heightmapByLoadNum.values()) {
@@ -530,10 +334,25 @@ public class HeightMap {
        float localAltitude = HeightMap.getWorldHeight(currentLoc);
        Zone zone = ZoneManager.findSmallestZone(currentLoc);

-        if (localAltitude < zone.getSeaLevel())
-            return true;
+        return localAltitude < zone.getSeaLevel();
+    }
+
+    private static void generatePixelData(HeightMap heightMap) {
+
+        Color color;
+
+        // Generate altitude lookup table for this heightmap
+
+        heightMap.pixelColorValues = new int[heightMap.heightmapImage.getWidth()][heightMap.heightmapImage.getHeight()];
+
+        for (int y = 0; y < heightMap.heightmapImage.getHeight(); y++) {
+            for (int x = 0; x < heightMap.heightmapImage.getWidth(); x++) {
+
+                color = new Color(heightMap.heightmapImage.getRGB(x, y));
+                heightMap.pixelColorValues[x][y] = color.getRed();
+            }
+        }

-        return false;
    }

    public Vector2f getGridSquare(Vector2f zoneLoc) {
@@ -541,14 +360,18 @@ public class HeightMap {
        if (zoneLoc.x < 0)
            zoneLoc.setX(0);

-        if (zoneLoc.x > this.fullExtentsX - 1)
-            zoneLoc.setX((this.fullExtentsX - 1) + .9999999f);
+        if (zoneLoc.x >= this.fullExtentsX)
+            zoneLoc.setX(this.fullExtentsX);

        if (zoneLoc.y < 0)
            zoneLoc.setY(0);

-        if (zoneLoc.y > this.fullExtentsY - 1)
-            zoneLoc.setY((this.fullExtentsY - 1) + .9999999f);
+        if (zoneLoc.y > this.fullExtentsY)
+            zoneLoc.setY(this.fullExtentsY);
+
+        // Flip Y coordinates
+
+        zoneLoc.setY(this.fullExtentsY - zoneLoc.y);

        float xBucket = (zoneLoc.x / this.bucketWidthX);
        float yBucket = (zoneLoc.y / this.bucketWidthY);
@@ -569,13 +392,10 @@ public class HeightMap {
        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);
+        int gridY = (int) gridSquare.y;

        if (gridX > maxX)
            gridX = maxX;
@@ -613,76 +433,11 @@ public class HeightMap {
        interpolatedHeight += (bottomLeftHeight * (1 - offsetX) * offsetY);
        interpolatedHeight += (topLeftHeight * (1 - offsetX) * (1 - offsetY));

-        interpolatedHeight *= (float) this.maxHeight / 256;  // Scale height
+        interpolatedHeight *= (float) this.maxHeight * SCALEVALUE;  // 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;
    }
@@ -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);
@@ -28,31 +28,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 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.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.spawnTime);
+            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();

@@ -106,17 +102,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 +127,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 +143,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,6 +159,20 @@ public class dbMobHandler extends dbHandlerBase {
        }
    }

+    public boolean REMOVE_ALL_MINIONS(final long captainUID) {
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("DELETE FROM `dyn_guards` WHERE `captainUID`=?;")) {
+
+            preparedStatement.setLong(1, captainUID);
+
+            return (preparedStatement.executeUpdate() > 0);
+
+        } catch (SQLException e) {
+            Logger.error(e);
+            return false;
+        }
+    }

    public ArrayList<Mob> GET_ALL_MOBS_FOR_ZONE(Zone zone) {

@@ -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();
@@ -9,6 +9,7 @@

 package engine.devcmd.cmds;

+import engine.Enum;
 import engine.Enum.GameObjectType;
 import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.ChatManager;
@@ -43,7 +44,7 @@ public class AddMobCmd extends AbstractDevCmd {
                MobBase mb = (MobBase) mobbaseAGO;
                int loadID = mb.getObjectUUID();
                Mob mob = Mob.createMob(loadID, Vector3fImmutable.getRandomPointInCircle(pc.getLoc(), 100),
-                        null, true, zone, null, 0, "", 1);
+                        null, zone, null, null, "", 1, Enum.AIAgentType.MOBILE);
                if (mob != null) {
                    mob.updateDatabase();
                    this.setResult(String.valueOf(mob.getDBID()));
@@ -84,7 +85,7 @@ public class AddMobCmd extends AbstractDevCmd {


        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.";
-
-    }
-
-}
@@ -13,7 +13,6 @@ 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;
@@ -22,205 +21,58 @@ 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 = HeightMap.getNextZoneWithTerrain(currentZone);
+        parentZone = HeightMap.getNextZoneWithTerrain(currentZone.getParent());

-        this.throwbackInfo(pc, "Altitude : " + height);
+        float currentHeight = HeightMap.getWorldHeight(currentZone, playerCharacter.getLoc());
+        float parentHeight = HeightMap.getWorldHeight(parentZone, playerCharacter.getLoc());

-        this.throwbackInfo(pc, "Character Height: " + pc.getCharacterHeight());
-        this.throwbackInfo(pc, "Character Height to start swimming: " + pc.centerHeight);
+        Vector2f zoneLoc = ZoneManager.worldToZoneSpace(playerCharacter.getLoc(), heightmapZone);
+        Vector2f gridSquare = heightmapZone.getHeightMap().getGridSquare(zoneLoc);

-        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()));
+        this.throwbackInfo(playerCharacter, "Current Zone : " + currentZone.getName());
+        this.throwbackInfo(playerCharacter, "Heightmap Zone : " + heightmapZone.getName());
+        this.throwbackInfo(playerCharacter, "Zone Height: " + heightmapZone.worldAltitude);
+        this.throwbackInfo(playerCharacter, "Sea Level: " + heightmapZone.getSeaLevel());
+        this.throwbackInfo(playerCharacter, "Grid : " + (int) gridSquare.x + "x" + (int) gridSquare.y);
+        this.throwbackInfo(playerCharacter, "*** 256: " + currentHeight);
+        this.throwbackInfo(playerCharacter, "***Adjusted Height: " + (currentHeight + playerCharacter.getCharacterHeight()));

-        if (end)
-            return;
-
-        Vector2f gridSquare;
-        Vector2f gridOffset;
-        Vector2f parentGrid;
-        Vector2f parentLoc = new Vector2f(-1, -1);
-
-        Zone currentZone = ZoneManager.findSmallestZone(pc.getLoc());
-
-        if (currentZone == null)
-            return;
-
-        Zone parentZone = currentZone.getParent();
-
-        HeightMap heightMap = currentZone.getHeightMap();
-
-
-        //find the next parents heightmap if the currentzone heightmap is null.
-        while (heightMap == null) {
-
-            if (currentZone == ZoneManager.getSeaFloor()) {
-                this.throwbackInfo(pc, "Could not find a heightmap to get height.");
-                break;
-            }
-
-            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);
+        HeightMap.SCALEVALUE = 1f / 255f;
+        currentHeight = HeightMap.getWorldHeight(currentZone, playerCharacter.getLoc());
+        HeightMap.SCALEVALUE = 1f / 256f;

+        this.throwbackInfo(playerCharacter, "***255 Adjusted: " + (currentHeight + playerCharacter.getCharacterHeight()));
+        this.throwbackInfo(playerCharacter, "Drowning Height: " + (heightmapZone.getSeaLevel() + playerCharacter.getCharacterHeight()));

+        this.throwbackInfo(playerCharacter, "------------");
+        this.throwbackInfo(playerCharacter, "Parent : " + parentZone.getName());
+        this.throwbackInfo(playerCharacter, "Height returned : " + parentHeight);
+        this.throwbackInfo(playerCharacter, "[" + (gridSquare.x) + "][" + (gridSquare.y) + "]");
+        this.throwbackInfo(playerCharacter, "[" + (gridSquare.x + 1) + "][" + (gridSquare.y) + "]");
+        this.throwbackInfo(playerCharacter, "[" + (gridSquare.x) + "][" + (gridSquare.y + 1) + "]");
+        this.throwbackInfo(playerCharacter, "[" + (gridSquare.x + 1) + "][" + (gridSquare.y + 1) + "]");
    }

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

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

 }
@@ -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;
@@ -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;

@@ -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);
                }
@@ -9,9 +9,9 @@

 package engine.devcmd.cmds;

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

 import java.lang.reflect.Field;

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

-
-        if (pc.region == null) {
+        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) {
+            this.throwbackInfo(pc, "Region Info: " + ((AbstractCharacter) target).getName());
+            this.throwbackInfo(pc, "Region Name: " + region);
+            this.throwbackInfo(pc, "Region Height: " + region.lerpY((AbstractCharacter)target));
        }
-        result += ("}");
-
-        this.throwbackInfo(pc, result.toString());
-

    }

@@ -11,7 +11,6 @@ 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;
@@ -138,49 +137,16 @@ public class RemoveObjectCmd extends AbstractDevCmd {
            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;
+        // Remove hirelings for this building

-            if (ac.getObjectType() == GameObjectType.NPC)
-                npc = (NPC) ac;
-            else if (ac.getObjectType() == GameObjectType.Mob)
-                mobA = (Mob) ac;
+        for (AbstractCharacter abstractCharacter : building.getHirelings().keySet())
+            BuildingManager.removeHireling(building, abstractCharacter);

-            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);
-            }
-
-
-        }
        Zone zone = building.getParentZone();
        DbManager.BuildingQueries.DELETE_FROM_DATABASE(building);
        DbManager.removeFromCache(building);
@@ -209,11 +175,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);
@@ -0,0 +1,43 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2022
+//                www.magicbane.com
+
+
+package engine.devcmd.cmds;
+
+import engine.devcmd.AbstractDevCmd;
+import engine.gameManager.ZoneManager;
+import engine.objects.AbstractGameObject;
+import engine.objects.PlayerCharacter;
+import engine.objects.Zone;
+
+public class SeaAuditCmd extends AbstractDevCmd {
+
+    public SeaAuditCmd() {
+        super("seaaudit");
+    }
+
+    @Override
+    protected void _doCmd(PlayerCharacter playerCharacter, String[] words,
+                          AbstractGameObject target) {
+
+        for (Zone zone : ZoneManager.getAllZones())
+            if (zone.getSeaLevel() > zone.worldAltitude)
+                this.throwbackInfo(playerCharacter, zone.getObjectUUID() + zone.getName());
+    }
+
+    @Override
+    protected String _getHelpString() {
+        return "Queries heightmap engine";
+    }
+
+    @Override
+    protected String _getUsageString() {
+        return "' /getheight";
+    }
+
+}
@@ -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);
@@ -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();
@@ -104,7 +104,7 @@ public class ZoneInfoCmd extends AbstractDevCmd {
        output += newline;
        output += "Sea Level = " + zone.getSeaLevel();
        output += newline;
-        output += "World Altitude = " + zone.getWorldAltitude();
+        output += "World Altitude = " + zone.worldAltitude;
        throwbackInfo(player, output);

        City city = ZoneManager.getCityAtLocation(player.getLoc());
@@ -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);
    }
@@ -308,6 +308,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 +386,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;
-
            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);

        }

@@ -530,41 +572,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;
        }
@@ -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())
+            //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 (attackedMobile.getCombatTarget() != null && !attackedMobile.isSiege())
                return;

-            if (ac.getObjectType() == GameObjectType.Mob && retaliater.isSiege())
-                return;
-
-            retaliater.setCombatTarget(ac);
+            attackedMobile.setCombatTarget(attacker);

        }
    }
@@ -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());
@@ -128,7 +130,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 +144,7 @@ public enum DevCmdManager {
        DevCmdManager.registerDevCmd(new ApplyBonusCmd());
        DevCmdManager.registerDevCmd(new AuditFailedItemsCmd());
        DevCmdManager.registerDevCmd(new SlotTestCmd());
-
+        DevCmdManager.registerDevCmd(new SeaAuditCmd());
    }

    private static void registerDevCmd(AbstractDevCmd cmd) {
@@ -330,6 +330,8 @@ public enum LootManager {

    public static void GenerateEquipmentDrop(Mob mob) {

+        if(mob.behaviourType.equals(Enum.MobBehaviourType.HamletGuard))
+            return; // safehold guards don't drop their equipment
        //do equipment here
        int dropCount = 0;
        if (mob.getEquip() != null)
@@ -116,8 +116,8 @@ public enum MovementManager {

        // if inside a building, convert both locations from the building local reference frame to the world reference frame

-        if (msg.getTargetID() > 0) {
-            Building building = BuildingManager.getBuildingFromCache(msg.getTargetID());
+        if (msg.getInBuildingUUID() > 0) {
+            Building building = BuildingManager.getBuildingFromCache(msg.getInBuildingUUID());
            if (building != null) {

                Vector3fImmutable convertLocEnd = new Vector3fImmutable(ZoneManager.convertLocalToWorld(building, endLocation));
@@ -128,8 +128,8 @@ public enum MovementManager {
                //                }
                //                else {
                toMove.setInBuilding(msg.getInBuilding());
-                toMove.setInFloorID(msg.getUnknown01());
-                toMove.setInBuildingID(msg.getTargetID());
+                toMove.setInFloorID(msg.getInBuildingFloor());
+                toMove.setInBuildingID(msg.getInBuildingUUID());
                msg.setStartCoord(ZoneManager.convertWorldToLocal(building, toMove.getLoc()));

                if (toMove.getObjectType() == GameObjectType.PlayerCharacter) {
@@ -174,9 +174,9 @@ public enum MovementManager {
                msg.setStartCoord(ZoneManager.convertWorldToLocal(Regions.GetBuildingForRegion(toMove.region), toMove.getLoc()));
                msg.setEndCoord(ZoneManager.convertWorldToLocal(regionBuilding, endLocation));
                msg.setInBuilding(toMove.region.level);
-                msg.setUnknown01(toMove.region.room);
-                msg.setTargetType(GameObjectType.Building.ordinal());
-                msg.setTargetID(regionBuilding.getObjectUUID());
+                msg.setInBuildingFloor(toMove.region.room);
+                msg.setStartLocType(GameObjectType.Building.ordinal());
+                msg.setInBuildingUUID(regionBuilding.getObjectUUID());
            }

        } else {
@@ -185,8 +185,8 @@ public enum MovementManager {
            toMove.setInBuilding(-1);
            msg.setStartCoord(toMove.getLoc());
            msg.setEndCoord(endLocation);
-            msg.setTargetType(0);
-            msg.setTargetID(0);
+            msg.setStartLocType(0);
+            msg.setInBuildingUUID(0);
        }

        //checks sync between character and server, if out of sync, teleport player to original position and return.
@@ -233,7 +233,7 @@ public enum MovementManager {
        toMove.cancelOnMove();

        //cancel any attacks for manual move.
-        if ((toMove.getObjectType() == GameObjectType.PlayerCharacter) && msg.getUnknown02() == 0)
+        if ((toMove.getObjectType() == GameObjectType.PlayerCharacter) && msg.getInitiatedFromAttack() == 0)
            toMove.setCombatTarget(null);


@@ -464,7 +464,7 @@ public enum MovementManager {
        }
    }

-    public static void translocate(AbstractCharacter teleporter, Vector3fImmutable targetLoc, Regions region) {
+    public static void translocate(AbstractCharacter teleporter, Vector3fImmutable targetLoc) {


        if (targetLoc == null)
@@ -473,7 +473,6 @@ public enum MovementManager {
        Vector3fImmutable oldLoc = new Vector3fImmutable(teleporter.getLoc());

        teleporter.stopMovement(targetLoc);
-        teleporter.setRegion(region);

        //mobs ignore region sets for now.
        if (teleporter.getObjectType().equals(GameObjectType.Mob)) {
@@ -5,13 +5,17 @@ import engine.InterestManagement.WorldGrid;
 import engine.math.Quaternion;
 import engine.math.Vector3f;
 import engine.math.Vector3fImmutable;
+import engine.mobileAI.MobAI;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.msg.PetMsg;
 import engine.objects.*;
 import engine.powers.EffectsBase;
+import engine.powers.PowersBase;
+import engine.powers.RuneSkillAdjustEntry;
 import org.pmw.tinylog.Logger;

+import javax.smartcardio.ATR;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.concurrent.ThreadLocalRandom;
@@ -23,92 +27,6 @@ public enum NPCManager {
    NPC_MANAGER;
    public static HashMap<Integer, ArrayList<Integer>> _runeSetMap = new HashMap<>();

-    public static void LoadAllRuneSets() {
-        _runeSetMap = DbManager.ItemBaseQueries.LOAD_RUNES_FOR_NPC_AND_MOBS();
-    }
-
-    public static void LoadAllBootySets() {
-        LootManager._bootySetMap = DbManager.LootQueries.LOAD_BOOTY_TABLES();
-    }
-
-    public static void applyRuneSetEffects(Mob mob) {
-
-        // Early exit
-
-        if (mob.runeSet == 0)
-            return;
-
-        //Apply all rune effects.
-
-        if (NPCManager._runeSetMap.get(mob.runeSet).contains(252623)) {
-            mob.isPlayerGuard = true;
-        }
-
-        // Only captains have contracts
-
-        if (mob.contract != null || mob.isPlayerGuard)
-            applyEffectsForRune(mob, 252621);
-
-
-        // Apply effects from RuneSet
-
-        if (mob.runeSet != 0)
-            for (int runeID : _runeSetMap.get(mob.runeSet))
-                applyEffectsForRune(mob, runeID);
-
-        // Not sure why but apply Warrior effects for some reason?
-
-        applyEffectsForRune(mob, 2518);
-    }
-
-    public static void applyEffectsForRune(AbstractCharacter character, int runeID) {
-
-        EffectsBase effectsBase;
-        RuneBase sourceRune = RuneBase.getRuneBase(runeID);
-
-        // Race runes are in the runeset but not in runebase for some reason
-
-        if (sourceRune == null)
-            return;
-
-        for (MobBaseEffects mbe : sourceRune.getEffectsList()) {
-
-            effectsBase = PowersManager.getEffectByToken(mbe.getToken());
-
-            if (effectsBase == null) {
-                Logger.info("Mob: " + character.getObjectUUID() + "  EffectsBase Null for Token " + mbe.getToken());
-                continue;
-            }
-
-            //check to upgrade effects if needed.
-            if (character.effects.containsKey(Integer.toString(effectsBase.getUUID()))) {
-
-                if (mbe.getReqLvl() > (int) character.level)
-                    continue;
-
-                Effect eff = character.effects.get(Integer.toString(effectsBase.getUUID()));
-
-                if (eff == null)
-                    continue;
-
-                //Current effect is a higher rank, dont apply.
-                if (eff.getTrains() > mbe.getRank())
-                    continue;
-
-                //new effect is of a higher rank. remove old effect and apply new one.
-                eff.cancelJob();
-                character.addEffectNoTimer(Integer.toString(effectsBase.getUUID()), effectsBase, mbe.getRank(), true);
-            } else {
-
-                if (mbe.getReqLvl() > (int) character.level)
-                    continue;
-
-                character.addEffectNoTimer(Integer.toString(effectsBase.getUUID()), effectsBase, mbe.getRank(), true);
-            }
-
-        }
-    }
-
    public static void dismissNecroPet(Mob necroPet, boolean updateOwner) {

        necroPet.setCombatTarget(null);
@@ -127,10 +45,12 @@ public enum NPCManager {

        DbManager.removeFromCache(necroPet);

-        PlayerCharacter petOwner = necroPet.getOwner();
+
+        PlayerCharacter petOwner = (PlayerCharacter) necroPet.guardCaptain;

        if (petOwner != null) {
-            necroPet.setOwner(null);
+
+            necroPet.guardCaptain = null;
            petOwner.setPet(null);

            if (updateOwner == false)
@@ -202,78 +122,6 @@ public enum NPCManager {
        playerCharacter.necroPets.clear();
    }

-
-    public static void removeSiegeMinions(Mob mobile) {
-
-        for (Mob toRemove : mobile.siegeMinionMap.keySet()) {
-
-            if (mobile.isMoving()) {
-
-                mobile.stopMovement(mobile.getLoc());
-
-                if (toRemove.parentZone != null)
-                    toRemove.parentZone.zoneMobSet.remove(toRemove);
-            }
-
-            try {
-                toRemove.clearEffects();
-            } catch (Exception e) {
-                Logger.error(e.getMessage());
-            }
-
-            if (toRemove.parentZone != null)
-                toRemove.parentZone.zoneMobSet.remove(toRemove);
-
-            WorldGrid.RemoveWorldObject(toRemove);
-            WorldGrid.removeObject(toRemove);
-            DbManager.removeFromCache(toRemove);
-
-            PlayerCharacter petOwner = toRemove.getOwner();
-
-            if (petOwner != null) {
-
-                petOwner.setPet(null);
-                toRemove.setOwner(null);
-
-                PetMsg petMsg = new PetMsg(5, null);
-                Dispatch dispatch = Dispatch.borrow(petOwner, petMsg);
-                DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.PRIMARY);
-            }
-        }
-    }
-
-    public static boolean removeMobileFromBuilding(Mob mobile, Building building) {
-
-        // Remove npc from it's building
-
-        try {
-            mobile.clearEffects();
-        } catch (Exception e) {
-            Logger.error(e.getMessage());
-        }
-
-        if (mobile.parentZone != null)
-            mobile.parentZone.zoneMobSet.remove(mobile);
-
-        if (building != null) {
-            building.getHirelings().remove(mobile);
-            removeSiegeMinions(mobile);
-        }
-
-        // Delete npc from database
-
-        if (DbManager.MobQueries.DELETE_MOB(mobile) == 0)
-            return false;
-
-        // Remove npc from the simulation
-
-        mobile.removeFromCache();
-        DbManager.removeFromCache(mobile);
-        WorldGrid.RemoveWorldObject(mobile);
-        WorldGrid.removeObject(mobile);
-        return true;
-    }
-
    public static void loadAllPirateNames() {

        DbManager.NPCQueries.LOAD_PIRATE_NAMES();
@@ -340,10 +188,19 @@ public enum NPCManager {
        else
            buildingSlot = BuildingManager.getAvailableSlot(abstractCharacter.building);

+        // Override slot for siege engines
+
+        if (abstractCharacter.getObjectType().equals(Enum.GameObjectType.Mob) && ((Mob) abstractCharacter).behaviourType.equals(Enum.MobBehaviourType.SiegeEngine)) {
+            Mob siegeMobile = (Mob) abstractCharacter;
+            buildingSlot = siegeMobile.guardCaptain.minions.size() + 2;
+        }
+
        if (buildingSlot == -1)
            Logger.error("No available slot for NPC: " + abstractCharacter.getObjectUUID());

-        abstractCharacter.building.getHirelings().put(abstractCharacter, buildingSlot);
+        // Pets are regular mobiles not hirelings (Siege engines)
+        if (abstractCharacter.contract != null)
+            abstractCharacter.building.getHirelings().put(abstractCharacter, buildingSlot);

        // Override bind and location for  this npc derived
        // from BuildingManager slot location data.
@@ -370,4 +227,251 @@ public enum NPCManager {

        return buildingSlot;
    }
+
+    public static void AssignPatrolPoints(Mob mob) {
+        mob.patrolPoints = new ArrayList<>();
+
+        for (int i = 0; i < 5; ++i) {
+            float patrolRadius = mob.getSpawnRadius();
+
+            if (patrolRadius > 256)
+                patrolRadius = 256;
+
+            if (patrolRadius < 60)
+                patrolRadius = 60;
+
+            Vector3fImmutable newPatrolPoint = Vector3fImmutable.getRandomPointInCircle(mob.getBindLoc(), patrolRadius);
+            mob.patrolPoints.add(newPatrolPoint);
+
+            if (i == 1) {
+                mob.setLoc(newPatrolPoint);
+                mob.endLoc = newPatrolPoint;
+            }
+        }
+    }
+
+    public static void applyGuardStanceModifiers(Mob guard){
+        float damageModifier = 1;
+        float attackRatingModifier = 1;
+        float defenseModifier = 1;
+        float attackSpeedModifier = 1;
+        float powerDamageModifier = 1;
+        //handle stance modifiers for guard mob
+        if(guard.agentType.equals(Enum.AIAgentType.GUARDWALLARCHER)){
+            //apply rogue bonuses
+            attackRatingModifier += 0.5f;
+            defenseModifier += 0.5f;
+            damageModifier += 0.5f;
+            attackSpeedModifier -= 0.36f;
+        }else {
+            Integer contractID;
+            if (guard.agentType.equals(Enum.AIAgentType.GUARDMINION)) {
+                contractID = guard.guardCaptain.contract.getContractID();
+            } else{
+                contractID = guard.contract.getContractID();
+            }
+            if (Enum.MinionType.ContractToMinionMap.get(contractID) != null && Enum.MinionType.ContractToMinionMap.get(contractID).isMage()){
+                //apply mage offensive Stance
+                powerDamageModifier += 0.5f;
+            } else{
+                //apply fighter offensive stance
+                damageModifier += 0.5f;
+                attackSpeedModifier -= 0.36f;
+            }
+        }
+        guard.minDamageHandOne *= damageModifier;
+        guard.minDamageHandTwo *= damageModifier;
+        guard.maxDamageHandOne *= damageModifier;
+        guard.maxDamageHandTwo *= damageModifier;
+        guard.atrHandOne *= attackRatingModifier;
+        guard.atrHandTwo *= attackRatingModifier;
+        guard.defenseRating *= defenseModifier;
+        guard.speedHandOne *= attackSpeedModifier;
+        guard.speedHandTwo *= attackSpeedModifier;
+
+        //TODO figure out how to apply +50% powerdamage to mage guards
+    }
+
+    public static void setDamageAndSpeedForGuard(Mob guard){
+
+        float rankModifier = 1 + (guard.getRank() * 0.1f);
+        int primaryStat = 0;
+        if(guard.equip == null) {
+            guard.minDamageHandOne = (int)((guard.mobBase.getDamageMin()) * rankModifier);
+            guard.maxDamageHandOne = (int)((guard.mobBase.getDamageMax()) * rankModifier);
+            guard.speedHandOne = 30.0f;
+        }else{
+            if(guard.equip.containsKey(1)){
+                //has main hand weapon
+                ItemBase weapon = guard.equip.get(1).getItemBase();
+                if(weapon.isStrBased())
+                    primaryStat = guard.getStatStrCurrent();
+                else
+                    primaryStat = guard.getStatDexCurrent();
+                guard.minDamageHandOne = (int)((guard.mobBase.getDamageMin() + weapon.getMinDamage()) * rankModifier) + primaryStat;
+                guard.maxDamageHandOne = (int)((guard.mobBase.getDamageMax() + weapon.getMaxDamage()) * rankModifier) + primaryStat;
+                guard.speedHandOne = weapon.getSpeed();
+                guard.rangeHandOne = weapon.getRange();
+            } else if(guard.equip.containsKey(2) && !guard.equip.get(2).getItemBase().isShield()){
+                //has off hand weapon
+                ItemBase weapon = guard.equip.get(2).getItemBase();
+                if(weapon.isStrBased())
+                    primaryStat = guard.getStatStrCurrent();
+                else
+                    primaryStat = guard.getStatDexCurrent();
+                guard.minDamageHandTwo = (int)((guard.mobBase.getDamageMin() + weapon.getMinDamage()) * rankModifier) + primaryStat;
+                guard.maxDamageHandTwo = (int)((guard.mobBase.getDamageMax() + weapon.getMaxDamage()) * rankModifier) + primaryStat;
+                guard.speedHandTwo = weapon.getSpeed();
+                guard.rangeHandTwo = weapon.getRange();
+            } else {
+                primaryStat = guard.getStatStrCurrent();
+                guard.minDamageHandOne = (int)((guard.mobBase.getDamageMin()) * rankModifier) + primaryStat;
+                guard.maxDamageHandOne = (int)((guard.mobBase.getDamageMax()) * rankModifier) + primaryStat;
+                guard.speedHandOne = 30.0f;
+                guard.rangeHandOne = 3;
+            }
+        }
+    }
+
+    public static void setDefenseForGuard(Mob guard){
+        int dexterity = guard.getStatDexCurrent();
+        if(dexterity < 1)
+            dexterity = 1;
+        int baseDef = guard.mobBase.getDefenseRating();
+        int armorDefense = 0;
+        for(MobEquipment equipped : guard.equip.values())
+            if(equipped.getItemBase().isArmor() || equipped.getItemBase().isShield())
+                armorDefense += equipped.getItemBase().getDefense();
+        guard.defenseRating = dexterity + baseDef + armorDefense;
+    }
+
+    public static void setAttackRatingForGuard(Mob guard) {
+        int strength = guard.getStatStrCurrent();
+        int baseAtr = guard.mobBase.getAttackRating();
+        if (guard.equip.get(1) != null)
+            guard.atrHandOne = baseAtr + (int) ((strength * 0.5f) + (guard.equip.get(1).getItemBase().getPercentRequired() * 4) + (guard.equip.get(1).getItemBase().getPercentRequired() * 3));
+        else if (guard.equip.get(2) != null && !guard.equip.get(2).getItemBase().isShield())
+            guard.atrHandTwo = baseAtr + (int) ((strength * 0.5f) + (guard.equip.get(2).getItemBase().getPercentRequired() * 4) + (guard.equip.get(2).getItemBase().getPercentRequired() * 3));
+        else
+            guard.atrHandOne = baseAtr;
+    }
+
+    public static void setMaxHealthForGuard(Mob guard){
+        //values derived fom reading memory address for health on client when selecting player guards
+        switch(guard.getRank()){
+            default:
+                guard.healthMax = 750; //rank 1
+                break;
+            case 2:
+                guard.healthMax =  2082;
+                break;
+            case 3:
+                guard.healthMax =  2740;
+                break;
+            case 4:
+                guard.healthMax =  3414;
+                break;
+            case 5:
+                guard.healthMax =  4080;
+                break;
+            case 6:
+                guard.healthMax =  4746;
+                break;
+            case 7:
+                guard.healthMax =  5412;
+                break;
+        }
+    }
+
+    public static void applyMobbaseEffects(Mob mob) {
+        EffectsBase effectsBase;
+        for (MobBaseEffects mbe : mob.mobBase.effectsList) {
+
+            effectsBase = PowersManager.getEffectByToken(mbe.getToken());
+
+            if (effectsBase == null) {
+                Logger.info("Mob: " + mob.getObjectUUID() + "  EffectsBase Null for Token " + mbe.getToken());
+                continue;
+            }
+
+            //check to upgrade effects if needed.
+            if (mob.effects.containsKey(Integer.toString(effectsBase.getUUID()))) {
+
+                if (mbe.getReqLvl() > (int) mob.level)
+                    continue;
+
+                Effect eff = mob.effects.get(Integer.toString(effectsBase.getUUID()));
+
+                if (eff == null)
+                    continue;
+
+                //Current effect is a higher rank, dont apply.
+                if (eff.getTrains() > mbe.getRank())
+                    continue;
+
+                //new effect is of a higher rank. remove old effect and apply new one.
+                eff.cancelJob();
+                mob.addEffectNoTimer(Integer.toString(effectsBase.getUUID()), effectsBase, mbe.getRank(), true);
+            } else {
+
+                if (mbe.getReqLvl() > (int) mob.level)
+                    continue;
+
+                mob.addEffectNoTimer(Integer.toString(effectsBase.getUUID()), effectsBase, mbe.getRank(), true);
+            }
+
+        }
+    }
+
+    public static void applyEquipmentResists(Mob mob){
+        if(mob.equip != null){
+           for(MobEquipment equipped : mob.equip.values()){
+               ItemBase itemBase = equipped.getItemBase();
+               if(itemBase.isHeavyArmor() || itemBase.isLightArmor() || itemBase.isMediumArmor()){
+                   mob.resists.setResist(Enum.DamageType.Crush, mob.resists.getResist(Enum.DamageType.Crush,0) + itemBase.getCrushResist());
+                   mob.resists.setResist(Enum.DamageType.Slash, mob.resists.getResist(Enum.DamageType.Slash,0) + itemBase.getCrushResist());
+                   mob.resists.setResist(Enum.DamageType.Pierce, mob.resists.getResist(Enum.DamageType.Pierce,0) + itemBase.getCrushResist());
+               }
+           }
+        }
+    }
+
+    public static void applyMobbaseSkill(Mob mob) {
+        SkillsBase baseSkill = DbManager.SkillsBaseQueries.GET_BASE_BY_TOKEN(mob.mobBase.getMobBaseStats().getBaseSkill());
+        if(baseSkill != null)
+            mob.getSkills().put(baseSkill.getName(),new CharacterSkill(baseSkill,mob,mob.mobBase.getMobBaseStats().getBaseSkillAmount()));
+    }
+
+    public static void applyRuneSkills(Mob mob, int runeID){
+        //load mob skill adjustments from mobbase rune
+        if(PowersManager._allRuneSkillAdjusts.containsKey(runeID))
+            for(RuneSkillAdjustEntry entry : PowersManager._allRuneSkillAdjusts.get(runeID)) {
+                if(SkillsBase.getFromCache(entry.skill_type) == null)
+                    SkillsBase.putInCache(DbManager.SkillsBaseQueries.GET_BASE_BY_NAME(entry.skill_type));
+                SkillsBase skillBase = SkillsBase.getFromCache(entry.skill_type);
+                if(skillBase == null)
+                    continue;
+                if (entry.level <= mob.level)
+                    if (mob.skills.containsKey(entry.name) == false)
+                        mob.skills.put(entry.skill_type, new CharacterSkill(skillBase, mob, entry.rank));
+                    else
+                        mob.skills.put(entry.skill_type, new CharacterSkill(skillBase, mob, entry.rank + mob.skills.get(entry.skill_type).getNumTrains()));
+            }
+    }
+
+    public static void applyRunesForNPC(NPC npc){
+        npc.runes = new ArrayList<>();
+        RuneBase shopkeeperBase = RuneBase.getRuneBase(252620);
+        CharacterRune shopkeeper = new CharacterRune(shopkeeperBase,npc.getObjectUUID());
+        npc.runes.add(shopkeeper);
+        if(NPCManager._runeSetMap.containsKey(npc.runeSetID)) {
+            for (int runeID : _runeSetMap.get(npc.runeSetID)) {
+                RuneBase rb = RuneBase.getRuneBase(runeID);
+                if(rb != null) {
+                    CharacterRune toApply = new CharacterRune(rb, npc.getObjectUUID());
+                    npc.runes.add(toApply);
+                }
+            }
+        }
+    }
 }
@@ -53,13 +53,10 @@ public enum PowersManager {
    public static HashMap<Integer, AbstractPowerAction> powerActionsByID = new HashMap<>();
    public static HashMap<String, Integer> ActionTokenByIDString = new HashMap<>();
    public static HashMap<String, Integer> AnimationOverrides = new HashMap<>();
-    public static HashMap<Integer, ArrayList<MobPowerEntry>> AllMobPowers;
+    public static HashMap<Integer, ArrayList<RunePowerEntry>> _allRunePowers;
+    public static HashMap<Integer, ArrayList<RuneSkillAdjustEntry>> _allRuneSkillAdjusts;
    private static JobScheduler js;

-    private PowersManager() {
-
-    }
-
    public static void initPowersManager(boolean fullPowersLoad) {

        if (fullPowersLoad)
@@ -103,6 +100,16 @@ public enum PowersManager {
        }
    }

+    public static ArrayList<RunePowerEntry> getPowersForRune(int rune_id) {
+
+        ArrayList<RunePowerEntry> powerEntries = PowersManager._allRunePowers.get(rune_id);
+
+        if (powerEntries == null)
+            powerEntries = new ArrayList<>();
+
+        return powerEntries;
+    }
+
    // This pre-loads all powers and effects
    public static void InitializePowers() {

@@ -839,8 +846,6 @@ public enum PowersManager {
            return;
        }

-        playerCharacter.setHateValue(pb.getHateValue(trains));
-
        //Send Cast Message.
 //		PerformActionMsg castMsg = new PerformActionMsg(msg);
 //		castMsg.setNumTrains(9999);
@@ -891,8 +896,6 @@ public enum PowersManager {
            //Power is aiding a target, handle aggro if combat target is a Mob.
            if (!pb.isHarmful() && target.getObjectType() == GameObjectType.PlayerCharacter) {
                PlayerCharacter pcTarget = (PlayerCharacter) target;
-                if (!pb.isHarmful())
-                    Mob.HandleAssistedAggro(playerCharacter, pcTarget);
            }

            // update target of used power timer
@@ -9,6 +9,7 @@
 package engine.gameManager;

 import engine.Enum;
+import engine.InterestManagement.HeightMap;
 import engine.db.archive.CityRecord;
 import engine.db.archive.DataWarehouse;
 import engine.math.Bounds;
@@ -453,4 +454,31 @@ public enum ZoneManager {
            }
        }
    }
+
+    public static float caclulateWorldAltitude(Zone zone) {
+
+        float worldAlttitude = MBServerStatics.SEA_FLOOR_ALTITUDE;
+
+        // Seafloor
+
+        if (zone.getParent() == null)
+            return worldAlttitude;
+
+        Zone parentZone = zone.getParent();
+
+        // Children of seafloor
+
+        if (parentZone.getParent() == null)
+            return worldAlttitude + zone.getYCoord();
+
+        // return height from heightmap engine at zone location
+
+        worldAlttitude = HeightMap.getWorldHeight(parentZone, zone.getLoc());
+
+        // Add zone offset to value
+
+        worldAlttitude += zone.getYCoord();
+
+        return worldAlttitude;
+    }
 }
@@ -29,7 +29,7 @@ public class EndFearJob extends AbstractEffectJob {
        if (this.target == null || (!(this.target instanceof Mob)))
            return;

-        ((Mob) this.target).setFearedObject(null);
+        ((Mob) this.target).fearedObject = null;
    }

    @Override
@@ -40,6 +40,6 @@ public class EndFearJob extends AbstractEffectJob {
        if (this.target == null || (!(this.target instanceof Mob)))
            return;

-        ((Mob) this.target).setFearedObject(null);
+        ((Mob) this.target).fearedObject = null;
    }
 }
@@ -61,8 +61,6 @@ public class FinishSummonsJob extends AbstractScheduleJob {
            return;
        }

-        if (this.source.region != null)
-            this.target.setRegion(this.source.region);
        //teleport target to source
        target.teleport(source.getLoc());
    }
@@ -23,6 +23,7 @@ import engine.net.client.msg.PowerProjectileMsg;
 import engine.objects.*;
 import engine.powers.ActionsBase;
 import engine.powers.PowersBase;
+import engine.powers.RunePowerEntry;
 import engine.server.MBServerStatics;
 import org.pmw.tinylog.Logger;

@@ -49,17 +50,19 @@ public class MobAI {
                return;
            }

+            if (target.getObjectType().equals(Enum.GameObjectType.PlayerCharacter) &&
+                    !mob.canSee((AbstractCharacter) target)) {
+                mob.setCombatTarget(null);
+                return;
+            }
+
            if (target.getObjectType() == Enum.GameObjectType.PlayerCharacter && canCast(mob)) {

-                if (mob.isPlayerGuard() == false && MobCast(mob)) {
+                if (MobCast(mob)) {
                    mob.updateLocation();
                    return;
                }

-                if (mob.isPlayerGuard() == true && GuardCast(mob)) {
-                    mob.updateLocation();
-                    return;
-                }
            }

            if (!CombatUtilities.inRangeToAttack(mob, target))
@@ -96,7 +99,7 @@ public class MobAI {
                return;
            }

-            if (mob.BehaviourType.callsForHelp)
+            if (mob.behaviourType.callsForHelp)
                MobCallForHelp(mob);

            if (!MovementUtilities.inRangeDropAggro(mob, target)) {
@@ -165,7 +168,7 @@ public class MobAI {

            if (playercity != null)
                for (Mob guard : playercity.getParent().zoneMobSet)
-                    if (guard.BehaviourType != null && guard.BehaviourType.ordinal() == Enum.MobBehaviourType.GuardCaptain.ordinal())
+                    if (guard.agentType.equals(Enum.AIAgentType.GUARDCAPTAIN))
                        if (guard.getCombatTarget() == null && !guard.getGuild().equals(mob.getGuild()))
                            guard.setCombatTarget(mob);

@@ -249,50 +252,58 @@ public class MobAI {

        try {

-            //make sure mob is out of combat stance
-
            int patrolDelay = ThreadLocalRandom.current().nextInt((int) (MobAIThread.AI_PATROL_DIVISOR * 0.5f), MobAIThread.AI_PATROL_DIVISOR) + MobAIThread.AI_PATROL_DIVISOR;

-            //early exit while waiting to patrol again
+            // early exit while waiting to patrol again.
+            // Minions are force marched if captain is alive
+
+            boolean forced = mob.agentType.equals(Enum.AIAgentType.GUARDMINION) &&
+                    mob.guardCaptain.isAlive();

            if (mob.stopPatrolTime + (patrolDelay * 1000) > System.currentTimeMillis())
-                return;
-
-            //guard captains inherit barracks patrol points dynamically
-
-            if (mob.BehaviourType.ordinal() == Enum.MobBehaviourType.GuardCaptain.ordinal()) {
-
-                Building barracks = mob.building;
-
-                if (barracks != null && barracks.patrolPoints != null && !barracks.getPatrolPoints().isEmpty()) {
-                    mob.patrolPoints = barracks.patrolPoints;
-                } else {
-                    randomGuardPatrolPoint(mob);
+                if (!forced)
                    return;
+
+            //guards inherit barracks patrol points dynamically
+
+            if (mob.patrolPoints == null || mob.patrolPoints.isEmpty())
+                if (mob.agentType.equals(Enum.AIAgentType.GUARDCAPTAIN) || mob.agentType.equals(Enum.AIAgentType.GUARDMINION)) {
+
+                    Building barracks = mob.building;
+
+                    if (barracks != null && barracks.patrolPoints != null && !barracks.getPatrolPoints().isEmpty()) {
+                        mob.patrolPoints = barracks.patrolPoints;
+                    } else {
+                        randomGuardPatrolPoint(mob);
+                        return;
+                    }
                }
-            }

            if (mob.lastPatrolPointIndex > mob.patrolPoints.size() - 1)
                mob.lastPatrolPointIndex = 0;

-            mob.destination = mob.patrolPoints.get(mob.lastPatrolPointIndex);
-            mob.lastPatrolPointIndex += 1;
+            // Minions are given marching orders by the captain if he is alive
+
+            if (mob.agentType.equals(Enum.AIAgentType.GUARDMINION)) {
+                Mob captain = (Mob) mob.guardCaptain;
+                mob.destination = captain.destination.add(Formation.getOffset(2, mob.guardCaptain.minions.indexOf(mob.getObjectUUID()) + 3));
+                mob.lastPatrolPointIndex = captain.lastPatrolPointIndex;
+            } else {
+                mob.destination = mob.patrolPoints.get(mob.lastPatrolPointIndex);
+                mob.lastPatrolPointIndex += 1;
+            }
+
+            // Captain orders minions to patrol
+
+            if (mob.agentType.equals(Enum.AIAgentType.GUARDCAPTAIN))
+                for (Integer minionUUID : mob.minions) {
+                    Mob minion = Mob.getMob(minionUUID);
+                    if (minion.isAlive() && minion.combatTarget == null)
+                        MobAI.Patrol(minion);
+                }

            MovementUtilities.aiMove(mob, mob.destination, true);

-            if (mob.BehaviourType.equals(Enum.MobBehaviourType.GuardCaptain))
-                for (Entry<Mob, Integer> minion : mob.siegeMinionMap.entrySet())
-
-                    //make sure mob is out of combat stance
-
-                    if (minion.getKey().despawned == false) {
-                        if (MovementUtilities.canMove(minion.getKey())) {
-                            Vector3f minionOffset = Formation.getOffset(2, minion.getValue() + 3);
-                            minion.getKey().updateLocation();
-                            Vector3fImmutable formationPatrolPoint = new Vector3fImmutable(mob.destination.x + minionOffset.x, mob.destination.y, mob.destination.z + minionOffset.z);
-                            MovementUtilities.aiMove(minion.getKey(), formationPatrolPoint, true);
-                        }
-                    }
        } catch (Exception e) {
            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: AttackTarget" + " " + e.getMessage());
        }
@@ -300,6 +311,8 @@ public class MobAI {

    public static boolean canCast(Mob mob) {

+        int contractID = 0;
+
        try {

            // Performs validation to determine if a
@@ -308,26 +321,27 @@ public class MobAI {
            if (mob == null)
                return false;

-            if(mob.isPlayerGuard == true){
+            if (mob.isPlayerGuard() == true) {

-                int contractID;
-
-                if(mob.BehaviourType.equals(Enum.MobBehaviourType.GuardMinion))
-                    contractID = mob.npcOwner.contract.getContractID();
-                 else
+                if(mob.agentType.equals(Enum.AIAgentType.GUARDWALLARCHER))
+                    return false; //wall archers don't cast
+                if (mob.agentType.equals(Enum.AIAgentType.GUARDMINION))
+                    contractID = mob.guardCaptain.contract.getContractID();
+                else
                    contractID = mob.contract.getContractID();

-                if(Enum.MinionType.ContractToMinionMap.get(contractID).isMage() == false)
+                // exception allowing werewolf and werebear guard captains to cast
+
+                if (Enum.MinionType.ContractToMinionMap.get(contractID).isMage() == false && contractID != 980103 && contractID != 980104)
                    return false;
            }

-            if (mob.mobPowers.isEmpty())
+            // Mobile has no powers defined in mobbase or contract..
+
+            if (PowersManager.getPowersForRune(mob.getMobBaseID()).isEmpty() &&
+                    PowersManager.getPowersForRune(contractID).isEmpty())
                return false;

-            if (!mob.canSee((PlayerCharacter) mob.getCombatTarget())) {
-                mob.setCombatTarget(null);
-                return false;
-            }
            if (mob.nextCastTime == 0)
                mob.nextCastTime = System.currentTimeMillis();

@@ -346,47 +360,67 @@ public class MobAI {
            // and casts it on the current target (or itself).  Validation
            // (including empty lists) is done previously within canCast();

-            ArrayList<Integer> powerTokens;
-            ArrayList<Integer> purgeTokens;
+            ArrayList<RunePowerEntry> powerEntries;
+            ArrayList<RunePowerEntry> purgeEntries;
            AbstractCharacter target = (AbstractCharacter) mob.getCombatTarget();

-            if (mob.BehaviourType.callsForHelp)
+            if (mob.behaviourType.callsForHelp)
                MobCallForHelp(mob);

            // Generate a list of tokens from the mob powers for this mobile.

-            powerTokens = new ArrayList<>(mob.mobPowers.keySet());
-            purgeTokens = new ArrayList<>();
+            powerEntries = new ArrayList<>(PowersManager.getPowersForRune(mob.getMobBaseID()));
+            purgeEntries = new ArrayList<>();
+
+            // 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 = PowersManager.getPowersForRune(mob.contractUUID);
+
+                if (mob.agentType.equals(Enum.AIAgentType.GUARDMINION))
+                    contractEntries = PowersManager.getPowersForRune(mob.guardCaptain.contractUUID);
+
+                powerEntries.addAll(contractEntries);
+
+            }

            // If player has this effect on them currently then remove
            // this token from our list.

-            for (int powerToken : powerTokens) {
+            for (RunePowerEntry runePowerEntry : powerEntries) {

-                PowersBase powerBase = PowersManager.getPowerByToken(powerToken);
+                PowersBase powerBase = PowersManager.getPowerByToken(runePowerEntry.token);

                for (ActionsBase actionBase : powerBase.getActions()) {

                    String stackType = actionBase.stackType;

                    if (target.getEffects() != null && target.getEffects().containsKey(stackType))
-                        purgeTokens.add(powerToken);
+                        purgeEntries.add(runePowerEntry);
                }
            }

-            powerTokens.removeAll(purgeTokens);
+            powerEntries.removeAll(purgeEntries);

            // Sanity check

-            if (powerTokens.isEmpty())
+            if (powerEntries.isEmpty())
                return false;

            // Pick random spell from our list of powers

-            int powerToken = powerTokens.get(ThreadLocalRandom.current().nextInt(powerTokens.size()));
-            int powerRank = mob.mobPowers.get(powerToken);
+            RunePowerEntry runePowerEntry = powerEntries.get(ThreadLocalRandom.current().nextInt(powerEntries.size()));

-            PowersBase mobPower = PowersManager.getPowerByToken(powerToken);
+            PowersBase mobPower = PowersManager.getPowerByToken(runePowerEntry.token);
+            int powerRank = runePowerEntry.rank;
+
+            if (mob.isPlayerGuard())
+                powerRank = getGuardPowerRank(mob);

            //check for hit-roll

@@ -411,7 +445,7 @@ public class MobAI {
                msg.setUnknown04(2);

                PowersManager.finishUseMobPower(msg, mob, 0, 0);
-                long randomCooldown = (long)((ThreadLocalRandom.current().nextInt(10,15) * 1000) * MobAIThread.AI_CAST_FREQUENCY);
+                long randomCooldown = (long) ((ThreadLocalRandom.current().nextInt(10, 15) * 1000) * MobAIThread.AI_CAST_FREQUENCY);

                mob.nextCastTime = System.currentTimeMillis() + randomCooldown;
                return true;
@@ -422,127 +456,33 @@ public class MobAI {
        return false;
    }

-    public static boolean GuardCast(Mob mob) {
+    public static int getGuardPowerRank(Mob mob) {
+        int powerRank = 1;

-        try {
-            // Method picks a random spell from a mobile's list of powers
-            // and casts it on the current target (or itself).  Validation
-            // (including empty lists) is done previously within canCast();
-
-            ArrayList<Integer> powerTokens;
-            ArrayList<Integer> purgeTokens;
-            AbstractCharacter target = (AbstractCharacter) mob.getCombatTarget();
-
-            if (mob.BehaviourType.callsForHelp)
-                MobCallForHelp(mob);
-
-            // Generate a list of tokens from the mob powers for this mobile.
-
-            powerTokens = new ArrayList<>(mob.mobPowers.keySet());
-            purgeTokens = new ArrayList<>();
-
-            // If player has this effect on them currently then remove
-            // this token from our list.
-
-            for (int powerToken : powerTokens) {
-
-                PowersBase powerBase = PowersManager.getPowerByToken(powerToken);
-
-                for (ActionsBase actionBase : powerBase.getActions()) {
-
-                    String stackType = actionBase.stackType;
-
-                    if (target.getEffects() != null && target.getEffects().containsKey(stackType))
-                        purgeTokens.add(powerToken);
-                }
-            }
-
-            powerTokens.removeAll(purgeTokens);
-
-            // Sanity check
-
-            if (powerTokens.isEmpty())
-                return false;
-
-            int powerToken = 0;
-            int nukeRoll = ThreadLocalRandom.current().nextInt(1,100);
-
-            if (nukeRoll < 55) {
-
-                //use direct damage spell
-                powerToken = powerTokens.get(powerTokens.size() - 1);
-
-            } else {
-                //use random spell
-                powerToken = powerTokens.get(ThreadLocalRandom.current().nextInt(powerTokens.size()));
-            }
-
-            int powerRank = 1;
-
-            switch(mob.getRank()){
-                case 1:
-                    powerRank = 10;
-                    break;
-                case 2:
-                    powerRank = 15;
-                    break;
-                case 3:
-                    powerRank = 20;
-                    break;
-                case 4:
-                    powerRank = 25;
-                    break;
-                case 5:
-                    powerRank = 30;
-                    break;
-                case 6:
-                    powerRank = 35;
-                    break;
-                case 7:
-                    powerRank = 40;
-                    break;
-            }
-
-            PowersBase mobPower = PowersManager.getPowerByToken(powerToken);
-
-            //check for hit-roll
-
-            if (mobPower.requiresHitRoll)
-                if (CombatUtilities.triggerDefense(mob, mob.getCombatTarget()))
-                    return false;
-
-            // Cast the spell
-
-            if (CombatUtilities.inRange2D(mob, mob.getCombatTarget(), mobPower.getRange())) {
-
-                PerformActionMsg msg;
-
-                if (!mobPower.isHarmful() || mobPower.targetSelf) {
-
-                    if (mobPower.category.equals("DISPEL")) {
-                        PowersManager.useMobPower(mob, target, mobPower, powerRank);
-                        msg = PowersManager.createPowerMsg(mobPower, powerRank, mob, target);
-                    } else {
-                        PowersManager.useMobPower(mob, mob, mobPower, powerRank);
-                        msg = PowersManager.createPowerMsg(mobPower, powerRank, mob, mob);
-                    }
-                } else {
-                    PowersManager.useMobPower(mob, target, mobPower, powerRank);
-                    msg = PowersManager.createPowerMsg(mobPower, powerRank, mob, target);
-                }
-
-                msg.setUnknown04(2);
-
-                PowersManager.finishUseMobPower(msg, mob, 0, 0);
-
-                long randomCooldown = (long)((ThreadLocalRandom.current().nextInt(10,15) * 1000) * MobAIThread.AI_CAST_FREQUENCY);
-                mob.nextCastTime = System.currentTimeMillis() + randomCooldown;
-                return true;
-            }
-        } catch (Exception e) {
-            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: MobCast" + " " + e.getMessage());
+        switch (mob.getRank()) {
+            case 1:
+                powerRank = 10;
+                break;
+            case 2:
+                powerRank = 15;
+                break;
+            case 3:
+                powerRank = 20;
+                break;
+            case 4:
+                powerRank = 25;
+                break;
+            case 5:
+                powerRank = 30;
+                break;
+            case 6:
+                powerRank = 35;
+                break;
+            case 7:
+                powerRank = 40;
+                break;
        }
-        return false;
+        return powerRank;
    }

    public static void MobCallForHelp(Mob mob) {
@@ -564,7 +504,7 @@ public class MobAI {
            Zone mobCamp = mob.getParentZone();

            for (Mob helper : mobCamp.zoneMobSet) {
-                if (helper.BehaviourType.respondsToCallForHelp && helper.BehaviourType.BehaviourHelperType.equals(mob.BehaviourType)) {
+                if (helper.behaviourType.respondsToCallForHelp && helper.behaviourType.BehaviourHelperType.equals(mob.behaviourType)) {
                    helper.setCombatTarget(mob.getCombatTarget());
                    callGotResponse = true;
                }
@@ -606,10 +546,10 @@ public class MobAI {

            //override for guards

-            if (mob.despawned && mob.isPlayerGuard) {
+            if (mob.despawned && mob.isPlayerGuard()) {

-                if (mob.BehaviourType.ordinal() == Enum.MobBehaviourType.GuardMinion.ordinal()) {
-                    if (mob.npcOwner.isAlive() == false || ((Mob) mob.npcOwner).despawned == true) {
+                if (mob.agentType.equals(Enum.AIAgentType.GUARDMINION)) {
+                    if (mob.guardCaptain.isAlive() == false || ((Mob) mob.guardCaptain).despawned == true) {

                        //minions don't respawn while guard captain is dead

@@ -625,7 +565,7 @@ public class MobAI {

                //check to send mob home for player guards to prevent exploit of dragging guards away and then teleporting

-                if (mob.BehaviourType.ordinal() != Enum.MobBehaviourType.Pet1.ordinal())
+                if (!mob.agentType.equals(Enum.AIAgentType.PET))
                    CheckToSendMobHome(mob);

                return;
@@ -638,15 +578,23 @@ public class MobAI {
                return;
            }

-            //no players loaded, no need to proceed
+            //no players loaded, no need to proceed unless it's a player guard
+            boolean bypassLoadedPlayerCheck = false;
+            if(mob.isPlayerGuard() || mob.isSiege()) {
+                bypassLoadedPlayerCheck = true;
+                if(mob.combatTarget != null && mob.combatTarget.getObjectType().equals(Enum.GameObjectType.PlayerCharacter))
+                    if(mob.combatTarget.loc.distanceSquared(mob.loc) > 10000)
+                        mob.setCombatTarget(null);
+            }

-            if (mob.playerAgroMap.isEmpty()) {
-                if(mob.getCombatTarget() != null)
+            if (mob.playerAgroMap.isEmpty() && !bypassLoadedPlayerCheck) {
+                if (mob.getCombatTarget() != null)
                    mob.setCombatTarget(null);
                return;
            }

-            if (mob.BehaviourType.ordinal() != Enum.MobBehaviourType.Pet1.ordinal())
+
+            if (mob.agentType.equals(Enum.AIAgentType.PET) == false)
                CheckToSendMobHome(mob);

            if (mob.getCombatTarget() != null) {
@@ -673,17 +621,14 @@ public class MobAI {
                }
            }

-            switch (mob.BehaviourType) {
+            switch (mob.behaviourType) {
                case GuardCaptain:
-                    GuardCaptainLogic(mob);
-                    break;
                case GuardMinion:
-                    GuardMinionLogic(mob);
-                    break;
                case GuardWallArcher:
-                    GuardWallArcherLogic(mob);
+                    GuardLogic(mob);
                    break;
                case Pet1:
+                case SiegeEngine:
                    PetLogic(mob);
                    break;
                case HamletGuard:
@@ -707,7 +652,7 @@ public class MobAI {
            if (!aiAgent.isAlive())
                return;

-            ConcurrentHashMap<Integer, Boolean> loadedPlayers = aiAgent.playerAgroMap;
+            ConcurrentHashMap<Integer, Float> loadedPlayers = aiAgent.playerAgroMap;

            for (Entry playerEntry : loadedPlayers.entrySet()) {

@@ -747,7 +692,6 @@ public class MobAI {
                    aiAgent.setCombatTarget(loadedPlayer);
                    return;
                }
-
            }

            if (aiAgent.getCombatTarget() == null) {
@@ -782,47 +726,45 @@ public class MobAI {

            mob.updateLocation();

-            switch (mob.BehaviourType) {
+            switch (mob.behaviourType) {

                case Pet1:
-                    if (mob.getOwner() == null)
+
+                    if (mob.guardCaptain == null)
                        return;

-                    if (!mob.playerAgroMap.containsKey(mob.getOwner().getObjectUUID())) {
+                    //mob no longer has its owner loaded, translate pet to owner

-                        //mob no longer has its owner loaded, translocate pet to owner
-
-                        MovementManager.translocate(mob, mob.getOwner().getLoc(), null);
+                    if (!mob.playerAgroMap.containsKey(mob.guardCaptain.getObjectUUID())) {
+                        MovementManager.translocate(mob, mob.guardCaptain.getLoc());
                        return;
                    }
+
                    if (mob.getCombatTarget() == null) {

                        //move back to owner

-                        if (CombatUtilities.inRange2D(mob, mob.getOwner(), 6))
+                        if (CombatUtilities.inRange2D(mob, mob.guardCaptain, 6))
                            return;

-                        mob.destination = mob.getOwner().getLoc();
-                        MovementUtilities.moveToLocation(mob, mob.destination, 5);
+                        mob.destination = mob.guardCaptain.getLoc();
+                        MovementUtilities.moveToLocation(mob, mob.destination, 5, false);
                    } else
                        chaseTarget(mob);
                    break;
-                case GuardMinion:
-                    if (!mob.npcOwner.isAlive() || ((Mob) mob.npcOwner).despawned)
-                        randomGuardPatrolPoint(mob);
-                    else {
-                        if (mob.getCombatTarget() != null) {
-                            chaseTarget(mob);
-                        }
-                    }
-                    break;
                default:
                    if (mob.getCombatTarget() == null) {
-                        if (!mob.isMoving())
-                            Patrol(mob);
-                        else {
+
+                        if (!mob.isMoving()) {
+
+                            // Minions only patrol on their own if captain is dead.
+
+                            if (mob.agentType.equals(Enum.AIAgentType.GUARDMINION) == false)
+                                Patrol(mob);
+                            else if (mob.guardCaptain.isAlive() == false)
+                                Patrol(mob);
+                        } else
                            mob.stopPatrolTime = System.currentTimeMillis();
-                        }
                    } else {
                        chaseTarget(mob);
                    }
@@ -893,7 +835,8 @@ public class MobAI {
            if (mob.getCombatTarget() == null)
                return;

-            if (mob.getCombatTarget().getObjectType().equals(Enum.GameObjectType.PlayerCharacter) && MovementUtilities.inRangeDropAggro(mob, (PlayerCharacter) mob.getCombatTarget()) == false && mob.BehaviourType.ordinal() != Enum.MobBehaviourType.Pet1.ordinal()) {
+            if (mob.getCombatTarget().getObjectType().equals(Enum.GameObjectType.PlayerCharacter) && MovementUtilities.inRangeDropAggro(mob, (PlayerCharacter) mob.getCombatTarget()) == false &&
+                    mob.agentType.equals(Enum.AIAgentType.PET) == false) {

                mob.setCombatTarget(null);
                return;
@@ -909,15 +852,6 @@ public class MobAI {
    private static void CheckToSendMobHome(Mob mob) {

        try {
-            if (mob.BehaviourType.isAgressive) {
-
-                if (mob.isPlayerGuard()) {
-                    if (mob.BehaviourType.ordinal() == Enum.MobBehaviourType.GuardCaptain.ordinal())
-                        CheckForPlayerGuardAggro(mob);
-                } else {
-                    CheckForAggro(mob);
-                }
-            }

            if (mob.getCombatTarget() != null && CombatUtilities.inRange2D(mob, mob.getCombatTarget(), MobAIThread.AI_BASE_AGGRO_RANGE * 0.5f))
                return;
@@ -932,13 +866,15 @@ public class MobAI {
                    PowersManager.useMobPower(mob, mob, recall, 40);
                    mob.setCombatTarget(null);

-                    if (mob.BehaviourType.ordinal() == Enum.MobBehaviourType.GuardCaptain.ordinal() && mob.isAlive()) {
+                    if (mob.agentType.equals(Enum.AIAgentType.GUARDCAPTAIN) && mob.isAlive()) {

                        //guard captain pulls his minions home with him

-                        for (Entry<Mob, Integer> minion : mob.siegeMinionMap.entrySet()) {
-                            PowersManager.useMobPower(minion.getKey(), minion.getKey(), recall, 40);
-                            minion.getKey().setCombatTarget(null);
+                        for (Integer minionUUID : mob.minions) {
+                            Mob minion = Mob.getMob(minionUUID);
+
+                            PowersManager.useMobPower(minion, minion, recall, 40);
+                            minion.setCombatTarget(null);
                        }
                    }
                }
@@ -948,8 +884,8 @@ public class MobAI {
                PowersManager.useMobPower(mob, mob, recall, 40);
                mob.setCombatTarget(null);

-                for (Entry playerEntry : mob.playerAgroMap.entrySet())
-                    PlayerCharacter.getFromCache((int) playerEntry.getKey()).setHateValue(0);
+                for (Integer playerEntry : mob.playerAgroMap.keySet())
+                    mob.playerAgroMap.put(playerEntry, 0f);
            }
        } catch (Exception e) {
            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: CheckToSendMobHome" + " " + e.getMessage());
@@ -960,16 +896,10 @@ public class MobAI {

        try {

-            float rangeSquared = mob.getRange() * mob.getRange();
-            float distanceSquared = mob.getLoc().distanceSquared2D(mob.getCombatTarget().getLoc());
-
-            if(mob.isMoving() == true && distanceSquared < rangeSquared - 50) {
-                mob.destination = mob.getLoc();
-                MovementUtilities.moveToLocation(mob, mob.destination, 0);
-            } else if (CombatUtilities.inRange2D(mob, mob.getCombatTarget(), mob.getRange()) == false) {
+            if (CombatUtilities.inRange2D(mob, mob.getCombatTarget(), mob.getRange()) == false) {
                if (mob.getRange() > 15) {
                    mob.destination = mob.getCombatTarget().getLoc();
-                    MovementUtilities.moveToLocation(mob, mob.destination, 0);
+                    MovementUtilities.moveToLocation(mob, mob.destination, 0, false);
                } else {

                    //check if building
@@ -978,11 +908,11 @@ public class MobAI {
                        case PlayerCharacter:
                        case Mob:
                            mob.destination = MovementUtilities.GetDestinationToCharacter(mob, (AbstractCharacter) mob.getCombatTarget());
-                            MovementUtilities.moveToLocation(mob, mob.destination, mob.getRange() + 1);
+                            MovementUtilities.moveToLocation(mob, mob.destination, mob.getRange() + 1, false);
                            break;
                        case Building:
                            mob.destination = mob.getCombatTarget().getLoc();
-                            MovementUtilities.moveToLocation(mob, mob.getCombatTarget().getLoc(), 0);
+                            MovementUtilities.moveToLocation(mob, mob.getCombatTarget().getLoc(), 0, false);
                            break;
                    }
                }
@@ -1003,17 +933,17 @@ public class MobAI {

                //dont scan self.

-                if (mob.equals(awoMob) || (mob.agentType.equals(Enum.AIAgentType.GUARD)) == true)
+                if (mob.equals(awoMob) || (mob.agentType.equals(Enum.AIAgentType.GUARDCAPTAIN)) == true)
                    continue;

                Mob aggroMob = (Mob) awoMob;

                //don't attack other guards

-                if ((aggroMob.agentType.equals(Enum.AIAgentType.GUARD)))
+                if ((aggroMob.agentType.equals(Enum.AIAgentType.GUARDCAPTAIN)))
                    continue;

-                if(aggroMob.BehaviourType.equals(Enum.MobBehaviourType.Pet1))
+                if (aggroMob.agentType.equals(Enum.AIAgentType.PET))
                    continue;

                if (mob.getLoc().distanceSquared2D(aggroMob.getLoc()) > sqr(50))
@@ -1026,75 +956,33 @@ public class MobAI {
        }
    }

-    public static void GuardCaptainLogic(Mob mob) {
+    public static void GuardLogic(Mob mob) {

        try {
-            if (mob.getCombatTarget() == null)
+            if (mob.getCombatTarget() == null) {
                CheckForPlayerGuardAggro(mob);
+            } else {
+                //do not need to look to change target if target is already null
+                AbstractWorldObject newTarget = ChangeTargetFromHateValue(mob);

-            AbstractWorldObject newTarget = ChangeTargetFromHateValue(mob);
+                if (newTarget != null) {

-            if (newTarget != null) {
-
-                if (newTarget.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) {
-                    if (GuardCanAggro(mob, (PlayerCharacter) newTarget))
-                        mob.setCombatTarget(newTarget);
-                } else
-                    mob.setCombatTarget(newTarget);
-
-            }
-
-            CheckMobMovement(mob);
-            CheckForAttack(mob);
-        } catch (Exception e) {
-            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: GuardCaptainLogic" + " " + e.getMessage());
-        }
-    }
-
-    public static void GuardMinionLogic(Mob mob) {
-
-        try {
-            if (!mob.npcOwner.isAlive()) {
-
-                if (mob.getCombatTarget() == null) {
-                    CheckForPlayerGuardAggro(mob);
-                } else {
-
-                    AbstractWorldObject newTarget = ChangeTargetFromHateValue(mob);
-
-                    if (newTarget != null) {
-
-                        if (newTarget.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) {
-                            if (GuardCanAggro(mob, (PlayerCharacter) newTarget))
-                                mob.setCombatTarget(newTarget);
-                        } else
+                    if (newTarget.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) {
+                        if (GuardCanAggro(mob, (PlayerCharacter) newTarget))
                            mob.setCombatTarget(newTarget);
-
-                    }
+                    } else
+                        mob.setCombatTarget(newTarget);
                }
-            }else {
-                if (mob.npcOwner.getCombatTarget() != null)
-                    mob.setCombatTarget(mob.npcOwner.getCombatTarget());
-                else
-                    if (mob.getCombatTarget() != null)
-                        mob.setCombatTarget(null);
            }
-            CheckMobMovement(mob);
-            CheckForAttack(mob);
-        } catch (Exception e) {
-            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: GuardMinionLogic" + " " + e.getMessage());
-        }
-    }

-    public static void GuardWallArcherLogic(Mob mob) {
+            if(mob.behaviourType.canRoam)
+                CheckMobMovement(mob);//all guards that can move check to move
+
+            if(mob.combatTarget != null)
+                CheckForAttack(mob); //only check to attack if combat target is not null

-        try {
-            if (mob.getCombatTarget() == null)
-                CheckForPlayerGuardAggro(mob);
-            else
-                CheckForAttack(mob);
        } catch (Exception e) {
-            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: GuardWallArcherLogic" + " " + e.getMessage());
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: GuardLogic" + " " + e.getMessage());
        }
    }

@@ -1102,11 +990,11 @@ public class MobAI {

        try {

-            if (mob.getOwner() == null && mob.isNecroPet() == false && mob.isSiege() == false)
+            if (mob.guardCaptain == null && mob.isNecroPet() == false && mob.isSiege() == false)
                if (ZoneManager.getSeaFloor().zoneMobSet.contains(mob))
                    mob.killCharacter("no owner");

-            if (MovementUtilities.canMove(mob) && mob.BehaviourType.canRoam)
+            if (MovementUtilities.canMove(mob) && mob.behaviourType.canRoam)
                CheckMobMovement(mob);

            CheckForAttack(mob);
@@ -1156,7 +1044,7 @@ public class MobAI {
            if (mob.getCombatTarget() != null && mob.playerAgroMap.containsKey(mob.getCombatTarget().getObjectUUID()) == false)
                mob.setCombatTarget(null);

-            if (mob.BehaviourType.isAgressive) {
+            if (mob.behaviourType.isAgressive) {

                AbstractWorldObject newTarget = ChangeTargetFromHateValue(mob);

@@ -1164,7 +1052,7 @@ public class MobAI {
                    mob.setCombatTarget(newTarget);
                else {
                    if (mob.getCombatTarget() == null) {
-                        if (mob.BehaviourType == Enum.MobBehaviourType.HamletGuard)
+                        if (mob.behaviourType == Enum.MobBehaviourType.HamletGuard)
                            SafeGuardAggro(mob);  //safehold guard
                        else
                            CheckForAggro(mob);   //normal aggro
@@ -1174,12 +1062,12 @@ public class MobAI {

            //check if mob can move for patrol or moving to target

-            if (mob.BehaviourType.canRoam)
+            if (mob.behaviourType.canRoam)
                CheckMobMovement(mob);

            //check if mob can attack if it isn't wimpy

-            if (!mob.BehaviourType.isWimpy && mob.getCombatTarget() != null)
+            if (!mob.behaviourType.isWimpy && mob.getCombatTarget() != null)
                CheckForAttack(mob);

        } catch (Exception e) {
@@ -1196,7 +1084,16 @@ public class MobAI {
            if (!mob.isAlive())
                return;

-            ConcurrentHashMap<Integer, Boolean> loadedPlayers = mob.playerAgroMap;
+            // Defer to captain if possible for current target
+
+            if (mob.agentType.equals(Enum.AIAgentType.GUARDMINION) &&
+                    mob.guardCaptain.isAlive()
+                    && mob.guardCaptain.combatTarget != null) {
+                mob.setCombatTarget(mob.guardCaptain.combatTarget);
+                return;
+            }
+
+            ConcurrentHashMap<Integer, Float> loadedPlayers = mob.playerAgroMap;

            for (Entry playerEntry : loadedPlayers.entrySet()) {

@@ -1231,27 +1128,39 @@ public class MobAI {
                    mob.setCombatTarget(loadedPlayer);
                    return;
                }
+            }
+                if (mob.getCombatTarget() == null) {
+
+                    //look for siege equipment to aggro if no players found to aggro
+
+                    HashSet<AbstractWorldObject> awoList = WorldGrid.getObjectsInRangePartial(mob, MobAIThread.AI_BASE_AGGRO_RANGE, MBServerStatics.MASK_SIEGE);
+
+                    for (AbstractWorldObject awoMob : awoList) {
+
+
+                        Mob aggroMob = (Mob) awoMob;
+                        if(GuardCanAggro(mob,aggroMob)) {
+                            mob.setCombatTarget(aggroMob);
+                            return;
+                        }
+                    }
+
            }
        } catch (Exception e) {
            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: CheckForPlayerGuardAggro" + e.getMessage());
        }
    }

-    public static Boolean GuardCanAggro(Mob mob, PlayerCharacter target) {
+    public static Boolean GuardCanAggro(Mob mob, AbstractCharacter target) {

        try {

+            if (mob.guardedCity.cityOutlaws.contains(target.getObjectUUID()) == true)
+                return true;
+
            if (mob.getGuild().getNation().equals(target.getGuild().getNation()))
                return false;

-            if (mob.BehaviourType.ordinal() == Enum.MobBehaviourType.GuardMinion.ordinal()) {
-                if (((Mob) mob.npcOwner).building.getCity().cityOutlaws.contains(target.getObjectUUID()) == true) {
-                    return true;
-                }
-            } else if (mob.building.getCity().cityOutlaws.contains(target.getObjectUUID()) == true) {
-                return true;
-            }
-
            //first check condemn list for aggro allowed (allies button is checked)

            if (ZoneManager.getCityAtLocation(mob.getLoc()).getTOL().reverseKOS) {
@@ -1329,17 +1238,19 @@ public class MobAI {

            MovementUtilities.aiMove(mob, mob.destination, true);

-            if (mob.BehaviourType.ordinal() == Enum.MobBehaviourType.GuardCaptain.ordinal()) {
-                for (Entry<Mob, Integer> minion : mob.siegeMinionMap.entrySet()) {
+            if (mob.agentType.equals(Enum.AIAgentType.GUARDCAPTAIN)) {
+                for (Integer minionUUID : mob.minions) {
+
+                    Mob minion = Mob.getMob(minionUUID);

                    //make sure mob is out of combat stance

-                    if (minion.getKey().despawned == false) {
-                        if (MovementUtilities.canMove(minion.getKey())) {
-                            Vector3f minionOffset = Formation.getOffset(2, minion.getValue() + 3);
-                            minion.getKey().updateLocation();
+                    if (minion.despawned == false) {
+                        if (MovementUtilities.canMove(minion)) {
+                            Vector3f minionOffset = Formation.getOffset(2, mob.minions.indexOf(minionUUID) + 3);
+                            minion.updateLocation();
                            Vector3fImmutable formationPatrolPoint = new Vector3fImmutable(mob.destination.x + minionOffset.x, mob.destination.y, mob.destination.z + minionOffset.z);
-                            MovementUtilities.aiMove(minion.getKey(), formationPatrolPoint, true);
+                            MovementUtilities.aiMove(minion, formationPatrolPoint, true);
                        }
                    }
                }
@@ -1356,7 +1267,7 @@ public class MobAI {
            float CurrentHateValue = 0;

            if (mob.getCombatTarget() != null && mob.getCombatTarget().getObjectType().equals(Enum.GameObjectType.PlayerCharacter))
-                CurrentHateValue = ((PlayerCharacter) mob.getCombatTarget()).getHateValue();
+                CurrentHateValue = mob.playerAgroMap.get(mob.combatTarget.getObjectUUID()).floatValue();

            AbstractWorldObject mostHatedTarget = null;

@@ -1367,8 +1278,8 @@ public class MobAI {
                if (potentialTarget.equals(mob.getCombatTarget()))
                    continue;

-                if (potentialTarget != null && potentialTarget.getHateValue() > CurrentHateValue && MovementUtilities.inRangeToAggro(mob, potentialTarget)) {
-                    CurrentHateValue = potentialTarget.getHateValue();
+                if (potentialTarget != null && mob.playerAgroMap.get(potentialTarget.getObjectUUID()).floatValue() > CurrentHateValue && MovementUtilities.inRangeToAggro(mob, potentialTarget)) {
+                    CurrentHateValue = mob.playerAgroMap.get(potentialTarget.getObjectUUID()).floatValue();
                    mostHatedTarget = potentialTarget;
                }

@@ -48,7 +48,7 @@ public class CombatUtilities {
    }

    public static boolean inRange2D(AbstractWorldObject entity1, AbstractWorldObject entity2, double range) {
-        return entity1.getLoc().distance2D(entity2.getLoc()) < range;
+        return entity1.getLoc().distanceSquared2D(entity2.getLoc()) < range * range;
    }

    public static void swingIsBlock(Mob agent, AbstractWorldObject target, int animation) {
@@ -264,19 +264,9 @@ public class CombatUtilities {
                swingIsBlock(agent, target, passiveAnim);
                return;
            }
-            if (agent.getEquip().get(1) != null && agent.getEquip().get(2) != null && agent.getEquip().get(2).getItemBase().isShield() == false) {
-                //mob is duel wielding and should conduct an attack for each hand
-                ItemBase weapon1 = agent.getEquip().get(1).getItemBase();
-                double range1 = getMaxDmg(weapon1.getMinDamage(), agent, weapon1) - getMinDmg(weapon1.getMinDamage(), agent, weapon1);
-                double damage1 = getMinDmg(weapon1.getMinDamage(), agent, weapon1) + ((ThreadLocalRandom.current().nextFloat() * range1) + (ThreadLocalRandom.current().nextFloat() * range1)) / 2;
-                swingIsDamage(agent, target, (float) damage1, CombatManager.getSwingAnimation(weapon1, null, true));
-                ItemBase weapon2 = agent.getEquip().get(2).getItemBase();
-                double range2 = getMaxDmg(weapon2.getMinDamage(), agent, weapon2) - getMinDmg(weapon2.getMinDamage(), agent, weapon2);
-                double damage2 = getMinDmg(weapon2.getMinDamage(), agent, weapon2) + ((ThreadLocalRandom.current().nextFloat() * range2) + (ThreadLocalRandom.current().nextFloat() * range2)) / 2;
-                swingIsDamage(agent, target, (float) damage2, CombatManager.getSwingAnimation(weapon1, null, false));
-            } else {
-                swingIsDamage(agent, target, determineDamage(agent), anim);
-            }
+
+            swingIsDamage(agent, target, determineDamage(agent), anim);
+

            if (agent.getWeaponPower() != null)
                agent.getWeaponPower().attack(target, MBServerStatics.ONE_MINUTE);
@@ -319,19 +309,10 @@ public class CombatUtilities {
        if (target == null)
            return 0;

-        float damage = 0;
+        int damage = 0;

        DamageType dt = getDamageType(agent);
-        if ((agent.agentType.equals(AIAgentType.PET)) == true || agent.isPet() == true || agent.isNecroPet() == true) {
-            damage = calculatePetDamage(agent);
-        } else if (agent.isPlayerGuard() == true) {
-            //damage = calculateGuardDamage(agent);
-            damage = calculateMobDamage(agent);
-        } else if (agent.getLevel() > 80) {
-            damage = calculateEpicDamage(agent);
-        } else {
-            damage = calculateMobDamage(agent);
-        }
+        damage = ThreadLocalRandom.current().nextInt((int)getMinDmg(agent), (int)getMaxDmg(agent) + 1);
        if (AbstractWorldObject.IsAbstractCharacter(target)) {
            if (((AbstractCharacter) target).isSit()) {
                damage *= 2.5f; //increase damage if sitting
@@ -357,158 +338,16 @@ public class CombatUtilities {
        return dt;
    }

-    public static int calculatePetDamage(Mob agent) {
-        //damage calc for pet
-        float range;
-        float damage;
-        float min = 40;
-        float max = 60;
-        float dmgMultiplier = 1 + agent.getBonuses().getFloatPercentAll(ModType.MeleeDamageModifier, SourceType.None);
-        double minDmg = getMinDmg(min, agent, null);
-        double maxDmg = getMaxDmg(max, agent, null);
-        dmgMultiplier += agent.getLevel() * 0.1f;
-        range = (float) (maxDmg - minDmg);
-        damage = min + ((ThreadLocalRandom.current().nextFloat() * range) + (ThreadLocalRandom.current().nextFloat() * range)) / 2;
-        return (int) (damage * dmgMultiplier);
+    public static double getMinDmg(Mob agent) {
+        if(agent.equip.get(2) != null && !agent.equip.get(2).getItemBase().isShield())
+            return agent.minDamageHandTwo;
+        else return agent.minDamageHandOne;
    }

-    public static int calculateGuardDamage(Mob agent) {
-        //damage calc for guard
-        ItemBase weapon = agent.getEquip().get(1).getItemBase();
-        AbstractWorldObject target = agent.getCombatTarget();
-
-        float dmgMultiplier = 1 + agent.getBonuses().getFloatPercentAll(ModType.MeleeDamageModifier, SourceType.None);
-
-        double minDmg = weapon.getMinDamage();
-        double maxDmg = weapon.getMaxDamage();
-        double min = getMinDmg(minDmg, agent, weapon);
-        double max = getMaxDmg(maxDmg, agent, weapon);
-
-        DamageType dt = weapon.getDamageType();
-
-        double range = max - min;
-        double damage = min + ((ThreadLocalRandom.current().nextFloat() * range) + (ThreadLocalRandom.current().nextFloat() * range)) / 2;
-
-        if (AbstractWorldObject.IsAbstractCharacter(target))
-            if (((AbstractCharacter) target).isSit())
-                damage *= 2.5f; //increase damage if sitting
-        if (AbstractWorldObject.IsAbstractCharacter(target))
-            return (int) (((AbstractCharacter) target).getResists().getResistedDamage(agent, (AbstractCharacter) target, dt, (float) damage, 0) * dmgMultiplier);
-        return 0;
-    }
-
-    public static int calculateEpicDamage(Mob agent) {
-        //handle r8 mob damage
-        DamageType dt = DamageType.Crush;
-        AbstractWorldObject target = agent.getCombatTarget();
-        float dmgMultiplier = 1 + agent.getBonuses().getFloatPercentAll(ModType.MeleeDamageModifier, SourceType.None);
-        double min = agent.getMinDamageHandOne();
-        double max = agent.getMaxDamageHandOne();
-        if (agent.getEquip().get(1) != null) {
-            if (agent.getEquip().get(1).getItemBase() != null) {
-                dt = agent.getEquip().get(1).getItemBase().getDamageType();
-                min = agent.getMinDamageHandOne();
-                max = agent.getMaxDamageHandOne();
-            } else if (agent.getEquip().get(2).getItemBase() != null && agent.getEquip().get(2).getItemBase().isShield() == false) {
-                dt = agent.getEquip().get(2).getItemBase().getDamageType();
-                min = agent.getMinDamageHandTwo();
-                max = agent.getMaxDamageHandTwo();
-            }
-        }
-
-
-        double range = max - min;
-        double damage = min + ((ThreadLocalRandom.current().nextFloat() * range) + (ThreadLocalRandom.current().nextFloat() * range)) / 2;
-        return (int) (((AbstractCharacter) target).getResists().getResistedDamage(agent, (AbstractCharacter) target, dt, (float) damage, 0) * dmgMultiplier);
-    }
-
-    public static int calculateMobDamage(Mob agent) {
-        ItemBase weapon = null;
-        double minDmg;
-        double maxDmg;
-        DamageType dt;
-
-        //main hand or offhand damage
-
-        if (agent.getEquip().get(1) != null)
-            weapon = agent.getEquip().get(1).getItemBase();
-        else if (agent.getEquip().get(2) != null)
-            weapon = agent.getEquip().get(2).getItemBase();
-
-        if (weapon != null) {
-            minDmg = getMinDmg(weapon.getMinDamage(), agent, weapon);
-            maxDmg = getMaxDmg(weapon.getMaxDamage(), agent, weapon);
-            dt = weapon.getDamageType();
-        } else {
-            minDmg = agent.getMobBase().getDamageMin();
-            maxDmg = agent.getMobBase().getDamageMax();
-            dt = DamageType.Crush;
-        }
-
-        AbstractWorldObject target = agent.getCombatTarget();
-
-        float dmgMultiplier = 1 + agent.getBonuses().getFloatPercentAll(ModType.MeleeDamageModifier, SourceType.None);
-        double range = maxDmg - minDmg;
-        double damage = minDmg + ((ThreadLocalRandom.current().nextFloat() * range) + (ThreadLocalRandom.current().nextFloat() * range)) / 2;
-
-        if (AbstractWorldObject.IsAbstractCharacter(target))
-            if (((AbstractCharacter) target).isSit())
-                damage *= 2.5f; //increase damage if sitting
-        if (AbstractWorldObject.IsAbstractCharacter(target))
-            return (int) (((AbstractCharacter) target).getResists().getResistedDamage(agent, (AbstractCharacter) target, dt, (float) damage, 0) * dmgMultiplier);
-        return 0;
-    }
-
-    public static double getMinDmg(double min, Mob agent, ItemBase weapon) {
-
-        int primary = agent.getStatStrCurrent();
-        int secondary = agent.getStatDexCurrent();
-        int focusLevel = 0;
-        int masteryLevel = 0;
-
-        if (weapon != null) {
-            if (weapon.isStrBased() == true) {
-                primary = agent.getStatStrCurrent();
-                secondary = agent.getStatDexCurrent();
-            } else {
-                primary = agent.getStatDexCurrent();
-                secondary = agent.getStatStrCurrent();
-                if (agent.getSkills().containsKey(weapon.getSkillRequired())) {
-                    focusLevel = (int) agent.getSkills().get(weapon.getSkillRequired()).getModifiedAmount();
-                }
-                if (agent.getSkills().containsKey(weapon.getMastery())) {
-                    masteryLevel = (int) agent.getSkills().get(weapon.getMastery()).getModifiedAmount();
-                }
-            }
-        }
-        return min * (pow(0.0048 * primary + .049 * (primary - 0.75), 0.5) + pow(0.0066 * secondary + 0.064 * (secondary - 0.75), 0.5) + +0.01 * (focusLevel + masteryLevel));
-    }
-
-    public static double getMaxDmg(double max, Mob agent, ItemBase weapon) {
-
-        int primary = agent.getStatStrCurrent();
-        int secondary = agent.getStatDexCurrent();
-        int focusLevel = 0;
-        int masteryLevel = 0;
-
-        if (weapon != null) {
-
-            if (weapon.isStrBased() == true) {
-                primary = agent.getStatStrCurrent();
-                secondary = agent.getStatDexCurrent();
-            } else {
-                primary = agent.getStatDexCurrent();
-                secondary = agent.getStatStrCurrent();
-            }
-
-            if (agent.getSkills().containsKey(weapon.getSkillRequired()))
-                focusLevel = (int) agent.getSkills().get(weapon.getSkillRequired()).getModifiedAmount();
-
-            if (agent.getSkills().containsKey(weapon.getSkillRequired()))
-                masteryLevel = (int) agent.getSkills().get(weapon.getMastery()).getModifiedAmount();
-
-        }
-        return max * (pow(0.0124 * primary + 0.118 * (primary - 0.75), 0.5) + pow(0.0022 * secondary + 0.028 * (secondary - 0.75), 0.5) + 0.0075 * (focusLevel + masteryLevel));
+    public static double getMaxDmg(Mob agent) {
+        if(agent.equip.get(2) != null && !agent.equip.get(2).getItemBase().isShield())
+            return agent.maxDamageHandTwo;
+        else return agent.maxDamageHandOne;
    }

 }
@@ -13,10 +13,10 @@ import engine.Enum;
 import engine.Enum.GameObjectType;
 import engine.Enum.ModType;
 import engine.Enum.SourceType;
-import engine.mobileAI.Threads.MobAIThread;
 import engine.exception.MsgSendException;
 import engine.gameManager.MovementManager;
 import engine.math.Vector3fImmutable;
+import engine.mobileAI.Threads.MobAIThread;
 import engine.net.client.msg.MoveToPointMsg;
 import engine.objects.*;
 import org.pmw.tinylog.Logger;
@@ -38,7 +38,7 @@ public class MovementUtilities {
            if (agent.getContract() != null)
                guardCaptain = agent;
            else
-                guardCaptain = (Mob) agent.npcOwner;
+                guardCaptain = (Mob) agent.guardCaptain;

            if (guardCaptain != null) {
                Building barracks = guardCaptain.building;
@@ -147,7 +147,7 @@ public class MovementUtilities {
        return aiAgent.getLoc().ClosestPointOnLine(aggroTarget.getLoc(), aggroTarget.getEndLoc());
    }

-    public static void moveToLocation(Mob agent, Vector3fImmutable newLocation, float offset) {
+    public static void moveToLocation(Mob agent, Vector3fImmutable newLocation, float offset, boolean isWalking) {
        try {

            //don't move farther than 30 units from player.
@@ -158,7 +158,7 @@ public class MovementUtilities {

            agent.setFaceDir(newLoc.subtract2D(agent.getLoc()).normalize());

-            aiMove(agent, newLoc, false);
+            aiMove(agent, newLoc, isWalking);