Add collisions to tileset

This commit is contained in:
2023-12-17 09:36:33 +01:00
parent 4f2ac9a0eb
commit 5564df4768
5 changed files with 2239 additions and 4 deletions

File diff suppressed because one or more lines are too long

View File

@@ -135,8 +135,9 @@ static void updateCollisionMap(BzTileMap *map, i32 startX, i32 startY, i32 endX,
i32 idx = y * map->width + x; i32 idx = y * map->width + x;
if (map->collisionMap[idx]) continue; if (map->collisionMap[idx]) continue;
i32 tile = bzTileLayerGetTile(layer, x, y); BzTile tile = bzTileLayerGetTile(layer, x, y);
BzTileShape tilesetShape = bzTilesetGetTileCollider(tileset, tile); BzTileID tileID = bzTilesetGetTileID(tileset, tile);
BzTileShape tilesetShape = bzTilesetGetTileCollider(tileset, tileID);
if (tilesetShape.type == BZ_TILE_SHAPE_NONE || if (tilesetShape.type == BZ_TILE_SHAPE_NONE ||
tilesetShape.type == BZ_TILE_SHAPE_POINT) tilesetShape.type == BZ_TILE_SHAPE_POINT)
continue; continue;

File diff suppressed because it is too large Load Diff

View File

@@ -555,11 +555,17 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
</tile> </tile>
<tile id="1044"> <tile id="1044">
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
</tile> </tile>
<tile id="1045"> <tile id="1045">
<properties> <properties>
@@ -655,11 +661,17 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
</tile> </tile>
<tile id="1300"> <tile id="1300">
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
</tile> </tile>
<tile id="1301"> <tile id="1301">
<properties> <properties>
@@ -740,6 +752,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="3" y="3" width="10" height="13"/>
</objectgroup>
<animation> <animation>
<frame tileid="1792" duration="100"/> <frame tileid="1792" duration="100"/>
<frame tileid="2816" duration="100"/> <frame tileid="2816" duration="100"/>
@@ -751,6 +766,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="3" y="3" width="13" height="13"/>
</objectgroup>
<animation> <animation>
<frame tileid="1793" duration="100"/> <frame tileid="1793" duration="100"/>
<frame tileid="2817" duration="100"/> <frame tileid="2817" duration="100"/>
@@ -762,6 +780,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="3" width="16" height="13"/>
</objectgroup>
<animation> <animation>
<frame tileid="1794" duration="100"/> <frame tileid="1794" duration="100"/>
<frame tileid="2818" duration="100"/> <frame tileid="2818" duration="100"/>
@@ -773,6 +794,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="3" width="13" height="13"/>
</objectgroup>
<animation> <animation>
<frame tileid="1795" duration="100"/> <frame tileid="1795" duration="100"/>
<frame tileid="2819" duration="100"/> <frame tileid="2819" duration="100"/>
@@ -784,6 +808,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
<animation> <animation>
<frame tileid="1797" duration="100"/> <frame tileid="1797" duration="100"/>
<frame tileid="2565" duration="100"/> <frame tileid="2565" duration="100"/>
@@ -828,6 +855,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
<animation> <animation>
<frame tileid="1802" duration="100"/> <frame tileid="1802" duration="100"/>
<frame tileid="2314" duration="100"/> <frame tileid="2314" duration="100"/>
@@ -839,6 +869,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
<animation> <animation>
<frame tileid="1803" duration="100"/> <frame tileid="1803" duration="100"/>
<frame tileid="2315" duration="100"/> <frame tileid="2315" duration="100"/>
@@ -850,6 +883,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="6" y="6" width="10" height="10"/>
</objectgroup>
<animation> <animation>
<frame tileid="1804" duration="400"/> <frame tileid="1804" duration="400"/>
<frame tileid="2572" duration="400"/> <frame tileid="2572" duration="400"/>
@@ -861,6 +897,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="5" width="16" height="11"/>
</objectgroup>
<animation> <animation>
<frame tileid="1805" duration="400"/> <frame tileid="1805" duration="400"/>
<frame tileid="2573" duration="400"/> <frame tileid="2573" duration="400"/>
@@ -872,6 +911,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="5" width="10" height="10"/>
</objectgroup>
<animation> <animation>
<frame tileid="1806" duration="400"/> <frame tileid="1806" duration="400"/>
<frame tileid="2574" duration="400"/> <frame tileid="2574" duration="400"/>
@@ -883,6 +925,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
<animation> <animation>
<frame tileid="1807" duration="400"/> <frame tileid="1807" duration="400"/>
<frame tileid="2319" duration="400"/> <frame tileid="2319" duration="400"/>
@@ -894,6 +939,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
<animation> <animation>
<frame tileid="1808" duration="400"/> <frame tileid="1808" duration="400"/>
<frame tileid="2320" duration="400"/> <frame tileid="2320" duration="400"/>
@@ -905,6 +953,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
<animation> <animation>
<frame tileid="1809" duration="200"/> <frame tileid="1809" duration="200"/>
<frame tileid="2577" duration="200"/> <frame tileid="2577" duration="200"/>
@@ -916,6 +967,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
<animation> <animation>
<frame tileid="1810" duration="200"/> <frame tileid="1810" duration="200"/>
<frame tileid="2578" duration="200"/> <frame tileid="2578" duration="200"/>
@@ -927,6 +981,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
<animation> <animation>
<frame tileid="1811" duration="200"/> <frame tileid="1811" duration="200"/>
<frame tileid="2579" duration="200"/> <frame tileid="2579" duration="200"/>
@@ -938,6 +995,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
<animation> <animation>
<frame tileid="1812" duration="200"/> <frame tileid="1812" duration="200"/>
<frame tileid="2580" duration="200"/> <frame tileid="2580" duration="200"/>
@@ -949,6 +1009,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
<animation> <animation>
<frame tileid="1813" duration="200"/> <frame tileid="1813" duration="200"/>
<frame tileid="2581" duration="200"/> <frame tileid="2581" duration="200"/>
@@ -960,6 +1023,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
<animation> <animation>
<frame tileid="1814" duration="200"/> <frame tileid="1814" duration="200"/>
<frame tileid="2582" duration="200"/> <frame tileid="2582" duration="200"/>
@@ -971,6 +1037,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
<animation> <animation>
<frame tileid="1815" duration="200"/> <frame tileid="1815" duration="200"/>
<frame tileid="2583" duration="200"/> <frame tileid="2583" duration="200"/>
@@ -982,6 +1051,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
<animation> <animation>
<frame tileid="1816" duration="200"/> <frame tileid="1816" duration="200"/>
<frame tileid="2584" duration="200"/> <frame tileid="2584" duration="200"/>
@@ -993,6 +1065,10 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
<object id="2" x="0" y="0" width="16" height="16"/>
</objectgroup>
<animation> <animation>
<frame tileid="1817" duration="200"/> <frame tileid="1817" duration="200"/>
<frame tileid="2585" duration="200"/> <frame tileid="2585" duration="200"/>
@@ -1004,6 +1080,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="4" x="0" y="0" width="16" height="16"/>
</objectgroup>
<animation> <animation>
<frame tileid="1818" duration="200"/> <frame tileid="1818" duration="200"/>
<frame tileid="2586" duration="200"/> <frame tileid="2586" duration="200"/>
@@ -1015,6 +1094,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="3" y="0" width="10" height="16"/>
</objectgroup>
<animation> <animation>
<frame tileid="2048" duration="100"/> <frame tileid="2048" duration="100"/>
<frame tileid="3072" duration="100"/> <frame tileid="3072" duration="100"/>
@@ -1026,6 +1108,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="3" y="0" width="13" height="16"/>
</objectgroup>
<animation> <animation>
<frame tileid="2049" duration="100"/> <frame tileid="2049" duration="100"/>
<frame tileid="3073" duration="100"/> <frame tileid="3073" duration="100"/>
@@ -1037,6 +1122,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
<animation> <animation>
<frame tileid="2050" duration="100"/> <frame tileid="2050" duration="100"/>
<frame tileid="3074" duration="100"/> <frame tileid="3074" duration="100"/>
@@ -1048,6 +1136,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="13" height="16"/>
</objectgroup>
<animation> <animation>
<frame tileid="2051" duration="100"/> <frame tileid="2051" duration="100"/>
<frame tileid="3075" duration="100"/> <frame tileid="3075" duration="100"/>
@@ -1059,6 +1150,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
<animation> <animation>
<frame tileid="2052" duration="100"/> <frame tileid="2052" duration="100"/>
<frame tileid="2820" duration="100"/> <frame tileid="2820" duration="100"/>
@@ -1070,6 +1164,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
<animation> <animation>
<frame tileid="2053" duration="100"/> <frame tileid="2053" duration="100"/>
<frame tileid="2821" duration="100"/> <frame tileid="2821" duration="100"/>
@@ -1081,6 +1178,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
<animation> <animation>
<frame tileid="2054" duration="100"/> <frame tileid="2054" duration="100"/>
<frame tileid="2822" duration="100"/> <frame tileid="2822" duration="100"/>
@@ -1119,6 +1219,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
<animation> <animation>
<frame tileid="2058" duration="100"/> <frame tileid="2058" duration="100"/>
<frame tileid="2570" duration="100"/> <frame tileid="2570" duration="100"/>
@@ -1130,6 +1233,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
<animation> <animation>
<frame tileid="2059" duration="100"/> <frame tileid="2059" duration="100"/>
<frame tileid="2571" duration="100"/> <frame tileid="2571" duration="100"/>
@@ -1141,6 +1247,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="6" y="0" width="10" height="16"/>
</objectgroup>
<animation> <animation>
<frame tileid="2060" duration="400"/> <frame tileid="2060" duration="400"/>
<frame tileid="2828" duration="400"/> <frame tileid="2828" duration="400"/>
@@ -1157,6 +1266,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="10" height="16"/>
</objectgroup>
<animation> <animation>
<frame tileid="2062" duration="400"/> <frame tileid="2062" duration="400"/>
<frame tileid="2830" duration="400"/> <frame tileid="2830" duration="400"/>
@@ -1168,6 +1280,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
<animation> <animation>
<frame tileid="2063" duration="400"/> <frame tileid="2063" duration="400"/>
<frame tileid="2575" duration="400"/> <frame tileid="2575" duration="400"/>
@@ -1179,6 +1294,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
<animation> <animation>
<frame tileid="2064" duration="400"/> <frame tileid="2064" duration="400"/>
<frame tileid="2576" duration="400"/> <frame tileid="2576" duration="400"/>
@@ -1190,6 +1308,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
<animation> <animation>
<frame tileid="2065" duration="200"/> <frame tileid="2065" duration="200"/>
<frame tileid="2833" duration="200"/> <frame tileid="2833" duration="200"/>
@@ -1201,11 +1322,17 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
</tile> </tile>
<tile id="2067"> <tile id="2067">
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
<animation> <animation>
<frame tileid="2067" duration="200"/> <frame tileid="2067" duration="200"/>
<frame tileid="2835" duration="200"/> <frame tileid="2835" duration="200"/>
@@ -1217,6 +1344,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
<animation> <animation>
<frame tileid="2068" duration="200"/> <frame tileid="2068" duration="200"/>
<frame tileid="2836" duration="200"/> <frame tileid="2836" duration="200"/>
@@ -1228,6 +1358,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
<animation> <animation>
<frame tileid="2069" duration="200"/> <frame tileid="2069" duration="200"/>
<frame tileid="2837" duration="200"/> <frame tileid="2837" duration="200"/>
@@ -1239,6 +1372,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
<animation> <animation>
<frame tileid="2070" duration="200"/> <frame tileid="2070" duration="200"/>
<frame tileid="2838" duration="200"/> <frame tileid="2838" duration="200"/>
@@ -1250,11 +1386,17 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
</tile> </tile>
<tile id="2072"> <tile id="2072">
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
<animation> <animation>
<frame tileid="2072" duration="200"/> <frame tileid="2072" duration="200"/>
<frame tileid="2840" duration="200"/> <frame tileid="2840" duration="200"/>
@@ -1266,6 +1408,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
<animation> <animation>
<frame tileid="2073" duration="200"/> <frame tileid="2073" duration="200"/>
<frame tileid="2841" duration="200"/> <frame tileid="2841" duration="200"/>
@@ -1277,6 +1422,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
<animation> <animation>
<frame tileid="2074" duration="200"/> <frame tileid="2074" duration="200"/>
<frame tileid="2842" duration="200"/> <frame tileid="2842" duration="200"/>
@@ -1288,6 +1436,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="3" y="0" width="10" height="13"/>
</objectgroup>
<animation> <animation>
<frame tileid="2304" duration="100"/> <frame tileid="2304" duration="100"/>
<frame tileid="3328" duration="100"/> <frame tileid="3328" duration="100"/>
@@ -1299,6 +1450,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="3" y="0" width="13" height="13"/>
</objectgroup>
<animation> <animation>
<frame tileid="2305" duration="100"/> <frame tileid="2305" duration="100"/>
<frame tileid="3329" duration="100"/> <frame tileid="3329" duration="100"/>
@@ -1310,6 +1464,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="13"/>
</objectgroup>
<animation> <animation>
<frame tileid="2306" duration="100"/> <frame tileid="2306" duration="100"/>
<frame tileid="3330" duration="100"/> <frame tileid="3330" duration="100"/>
@@ -1321,6 +1478,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="13" height="13"/>
</objectgroup>
<animation> <animation>
<frame tileid="2307" duration="100"/> <frame tileid="2307" duration="100"/>
<frame tileid="3331" duration="100"/> <frame tileid="3331" duration="100"/>
@@ -1332,6 +1492,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
<animation> <animation>
<frame tileid="2309" duration="100"/> <frame tileid="2309" duration="100"/>
<frame tileid="3077" duration="100"/> <frame tileid="3077" duration="100"/>
@@ -1376,6 +1539,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="6" y="0" width="10" height="10"/>
</objectgroup>
<animation> <animation>
<frame tileid="2316" duration="400"/> <frame tileid="2316" duration="400"/>
<frame tileid="3084" duration="400"/> <frame tileid="3084" duration="400"/>
@@ -1387,6 +1553,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="10"/>
</objectgroup>
<animation> <animation>
<frame tileid="2317" duration="400"/> <frame tileid="2317" duration="400"/>
<frame tileid="3085" duration="400"/> <frame tileid="3085" duration="400"/>
@@ -1398,6 +1567,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="10" height="10"/>
</objectgroup>
<animation> <animation>
<frame tileid="2318" duration="400"/> <frame tileid="2318" duration="400"/>
<frame tileid="3086" duration="400"/> <frame tileid="3086" duration="400"/>
@@ -1409,6 +1581,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
<animation> <animation>
<frame tileid="2321" duration="200"/> <frame tileid="2321" duration="200"/>
<frame tileid="3089" duration="200"/> <frame tileid="3089" duration="200"/>
@@ -1420,6 +1595,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
<animation> <animation>
<frame tileid="2322" duration="200"/> <frame tileid="2322" duration="200"/>
<frame tileid="3090" duration="200"/> <frame tileid="3090" duration="200"/>
@@ -1431,6 +1609,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
<animation> <animation>
<frame tileid="2323" duration="200"/> <frame tileid="2323" duration="200"/>
<frame tileid="3091" duration="200"/> <frame tileid="3091" duration="200"/>
@@ -1442,6 +1623,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
<animation> <animation>
<frame tileid="2326" duration="200"/> <frame tileid="2326" duration="200"/>
<frame tileid="3094" duration="200"/> <frame tileid="3094" duration="200"/>
@@ -1453,6 +1637,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
<animation> <animation>
<frame tileid="2327" duration="200"/> <frame tileid="2327" duration="200"/>
<frame tileid="3095" duration="200"/> <frame tileid="3095" duration="200"/>
@@ -1464,6 +1651,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
<animation> <animation>
<frame tileid="2328" duration="200"/> <frame tileid="2328" duration="200"/>
<frame tileid="3096" duration="200"/> <frame tileid="3096" duration="200"/>
@@ -1519,6 +1709,9 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
<animation> <animation>
<frame tileid="4868" duration="100"/> <frame tileid="4868" duration="100"/>
<frame tileid="4869" duration="100"/> <frame tileid="4869" duration="100"/>
@@ -1545,6 +1738,11 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="3" y="3" width="10" height="11">
<ellipse/>
</object>
</objectgroup>
</tile> </tile>
<tile id="5889"> <tile id="5889">
<properties> <properties>
@@ -1555,31 +1753,55 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="4" y="6" width="8" height="8">
<ellipse/>
</object>
</objectgroup>
</tile> </tile>
<tile id="5891"> <tile id="5891">
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="4" y="6" width="8" height="8">
<ellipse/>
</object>
</objectgroup>
</tile> </tile>
<tile id="5892" type="keep"> <tile id="5892" type="keep">
<properties> <properties>
<property name="building" value=""/> <property name="building" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
</tile> </tile>
<tile id="5893" type="keep"> <tile id="5893" type="keep">
<properties> <properties>
<property name="building" value=""/> <property name="building" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
</tile> </tile>
<tile id="5894" type="keep"> <tile id="5894" type="keep">
<properties> <properties>
<property name="building" value=""/> <property name="building" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
</tile> </tile>
<tile id="6144"> <tile id="6144">
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="4" y="6" width="8" height="8">
<ellipse/>
</object>
</objectgroup>
</tile> </tile>
<tile id="6145"> <tile id="6145">
<properties> <properties>
@@ -1590,26 +1812,45 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="4" y="6" width="8" height="8">
<ellipse/>
</object>
</objectgroup>
</tile> </tile>
<tile id="6147"> <tile id="6147">
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="4" y="6" width="8" height="8">
<ellipse/>
</object>
</objectgroup>
</tile> </tile>
<tile id="6148" type="keep"> <tile id="6148" type="keep">
<properties> <properties>
<property name="building" value=""/> <property name="building" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
</tile> </tile>
<tile id="6149" type="keep"> <tile id="6149" type="keep">
<properties> <properties>
<property name="building" value=""/> <property name="building" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
</tile> </tile>
<tile id="6150" type="keep"> <tile id="6150" type="keep">
<properties> <properties>
<property name="building" value=""/> <property name="building" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
</tile> </tile>
<tile id="6400"> <tile id="6400">
<properties> <properties>
@@ -1625,31 +1866,55 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="4" y="6" width="8" height="8">
<ellipse/>
</object>
</objectgroup>
</tile> </tile>
<tile id="6403"> <tile id="6403">
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="4" y="6" width="8" height="8">
<ellipse/>
</object>
</objectgroup>
</tile> </tile>
<tile id="6404" type="keep"> <tile id="6404" type="keep">
<properties> <properties>
<property name="building" value=""/> <property name="building" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
</tile> </tile>
<tile id="6405" type="keep"> <tile id="6405" type="keep">
<properties> <properties>
<property name="building" value=""/> <property name="building" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
</tile> </tile>
<tile id="6406" type="keep"> <tile id="6406" type="keep">
<properties> <properties>
<property name="building" value=""/> <property name="building" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="0" y="0" width="16" height="16"/>
</objectgroup>
</tile> </tile>
<tile id="6656"> <tile id="6656">
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="4" y="6" width="8" height="8">
<ellipse/>
</object>
</objectgroup>
</tile> </tile>
<tile id="6657"> <tile id="6657">
<properties> <properties>
@@ -1670,6 +1935,11 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="4" y="6" width="8" height="8">
<ellipse/>
</object>
</objectgroup>
</tile> </tile>
<tile id="6913"> <tile id="6913">
<properties> <properties>
@@ -1680,6 +1950,11 @@
<properties> <properties>
<property name="terrain" value=""/> <property name="terrain" value=""/>
</properties> </properties>
<objectgroup draworder="index" id="2">
<object id="1" x="4" y="6" width="8" height="8">
<ellipse/>
</object>
</objectgroup>
</tile> </tile>
<tile id="7169"> <tile id="7169">
<properties> <properties>

View File

@@ -20,7 +20,12 @@ def extract_by_property(tiles, key):
def remove_properties(data, dst_file): def remove_properties(data, dst_file):
data = json.loads(data) data = json.loads(data)
new_tiles = [{'id': tile['id']} for tile in data['tiles']] new_tiles = []
for tile in data['tiles']:
v = {'id': tile['id']}
if 'objectgroup' in tile:
v['objectgroup'] = tile['objectgroup']
new_tiles.append(v)
data['tiles'] = new_tiles data['tiles'] = new_tiles
del data['wangsets'] del data['wangsets']
with open(dst_file, 'w') as f: with open(dst_file, 'w') as f: