Add buildings

2024-01-15 10:12:40 +01:00
parent e35cee7e7a
commit 087b8f22a7
10 changed files with 1540 additions and 101 deletions
--- a/assets/game.png
+++ b/assets/game.png
--- a/assets/game.tsj
+++ b/assets/game.tsj
--- a/assets/maps/tree_test.tmj
+++ b/assets/maps/tree_test.tmj
@@ -241,9 +241,9 @@
            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5893, 5894, 5895, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6149, 6150, 6151, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6405, 6406, 6407, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5655, 5656, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5911, 5912, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -284,9 +284,9 @@
            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1047, 1047, 1047, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1047, 1047, 1047, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1047, 1047, 1047, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1047, 1047, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1047, 1047, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -321,8 +321,8 @@
                 "type":"",
                 "visible":true,
                 "width":10,
-                 "x":144.666666666667,
-                 "y":160.666666666667
+                 "x":144.667,
+                 "y":160.667
                }, 
                {
                 "gid":28,
@@ -334,7 +334,7 @@
                 "visible":true,
                 "width":10,
                 "x":148,
-                 "y":221.333333333333
+                 "y":221.333
                }, 
                {
                 "gid":28,
@@ -345,7 +345,7 @@
                 "type":"",
                 "visible":true,
                 "width":10,
-                 "x":148.666666666667,
+                 "x":148.667,
                 "y":285
                }, 
                {
@@ -358,7 +358,7 @@
                 "visible":true,
                 "width":10,
                 "x":211,
-                 "y":287.333333333333
+                 "y":287.333
                }, 
                {
                 "gid":28,
@@ -370,7 +370,7 @@
                 "visible":true,
                 "width":10,
                 "x":213,
-                 "y":223.333333333333
+                 "y":223.333
                }, 
                {
                 "gid":28,
@@ -381,8 +381,8 @@
                 "type":"",
                 "visible":true,
                 "width":10,
-                 "x":212.333333333333,
-                 "y":161.333333333333
+                 "x":212.333,
+                 "y":161.333
                }, 
                {
                 "gid":28,
@@ -393,8 +393,8 @@
                 "type":"",
                 "visible":true,
                 "width":10,
-                 "x":275.333333333333,
-                 "y":160.333333333333
+                 "x":275.333,
+                 "y":160.333
                }, 
                {
                 "gid":28,
@@ -406,7 +406,7 @@
                 "visible":true,
                 "width":10,
                 "x":276,
-                 "y":222.333333333333
+                 "y":222.333
                }, 
                {
                 "gid":28,
@@ -417,8 +417,8 @@
                 "type":"",
                 "visible":true,
                 "width":10,
-                 "x":276.666666666667,
-                 "y":284.333333333333
+                 "x":276.667,
+                 "y":284.333
                }],
         "opacity":1,
         "type":"objectgroup",
