class and table schema now conform to JSON

src/engine/Enum.java

@@ -469,7 +469,7 @@ public class Enum {
 
                 // 14001 does not have a banestone to bind at
 
-                if (ruinZone.zoneTemplate == 14001)
+                if (ruinZone.template == 14001)
                     spawnLocation = Vector3fImmutable.getRandomPointOnCircle(ruinZone.getLoc(), 30);
                 else
                     spawnLocation = Vector3fImmutable.getRandomPointOnCircle(ruinZone.getLoc()

src/engine/InterestManagement/HeightMap.java

@@ -191,7 +191,7 @@ public class HeightMap {
 
         HeightMap heightMap = new HeightMap(zone);
 
-        HeightMap.heightmapByLoadNum.put(zone.zoneTemplate, heightMap);
+        HeightMap.heightmapByLoadNum.put(zone.template, heightMap);
 
     }
 

src/engine/devcmd/cmds/GetZoneCmd.java

@@ -51,7 +51,7 @@ public class GetZoneCmd extends AbstractDevCmd {
         }
 
         for (Zone zone : allIn)
-            throwbackInfo(pcSender, zone.zoneName + "; UUID: " + zone.getObjectUUID() + ", loadNum: " + zone.zoneTemplate);
+            throwbackInfo(pcSender, zone.zoneName + "; UUID: " + zone.getObjectUUID() + ", loadNum: " + zone.template);
     }
 
     @Override

src/engine/devcmd/cmds/InfoCmd.java

@@ -387,7 +387,7 @@ public class InfoCmd extends AbstractDevCmd {
                     output += newline;
                     output += "EquipSet: " + targetNPC.getEquipmentSetID();
                     output += newline;
-                    output += "Parent Zone LoadNum : " + targetNPC.getParentZone().zoneTemplate;
+                    output += "Parent Zone LoadNum : " + targetNPC.getParentZone().template;
 
                 }
 
@@ -473,7 +473,7 @@ public class InfoCmd extends AbstractDevCmd {
                 output += "EquipSet: " + targetMob.equipmentSetID;
                 output += newline;
                 try {
-                    output += "Parent Zone LoadNum : " + targetMob.getParentZone().zoneTemplate;
+                    output += "Parent Zone LoadNum : " + targetMob.getParentZone().template;
                 } catch (Exception ex) {
                     //who cares
                 }

src/engine/devcmd/cmds/ZoneInfoCmd.java

@@ -75,7 +75,7 @@ public class ZoneInfoCmd extends AbstractDevCmd {
         output += newline;
         output += "name: " + zone.zoneName;
         output += newline;
-        output += "loadNum: " + zone.zoneTemplate;
+        output += "loadNum: " + zone.template;
         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;
@@ -130,7 +130,7 @@ public class ZoneInfoCmd extends AbstractDevCmd {
 
             for (Zone child : nodes) {
                 output += newline;
-                output += child.zoneName + " (" + child.zoneTemplate + ')';
+                output += child.zoneName + " (" + child.template + ')';
             }
         }
         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.zoneName + " (" + zone.zoneTemplate + ") " + zone.getObjectUUID());
+        throwbackInfo(playerCharacter, zone.zoneName + " (" + zone.template + ") " + zone.getObjectUUID());
 
         // NPC
 

src/engine/gameManager/ZoneManager.java

@@ -182,7 +182,7 @@ public enum ZoneManager {
 
     public static final void populateWorldZones(final Zone zone) {
 
-        int loadNum = zone.zoneTemplate;
+        int loadNum = zone.template;
 
         // Zones are added to separate
         // collections for quick access

src/engine/objects/Zone.java

@@ -38,7 +38,7 @@ public class Zone extends AbstractGameObject {
     public final float xOffset;
     public final float zOffset;
     public final float yOffset;
-    public final int zoneTemplate;
+    public final int template;
     public final byte peace_zone;
     public final String Icon1;
     public final String Icon2;
@@ -74,7 +74,7 @@ public class Zone extends AbstractGameObject {
         this.xOffset = rs.getFloat("xOffset");
         this.zOffset = rs.getFloat("zOffset");
         this.yOffset = rs.getFloat("yOffset");
-        this.zoneTemplate = rs.getInt("template");
+        this.template = rs.getInt("template");
         this.peace_zone = rs.getByte("peace_zone");
         this.Icon1 = rs.getString("icon1");
         this.Icon2 = rs.getString("icon2");
@@ -106,7 +106,7 @@ public class Zone extends AbstractGameObject {
 
     public static void serializeForClientMsg(Zone zone, ByteBufferWriter writer) {
 
-        if (zone.zoneTemplate == 0 && zone.playerCityUUID == 0)
+        if (zone.template == 0 && zone.playerCityUUID == 0)
             Logger.warn("Warning! WorldServerMap with ID " + zone.getObjectUUID() + " has a loadnum of 0 (player city) and no city linked. This will probably crash the client!");
 
         // Player City Terraform values serialized here.
@@ -124,7 +124,7 @@ public class Zone extends AbstractGameObject {
 
         writer.putInt(0);
         writer.putInt(0);
-        writer.putInt(zone.zoneTemplate);
+        writer.putInt(zone.template);
 
         if (zone.playerCityUUID > 0) {
             City k = City.getCity(zone.playerCityUUID);
@@ -167,7 +167,7 @@ public class Zone extends AbstractGameObject {
 
         this.bounds = Bounds.borrow();
 
-        Vector2f zoneSize = ZoneManager._zone_size_data.get(this.zoneTemplate);
+        Vector2f zoneSize = ZoneManager._zone_size_data.get(this.template);
 
         // Default to player zone size on error? Maybe log this
 
@@ -313,7 +313,7 @@ public class Zone extends AbstractGameObject {
         if (this.guild_zone)
             return HeightMap.PlayerCityHeightMap;
 
-        return HeightMap.heightmapByLoadNum.get(this.zoneTemplate);
+        return HeightMap.heightmapByLoadNum.get(this.template);
     }
 
 }

src/engine/server/world/WorldServer.java

@@ -469,7 +469,7 @@ public class WorldServer {
 		for (Zone zone : ZoneManager.getAllZones()) {
 			if (zone.getHeightMap() != null) {
 				if (zone.getHeightMap().bucketWidthX == 0) {
-					System.out.println("Zone load num: " + zone.zoneTemplate + " has no bucket width");
+					System.out.println("Zone load num: " + zone.template + " has no bucket width");
 				}
 			}
 		}
@@ -565,7 +565,7 @@ public class WorldServer {
 
 		for (Zone zone : rootParent) {
 
-			ZoneManager.addZone(zone.zoneTemplate, zone);
+			ZoneManager.addZone(zone.template, zone);
 
 			//Handle Buildings