Handler update.

# Conflicts:
#	src/engine/mobileAI/utilities/CombatUtilities.java

src/engine/InterestManagement/HeightMap.java

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

src/engine/InterestManagement/InterestManager.java

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

src/engine/InterestManagement/Terrain.java

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

src/engine/db/archive/CityRecord.java

@@ -67,7 +67,7 @@ public class CityRecord extends DataRecord {
         cityRecord.locX = cityRecord.city.getTOL().getLoc().x;
         cityRecord.locY = -cityRecord.city.getTOL().getLoc().z; // flip sign on 'y' coordinate
 
-        cityRecord.zoneHash = cityRecord.city.getParent().getHash();
+        cityRecord.zoneHash = cityRecord.city.getParent().hash;
 
         if (cityRecord.eventType.equals(Enum.RecordEventType.CREATE))
             cityRecord.establishedDatetime = cityRecord.city.established;

src/engine/db/archive/GuildRecord.java

@@ -89,7 +89,7 @@ public class GuildRecord extends DataRecord {
         guildRecord.guildHash = guildRecord.guild.getHash();
         guildRecord.guildID = guildRecord.guild.getObjectUUID();
         guildRecord.guildName = guildRecord.guild.getName();
-        guildRecord.charterName = Enum.GuildType.getGuildTypeFromInt(guildRecord.guild.getCharter()).getCharterName();
+        guildRecord.charterName = Enum.GuildCharterType.getGuildTypeFromInt(guildRecord.guild.getCharter()).getCharterName();
 
         guildRecord.GLHash = DataWarehouse.hasher.encrypt(guildRecord.guild.getGuildLeaderUUID());
 

src/engine/db/archive/MineRecord.java

@@ -52,7 +52,7 @@ public class MineRecord extends DataRecord {
             mineRecord.eventType = eventType;
         }
 
-        mineRecord.zoneHash = mine.getParentZone().getHash();
+        mineRecord.zoneHash = mine.getParentZone().hash;
 
         if (character.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) {
             player = (PlayerCharacter) character;

src/engine/db/archive/PvpRecord.java

@@ -281,7 +281,7 @@ public class PvpRecord extends DataRecord {
         outStatement.setInt(8, this.victim.getLevel());
 
         outStatement.setString(9, DataWarehouse.hasher.encrypt(zone.getObjectUUID()));
-        outStatement.setString(10, zone.getName());
+        outStatement.setString(10, zone.zoneName);
         outStatement.setFloat(11, this.location.getX());
         outStatement.setFloat(12, -this.location.getZ()); // flip sign on 'y' coordinate
         outStatement.setBoolean(13, this.pvpExp);

src/engine/db/handlers/dbBoonHandler.java

@@ -1,51 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2022
-//                www.magicbane.com
-
-
-package engine.db.handlers;
-
-import engine.gameManager.DbManager;
-import engine.objects.Boon;
-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;
-
-public class dbBoonHandler extends dbHandlerBase {
-
-    public dbBoonHandler() {
-    }
-
-
-    public ArrayList<Boon> GET_BOON_AMOUNTS_FOR_ITEMBASE(int itemBaseUUID) {
-
-        ArrayList<Boon> boons = new ArrayList<>();
-        Boon thisBoon;
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_item_boons`  WHERE `itemBaseID` = ?")) {
-
-            preparedStatement.setInt(1, itemBaseUUID);
-
-            ResultSet rs = preparedStatement.executeQuery();
-
-            while (rs.next()) {
-                thisBoon = new Boon(rs);
-                boons.add(thisBoon);
-            }
-
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-
-        return boons;
-    }
-}

src/engine/db/handlers/dbBuildingHandler.java

@@ -13,6 +13,7 @@ import engine.Enum;
 import engine.Enum.DbObjectType;
 import engine.Enum.ProtectionState;
 import engine.Enum.TaxType;
+import engine.gameManager.BuildingManager;
 import engine.gameManager.DbManager;
 import engine.math.Vector3fImmutable;
 import engine.objects.*;
@@ -27,6 +28,7 @@ import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.concurrent.ConcurrentHashMap;
 
 public class dbBuildingHandler extends dbHandlerBase {
 
@@ -88,14 +90,12 @@ public class dbBuildingHandler extends dbHandlerBase {
         return removeFromBuildings(b);
     }
 
-    public ArrayList<Building> GET_ALL_BUILDINGS_FOR_ZONE(Zone zone) {
+    public ArrayList<Building> GET_ALL_BUILDINGS() {
 
         ArrayList<Building> buildings = new ArrayList<>();
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_building`.*, `object`.`parent` FROM `object` INNER JOIN `obj_building` ON `obj_building`.`UID` = `object`.`UID` WHERE `object`.`parent` = ?;")) {
-
-            preparedStatement.setLong(1, zone.getObjectUUID());
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_building`.*, `object`.`parent` FROM `object` INNER JOIN `obj_building` ON `obj_building`.`UID` = `object`.`UID` ORDER BY  `object`.`UID` ASC;")) {
 
             ResultSet rs = preparedStatement.executeQuery();
             buildings = getObjectsFromRs(rs, 1000);
@@ -425,26 +425,28 @@ public class dbBuildingHandler extends dbHandlerBase {
         return false;
     }
 
-    public void LOAD_ALL_FRIENDS_FOR_BUILDING(Building building) {
-
-        if (building == null)
-            return;
+    public void LOAD_BUILDING_FRIENDS() {
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `dyn_building_friends` WHERE `buildingUID` = ?")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `dyn_building_friends`")) {
 
-            preparedStatement.setInt(1, building.getObjectUUID());
             ResultSet rs = preparedStatement.executeQuery();
 
             while (rs.next()) {
                 BuildingFriends friend = new BuildingFriends(rs);
-                switch (friend.getFriendType()) {
+
+                // Create map if it does not yet exist
+
+                if (!BuildingManager._buildingFriends.containsKey(friend.buildingUID))
+                    BuildingManager._buildingFriends.put(friend.buildingUID, new ConcurrentHashMap<>());
+
+                switch (friend.friendType) {
                     case 7:
-                        building.getFriends().put(friend.getPlayerUID(), friend);
+                        BuildingManager._buildingFriends.get(friend.buildingUID).put(friend.playerUID, friend);
                         break;
                     case 8:
                     case 9:
-                        building.getFriends().put(friend.getGuildUID(), friend);
+                        BuildingManager._buildingFriends.get(friend.buildingUID).put(friend.guildUID, friend);
                         break;
                 }
             }
@@ -455,26 +457,29 @@ public class dbBuildingHandler extends dbHandlerBase {
 
     }
 
-    public void LOAD_ALL_CONDEMNED_FOR_BUILDING(Building building) {
-
-        if (building == null)
-            return;
+    public void LOAD_BUILDING_CONDEMNED() {
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `dyn_building_condemned` WHERE `buildingUID` = ?")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `dyn_building_condemned`")) {
 
-            preparedStatement.setInt(1, building.getObjectUUID());
             ResultSet rs = preparedStatement.executeQuery();
 
             while (rs.next()) {
+
                 Condemned condemned = new Condemned(rs);
-                switch (condemned.getFriendType()) {
+
+                // Create map if it does not yet exist
+
+                if (!BuildingManager._buildingCondemned.containsKey(condemned.buildingUUID))
+                    BuildingManager._buildingCondemned.put(condemned.buildingUUID, new ConcurrentHashMap<>());
+
+                switch (condemned.friendType) {
                     case 2:
-                        building.getCondemned().put(condemned.getPlayerUID(), condemned);
+                        BuildingManager._buildingCondemned.get(condemned.buildingUUID).put(condemned.playerUID, condemned);
                         break;
                     case 4:
                     case 5:
-                        building.getCondemned().put(condemned.getGuildUID(), condemned);
+                        BuildingManager._buildingCondemned.get(condemned.buildingUUID).put(condemned.guildUID, condemned);
                         break;
                 }
             }
@@ -484,35 +489,27 @@ public class dbBuildingHandler extends dbHandlerBase {
         }
     }
 
-    public ArrayList<Vector3fImmutable> LOAD_PATROL_POINTS(Building building) {
-
-        if (building == null)
-            return null;
-
-        ArrayList<Vector3fImmutable> patrolPoints = new ArrayList<>();
+    public void LOAD_BARRACKS_PATROL_POINTS() {
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `dyn_building_patrol_points` WHERE `buildingUID` = ?")) {
-
-            preparedStatement.setInt(1, building.getObjectUUID());
-
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `dyn_building_patrol_points`")) {
 
             ResultSet rs = preparedStatement.executeQuery();
 
             while (rs.next()) {
-                float x1 = rs.getFloat("patrolX");
-                float y1 = rs.getFloat("patrolY");
-                float z1 = rs.getFloat("patrolZ");
-                Vector3fImmutable patrolPoint = new Vector3fImmutable(x1, y1, z1);
-                patrolPoints.add(patrolPoint);
+
+                int buildingUUID = rs.getInt("buildingUID");
+
+                if (!BuildingManager._buildingPatrolPoints.containsKey(buildingUUID))
+                    BuildingManager._buildingPatrolPoints.put(buildingUUID, new ArrayList<>());
+
+                Vector3fImmutable patrolPoint = new Vector3fImmutable(rs.getFloat("patrolX"), rs.getFloat("patrolY"), rs.getFloat("patrolZ"));
+                BuildingManager._buildingPatrolPoints.get(buildingUUID).add(patrolPoint);
             }
 
         } catch (SQLException e) {
             Logger.error(e);
         }
-
-        return patrolPoints;
-
     }
 
     public boolean ADD_TO_CONDEMNLIST(final long parentUID, final long playerUID, final long guildID, final int friendType) {
@@ -722,10 +719,10 @@ public class dbBuildingHandler extends dbHandlerBase {
                      + "WHERE`buildingUID` = ? AND `playerUID` = ? AND `guildUID` = ? AND `friendType` = ?")) {
 
             preparedStatement.setBoolean(1, active);
-            preparedStatement.setInt(2, condemn.getParent());
-            preparedStatement.setInt(3, condemn.getPlayerUID());
-            preparedStatement.setInt(4, condemn.getGuildUID());
-            preparedStatement.setInt(5, condemn.getFriendType());
+            preparedStatement.setInt(2, condemn.buildingUUID);
+            preparedStatement.setInt(3, condemn.playerUID);
+            preparedStatement.setInt(4, condemn.guildUID);
+            preparedStatement.setInt(5, condemn.friendType);
 
             return (preparedStatement.executeUpdate() > 0);
 

src/engine/db/handlers/dbCityHandler.java

@@ -34,16 +34,19 @@ public class dbCityHandler extends dbHandlerBase {
             case "zone":
                 Zone zone = new Zone(rs);
                 DbManager.addToCache(zone);
+                zone.runAfterLoad();
                 list.add(zone);
                 break;
             case "building":
                 Building building = new Building(rs);
                 DbManager.addToCache(building);
+                building.runAfterLoad();
                 list.add(building);
                 break;
             case "city":
                 City city = new City(rs);
                 DbManager.addToCache(city);
+                city.runAfterLoad();
                 list.add(city);
                 break;
         }
@@ -96,14 +99,12 @@ public class dbCityHandler extends dbHandlerBase {
         return objectList;
     }
 
-    public ArrayList<City> GET_CITIES_BY_ZONE(final int objectUUID) {
+    public ArrayList<City> GET_ALL_CITIES() {
 
         ArrayList<City> cityList = new ArrayList<>();
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_city`.*, `object`.`parent` FROM `obj_city` INNER JOIN `object` ON `object`.`UID` = `obj_city`.`UID` WHERE `object`.`parent`=?;")) {
-
-            preparedStatement.setLong(1, objectUUID);
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_city`.*, `object`.`parent` FROM `obj_city` INNER JOIN `object` ON `object`.`UID` = `obj_city`.`UID` ORDER BY `object`.`UID` ASC;")) {
 
             ResultSet rs = preparedStatement.executeQuery();
             cityList = getObjectsFromRs(rs, 100);

src/engine/db/handlers/dbContractHandler.java

@@ -12,8 +12,8 @@ package engine.db.handlers;
 import engine.Enum;
 import engine.gameManager.DbManager;
 import engine.objects.Contract;
-import engine.objects.ItemBase;
-import engine.objects.MobEquipment;
+import engine.objects.Item;
+import engine.objects.MobLoot;
 import org.pmw.tinylog.Logger;
 
 import java.sql.Connection;
@@ -63,33 +63,12 @@ public class dbContractHandler extends dbHandlerBase {
 
             while (rs.next()) {
 
-                //handle item base
-                int itemBaseID = rs.getInt("itembaseID");
+                int templateID = rs.getInt("templateID");
 
-                ItemBase ib = ItemBase.getItemBase(itemBaseID);
+                Item item = new Item(templateID);
+                item.objectUUID = MobLoot.lastNegativeID.decrementAndGet();
+                contract.getSellInventory().add(item);
 
-                if (ib != null) {
-
-                    MobEquipment me = new MobEquipment(ib, 0, 0);
-                    contract.getSellInventory().add(me);
-
-                    //handle magic effects
-                    String prefix = rs.getString("prefix");
-                    int pRank = rs.getInt("pRank");
-                    String suffix = rs.getString("suffix");
-                    int sRank = rs.getInt("sRank");
-
-                    if (prefix != null) {
-                        me.setPrefix(prefix, pRank);
-                        me.setIsID(true);
-                    }
-
-                    if (suffix != null) {
-                        me.setSuffix(suffix, sRank);
-                        me.setIsID(true);
-                    }
-
-                }
             }
         } catch (SQLException e) {
             Logger.error(e);

src/engine/db/handlers/dbGuildHandler.java

@@ -695,24 +695,4 @@ public class dbGuildHandler extends dbHandlerBase {
         }
     }
 
-    //TODO uncomment this when finished with guild history warehouse integration
-//	public HashMap<Integer, GuildRecord> GET_WAREHOUSE_GUILD_HISTORY(){
-//		
-//		HashMap<Integer, GuildRecord> tempMap = new HashMap<>();
-//		prepareCallable("SELECT * FROM `warehouse_guildhistory` WHERE `eventType` = 'CREATE'");
-//		try {
-//			ResultSet rs = executeQuery();
-//			
-//			while (rs.next()) {
-//				GuildRecord guildRecord = new GuildRecord(rs);
-//				tempMap.put(guildRecord.guildID, guildRecord);
-//			}
-//		}catch (Exception e){
-//			Logger.error(e);
-//		}
-//		return tempMap;
-//		
-//	}
-
-
 }

src/engine/db/handlers/dbHeightMapHandler.java

@@ -1,43 +0,0 @@
-package engine.db.handlers;
-
-import engine.InterestManagement.HeightMap;
-import engine.gameManager.DbManager;
-import org.pmw.tinylog.Logger;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-public class dbHeightMapHandler extends dbHandlerBase {
-
-    public dbHeightMapHandler() {
-
-
-    }
-
-    public void LOAD_ALL_HEIGHTMAPS() {
-
-        HeightMap thisHeightmap;
-        HeightMap.heightMapsCreated = 0;
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_zone_heightmap INNER JOIN static_zone_size ON static_zone_size.loadNum = static_zone_heightmap.zoneLoadID")) {
-
-            ResultSet rs = preparedStatement.executeQuery();
-
-            while (rs.next()) {
-                thisHeightmap = new HeightMap(rs);
-
-                if (thisHeightmap.getHeightmapImage() == null) {
-                    Logger.info("Imagemap for " + thisHeightmap.getHeightMapID() + " was null");
-                    continue;
-                }
-            }
-
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-    }
-
-}

src/engine/db/handlers/dbItemBaseHandler.java

@@ -1,138 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2022
-//                www.magicbane.com
-
-
-package engine.db.handlers;
-
-import engine.gameManager.DbManager;
-import engine.objects.ItemBase;
-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;
-
-public class dbItemBaseHandler extends dbHandlerBase {
-
-    public dbItemBaseHandler() {
-
-    }
-
-    public void LOAD_BAKEDINSTATS(ItemBase itemBase) {
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_item_bakedinstat` WHERE `itemID` = ?")) {
-
-            preparedStatement.setInt(1, itemBase.getUUID());
-            ResultSet rs = preparedStatement.executeQuery();
-
-            while (rs.next()) {
-                if (rs.getBoolean("fromUse"))
-                    itemBase.getUsedStats().put(rs.getInt("token"), rs.getInt("numTrains"));
-                else
-                    itemBase.getBakedInStats().put(rs.getInt("token"), rs.getInt("numTrains"));
-            }
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-    }
-
-    public void LOAD_ANIMATIONS(ItemBase itemBase) {
-
-        ArrayList<Integer> tempList = new ArrayList<>();
-        ArrayList<Integer> tempListOff = new ArrayList<>();
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_itembase_animations` WHERE `itemBaseUUID` = ?")) {
-
-            preparedStatement.setInt(1, itemBase.getUUID());
-            ResultSet rs = preparedStatement.executeQuery();
-
-            while (rs.next()) {
-                int animation = rs.getInt("animation");
-                boolean rightHand = rs.getBoolean("rightHand");
-
-                if (rightHand)
-                    tempList.add(animation);
-                else
-                    tempListOff.add(animation);
-            }
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-
-        itemBase.setAnimations(tempList);
-        itemBase.setOffHandAnimations(tempListOff);
-    }
-
-    public void LOAD_ALL_ITEMBASES() {
-
-        ItemBase itemBase;
-        int recordsRead = 0;
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_itembase")) {
-
-            ResultSet rs = preparedStatement.executeQuery();
-
-            while (rs.next()) {
-                recordsRead++;
-                itemBase = new ItemBase(rs);
-                ItemBase.addToCache(itemBase);
-            }
-
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-
-        Logger.info("read: " + recordsRead + " cached: " + ItemBase.getUUIDCache().size());
-    }
-
-    public HashMap<Integer, ArrayList<Integer>> LOAD_RUNES_FOR_NPC_AND_MOBS() {
-
-        HashMap<Integer, ArrayList<Integer>> runeSets = new HashMap<>();
-        int runeSetID;
-        int runeBaseID;
-        int recordsRead = 0;
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_npc_runeSet")) {
-
-            ResultSet rs = preparedStatement.executeQuery();
-
-            while (rs.next()) {
-
-                recordsRead++;
-
-                runeSetID = rs.getInt("runeSet");
-                runeBaseID = rs.getInt("runeBase");
-
-                if (runeSets.get(runeSetID) == null) {
-                    ArrayList<Integer> runeList = new ArrayList<>();
-                    runeList.add(runeBaseID);
-                    runeSets.put(runeSetID, runeList);
-                } else {
-                    ArrayList<Integer> runeList = runeSets.get(runeSetID);
-                    runeList.add(runeSetID);
-                    runeSets.put(runeSetID, runeList);
-                }
-            }
-
-        } catch (SQLException e) {
-            Logger.error(e);
-            return runeSets;
-        }
-
-        Logger.info("read: " + recordsRead + " cached: " + runeSets.size());
-        return runeSets;
-    }
-
-}

src/engine/db/handlers/dbItemHandler.java

@@ -9,12 +9,16 @@
 
 package engine.db.handlers;
 
+import engine.Enum;
 import engine.Enum.ItemContainerType;
 import engine.Enum.ItemType;
 import engine.gameManager.DbManager;
 import engine.objects.AbstractCharacter;
 import engine.objects.CharacterItemManager;
 import engine.objects.Item;
+import engine.objects.ItemTemplate;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
 import org.pmw.tinylog.Logger;
 
 import java.sql.Connection;
@@ -52,46 +56,56 @@ public class dbItemHandler extends dbHandlerBase {
         return ret;
     }
 
-    public Item ADD_ITEM(Item toAdd) {
+    public Item PERSIST(Item toAdd) {
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("CALL `item_CREATE`(?, ?, ?, ?, ?, ?, ?, ?, ?,?);")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("CALL `item_CREATE`(?, ?, ?, ?, ?, ?, ?, ?,?);")) {
 
-            preparedStatement.setInt(1, toAdd.getOwnerID());
-            preparedStatement.setInt(2, toAdd.getItemBaseID());
-            preparedStatement.setInt(3, toAdd.getChargesRemaining());
-            preparedStatement.setInt(4, toAdd.getDurabilityCurrent());
-            preparedStatement.setInt(5, toAdd.getDurabilityMax());
+            preparedStatement.setInt(1, toAdd.ownerID);
+            preparedStatement.setInt(2, toAdd.templateID);
+            preparedStatement.setInt(3, (byte) toAdd.chargesRemaining);
+            preparedStatement.setInt(4, (short) toAdd.combat_health_current);
 
             if (toAdd.getNumOfItems() < 1)
-                preparedStatement.setInt(6, 1);
+                preparedStatement.setInt(5, 1);
             else
-                preparedStatement.setInt(6, toAdd.getNumOfItems());
+                preparedStatement.setInt(5, toAdd.getNumOfItems());
 
             switch (toAdd.containerType) {
                 case INVENTORY:
-                    preparedStatement.setString(7, "inventory");
+                    preparedStatement.setString(6, "inventory");
                     break;
                 case EQUIPPED:
-                    preparedStatement.setString(7, "equip");
+                    preparedStatement.setString(6, "equip");
                     break;
                 case BANK:
-                    preparedStatement.setString(7, "bank");
+                    preparedStatement.setString(6, "bank");
                     break;
                 case VAULT:
-                    preparedStatement.setString(7, "vault");
+                    preparedStatement.setString(6, "vault");
                     break;
                 case FORGE:
-                    preparedStatement.setString(7, "forge");
+                    preparedStatement.setString(6, "forge");
                     break;
                 default:
-                    preparedStatement.setString(7, "none"); //Shouldn't be here
+                    preparedStatement.setString(6, "none"); //Shouldn't be here
                     break;
             }
 
-            preparedStatement.setByte(8, toAdd.getEquipSlot());
-            preparedStatement.setInt(9, toAdd.getFlags());
-            preparedStatement.setString(10, toAdd.getCustomName());
+            if (toAdd.equipSlot.equals(Enum.EquipSlotType.NONE))
+                preparedStatement.setString(7, "");
+            else
+                preparedStatement.setString(7, toAdd.equipSlot.name());
+
+            String flagString = "";
+
+            for (Enum.ItemFlags itemflag : toAdd.flags)
+                flagString += itemflag.toString() + ";";
+
+            flagString = flagString.replaceAll(";$", "");
+
+            preparedStatement.setString(8, flagString);
+            preparedStatement.setString(9, toAdd.name);
 
             ResultSet rs = preparedStatement.executeQuery();
 
@@ -148,7 +162,7 @@ public class dbItemHandler extends dbHandlerBase {
         ArrayList<Item> itemList;
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_item`.*, `object`.`parent`, `object`.`type` FROM `object` INNER JOIN `obj_item` ON `object`.`UID` = `obj_item`.`UID` WHERE `object`.`parent`=? && `obj_item`.`item_container`='equip';")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_item`.*, `object`.`parent`, `object`.`type` FROM `object` INNER JOIN `obj_item` ON `object`.`UID` = `obj_item`.`UID` WHERE `object`.`parent`=? && `obj_item`.`container`='equip';")) {
 
             preparedStatement.setLong(1, targetId);
             ResultSet rs = preparedStatement.executeQuery();
@@ -163,6 +177,45 @@ public class dbItemHandler extends dbHandlerBase {
         return itemList;
     }
 
+    public void LOAD_ITEM_TEMPLATES() {
+
+        JSONParser jsonParser = new JSONParser();
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_item_templates`;");
+             ResultSet rs = preparedStatement.executeQuery()) {
+
+            while (rs.next()) {
+                int templateID = rs.getInt("id");
+                JSONObject jsonObject = (JSONObject) jsonParser.parse(rs.getString("template"));
+                ItemTemplate itemTemplate = new ItemTemplate(jsonObject);
+                itemTemplate.template_id = templateID;
+                ItemTemplate.templates.put(templateID, itemTemplate);
+            }
+
+        } catch (Exception e) {
+            Logger.error(e);
+        }
+    }
+
+    public void LOAD_TEMPLATE_MODTABLES() {
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_vendor_items`;");
+             ResultSet rs = preparedStatement.executeQuery()) {
+
+            while (rs.next()) {
+                int templateID = rs.getInt("templateID");
+                int modTable = rs.getInt("modTable");
+                ItemTemplate template = ItemTemplate.templates.get(templateID);
+                template.modTable = modTable;
+            }
+
+        } catch (Exception e) {
+            Logger.error(e);
+        }
+
+    }
     public Item GET_ITEM(final int itemUUID) {
 
         Item item;
@@ -242,7 +295,7 @@ public class dbItemHandler extends dbHandlerBase {
     public boolean MOVE_GOLD(final Item from, final Item to, final int amt) {
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_item` SET `item_numberOfItems` = CASE WHEN `UID`=?  THEN ? WHEN `UID`=? THEN ? END WHERE `UID` IN (?, ?);")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_item` SET `numberOfItems` = CASE WHEN `UID`=?  THEN ? WHEN `UID`=? THEN ? END WHERE `UID` IN (?, ?);")) {
 
             int newFromAmt = from.getNumOfItems() - amt;
             int newToAmt = to.getNumOfItems() + amt;
@@ -268,11 +321,11 @@ public class dbItemHandler extends dbHandlerBase {
 
         for (Item item : inventory) {
 
-            if (item.getItemBase().getType().equals(ItemType.GOLD))
+            if (item.template.item_type.equals(ItemType.GOLD))
                 continue;
 
             try (Connection connection = DbManager.getConnection();
-                 PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_item` LEFT JOIN `object` ON `object`.`UID` = `obj_item`.`UID` SET `object`.`parent`=NULL, `obj_item`.`item_container`='none' WHERE `object`.`UID`=?;")) {
+                 PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_item` LEFT JOIN `object` ON `object`.`UID` = `obj_item`.`UID` SET `object`.`parent`=NULL, `obj_item`.`container`='none' WHERE `object`.`UID`=?;")) {
 
                 preparedStatement.setLong(1, item.getObjectUUID());
                 worked = (preparedStatement.executeUpdate() > 0);
@@ -288,12 +341,12 @@ public class dbItemHandler extends dbHandlerBase {
         return worked;
     }
 
-    public HashSet<Integer> GET_ITEMS_FOR_VENDOR(final int vendorID) {
+    public HashSet<Integer> GET_VENDOR_CAN_ROLL_LIST(final int vendorID) {
 
         HashSet<Integer> itemSet = new HashSet<>();
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT ID FROM static_itembase WHERE vendorType = ?")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT templateID FROM static_vendor_items WHERE vendorType = ?")) {
 
             preparedStatement.setInt(1, vendorID);
 
@@ -311,8 +364,8 @@ public class dbItemHandler extends dbHandlerBase {
     }
 
     //Used to transfer a single item between owners or equip or vault or bank or inventory
-    public boolean UPDATE_OWNER(final Item item, int newOwnerID, boolean ownerNPC, boolean ownerPlayer,
-                                boolean ownerAccount, ItemContainerType containerType, int slot) {
+    public boolean UPDATE_OWNER(final Item item, int newOwnerID,
+                                ItemContainerType containerType, Enum.EquipSlotType slot) {
 
         boolean worked = false;
 
@@ -346,7 +399,12 @@ public class dbItemHandler extends dbHandlerBase {
                     preparedStatement.setString(3, "none"); //Shouldn't be here
                     break;
             }
-            preparedStatement.setInt(4, slot);
+
+            if (slot.equals(Enum.EquipSlotType.NONE))
+                preparedStatement.setString(4, "");
+            else
+                preparedStatement.setString(4, slot.name());
+
             ResultSet rs = preparedStatement.executeQuery();
 
             if (rs.next())
@@ -362,11 +420,11 @@ public class dbItemHandler extends dbHandlerBase {
     public boolean SET_DURABILITY(final Item item, int value) {
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_item` SET `item_durabilityCurrent`=? WHERE `UID`=? AND `item_durabilityCurrent`=?")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_item` SET `combat_health_current`=? WHERE `UID`=? AND `combat_health_current`=?")) {
 
             preparedStatement.setInt(1, value);
             preparedStatement.setLong(2, item.getObjectUUID());
-            preparedStatement.setInt(3, item.getDurabilityCurrent());
+            preparedStatement.setInt(3, (short) item.combat_health_current);
 
             return (preparedStatement.executeUpdate() > 0);
 
@@ -379,7 +437,7 @@ public class dbItemHandler extends dbHandlerBase {
     public boolean UPDATE_FORGE_TO_INVENTORY(final Item item) {
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_item` SET `item_container` = ? WHERE `UID` = ? AND `item_container` = 'forge';")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_item` SET `container` = ? WHERE `UID` = ? AND `container` = 'forge';")) {
 
             preparedStatement.setString(1, "inventory");
             preparedStatement.setLong(2, item.getObjectUUID());
@@ -412,11 +470,11 @@ public class dbItemHandler extends dbHandlerBase {
      */
     public boolean UPDATE_GOLD(final Item item, int newValue, int oldValue) {
 
-        if (!item.getItemBase().getType().equals(ItemType.GOLD))
+        if (!item.template.item_type.equals(ItemType.GOLD))
             return false;
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_item` SET `item_numberOfItems`=? WHERE `UID`=?")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_item` SET `numberOfItems`=? WHERE `UID`=?")) {
 
             preparedStatement.setInt(1, newValue);
             preparedStatement.setLong(2, item.getObjectUUID());
@@ -433,9 +491,9 @@ public class dbItemHandler extends dbHandlerBase {
     public boolean UPDATE_REMAINING_CHARGES(final Item item) {
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_item` SET `item_chargesRemaining` = ? WHERE `UID` = ?")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_item` SET `chargesRemaining` = ? WHERE `UID` = ?")) {
 
-            preparedStatement.setInt(1, item.getChargesRemaining());
+            preparedStatement.setInt(1, (byte) item.chargesRemaining);
             preparedStatement.setLong(2, item.getObjectUUID());
 
             return (preparedStatement.executeUpdate() > 0);
@@ -453,7 +511,7 @@ public class dbItemHandler extends dbHandlerBase {
     public boolean ZERO_ITEM_STACK(Item item) {
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_item` SET `item_numberOfItems`=0 WHERE `UID` = ?")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_item` SET `numberOfItems`=0 WHERE `UID` = ?")) {
 
             preparedStatement.setLong(1, item.getObjectUUID());
 
@@ -468,9 +526,16 @@ public class dbItemHandler extends dbHandlerBase {
     public boolean UPDATE_FLAGS(Item item) {
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_item` SET `item_flags`=? WHERE `UID` = ?")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_item` SET `flags`=? WHERE `UID` = ?")) {
 
-            preparedStatement.setInt(1, item.getFlags());
+            String flagString = "";
+
+            for (Enum.ItemFlags itemflag : item.flags)
+                flagString += itemflag.toString() + ";";
+
+            flagString = flagString.replaceAll(";$", "");
+
+            preparedStatement.setString(1, flagString);
             preparedStatement.setLong(2, item.getObjectUUID());
 
             return (preparedStatement.executeUpdate() > 0);
@@ -483,8 +548,13 @@ public class dbItemHandler extends dbHandlerBase {
 
     public boolean UPDATE_VALUE(Item item, int value) {
 
+        // Write 0 if we will not modify the value from template
+
+        if (item.value == item.template.item_value)
+            value = 0;
+
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_item` SET `item_value`=? WHERE `UID` = ?")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_item` SET `value`=? WHERE `UID` = ?")) {
 
             preparedStatement.setInt(1, value);
             preparedStatement.setLong(2, item.getObjectUUID());
@@ -496,4 +566,25 @@ public class dbItemHandler extends dbHandlerBase {
             return false;
         }
     }
+
+    public boolean UPDATE_EQUIP_SLOT(Item item) {
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_item` SET `equipSlot`=? WHERE `UID` = ?")) {
+
+            if (item.equipSlot.equals(Enum.EquipSlotType.NONE))
+                preparedStatement.setString(1, "");
+            else
+                preparedStatement.setString(1, item.equipSlot.name());
+
+            preparedStatement.setLong(2, item.getObjectUUID());
+
+            return (preparedStatement.executeUpdate() > 0);
+
+        } catch (SQLException e) {
+            Logger.error(e);
+            return false;
+        }
+    }
+
 }

src/engine/db/handlers/dbMineHandler.java

@@ -12,7 +12,6 @@ import engine.Enum;
 import engine.gameManager.DbManager;
 import engine.objects.Mine;
 import engine.objects.MineProduction;
-import engine.objects.Resource;
 import org.pmw.tinylog.Logger;
 
 import java.sql.Connection;
@@ -84,7 +83,7 @@ public class dbMineHandler extends dbHandlerBase {
         return false;
     }
 
-    public boolean CHANGE_RESOURCE(Mine mine, Resource resource) {
+    public boolean CHANGE_RESOURCE(Mine mine, Enum.ResourceType resource) {
 
         try (Connection connection = DbManager.getConnection();
              PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_mine` SET `mine_resource`=? WHERE `UID`=?")) {

src/engine/db/handlers/dbMobHandler.java

@@ -11,7 +11,6 @@ package engine.db.handlers;
 
 import engine.gameManager.DbManager;
 import engine.objects.Mob;
-import engine.objects.Zone;
 import org.joda.time.DateTime;
 import org.pmw.tinylog.Logger;
 
@@ -28,31 +27,27 @@ public class dbMobHandler extends dbHandlerBase {
         this.localObjectType = engine.Enum.GameObjectType.valueOf(this.localClass.getSimpleName());
     }
 
-    public Mob ADD_MOB(Mob toAdd) {
+    public Mob PERSIST(Mob toAdd) {
 
         Mob mobile = null;
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("CALL `mob_CREATE`(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);")) {
+             PreparedStatement 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.spawnDelay);
+            preparedStatement.setInt(10, toAdd.contractUUID);
+            preparedStatement.setInt(11, toAdd.buildingUUID);
+            preparedStatement.setInt(12, toAdd.level);
+            preparedStatement.setString(13, toAdd.firstName);
+            preparedStatement.setString(14, toAdd.behaviourType.toString());
 
             ResultSet rs = preparedStatement.executeQuery();
 
@@ -69,6 +64,23 @@ public class dbMobHandler extends dbHandlerBase {
         return mobile;
     }
 
+    public ArrayList<Mob> GET_ALL_MOBS() {
+
+        ArrayList<Mob> mobileList = new ArrayList<>();
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_mob`.*, `object`.`parent` FROM `object` INNER JOIN `obj_mob` ON `obj_mob`.`UID` = `object`.`UID` ORDER BY `object`.`UID` ASC;")) {
+
+            ResultSet rs = preparedStatement.executeQuery();
+            mobileList = getObjectsFromRs(rs, 1000);
+
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
+
+        return mobileList;
+    }
+
     public boolean updateUpgradeTime(Mob mob, DateTime upgradeDateTime) {
 
         try (Connection connection = DbManager.getConnection();
@@ -106,17 +118,17 @@ public class dbMobHandler extends dbHandlerBase {
         return row_count;
     }
 
-    public void LOAD_PATROL_POINTS(Mob captain) {
+    public void LOAD_GUARD_MINIONS(Mob guardCaptain) {
 
         try (Connection connection = DbManager.getConnection();
              PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `dyn_guards` WHERE `captainUID` = ?")) {
 
-            preparedStatement.setInt(1, captain.getObjectUUID());
+            preparedStatement.setInt(1, guardCaptain.getObjectUUID());
             ResultSet rs = preparedStatement.executeQuery();
 
             while (rs.next()) {
-                String name = rs.getString("name");
-                Mob toCreate = Mob.createGuardMob(captain, captain.getGuild(), captain.getParentZone(), captain.building.getLoc(), captain.getLevel(), name);
+                String minionName = rs.getString("minionName");
+                Mob toCreate = Mob.createGuardMinion(guardCaptain, guardCaptain.getLevel(), minionName);
 
                 if (toCreate == null)
                     return;
@@ -131,15 +143,13 @@ public class dbMobHandler extends dbHandlerBase {
         }
     }
 
-    public boolean ADD_TO_GUARDS(final long captainUID, final int mobBaseID, final String name, final int slot) {
+    public boolean ADD_GUARD_MINION(final long captainUID, final String minionName) {
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("INSERT INTO `dyn_guards` (`captainUID`, `mobBaseID`,`name`, `slot`) VALUES (?,?,?,?)")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("INSERT INTO `dyn_guards` (`captainUID`, `minionName`) VALUES (?,?)")) {
 
             preparedStatement.setLong(1, captainUID);
-            preparedStatement.setInt(2, mobBaseID);
-            preparedStatement.setString(3, name);
-            preparedStatement.setInt(4, slot);
+            preparedStatement.setString(2, minionName);
 
             return (preparedStatement.executeUpdate() > 0);
 
@@ -149,14 +159,13 @@ public class dbMobHandler extends dbHandlerBase {
         }
     }
 
-    public boolean REMOVE_FROM_GUARDS(final long captainUID, final int mobBaseID, final int slot) {
+    public boolean REMOVE_GUARD_MINION(final long captainUID, final String minionName) {
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("DELETE FROM `dyn_guards` WHERE `captainUID`=? AND `mobBaseID`=? AND `slot` =?")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("DELETE FROM `dyn_guards` WHERE `captainUID`=? AND `minionName`=? LIMIT 1;")) {
 
             preparedStatement.setLong(1, captainUID);
-            preparedStatement.setInt(2, mobBaseID);
-            preparedStatement.setInt(3, slot);
+            preparedStatement.setString(2, minionName);
 
             return (preparedStatement.executeUpdate() > 0);
 
@@ -166,24 +175,19 @@ public class dbMobHandler extends dbHandlerBase {
         }
     }
 
-
-    public ArrayList<Mob> GET_ALL_MOBS_FOR_ZONE(Zone zone) {
-
-        ArrayList<Mob> mobileList = new ArrayList<>();
+    public boolean REMOVE_ALL_MINIONS(final long captainUID) {
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_mob`.*, `object`.`parent` FROM `object` INNER JOIN `obj_mob` ON `obj_mob`.`UID` = `object`.`UID` WHERE `object`.`parent` = ?;")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("DELETE FROM `dyn_guards` WHERE `captainUID`=?;")) {
 
-            preparedStatement.setLong(1, zone.getObjectUUID());
+            preparedStatement.setLong(1, captainUID);
 
-            ResultSet rs = preparedStatement.executeQuery();
-            mobileList = getObjectsFromRs(rs, 1000);
+            return (preparedStatement.executeUpdate() > 0);
 
         } catch (SQLException e) {
             Logger.error(e);
+            return false;
         }
-
-        return mobileList;
     }
 
     public Mob GET_MOB(final int objectUUID) {

src/engine/db/handlers/dbNPCHandler.java

@@ -15,7 +15,6 @@ import engine.math.Vector3fImmutable;
 import engine.objects.NPC;
 import engine.objects.NPCProfits;
 import engine.objects.ProducedItem;
-import engine.objects.Zone;
 import org.joda.time.DateTime;
 import org.pmw.tinylog.Logger;
 
@@ -24,6 +23,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.HashMap;
 
 public class dbNPCHandler extends dbHandlerBase {
 
@@ -32,6 +32,45 @@ public class dbNPCHandler extends dbHandlerBase {
         this.localObjectType = engine.Enum.GameObjectType.valueOf(this.localClass.getSimpleName());
     }
 
+    public static HashMap<Integer, ArrayList<Integer>> LOAD_RUNES_FOR_NPC_AND_MOBS() {
+
+        HashMap<Integer, ArrayList<Integer>> runeSets = new HashMap<>();
+        int runeSetID;
+        int runeBaseID;
+        int recordsRead = 0;
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_npc_runeSet")) {
+
+            ResultSet rs = preparedStatement.executeQuery();
+
+            while (rs.next()) {
+
+                recordsRead++;
+
+                runeSetID = rs.getInt("runeSet");
+                runeBaseID = rs.getInt("runeBase");
+
+                if (runeSets.get(runeSetID) == null) {
+                    ArrayList<Integer> runeList = new ArrayList<>();
+                    runeList.add(runeBaseID);
+                    runeSets.put(runeSetID, runeList);
+                } else {
+                    ArrayList<Integer> runeList = runeSets.get(runeSetID);
+                    runeList.add(runeSetID);
+                    runeSets.put(runeSetID, runeList);
+                }
+            }
+
+        } catch (SQLException e) {
+            Logger.error(e);
+            return runeSets;
+        }
+
+        Logger.info("read: " + recordsRead + " cached: " + runeSets.size());
+        return runeSets;
+    }
+
     public NPC PERSIST(NPC toAdd) {
 
         NPC npc = null;
@@ -94,14 +133,12 @@ public class dbNPCHandler extends dbHandlerBase {
         return row_count;
     }
 
-    public ArrayList<NPC> GET_ALL_NPCS_FOR_ZONE(Zone zone) {
+    public ArrayList<NPC> GET_ALL_NPCS() {
 
         ArrayList<NPC> npcList = new ArrayList<>();
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_npc`.*, `object`.`parent` FROM `object` INNER JOIN `obj_npc` ON `obj_npc`.`UID` = `object`.`UID` WHERE `object`.`parent` = ?;")) {
-
-            preparedStatement.setLong(1, zone.getObjectUUID());
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_npc`.*, `object`.`parent` FROM `object` INNER JOIN `obj_npc` ON `obj_npc`.`UID` = `object`.`UID` ORDER BY `object`.`UID` ASC;")) {
 
             ResultSet rs = preparedStatement.executeQuery();
             npcList = getObjectsFromRs(rs, 1000);
@@ -308,14 +345,14 @@ public class dbNPCHandler extends dbHandlerBase {
                 + NPC._pirateNames.size() + " mobBases");
     }
 
-    public boolean ADD_TO_PRODUCTION_LIST(final long ID, final long npcUID, final long itemBaseID, DateTime dateTime, String prefix, String suffix, String name, boolean isRandom, int playerID) {
+    public boolean ADD_TO_PRODUCTION_LIST(final long ID, final long npcUID, final long templateID, DateTime dateTime, String prefix, String suffix, String name, boolean isRandom, int playerID) {
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("INSERT INTO `dyn_npc_production` (`ID`,`npcUID`, `itemBaseID`,`dateToUpgrade`, `isRandom`, `prefix`, `suffix`, `name`,`playerID`) VALUES (?,?,?,?,?,?,?,?,?)")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("INSERT INTO `dyn_npc_production` (`ID`,`npcUID`, `templateID`,`dateToUpgrade`, `isRandom`, `prefix`, `suffix`, `name`,`playerID`) VALUES (?,?,?,?,?,?,?,?,?)")) {
 
             preparedStatement.setLong(1, ID);
             preparedStatement.setLong(2, npcUID);
-            preparedStatement.setLong(3, itemBaseID);
+            preparedStatement.setLong(3, templateID);
             preparedStatement.setTimestamp(4, new java.sql.Timestamp(dateTime.getMillis()));
             preparedStatement.setBoolean(5, isRandom);
             preparedStatement.setString(6, prefix);

src/engine/db/handlers/dbPlayerCharacterHandler.java

@@ -11,10 +11,7 @@ package engine.db.handlers;
 
 import engine.Enum;
 import engine.gameManager.DbManager;
-import engine.objects.AbstractWorldObject;
-import engine.objects.Heraldry;
-import engine.objects.PlayerCharacter;
-import engine.objects.PlayerFriends;
+import engine.objects.*;
 import engine.server.MBServerStatics;
 import org.pmw.tinylog.Logger;
 
@@ -45,8 +42,8 @@ public class dbPlayerCharacterHandler extends dbHandlerBase {
             preparedStatement.setLong(1, toAdd.getAccount().getObjectUUID());
             preparedStatement.setString(2, toAdd.getFirstName());
             preparedStatement.setString(3, toAdd.getLastName());
-            preparedStatement.setInt(4, toAdd.getRace().getRaceRuneID());
-            preparedStatement.setInt(5, toAdd.getBaseClass().getObjectUUID());
+            preparedStatement.setInt(4, toAdd.race.getRaceRuneID());
+            preparedStatement.setInt(5, toAdd.baseClass.getObjectUUID());
             preparedStatement.setInt(6, toAdd.getStrMod());
             preparedStatement.setInt(7, toAdd.getDexMod());
             preparedStatement.setInt(8, toAdd.getConMod());

src/engine/db/handlers/dbPowerHandler.java

@@ -13,17 +13,12 @@ import engine.Enum;
 import engine.gameManager.DbManager;
 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 {
@@ -34,16 +29,17 @@ public class dbPowerHandler extends dbHandlerBase {
     }
 
     public static void addAllSourceTypes() {
-        PreparedStatementShared ps = null;
-        try {
-            ps = new PreparedStatementShared("SELECT * FROM static_power_sourcetype");
-            ResultSet rs = ps.executeQuery();
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_power_sourcetype")) {
+
+            ResultSet rs = preparedStatement.executeQuery();
             String IDString, source;
+
             while (rs.next()) {
                 IDString = rs.getString("IDString");
                 int token = DbManager.hasher.SBStringHash(IDString);
 
-
                 source = rs.getString("source").replace("-", "").trim();
                 Enum.EffectSourceType effectSourceType = Enum.EffectSourceType.GetEffectSourceType(source);
 
@@ -52,19 +48,18 @@ public class dbPowerHandler extends dbHandlerBase {
 
                 EffectsBase.effectSourceTypeMap.get(token).add(effectSourceType);
             }
-            rs.close();
         } catch (Exception e) {
             Logger.error(e);
-        } finally {
-            ps.release();
         }
     }
 
     public static void addAllAnimationOverrides() {
-        PreparedStatementShared ps = null;
-        try {
-            ps = new PreparedStatementShared("SELECT * FROM static_power_animation_override");
-            ResultSet rs = ps.executeQuery();
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_power_animation_override")) {
+
+            ResultSet rs = preparedStatement.executeQuery();
+
             String IDString;
             int animation;
             while (rs.next()) {
@@ -78,51 +73,10 @@ public class dbPowerHandler extends dbHandlerBase {
                 PowersManager.AnimationOverrides.put(IDString, animation);
 
             }
-            rs.close();
         } catch (Exception e) {
             Logger.error(e);
-        } finally {
-            ps.release();
-        }
-    }
-
-    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;
     }
 
 }

src/engine/db/handlers/dbRuneBaseHandler.java

@@ -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();

src/engine/db/handlers/dbWarehouseHandler.java

@@ -9,14 +9,19 @@
 
 package engine.db.handlers;
 
+import engine.Enum;
 import engine.Enum.GameObjectType;
-import engine.Enum.ProtectionState;
 import engine.Enum.TransactionType;
 import engine.gameManager.DbManager;
-import engine.math.Vector3fImmutable;
-import engine.objects.*;
+import engine.objects.Building;
+import engine.objects.City;
+import engine.objects.Transaction;
+import engine.objects.Warehouse;
 import engine.server.MBServerStatics;
 import org.joda.time.DateTime;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
 import org.pmw.tinylog.Logger;
 
 import java.sql.Connection;
@@ -31,463 +36,10 @@ public class dbWarehouseHandler extends dbHandlerBase {
     private static final ConcurrentHashMap<Integer, String> columns = new ConcurrentHashMap<>(MBServerStatics.CHM_INIT_CAP, MBServerStatics.CHM_LOAD, MBServerStatics.CHM_THREAD_LOW);
 
     public dbWarehouseHandler() {
-        this.localClass = Warehouse.class;
-        this.localObjectType = engine.Enum.GameObjectType.valueOf(this.localClass.getSimpleName());
 
     }
 
-    public static void addObject(ArrayList<AbstractGameObject> list, ResultSet rs) throws SQLException {
-        String type = rs.getString("type");
-        switch (type) {
-            case "building":
-                Building building = new Building(rs);
-                DbManager.addToCache(building);
-                list.add(building);
-                break;
-            case "warehouse":
-                Warehouse warehouse = new Warehouse(rs);
-                DbManager.addToCache(warehouse);
-                list.add(warehouse);
-                break;
-        }
-    }
-
-    public ArrayList<AbstractGameObject> CREATE_WAREHOUSE(int parentZoneID, int OwnerUUID, String name, int meshUUID,
-                                                          Vector3fImmutable location, float meshScale, int currentHP,
-                                                          ProtectionState protectionState, int currentGold, int rank,
-                                                          DateTime upgradeDate, int blueprintUUID, float w, float rotY) {
-
-        ArrayList<AbstractGameObject> warehouseList = new ArrayList<>();
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("CALL `WAREHOUSE_CREATE`(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? ,? ,? ,?, ?);")) {
-
-            preparedStatement.setInt(1, parentZoneID);
-            preparedStatement.setInt(2, OwnerUUID);
-            preparedStatement.setString(3, name);
-            preparedStatement.setInt(4, meshUUID);
-            preparedStatement.setFloat(5, location.x);
-            preparedStatement.setFloat(6, location.y);
-            preparedStatement.setFloat(7, location.z);
-            preparedStatement.setFloat(8, meshScale);
-            preparedStatement.setInt(9, currentHP);
-            preparedStatement.setString(10, protectionState.name());
-            preparedStatement.setInt(11, currentGold);
-            preparedStatement.setInt(12, rank);
-
-            if (upgradeDate != null)
-                preparedStatement.setTimestamp(13, new java.sql.Timestamp(upgradeDate.getMillis()));
-            else
-                preparedStatement.setNull(13, java.sql.Types.DATE);
-
-            preparedStatement.setInt(14, blueprintUUID);
-            preparedStatement.setFloat(15, w);
-            preparedStatement.setFloat(16, rotY);
-
-            preparedStatement.execute();
-            ResultSet rs = preparedStatement.getResultSet();
-
-            while (rs.next())
-                addObject(warehouseList, rs);
-
-            while (preparedStatement.getMoreResults()) {
-                rs = preparedStatement.getResultSet();
-
-                while (rs.next())
-                    addObject(warehouseList, rs);
-            }
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-
-        return warehouseList;
-    }
-
-    public boolean updateLocks(final Warehouse wh, long locks) {
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_locks`=? WHERE `UID` = ?")) {
-
-            preparedStatement.setLong(1, locks);
-            preparedStatement.setInt(2, wh.getUID());
-
-            return (preparedStatement.executeUpdate() > 0);
-
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-        return false;
-    }
-
-    public boolean updateGold(final Warehouse wh, int amount) {
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_gold`=? WHERE `UID` = ?")) {
-
-            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
-
-            return (preparedStatement.executeUpdate() > 0);
-
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-        return false;
-    }
-
-    public boolean updateStone(final Warehouse wh, int amount) {
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_stone`=? WHERE `UID` = ?")) {
-
-            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
-
-            return (preparedStatement.executeUpdate() > 0);
-
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-        return false;
-    }
-
-    public boolean updateTruesteel(final Warehouse wh, int amount) {
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_truesteel`=? WHERE `UID` = ?")) {
-
-            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
-
-            return (preparedStatement.executeUpdate() > 0);
-
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-        return false;
-    }
-
-    public boolean updateIron(final Warehouse wh, int amount) {
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_iron`=? WHERE `UID` = ?")) {
-
-            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
-
-            return (preparedStatement.executeUpdate() > 0);
-
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-        return false;
-    }
-
-    public boolean updateAdamant(final Warehouse wh, int amount) {
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_adamant`=? WHERE `UID` = ?")) {
-
-            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
-
-            return (preparedStatement.executeUpdate() > 0);
-
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-        return false;
-    }
-
-    public boolean updateLumber(final Warehouse wh, int amount) {
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_lumber`=? WHERE `UID` = ?")) {
-
-            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
-
-            return (preparedStatement.executeUpdate() > 0);
-
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-        return false;
-    }
-
-    public boolean updateOak(final Warehouse wh, int amount) {
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_oak`=? WHERE `UID` = ?")) {
-
-            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
-
-            return (preparedStatement.executeUpdate() > 0);
-
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-        return false;
-    }
-
-    public boolean updateBronzewood(final Warehouse wh, int amount) {
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_bronzewood`=? WHERE `UID` = ?")) {
-
-            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
-
-            return (preparedStatement.executeUpdate() > 0);
-
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-        return false;
-    }
-
-    public boolean updateMandrake(final Warehouse wh, int amount) {
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_mandrake`=? WHERE `UID` = ?")) {
-
-            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
-
-            return (preparedStatement.executeUpdate() > 0);
-
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-        return false;
-    }
-
-    public boolean updateCoal(final Warehouse wh, int amount) {
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_coal`=? WHERE `UID` = ?")) {
-
-            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
-
-            return (preparedStatement.executeUpdate() > 0);
-
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-        return false;
-    }
-
-    public boolean updateAgate(final Warehouse wh, int amount) {
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_agate`=? WHERE `UID` = ?")) {
-
-            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
-
-            return (preparedStatement.executeUpdate() > 0);
-
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-        return false;
-    }
-
-    public boolean updateDiamond(final Warehouse wh, int amount) {
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_diamond`=? WHERE `UID` = ?")) {
-
-            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
-
-            return (preparedStatement.executeUpdate() > 0);
-
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-        return false;
-    }
-
-    public boolean updateOnyx(final Warehouse wh, int amount) {
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_onyx`=? WHERE `UID` = ?")) {
-
-            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
-
-            return (preparedStatement.executeUpdate() > 0);
-
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-        return false;
-    }
-
-    public boolean updateAzoth(final Warehouse wh, int amount) {
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_azoth`=? WHERE `UID` = ?")) {
-
-            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
-
-            return (preparedStatement.executeUpdate() > 0);
-
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-        return false;
-    }
-
-    public boolean updateOrichalk(final Warehouse wh, int amount) {
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_orichalk`=? WHERE `UID` = ?")) {
-
-            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
-
-            return (preparedStatement.executeUpdate() > 0);
-
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-        return false;
-    }
-
-    public boolean updateAntimony(final Warehouse wh, int amount) {
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_antimony`=? WHERE `UID` = ?")) {
-
-            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
-
-            return (preparedStatement.executeUpdate() > 0);
-
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-        return false;
-    }
-
-    public boolean updateSulfur(final Warehouse wh, int amount) {
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_sulfur`=? WHERE `UID` = ?")) {
-
-            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
-
-            return (preparedStatement.executeUpdate() > 0);
-
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-        return false;
-    }
-
-    public boolean updateQuicksilver(final Warehouse wh, int amount) {
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_quicksilver`=? WHERE `UID` = ?")) {
-
-            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
-
-            return (preparedStatement.executeUpdate() > 0);
-
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-        return false;
-    }
-
-    public boolean updateGalvor(final Warehouse wh, int amount) {
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_galvor`=? WHERE `UID` = ?")) {
-
-            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
-
-            return (preparedStatement.executeUpdate() > 0);
-
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-        return false;
-    }
-
-    public boolean updateWormwood(final Warehouse wh, int amount) {
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_wormwood`=? WHERE `UID` = ?")) {
-
-            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
-
-            return (preparedStatement.executeUpdate() > 0);
-
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-        return false;
-    }
-
-    public boolean updateObsidian(final Warehouse wh, int amount) {
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_obsidian`=? WHERE `UID` = ?")) {
-
-            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
-
-            return (preparedStatement.executeUpdate() > 0);
-
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-        return false;
-    }
-
-    public boolean updateBloodstone(final Warehouse wh, int amount) {
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_bloodstone`=? WHERE `UID` = ?")) {
-
-            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
-
-            return (preparedStatement.executeUpdate() > 0);
-
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-        return false;
-    }
-
-    public boolean updateMithril(final Warehouse wh, int amount) {
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_mithril`=? WHERE `UID` = ?")) {
-
-            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
-
-            return (preparedStatement.executeUpdate() > 0);
-
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-        return false;
-    }
-
-    public boolean CREATE_TRANSACTION(int warehouseBuildingID, GameObjectType targetType, int targetUUID, TransactionType transactionType, Resource resource, int amount, DateTime date) {
+    public boolean CREATE_TRANSACTION(int warehouseBuildingID, GameObjectType targetType, int targetUUID, TransactionType transactionType, Enum.ResourceType resource, int amount, DateTime date) {
 
         try (Connection connection = DbManager.getConnection();
              PreparedStatement preparedStatement = connection.prepareStatement("INSERT INTO `dyn_warehouse_transactions` (`warehouseUID`, `targetType`,`targetUID`, `type`,`resource`,`amount`,`date` ) VALUES (?,?,?,?,?,?,?)")) {
@@ -532,24 +84,74 @@ public class dbWarehouseHandler extends dbHandlerBase {
         return transactionsList;
     }
 
-    public void LOAD_ALL_WAREHOUSES() {
-
-        Warehouse warehouse;
-
+    public void DELETE_WAREHOUSE(Warehouse warehouse) {
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_warehouse`.*, `object`.`parent`, `object`.`type` FROM `object` LEFT JOIN `obj_warehouse` ON `object`.`UID` = `obj_warehouse`.`UID` WHERE `object`.`type` = 'warehouse';")) {
-
-
-            ResultSet rs = preparedStatement.executeQuery();
-
-            while (rs.next()) {
-                warehouse = new Warehouse(rs);
-                warehouse.runAfterLoad();
-                warehouse.loadAllTransactions();
-            }
+             PreparedStatement preparedStatement = connection.prepareStatement("DELETE FROM `dyn_warehouse` WHERE `cityUUID` = ?;")) {
+            preparedStatement.setInt(1, warehouse.city.getObjectUUID());
+            preparedStatement.executeUpdate();
 
         } catch (SQLException e) {
             Logger.error(e);
         }
+
+    }
+
+    public boolean UPDATE_WAREHOUSE(Warehouse warehouse) {
+
+        JSONObject warehouseJSON = new JSONObject();
+
+        JSONObject resources = new JSONObject(warehouse.resources);
+        warehouseJSON.put("resources", resources);
+
+        JSONArray locks = new JSONArray();
+
+        for (Enum.ResourceType resource : warehouse.locked)
+            locks.add(resource.name());
+
+        warehouseJSON.put("locked", locks);
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("INSERT INTO `dyn_warehouse` (`cityUUID`, `warehouse`) VALUES (?, ?) " +
+                     "ON DUPLICATE KEY UPDATE `warehouse` = VALUES(`warehouse`)")) {
+
+            preparedStatement.setInt(1, warehouse.city.getObjectUUID());
+            preparedStatement.setString(2, warehouseJSON.toString());
+
+            return (preparedStatement.executeUpdate() > 0);
+
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
+        return false;
+    }
+
+    public void LOAD_WAREHOUSES() {
+
+        JSONParser jsonParser = new JSONParser();
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `dyn_warehouse`;");
+             ResultSet rs = preparedStatement.executeQuery()) {
+
+            while (rs.next()) {
+                int cityUID = rs.getInt("cityUUID");
+                JSONObject jsonObject = (JSONObject) jsonParser.parse(rs.getString("warehouse"));
+                City city = City.getCity(cityUID);
+                city.warehouse = new Warehouse(jsonObject);
+                city.warehouse.city = city;
+
+                // Locate warehouse building
+                for (Building building : city.parentZone.zoneBuildingSet) {
+                    if (building.getBlueprint().getBuildingGroup().equals(Enum.BuildingGroup.WAREHOUSE)) {
+                        city.warehouse.building = building;
+                        break;
+                    }
+                }
+
+            }
+
+        } catch (Exception e) {
+            Logger.error(e);
+        }
     }
 }

src/engine/db/handlers/dbZoneHandler.java

@@ -12,8 +12,8 @@ package engine.db.handlers;
 import engine.Enum;
 import engine.gameManager.DbManager;
 import engine.gameManager.ZoneManager;
-import engine.math.Vector2f;
 import engine.objects.Zone;
+import engine.objects.ZoneTemplate;
 import org.pmw.tinylog.Logger;
 
 import java.sql.Connection;
@@ -29,25 +29,21 @@ public class dbZoneHandler extends dbHandlerBase {
         this.localObjectType = Enum.GameObjectType.valueOf(this.localClass.getSimpleName());
     }
 
-    public ArrayList<Zone> GET_ALL_NODES(Zone zone) {
-        ArrayList<Zone> wsmList = new ArrayList<>();
-        wsmList.addAll(zone.getNodes());
-        if (zone.absX == 0.0f) {
-            zone.absX = zone.getXCoord();
+    public ArrayList<Zone> GET_ALL_ZONES() {
+
+        ArrayList<Zone> zoneList = new ArrayList<>();
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_zone`.*, `object`.`parent` FROM `object` INNER JOIN `obj_zone` ON `obj_zone`.`UID` = `object`.`UID` ORDER BY `object`.`UID` ASC;")) {
+
+            ResultSet rs = preparedStatement.executeQuery();
+            zoneList = getObjectsFromRs(rs, 2000);
+
+        } catch (SQLException e) {
+            Logger.error(e);
         }
-        if (zone.absY == 0.0f) {
-            zone.absY = zone.getYCoord();
-        }
-        if (zone.absZ == 0.0f) {
-            zone.absZ = zone.getZCoord();
-        }
-        for (Zone child : zone.getNodes()) {
-            child.absX = child.getXCoord() + zone.absX;
-            child.absY = child.getYCoord() + zone.absY;
-            child.absZ = child.getZCoord() + zone.absZ;
-            wsmList.addAll(this.GET_ALL_NODES(child));
-        }
-        return wsmList;
+
+        return zoneList;
     }
 
     public Zone GET_BY_UID(long ID) {
@@ -72,43 +68,38 @@ public class dbZoneHandler extends dbHandlerBase {
         return zone;
     }
 
-    public ArrayList<Zone> GET_MAP_NODES(final int objectUUID) {
-
-        ArrayList<Zone> zoneList = new ArrayList<>();
+    public void LOAD_ALL_ZONE_TEMPLATES() {
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_zone`.*, `object`.`parent` FROM `object` INNER JOIN `obj_zone` ON `obj_zone`.`UID` = `object`.`UID` WHERE `object`.`parent` = ?;")) {
-
-            preparedStatement.setLong(1, objectUUID);
-
-            ResultSet rs = preparedStatement.executeQuery();
-            zoneList = getObjectsFromRs(rs, 2000);
-
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-
-        return zoneList;
-    }
-
-    public void LOAD_ZONE_EXTENTS() {
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_zone_size`;")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_zone_templates")) {
 
             ResultSet rs = preparedStatement.executeQuery();
 
             while (rs.next()) {
-                Vector2f zoneSize = new Vector2f();
-                int loadNum = rs.getInt("loadNum");
-                zoneSize.x = rs.getFloat("xRadius");
-                zoneSize.y = rs.getFloat("zRadius");
-                ZoneManager._zone_size_data.put(loadNum, zoneSize);
+                ZoneTemplate zoneTemplate = new ZoneTemplate(rs);
+                ZoneManager._zone_templates.put(zoneTemplate.templateID, zoneTemplate);
             }
 
+            // Add player city
+
+            ZoneTemplate zoneTemplate = new ZoneTemplate();
+
+            zoneTemplate.templateID = 0;
+            zoneTemplate.sea_level_type = "PARENT";
+            zoneTemplate.sea_level = 0;
+            zoneTemplate.max_blend = 128;
+            zoneTemplate.min_blend = 128;
+            zoneTemplate.terrain_max_y = 5;
+            zoneTemplate.major_radius = (int) Enum.CityBoundsType.ZONE.halfExtents;
+            zoneTemplate.minor_radius = (int) Enum.CityBoundsType.ZONE.halfExtents;
+            zoneTemplate.terrain_type = "PLANAR";
+
+            ZoneManager._zone_templates.put(zoneTemplate.templateID, zoneTemplate);
+
         } catch (SQLException e) {
             Logger.error(e);
         }
+
     }
 
     public boolean DELETE_ZONE(final Zone zone) {

src/engine/devcmd/cmds/AddGoldCmd.java

@@ -32,7 +32,7 @@ public class AddGoldCmd extends AbstractDevCmd {
             return;
         }
 
-        Item gold = pc.getCharItemManager().getGoldInventory();
+        Item gold = pc.charItemManager.getGoldInventory();
         int curAmt;
         if (gold == null)
             curAmt = 0;
@@ -54,13 +54,13 @@ public class AddGoldCmd extends AbstractDevCmd {
             return;
         }
 
-        if (!pc.getCharItemManager().addGoldToInventory(amt, true)) {
+        if (!pc.charItemManager.addGoldToInventory(amt, true)) {
             throwbackError(pc, "Failed to add gold to inventory");
             return;
         }
 
         ChatManager.chatSayInfo(pc, amt + " gold added to inventory");
-        pc.getCharItemManager().updateInventory();
+        pc.charItemManager.updateInventory();
     }
 
     @Override

src/engine/devcmd/cmds/AddMobCmd.java

@@ -9,18 +9,16 @@
 
 package engine.devcmd.cmds;
 
-import engine.Enum.GameObjectType;
+import engine.Enum;
 import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.ChatManager;
-import engine.gameManager.DbManager;
 import engine.gameManager.ZoneManager;
-import engine.math.Vector3fImmutable;
-import engine.objects.*;
+import engine.objects.AbstractGameObject;
+import engine.objects.Mob;
+import engine.objects.PlayerCharacter;
+import engine.objects.Zone;
 import org.pmw.tinylog.Logger;
 
-/**
- * @author Eighty
- */
 public class AddMobCmd extends AbstractDevCmd {
 
     public AddMobCmd() {
@@ -37,27 +35,8 @@ public class AddMobCmd extends AbstractDevCmd {
 
         Zone zone = ZoneManager.findSmallestZone(pc.getLoc());
 
-        if (words[0].equals("all")) {
-
-            for (AbstractGameObject mobbaseAGO : DbManager.getList(GameObjectType.MobBase)) {
-                MobBase mb = (MobBase) mobbaseAGO;
-                int loadID = mb.getObjectUUID();
-                Mob mob = Mob.createMob(loadID, Vector3fImmutable.getRandomPointInCircle(pc.getLoc(), 100),
-                        null, true, zone, null, 0, "", 1);
-                if (mob != null) {
-                    mob.updateDatabase();
-                    this.setResult(String.valueOf(mob.getDBID()));
-                } else {
-                    throwbackError(pc, "Failed to create mob of type " + loadID);
-                    Logger.error("Failed to create mob of type "
-                            + loadID);
-                }
-            }
-            return;
-        }
-
-
         int loadID;
+
         try {
             loadID = Integer.parseInt(words[0]);
         } catch (NumberFormatException e) {
@@ -71,20 +50,19 @@ public class AddMobCmd extends AbstractDevCmd {
             return; // NaN
         }
 
-
         if (zone == null) {
             throwbackError(pc, "Failed to find zone to place mob in.");
             return;
         }
 
-        if (zone.isPlayerCity()) {
+        if (zone.guild_zone) {
             throwbackError(pc, "Cannot use ./mob on Player cities. Try ./servermob instead.");
             return;
         }
 
-
         Mob mob = Mob.createMob(loadID, pc.getLoc(),
-                null, true, zone, null, 0, "", 1);
+                null, zone, null, null, "", 1, Enum.AIAgentType.MOBILE);
+
         if (mob != null) {
             mob.updateDatabase();
             ChatManager.chatSayInfo(pc,

src/engine/devcmd/cmds/AuditFailedItemsCmd.java

@@ -1,127 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2022
-//                www.magicbane.com
-
-
-package engine.devcmd.cmds;
-
-import engine.Enum.ModType;
-import engine.devcmd.AbstractDevCmd;
-import engine.gameManager.PowersManager;
-import engine.net.ItemProductionManager;
-import engine.objects.*;
-import engine.powers.effectmodifiers.AbstractEffectModifier;
-import engine.powers.poweractions.AbstractPowerAction;
-import org.pmw.tinylog.Logger;
-
-public class AuditFailedItemsCmd extends AbstractDevCmd {
-
-    public AuditFailedItemsCmd() {
-        super("faileditems");
-    }
-
-    @Override
-    protected void _doCmd(PlayerCharacter pcSender, String[] words,
-                          AbstractGameObject target) {
-
-
-        if (ItemProductionManager.FailedItems.isEmpty())
-            return;
-
-        Logger.info("Auditing Item production Failed Items");
-
-        String newLine = "\r\n";
-        String auditFailedItem = "Failed Item Name | Prefix | Suffix | NPC | Contract  | Player | ";
-
-        for (ProducedItem failedItem : ItemProductionManager.FailedItems) {
-
-            String npcName = "";
-            String playerName = "";
-            String contractName = "";
-
-            String prefix = "";
-            String suffix = "";
-            String itemName = "";
-            NPC npc = NPC.getFromCache(failedItem.getNpcUID());
-
-            if (npc == null) {
-                npcName = "null";
-                contractName = "null";
-            } else {
-                npcName = npc.getName();
-                if (npc.getContract() != null)
-                    contractName = npc.getContract().getName();
-            }
-
-            PlayerCharacter roller = PlayerCharacter.getFromCache(failedItem.getPlayerID());
-
-            if (roller == null)
-                playerName = "null";
-            else
-                playerName = roller.getName();
-
-            ItemBase ib = ItemBase.getItemBase(failedItem.getItemBaseID());
-
-            if (ib != null) {
-                itemName = ib.getName();
-            }
-
-            if (failedItem.isRandom() == false) {
-                if (failedItem.getPrefix().isEmpty() == false) {
-                    AbstractPowerAction pa = PowersManager.getPowerActionByIDString(failedItem.getPrefix());
-                    if (pa != null) {
-                        for (AbstractEffectModifier aem : pa.getEffectsBase().getModifiers()) {
-                            if (aem.modType.equals(ModType.ItemName)) {
-                                prefix = aem.getString1();
-                                break;
-                            }
-                        }
-                    }
-
-                }
-
-                if (failedItem.getSuffix().isEmpty() == false) {
-                    AbstractPowerAction pa = PowersManager.getPowerActionByIDString(failedItem.getSuffix());
-                    if (pa != null) {
-                        for (AbstractEffectModifier aem : pa.getEffectsBase().getModifiers()) {
-                            if (aem.modType.equals(ModType.ItemName)) {
-                                suffix = aem.getString1();
-                                break;
-                            }
-                        }
-                    }
-
-                }
-
-            } else {
-                prefix = "random";
-            }
-
-
-            auditFailedItem += newLine;
-            auditFailedItem += itemName + " | " + prefix + " | " + suffix + " | " + failedItem.getNpcUID() + ":" + npcName + " | " + contractName + " | " + failedItem.getPlayerID() + ":" + playerName;
-
-        }
-        Logger.info(auditFailedItem);
-        ItemProductionManager.FailedItems.clear();
-
-
-    }
-
-
-    @Override
-    protected String _getUsageString() {
-        return "' /bounds'";
-    }
-
-    @Override
-    protected String _getHelpString() {
-        return "Audits all the mobs in a zone.";
-
-    }
-
-}

src/engine/devcmd/cmds/AuditHeightMapCmd.java

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

src/engine/devcmd/cmds/AuditMobsCmd.java

@@ -1,105 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2022
-//                www.magicbane.com
-
-
-package engine.devcmd.cmds;
-
-import engine.devcmd.AbstractDevCmd;
-import engine.gameManager.ZoneManager;
-import engine.objects.AbstractGameObject;
-import engine.objects.PlayerCharacter;
-import engine.objects.Zone;
-
-public class AuditMobsCmd extends AbstractDevCmd {
-
-    public AuditMobsCmd() {
-        super("auditmobs");
-    }
-
-    @Override
-    protected void _doCmd(PlayerCharacter pcSender, String[] words,
-                          AbstractGameObject target) {
-        if (pcSender == null)
-            return;
-
-        //get Zone to check mobs against
-
-        Zone zone;
-
-        if (words.length == 2) {
-            if (words[0].equals("all")) {
-                int plusplus = 0;
-                int count = Integer.parseInt(words[1]);
-                for (Zone zoneMicro : ZoneManager.getAllZones()) {
-                    int size = zoneMicro.zoneMobSet.size();
-
-                    if (size >= count) {
-                        plusplus++;
-                        throwbackInfo(pcSender, zoneMicro.getName() + " at location  " + zoneMicro.getLoc().toString() + " has " + size + " mobs. ");
-                        System.out.println(zoneMicro.getName() + " at location  " + zoneMicro.getLoc().toString() + " has " + size + " mobs. ");
-                    }
-
-
-                }
-                throwbackInfo(pcSender, " there are " + plusplus + " zones with at least " + count + " mobs in each.");
-            }
-            return;
-        }
-        if (words.length > 1) {
-            this.sendUsage(pcSender);
-            return;
-        } else if (words.length == 1) {
-            int uuid;
-            try {
-                uuid = Integer.parseInt(words[0]);
-                zone = ZoneManager.getZoneByUUID(uuid);
-            } catch (NumberFormatException e) {
-                zone = ZoneManager.findSmallestZone(pcSender.getLoc());
-            }
-        } else
-            zone = ZoneManager.findSmallestZone(pcSender.getLoc());
-
-        if (zone == null) {
-            throwbackError(pcSender, "Unable to find the zone");
-            return;
-        }
-
-        //get list of mobs for zone
-
-        if (zone.zoneMobSet.isEmpty()) {
-            throwbackError(pcSender, "No mobs found for this zone.");
-            return;
-        }
-
-        //	ConcurrentHashMap<Integer, Mob> spawnMap = Mob.getSpawnMap();
-        //ConcurrentHashMap<Mob, Long> respawnMap = Mob.getRespawnMap();
-        //		ConcurrentHashMap<Mob, Long> despawnMap = Mob.getDespawnMap();
-
-        throwbackInfo(pcSender, zone.getName() + ", numMobs: " + zone.zoneMobSet.size());
-        throwbackInfo(pcSender, "UUID, dbID, inRespawnMap, isAlive, activeAI, Loc");
-
-
-        //mob not found in spawn map, check respawn
-        boolean inRespawn = false;
-
-
-    }
-
-
-    @Override
-    protected String _getUsageString() {
-        return "' /auditmobs [zone.UUID]'";
-    }
-
-    @Override
-    protected String _getHelpString() {
-        return "Audits all the mobs in a zone.";
-
-    }
-
-}

src/engine/devcmd/cmds/ChangeNameCmd.java

@@ -1,114 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2022
-//                www.magicbane.com
-
-
-package engine.devcmd.cmds;
-
-import engine.devcmd.AbstractDevCmd;
-import engine.gameManager.DbManager;
-import engine.gameManager.SessionManager;
-import engine.math.Vector3fImmutable;
-import engine.objects.AbstractGameObject;
-import engine.objects.PlayerCharacter;
-import engine.util.MiscUtils;
-
-public class ChangeNameCmd extends AbstractDevCmd {
-
-    public ChangeNameCmd() {
-        super("changename");
-    }
-
-    @Override
-    protected void _doCmd(PlayerCharacter pc, String[] words,
-                          AbstractGameObject target) {
-        Vector3fImmutable loc = null;
-
-        // Arg Count Check
-        if (words.length < 2) {
-            this.sendUsage(pc);
-            return;
-        }
-
-        String oldFirst = words[0];
-        String newFirst = words[1];
-        String newLast = "";
-        if (words.length > 2) {
-            newLast = words[2];
-            for (int i = 3; i < words.length; i++)
-                newLast += ' ' + words[i];
-        }
-
-        //verify new name length
-        if (newFirst.length() < 3) {
-            this.throwbackError(pc, "Error: First name is incorrect length. Must be between 3 and 15 characters");
-            return;
-        }
-
-        //verify old name length
-        if (newLast.length() > 50) {
-            this.throwbackError(pc, "Error: Last name is incorrect length. Must be no more than 50 characters");
-            return;
-        }
-
-        // Check if firstname is valid
-        if (MiscUtils.checkIfFirstNameInvalid(newFirst)) {
-            this.throwbackError(pc, "Error: First name is not allowed");
-            return;
-        }
-
-
-        //get the world ID we're modifying for
-
-        //test if first name is unique, unless new and old first name are equal.
-        if (!(oldFirst.equals(newFirst))) {
-            if (!DbManager.PlayerCharacterQueries.IS_CHARACTER_NAME_UNIQUE(newFirst)) {
-                this.throwbackError(pc, "Error: First name is not unique.");
-                return;
-            }
-        }
-
-        //tests passed, update name in database
-        if (!DbManager.PlayerCharacterQueries.UPDATE_NAME(oldFirst, newFirst, newLast)) {
-            this.throwbackError(pc, "Error: Database failed to update the name.");
-            return;
-        }
-
-        //Finally update player ingame
-        PlayerCharacter pcTar = null;
-        try {
-            pcTar = SessionManager
-                    .getPlayerCharacterByLowerCaseName(words[0]);
-            pcTar.setFirstName(newFirst);
-            pcTar.setLastName(newLast);
-            this.setTarget(pcTar); //for logging
-
-            //specify if last name is ascii characters only
-            String lastAscii = newLast.replaceAll("[^\\p{ASCII}]", "");
-            pcTar.setAsciiLastName(lastAscii.equals(newLast));
-        } catch (Exception e) {
-            this.throwbackError(pc, "Database was updated but ingame character failed to update.");
-            return;
-        }
-
-        String out = oldFirst + " was changed to " + newFirst + (newLast.isEmpty() ? "." : (' ' + newLast + '.'));
-        this.throwbackInfo(pc, out);
-
-
-    }
-
-    @Override
-    protected String _getHelpString() {
-        return "Changes the name of a player";
-    }
-
-    @Override
-    protected String _getUsageString() {
-        return "'./changename oldFirstName newFirstName newLastName'";
-    }
-
-}

src/engine/devcmd/cmds/CombatMessageCmd.java

@@ -1,56 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2022
-//                www.magicbane.com
-
-
-package engine.devcmd.cmds;
-
-import engine.devcmd.AbstractDevCmd;
-import engine.net.client.msg.TargetedActionMsg;
-import engine.objects.AbstractGameObject;
-import engine.objects.PlayerCharacter;
-
-/**
- * @author Eighty
- */
-public class CombatMessageCmd extends AbstractDevCmd {
-
-    public CombatMessageCmd() {
-        super("cm");
-    }
-
-    @Override
-    protected void _doCmd(PlayerCharacter pcSender, String[] args,
-                          AbstractGameObject target) {
-        if (pcSender == null)
-            return;
-        if (args.length != 1) {
-            this.sendUsage(pcSender);
-            return;
-        }
-        int num = 0;
-        try {
-            num = Integer.parseInt(args[0]);
-        } catch (NumberFormatException e) {
-            throwbackError(pcSender, "Supplied message number " + args[0] + " failed to parse to an Integer");
-            return;
-        }
-        TargetedActionMsg.un2cnt = num;
-        throwbackInfo(pcSender, "CombatMessage set to " + num);
-    }
-
-    @Override
-    protected String _getUsageString() {
-        return "' /cm [cmNumber]'";
-    }
-
-    @Override
-    protected String _getHelpString() {
-        return "Sets the combat message to the supplied integer value";
-    }
-
-}

src/engine/devcmd/cmds/CreateItemCmd.java

@@ -11,7 +11,6 @@ package engine.devcmd.cmds;
 
 import engine.devcmd.AbstractDevCmd;
 import engine.objects.AbstractGameObject;
-import engine.objects.ItemBase;
 import engine.objects.ItemFactory;
 import engine.objects.PlayerCharacter;
 
@@ -27,28 +26,20 @@ public class CreateItemCmd extends AbstractDevCmd {
     @Override
     protected void _doCmd(PlayerCharacter pc, String[] words,
                           AbstractGameObject target) {
+
         if (words.length < 2) {
             this.sendUsage(pc);
             return;
         }
-        int id;
-        id = ItemBase.getIDByName(words[0]);
 
-        if (id == 0)
-            id = Integer.parseInt(words[0]);
-        if (id == 7) {
-            this.throwbackInfo(pc, "use /addgold to add gold.....");
-            return;
-        }
+        int templateID = Integer.parseInt(words[0]);
 
         int size = 1;
 
-        if (words.length < 3) {
+        if (words.length == 2)
             size = Integer.parseInt(words[1]);
-        }
-
-        ItemFactory.fillInventory(pc, id, size);
 
+        ItemFactory.fillInventory(pc, templateID, size);
     }
 
     @Override
@@ -58,7 +49,7 @@ public class CreateItemCmd extends AbstractDevCmd {
 
     @Override
     protected String _getUsageString() {
-        return "' /createitem <ItembaseID> <quantity>'";
+        return "' /createitem <templateID> <quantity>'";
     }
 
 }

src/engine/devcmd/cmds/DebugCmd.java

@@ -1,122 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2022
-//                www.magicbane.com
-
-
-package engine.devcmd.cmds;
-
-import engine.devcmd.AbstractDevCmd;
-import engine.jobs.DebugTimerJob;
-import engine.objects.AbstractGameObject;
-import engine.objects.PlayerCharacter;
-
-public class DebugCmd extends AbstractDevCmd {
-
-
-    public DebugCmd() {
-        super("debug");
-        //		super("debug", MBServerStatics.ACCESS_GROUP_ALL_TEAM, 0, false, false);
-    }
-
-    private static void toggleDebugTimer(PlayerCharacter pc, String name, int num, int duration, boolean toggle) {
-        if (toggle) {
-            DebugTimerJob dtj = new DebugTimerJob(pc, name, num, duration);
-            pc.renewTimer(name, dtj, duration);
-        } else
-            pc.cancelTimer(name);
-    }
-
-    @Override
-    protected void _doCmd(PlayerCharacter pc, String[] words,
-                          AbstractGameObject target) {
-        if (words.length < 2) {
-            this.sendUsage(pc);
-            return;
-        }
-
-        if (pc == null)
-            return;
-
-        //pc.setDebug must use bit sizes: 1, 2, 4, 8, 16, 32
-
-        String command = words[0].toLowerCase();
-        boolean toggle = (words[1].toLowerCase().equals("on")) ? true : false;
-
-        switch (command) {
-            case "magictrek":
-                pc.RUN_MAGICTREK = toggle;
-
-                break;
-            case "combat":
-                pc.setDebug(64, toggle);
-
-                break;
-            case "health":
-                toggleDebugTimer(pc, "Debug_Health", 1, 1000, toggle);
-
-                break;
-            case "mana":
-                toggleDebugTimer(pc, "Debug_Mana", 2, 1000, toggle);
-
-                break;
-            case "stamina":
-                toggleDebugTimer(pc, "Debug_Stamina", 3, 500, toggle);
-
-                break;
-            case "spells":
-                pc.setDebug(16, toggle);
-
-                break;
-            case "damageabsorber":
-                pc.setDebug(2, toggle);
-
-                break;
-            case "recast":
-            case "recycle":
-                pc.setDebug(4, toggle);
-
-                break;
-            case "seeinvis":
-                pc.setDebug(8, toggle);
-
-                break;
-            case "movement":
-                pc.setDebug(1, toggle);
-
-                break;
-            case "noaggro":
-                pc.setDebug(32, toggle);
-
-                break;
-            //		case "loot":
-            //			MBServerStatics.debugLoot = toggle;
-            //			break;
-
-            default:
-                String output = "Debug for " + command + " not found.";
-                throwbackError(pc, output);
-                return;
-        }
-
-
-        setTarget(pc); //for logging
-
-        String output = "Debug for " + command + " turned " + ((toggle) ? "on." : "off.");
-        throwbackInfo(pc, output);
-    }
-
-    @Override
-    protected String _getHelpString() {
-        return "Runs debug commands";
-
-    }
-
-    @Override
-    protected String _getUsageString() {
-        return "'./Debug command on/off'";
-    }
-}

src/engine/devcmd/cmds/DespawnCmd.java

@@ -1,66 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2022
-//                www.magicbane.com
-
-
-package engine.devcmd.cmds;
-
-import engine.Enum.GameObjectType;
-import engine.devcmd.AbstractDevCmd;
-import engine.objects.AbstractGameObject;
-import engine.objects.Mob;
-import engine.objects.PlayerCharacter;
-
-public class DespawnCmd extends AbstractDevCmd {
-
-    public DespawnCmd() {
-        super("debugmob");
-    }
-
-    @Override
-    protected void _doCmd(PlayerCharacter pc, String[] words,
-                          AbstractGameObject target) {
-
-
-        if (pc == null) {
-            return;
-        }
-
-
-        Mob mob = null;
-
-        if (target != null && target.getObjectType().equals(GameObjectType.Mob))
-            mob = (Mob) target;
-
-        if (mob == null)
-            mob = Mob.getFromCache(Integer.parseInt(words[1]));
-
-        if (mob == null)
-            return;
-
-        if (words[0].equalsIgnoreCase("respawn")) {
-            mob.respawn();
-            this.throwbackInfo(pc, "Mob with ID " + mob.getObjectUUID() + " Respawned");
-        } else if (words[0].equalsIgnoreCase("despawn")) {
-            mob.despawn();
-            this.throwbackInfo(pc, "Mob with ID " + mob.getObjectUUID() + " Despawned");
-        }
-    }
-
-    @Override
-    protected String _getHelpString() {
-        return "Gets distance from a target.";
-
-    }
-
-    @Override
-    protected String _getUsageString() {
-        return "' /distance'";
-
-    }
-
-}

src/engine/devcmd/cmds/DistanceCmd.java

@@ -1,65 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2022
-//                www.magicbane.com
-
-
-package engine.devcmd.cmds;
-
-import engine.devcmd.AbstractDevCmd;
-import engine.math.Vector3fImmutable;
-import engine.objects.AbstractGameObject;
-import engine.objects.AbstractWorldObject;
-import engine.objects.PlayerCharacter;
-
-public class DistanceCmd extends AbstractDevCmd {
-
-    public DistanceCmd() {
-        super("distance");
-    }
-
-    @Override
-    protected void _doCmd(PlayerCharacter pc, String[] words,
-                          AbstractGameObject target) {
-
-
-        // Arg Count Check
-        if (words.length != 1) {
-            this.sendUsage(pc);
-            return;
-        }
-        if (pc == null) {
-            return;
-        }
-
-        if (target == null || !(target instanceof AbstractWorldObject)) {
-            throwbackError(pc, "No target found.");
-            return;
-        }
-
-        AbstractWorldObject awoTarget = (AbstractWorldObject) target;
-
-        Vector3fImmutable pcLoc = pc.getLoc();
-        Vector3fImmutable tarLoc = awoTarget.getLoc();
-        String out = "Distance: " + pcLoc.distance(tarLoc) +
-                "\r\nYour Loc: " + pcLoc.x + 'x' + pcLoc.y + 'x' + pcLoc.z +
-                "\r\nTarget Loc: " + tarLoc.x + 'x' + tarLoc.y + 'x' + tarLoc.z;
-        throwbackInfo(pc, out);
-    }
-
-    @Override
-    protected String _getHelpString() {
-        return "Gets distance from a target.";
-
-    }
-
-    @Override
-    protected String _getUsageString() {
-        return "' /distance'";
-
-    }
-
-}

src/engine/devcmd/cmds/EffectCmd.java

@@ -1,61 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2022
-//                www.magicbane.com
-
-
-package engine.devcmd.cmds;
-
-import engine.devcmd.AbstractDevCmd;
-import engine.gameManager.ChatManager;
-import engine.gameManager.PowersManager;
-import engine.objects.AbstractGameObject;
-import engine.objects.PlayerCharacter;
-import engine.powers.EffectsBase;
-
-/**
- * @author Eighty
- */
-public class EffectCmd extends AbstractDevCmd {
-
-    public EffectCmd() {
-        super("effect");
-    }
-
-    @Override
-    protected void _doCmd(PlayerCharacter pcSender, String[] args,
-                          AbstractGameObject target) {
-        int ID = 0;
-        int token = 0;
-
-        if (args.length != 2) {
-            this.sendUsage(pcSender);
-            return;
-        }
-        ID = Integer.parseInt(args[0]);
-        token = Integer.parseInt(args[1]);
-
-        EffectsBase eb = PowersManager.setEffectToken(ID, token);
-        if (eb == null) {
-            throwbackError(pcSender, "Unable to find EffectsBase " + ID
-                    + " to modify.");
-            return;
-        }
-        ChatManager.chatSayInfo(pcSender,
-                "EffectsBase with ID " + ID + " changed token to " + token);
-    }
-
-    @Override
-    protected String _getUsageString() {
-        return "' /effect EffectsBaseID Token'";
-    }
-
-    @Override
-    protected String _getHelpString() {
-        return "Temporarily places the effect token with the corresponding EffectsBase on the server";
-    }
-
-}

src/engine/devcmd/cmds/EnchantCmd.java

@@ -1,87 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2022
-//                www.magicbane.com
-
-
-package engine.devcmd.cmds;
-
-import engine.devcmd.AbstractDevCmd;
-import engine.objects.*;
-
-public class EnchantCmd extends AbstractDevCmd {
-
-    public EnchantCmd() {
-        super("enchant");
-    }
-
-    @Override
-    protected void _doCmd(PlayerCharacter pc, String[] words,
-                          AbstractGameObject target) {
-        int rank = 0;
-        if (words.length < 1) {
-            this.sendUsage(pc);
-            return;
-        }
-
-
-        try {
-            rank = Integer.parseInt(words[0]);
-        } catch (Exception e) {
-
-        }
-
-
-        Item item;
-        if (target == null || target instanceof Item)
-            item = (Item) target;
-        else {
-            throwbackError(pc, "Must have an item targeted");
-            return;
-        }
-
-        CharacterItemManager cim = pc.getCharItemManager();
-        if (cim == null) {
-            throwbackError(pc, "Unable to find the character item manager for player " + pc.getFirstName() + '.');
-            return;
-        }
-
-        if (words[0].equals("clear")) {
-            item.clearEnchantments();
-            cim.updateInventory();
-            this.setResult(String.valueOf(item.getObjectUUID()));
-        } else {
-            int cnt = words.length;
-            for (int i = 1; i < cnt; i++) {
-                String enchant = words[i];
-                boolean valid = true;
-                for (Effect eff : item.getEffects().values()) {
-                    if (eff.getEffectsBase().getIDString().equals(enchant)) {
-                        throwbackError(pc, "This item already has that enchantment");
-                        return;
-                    }
-                }
-                if (valid) {
-                    item.addPermanentEnchantmentForDev(enchant, rank);
-                    this.setResult(String.valueOf(item.getObjectUUID()));
-                } else
-                    throwbackError(pc, "Invalid Enchantment. Enchantment must consist of SUF-001 to SUF-328 or PRE-001 to PRE-334. Sent " + enchant + '.');
-            }
-            cim.updateInventory();
-        }
-    }
-
-    @Override
-    protected String _getHelpString() {
-        return "Enchants an item with a prefix and suffix";
-    }
-
-    @Override
-    protected String _getUsageString() {
-        return "' /enchant clear/Enchant1 Enchant2 Enchant3 ...'";
-    }
-
-}

src/engine/devcmd/cmds/GateInfoCmd.java

@@ -1,84 +0,0 @@
-package engine.devcmd.cmds;
-
-import engine.Enum.BuildingGroup;
-import engine.Enum.GameObjectType;
-import engine.devcmd.AbstractDevCmd;
-import engine.math.Vector3fImmutable;
-import engine.objects.*;
-
-public class GateInfoCmd extends AbstractDevCmd {
-
-    public GateInfoCmd() {
-        super("gateinfo");
-    }
-
-    // AbstractDevCmd Overridden methods
-
-    @Override
-    protected void _doCmd(PlayerCharacter player, String[] args,
-                          AbstractGameObject target) {
-
-        Building targetBuilding;
-        String outString;
-        Runegate runeGate;
-        Blueprint blueprint;
-        String newline = "\r\n ";
-        targetBuilding = (Building) target;
-
-        if (targetBuilding.getObjectType() != GameObjectType.Building) {
-            throwbackInfo(player, "GateInfo: target must be a Building");
-            throwbackInfo(player, "Found" + targetBuilding.getObjectType().toString());
-            return;
-        }
-
-        blueprint = Blueprint._meshLookup.get(targetBuilding.getMeshUUID());
-
-        if (blueprint == null ||
-                (blueprint.getBuildingGroup() != BuildingGroup.RUNEGATE)) {
-            throwbackInfo(player, "showgate: target must be a Runegate");
-            return;
-        }
-
-
-        runeGate = Runegate._runegates.get(targetBuilding.getObjectUUID());
-
-        outString = "RungateType: " + runeGate.gateBuilding.getName();
-        outString += newline;
-
-        outString += "Portal State:";
-        outString += newline;
-
-        for (Portal portal : runeGate.getPortals()) {
-
-            outString += "Portal: " + portal.portalType.name();
-            outString += " Active: " + portal.isActive();
-            outString += " Dest: " + portal.targetGate.getName();
-            outString += newline;
-            outString += " Origin: " + portal.getPortalLocation().x + 'x';
-            outString += " " + portal.getPortalLocation().y + 'y';
-            outString += newline;
-
-            Vector3fImmutable offset = portal.getPortalLocation().subtract(targetBuilding.getLoc());
-            outString += " Offset: " + offset.x + "x " + offset.z + 'y';
-            outString += newline;
-            outString += newline;
-
-        }
-        outString += newline;
-        throwbackInfo(player, outString);
-    }
-
-    @Override
-    protected String _getHelpString() {
-        return "Displays a runegate's gate status";
-    }
-
-    @Override
-    protected String _getUsageString() {
-
-
-        return "/gateinfo <target runegate> \n";
-    }
-
-
-}

src/engine/devcmd/cmds/GetBankCmd.java

@@ -1,52 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2022
-//                www.magicbane.com
-
-
-package engine.devcmd.cmds;
-
-import engine.devcmd.AbstractDevCmd;
-import engine.gameManager.SessionManager;
-import engine.net.client.ClientConnection;
-import engine.net.client.msg.VendorDialogMsg;
-import engine.objects.AbstractGameObject;
-import engine.objects.PlayerCharacter;
-
-/**
- * @author Eighty
- */
-public class GetBankCmd extends AbstractDevCmd {
-
-    public GetBankCmd() {
-        super("getbank");
-    }
-
-    @Override
-    protected void _doCmd(PlayerCharacter pcSender, String[] args,
-                          AbstractGameObject target) {
-        if (pcSender == null)
-            return;
-
-        ClientConnection cc = SessionManager.getClientConnection(pcSender);
-        if (cc == null)
-            return;
-
-        VendorDialogMsg.getBank(pcSender, null, cc);
-        this.setTarget(pcSender); //for logging
-    }
-
-    @Override
-    protected String _getUsageString() {
-        return "' /getbank'";
-    }
-
-    @Override
-    protected String _getHelpString() {
-        return "Opens bank window";
-    }
-
-}

src/engine/devcmd/cmds/GetHeightCmd.java

@@ -9,11 +9,10 @@
 
 package engine.devcmd.cmds;
 
-import engine.InterestManagement.HeightMap;
+import engine.InterestManagement.Terrain;
 import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.ZoneManager;
 import engine.math.Vector2f;
-import engine.math.Vector3fImmutable;
 import engine.objects.AbstractGameObject;
 import engine.objects.PlayerCharacter;
 import engine.objects.Zone;
@@ -22,205 +21,79 @@ public class GetHeightCmd extends AbstractDevCmd {
 
     public GetHeightCmd() {
         super("getHeight");
-        this.addCmdString("height");
     }
 
     @Override
-    protected void _doCmd(PlayerCharacter pc, String[] words,
+    protected void _doCmd(PlayerCharacter playerCharacter, String[] words,
                           AbstractGameObject target) {
 
-        boolean end = true;
+        Zone currentZone;
+        Zone parentZone;
+        Zone heightmapZone;
 
-        float height = HeightMap.getWorldHeight(pc);
+        currentZone = ZoneManager.findSmallestZone(playerCharacter.getLoc());
+        heightmapZone = Terrain.getNextZoneWithTerrain(currentZone);
+        parentZone = Terrain.getNextZoneWithTerrain(currentZone.parent);
 
-        this.throwbackInfo(pc, "Altitude : " + height);
+        Vector2f childZoneLoc = ZoneManager.worldToTerrainSpace(playerCharacter.getLoc(), heightmapZone);
+        Vector2f childZoneOffset = ZoneManager.worldToZoneOffset(playerCharacter.getLoc(), heightmapZone);
+        Vector2f normalizedOffset = new Vector2f(Math.abs(childZoneOffset.x) / heightmapZone.template.major_radius,
+                Math.abs(childZoneOffset.y) / heightmapZone.template.minor_radius);
+        Vector2f parentZoneLoc = ZoneManager.worldToTerrainSpace(playerCharacter.getLoc(), parentZone);
 
-        this.throwbackInfo(pc, "Character Height: " + pc.getCharacterHeight());
-        this.throwbackInfo(pc, "Character Height to start swimming: " + pc.centerHeight);
+        float childHeight = heightmapZone.terrain.getInterpolatedTerrainHeight(childZoneLoc);
+        childHeight = childHeight + heightmapZone.global_height;
 
-        Zone zone = ZoneManager.findSmallestZone(pc.getLoc());
-        this.throwbackInfo(pc, "Water Level : " + zone.getSeaLevel());
-        this.throwbackInfo(pc, "Character Water Level Above : " + (pc.getCharacterHeight() + height - zone.getSeaLevel()));
+        float parentHeight = parentZone.terrain.getInterpolatedTerrainHeight(parentZoneLoc);
+        parentHeight += parentZone.global_height;
 
-        if (end)
-            return;
+        float blendedHeight = Terrain.getWorldHeight(currentZone, playerCharacter.getLoc());
 
-        Vector2f gridSquare;
-        Vector2f gridOffset;
-        Vector2f parentGrid;
-        Vector2f parentLoc = new Vector2f(-1, -1);
+        Vector2f terrainCell = heightmapZone.terrain.getTerrainCell(childZoneLoc);
+        Vector2f cell_offset = new Vector2f(terrainCell.x % 1, terrainCell.y % 1);
 
-        Zone currentZone = ZoneManager.findSmallestZone(pc.getLoc());
-
-        if (currentZone == null)
-            return;
-
-        Zone parentZone = currentZone.getParent();
-
-        HeightMap heightMap = currentZone.getHeightMap();
+        terrainCell.x = (float) Math.floor(terrainCell.x);
+        terrainCell.y = (float) Math.floor(terrainCell.y);
 
 
-        //find the next parents heightmap if the currentzone heightmap is null.
-        while (heightMap == null) {
+        short top_left_pixel = heightmapZone.terrain.terrain_pixel_data[(int) terrainCell.x][(int) terrainCell.y];
+        short top_right_pixel = heightmapZone.terrain.terrain_pixel_data[(int) terrainCell.x + 1][(int) terrainCell.y];
+        short bottom_left_pixel = heightmapZone.terrain.terrain_pixel_data[(int) terrainCell.x][(int) terrainCell.y + 1];
+        short bottom_right_pixel = heightmapZone.terrain.terrain_pixel_data[(int) terrainCell.x + 1][(int) terrainCell.y + 1];
 
-            if (currentZone == ZoneManager.getSeaFloor()) {
-                this.throwbackInfo(pc, "Could not find a heightmap to get height.");
-                break;
-            }
+        this.throwbackInfo(playerCharacter, "Current Zone : " + currentZone.zoneName);
+        this.throwbackInfo(playerCharacter, "Heightmap Zone : " + heightmapZone.zoneName);
+        this.throwbackInfo(playerCharacter, "Parent Zone: " + parentZone.zoneName);
 
-            this.throwbackError(pc, "Heightmap does not exist for " + currentZone.getName());
-            this.throwbackInfo(pc, "Using parent zone instead: ");
-            currentZone = currentZone.getParent();
-            heightMap = currentZone.getHeightMap();
-        }
+        this.throwbackInfo(playerCharacter, "Player loc: " + "[" + playerCharacter.loc.x + "]" + "[" + playerCharacter.loc.y + "]" + "[" + playerCharacter.loc.z + "]");
 
+        this.throwbackInfo(playerCharacter, "Terrain Cell : " + "[" + terrainCell.x + "]" + "[" + terrainCell.y + "]");
+        this.throwbackInfo(playerCharacter, "Cell Offset : " + "[" + cell_offset.x + "]" + "[" + cell_offset.y + "]");
+        this.throwbackInfo(playerCharacter, "Pixels : " + "[" + top_left_pixel + "]" + "[" + top_right_pixel + "]");
+        this.throwbackInfo(playerCharacter, "Pixels : " + "[" + bottom_left_pixel + "]" + "[" + bottom_right_pixel + "]");
 
-        if ((heightMap == null) || (currentZone == ZoneManager.getSeaFloor())) {
-            this.throwbackInfo(pc, currentZone.getName() + " has no heightmap ");
-            this.throwbackInfo(pc, "Current altitude: " + currentZone.absY);
-            return;
-        }
+        this.throwbackInfo(playerCharacter, "Child Zone Offset: " + "[" + childZoneOffset.x + "]" + "[" + childZoneOffset.y + "]");
+        this.throwbackInfo(playerCharacter, "Normalized offset: " + "[" + normalizedOffset.x + "]" + "[" + normalizedOffset.y + "]");
+        this.throwbackInfo(playerCharacter, "template blend Values: (max/min): " + heightmapZone.template.max_blend + " /" + heightmapZone.template.min_blend);
+        this.throwbackInfo(playerCharacter, "terrain values (max/min): " + heightmapZone.terrain.blend_values.x + " /" + heightmapZone.terrain.blend_values.y);
+        this.throwbackInfo(playerCharacter, "Blend coefficient: " + heightmapZone.terrain.getTerrainBlendCoefficient(childZoneOffset));
 
-        Vector2f zoneLoc = ZoneManager.worldToZoneSpace(pc.getLoc(), currentZone);
-
-        Vector3fImmutable seaFloorLocalLoc = ZoneManager.worldToLocal(pc.getLoc(), ZoneManager.getSeaFloor());
-        this.throwbackInfo(pc, "SeaFloor Local : " + seaFloorLocalLoc.x + " , " + seaFloorLocalLoc.y);
-
-
-        this.throwbackInfo(pc, "Local Zone Location : " + zoneLoc.x + " , " + zoneLoc.y);
-        Vector3fImmutable localLocFromCenter = ZoneManager.worldToLocal(pc.getLoc(), currentZone);
-        Vector3fImmutable parentLocFromCenter = ZoneManager.worldToLocal(pc.getLoc(), currentZone.getParent());
-        this.throwbackInfo(pc, "Local Zone Location from center : " + localLocFromCenter);
-        this.throwbackInfo(pc, "parent Zone Location from center : " + parentLocFromCenter);
-
-        Vector2f parentZoneLoc = ZoneManager.worldToZoneSpace(pc.getLoc(), currentZone.getParent());
-        this.throwbackInfo(pc, "Parent Zone Location from Bottom Left : " + parentZoneLoc);
-
-        if ((parentZone != null) && (parentZone.getHeightMap() != null)) {
-            parentLoc = ZoneManager.worldToZoneSpace(pc.getLoc(), parentZone);
-            parentGrid = parentZone.getHeightMap().getGridSquare(parentLoc);
-        } else
-            parentGrid = new Vector2f(-1, -1);
-
-        gridSquare = heightMap.getGridSquare(zoneLoc);
-        gridOffset = HeightMap.getGridOffset(gridSquare);
-
-        float interaltitude = currentZone.getHeightMap().getInterpolatedTerrainHeight(zoneLoc);
-
-        this.throwbackInfo(pc, currentZone.getName());
-        this.throwbackInfo(pc, "Current Grid Square: " + gridSquare.x + " , " + gridSquare.y);
-        this.throwbackInfo(pc, "Grid Offset: " + gridOffset.x + " , " + gridOffset.y);
-        this.throwbackInfo(pc, "Parent Grid: " + parentGrid.x + " , " + parentGrid.y);
-
-        if (parentGrid.x != -1) {
-            float parentAltitude = parentZone.getHeightMap().getInterpolatedTerrainHeight(parentLoc);
-            this.throwbackInfo(pc, "Parent ALTITUDE: " + (parentAltitude));
-            this.throwbackInfo(pc, "Parent Interpolation: " + (parentAltitude + parentZone.getWorldAltitude()));
-        }
-        this.throwbackInfo(pc, "interpolated height: " + interaltitude);
-
-        this.throwbackInfo(pc, "interpolated height with World: " + (interaltitude + currentZone.getWorldAltitude()));
-
-        float realWorldAltitude = interaltitude + currentZone.getWorldAltitude();
-
-        //OUTSET
-        if (parentZone != null) {
-            float parentXRadius = currentZone.getBounds().getHalfExtents().x;
-            float parentZRadius = currentZone.getBounds().getHalfExtents().y;
-
-            float offsetX = Math.abs((localLocFromCenter.x / parentXRadius));
-            float offsetZ = Math.abs((localLocFromCenter.z / parentZRadius));
-
-            float bucketScaleX = 100 / parentXRadius;
-            float bucketScaleZ = 200 / parentZRadius;
-
-            float outsideGridSizeX = 1 - bucketScaleX; //32/256
-            float outsideGridSizeZ = 1 - bucketScaleZ;
-            float weight;
-
-            double scale;
-
-
-            if (offsetX > outsideGridSizeX && offsetX > offsetZ) {
-                weight = (offsetX - outsideGridSizeX) / bucketScaleX;
-                scale = Math.atan2((.5 - weight) * 3.1415927, 1);
-
-                float scaleChild = (float) ((scale + 1) * .5);
-                float scaleParent = 1 - scaleChild;
-
-
-                float parentAltitude = parentZone.getHeightMap().getInterpolatedTerrainHeight(parentLoc);
-                float parentCenterAltitude = parentZone.getHeightMap().getInterpolatedTerrainHeight(ZoneManager.worldToZoneSpace(currentZone.getLoc(), parentZone));
-
-                parentCenterAltitude += currentZone.getYCoord();
-                parentCenterAltitude += interaltitude;
-
-                float firstScale = parentAltitude * scaleParent;
-                float secondScale = parentCenterAltitude * scaleChild;
-                float outsetALt = firstScale + secondScale;
-
-                outsetALt += currentZone.getParent().getAbsY();
-                realWorldAltitude = outsetALt;
-
-            } else if (offsetZ > outsideGridSizeZ) {
-
-                weight = (offsetZ - outsideGridSizeZ) / bucketScaleZ;
-                scale = Math.atan2((.5 - weight) * 3.1415927, 1);
-
-                float scaleChild = (float) ((scale + 1) * .5);
-                float scaleParent = 1 - scaleChild;
-                float parentAltitude = parentZone.getHeightMap().getInterpolatedTerrainHeight(parentLoc);
-                float parentCenterAltitude = parentZone.getHeightMap().getInterpolatedTerrainHeight(ZoneManager.worldToZoneSpace(currentZone.getLoc(), parentZone));
-
-                parentCenterAltitude += currentZone.getYCoord();
-                parentCenterAltitude += interaltitude;
-                float firstScale = parentAltitude * scaleParent;
-                float secondScale = parentCenterAltitude * scaleChild;
-                float outsetALt = firstScale + secondScale;
-
-                outsetALt += currentZone.getParent().getAbsY();
-                realWorldAltitude = outsetALt;
-
-
-            }
-        }
-
-        float strMod = pc.statStrBase - 40;
-
-        strMod *= .00999999998f;
-
-        strMod += 1f;
-
-        float radius = 0;
-        switch (pc.getRaceID()) {
-            case 2017:
-                radius = 3.1415927f;
-            case 2000:
-
-
-        }
-        strMod *= 1.5707964f;
-
-        strMod += 3.1415927f;
-
-        strMod -= .5f;
-
-
-        realWorldAltitude += strMod;
-
-        this.throwbackInfo(pc, "interpolated height with World: " + realWorldAltitude);
+        this.throwbackInfo(playerCharacter, "------------");
 
+        this.throwbackInfo(playerCharacter, "Child Height at loc: " + Math.ceil(childHeight));
+        this.throwbackInfo(playerCharacter, "Parent Height at loc: " + Math.ceil(parentHeight));
+        this.throwbackInfo(playerCharacter, "Blended Height (Ceil): " + blendedHeight + " (" + Math.ceil(blendedHeight) + ")");
 
     }
 
     @Override
     protected String _getHelpString() {
-        return "Temporarily Changes SubRace";
+        return "Queries heightmap engine";
     }
 
     @Override
     protected String _getUsageString() {
-        return "' /subrace mobBaseID";
+        return "' /getheight";
     }
 
 }

src/engine/devcmd/cmds/GetMemoryCmd.java

@@ -1,58 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2022
-//                www.magicbane.com
-
-
-package engine.devcmd.cmds;
-
-import engine.devcmd.AbstractDevCmd;
-import engine.objects.AbstractGameObject;
-import engine.objects.PlayerCharacter;
-
-public class GetMemoryCmd extends AbstractDevCmd {
-
-    public GetMemoryCmd() {
-        super("getmemory");
-    }
-
-    public static String getMemoryOutput(long memory) {
-        String out = "";
-        if (memory > 1073741824)
-            return (memory / 1073741824) + "GB";
-        else if (memory > 1048576)
-            return (memory / 1048576) + "MB";
-        else if (memory > 1024)
-            return (memory / 1048576) + "KB";
-        else
-            return memory + "B";
-    }
-
-    @Override
-    protected void _doCmd(PlayerCharacter pcSender, String[] words,
-                          AbstractGameObject target) {
-        if (pcSender == null)
-            return;
-
-        String hSize = getMemoryOutput(Runtime.getRuntime().totalMemory());
-        String mhSize = getMemoryOutput(Runtime.getRuntime().maxMemory());
-        String fhSize = getMemoryOutput(Runtime.getRuntime().freeMemory());
-
-        String out = "Heap Size: " + hSize + ", Max Heap Size: " + mhSize + ", Free Heap Size: " + fhSize;
-        throwbackInfo(pcSender, out);
-    }
-
-    @Override
-    protected String _getUsageString() {
-        return "' /getmemory'";
-    }
-
-    @Override
-    protected String _getHelpString() {
-        return "lists memory usage";
-    }
-
-}

src/engine/devcmd/cmds/GetOffsetCmd.java

@@ -48,7 +48,7 @@ public class GetOffsetCmd extends AbstractDevCmd {
         float difY = pcSender.getLoc().y - zone.absY;
         float difZ = pcSender.getLoc().z - zone.absZ;
 
-        throwbackInfo(pcSender, zone.getName() + ": (x: " + difX + ", y: " + difY + ", z: " + difZ + ')');
+        throwbackInfo(pcSender, zone.zoneName + ": (x: " + difX + ", y: " + difY + ", z: " + difZ + ')');
     }
 
     @Override

src/engine/devcmd/cmds/GetVaultCmd.java

@@ -12,7 +12,7 @@ package engine.devcmd.cmds;
 import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.SessionManager;
 import engine.net.client.ClientConnection;
-import engine.net.client.msg.VendorDialogMsg;
+import engine.net.client.handlers.VendorDialogMsgHandler;
 import engine.objects.AbstractGameObject;
 import engine.objects.PlayerCharacter;
 
@@ -32,7 +32,7 @@ public class GetVaultCmd extends AbstractDevCmd {
         if (cc == null)
             return;
 
-        VendorDialogMsg.getVault(pcSender, null, cc);
+        VendorDialogMsgHandler.getVault(pcSender, null, cc);
         this.setTarget(pcSender); //for logging
     }
 

src/engine/devcmd/cmds/GetZoneCmd.java

@@ -1,67 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2022
-//                www.magicbane.com
-
-
-package engine.devcmd.cmds;
-
-import engine.devcmd.AbstractDevCmd;
-import engine.gameManager.ZoneManager;
-import engine.objects.AbstractGameObject;
-import engine.objects.PlayerCharacter;
-import engine.objects.Zone;
-
-import java.util.ArrayList;
-
-public class GetZoneCmd extends AbstractDevCmd {
-
-    public GetZoneCmd() {
-        super("getzone");
-    }
-
-    @Override
-    protected void _doCmd(PlayerCharacter pcSender, String[] words,
-                          AbstractGameObject target) {
-        if (pcSender == null)
-            return;
-
-        if (words.length != 1) {
-            this.sendUsage(pcSender);
-            return;
-        }
-
-        ArrayList<Zone> allIn = new ArrayList<>();
-        switch (words[0].toLowerCase()) {
-            case "all":
-                throwbackInfo(pcSender, "All zones currently in");
-                allIn = ZoneManager.getAllZonesIn(pcSender.getLoc());
-                break;
-            case "smallest":
-                throwbackInfo(pcSender, "Smallest zone currently in");
-                Zone zone = ZoneManager.findSmallestZone(pcSender.getLoc());
-                allIn.add(zone);
-                break;
-            default:
-                this.sendUsage(pcSender);
-                return;
-        }
-
-        for (Zone zone : allIn)
-            throwbackInfo(pcSender, zone.getName() + "; UUID: " + zone.getObjectUUID() + ", loadNum: " + zone.getLoadNum());
-    }
-
-    @Override
-    protected String _getUsageString() {
-        return "' /getzone smallest/all'";
-    }
-
-    @Override
-    protected String _getHelpString() {
-        return "lists what zones a player is in";
-    }
-
-}

src/engine/devcmd/cmds/GotoBoundsCmd.java

@@ -1,107 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2022
-//                www.magicbane.com
-
-
-package engine.devcmd.cmds;
-
-import engine.Enum.GameObjectType;
-import engine.devcmd.AbstractDevCmd;
-import engine.math.Vector3fImmutable;
-import engine.objects.AbstractGameObject;
-import engine.objects.Building;
-import engine.objects.PlayerCharacter;
-
-public class GotoBoundsCmd extends AbstractDevCmd {
-
-    public GotoBoundsCmd() {
-        super("gotobounds");
-    }
-
-    @Override
-    protected void _doCmd(PlayerCharacter player, String[] words,
-                          AbstractGameObject target) {
-
-        String corner = words[0];
-        Vector3fImmutable targetLoc = Vector3fImmutable.ZERO;
-
-        if (target == null || !target.getObjectType().equals(GameObjectType.Building)) {
-            this.throwbackError(player, "No Building Selected");
-            return;
-        }
-
-        Building building = (Building) target;
-
-        if (building.getBounds() == null) {
-            this.throwbackInfo(player, "No valid Bounds for building UUID " + building.getObjectUUID());
-            return;
-        }
-        float x = building.getBounds().getHalfExtents().x;
-        float z = building.getBounds().getHalfExtents().y;
-
-        if (building.getBlueprint() != null) {
-            x = building.getBlueprint().getExtents().x;
-            z = building.getBlueprint().getExtents().y;
-        }
-
-        float topLeftX = building.getLoc().x - x;
-        float topLeftY = building.getLoc().z - z;
-
-        float topRightX = building.getLoc().x + x;
-        float topRightY = building.getLoc().z - z;
-
-        float bottomLeftX = building.getLoc().x - x;
-        float bottomLeftY = building.getLoc().z + z;
-
-        float bottomRightX = building.getLoc().x + x;
-        float bottomRightY = building.getLoc().z + z;
-
-
-        switch (corner) {
-            case "topleft":
-                targetLoc = new Vector3fImmutable(topLeftX, 0, topLeftY);
-                break;
-            case "topright":
-                targetLoc = new Vector3fImmutable(topRightX, 0, topRightY);
-                break;
-            case "bottomleft":
-                targetLoc = new Vector3fImmutable(bottomLeftX, 0, bottomLeftY);
-                break;
-            case "bottomright":
-                targetLoc = new Vector3fImmutable(bottomRightX, 0, bottomRightY);
-                break;
-            default:
-                this.throwbackInfo(player, "wrong corner name. use topleft , topright , bottomleft , bottomright");
-                return;
-
-        }
-
-        targetLoc = Vector3fImmutable.transform(building.getLoc(), targetLoc, building.getBounds().getRotationDegrees());
-
-        // Teleport player
-
-        if (targetLoc == Vector3fImmutable.ZERO) {
-            this.throwbackError(player, "Failed to locate UUID");
-            return;
-        }
-
-        player.teleport(targetLoc);
-
-    }
-
-    @Override
-    protected String _getHelpString() {
-        return "Teleports player to a UUID";
-    }
-
-    @Override
-    protected String _getUsageString() {
-        return "' /gotoobj <UID>'";
-
-    }
-
-}

src/engine/devcmd/cmds/GotoCmd.java

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

src/engine/devcmd/cmds/HotzoneCmd.java

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

src/engine/devcmd/cmds/InfoCmd.java

@@ -253,9 +253,9 @@ public class InfoCmd extends AbstractDevCmd {
                 output += newline;
                 output += "InSession : " + SessionManager.getPlayerCharacterByID(target.getObjectUUID()) != null ? " true " : " false";
                 output += newline;
-                output += "RaceType: " + targetPC.getRace().getRaceType().name();
+                output += "RaceType: " + targetPC.race.getRaceType().name();
                 output += newline;
-                output += "Race: " + targetPC.getRace().getName();
+                output += "Race: " + targetPC.race.getName();
                 output += newline;
                 output += "Safe:" + targetPC.inSafeZone();
                 output += newline;
@@ -278,7 +278,7 @@ public class InfoCmd extends AbstractDevCmd {
                     output += "Account ID: UNKNOWN";
 
                 output += newline;
-                output += "Inventory Weight:" + (targetPC.getCharItemManager().getInventoryWeight() + targetPC.getCharItemManager().getEquipWeight());
+                output += "Inventory Weight:" + (targetPC.charItemManager.getInventoryWeight() + targetPC.charItemManager.getEquipWeight());
                 output += newline;
                 output += "Max Inventory Weight:" + ((int) targetPC.statStrBase * 3);
                 output += newline;
@@ -291,7 +291,7 @@ public class InfoCmd extends AbstractDevCmd {
                 output += "inFloor :" + targetPC.getInFloorID();
                 output += newline;
 
-                BaseClass baseClass = targetPC.getBaseClass();
+                BaseClass baseClass = targetPC.baseClass;
 
                 if (baseClass != null)
                     output += StringUtils.addWS("Class: " + baseClass.getName(), 20);
@@ -387,7 +387,7 @@ public class InfoCmd extends AbstractDevCmd {
                     output += newline;
                     output += "EquipSet: " + targetNPC.getEquipmentSetID();
                     output += newline;
-                    output += "Parent Zone LoadNum : " + targetNPC.getParentZone().getLoadNum();
+                    output += "Parent Zone LoadNum : " + targetNPC.getParentZone().templateID;
 
                 }
 
@@ -440,7 +440,9 @@ public class InfoCmd extends AbstractDevCmd {
                         output += "isSummonedPet: true";
                     else
                         output += "isSummonedPet: false";
-                    PlayerCharacter owner = targetMob.getOwner();
+
+
+                    PlayerCharacter owner = (PlayerCharacter) targetMob.guardCaptain;
                     if (owner != null)
                         output += "     owner: " + owner.getObjectUUID();
                     output += newline;
@@ -471,7 +473,7 @@ public class InfoCmd extends AbstractDevCmd {
                 output += "EquipSet: " + targetMob.equipmentSetID;
                 output += newline;
                 try {
-                    output += "Parent Zone LoadNum : " + targetMob.getParentZone().getLoadNum();
+                    output += "Parent Zone LoadNum : " + targetMob.getParentZone().templateID;
                 } catch (Exception ex) {
                     //who cares
                 }
@@ -492,28 +494,28 @@ public class InfoCmd extends AbstractDevCmd {
                     output += newline;
                     output += "No building found." + newline;
                 }
-                int max = (int)(4.882 * targetMob.level + 121.0);
-                if(max > 321){
+                int max = (int) (4.882 * targetMob.level + 121.0);
+                if (max > 321) {
                     max = 321;
                 }
-                int min = (int)(4.469 * targetMob.level - 3.469);
+                int min = (int) (4.469 * targetMob.level - 3.469);
                 output += "Min Loot Roll = " + min;
                 output += "Max Loot Roll = " + max;
                 break;
             case Item:  //intentional passthrough
             case MobLoot:
                 Item item = (Item) target;
-                ItemBase itemBase = item.getItemBase();
-                output += StringUtils.addWS("ItemBase: " + itemBase.getUUID(), 20);
-                output += "Weight: " + itemBase.getWeight();
+                ItemTemplate template = ItemTemplate.templates.get(item.templateID);
+                output += StringUtils.addWS("Template: " + template.template_id, 20);
+                output += "Weight: " + template.item_wt;
                 output += newline;
                 DecimalFormat df = new DecimalFormat("###,###,###,###,##0");
                 output += StringUtils.addWS("Qty: "
                         + df.format(item.getNumOfItems()), 20);
-                output += "Charges: " + item.getChargesRemaining()
-                        + '/' + item.getChargesMax();
+                output += "Charges: " + (byte) item.chargesRemaining
+                        + '/' + item.template.item_initial_charges;
                 output += newline;
-                output += "Name: " + itemBase.getName();
+                output += "Name: " + template.item_base_name;
                 output += newline;
                 output += item.getContainerInfo();
 

src/engine/devcmd/cmds/MakeBaneCmd.java

@@ -111,12 +111,12 @@ public class MakeBaneCmd extends AbstractDevCmd {
             return;
         }
 
-        if (!zone.isPlayerCity()) {
+        if (!zone.guild_zone) {
             throwbackError(pc, "This is not a player city.");
             return;
         }
 
-        City city = City.getCity(zone.getPlayerCityUUID());
+        City city = City.getCity(zone.playerCityUUID);
         if (city == null) {
             throwbackError(pc, "Unable to find the city associated with this zone.");
             return;
@@ -167,7 +167,7 @@ public class MakeBaneCmd extends AbstractDevCmd {
             return;
         }
         stone.addEffectBit((1 << 19));
-        stone.setRank((byte) rank);
+        BuildingManager.setRank(stone, (byte) rank);
         stone.setMaxHitPoints(blueprint.getMaxHealth(stone.getRank()));
         stone.setCurrentHitPoints(stone.getMaxHitPoints());
         BuildingManager.setUpgradeDateTime(stone, null, 0);

src/engine/devcmd/cmds/MakeItemCmd.java

@@ -9,7 +9,6 @@
 
 package engine.devcmd.cmds;
 
-import engine.Enum.ItemContainerType;
 import engine.Enum.ItemType;
 import engine.Enum.OwnerType;
 import engine.devcmd.AbstractDevCmd;
@@ -17,8 +16,6 @@ import engine.gameManager.DbManager;
 import engine.objects.*;
 import engine.powers.EffectsBase;
 
-import java.util.ArrayList;
-
 /**
  * @author Eighty
  */
@@ -32,48 +29,6 @@ public class MakeItemCmd extends AbstractDevCmd {
     protected void _doCmd(PlayerCharacter pc, String[] words,
                           AbstractGameObject target) {
 
-        if (words[0].equals("resources")) {
-            for (int ibID : Warehouse.getMaxResources().keySet()) {
-                if (ibID == 7)
-                    continue;
-
-                ItemBase ib = ItemBase.getItemBase(ibID);
-
-                short weight = ib.getWeight();
-                if (!pc.getCharItemManager().hasRoomInventory(weight)) {
-                    throwbackError(pc, "Not enough room in inventory for any more of this item");
-
-                    pc.getCharItemManager().updateInventory();
-                    return;
-                }
-
-                boolean worked = false;
-                Item item = new Item(ib, pc.getObjectUUID(),
-                        OwnerType.PlayerCharacter, (byte) 0, (byte) 0, (short) ib.getDurability(), (short) ib.getDurability(),
-                        true, false, ItemContainerType.INVENTORY, (byte) 0,
-                        new ArrayList<>(), "");
-
-                item.setNumOfItems(Warehouse.getMaxResources().get(ibID));
-
-                try {
-                    item = DbManager.ItemQueries.ADD_ITEM(item);
-                    worked = true;
-                } catch (Exception e) {
-                    throwbackError(pc, "DB error 1: Unable to create item. " + e.getMessage());
-                    return;
-                }
-
-                if (item == null || !worked) {
-                    throwbackError(pc, "DB error 2: Unable to create item.");
-                    return;
-                }
-
-
-                //add item to inventory
-                pc.getCharItemManager().addItemToInventory(item);
-            }
-            return;
-        }
         if (words.length < 3 || words.length > 5) {
             this.sendUsage(pc);
             return;
@@ -103,16 +58,23 @@ public class MakeItemCmd extends AbstractDevCmd {
             numItems = (numItems > 5000) ? 5000 : numItems;
         }
 
-        int itembaseID;
+        int templateID;
+        ItemTemplate template;
         try {
-            itembaseID = Integer.parseInt(words[0]);
-        } catch (NumberFormatException e) {
-            itembaseID = ItemBase.getIDByName(words[0].toLowerCase());
-            if (itembaseID == 0) {
+            templateID = Integer.parseInt(words[0]);
+            template = ItemTemplate.templates.get(words[0].toLowerCase());
+
+            if (template == null) {
                 throwbackError(pc, "Supplied type " + words[0]
                         + " failed to parse to an Integer");
                 return;
             }
+
+            if (template.item_type == ItemType.GOLD) {
+                this.throwbackInfo(pc, "use /addgold to add gold.");
+                return;
+            }
+
         } catch (Exception e) {
             throwbackError(pc,
                     "An unknown exception occurred when trying to use createitem command for type "
@@ -120,10 +82,6 @@ public class MakeItemCmd extends AbstractDevCmd {
             return; // NaN
         }
 
-        if (itembaseID == 7) {
-            this.throwbackInfo(pc, "use /addgold to add gold.");
-            return;
-        }
 
         String prefix = "";
         String suffix = "";
@@ -174,57 +132,54 @@ public class MakeItemCmd extends AbstractDevCmd {
                 return;
             }
         }
-        ItemBase ib = ItemBase.getItemBase(itembaseID);
-        if (ib == null) {
-            throwbackError(pc, "Unable to find itembase of ID " + itembaseID);
+        template = ItemTemplate.templates.get(templateID);
+
+        if (template == null) {
+            throwbackError(pc, "Unable to find template " + templateID);
             return;
         }
 
         if ((numItems > 1)
-                && (ib.getType().equals(ItemType.RESOURCE) == false)
-                && (ib.getType().equals(ItemType.OFFERING)) == false)
+                && (template.item_type.equals(ItemType.RESOURCE) == false)
+                && (template.item_type.equals(ItemType.OFFERING)) == false)
             numItems = 1;
 
-        CharacterItemManager cim = pc.getCharItemManager();
+        CharacterItemManager cim = pc.charItemManager;
+
         if (cim == null) {
             throwbackError(pc, "Unable to find the character item manager for player " + pc.getFirstName() + '.');
             return;
         }
 
-        byte charges = (byte) ib.getNumCharges();
-        short dur = (short) ib.getDurability();
-
         String result = "";
+
         for (int i = 0; i < quantity; i++) {
-            short weight = ib.getWeight();
+
+            int weight = template.item_wt;
+
             if (!cim.hasRoomInventory(weight)) {
                 throwbackError(pc, "Not enough room in inventory for any more of this item. " + i + " produced.");
+
                 if (i > 0)
                     cim.updateInventory();
+
                 return;
             }
 
-            boolean worked = false;
-            Item item = new Item(ib, pc.getObjectUUID(),
-                    OwnerType.PlayerCharacter, charges, charges, dur, dur,
-                    true, false, ItemContainerType.INVENTORY, (byte) 0,
-                    new ArrayList<>(), "");
+            Item item = new Item(templateID);
+            item.ownerID = pc.getObjectUUID();
+            item.ownerType = OwnerType.PlayerCharacter;
+
             if (numItems > 1)
                 item.setNumOfItems(numItems);
 
             try {
-                item = DbManager.ItemQueries.ADD_ITEM(item);
-                worked = true;
+                item = DbManager.ItemQueries.PERSIST(item);
             } catch (Exception e) {
                 throwbackError(pc, "DB error 1: Unable to create item. " + e.getMessage());
                 return;
             }
 
-            if (item == null || !worked) {
-                throwbackError(pc, "DB error 2: Unable to create item.");
-                return;
-            }
-
             //create prefix
             if (!prefix.isEmpty())
                 item.addPermanentEnchantmentForDev(prefix, 0);
@@ -243,12 +198,12 @@ public class MakeItemCmd extends AbstractDevCmd {
 
     @Override
     protected String _getHelpString() {
-        return "Creates an item of type 'itembaseID' with a prefix and suffix";
+        return "Creates an item of type templateID with a prefix and suffix";
     }
 
     @Override
     protected String _getUsageString() {
-        return "'./makeitem itembaseID PrefixID SuffixID [quantity] [numResources]'";
+        return "'./makeitem templateID PrefixID SuffixID [quantity] [numResources]'";
     }
 
 }

src/engine/devcmd/cmds/PrintBankCmd.java

@@ -47,13 +47,17 @@ public class PrintBankCmd extends AbstractDevCmd {
         }
 
 
-        CharacterItemManager cim = ((AbstractCharacter) tar).getCharItemManager();
+        CharacterItemManager cim = ((AbstractCharacter) tar).charItemManager;
         ArrayList<Item> list = cim.getBank();
         throwbackInfo(pc, "Bank for " + type + ' ' + name + " (" + tar.getObjectUUID() + ')');
+
         for (Item item : list) {
-            throwbackInfo(pc, "    " + item.getItemBase().getName() + ", count: " + item.getNumOfItems());
+            ItemTemplate template = ItemTemplate.templates.get(item.templateID);
+            throwbackInfo(pc, "    " + template.item_base_name + ", count: " + item.getNumOfItems());
         }
+
         Item gold = cim.getGoldBank();
+
         if (gold != null)
             throwbackInfo(pc, "    Gold, count: " + gold.getNumOfItems());
         else

src/engine/devcmd/cmds/PrintBonusesCmd.java

@@ -33,7 +33,8 @@ public class PrintBonusesCmd extends AbstractDevCmd {
             if (target instanceof Item) {
                 type = "Item";
                 tar = (Item) target;
-                name = ((Item) tar).getItemBase().getName();
+                ItemTemplate template = ItemTemplate.templates.get(((Item) tar).templateID);
+                name = template.item_base_name;
             } else if (target instanceof AbstractCharacter) {
                 tar = (AbstractCharacter) target;
                 name = ((AbstractCharacter) tar).getFirstName();

src/engine/devcmd/cmds/PrintEffectsCmd.java

@@ -9,46 +9,49 @@
 
 package engine.devcmd.cmds;
 
-import engine.Enum;
 import engine.devcmd.AbstractDevCmd;
-import engine.gameManager.DbManager;
+import engine.objects.AbstractCharacter;
 import engine.objects.AbstractGameObject;
 import engine.objects.PlayerCharacter;
 
 /**
  *
  */
-public class DecachePlayerCmd extends AbstractDevCmd {
 
-    public DecachePlayerCmd() {
-        super("decacheplayer");
+public class PrintEffectsCmd extends AbstractDevCmd {
+
+    public PrintEffectsCmd() {
+        super("printeffects");
+        //		super("printstats", MBServerStatics.ACCESS_LEVEL_ADMIN);
     }
 
     @Override
     protected void _doCmd(PlayerCharacter pc, String[] words,
                           AbstractGameObject target) {
-        if (words.length < 1) {
-            this.sendUsage(pc);
-        }
 
-        int objectUUID = Integer.parseInt(words[0]);
+        AbstractCharacter tar;
 
-        if (DbManager.inCache(Enum.GameObjectType.PlayerCharacter, objectUUID)) {
-            this.setTarget(PlayerCharacter.getFromCache(objectUUID)); //for logging
-            PlayerCharacter.getFromCache(objectUUID).removeFromCache();
-        } else {
-            this.sendHelp(pc);
+        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 "No player found. Please make sure the table ID is correct.";
+        return "Returns the player's current stats";
     }
 
     @Override
     protected String _getUsageString() {
-        return "' /decacheplayer <UUID>'";
+        return "' /printstats'";
     }
 
 }

src/engine/devcmd/cmds/PrintEquipCmd.java

@@ -9,6 +9,7 @@
 
 package engine.devcmd.cmds;
 
+import engine.Enum;
 import engine.Enum.GameObjectType;
 import engine.devcmd.AbstractDevCmd;
 import engine.objects.*;
@@ -63,9 +64,9 @@ public class PrintEquipCmd extends AbstractDevCmd {
         if (tar.getObjectType() == GameObjectType.Mob) {
             Mob tarMob = (Mob) tar;
             throwbackInfo(pc, "Equip for " + type + ' ' + name + " (" + tar.getObjectUUID() + ')');
-            for (int slot : tarMob.getEquip().keySet()) {
-                MobEquipment equip = tarMob.getEquip().get(slot);
-                throwbackInfo(pc, equip.getItemBase().getUUID() + "  :  " + equip.getItemBase().getName() + ", slot: " + slot);
+            for (Enum.EquipSlotType slot : tarMob.charItemManager.equipped.keySet()) {
+                Item equip = tarMob.charItemManager.equipped.get(slot);
+                throwbackInfo(pc, equip.templateID + "  :  " + equip.template.item_base_name + ", slot: " + slot);
             }
             return;
         }
@@ -73,19 +74,20 @@ public class PrintEquipCmd extends AbstractDevCmd {
         if (tar.getObjectType() == GameObjectType.NPC) {
             NPC tarMob = (NPC) tar;
             throwbackInfo(pc, "Equip for " + type + ' ' + name + " (" + tar.getObjectUUID() + ')');
-            for (int slot : tarMob.getEquip().keySet()) {
-                MobEquipment equip = tarMob.getEquip().get(slot);
-                throwbackInfo(pc, equip.getItemBase().getUUID() + "  :  " + equip.getItemBase().getName() + ", slot: " + slot);
+            for (Enum.EquipSlotType slot : tarMob.charItemManager.equipped.keySet()) {
+                Item equip = tarMob.charItemManager.equipped.get(slot);
+                throwbackInfo(pc, equip.templateID + "  :  " + equip.template.item_base_name + ", slot: " + slot);
             }
             return;
         }
 
-        CharacterItemManager cim = ((AbstractCharacter) tar).getCharItemManager();
-        ConcurrentHashMap<Integer, Item> list = cim.getEquipped();
+        CharacterItemManager cim = ((AbstractCharacter) tar).charItemManager;
+        ConcurrentHashMap<Enum.EquipSlotType, Item> list = cim.getEquipped();
         throwbackInfo(pc, "Equip for " + type + ' ' + name + " (" + tar.getObjectUUID() + ')');
-        for (Integer slot : list.keySet()) {
+
+        for (Enum.EquipSlotType slot : list.keySet()) {
             Item item = list.get(slot);
-            throwbackInfo(pc, "    " + item.getItemBase().getName() + ", slot: " + slot);
+            throwbackInfo(pc, "    " + item.template.item_base_name + ", slot: " + slot);
         }
     }
 

src/engine/devcmd/cmds/PrintInventoryCmd.java

@@ -60,7 +60,7 @@ public class PrintInventoryCmd extends AbstractDevCmd {
                 }
             }
 
-            CharacterItemManager cim = tar.getCharItemManager();
+            CharacterItemManager cim = tar.charItemManager;
             inventory = cim.getInventory();  //this list can contain gold when tar is a PC that is dead
             gold = cim.getGoldInventory();
             throwbackInfo(pc, " Weight : " + (cim.getInventoryWeight() + cim.getEquipWeight()));
@@ -75,14 +75,18 @@ public class PrintInventoryCmd extends AbstractDevCmd {
         int goldCount = 0;
 
         for (Item item : inventory) {
-            if (item.getItemBase().getType().equals(ItemType.GOLD) == false) {
+            ItemTemplate template = ItemTemplate.templates.get(item.templateID);
+
+            if (item.template.item_type.equals(ItemType.GOLD) == false) {
+
                 String chargeInfo = "";
-                byte chargeMax = item.getChargesMax();
+                int chargeMax = template.item_initial_charges;
+
                 if (chargeMax > 0) {
-                    byte charges = item.getChargesRemaining();
+                    int charges = item.chargesRemaining;
                     chargeInfo = " charges: " + charges + '/' + chargeMax;
                 }
-                throwbackInfo(pc, "    " + item.getItemBase().getName() + ", count: " + item.getNumOfItems() + chargeInfo);
+                throwbackInfo(pc, "    " + template.item_base_name + ", count: " + item.getNumOfItems() + chargeInfo);
             } else
                 goldCount += item.getNumOfItems();
         }

src/engine/devcmd/cmds/PrintRunesCmd.java

@@ -10,48 +10,49 @@
 package engine.devcmd.cmds;
 
 import engine.devcmd.AbstractDevCmd;
-import engine.gameManager.ChatManager;
+import engine.objects.AbstractCharacter;
 import engine.objects.AbstractGameObject;
+import engine.objects.CharacterRune;
 import engine.objects.PlayerCharacter;
 
-public class DebugMeleeSyncCmd extends AbstractDevCmd {
+/**
+ *
+ */
 
-    public DebugMeleeSyncCmd() {
-        super("debugmeleesync");
+public class PrintRunesCmd extends AbstractDevCmd {
+
+    public PrintRunesCmd() {
+        super("printrunes");
+        //		super("printstats", MBServerStatics.ACCESS_LEVEL_ADMIN);
     }
 
     @Override
     protected void _doCmd(PlayerCharacter pc, String[] words,
                           AbstractGameObject target) {
-        // Arg Count Check
-        if (words.length != 1) {
-            this.sendUsage(pc);
-            return;
-        }
 
-        String s = words[0].toLowerCase();
+        AbstractCharacter tar;
 
-        if (s.equals("on")) {
-            pc.setDebug(64, true);
-            ChatManager.chatSayInfo(pc, "Melee Sync Debug ON");
-        } else if (s.equals("off")) {
-            pc.setDebug(64, false);
-            ChatManager.chatSayInfo(pc, "Melee Sync Debug OFF");
-        } else {
-            this.sendUsage(pc);
+        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 "Turns on/off melee sync debugging.";
-
+        return "Returns the player's current stats";
     }
 
     @Override
     protected String _getUsageString() {
-        return "'./debugmeleesync on|off'";
-
+        return "' /printstats'";
     }
 
 }

src/engine/devcmd/cmds/PrintStatsCmd.java

@@ -9,11 +9,10 @@
 
 package engine.devcmd.cmds;
 
+import engine.Enum;
 import engine.devcmd.AbstractDevCmd;
 import engine.objects.*;
 
-import java.util.HashMap;
-
 /**
  *
  */
@@ -22,17 +21,6 @@ public class PrintStatsCmd extends AbstractDevCmd {
 
     public PrintStatsCmd() {
         super("printstats");
-        //		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
@@ -76,11 +64,12 @@ public class PrintStatsCmd extends AbstractDevCmd {
     }
 
     public void printStatsMob(PlayerCharacter pc, Mob tar) {
+
         MobBase mb = tar.getMobBase();
+
         if (mb == null)
             return;
 
-
         String newline = "\r\n ";
         String out = "Server stats for Mob " + mb.getFirstName() + newline;
         out += "Stats Base (Modified)" + newline;
@@ -96,23 +85,21 @@ public class PrintStatsCmd extends AbstractDevCmd {
         out += "Defense: " + tar.getDefenseRating() + newline;
 
         //get weapons
-        HashMap<Integer, MobEquipment> equip = tar.getEquip();
-        ItemBase main = null;
 
-        if (equip != null)
-            main = getWeaponBase(1, equip);
-        ItemBase off = null;
+        if (tar.charItemManager.equipped.isEmpty() == false)
+            if (tar.charItemManager.equipped.get(Enum.EquipSlotType.LHELD) != null && !ItemTemplate.isShield(tar.charItemManager.equipped.get(Enum.EquipSlotType.LHELD))) {
+                //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;
+            }
 
-        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;
-        }
         out += "isAlive: " + tar.isAlive() + ", Combat: " + tar.isCombat() + newline;
 
         throwbackInfo(pc, out);

src/engine/devcmd/cmds/PrintVaultCmd.java

@@ -46,11 +46,12 @@ public class PrintVaultCmd extends AbstractDevCmd {
         }
 
 
-        CharacterItemManager cim = ((AbstractCharacter) tar).getCharItemManager();
+        CharacterItemManager cim = ((AbstractCharacter) tar).charItemManager;
         ArrayList<Item> list = cim.getVault();
         throwbackInfo(pc, "Vault for " + type + ' ' + name + " (" + tar.getObjectUUID() + ')');
         for (Item item : list) {
-            throwbackInfo(pc, "    " + item.getItemBase().getName() + ", count: " + item.getNumOfItems());
+            ItemTemplate template = ItemTemplate.templates.get(item.templateID);
+            throwbackInfo(pc, "    " + template.item_base_name + ", count: " + item.getNumOfItems());
         }
         Item gold = cim.getGoldVault();
         if (gold != null)

src/engine/devcmd/cmds/PurgeObjectsCmd.java

@@ -42,7 +42,7 @@ public class PurgeObjectsCmd extends AbstractDevCmd {
 
     private static void PurgeWalls(Zone zone, PlayerCharacter pc) {
 
-        if (!zone.isPlayerCity())
+        if (!zone.guild_zone)
             return;
 
         for (Building building : zone.zoneBuildingSet) {
@@ -59,22 +59,25 @@ public class PurgeObjectsCmd extends AbstractDevCmd {
 
 
                 if (npc != null) {
-                    for (Mob mob : npc.getSiegeMinionMap().keySet()) {
+                    for (Integer minionUUID : npc.minions) {
+                        Mob mob = Mob.getMob(minionUUID);
                         WorldGrid.RemoveWorldObject(mob);
                         WorldGrid.removeObject(mob, pc);
-                        //Mob.getRespawnMap().remove(mob);
+
                         if (mob.getParentZone() != null)
                             mob.getParentZone().zoneMobSet.remove(mob);
                     }
+
                     DbManager.NPCQueries.DELETE_NPC(npc);
                     DbManager.removeFromCache(GameObjectType.NPC,
                             npc.getObjectUUID());
                     WorldGrid.RemoveWorldObject(npc);
                 } else if (mobA != null) {
-                    for (Mob mob : mobA.getSiegeMinionMap().keySet()) {
+                    for (Integer minionUUID : mobA.minions) {
+                        Mob mob = Mob.getMob(minionUUID);
                         WorldGrid.RemoveWorldObject(mob);
                         WorldGrid.removeObject(mob, pc);
-                        //Mob.getRespawnMap().remove(mob);
+
                         if (mob.getParentZone() != null)
                             mob.getParentZone().zoneMobSet.remove(mob);
                     }
@@ -151,10 +154,11 @@ public class PurgeObjectsCmd extends AbstractDevCmd {
 
 
             if (npc != null) {
-                for (Mob mob : npc.getSiegeMinionMap().keySet()) {
+                for (Integer minionUUID : npc.minions) {
+                    Mob mob = Mob.getMob(minionUUID);
                     WorldGrid.RemoveWorldObject(mob);
                     WorldGrid.removeObject(mob, pc);
-                    //Mob.getRespawnMap().remove(mob);
+
                     if (mob.getParentZone() != null)
                         mob.getParentZone().zoneMobSet.remove(mob);
                 }
@@ -163,10 +167,11 @@ public class PurgeObjectsCmd extends AbstractDevCmd {
                         npc.getObjectUUID());
                 WorldGrid.RemoveWorldObject(npc);
             } else if (mobA != null) {
-                for (Mob mob : mobA.getSiegeMinionMap().keySet()) {
+                for (Integer minionUUID : mobA.minions) {
+                    Mob mob = Mob.getMob(minionUUID);
                     WorldGrid.RemoveWorldObject(mob);
                     WorldGrid.removeObject(mob, pc);
-                    //Mob.getRespawnMap().remove(mob);
+
                     if (mob.getParentZone() != null)
                         mob.getParentZone().zoneMobSet.remove(mob);
                 }

src/engine/devcmd/cmds/RealmInfoCmd.java

@@ -60,12 +60,12 @@ public class RealmInfoCmd extends AbstractDevCmd {
         outString += ")";
         outString += newline;
 
-        outString += " Zone: " + serverZone.getName();
+        outString += " Zone: " + serverZone.zoneName;
 
         outString += newline;
 
-        if (serverZone.getParent() != null)
-            outString += " Parent: " + serverZone.getParent().getName();
+        if (serverZone.parent != null)
+            outString += " Parent: " + serverZone.parent.zoneName;
         else
             outString += "Parent: NONE";
 

src/engine/devcmd/cmds/RegionCmd.java

@@ -10,10 +10,8 @@
 package engine.devcmd.cmds;
 
 import engine.devcmd.AbstractDevCmd;
-import engine.objects.AbstractGameObject;
-import engine.objects.PlayerCharacter;
-
-import java.lang.reflect.Field;
+import engine.gameManager.BuildingManager;
+import engine.objects.*;
 
 public class RegionCmd extends AbstractDevCmd {
 
@@ -25,42 +23,28 @@ public class RegionCmd extends AbstractDevCmd {
     protected void _doCmd(PlayerCharacter pc, String[] words,
                           AbstractGameObject target) {
 
+        String newline = "\r\n ";
+        String output;
+        output = "Target Region Information:" + newline;
 
-        if (pc.region == null) {
+        Building building = BuildingManager.getBuildingAtLocation(((AbstractCharacter) target).loc);
+        if (building == null) {
+            this.throwbackInfo(pc, "No Building At This Location.");
+        }
+        Regions region = ((AbstractCharacter) target).region;
+        if (region == null) {
             this.throwbackInfo(pc, "No Region Found.");
             return;
         }
 
-
-        String newLine = System.getProperty("line.separator");
-        String result = "";
-        result += (pc.region.getClass().getSimpleName());
-        result += (" {");
-        result += (newLine);
-        Field[] fields = pc.region.getClass().getDeclaredFields();
-
-        //print field names paired with their values
-        for (Field field : fields) {
-            field.setAccessible(true);
-            result += (" ");
-            try {
-
-                if (field.getName().contains("Furniture"))
-                    continue;
-                result += (field.getName());
-                result += (": ");
-                //requires access to private field:
-                result += (field.get(pc.region).toString());
-            } catch (IllegalAccessException ex) {
-                System.out.println(ex);
-            }
-            result.trim();
-            result += (newLine);
+        if (region != null) {
+            output += "Player Info: " + ((AbstractCharacter) target).getName() + newline;
+            output += "Region Building: " + building.getName() + newline;
+            output += "Region Height: " + region.lerpY((AbstractCharacter) target) + newline;
+            output += "is Stairs: " + region.isStairs() + newline;
+            output += "is Outside: " + region.isOutside();
+            this.throwbackInfo(pc, output);
         }
-        result += ("}");
-
-        this.throwbackInfo(pc, result.toString());
-
 
     }
 

src/engine/devcmd/cmds/RemoveBaneCmd.java

@@ -34,12 +34,12 @@ public class RemoveBaneCmd extends AbstractDevCmd {
             return;
         }
 
-        if (!zone.isPlayerCity()) {
+        if (!zone.guild_zone) {
             throwbackError(pc, "This is not a player city.");
             return;
         }
 
-        City city = City.getCity(zone.getPlayerCityUUID());
+        City city = City.getCity(zone.playerCityUUID);
         if (city == null) {
             throwbackError(pc, "Unable to find the city associated with this zone.");
             return;

src/engine/devcmd/cmds/RemoveObjectCmd.java

@@ -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;
@@ -131,56 +130,23 @@ public class RemoveObjectCmd extends AbstractDevCmd {
             building.disableSpire(false);
 
         if ((building.getBlueprint() != null) && (building.getBlueprint().getBuildingGroup() == BuildingGroup.WAREHOUSE)) {
-            City city = City.getCity(building.getParentZone().getPlayerCityUUID());
-            if (city != null) {
-                city.setWarehouseBuildingID(0);
-            }
-            Warehouse.warehouseByBuildingUUID.remove(building.getObjectUUID());
-        }
+            City city = City.getCity(building.getParentZone().playerCityUUID);
 
+            DbManager.WarehouseQueries.DELETE_WAREHOUSE(city.warehouse);
+            city.warehouse = null;
+
+        }
 
         //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);

src/engine/devcmd/cmds/ResetLevelCmd.java

@@ -1,35 +0,0 @@
-package engine.devcmd.cmds;
-
-import engine.devcmd.AbstractDevCmd;
-import engine.objects.AbstractGameObject;
-import engine.objects.PlayerCharacter;
-
-public class ResetLevelCmd extends AbstractDevCmd {
-
-    public ResetLevelCmd() {
-        super("resetlevel");
-    }
-
-    // AbstractDevCmd Overridden methods
-
-    @Override
-    protected void _doCmd(PlayerCharacter player, String[] args,
-                          AbstractGameObject target) {
-
-        player.ResetLevel(Short.parseShort(args[0]));
-    }
-
-    @Override
-    protected String _getHelpString() {
-        return "Resets character level to `level`. All training points are reset. Player must relog for changes to update.";
-    }
-
-    @Override
-    protected String _getUsageString() {
-
-
-        return "/resetlevel <level>";
-    }
-
-
-}

src/engine/devcmd/cmds/SetBaneActiveCmd.java

@@ -41,12 +41,12 @@ public class SetBaneActiveCmd extends AbstractDevCmd {
             return;
         }
 
-        if (!zone.isPlayerCity()) {
+        if (!zone.guild_zone) {
             throwbackError(pc, "This is not a player city.");
             return;
         }
 
-        City city = City.getCity(zone.getPlayerCityUUID());
+        City city = City.getCity(zone.playerCityUUID);
         if (city == null) {
             throwbackError(pc, "Unable to find the city associated with this zone.");
             return;

src/engine/devcmd/cmds/SetForceRenameCityCmd.java

@@ -31,9 +31,9 @@ public class SetForceRenameCityCmd extends AbstractDevCmd {
         if (zone == null)
             return;
         boolean rename = words[0].equalsIgnoreCase("true") ? true : false;
-        if (zone.getPlayerCityUUID() == 0)
+        if (zone.playerCityUUID == 0)
             return;
-        City city = City.getCity(zone.getPlayerCityUUID());
+        City city = City.getCity(zone.playerCityUUID);
         if (city == null)
             return;
         city.setForceRename(rename);

src/engine/devcmd/cmds/SetMaintCmd.java

@@ -1,60 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2022
-//                www.magicbane.com
-
-
-package engine.devcmd.cmds;
-
-import engine.Enum;
-import engine.devcmd.AbstractDevCmd;
-import engine.gameManager.ChatManager;
-import engine.gameManager.MaintenanceManager;
-import engine.objects.AbstractGameObject;
-import engine.objects.Building;
-import engine.objects.PlayerCharacter;
-
-import java.time.LocalDateTime;
-
-public class SetMaintCmd extends AbstractDevCmd {
-
-    public SetMaintCmd() {
-        super("setMaint");
-        this.addCmdString("setmaint");
-    }
-
-    @Override
-    protected void _doCmd(PlayerCharacter player, String[] words,
-                          AbstractGameObject target) {
-
-        if (!target.getObjectType().equals(Enum.GameObjectType.Building)) {
-            ChatManager.chatSayInfo(player, "Target is not a valid building");
-            return;
-        }
-
-        Building targetBuilding = (Building) target;
-
-        if (targetBuilding.getProtectionState().equals(Enum.ProtectionState.NPC)) {
-            ChatManager.chatSayInfo(player, "Target is not a valid building");
-            return;
-        }
-
-        MaintenanceManager.setMaintDateTime(targetBuilding, LocalDateTime.now().minusDays(1).withHour(13).withMinute(0).withSecond(0).withNano(0));
-        ChatManager.chatSayInfo(player, "Maint will run for UUID: " + targetBuilding.getObjectUUID());
-    }
-
-
-    @Override
-    protected String _getHelpString() {
-        return "Sets the Rank of either the targets object or the object specified by ID.";
-    }
-
-    @Override
-    protected String _getUsageString() {
-        return "' /setrank ID rank' || ' /setrank rank' || ' /rank ID rank' || ' /rank rank'";
-    }
-
-}

src/engine/devcmd/cmds/SetMineExpansion.java

@@ -1,80 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2022
-//                www.magicbane.com
-
-
-package engine.devcmd.cmds;
-
-
-import engine.Enum.GameObjectType;
-import engine.devcmd.AbstractDevCmd;
-import engine.gameManager.BuildingManager;
-import engine.gameManager.ChatManager;
-import engine.gameManager.DbManager;
-import engine.objects.AbstractGameObject;
-import engine.objects.Building;
-import engine.objects.Mine;
-import engine.objects.PlayerCharacter;
-
-/**
- * @author Eighty
- */
-public class SetMineExpansion extends AbstractDevCmd {
-
-    public SetMineExpansion() {
-        super("setexpansion");
-        this.addCmdString("setexpansion");
-    }
-
-    @Override
-    protected void _doCmd(PlayerCharacter pcSender, String[] args,
-                          AbstractGameObject target) {
-
-
-        if (target.getObjectType() != GameObjectType.Building)
-            return;
-        Building mineBuilding = BuildingManager.getBuilding(target.getObjectUUID());
-        if (mineBuilding == null)
-            return;
-        Mine mine = Mine.getMineFromTower(mineBuilding.getObjectUUID());
-        if (mine == null)
-            return;
-        int bit = 2;
-        switch (args[0].toUpperCase()) {
-            case "ON":
-
-                bit |= mine.getFlags();
-                if (!DbManager.MineQueries.SET_FLAGS(mine, bit))
-                    return;
-                mine.setFlags(bit);
-                ChatManager.chatSystemInfo(pcSender, mine.getZoneName() + "'s " + mine.getMineType().name + " is now an expansion mine.");
-                break;
-
-            case "OFF":
-                bit &= ~mine.getFlags();
-                if (!DbManager.MineQueries.SET_FLAGS(mine, bit))
-                    return;
-                mine.setFlags(bit);
-                ChatManager.chatSystemInfo(pcSender, mine.getZoneName() + "'s " + mine.getMineType().name + " is no longer an expansion mine.");
-                break;
-
-        }
-
-
-    }
-
-    @Override
-    protected String _getUsageString() {
-        return "' /setmineexpansion on|off";
-    }
-
-    @Override
-    protected String _getHelpString() {
-        return "enables or disables an expansion type for a mine.";
-    }
-
-}

src/engine/devcmd/cmds/SetMineTypeCmd.java

@@ -1,62 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2022
-//                www.magicbane.com
-
-
-package engine.devcmd.cmds;
-
-
-import engine.Enum.GameObjectType;
-import engine.devcmd.AbstractDevCmd;
-import engine.gameManager.BuildingManager;
-import engine.gameManager.ChatManager;
-import engine.gameManager.DbManager;
-import engine.objects.*;
-
-/**
- * @author Eighty
- */
-public class SetMineTypeCmd extends AbstractDevCmd {
-
-    public SetMineTypeCmd() {
-        super("setminetype");
-        this.addCmdString("setminetype");
-    }
-
-    @Override
-    protected void _doCmd(PlayerCharacter pcSender, String[] args,
-                          AbstractGameObject target) {
-
-        MineProduction mineType = MineProduction.valueOf(args[0].toUpperCase());
-        if (mineType == null)
-            return;
-
-        if (target.getObjectType() != GameObjectType.Building)
-            return;
-        Building mineBuilding = BuildingManager.getBuilding(target.getObjectUUID());
-        if (mineBuilding == null)
-            return;
-        Mine mine = Mine.getMineFromTower(mineBuilding.getObjectUUID());
-        if (mine == null)
-            return;
-        if (!DbManager.MineQueries.CHANGE_TYPE(mine, mineType))
-            return;
-        mine.setMineType(mineType.name());
-        ChatManager.chatSystemInfo(pcSender, "The mine in " + mine.getZoneName() + " is now a(n) " + mine.getMineType().name);
-    }
-
-    @Override
-    protected String _getUsageString() {
-        return "' /setminetype gold|ore|magic|lumber";
-    }
-
-    @Override
-    protected String _getHelpString() {
-        return "Changes the mine type of the current mine.";
-    }
-
-}

src/engine/devcmd/cmds/SetNpcEquipSetCmd.java

@@ -1,136 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2022
-//                www.magicbane.com
-
-
-package engine.devcmd.cmds;
-
-import engine.Enum.GameObjectType;
-import engine.InterestManagement.WorldGrid;
-import engine.devcmd.AbstractDevCmd;
-import engine.objects.AbstractGameObject;
-import engine.objects.MobBase;
-import engine.objects.NPC;
-import engine.objects.PlayerCharacter;
-
-public class SetNpcEquipSetCmd extends AbstractDevCmd {
-
-    public static int lastEquipSetID = 0;
-
-    public SetNpcEquipSetCmd() {
-        super("setEquipSet");
-        this.addCmdString("equipset");
-    }
-
-    @Override
-    protected void _doCmd(PlayerCharacter pc, String[] words,
-                          AbstractGameObject target) {
-        // Arg Count Check
-        if (words.length != 1) {
-            this.sendUsage(pc);
-            return;
-        }
-
-        if (target.getObjectType() != GameObjectType.NPC) {
-            this.sendUsage(pc);
-            return;
-        }
-
-        NPC npc = (NPC) target;
-
-        if (words[0].equalsIgnoreCase("next")) {
-
-            if (SetNpcEquipSetCmd.lastEquipSetID >= 1222)
-                SetNpcEquipSetCmd.lastEquipSetID = 1;
-            else
-                SetNpcEquipSetCmd.lastEquipSetID++;
-
-            boolean complete = false;
-
-            while (complete == false) {
-                complete = NPC.UpdateEquipSetID(npc, SetNpcEquipSetCmd.lastEquipSetID);
-
-                if (!complete) {
-                    SetNpcEquipSetCmd.lastEquipSetID++;
-                    if (SetNpcEquipSetCmd.lastEquipSetID >= 1222)
-                        SetNpcEquipSetCmd.lastEquipSetID = 1;
-                }
-            }
-
-            if (complete) {
-                npc.equip = MobBase.loadEquipmentSet(npc.getEquipmentSetID());
-                WorldGrid.updateObject(npc);
-                this.throwbackInfo(pc, "Equipment Set Changed to " + SetNpcEquipSetCmd.lastEquipSetID);
-            }
-
-
-            return;
-        }
-
-        if (words[0].equalsIgnoreCase("last")) {
-
-            if (SetNpcEquipSetCmd.lastEquipSetID <= 1)
-                SetNpcEquipSetCmd.lastEquipSetID = 1222;
-            else
-                SetNpcEquipSetCmd.lastEquipSetID--;
-
-            boolean complete = false;
-
-            while (complete == false) {
-                complete = NPC.UpdateEquipSetID(npc, SetNpcEquipSetCmd.lastEquipSetID);
-
-                if (!complete) {
-                    SetNpcEquipSetCmd.lastEquipSetID--;
-                    if (SetNpcEquipSetCmd.lastEquipSetID <= 1)
-                        SetNpcEquipSetCmd.lastEquipSetID = 1222;
-                }
-
-            }
-
-            if (complete) {
-                this.throwbackInfo(pc, "Equipment Set Changed to " + SetNpcEquipSetCmd.lastEquipSetID);
-                npc.equip = MobBase.loadEquipmentSet(npc.getEquipmentSetID());
-                WorldGrid.updateObject(npc);
-            }
-
-
-            return;
-        }
-
-        int equipSetID = 0;
-
-        try {
-            equipSetID = Integer.parseInt(words[0]);
-        } catch (Exception e) {
-            this.throwbackError(pc, e.getMessage());
-        }
-
-        if (!NPC.UpdateEquipSetID(npc, equipSetID)) {
-            this.throwbackError(pc, "Unable to find Equipset for ID " + equipSetID);
-            return;
-        }
-
-        SetNpcEquipSetCmd.lastEquipSetID = equipSetID;
-        npc.equip = MobBase.loadEquipmentSet(npc.getEquipmentSetID());
-        WorldGrid.updateObject(npc);
-
-        this.throwbackInfo(pc, "Equipment Set Changed to " + equipSetID);
-
-
-    }
-
-    @Override
-    protected String _getHelpString() {
-        return "Sets slot position for an NPC to 'slot'";
-    }
-
-    @Override
-    protected String _getUsageString() {
-        return "' /changeslot slot'";
-    }
-
-}

src/engine/devcmd/cmds/SetNpcMobbaseCmd.java

@@ -1,66 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2022
-//                www.magicbane.com
-
-
-package engine.devcmd.cmds;
-
-import engine.Enum.GameObjectType;
-import engine.InterestManagement.WorldGrid;
-import engine.devcmd.AbstractDevCmd;
-import engine.objects.AbstractGameObject;
-import engine.objects.MobBase;
-import engine.objects.NPC;
-import engine.objects.PlayerCharacter;
-
-public class SetNpcMobbaseCmd extends AbstractDevCmd {
-
-    public SetNpcMobbaseCmd() {
-        super("setmobbase");
-        this.addCmdString("npcmobbase");
-    }
-
-    @Override
-    protected void _doCmd(PlayerCharacter player, String[] words,
-                          AbstractGameObject target) {
-
-        // Arg Count Check
-        if (words.length != 1) {
-            this.sendUsage(player);
-            return;
-        }
-
-        if (target.getObjectType() != GameObjectType.NPC) {
-            this.sendUsage(player);
-            return;
-        }
-
-        NPC npc = (NPC) target;
-
-        int mobBaseID = Integer.parseInt(words[0]);
-
-        if (MobBase.getMobBase(mobBaseID) == null) {
-            this.throwbackError(player, "Cannot find Mobbase for ID " + mobBaseID);
-            return;
-        }
-        NPC.UpdateRaceID(npc, mobBaseID);
-
-        WorldGrid.updateObject(npc);
-
-    }
-
-    @Override
-    protected String _getHelpString() {
-        return "Sets mobbase override for an NPC";
-    }
-
-    @Override
-    protected String _getUsageString() {
-        return "' /setmobbase mobBaseID'";
-    }
-
-}

src/engine/devcmd/cmds/SetRankCmd.java

@@ -57,7 +57,7 @@ public class SetRankCmd extends AbstractDevCmd {
                     Blueprint blueprint = targetBuilding.getBlueprint();
 
                     if (blueprint == null) {
-                        targetBuilding.setRank(targetRank);
+                        BuildingManager.setRank(targetBuilding, targetRank);
                         ChatManager.chatSayInfo(player, "Building ranked without blueprint" + targetBuilding.getObjectUUID());
                         return;
                     }
@@ -68,9 +68,8 @@ public class SetRankCmd extends AbstractDevCmd {
                     }
 
                     // Set the current targetRank
-                    int lastMeshID = targetBuilding.getMeshUUID();
-                    targetBuilding.setRank(targetRank);
 
+                    BuildingManager.setRank(targetBuilding, targetRank);
                     ChatManager.chatSayInfo(player, "Rank set for building with ID " + targetBuilding.getObjectUUID() + " to rank " + targetRank);
                     break;
                 case NPC:
@@ -114,7 +113,7 @@ public class SetRankCmd extends AbstractDevCmd {
 
             // Set the current targetRank
             int lastMeshID = targetBuilding.getMeshUUID();
-            targetBuilding.setRank(targetRank);
+            BuildingManager.setRank(targetBuilding, targetRank);
 
             if (lastMeshID != targetBuilding.getMeshUUID())
                 targetBuilding.refresh(true);

src/engine/devcmd/cmds/SetSubRaceCmd.java

@@ -67,119 +67,6 @@ public class SetSubRaceCmd extends AbstractDevCmd {
         building.removeAllVisualEffects();
         building.addEffectBit(1 << Integer.parseInt(words[0]));
         building.updateEffects();
-        //63535 38751
-        //		Zone zone = ZoneManager.findSmallestZone(pc.getLoc());
-        //		//CityZoneMsg czm = new CityZoneMsg(3, zone.getLoc().x, zone.getLoc().y, zone.getLoc().z, "balls", zone, 0, 0);
-        //		pc.getClientConnection().sendMsg(new DeleteItemMsg(zone.getObjectType().ordinal(), zone.getObjectUUID()));
-
-        //		UpdateInventoryMsg updateInventoryMsg = new UpdateInventoryMsg(new ArrayList<>(), new ArrayList<>(), null, true);
-        //		pc.getClientConnection().sendMsg(updateInventoryMsg);
-
-        //pc.getCharItemManager().updateInventory();
-
-
-        //		Mob mob = (Mob)target;
-        //
-        //		if (mob == null)
-        //			return;
-        //
-        //		MobLoot mobLoot = new MobLoot(mob, ItemBase.getItemBase(Integer.parseInt(words[0])), false);
-        //
-        //		mob.getCharItemManager().addItemToInventory(mobLoot);
-
-
-        //		if (target.getObjectType() != GameObjectType.Building)
-        //			return;
-        //
-        //		Building warehouseBuilding = (Building)target;
-        //
-        //		if (Warehouse.warehouseByBuildingUUID.get(warehouseBuilding.getObjectUUID()) == null)
-        //			return;
-        //
-        //		Warehouse warehouse = Warehouse.warehouseByBuildingUUID.get(warehouseBuilding.getObjectUUID());
-        //
-        //		for (int ibID: Warehouse.getMaxResources().keySet()){
-        //			ItemBase ib = ItemBase.getItemBase(ibID);
-        //			warehouse.depositFromMine(null, ib, Warehouse.getMaxResources().get(ibID));
-        //		}
-
-
-        //		int raceID = Integer.parseInt(words[0]);
-        //
-        //		UpdateCharOrMobMessage ucm = new UpdateCharOrMobMessage(pc, raceID);
-        //
-        //		pc.getClientConnection().sendMsg(ucm);
-
-        //		LoadCharacterMsg lcm = new LoadCharacterMsg((AbstractCharacter)null,false);
-        //		try {
-        //			DispatchMessage.sendToAllInRange(pc, lcm);
-        //		} catch (MsgSendException e) {
-        //			// TODO Auto-generated catch block
-        //			e.printStackTrace();
-        //		}
-        //		ModifyHealthMsg mhm =new ModifyHealthMsg(pc, pc, -50f, 0f, 0f, 0, null, 9999, 0);
-        //		mhm.setOmitFromChat(1);
-        //		pc.getClientConnection().sendMsg(mhm);
-        //
-        //		int temp = 0;
-        //		boolean start = false;
-        //
-        //		for (EffectsBase eb: EffectsBase.getAllEffectsBase()){
-        //
-        //
-        //
-        //			if (!pc.getClientConnection().isConnected()){
-        //				Logger.info("", "PLAYER DC!" + eb.getIDString());
-        //				break;
-        //			}
-        //
-        //			eb = PowersManager.getEffectByIDString("WLR-018A");
-        //
-        //
-        //			NoTimeJob ntj = new NoTimeJob(pc, "NONE", eb, 40);
-        //			pc.addEffect(String.valueOf(eb.getUUID()), 1000, ntj, eb, 40);
-        //			eb.sendEffectNoPower(ntj, 1000, pc.getClientConnection());
-        //
-        //			ThreadUtils.sleep(500);
-        //			pc.clearEffects();
-        //
-        //			//WorldServer.updateObject((AbstractWorldObject)target, pc);
-        //			this.throwbackInfo(pc, eb.getIDString());
-        //			break;
-        //			//ThreadUtils.sleep(500);
-        //
-        //		}
-
-
-        //		for (EffectsBase eb : EffectsBase.getAllEffectsBase()){
-        //			if (eb.getToken() == 0)
-        //				continue;
-        //			int token = eb.getToken();
-        //			ApplyEffectMsg pum = new ApplyEffectMsg();
-        //			pum.setEffectID(token);
-        //			pum.setSourceType(pc.getObjectType().ordinal());
-        //			pum.setSourceID(pc.getObjectUUID());
-        //			pum.setTargetType(pc.getObjectType().ordinal());
-        //			pum.setTargetID(pc.getObjectUUID());
-        //			pum.setNumTrains(40);
-        //			pum.setDuration(-1);
-        ////			pum.setDuration((pb.isChant()) ? (int)pb.getChantDuration() : ab.getDurationInSeconds(trains));
-        //			pum.setPowerUsedID(0);
-        //		//	pum.setPowerUsedName("Inflict Poison");
-        //			this.throwbackInfo(pc, eb.getName() + "Token = " + eb.getToken());
-        //			pc.getClientConnection().sendMsg(pum);
-        //			ThreadUtils.sleep(200);
-        //		}
-        //
-
-        //		 UpdateObjectMsg uom = new UpdateObjectMsg(pc, 4);
-        //         try {
-        //             Location.sendToAllInRange(pc, uom);
-        //         } catch (MsgSendException e) {
-        //             // TODO Auto-generated catch block
-        //             e.printStackTrace();
-        //         }
-
 
     }
 

src/engine/devcmd/cmds/SimulateBootyCmd.java

@@ -33,10 +33,11 @@ public class SimulateBootyCmd extends AbstractDevCmd {
 
         if (mob.bootySet != 0) {
             for (BootySetEntry entry : LootManager._bootySetMap.get(mob.bootySet)) {
-                ItemBase item = ItemBase.getItemBase(entry.itemBase);
-                if (item != null) {
-                    output += "[" + entry.bootyType + "] " + item.getName() + " [Chance] " + entry.dropChance + newline;
-                }
+
+                ItemTemplate template = ItemTemplate.templates.get(entry.templateID);
+
+                if (template != null)
+                    output += "[" + entry.bootyType + "] " + template.item_base_name + " [Chance] " + entry.dropChance + newline;
             }
         }
 
@@ -55,9 +56,9 @@ public class SimulateBootyCmd extends AbstractDevCmd {
 
             try {
                 mob.loadInventory();
-                for (Item lootItem : mob.getCharItemManager().getInventory()) {
-                    switch (lootItem.getItemBase().getType()) {
-                        case CONTRACT: //CONTRACT
+                for (Item lootItem : mob.charItemManager.getInventory()) {
+                    switch (lootItem.template.item_type) {
+                        case EMPLOYMENTCONTRACT: //CONTRACT
                             Contracts.add(lootItem);
                             break;
                         case OFFERING: //OFFERING
@@ -70,7 +71,7 @@ public class SimulateBootyCmd extends AbstractDevCmd {
                             Runes.add(lootItem);
                             break;
                         case WEAPON: //WEAPON
-                            if (lootItem.getItemBase().isGlass())
+                            if (lootItem.getName().toUpperCase().contains("GLASS"))
                                 GlassItems.add(lootItem);
                             else
                                 OtherDrops.add(lootItem);
@@ -86,19 +87,19 @@ public class SimulateBootyCmd extends AbstractDevCmd {
             } catch (Exception ex) {
                 failures++;
             }
-            if (mob.getEquip() != null) {
-                for (MobEquipment me : mob.getEquip().values()) {
+            if (mob.charItemManager.equipped.isEmpty() == false) {
+                for (Item me : mob.charItemManager.equipped.values()) {
 
-                    if (me.getDropChance() == 0)
+                    if (me.drop_chance == 0)
                         continue;
 
                     float equipmentRoll = ThreadLocalRandom.current().nextInt(99) + 1;
-                    float dropChance = me.getDropChance() * 100;
+                    float dropChance = me.drop_chance * 100;
 
                     if (equipmentRoll > (dropChance))
                         continue;
 
-                    MobLoot ml = new MobLoot(mob, me.getItemBase(), false);
+                    MobLoot ml = new MobLoot(mob, me.template, false);
 
                     if (ml != null)
                         EquipmentDrops.add(ml);

src/engine/devcmd/cmds/SlotNpcCmd.java

@@ -53,7 +53,7 @@ public class SlotNpcCmd extends AbstractDevCmd {
         if (stringIndex == -1)
             return false;
 
-        // Validate we have a corrent building group name
+        // Validate we have a correct building group name
 
         for (BuildingGroup group : BuildingGroup.values()) {
             if (group.name().equals(userInput[0].toUpperCase()))
@@ -114,8 +114,7 @@ public class SlotNpcCmd extends AbstractDevCmd {
 
                 if (!DbManager.ContractQueries.updateAllowedBuildings(contract, contract.getAllowedBuildings().toLong())) {
                     Logger.error("Failed to update Database for Contract Allowed buildings");
-                    ChatManager.chatSystemError(pc, "Failed to update Database for Contract Allowed buildings. " +
-                            "Contact A CCR, oh wait, you are a CCR. You're Fubared.");
+                    ChatManager.chatSystemError(pc, "Failed to update Database for Contract Allowed buildings. ");
                     return;
                 }
 
@@ -125,8 +124,7 @@ public class SlotNpcCmd extends AbstractDevCmd {
                 contract.getAllowedBuildings().remove(buildingGroup);
                 if (!DbManager.ContractQueries.updateAllowedBuildings(contract, contract.getAllowedBuildings().toLong())) {
                     Logger.error("Failed to update Database for Contract Allowed buildings");
-                    ChatManager.chatSystemError(pc, "Failed to update Database for Contract Allowed buildings. " +
-                            "Contact A CCR, oh wait, you are a CCR. You're Fubared.");
+                    ChatManager.chatSystemError(pc, "Failed to update Database for Contract Allowed buildings. ");
                     return;
                 }
 
@@ -138,14 +136,14 @@ public class SlotNpcCmd extends AbstractDevCmd {
 
     @Override
     protected String _getHelpString() {
-        return "Sets a building slot on a targeted npc";
+        return "Toggles a building group on a targeted npc";
     }
 
     // Class methods
 
     @Override
     protected String _getUsageString() {
-        String usage = "/npcslot [BuildingType] on-off \n";
+        String usage = "/npcslot [BuildingGroup] on-off \n";
 
         for (BuildingGroup group : BuildingGroup.values()) {
             usage += group.name() + ' ';

src/engine/devcmd/cmds/SplatMobCmd.java

@@ -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();

src/engine/devcmd/cmds/SummonCmd.java

@@ -13,7 +13,7 @@ import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.SessionManager;
 import engine.gameManager.ZoneManager;
 import engine.math.Vector3fImmutable;
-import engine.net.client.msg.RecvSummonsRequestMsg;
+import engine.net.client.msg.RecvSummonsMsg;
 import engine.objects.AbstractGameObject;
 import engine.objects.PlayerCharacter;
 import engine.objects.Zone;
@@ -40,8 +40,8 @@ public class SummonCmd extends AbstractDevCmd {
                 Zone zone = ZoneManager.findSmallestZone(pc.getLoc());
                 String location = "Somewhere";
                 if (zone != null)
-                    location = zone.getName();
-                RecvSummonsRequestMsg rsrm = new RecvSummonsRequestMsg(pc.getObjectType().ordinal(), pc.getObjectUUID(), pc.getFirstName(),
+                    location = zone.zoneName;
+                RecvSummonsMsg rsrm = new RecvSummonsMsg(pc.getObjectType().ordinal(), pc.getObjectUUID(), pc.getFirstName(),
                         location, false);
                 toSummon.getClientConnection().sendMsg(rsrm);
 

src/engine/devcmd/cmds/ZoneInfoCmd.java

@@ -73,44 +73,41 @@ public class ZoneInfoCmd extends AbstractDevCmd {
         output = "Target Information:" + newline;
         output += StringUtils.addWS("UUID: " + objectUUID, 20);
         output += newline;
-        output += "name: " + zone.getName();
+        output += "name: " + zone.zoneName;
         output += newline;
-        output += "loadNum: " + zone.getLoadNum();
-        if (zone.getParent() != null) {
-            output += StringUtils.addWS(", parent: " + zone.getParent().getObjectUUID(), 30);
-            output += "Parentabs: x: " + zone.getParent().getAbsX() + ", y: " + zone.getParent().getAbsY() + ", z: " + zone.getParent().getAbsZ();
+        output += "loadNum: " + zone.templateID;
+        if (zone.parent != null) {
+            output += StringUtils.addWS(", parent: " + zone.parent.getObjectUUID(), 30);
+            output += "Parentabs: x: " + zone.parent.absX + ", y: " + zone.parent.absY + ", z: " + zone.parent.absZ;
 
         } else
             output += StringUtils.addWS(", parent: none", 30);
         output += newline;
-        output += "absLoc: x: " + zone.getAbsX() + ", y: " + zone.getAbsY() + ", z: " + zone.getAbsZ();
+        output += "absLoc: x: " + zone.absX + ", y: " + zone.absY + ", z: " + zone.absZ;
         output += newline;
-        output += "offset: x: " + zone.getXCoord() + ", y: " + zone.getYCoord() + ", z: " + zone.getZCoord();
+        output += "offset: x: " + zone.xOffset + ", y: " + zone.yOffset + ", z: " + zone.zOffset;
         output += newline;
-        output += "radius: x: " + zone.getBounds().getHalfExtents().x + ", z: " + zone.getBounds().getHalfExtents().y;
+        output += "radius: x: " + zone.bounds.getHalfExtents().x + ", z: " + zone.bounds.getHalfExtents().y;
         output += newline;
 
-        if (zone.getHeightMap() != null) {
-            output += "HeightMap ID: " + zone.getHeightMap().getHeightMapID();
+        if (zone.terrain != null) {
+            output += "Terrain image: " + zone.template.terrain_image;
             output += newline;
-            output += "Bucket Width X : " + zone.getHeightMap().getBucketWidthX();
-            output += newline;
-            output += "Bucket Width Y : " + zone.getHeightMap().getBucketWidthY();
-
         }
-        output += "radius: x: " + zone.getBounds().getHalfExtents().x + ", z: " + zone.getBounds().getHalfExtents().y;
+
+        output += "radius: x: " + zone.bounds.getHalfExtents().x + ", z: " + zone.bounds.getHalfExtents().y;
         output += newline;
         //		output += "minLvl = " + zone.getMinLvl() + " | maxLvl = " + zone.getMaxLvl();
         output += newline;
-        output += "Sea Level = " + zone.getSeaLevel();
+        output += "Sea Level = " + zone.sea_level;
         output += newline;
-        output += "World Altitude = " + zone.getWorldAltitude();
+        output += "World Altitude = " + zone.global_height;
         throwbackInfo(player, output);
 
         City city = ZoneManager.getCityAtLocation(player.getLoc());
 
         output += newline;
-        output += (city == null) ? "None" : city.getParent().getName();
+        output += (city == null) ? "None" : city.getParent().zoneName;
 
         if (city != null) {
 
@@ -123,14 +120,14 @@ public class ZoneInfoCmd extends AbstractDevCmd {
         } else {
             output = "children:";
 
-            ArrayList<Zone> nodes = zone.getNodes();
+            ArrayList<Zone> nodes = zone.nodes;
 
             if (nodes.isEmpty())
                 output += " none";
 
             for (Zone child : nodes) {
                 output += newline;
-                output += child.getName() + " (" + child.getLoadNum() + ')';
+                output += child.zoneName + " (" + child.templateID + ')';
             }
         }
         throwbackInfo(player, output);

src/engine/devcmd/cmds/ZoneSetCmd.java

@@ -40,7 +40,7 @@ public class ZoneSetCmd extends AbstractDevCmd {
 
         zone = ZoneManager.findSmallestZone(playerCharacter.getLoc());
 
-        throwbackInfo(playerCharacter, zone.getName() + " (" + zone.getLoadNum() + ") " + zone.getObjectUUID());
+        throwbackInfo(playerCharacter, zone.zoneName + " (" + zone.templateID + ") " + zone.getObjectUUID());
 
         // NPC
 

src/engine/devcmd/cmds/aiInfoCmd.java

@@ -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 += "Aggro Range: " + mob.getAggroRange() + newline;
-            output += "Player Aggro Map Size: " + mob.playerAgroMap.size() + 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);
     }

src/engine/devcmd/cmds/convertLoc.java

@@ -1,59 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2022
-//                www.magicbane.com
-
-
-package engine.devcmd.cmds;
-
-import engine.Enum.GameObjectType;
-import engine.devcmd.AbstractDevCmd;
-import engine.gameManager.ChatManager;
-import engine.gameManager.ZoneManager;
-import engine.math.Vector3fImmutable;
-import engine.objects.AbstractGameObject;
-import engine.objects.Building;
-import engine.objects.PlayerCharacter;
-
-public class convertLoc extends AbstractDevCmd {
-
-    public convertLoc() {
-        super("convertLoc");
-    }
-
-    @Override
-    protected void _doCmd(PlayerCharacter pc, String[] words,
-                          AbstractGameObject target) {
-
-
-        if (target == null) {
-            Vector3fImmutable convertLoc = ZoneManager.findSmallestZone(pc.getLoc()).getLoc().subtract(pc.getLoc());
-            ChatManager.chatSystemInfo(pc, Vector3fImmutable.toString(convertLoc));
-            return;
-        }
-
-
-        if (target.getObjectType() != GameObjectType.Building)
-            return;
-        Building toConvert = (Building) target;
-        Vector3fImmutable convertedLoc = ZoneManager.convertWorldToLocal(toConvert, pc.getLoc());
-        ChatManager.chatSystemInfo(pc, Vector3fImmutable.toString(convertedLoc));
-
-
-    }
-
-    @Override
-    protected String _getHelpString() {
-        return "Temporarily Changes SubRace";
-    }
-
-    @Override
-    protected String _getUsageString() {
-        return "' /setBuildingCollidables add/remove 'add creates a collision line.' needs 4 integers. startX, endX, startY, endY";
-
-    }
-
-}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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