--- a/game/game_tileset.h
+++ b/game/game_tileset.h
@@ -258,22 +258,75 @@ static AnimationFrame terrainGetAnimationFrame(BzTileID tile, i32 frameIdx) {

 typedef enum BuildingType {
    BUILDING_NONE = -1,
+    BUILDING_ARCHERY_RANGE,
+    BUILDING_BARRACS,
+    BUILDING_GRANARY,
+    BUILDING_HOUSE_01,
+    BUILDING_HOUSE_02,
+    BUILDING_HOUSE_03,
+    BUILDING_HOUSE_04,
+    BUILDING_HOUSE_05,
+    BUILDING_HOUSE_06,
+    BUILDING_HOUSE_07,
+    BUILDING_HOUSE_08,
+    BUILDING_HOUSE_09,
+    BUILDING_HOUSE_10,
+    BUILDING_HOUSE_11,
+    BUILDING_HOUSE_12,
    BUILDING_KEEP,
+    BUILDING_MARKET,
+    BUILDING_MILL,
+    BUILDING_WAREHOUSE,
    BUILDING_COUNT,
 } BuildingType;

 static BuildingType getTileBuilding(BzTileID tile) {
    switch (tile) {
-        case 5892:
-        case 5893:
-        case 5894:
-        case 6148:
+        case 5654:
+        case 5655:
+        case 5910:
+        case 5911:
+            return BUILDING_KEEP;
        case 6149:
        case 6150:
-        case 6404:
+            return BUILDING_BARRACS;
        case 6405:
        case 6406:
-            return BUILDING_KEEP;
+            return BUILDING_ARCHERY_RANGE;
+        case 6410:
+            return BUILDING_HOUSE_01;
+        case 6411:
+            return BUILDING_HOUSE_02;
+        case 6412:
+            return BUILDING_HOUSE_03;
+        case 6433:
+            return BUILDING_WAREHOUSE;
+        case 6666:
+            return BUILDING_HOUSE_04;
+        case 6667:
+            return BUILDING_HOUSE_05;
+        case 6668:
+            return BUILDING_HOUSE_06;
+        case 6689:
+        case 6690:
+        case 6691:
+            return BUILDING_MILL;
+        case 6922:
+            return BUILDING_HOUSE_07;
+        case 6923:
+            return BUILDING_HOUSE_08;
+        case 6924:
+            return BUILDING_HOUSE_09;
+        case 6945:
+            return BUILDING_GRANARY;
+        case 7178:
+            return BUILDING_HOUSE_10;
+        case 7179:
+            return BUILDING_HOUSE_11;
+        case 7180:
+            return BUILDING_HOUSE_12;
+        case 7191:
+            return BUILDING_MARKET;
        default:
            return BUILDING_COUNT;
    }
@@ -281,7 +334,25 @@ static BuildingType getTileBuilding(BzTileID tile) {

 static BzTileID getBuildingTile(BuildingType type) {
    switch (type) {
-        case BUILDING_KEEP: return 5892;
+        case BUILDING_KEEP: return 5654;
+        case BUILDING_BARRACS: return 6149;
+        case BUILDING_ARCHERY_RANGE: return 6405;
+        case BUILDING_HOUSE_01: return 6410;
+        case BUILDING_HOUSE_02: return 6411;
+        case BUILDING_HOUSE_03: return 6412;
+        case BUILDING_WAREHOUSE: return 6433;
+        case BUILDING_HOUSE_04: return 6666;
+        case BUILDING_HOUSE_05: return 6667;
+        case BUILDING_HOUSE_06: return 6668;
+        case BUILDING_MILL: return 6689;
+        case BUILDING_HOUSE_07: return 6922;
+        case BUILDING_HOUSE_08: return 6923;
+        case BUILDING_HOUSE_09: return 6924;
+        case BUILDING_GRANARY: return 6945;
+        case BUILDING_HOUSE_10: return 7178;
+        case BUILDING_HOUSE_11: return 7179;
+        case BUILDING_HOUSE_12: return 7180;
+        case BUILDING_MARKET: return 7191;
        default: return -1;
    }
 }
@@ -289,6 +360,24 @@ static BzTileID getBuildingTile(BuildingType type) {
 static const char *getBuildingStr(BuildingType type) {
    switch (type) {
        case BUILDING_KEEP: return "keep";
+        case BUILDING_BARRACS: return "barracs";
+        case BUILDING_ARCHERY_RANGE: return "archery_range";
+        case BUILDING_HOUSE_01: return "house_01";
+        case BUILDING_HOUSE_02: return "house_02";
+        case BUILDING_HOUSE_03: return "house_03";
+        case BUILDING_WAREHOUSE: return "warehouse";
+        case BUILDING_HOUSE_04: return "house_04";
+        case BUILDING_HOUSE_05: return "house_05";
+        case BUILDING_HOUSE_06: return "house_06";
+        case BUILDING_MILL: return "mill";
+        case BUILDING_HOUSE_07: return "house_07";
+        case BUILDING_HOUSE_08: return "house_08";
+        case BUILDING_HOUSE_09: return "house_09";
+        case BUILDING_GRANARY: return "granary";
+        case BUILDING_HOUSE_10: return "house_10";
+        case BUILDING_HOUSE_11: return "house_11";
+        case BUILDING_HOUSE_12: return "house_12";
+        case BUILDING_MARKET: return "market";
        default: return NULL;
    }
 }
@@ -296,8 +385,80 @@ static const char *getBuildingStr(BuildingType type) {
 static BuildingType getBuildingSize(BuildingType type, i32 *outWidth, i32 *outHeight) {
    switch (type) {
        case BUILDING_KEEP:
+            if (outWidth)  *outWidth  = 2;
+            if (outHeight) *outHeight = 2;
+            break;
+        case BUILDING_BARRACS:
+            if (outWidth)  *outWidth  = 2;
+            if (outHeight) *outHeight = 1;
+            break;
+        case BUILDING_ARCHERY_RANGE:
+            if (outWidth)  *outWidth  = 2;
+            if (outHeight) *outHeight = 1;
+            break;
+        case BUILDING_HOUSE_01:
+            if (outWidth)  *outWidth  = 1;
+            if (outHeight) *outHeight = 1;
+            break;
+        case BUILDING_HOUSE_02:
+            if (outWidth)  *outWidth  = 1;
+            if (outHeight) *outHeight = 1;
+            break;
+        case BUILDING_HOUSE_03:
+            if (outWidth)  *outWidth  = 1;
+            if (outHeight) *outHeight = 1;
+            break;
+        case BUILDING_WAREHOUSE:
+            if (outWidth)  *outWidth  = 1;
+            if (outHeight) *outHeight = 1;
+            break;
+        case BUILDING_HOUSE_04:
+            if (outWidth)  *outWidth  = 1;
+            if (outHeight) *outHeight = 1;
+            break;
+        case BUILDING_HOUSE_05:
+            if (outWidth)  *outWidth  = 1;
+            if (outHeight) *outHeight = 1;
+            break;
+        case BUILDING_HOUSE_06:
+            if (outWidth)  *outWidth  = 1;
+            if (outHeight) *outHeight = 1;
+            break;
+        case BUILDING_MILL:
            if (outWidth)  *outWidth  = 3;
-            if (outHeight) *outHeight = 3;
+            if (outHeight) *outHeight = 1;
+            break;
+        case BUILDING_HOUSE_07:
+            if (outWidth)  *outWidth  = 1;
+            if (outHeight) *outHeight = 1;
+            break;
+        case BUILDING_HOUSE_08:
+            if (outWidth)  *outWidth  = 1;
+            if (outHeight) *outHeight = 1;
+            break;
+        case BUILDING_HOUSE_09:
+            if (outWidth)  *outWidth  = 1;
+            if (outHeight) *outHeight = 1;
+            break;
+        case BUILDING_GRANARY:
+            if (outWidth)  *outWidth  = 1;
+            if (outHeight) *outHeight = 1;
+            break;
+        case BUILDING_HOUSE_10:
+            if (outWidth)  *outWidth  = 1;
+            if (outHeight) *outHeight = 1;
+            break;
+        case BUILDING_HOUSE_11:
+            if (outWidth)  *outWidth  = 1;
+            if (outHeight) *outHeight = 1;
+            break;
+        case BUILDING_HOUSE_12:
+            if (outWidth)  *outWidth  = 1;
+            if (outHeight) *outHeight = 1;
+            break;
+        case BUILDING_MARKET:
+            if (outWidth)  *outWidth  = 1;
+            if (outHeight) *outHeight = 1;
            break;
        default:
            if (outWidth)  *outWidth  = 0;
@@ -309,12 +470,12 @@ static BuildingType getBuildingSize(BuildingType type, i32 *outWidth, i32 *outHe

 typedef enum EntityType {
    ENTITY_NONE = -1,
-    ENTITY_WORKER,
-    ENTITY_WOOD,
-    ENTITY_STONE,
    ENTITY_APPLE,
    ENTITY_GOLD,
    ENTITY_POP,
+    ENTITY_STONE,
+    ENTITY_WOOD,
+    ENTITY_WORKER,
    ENTITY_COUNT,
 } EntityType;

@@ -414,26 +575,26 @@ static AnimationFrame entityGetAnimationFrame(EntityType entity, AnimType type,

 typedef enum ItemType {
    ITEM_NONE = -1,
-    ITEM_STAFF,
-    ITEM_PICKAXE,
-    ITEM_AXE,
-    ITEM_DAGGER,
-    ITEM_WOOD_SHIELD,
-    ITEM_SHIELD,
-    ITEM_IRON_SHIELD,
-    ITEM_BOW,
-    ITEM_JAVLIN,
    ITEM_ARROW,
-    ITEM_SWORD,
-    ITEM_GREATSWORD,
-    ITEM_CUTLASS,
+    ITEM_AXE,
    ITEM_BATTLEAXE,
-    ITEM_GREATEAXE,
-    ITEM_SYTHE,
-    ITEM_MACE,
    ITEM_BATTLEHAMMER,
+    ITEM_BOW,
+    ITEM_CUTLASS,
+    ITEM_DAGGER,
+    ITEM_GREATEAXE,
+    ITEM_GREATSWORD,
+    ITEM_IRON_SHIELD,
+    ITEM_JAVLIN,
+    ITEM_MACE,
+    ITEM_PICKAXE,
+    ITEM_SHIELD,
    ITEM_SPEAR,
+    ITEM_STAFF,
+    ITEM_SWORD,
+    ITEM_SYTHE,
    ITEM_TRIDENT,
+    ITEM_WOOD_SHIELD,
    ITEM_COUNT,
 } ItemType;

--- a/rawAssets/game.png
+++ b/rawAssets/game.png
--- a/rawAssets/game.tsj
+++ b/rawAssets/game.tsj
@@ -4830,6 +4830,134 @@
                 "value":""
                }]
        }, 
+        {
+         "id":5637,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":5638,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":5639,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":5640,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":5642,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":5643,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":5644,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":5646,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":5647,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":5648,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":5650,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":5651,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":5654,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }],
+         "type":"keep"
+        }, 
+        {
+         "id":5655,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }],
+         "type":"keep"
+        }, 
        {
         "id":5888,
         "objectgroup":
@@ -4962,14 +5090,7 @@
             "visible":true,
             "x":0,
             "y":0
-            },
-         "properties":[
-                {
-                 "name":"building",
-                 "type":"string",
-                 "value":""
-                }],
-         "type":"keep"
+            }
        }, 
        {
         "id":5893,
@@ -5001,8 +5122,7 @@
                 "name":"building",
                 "type":"string",
                 "value":""
-                }],
-         "type":"keep"
+                }]
        }, 
        {
         "id":5894,
@@ -5029,6 +5149,124 @@
             "x":0,
             "y":0
            },
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":5895,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":5896,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":5898,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":5899,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":5900,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":5902,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":5903,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":5904,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":5906,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":5907,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":5908,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":5910,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }],
+         "type":"keep"
+        }, 
+        {
+         "id":5911,
         "properties":[
                {
                 "name":"building",
@@ -5169,14 +5407,7 @@
             "visible":true,
             "x":0,
             "y":0
-            },
-         "properties":[
-                {
-                 "name":"building",
-                 "type":"string",
-                 "value":""
-                }],
-         "type":"keep"
+            }
        }, 
        {
         "id":6149,
@@ -5209,7 +5440,7 @@
                 "type":"string",
                 "value":""
                }],
-         "type":"keep"
+         "type":"barracs"
        }, 
        {
         "id":6150,
@@ -5242,7 +5473,79 @@
                 "type":"string",
                 "value":""
                }],
-         "type":"keep"
+         "type":"barracs"
+        }, 
+        {
+         "id":6151,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":6152,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":6158,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":6159,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":6160,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":6162,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":6163,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":6164,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
        }, 
        {
         "id":6400,
@@ -5352,14 +5655,7 @@
             "visible":true,
             "x":0,
             "y":0
-            },
-         "properties":[
-                {
-                 "name":"building",
-                 "type":"string",
-                 "value":""
-                }],
-         "type":"keep"
+            }
        }, 
        {
         "id":6405,
@@ -5392,7 +5688,7 @@
                 "type":"string",
                 "value":""
                }],
-         "type":"keep"
+         "type":"archery_range"
        }, 
        {
         "id":6406,
@@ -5425,7 +5721,164 @@
                 "type":"string",
                 "value":""
                }],
-         "type":"keep"
+         "type":"archery_range"
+        }, 
+        {
+         "id":6407,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":6408,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":6410,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }],
+         "type":"house_01"
+        }, 
+        {
+         "id":6411,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }],
+         "type":"house_02"
+        }, 
+        {
+         "id":6412,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }],
+         "type":"house_03"
+        }, 
+        {
+         "id":6414,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":6415,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":6416,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":6418,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":6419,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":6420,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":6429,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":6430,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":6431,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":6433,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }],
+         "type":"warehouse"
+        }, 
+        {
+         "id":6434,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":6435,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
        }, 
        {
         "id":6656,
@@ -5487,6 +5940,156 @@
                 "value":""
                }]
        }, 
