diff options
64 files changed, 95 insertions, 234 deletions
diff --git a/graphics/tiles/set_desert.png b/graphics/tiles/set_desert.png Binary files differnew file mode 100644 index 00000000..77a41eb9 --- /dev/null +++ b/graphics/tiles/set_desert.png diff --git a/graphics/tiles/set_icecave.png b/graphics/tiles/set_icecave.png Binary files differnew file mode 100644 index 00000000..8a1319b9 --- /dev/null +++ b/graphics/tiles/set_icecave.png diff --git a/graphics/tiles/set_icemountain.png b/graphics/tiles/set_icemountain.png Binary files differnew file mode 100644 index 00000000..3dab22e9 --- /dev/null +++ b/graphics/tiles/set_icemountain.png diff --git a/graphics/tiles/set_thermin_cave.png b/graphics/tiles/set_thermin_cave.png Binary files differnew file mode 100644 index 00000000..05b23249 --- /dev/null +++ b/graphics/tiles/set_thermin_cave.png diff --git a/maps/099-1.tmx b/maps/099-1.tmx index ec6a9b48..bf65669e 100644 --- a/maps/099-1.tmx +++ b/maps/099-1.tmx @@ -10,9 +10,7 @@ <tileset firstgid="257" name="woodland_indoor_x3" tilewidth="32" tileheight="32" tilecount="144" columns="16"> <image source="../graphics/tiles/woodland_indoor_x3.png" width="512" height="288"/> </tileset> - <tileset firstgid="401" name="collision" tilewidth="32" tileheight="32" tilecount="2" columns="2"> - <image source="../graphics/tiles/collision.png" width="64" height="32"/> - </tileset> + <tileset firstgid="401" source="../tilesets/collision.tsx"/> <tileset firstgid="403" name="artis-indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> <image source="../graphics/tiles/artis-indoor.png" width="512" height="512"/> </tileset> diff --git a/maps/099-2.tmx b/maps/099-2.tmx index f58b7853..2141bac2 100644 --- a/maps/099-2.tmx +++ b/maps/099-2.tmx @@ -11,9 +11,7 @@ <tileset firstgid="109" name="crypt_blockwall" tilewidth="32" tileheight="32" tilecount="256" columns="16"> <image source="../graphics/tiles/crypt_blockwall.png" width="512" height="512"/> </tileset> - <tileset firstgid="365" name="collision" tilewidth="32" tileheight="32" tilecount="2" columns="2"> - <image source="../graphics/tiles/collision.png" width="64" height="32"/> - </tileset> + <tileset firstgid="365" source="../tilesets/collision.tsx"/> <tileset firstgid="367" name="woodland_ground" tilewidth="32" tileheight="32" tilecount="256" columns="16"> <image source="../graphics/tiles/woodland_ground.png" width="512" height="512"/> </tileset> diff --git a/maps/099-3.tmx b/maps/099-3.tmx index f146b876..b921293e 100644 --- a/maps/099-3.tmx +++ b/maps/099-3.tmx @@ -34,9 +34,7 @@ <tileset firstgid="1453" name="crypt_blockwall" tilewidth="32" tileheight="32" tilecount="256" columns="16"> <image source="../graphics/tiles/crypt_blockwall.png" width="512" height="512"/> </tileset> - <tileset firstgid="1709" name="collision" tilewidth="32" tileheight="32" tilecount="2" columns="2"> - <image source="../graphics/tiles/collision.png" width="64" height="32"/> - </tileset> + <tileset firstgid="1709" source="../tilesets/collision.tsx"/> <tileset firstgid="1711" name="woodland_indoor_x2" tilewidth="32" tileheight="32" tilecount="96" columns="16"> <image source="../graphics/tiles/woodland_indoor_x2.png" width="512" height="192"/> </tileset> diff --git a/maps/099-4.tmx b/maps/099-4.tmx index ef66b21c..c9bc50fa 100644 --- a/maps/099-4.tmx +++ b/maps/099-4.tmx @@ -31,9 +31,7 @@ <tileset firstgid="1419" name="woodland_x4" tilewidth="64" tileheight="128" tilecount="8" columns="8"> <image source="../graphics/tiles/woodland_x4.png" width="512" height="128"/> </tileset> - <tileset firstgid="1427" name="collision" tilewidth="32" tileheight="32" tilecount="2" columns="2"> - <image source="../graphics/tiles/collision.png" width="64" height="32"/> - </tileset> + <tileset firstgid="1427" source="../tilesets/collision.tsx"/> <tileset firstgid="1429" name="woodland_x8" tilewidth="32" tileheight="32" tilecount="128" columns="16"> <image source="../graphics/tiles/woodland_x8.png" width="512" height="256"/> </tileset> diff --git a/maps/099-5.tmx b/maps/099-5.tmx index c8af0b30..b67224f1 100644 --- a/maps/099-5.tmx +++ b/maps/099-5.tmx @@ -58,9 +58,7 @@ <tileset firstgid="1419" name="woodland_x4" tilewidth="64" tileheight="128" tilecount="8" columns="8"> <image source="../graphics/tiles/woodland_x4.png" width="512" height="128"/> </tileset> - <tileset firstgid="1427" name="collision" tilewidth="32" tileheight="32" tilecount="2" columns="2"> - <image source="../graphics/tiles/collision.png" width="64" height="32"/> - </tileset> + <tileset firstgid="1427" source="../tilesets/collision.tsx"/> <tileset firstgid="1429" name="woodland_x8" tilewidth="32" tileheight="32" tilecount="128" columns="16"> <image source="../graphics/tiles/woodland_x8.png" width="512" height="256"/> </tileset> diff --git a/maps/099-6.tmx b/maps/099-6.tmx index ab31f04d..b60151e9 100644 --- a/maps/099-6.tmx +++ b/maps/099-6.tmx @@ -11,9 +11,7 @@ <tileset firstgid="109" name="crypt_blockwall" tilewidth="32" tileheight="32" tilecount="256" columns="16"> <image source="../graphics/tiles/crypt_blockwall.png" width="512" height="512"/> </tileset> - <tileset firstgid="365" name="collision" tilewidth="32" tileheight="32" tilecount="2" columns="2"> - <image source="../graphics/tiles/collision.png" width="64" height="32"/> - </tileset> + <tileset firstgid="365" source="../tilesets/collision.tsx"/> <tileset firstgid="367" name="woodland_ground" tilewidth="32" tileheight="32" tilecount="256" columns="16"> <image source="../graphics/tiles/woodland_ground.png" width="512" height="512"/> </tileset> diff --git a/maps/099-7.tmx b/maps/099-7.tmx index 95fefd38..bd5c9b95 100644 --- a/maps/099-7.tmx +++ b/maps/099-7.tmx @@ -142,9 +142,7 @@ <tileset firstgid="1353" name="woodland_x2" tilewidth="64" tileheight="64" tilecount="16" columns="8"> <image source="../graphics/tiles/woodland_x2.png" width="512" height="128"/> </tileset> - <tileset firstgid="1369" name="collision" tilewidth="32" tileheight="32" tilecount="2" columns="2"> - <image source="../graphics/tiles/collision.png" width="64" height="32"/> - </tileset> + <tileset firstgid="1369" source="../tilesets/collision.tsx"/> <tileset firstgid="1371" source="../tilesets/woodland_x2.tsx"/> <tileset firstgid="1403" name="woodland_ground2" tilewidth="32" tileheight="32" tilecount="256" columns="16"> <image source="../graphics/tiles/woodland_ground2.png" width="512" height="512"/> diff --git a/maps/099-8.tmx b/maps/099-8.tmx index be1fcc3e..5940c68e 100644 --- a/maps/099-8.tmx +++ b/maps/099-8.tmx @@ -4,12 +4,8 @@ <property name="music" value="despair.ogg"/> <property name="name" value="Keshlam's Maze"/> </properties> - <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32" tilecount="2" columns="2"> - <image source="../graphics/tiles/collision.png" width="64" height="32"/> - </tileset> - <tileset firstgid="3" name="cave" tilewidth="32" tileheight="32" tilecount="128" columns="16"> - <image source="../graphics/tiles/cave.png" width="512" height="256"/> - </tileset> + <tileset firstgid="1" source="../tilesets/collision.tsx"/> + <tileset firstgid="3" source="../tilesets/cave.tsx"/> <layer id="4" name="Ground" width="403" height="403"> <data encoding="csv"> 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, diff --git a/rules/cave/rule_cave_001.tmx b/rules/cave/rule_cave_001.tmx index 7944277c..a81ba242 100644 --- a/rules/cave/rule_cave_001.tmx +++ b/rules/cave/rule_cave_001.tmx @@ -1,16 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <map version="1.10" tiledversion="1.11.0" orientation="orthogonal" renderorder="right-down" width="17" height="17" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="1"> <tileset firstgid="1" source="../../tilesets/collision.tsx"/> - <tileset firstgid="3" name="set" tilewidth="32" tileheight="32" tilecount="64" columns="8"> - <image source="../../graphics/tiles/set_cave.png" width="256" height="256"/> - </tileset> + <tileset firstgid="3" source="../../tilesets/set_cave.tsx"/> <tileset firstgid="67" source="../../tilesets/set_rules.tsx"/> - <tileset firstgid="71" name="cave" tilewidth="32" tileheight="32" tilecount="128" columns="16"> - <image source="../../graphics/tiles/cave.png" width="512" height="256"/> - </tileset> - <tileset firstgid="199" name="cave_x2" tilewidth="32" tileheight="64" tilecount="16" columns="16"> - <image source="../../graphics/tiles/cave_x2.png" width="512" height="64"/> - </tileset> + <tileset firstgid="71" source="../../tilesets/cave.tsx"/> + <tileset firstgid="199" source="../../tilesets/cave_x2.tsx"/> <layer id="1" name="regions" width="17" height="17"> <data encoding="base64" compression="gzip"> H4sIAAAAAAAACmNgoA5wJpGmFRis7sAlPlDuIFaeXu4YBSMXAAAIMvB/hAQAAA== diff --git a/rules/cave/rule_cave_002.tmx b/rules/cave/rule_cave_002.tmx index a811bf52..577b66d8 100644 --- a/rules/cave/rule_cave_002.tmx +++ b/rules/cave/rule_cave_002.tmx @@ -6,13 +6,9 @@ <property name="NoOverlappingOutput" type="bool" value="false"/> </properties> <tileset firstgid="1" source="../../tilesets/collision.tsx"/> - <tileset firstgid="3" name="set" tilewidth="32" tileheight="32" tilecount="64" columns="8"> - <image source="../../graphics/tiles/set_cave.png" width="256" height="256"/> - </tileset> + <tileset firstgid="3" source="../../tilesets/set_cave.tsx"/> <tileset firstgid="67" source="../../tilesets/set_rules.tsx"/> - <tileset firstgid="71" name="cave" tilewidth="32" tileheight="32" tilecount="128" columns="16"> - <image source="../../graphics/tiles/cave.png" width="512" height="256"/> - </tileset> + <tileset firstgid="71" source="../../tilesets/cave.tsx"/> <layer id="1" name="regions" width="8" height="6"> <data encoding="base64" compression="gzip"> H4sIAAAAAAAACmNgIAycSZR3RhNzxqEOlzy6fnwAAPmsh/LAAAAA diff --git a/rules/cave/rule_cave_003.tmx b/rules/cave/rule_cave_003.tmx index 4986f455..35f9a1b6 100644 --- a/rules/cave/rule_cave_003.tmx +++ b/rules/cave/rule_cave_003.tmx @@ -1,13 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <map version="1.10" tiledversion="1.11.0" orientation="orthogonal" renderorder="right-down" width="13" height="4" tilewidth="32" tileheight="32" infinite="0" nextlayerid="6" nextobjectid="1"> <tileset firstgid="1" source="../../tilesets/collision.tsx"/> - <tileset firstgid="3" name="set" tilewidth="32" tileheight="32" tilecount="64" columns="8"> - <image source="../../graphics/tiles/set_cave.png" width="256" height="256"/> - </tileset> + <tileset firstgid="3" source="../../tilesets/set_cave.tsx"/> <tileset firstgid="67" source="../../tilesets/set_rules.tsx"/> - <tileset firstgid="71" name="cave" tilewidth="32" tileheight="32" tilecount="128" columns="16"> - <image source="../../graphics/tiles/cave.png" width="512" height="256"/> - </tileset> + <tileset firstgid="71" source="../../tilesets/cave.tsx"/> <layer id="1" name="regions" width="13" height="4"> <data encoding="base64" compression="gzip"> H4sIAAAAAAAACmNgIA84QzGxbHL1kAoAuFNWytAAAAA= diff --git a/rules/cave/rule_cave_004.tmx b/rules/cave/rule_cave_004.tmx index 349b31bd..81168d67 100644 --- a/rules/cave/rule_cave_004.tmx +++ b/rules/cave/rule_cave_004.tmx @@ -1,13 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <map version="1.10" tiledversion="1.11.0" orientation="orthogonal" renderorder="right-down" width="7" height="7" tilewidth="32" tileheight="32" infinite="0" nextlayerid="6" nextobjectid="1"> <tileset firstgid="1" source="../../tilesets/collision.tsx"/> - <tileset firstgid="3" name="set" tilewidth="32" tileheight="32" tilecount="64" columns="8"> - <image source="../../graphics/tiles/set_cave.png" width="256" height="256"/> - </tileset> + <tileset firstgid="3" source="../../tilesets/set_cave.tsx"/> <tileset firstgid="67" source="../../tilesets/set_rules.tsx"/> - <tileset firstgid="71" name="cave" tilewidth="32" tileheight="32" tilecount="128" columns="16"> - <image source="../../graphics/tiles/cave.png" width="512" height="256"/> - </tileset> + <tileset firstgid="71" source="../../tilesets/cave.tsx"/> <layer id="1" name="regions" width="7" height="7"> <data encoding="base64" compression="gzip"> H4sIAAAAAAAACmNgwA+coRidTSs5cgAAwD96ZMQAAAA= diff --git a/rules/cave/rule_cave_005.tmx b/rules/cave/rule_cave_005.tmx index d22572e1..45d3826a 100644 --- a/rules/cave/rule_cave_005.tmx +++ b/rules/cave/rule_cave_005.tmx @@ -1,13 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <map version="1.10" tiledversion="1.11.0" orientation="orthogonal" renderorder="right-down" width="13" height="7" tilewidth="32" tileheight="32" infinite="0" nextlayerid="6" nextobjectid="1"> <tileset firstgid="1" source="../../tilesets/collision.tsx"/> - <tileset firstgid="3" name="set" tilewidth="32" tileheight="32" tilecount="64" columns="8"> - <image source="../../graphics/tiles/set_cave.png" width="256" height="256"/> - </tileset> + <tileset firstgid="3" source="../../tilesets/set_cave.tsx"/> <tileset firstgid="67" source="../../tilesets/set_rules.tsx"/> - <tileset firstgid="71" name="cave" tilewidth="32" tileheight="32" tilecount="128" columns="16"> - <image source="../../graphics/tiles/cave.png" width="512" height="256"/> - </tileset> + <tileset firstgid="71" source="../../tilesets/cave.tsx"/> <layer id="1" name="regions" width="13" height="7"> <data encoding="base64" compression="gzip"> H4sIAAAAAAAACmNgIB84o9GU6MEn7kwCm556SAUAagDkCGwBAAA= diff --git a/rules/cave/rule_cave_006.tmx b/rules/cave/rule_cave_006.tmx index 7c2584eb..58a5f694 100644 --- a/rules/cave/rule_cave_006.tmx +++ b/rules/cave/rule_cave_006.tmx @@ -1,13 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <map version="1.10" tiledversion="1.11.0" orientation="orthogonal" renderorder="right-down" width="6" height="6" tilewidth="32" tileheight="32" infinite="0" nextlayerid="13" nextobjectid="1"> <tileset firstgid="1" source="../../tilesets/collision.tsx"/> - <tileset firstgid="3" name="set" tilewidth="32" tileheight="32" tilecount="64" columns="8"> - <image source="../../graphics/tiles/set_cave.png" width="256" height="256"/> - </tileset> + <tileset firstgid="3" source="../../tilesets/set_cave.tsx"/> <tileset firstgid="67" source="../../tilesets/set_rules.tsx"/> - <tileset firstgid="71" name="cave" tilewidth="32" tileheight="32" tilecount="128" columns="16"> - <image source="../../graphics/tiles/cave.png" width="512" height="256"/> - </tileset> + <tileset firstgid="71" source="../../tilesets/cave.tsx"/> <layer id="1" name="regions" width="6" height="6"> <data encoding="base64" compression="gzip"> H4sIAAAAAAAACmNgwA2ckWhnLOL4ALp6Zyzi2AAAH/dlMZAAAAA= diff --git a/rules/cave/rule_cave_007.tmx b/rules/cave/rule_cave_007.tmx index 03e07f89..e3b4655b 100644 --- a/rules/cave/rule_cave_007.tmx +++ b/rules/cave/rule_cave_007.tmx @@ -1,13 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <map version="1.10" tiledversion="1.11.0" orientation="orthogonal" renderorder="right-down" width="13" height="7" tilewidth="32" tileheight="32" infinite="0" nextlayerid="13" nextobjectid="1"> <tileset firstgid="1" source="../../tilesets/collision.tsx"/> - <tileset firstgid="3" name="set" tilewidth="32" tileheight="32" tilecount="64" columns="8"> - <image source="../../graphics/tiles/set_cave.png" width="256" height="256"/> - </tileset> + <tileset firstgid="3" source="../../tilesets/set_cave.tsx"/> <tileset firstgid="67" source="../../tilesets/set_rules.tsx"/> - <tileset firstgid="71" name="cave" tilewidth="32" tileheight="32" tilecount="128" columns="16"> - <image source="../../graphics/tiles/cave.png" width="512" height="256"/> - </tileset> + <tileset firstgid="71" source="../../tilesets/cave.tsx"/> <layer id="1" name="regions" width="13" height="7"> <data encoding="base64" compression="gzip"> H4sIAAAAAAAACmNgIA84QzGxbHL1DCe3AQBhmwyGbAEAAA== diff --git a/rules/cave/rule_cave_008.tmx b/rules/cave/rule_cave_008.tmx index ad2e6579..6cb00838 100644 --- a/rules/cave/rule_cave_008.tmx +++ b/rules/cave/rule_cave_008.tmx @@ -1,16 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <map version="1.10" tiledversion="1.11.0" orientation="orthogonal" renderorder="right-down" width="13" height="17" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="1"> <tileset firstgid="1" source="../../tilesets/collision.tsx"/> - <tileset firstgid="3" name="set" tilewidth="32" tileheight="32" tilecount="64" columns="8"> - <image source="../../graphics/tiles/set_cave.png" width="256" height="256"/> - </tileset> + <tileset firstgid="3" source="../../tilesets/set_cave.tsx"/> <tileset firstgid="67" source="../../tilesets/set_rules.tsx"/> - <tileset firstgid="71" name="cave" tilewidth="32" tileheight="32" tilecount="128" columns="16"> - <image source="../../graphics/tiles/cave.png" width="512" height="256"/> - </tileset> - <tileset firstgid="199" name="cave_x2" tilewidth="32" tileheight="64" tilecount="16" columns="16"> - <image source="../../graphics/tiles/cave_x2.png" width="512" height="64"/> - </tileset> + <tileset firstgid="71" source="../../tilesets/cave.tsx"/> + <tileset firstgid="199" source="../../tilesets/cave_x2.tsx"/> <layer id="1" name="regions" width="13" height="17"> <data encoding="base64" compression="gzip"> H4sIAAAAAAAACmNgIA84I2Fi+MNRDzUAOebSS88ooA0AAAuES0x0AwAA diff --git a/rules/cave/rule_cave_009.tmx b/rules/cave/rule_cave_009.tmx index 356716c9..54475c9a 100644 --- a/rules/cave/rule_cave_009.tmx +++ b/rules/cave/rule_cave_009.tmx @@ -1,13 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <map version="1.10" tiledversion="1.11.0" orientation="orthogonal" renderorder="right-down" width="6" height="6" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="1"> <tileset firstgid="1" source="../../tilesets/collision.tsx"/> - <tileset firstgid="3" name="set" tilewidth="32" tileheight="32" tilecount="64" columns="8"> - <image source="../../graphics/tiles/set_cave.png" width="256" height="256"/> - </tileset> + <tileset firstgid="3" source="../../tilesets/set_cave.tsx"/> <tileset firstgid="67" source="../../tilesets/set_rules.tsx"/> - <tileset firstgid="71" name="cave" tilewidth="32" tileheight="32" tilecount="128" columns="16"> - <image source="../../graphics/tiles/cave.png" width="512" height="256"/> - </tileset> + <tileset firstgid="71" source="../../tilesets/cave.tsx"/> <layer id="1" name="regions" width="6" height="6"> <data encoding="base64" compression="gzip"> H4sIAAAAAAAACmNgwA2ckWhnLOL4ALp6Zyzi2AAAH/dlMZAAAAA= diff --git a/rules/cave/rule_cave_010.tmx b/rules/cave/rule_cave_010.tmx index a5be5892..06231bda 100644 --- a/rules/cave/rule_cave_010.tmx +++ b/rules/cave/rule_cave_010.tmx @@ -1,13 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <map version="1.10" tiledversion="1.11.0" orientation="orthogonal" renderorder="right-down" width="13" height="7" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="1"> <tileset firstgid="1" source="../../tilesets/collision.tsx"/> - <tileset firstgid="3" name="set" tilewidth="32" tileheight="32" tilecount="64" columns="8"> - <image source="../../graphics/tiles/set_cave.png" width="256" height="256"/> - </tileset> + <tileset firstgid="3" source="../../tilesets/set_cave.tsx"/> <tileset firstgid="67" source="../../tilesets/set_rules.tsx"/> - <tileset firstgid="71" name="cave" tilewidth="32" tileheight="32" tilecount="128" columns="16"> - <image source="../../graphics/tiles/cave.png" width="512" height="256"/> - </tileset> + <tileset firstgid="71" source="../../tilesets/cave.tsx"/> <layer id="1" name="regions" width="13" height="7"> <data encoding="base64" compression="gzip"> H4sIAAAAAAAACmNgIA84QzGxbHL1DCe3AQBhmwyGbAEAAA== diff --git a/rules/cave/rule_cave_050.tmx b/rules/cave/rule_cave_050.tmx index 4133d3ef..90c1b318 100644 --- a/rules/cave/rule_cave_050.tmx +++ b/rules/cave/rule_cave_050.tmx @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <map version="1.10" tiledversion="1.11.0" orientation="orthogonal" renderorder="right-down" width="5" height="5" tilewidth="32" tileheight="32" infinite="0" nextlayerid="14" nextobjectid="1"> <tileset firstgid="1" source="../../tilesets/collision.tsx"/> - <tileset firstgid="3" name="set" tilewidth="32" tileheight="32" tilecount="64" columns="8"> - <image source="../../graphics/tiles/set_cave.png" width="256" height="256"/> - </tileset> + <tileset firstgid="3" source="../../tilesets/set_cave.tsx"/> <tileset firstgid="67" source="../../tilesets/set_rules.tsx"/> <layer id="1" name="regions" width="5" height="5"> <data encoding="base64" compression="gzip"> diff --git a/rules/cave/rule_cave_100.tmx b/rules/cave/rule_cave_100.tmx index 2f633d6e..2790c547 100644 --- a/rules/cave/rule_cave_100.tmx +++ b/rules/cave/rule_cave_100.tmx @@ -1,16 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <map version="1.10" tiledversion="1.11.0" orientation="orthogonal" renderorder="right-down" width="13" height="9" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="1"> <tileset firstgid="1" source="../../tilesets/collision.tsx"/> - <tileset firstgid="3" name="set" tilewidth="32" tileheight="32" tilecount="64" columns="8"> - <image source="../../graphics/tiles/set_cave.png" width="256" height="256"/> - </tileset> + <tileset firstgid="3" source="../../tilesets/set_cave.tsx"/> <tileset firstgid="67" source="../../tilesets/set_rules.tsx"/> - <tileset firstgid="71" name="cave" tilewidth="32" tileheight="32" tilecount="128" columns="16"> - <image source="../../graphics/tiles/cave.png" width="512" height="256"/> - </tileset> - <tileset firstgid="199" name="cave_x2" tilewidth="32" tileheight="64" tilecount="16" columns="16"> - <image source="../../graphics/tiles/cave_x2.png" width="512" height="64"/> - </tileset> + <tileset firstgid="71" source="../../tilesets/cave.tsx"/> + <tileset firstgid="199" source="../../tilesets/cave_x2.tsx"/> <layer id="1" name="regions" width="13" height="9"> <data encoding="base64" compression="gzip"> H4sIAAAAAAAACmNgIA84kyiOLOeMhPGJk2sPIfupbR42d1PTHlIBAHq5GFfUAQAA diff --git a/rules/desert/001.tmx b/rules/desert/001.tmx index 3cdf936d..116b3e57 100644 --- a/rules/desert/001.tmx +++ b/rules/desert/001.tmx @@ -16,9 +16,7 @@ <tileset firstgid="545" name="desert_x5" tilewidth="32" tileheight="160"> <image source="../../graphics/tiles/desert_x5.png" width="192" height="160"/> </tileset> - <tileset firstgid="551" name="set_desert" tilewidth="32" tileheight="32"> - <image source="../../graphics/tiles/set_desert.png" width="320" height="160"/> - </tileset> + <tileset firstgid="551" source="../../tilesets/set_desert.tsx"/> <tileset firstgid="601" source="../../tilesets/set_rules.tsx"/> <layer name="RuleRegions" width="21" height="11"> <data encoding="base64" compression="gzip"> diff --git a/rules/desert/002.tmx b/rules/desert/002.tmx index bafd5b7c..1b42b3e3 100644 --- a/rules/desert/002.tmx +++ b/rules/desert/002.tmx @@ -16,9 +16,7 @@ <tileset firstgid="545" name="desert_x5" tilewidth="32" tileheight="160"> <image source="../../graphics/tiles/desert_x5.png" width="192" height="160"/> </tileset> - <tileset firstgid="551" name="set_desert" tilewidth="32" tileheight="32"> - <image source="../../graphics/tiles/set_desert.png" width="320" height="160"/> - </tileset> + <tileset firstgid="551" source="../../tilesets/set_desert.tsx"/> <tileset firstgid="601" source="../../tilesets/set_rules.tsx"/> <layer name="RuleRegions" width="3" height="3"> <data encoding="base64" compression="gzip"> diff --git a/rules/desert/003.tmx b/rules/desert/003.tmx index 4158c271..d742a917 100644 --- a/rules/desert/003.tmx +++ b/rules/desert/003.tmx @@ -16,9 +16,7 @@ <tileset firstgid="545" name="desert_x5" tilewidth="32" tileheight="160"> <image source="../../graphics/tiles/desert_x5.png" width="192" height="160"/> </tileset> - <tileset firstgid="551" name="set_desert" tilewidth="32" tileheight="32"> - <image source="../../graphics/tiles/set_desert.png" width="320" height="160"/> - </tileset> + <tileset firstgid="551" source="../../tilesets/set_desert.tsx"/> <tileset firstgid="601" source="../../tilesets/set_rules.tsx"/> <layer name="RuleRegions" width="3" height="3"> <data encoding="base64" compression="gzip"> diff --git a/rules/desert/004.tmx b/rules/desert/004.tmx index 159cdf5d..cfeabbf5 100644 --- a/rules/desert/004.tmx +++ b/rules/desert/004.tmx @@ -17,9 +17,7 @@ <image source="../../graphics/tiles/desert_x5.png" width="192" height="160"/> </tileset> <tileset firstgid="551" source="../../tilesets/set_rules.tsx"/> - <tileset firstgid="555" name="set_desert" tilewidth="32" tileheight="32"> - <image source="../../graphics/tiles/set_desert.png" width="320" height="160"/> - </tileset> + <tileset firstgid="555" source="../../tilesets/set_desert.tsx"/> <layer name="RuleRegions" width="3" height="3"> <data encoding="base64" compression="gzip"> H4sIAAAAAAAAA2NgQAXqTAwYAAC8QrrlJAAAAA== diff --git a/rules/desert/010.tmx b/rules/desert/010.tmx index 97b6fa62..0b3650b5 100644 --- a/rules/desert/010.tmx +++ b/rules/desert/010.tmx @@ -17,9 +17,7 @@ <image source="../../graphics/tiles/desert_x5.png" width="192" height="160"/> </tileset> <tileset firstgid="551" source="../../tilesets/set_rules.tsx"/> - <tileset firstgid="555" name="set_desert" tilewidth="32" tileheight="32"> - <image source="../../graphics/tiles/set_desert.png" width="320" height="160"/> - </tileset> + <tileset firstgid="555" source="../../tilesets/set_desert.tsx"/> <layer name="RuleRegions" width="21" height="11"> <data encoding="base64" compression="gzip"> H4sIAAAAAAAAA2NgoA1QZ0LQ2NijZo6CUYAfAAADMqpNnAMAAA== diff --git a/rules/example_cave.tmx b/rules/example_cave.tmx index c0623a40..735094b1 100644 --- a/rules/example_cave.tmx +++ b/rules/example_cave.tmx @@ -1,17 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <map version="1.10" tiledversion="1.11.0" orientation="orthogonal" renderorder="right-down" width="64" height="32" tilewidth="32" tileheight="32" infinite="0" nextlayerid="15" nextobjectid="1"> - <tileset firstgid="1" name="set_cave" tilewidth="32" tileheight="32" tilecount="64" columns="8"> - <image source="../graphics/tiles/set_cave.png" width="256" height="256"/> - </tileset> - <tileset firstgid="65" name="cave" tilewidth="32" tileheight="32" tilecount="128" columns="16"> - <image source="../graphics/tiles/cave.png" width="512" height="256"/> - </tileset> - <tileset firstgid="193" name="collision" tilewidth="32" tileheight="32" tilecount="2" columns="2"> - <image source="../graphics/tiles/collision.png" width="64" height="32"/> - </tileset> - <tileset firstgid="195" name="cave_x2" tilewidth="32" tileheight="64" tilecount="16" columns="16"> - <image source="../graphics/tiles/cave_x2.png" width="512" height="64"/> - </tileset> + <tileset firstgid="1" source="../tilesets/set_cave.tsx"/> + <tileset firstgid="65" source="../tilesets/cave.tsx"/> + <tileset firstgid="193" source="../tilesets/collision.tsx"/> + <tileset firstgid="195" source="../tilesets/cave_x2.tsx"/> <tileset firstgid="211" source="../tilesets/set_rules.tsx"/> <layer id="1" name="set" width="64" height="32"> <data encoding="base64" compression="zlib"> diff --git a/rules/example_icecave.tmx b/rules/example_icecave.tmx index cff468cb..d156485a 100644 --- a/rules/example_icecave.tmx +++ b/rules/example_icecave.tmx @@ -1,12 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd"> <map version="1.0" orientation="orthogonal" width="32" height="32" tilewidth="32" tileheight="32"> - <tileset firstgid="1" name="set_icecave" tilewidth="32" tileheight="32"> - <image source="../graphics/tiles/set_icecave.png" width="128" height="128"/> - </tileset> - <tileset firstgid="17" name="collision" tilewidth="32" tileheight="32"> - <image source="../graphics/tiles/collision.png" width="64" height="32"/> - </tileset> + <tileset firstgid="1" source="../tilesets/set_icecave.tsx"/> + <tileset firstgid="17" source="../tilesets/collision.tsx"/> <tileset firstgid="19" source="../tilesets/icecave.tsx"/> <tileset firstgid="147" source="../tilesets/set_rules.tsx"/> <layer name="set" width="32" height="32" opacity="0.73"> diff --git a/rules/example_mountain.tmx b/rules/example_mountain.tmx index 6f4bba7d..1a627cb0 100644 --- a/rules/example_mountain.tmx +++ b/rules/example_mountain.tmx @@ -1,12 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd"> <map version="1.0" orientation="orthogonal" width="45" height="45" tilewidth="32" tileheight="32"> - <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32"> - <image source="../graphics/tiles/collision.png" width="64" height="32"/> - </tileset> - <tileset firstgid="3" name="set" tilewidth="32" tileheight="32"> - <image source="../graphics/tiles/set_icemountain.png" width="224" height="128"/> - </tileset> + <tileset firstgid="1" source="../tilesets/collision.tsx"/> + <tileset firstgid="3" source="../tilesets/set_icemountain.tsx"/> <tileset firstgid="31" name="Snow" tilewidth="32" tileheight="32"> <image source="../graphics/tiles/Snow.png" width="512" height="512"/> </tileset> diff --git a/rules/icecave/rule_icecave_001.tmx b/rules/icecave/rule_icecave_001.tmx index 150c9d78..9fd127ba 100644 --- a/rules/icecave/rule_icecave_001.tmx +++ b/rules/icecave/rule_icecave_001.tmx @@ -2,9 +2,7 @@ <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd"> <map version="1.0" orientation="orthogonal" width="9" height="9" tilewidth="32" tileheight="32"> <tileset firstgid="1" source="../../tilesets/collision.tsx"/> - <tileset firstgid="3" name="set_icecave" tilewidth="32" tileheight="32"> - <image source="../../graphics/tiles/set_icecave.png" width="128" height="128"/> - </tileset> + <tileset firstgid="3" source="../../tilesets/set_icecave.tsx"/> <tileset firstgid="19" source="../../tilesets/set_rules.tsx"/> <tileset firstgid="23" source="../../tilesets/icecave.tsx"/> <layer name="ruleRegions" width="9" height="9"> diff --git a/rules/icecave/rule_icecave_002.tmx b/rules/icecave/rule_icecave_002.tmx index c9275453..8c2a5ee5 100644 --- a/rules/icecave/rule_icecave_002.tmx +++ b/rules/icecave/rule_icecave_002.tmx @@ -2,9 +2,7 @@ <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd"> <map version="1.0" orientation="orthogonal" width="9" height="6" tilewidth="32" tileheight="32"> <tileset firstgid="1" source="../../tilesets/collision.tsx"/> - <tileset firstgid="3" name="set_icecave" tilewidth="32" tileheight="32"> - <image source="../../graphics/tiles/set_icecave.png" width="128" height="128"/> - </tileset> + <tileset firstgid="3" source="../../tilesets/set_icecave.tsx"/> <tileset firstgid="19" source="../../tilesets/set_rules.tsx"/> <tileset firstgid="23" source="../../tilesets/icecave.tsx"/> <layer name="ruleRegions" width="9" height="6"> diff --git a/rules/icecave/rule_icecave_003.tmx b/rules/icecave/rule_icecave_003.tmx index 99da688b..f1e49c36 100644 --- a/rules/icecave/rule_icecave_003.tmx +++ b/rules/icecave/rule_icecave_003.tmx @@ -2,9 +2,7 @@ <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd"> <map version="1.0" orientation="orthogonal" width="13" height="4" tilewidth="32" tileheight="32"> <tileset firstgid="1" source="../../tilesets/collision.tsx"/> - <tileset firstgid="3" name="set_icecave" tilewidth="32" tileheight="32"> - <image source="../../graphics/tiles/set_icecave.png" width="128" height="128"/> - </tileset> + <tileset firstgid="3" source="../../tilesets/set_icecave.tsx"/> <tileset firstgid="19" source="../../tilesets/set_rules.tsx"/> <tileset firstgid="23" source="../../tilesets/icecave.tsx"/> <layer name="ruleRegions" width="13" height="4"> diff --git a/rules/icecave/rule_icecave_004.tmx b/rules/icecave/rule_icecave_004.tmx index e9aef7c9..1649a711 100644 --- a/rules/icecave/rule_icecave_004.tmx +++ b/rules/icecave/rule_icecave_004.tmx @@ -2,9 +2,7 @@ <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd"> <map version="1.0" orientation="orthogonal" width="7" height="6" tilewidth="32" tileheight="32"> <tileset firstgid="1" source="../../tilesets/collision.tsx"/> - <tileset firstgid="3" name="set_icecave" tilewidth="32" tileheight="32"> - <image source="../../graphics/tiles/set_icecave.png" width="128" height="128"/> - </tileset> + <tileset firstgid="3" source="../../tilesets/set_icecave.tsx"/> <tileset firstgid="19" source="../../tilesets/set_rules.tsx"/> <tileset firstgid="23" source="../../tilesets/icecave.tsx"/> <layer name="ruleRegions" width="7" height="6"> diff --git a/rules/icecave/rule_icecave_005.tmx b/rules/icecave/rule_icecave_005.tmx index 9ade2f22..cb049138 100644 --- a/rules/icecave/rule_icecave_005.tmx +++ b/rules/icecave/rule_icecave_005.tmx @@ -2,9 +2,7 @@ <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd"> <map version="1.0" orientation="orthogonal" width="13" height="7" tilewidth="32" tileheight="32"> <tileset firstgid="1" source="../../tilesets/collision.tsx"/> - <tileset firstgid="3" name="set_icecave" tilewidth="32" tileheight="32"> - <image source="../../graphics/tiles/set_icecave.png" width="128" height="128"/> - </tileset> + <tileset firstgid="3" source="../../tilesets/set_icecave.tsx"/> <tileset firstgid="19" source="../../tilesets/set_rules.tsx"/> <tileset firstgid="23" source="../../tilesets/icecave.tsx"/> <layer name="ruleRegions" width="13" height="7"> diff --git a/rules/icecave/rule_icecave_006.tmx b/rules/icecave/rule_icecave_006.tmx index ec83ae75..a5cc6cb7 100644 --- a/rules/icecave/rule_icecave_006.tmx +++ b/rules/icecave/rule_icecave_006.tmx @@ -2,9 +2,7 @@ <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd"> <map version="1.0" orientation="orthogonal" width="6" height="6" tilewidth="32" tileheight="32"> <tileset firstgid="1" source="../../tilesets/collision.tsx"/> - <tileset firstgid="3" name="set_icecave" tilewidth="32" tileheight="32"> - <image source="../../graphics/tiles/set_icecave.png" width="128" height="128"/> - </tileset> + <tileset firstgid="3" source="../../tilesets/set_icecave.tsx"/> <tileset firstgid="19" source="../../tilesets/set_rules.tsx"/> <tileset firstgid="23" source="../../tilesets/icecave.tsx"/> <layer name="ruleRegions" width="6" height="6"> diff --git a/rules/icecave/rule_icecave_007.tmx b/rules/icecave/rule_icecave_007.tmx index 463d7283..e7c7566e 100644 --- a/rules/icecave/rule_icecave_007.tmx +++ b/rules/icecave/rule_icecave_007.tmx @@ -2,9 +2,7 @@ <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd"> <map version="1.0" orientation="orthogonal" width="13" height="7" tilewidth="32" tileheight="32"> <tileset firstgid="1" source="../../tilesets/collision.tsx"/> - <tileset firstgid="3" name="set_icecave" tilewidth="32" tileheight="32"> - <image source="../../graphics/tiles/set_icecave.png" width="128" height="128"/> - </tileset> + <tileset firstgid="3" source="../../tilesets/set_icecave.tsx"/> <tileset firstgid="19" source="../../tilesets/set_rules.tsx"/> <tileset firstgid="23" source="../../tilesets/icecave.tsx"/> <layer name="ruleRegions" width="13" height="7"> diff --git a/rules/icecave/rule_icecave_009.tmx b/rules/icecave/rule_icecave_009.tmx index a9917172..e056acdc 100644 --- a/rules/icecave/rule_icecave_009.tmx +++ b/rules/icecave/rule_icecave_009.tmx @@ -2,9 +2,7 @@ <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd"> <map version="1.0" orientation="orthogonal" width="6" height="6" tilewidth="32" tileheight="32"> <tileset firstgid="1" source="../../tilesets/collision.tsx"/> - <tileset firstgid="3" name="set_icecave" tilewidth="32" tileheight="32"> - <image source="../../graphics/tiles/set_icecave.png" width="128" height="128"/> - </tileset> + <tileset firstgid="3" source="../../tilesets/set_icecave.tsx"/> <tileset firstgid="19" source="../../tilesets/set_rules.tsx"/> <tileset firstgid="23" source="../../tilesets/icecave.tsx"/> <layer name="ruleRegions" width="6" height="6"> diff --git a/rules/icecave/rule_icecave_010.tmx b/rules/icecave/rule_icecave_010.tmx index 90d3e1d6..12039c67 100644 --- a/rules/icecave/rule_icecave_010.tmx +++ b/rules/icecave/rule_icecave_010.tmx @@ -2,9 +2,7 @@ <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd"> <map version="1.0" orientation="orthogonal" width="13" height="7" tilewidth="32" tileheight="32"> <tileset firstgid="1" source="../../tilesets/collision.tsx"/> - <tileset firstgid="3" name="set_icecave" tilewidth="32" tileheight="32"> - <image source="../../graphics/tiles/set_icecave.png" width="128" height="128"/> - </tileset> + <tileset firstgid="3" source="../../tilesets/set_icecave.tsx"/> <tileset firstgid="19" source="../../tilesets/set_rules.tsx"/> <tileset firstgid="23" source="../../tilesets/icecave.tsx"/> <layer name="ruleRegions" width="13" height="7"> diff --git a/rules/icecave/rule_icecave_020.tmx b/rules/icecave/rule_icecave_020.tmx index d594fa08..10ca308e 100644 --- a/rules/icecave/rule_icecave_020.tmx +++ b/rules/icecave/rule_icecave_020.tmx @@ -2,9 +2,7 @@ <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd"> <map version="1.0" orientation="orthogonal" width="9" height="7" tilewidth="32" tileheight="32"> <tileset firstgid="1" source="../../tilesets/collision.tsx"/> - <tileset firstgid="3" name="set_icecave" tilewidth="32" tileheight="32"> - <image source="../../graphics/tiles/set_icecave.png" width="128" height="128"/> - </tileset> + <tileset firstgid="3" source="../../tilesets/set_icecave.tsx"/> <tileset firstgid="19" source="../../tilesets/set_rules.tsx"/> <tileset firstgid="23" source="../../tilesets/icecave.tsx"/> <layer name="ruleRegions" width="9" height="7"> diff --git a/rules/icecave/rule_icecave_100.tmx b/rules/icecave/rule_icecave_100.tmx index f83b2c34..8160798e 100644 --- a/rules/icecave/rule_icecave_100.tmx +++ b/rules/icecave/rule_icecave_100.tmx @@ -2,9 +2,7 @@ <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd"> <map version="1.0" orientation="orthogonal" width="9" height="6" tilewidth="32" tileheight="32"> <tileset firstgid="1" source="../../tilesets/collision.tsx"/> - <tileset firstgid="3" name="set_icecave" tilewidth="32" tileheight="32"> - <image source="../../graphics/tiles/set_icecave.png" width="128" height="128"/> - </tileset> + <tileset firstgid="3" source="../../tilesets/set_icecave.tsx"/> <tileset firstgid="19" source="../../tilesets/set_rules.tsx"/> <tileset firstgid="23" source="../../tilesets/icecave.tsx"/> <layer name="ruleRegions" width="9" height="6"> diff --git a/rules/icemountain/rule_icemountain.tmx b/rules/icemountain/rule_icemountain.tmx index 6413eac4..c21c8c0b 100644 --- a/rules/icemountain/rule_icemountain.tmx +++ b/rules/icemountain/rule_icemountain.tmx @@ -1,17 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <map version="1.0" orientation="orthogonal" width="16" height="16" tilewidth="32" tileheight="32"> - <tileset firstgid="1" name="set_icemountain" tilewidth="32" tileheight="32"> - <image source="../graphics/tiles/set_icemountain.png" width="96" height="64"/> - </tileset> - <tileset firstgid="7" name="set_rules" tilewidth="32" tileheight="32"> - <image source="../graphics/tiles/set_rules.png" width="32" height="32"/> - </tileset> + <tileset firstgid="1" source="../../tilesets/set_icemountain.tsx"/> + <tileset firstgid="7" source="../../tilesets/set_rules.tsx"/> <tileset firstgid="8" name="Snow" tilewidth="32" tileheight="32"> <image source="../graphics/tiles/Snow.png" width="512" height="512"/> </tileset> - <tileset firstgid="264" name="collision" tilewidth="32" tileheight="32"> - <image source="../graphics/tiles/collision.png" width="64" height="32"/> - </tileset> + <tileset firstgid="264" source="../../tilesets/collision.tsx"/> <layer name="ruleRegions" width="16" height="16"> <data encoding="base64" compression="gzip"> H4sIAAAAAAAAA2NgGAWjYBSMVAAALq+17wAEAAA= diff --git a/rules/icemountain/rule_icemountain_001.tmx b/rules/icemountain/rule_icemountain_001.tmx index 62dc5b99..f34778ae 100644 --- a/rules/icemountain/rule_icemountain_001.tmx +++ b/rules/icemountain/rule_icemountain_001.tmx @@ -1,9 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd"> -<map version="1.0" orientation="orthogonal" width="15" height="5" tilewidth="32" tileheight="32"> - <tileset firstgid="1" name="set_icemountain" tilewidth="32" tileheight="32"> - <image source="../../graphics/tiles/set_icemountain.png" width="224" height="128"/> - </tileset> +<map version="1.11" tiledversion="1.11.1" orientation="orthogonal" renderorder="right-down" width="15" height="5" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="1"> + <tileset firstgid="1" source="../../tilesets/set_icemountain.tsx"/> <tileset firstgid="29" source="../../tilesets/set_rules.tsx"/> <tileset firstgid="33" name="Snow" tilewidth="32" tileheight="32"> <image source="../../graphics/tiles/Snow.png" width="512" height="512"/> diff --git a/rules/icemountain/rule_icemountain_002.tmx b/rules/icemountain/rule_icemountain_002.tmx index 340df407..bd9d3441 100644 --- a/rules/icemountain/rule_icemountain_002.tmx +++ b/rules/icemountain/rule_icemountain_002.tmx @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <map version="1.0" orientation="orthogonal" width="15" height="6" tilewidth="32" tileheight="32"> - <tileset firstgid="1" name="set_icemountain" tilewidth="32" tileheight="32"> - <image source="../../graphics/tiles/set_icemountain.png" width="96" height="64"/> - </tileset> + <tileset firstgid="1" source="../../tilesets/set_icemountain.tsx"/> <tileset firstgid="7" source="../../tilesets/set_rules.tsx"/> <tileset firstgid="8" name="Snow" tilewidth="32" tileheight="32"> <image source="../../graphics/tiles/Snow.png" width="512" height="512"/> diff --git a/rules/icemountain/rule_icemountain_003.tmx b/rules/icemountain/rule_icemountain_003.tmx index 19705639..8ab46ec7 100644 --- a/rules/icemountain/rule_icemountain_003.tmx +++ b/rules/icemountain/rule_icemountain_003.tmx @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <map version="1.0" orientation="orthogonal" width="13" height="9" tilewidth="32" tileheight="32"> - <tileset firstgid="1" name="set_icemountain" tilewidth="32" tileheight="32"> - <image source="../../graphics/tiles/set_icemountain.png" width="96" height="64"/> - </tileset> + <tileset firstgid="1" source="../../tilesets/set_icemountain.tsx"/> <tileset firstgid="7" source="../../tilesets/set_rules.tsx"/> <tileset firstgid="8" name="Snow" tilewidth="32" tileheight="32"> <image source="../../graphics/tiles/Snow.png" width="512" height="512"/> diff --git a/rules/icemountain/rule_icemountain_004.tmx b/rules/icemountain/rule_icemountain_004.tmx index 533faa65..0958ea29 100644 --- a/rules/icemountain/rule_icemountain_004.tmx +++ b/rules/icemountain/rule_icemountain_004.tmx @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <map version="1.0" orientation="orthogonal" width="13" height="9" tilewidth="32" tileheight="32"> - <tileset firstgid="1" name="set_icemountain" tilewidth="32" tileheight="32"> - <image source="../../graphics/tiles/set_icemountain.png" width="96" height="64"/> - </tileset> + <tileset firstgid="1" source="../../tilesets/set_icemountain.tsx"/> <tileset firstgid="7" source="../../tilesets/set_rules.tsx"/> <tileset firstgid="8" name="Snow" tilewidth="32" tileheight="32"> <image source="../../graphics/tiles/Snow.png" width="512" height="512"/> diff --git a/rules/icemountain/rule_icemountain_010.tmx b/rules/icemountain/rule_icemountain_010.tmx index 7ae68dc8..7aa586c6 100644 --- a/rules/icemountain/rule_icemountain_010.tmx +++ b/rules/icemountain/rule_icemountain_010.tmx @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd"> <map version="1.0" orientation="orthogonal" width="30" height="10" tilewidth="32" tileheight="32"> - <tileset firstgid="1" name="set_icemountain" tilewidth="32" tileheight="32"> - <image source="../../graphics/tiles/set_icemountain.png" width="224" height="128"/> - </tileset> + <tileset firstgid="1" source="../../tilesets/set_icemountain.tsx"/> <tileset firstgid="29" source="../../tilesets/set_rules.tsx"/> <tileset firstgid="33" name="Snow" tilewidth="32" tileheight="32"> <image source="../../graphics/tiles/Snow.png" width="512" height="512"/> diff --git a/rules/icemountain/rule_icemountain_011.tmx b/rules/icemountain/rule_icemountain_011.tmx index 6d64ccf7..757b42c0 100644 --- a/rules/icemountain/rule_icemountain_011.tmx +++ b/rules/icemountain/rule_icemountain_011.tmx @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd"> <map version="1.0" orientation="orthogonal" width="19" height="13" tilewidth="32" tileheight="32"> - <tileset firstgid="1" name="set_icemountain" tilewidth="32" tileheight="32"> - <image source="../../graphics/tiles/set_icemountain.png" width="224" height="128"/> - </tileset> + <tileset firstgid="1" source="../../tilesets/set_icemountain.tsx"/> <tileset firstgid="37" source="../../tilesets/set_rules.tsx"/> <tileset firstgid="41" name="Snow" tilewidth="32" tileheight="32"> <image source="../../graphics/tiles/Snow.png" width="512" height="512"/> diff --git a/rules/thermin_cave/rule001.tmx b/rules/thermin_cave/rule001.tmx index 16778310..47015fb8 100644 --- a/rules/thermin_cave/rule001.tmx +++ b/rules/thermin_cave/rule001.tmx @@ -3,9 +3,7 @@ <map version="1.0" orientation="orthogonal" width="15" height="11" tilewidth="32" tileheight="32"> <tileset firstgid="1" source="../../tilesets/collision.tsx"/> <tileset firstgid="3" source="../../tilesets/set_rules.tsx"/> - <tileset firstgid="7" name="set_thermin_cave" tilewidth="32" tileheight="32"> - <image source="../../graphics/tiles/set_thermin_cave.png" width="256" height="256"/> - </tileset> + <tileset firstgid="7" source="../../tilesets/set_thermin_cave.tsx"/> <tileset firstgid="71" name="thermin-cave" tilewidth="32" tileheight="32"> <image source="../../graphics/tiles/thermin-cave.png" width="512" height="256"/> </tileset> diff --git a/rules/thermin_cave/rule002.tmx b/rules/thermin_cave/rule002.tmx index 318840e7..1f999ef7 100644 --- a/rules/thermin_cave/rule002.tmx +++ b/rules/thermin_cave/rule002.tmx @@ -2,9 +2,7 @@ <map version="1.0" orientation="orthogonal" width="15" height="11" tilewidth="32" tileheight="32"> <tileset firstgid="1" source="../../tilesets/collision.tsx"/> <tileset firstgid="3" source="../../tilesets/set_rules.tsx"/> - <tileset firstgid="7" name="set_thermin_cave" tilewidth="32" tileheight="32"> - <image source="../../graphics/tiles/set_thermin_cave.png" width="256" height="256"/> - </tileset> + <tileset firstgid="7" source="../../tilesets/set_thermin_cave.tsx"/> <tileset firstgid="71" name="thermin-cave" tilewidth="32" tileheight="32"> <image source="../../graphics/tiles/thermin-cave.png" width="512" height="256"/> </tileset> diff --git a/rules/thermin_cave/rule003.tmx b/rules/thermin_cave/rule003.tmx index 6924093c..6d700478 100644 --- a/rules/thermin_cave/rule003.tmx +++ b/rules/thermin_cave/rule003.tmx @@ -2,9 +2,7 @@ <map version="1.0" orientation="orthogonal" width="15" height="11" tilewidth="32" tileheight="32"> <tileset firstgid="1" source="../../tilesets/collision.tsx"/> <tileset firstgid="3" source="../../tilesets/set_rules.tsx"/> - <tileset firstgid="7" name="set_thermin_cave" tilewidth="32" tileheight="32"> - <image source="../../graphics/tiles/set_thermin_cave.png" width="256" height="256"/> - </tileset> + <tileset firstgid="7" source="../../tilesets/set_thermin_cave.tsx"/> <tileset firstgid="71" name="thermin-cave" tilewidth="32" tileheight="32"> <image source="../../graphics/tiles/thermin-cave.png" width="512" height="256"/> </tileset> diff --git a/rules/thermin_cave/rule004.tmx b/rules/thermin_cave/rule004.tmx index f69881f2..56750eef 100644 --- a/rules/thermin_cave/rule004.tmx +++ b/rules/thermin_cave/rule004.tmx @@ -2,9 +2,7 @@ <map version="1.0" orientation="orthogonal" width="15" height="11" tilewidth="32" tileheight="32"> <tileset firstgid="1" source="../../tilesets/collision.tsx"/> <tileset firstgid="3" source="../../tilesets/set_rules.tsx"/> - <tileset firstgid="7" name="set_thermin_cave" tilewidth="32" tileheight="32"> - <image source="../../graphics/tiles/set_thermin_cave.png" width="256" height="256"/> - </tileset> + <tileset firstgid="7" source="../../tilesets/set_thermin_cave.tsx"/> <tileset firstgid="71" name="thermin-cave" tilewidth="32" tileheight="32"> <image source="../../graphics/tiles/thermin-cave.png" width="512" height="256"/> </tileset> diff --git a/rules/thermin_cave/rule005.tmx b/rules/thermin_cave/rule005.tmx index 81a3ebab..f1ef2b42 100644 --- a/rules/thermin_cave/rule005.tmx +++ b/rules/thermin_cave/rule005.tmx @@ -2,9 +2,7 @@ <map version="1.0" orientation="orthogonal" width="15" height="11" tilewidth="32" tileheight="32"> <tileset firstgid="1" source="../../tilesets/collision.tsx"/> <tileset firstgid="3" source="../../tilesets/set_rules.tsx"/> - <tileset firstgid="7" name="set_thermin_cave" tilewidth="32" tileheight="32"> - <image source="../../graphics/tiles/set_thermin_cave.png" width="256" height="256"/> - </tileset> + <tileset firstgid="7" source="../../tilesets/set_thermin_cave.tsx"/> <tileset firstgid="71" name="thermin-cave" tilewidth="32" tileheight="32"> <image source="../../graphics/tiles/thermin-cave.png" width="512" height="256"/> </tileset> diff --git a/rules/thermin_cave/rule006.tmx b/rules/thermin_cave/rule006.tmx index d426d3ff..2ffc1e69 100644 --- a/rules/thermin_cave/rule006.tmx +++ b/rules/thermin_cave/rule006.tmx @@ -2,9 +2,7 @@ <map version="1.0" orientation="orthogonal" width="15" height="11" tilewidth="32" tileheight="32"> <tileset firstgid="1" source="../../tilesets/collision.tsx"/> <tileset firstgid="3" source="../../tilesets/set_rules.tsx"/> - <tileset firstgid="7" name="set_thermin_cave" tilewidth="32" tileheight="32"> - <image source="../../graphics/tiles/set_thermin_cave.png" width="256" height="256"/> - </tileset> + <tileset firstgid="7" source="../../tilesets/set_thermin_cave.tsx"/> <tileset firstgid="71" name="thermin-cave" tilewidth="32" tileheight="32"> <image source="../../graphics/tiles/thermin-cave.png" width="512" height="256"/> </tileset> diff --git a/rules/thermin_cave/rule007.tmx b/rules/thermin_cave/rule007.tmx index d426d3ff..2ffc1e69 100644 --- a/rules/thermin_cave/rule007.tmx +++ b/rules/thermin_cave/rule007.tmx @@ -2,9 +2,7 @@ <map version="1.0" orientation="orthogonal" width="15" height="11" tilewidth="32" tileheight="32"> <tileset firstgid="1" source="../../tilesets/collision.tsx"/> <tileset firstgid="3" source="../../tilesets/set_rules.tsx"/> - <tileset firstgid="7" name="set_thermin_cave" tilewidth="32" tileheight="32"> - <image source="../../graphics/tiles/set_thermin_cave.png" width="256" height="256"/> - </tileset> + <tileset firstgid="7" source="../../tilesets/set_thermin_cave.tsx"/> <tileset firstgid="71" name="thermin-cave" tilewidth="32" tileheight="32"> <image source="../../graphics/tiles/thermin-cave.png" width="512" height="256"/> </tileset> diff --git a/rules/thermin_cave/rule008.tmx b/rules/thermin_cave/rule008.tmx index d426d3ff..2ffc1e69 100644 --- a/rules/thermin_cave/rule008.tmx +++ b/rules/thermin_cave/rule008.tmx @@ -2,9 +2,7 @@ <map version="1.0" orientation="orthogonal" width="15" height="11" tilewidth="32" tileheight="32"> <tileset firstgid="1" source="../../tilesets/collision.tsx"/> <tileset firstgid="3" source="../../tilesets/set_rules.tsx"/> - <tileset firstgid="7" name="set_thermin_cave" tilewidth="32" tileheight="32"> - <image source="../../graphics/tiles/set_thermin_cave.png" width="256" height="256"/> - </tileset> + <tileset firstgid="7" source="../../tilesets/set_thermin_cave.tsx"/> <tileset firstgid="71" name="thermin-cave" tilewidth="32" tileheight="32"> <image source="../../graphics/tiles/thermin-cave.png" width="512" height="256"/> </tileset> diff --git a/rules/thermin_cave/rule009.tmx b/rules/thermin_cave/rule009.tmx index d426d3ff..2ffc1e69 100644 --- a/rules/thermin_cave/rule009.tmx +++ b/rules/thermin_cave/rule009.tmx @@ -2,9 +2,7 @@ <map version="1.0" orientation="orthogonal" width="15" height="11" tilewidth="32" tileheight="32"> <tileset firstgid="1" source="../../tilesets/collision.tsx"/> <tileset firstgid="3" source="../../tilesets/set_rules.tsx"/> - <tileset firstgid="7" name="set_thermin_cave" tilewidth="32" tileheight="32"> - <image source="../../graphics/tiles/set_thermin_cave.png" width="256" height="256"/> - </tileset> + <tileset firstgid="7" source="../../tilesets/set_thermin_cave.tsx"/> <tileset firstgid="71" name="thermin-cave" tilewidth="32" tileheight="32"> <image source="../../graphics/tiles/thermin-cave.png" width="512" height="256"/> </tileset> diff --git a/tilesets/set_cave.tsx b/tilesets/set_cave.tsx index 8d9602cd..153fe024 100644 --- a/tilesets/set_cave.tsx +++ b/tilesets/set_cave.tsx @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<tileset version="1.10" tiledversion="1.11.0" name="set_cave" tilewidth="32" tileheight="32" spacing="1" tilecount="49" columns="7"> +<tileset version="1.11" tiledversion="1.11.1" name="set_cave" tilewidth="32" tileheight="32" tilecount="64" columns="8"> <image source="../graphics/tiles/set_cave.png" width="256" height="256"/> </tileset> diff --git a/tilesets/set_desert.tsx b/tilesets/set_desert.tsx new file mode 100644 index 00000000..fc4d0ca8 --- /dev/null +++ b/tilesets/set_desert.tsx @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<tileset version="1.11" tiledversion="1.11.1" name="set_desert" tilewidth="32" tileheight="32" tilecount="50" columns="10"> + <image source="../graphics/tiles/set_desert.png" width="320" height="160"/> +</tileset> diff --git a/tilesets/set_icecave.tsx b/tilesets/set_icecave.tsx new file mode 100644 index 00000000..a1ed64af --- /dev/null +++ b/tilesets/set_icecave.tsx @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<tileset version="1.11" tiledversion="1.11.1" name="set_icecave" tilewidth="32" tileheight="32" tilecount="16" columns="4"> + <image source="../graphics/tiles/set_icecave.png" width="128" height="128"/> +</tileset> diff --git a/tilesets/set_icemountain.tsx b/tilesets/set_icemountain.tsx new file mode 100644 index 00000000..ed571221 --- /dev/null +++ b/tilesets/set_icemountain.tsx @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<tileset version="1.11" tiledversion="1.11.1" name="set_icemountain" tilewidth="32" tileheight="32" tilecount="28" columns="7"> + <image source="../graphics/tiles/set_icemountain.png" width="224" height="128"/> +</tileset> diff --git a/tilesets/set_thermin_cave.tsx b/tilesets/set_thermin_cave.tsx new file mode 100644 index 00000000..3a49570d --- /dev/null +++ b/tilesets/set_thermin_cave.tsx @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<tileset version="1.11" tiledversion="1.11.1" name="set_thermin_cave" tilewidth="32" tileheight="32" tilecount="64" columns="8"> + <image source="../graphics/tiles/set_thermin_cave.png" width="256" height="256"/> +</tileset> |