+        {
+         "id":6661,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":6662,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":6663,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":6664,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":6666,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }],
+         "type":"house_04"
+        }, 
+        {
+         "id":6667,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }],
+         "type":"house_05"
+        }, 
+        {
+         "id":6668,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }],
+         "type":"house_06"
+        }, 
+        {
+         "id":6674,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":6675,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":6676,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":6685,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":6686,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":6687,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":6689,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }],
+         "type":"mill"
+        }, 
+        {
+         "id":6690,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }],
+         "type":"mill"
+        }, 
+        {
+         "id":6691,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }],
+         "type":"mill"
+        }, 
        {
         "id":6912,
         "objectgroup":
@@ -5529,6 +6132,145 @@
                 "value":""
                }]
        }, 
+        {
+         "id":6922,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }],
+         "type":"house_07"
+        }, 
+        {
+         "id":6923,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }],
+         "type":"house_08"
+        }, 
+        {
+         "id":6924,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }],
+         "type":"house_09"
+        }, 
+        {
+         "id":6934,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":6935,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":6936,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":6937,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":6938,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":6939,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":6941,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":6942,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":6943,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":6945,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }],
+         "type":"granary"
+        }, 
+        {
+         "id":6946,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":6947,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
        {
         "id":7168,
         "objectgroup":
@@ -5571,6 +6313,91 @@
                 "value":""
                }]
        }, 
+        {
+         "id":7178,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }],
+         "type":"house_10"
+        }, 
+        {
+         "id":7179,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }],
+         "type":"house_11"
+        }, 
+        {
+         "id":7180,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }],
+         "type":"house_12"
+        }, 
+        {
+         "id":7190,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":7191,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }],
+         "type":"market"
+        }, 
+        {
+         "id":7192,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":7193,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":7194,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
+        {
+         "id":7195,
+         "properties":[
+                {
+                 "name":"building",
+                 "type":"string",
+                 "value":""
+                }]
+        }, 
        {
         "id":7424,
         "properties":[
--- a/rawAssets/game.tsx
+++ b/rawAssets/game.tsx
@@ -1746,6 +1746,76 @@
   <property name="terrain" value=""/>
  </properties>
 </tile>
+ <tile id="5637">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="5638">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="5639">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="5640">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="5642">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="5643">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="5644">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="5646">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="5647">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="5648">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="5650">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="5651">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="5654" type="keep">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="5655" type="keep">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
 <tile id="5888">
  <properties>
   <property name="terrain" value=""/>
@@ -1781,7 +1851,12 @@
   </object>
  </objectgroup>
 </tile>
- <tile id="5892" type="keep">
+ <tile id="5892">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="5893">
  <properties>
   <property name="building" value=""/>
  </properties>
@@ -1789,7 +1864,7 @@
   <object id="1" x="0" y="0" width="16" height="16"/>
  </objectgroup>
 </tile>
- <tile id="5893" type="keep">
+ <tile id="5894">
  <properties>
   <property name="building" value=""/>
  </properties>
@@ -1797,13 +1872,70 @@
   <object id="1" x="0" y="0" width="16" height="16"/>
  </objectgroup>
 </tile>
- <tile id="5894" type="keep">
+ <tile id="5895">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="5896">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="5898">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="5899">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="5900">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="5902">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="5903">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="5904">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="5906">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="5907">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="5908">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="5910" type="keep">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="5911" type="keep">
  <properties>
   <property name="building" value=""/>
  </properties>
-  <objectgroup draworder="index" id="2">
-   <object id="1" x="0" y="0" width="16" height="16"/>
-  </objectgroup>
 </tile>
 <tile id="6144">
  <properties>
@@ -1840,7 +1972,12 @@
   </object>
  </objectgroup>
 </tile>
- <tile id="6148" type="keep">
+ <tile id="6148">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="6149" type="barracs">
  <properties>
   <property name="building" value=""/>
  </properties>
@@ -1848,7 +1985,7 @@
   <object id="1" x="0" y="0" width="16" height="16"/>
  </objectgroup>
 </tile>
- <tile id="6149" type="keep">
+ <tile id="6150" type="barracs">
  <properties>
   <property name="building" value=""/>
  </properties>
@@ -1856,13 +1993,45 @@
   <object id="1" x="0" y="0" width="16" height="16"/>
  </objectgroup>
 </tile>
- <tile id="6150" type="keep">
+ <tile id="6151">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6152">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6158">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6159">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6160">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6162">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6163">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6164">
  <properties>
   <property name="building" value=""/>
  </properties>
-  <objectgroup draworder="index" id="2">
-   <object id="1" x="0" y="0" width="16" height="16"/>
-  </objectgroup>
 </tile>
 <tile id="6400">
  <properties>
@@ -1894,7 +2063,12 @@
   </object>
  </objectgroup>
 </tile>
- <tile id="6404" type="keep">
+ <tile id="6404">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="6405" type="archery_range">
  <properties>
   <property name="building" value=""/>
  </properties>
@@ -1902,7 +2076,7 @@
   <object id="1" x="0" y="0" width="16" height="16"/>
  </objectgroup>
 </tile>
- <tile id="6405" type="keep">
+ <tile id="6406" type="archery_range">
  <properties>
   <property name="building" value=""/>
  </properties>
@@ -1910,13 +2084,90 @@
   <object id="1" x="0" y="0" width="16" height="16"/>
  </objectgroup>
 </tile>
- <tile id="6406" type="keep">
+ <tile id="6407">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6408">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6410" type="house_01">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6411" type="house_02">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6412" type="house_03">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6414">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6415">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6416">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6418">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6419">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6420">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6429">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6430">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6431">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6433" type="warehouse">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6434">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6435">
  <properties>
   <property name="building" value=""/>
  </properties>
-  <objectgroup draworder="index" id="2">
-   <object id="1" x="0" y="0" width="16" height="16"/>
-  </objectgroup>
 </tile>
 <tile id="6656">
  <properties>
@@ -1943,6 +2194,86 @@
   <property name="terrain" value=""/>
  </properties>
 </tile>
+ <tile id="6661">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6662">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6663">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6664">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6666" type="house_04">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6667" type="house_05">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6668" type="house_06">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6674">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6675">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6676">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6685">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6686">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6687">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6689" type="mill">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6690" type="mill">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6691" type="mill">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
 <tile id="6912">
  <properties>
   <property name="terrain" value=""/>
@@ -1958,6 +2289,81 @@
   <property name="terrain" value=""/>
  </properties>
 </tile>
+ <tile id="6922" type="house_07">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6923" type="house_08">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6924" type="house_09">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6934">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6935">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6936">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6937">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6938">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6939">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6941">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6942">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6943">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6945" type="granary">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6946">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="6947">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
 <tile id="7168">
  <properties>
   <property name="terrain" value=""/>
@@ -1973,6 +2379,51 @@
   <property name="terrain" value=""/>
  </properties>
 </tile>
+ <tile id="7178" type="house_10">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="7179" type="house_11">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="7180" type="house_12">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="7190">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="7191" type="market">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="7192">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="7193">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="7194">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
+ <tile id="7195">
+  <properties>
+   <property name="building" value=""/>
+  </properties>
+ </tile>
 <tile id="7424" type="wood">
  <properties>
   <property name="entity" value=""/>
--- a/rawAssets/game_001.kra
+++ b/rawAssets/game_001.kra
--- a/rawAssets/tree_test.tmx
+++ b/rawAssets/tree_test.tmx
@@ -205,9 +205,9 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,5893,5894,5895,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,6149,6150,6151,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,6405,6406,6407,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,5655,5656,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,5911,5912,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -241,9 +241,9 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,1047,1047,1047,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,1047,1047,1047,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,1047,1047,1047,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,1047,1047,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,1047,1047,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
--- a/scripts/extract_common.py
+++ b/scripts/extract_common.py
@@ -111,7 +111,7 @@ class EnumWriter:
        self.tiles = group_by_class(tiles)
        self.enums = []
        self.enums.append(self.to_enum("none"))
-        self.enums += [self.to_enum(x) for x in self.tiles.keys()]
+        self.enums += sorted([self.to_enum(x) for x in self.tiles.keys()])
        self.enums.append(self.to_enum("count"))
        self.enum_type = f"{prefix.capitalize()}Type"
        if anim_prefix: