Updated cave rules to work with latest Tiled

15 files changed, 275 insertions, 269 deletions

diff --git a/rules/automapper.tiled-project b/rules/automapper.tiled-project
new file mode 100644
index 00000000..d0eb5920
--- /dev/null
+++ b/rules/automapper.tiled-project
@@ -0,0 +1,14 @@
+{
+    "automappingRulesFile": "",
+    "commands": [
+    ],
+    "compatibilityVersion": 1100,
+    "extensionsPath": "extensions",
+    "folders": [
+        "."
+    ],
+    "properties": [
+    ],
+    "propertyTypes": [
+    ]
+}
diff --git a/rules/cave/rule_cave_001.tmx b/rules/cave/rule_cave_001.tmx
index 6b41f099..094faa26 100644
--- a/rules/cave/rule_cave_001.tmx
+++ b/rules/cave/rule_cave_001.tmx
@@ -1,54 +1,53 @@
 <?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="17" height="17" tilewidth="32" tileheight="32">
- <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32">
+<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" 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="set" tilewidth="32" tileheight="32">
+ <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="67" name="set_rules" tilewidth="32" tileheight="32">
+ <tileset firstgid="67" name="set_rules" tilewidth="32" tileheight="32" tilecount="4" columns="2">
   <image source="../../graphics/tiles/set_rules.png" width="64" height="64"/>
  </tileset>
- <tileset firstgid="71" name="cave" tilewidth="32" tileheight="32">
+ <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">
+ <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>
- <layer name="ruleRegions" width="17" height="17">
+ <layer id="1" name="regions" width="17" height="17">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoA5wJpGmFRis7sAlPlDuIFaeXu4YBSMXAAAIMvB/hAQAAA==
+   H4sIAAAAAAAACmNgoA5wJpGmFRis7sAlPlDuIFaeXu4YBSMXAAAIMvB/hAQAAA==
   </data>
  </layer>
- <layer name="ruleSet" width="17" height="17">
+ <layer id="2" name="input_set" width="17" height="17">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA9XOSQqAMBBE0YAjzhhRwRH1/md080VocNdRrM2DhKbKGJ146GOAIUYYi7tEqf9KihnmWGCJlbirlXdYbMR7ix32yr0yA44P/wuujnfseDju+WsmnD9dcWd7sesEaEU/nYQEAAA=
+   H4sIAAAAAAAACtXOSQqAMBBE0YAjzhhRwRH1/md080VocNdRrM2DhKbKGJ146GOAIUYYi7tEqf9KihnmWGCJlbirlXdYbMR7ix32yr0yA44P/wuujnfseDju+WsmnD9dcWd7sesEaEU/nYQEAAA=
   </data>
  </layer>
- <layer name="rule_Ground" width="17" height="17">
+ <layer id="3" name="output_Ground" width="17" height="17">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoA7whtL7ofRWNDoaSrtQyT5c4BCU3ovDHS5oNK3ARijtjSZOb3d4o9HogNb2w0ASGj0KRgEMAAB5sOMrhAQAAA==
+   H4sIAAAAAAAACmNgoA7whtL7ofRWNDoaSrtQyT5c4BCU3ovDHS5oNK3ARijtjSZOb3d4o9HogNb2w0ASGj0KRgEMAAB5sOMrhAQAAA==
   </data>
  </layer>
- <layer name="rule_Fringe" width="17" height="17">
+ <layer id="6" name="output_Over" width="17" height="17">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoC1opLH5xIKJA2RvAhp/IZ3tPwilj9PZXlwgYaAdMAoGHQAA9etQ4oQEAAA=
+   H4sIAAAAAAAACmNgGAWjYBSMgoEDAJPZHwSEBAAA
   </data>
  </layer>
- <layer name="rule_Collision" width="17" height="17">
+ <layer id="4" name="output_Fringe" width="17" height="17">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoA1gIsCnFaCXPYQAExpNqjy93UEvMFjiZxQMHgAAgZ1QGoQEAAA=
+   H4sIAAAAAAAACmNgoC1opLH5xIKJA2RvAhp/IZ3tPwilj9PZXlwgYaAdMAoGHQAA9etQ4oQEAAA=
   </data>
  </layer>
- <layer name="rule_Over" width="17" height="17">
+ <layer id="5" name="output_Collision" width="17" height="17">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgGAWjYBSMgoEDAJPZHwSEBAAA
+   H4sIAAAAAAAACmNgoA1gIsCnFaCXPYQAExpNqjy93UEvMFjiZxQMHgAAgZ1QGoQEAAA=
   </data>
  </layer>
- <layer name="rule_Error" width="17" height="17">
+ <layer id="7" name="output_Error" width="17" height="17">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgGAWjYBSMgoEDAJPZHwSEBAAA
+   H4sIAAAAAAAACmNgGAWjYBSMgoEDAJPZHwSEBAAA
   </data>
  </layer>
 </map>
diff --git a/rules/cave/rule_cave_002.tmx b/rules/cave/rule_cave_002.tmx
index 84a43349..7be57bcf 100644
--- a/rules/cave/rule_cave_002.tmx
+++ b/rules/cave/rule_cave_002.tmx
@@ -1,46 +1,50 @@
 <?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="8" height="6" tilewidth="32" tileheight="32">
- <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32">
+<map version="1.10" tiledversion="1.11.0" orientation="orthogonal" renderorder="right-down" width="8" height="6" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="1">
+ <properties>
+  <property name="DeleteTiles" type="bool" value="false"/>
+  <property name="MatchInOrder" type="bool" value="true"/>
+  <property name="NoOverlappingOutput" type="bool" value="false"/>
+ </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="set" tilewidth="32" tileheight="32">
+ <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="67" name="set_rules" tilewidth="32" tileheight="32">
+ <tileset firstgid="67" name="set_rules" tilewidth="32" tileheight="32" tilecount="4" columns="2">
   <image source="../../graphics/tiles/set_rules.png" width="64" height="64"/>
  </tileset>
- <tileset firstgid="71" name="cave" tilewidth="32" tileheight="32">
+ <tileset firstgid="71" name="cave" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../../graphics/tiles/cave.png" width="512" height="256"/>
  </tileset>
- <layer name="ruleRegions" width="8" height="6">
+ <layer id="1" name="regions" width="8" height="6">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIAycSZR3RhNzxqEOlzy6fnwAAPmsh/LAAAAA
+   H4sIAAAAAAAACmNgIAycSZR3RhNzxqEOlzy6fnwAAPmsh/LAAAAA
   </data>
  </layer>
- <layer name="ruleSet" width="8" height="6">
+ <layer id="2" name="input_set" width="8" height="6">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoA1gx8EmRg+x6kEAAKr4TszAAAAA
+   H4sIAAAAAAAACmNgIAzYyZBnJyCPzxxi1YMAANxwvgnAAAAA
   </data>
  </layer>
- <layer name="ruleNotSet" width="8" height="6">
+ <layer id="3" name="output_NotSet" width="8" height="6" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoD5gp4I4LrXoAAAMdXcLwAAAAA==
+   H4sIAAAAAAAACmNgoD5gp4I4LrXoAAAMdXcLwAAAAA==
   </data>
  </layer>
- <layer name="rule_Ground" width="8" height="6">
+ <layer id="4" name="output_Ground" width="8" height="6" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIAyyCchXYxGLQmJ3E2EHMoghQS0Ao0NRssAAAAA=
+   H4sIAAAAAAAACmNgIAyyCchXYxGLQmJ3E2EHMoghQS0Ao0NRssAAAAA=
   </data>
  </layer>
- <layer name="rule_Over" width="8" height="6">
+ <layer id="5" name="output_Over" width="8" height="6" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoB+Io4GZAIKpQ33AAAAA
+   H4sIAAAAAAAACmNgoB+Io4GZAIKpQ33AAAAA
   </data>
  </layer>
- <layer name="rule_Collision" width="8" height="6">
+ <layer id="6" name="output_Collision" width="8" height="6" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIAyYyJBnIiCPzxxi1YMAADYuyefAAAAA
+   H4sIAAAAAAAACmNgIAyYyJBnIiCPzxxi1YMAADYuyefAAAAA
   </data>
  </layer>
 </map>
diff --git a/rules/cave/rule_cave_003.tmx b/rules/cave/rule_cave_003.tmx
index ad85b20d..31b0c0f8 100644
--- a/rules/cave/rule_cave_003.tmx
+++ b/rules/cave/rule_cave_003.tmx
@@ -1,41 +1,40 @@
 <?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="13" height="4" tilewidth="32" tileheight="32">
- <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32">
+<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" 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="set" tilewidth="32" tileheight="32">
+ <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="67" name="set_rules" tilewidth="32" tileheight="32">
+ <tileset firstgid="67" name="set_rules" tilewidth="32" tileheight="32" tilecount="4" columns="2">
   <image source="../../graphics/tiles/set_rules.png" width="64" height="64"/>
  </tileset>
- <tileset firstgid="71" name="cave" tilewidth="32" tileheight="32">
+ <tileset firstgid="71" name="cave" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../../graphics/tiles/cave.png" width="512" height="256"/>
  </tileset>
- <layer name="ruleRegions" width="13" height="4">
+ <layer id="1" name="regions" width="13" height="4">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA84QzGxbHL1kAoAuFNWytAAAAA=
+   H4sIAAAAAAAACmNgIA84QzGxbHL1kAoAuFNWytAAAAA=
   </data>
  </layer>
- <layer name="ruleSet" width="13" height="4">
+ <layer id="2" name="input_set" width="13" height="4" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA+wE+Dj0sOOhc2AJk4JAABwbzCA0AAAAA==
+   H4sIAAAAAAAACmNgIA+wE+Dj0sOOhc2AJk4JAABwbzCA0AAAAA==
   </data>
  </layer>
- <layer name="ruleNotSet" width="13" height="4">
+ <layer id="3" name="output_NotSet" width="13" height="4" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIB+wo9EwNjsWNjHm4OKTAgAwnyyb0AAAAA==
+   H4sIAAAAAAAACmNgIB+wo9EwNjsWNjHm4OKTAgAwnyyb0AAAAA==
   </data>
  </layer>
- <layer name="rule_Ground" width="13" height="4">
+ <layer id="4" name="output_Ground" width="13" height="4">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgGBzAC0r7UGgOAAPIInnQAAAA
+   H4sIAAAAAAAACmNgGBzAC0r7UGgOAAPIInnQAAAA
   </data>
  </layer>
- <layer name="rule_Over" width="13" height="4">
+ <layer id="5" name="output_Over" width="13" height="4">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA/4o/EDkNixUDqeTLMpAQCMFVzp0AAAAA==
+   H4sIAAAAAAAACmNgIA/4o/EDkNixUDqeTLMpAQCMFVzp0AAAAA==
   </data>
  </layer>
 </map>
diff --git a/rules/cave/rule_cave_004.tmx b/rules/cave/rule_cave_004.tmx
index 71361a68..fb52cbfc 100644
--- a/rules/cave/rule_cave_004.tmx
+++ b/rules/cave/rule_cave_004.tmx
@@ -1,41 +1,40 @@
 <?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="7" height="7" tilewidth="32" tileheight="32">
- <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32">
+<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" 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="set" tilewidth="32" tileheight="32">
+ <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="67" name="set_rules" tilewidth="32" tileheight="32">
+ <tileset firstgid="67" name="set_rules" tilewidth="32" tileheight="32" tilecount="4" columns="2">
   <image source="../../graphics/tiles/set_rules.png" width="64" height="64"/>
  </tileset>
- <tileset firstgid="71" name="cave" tilewidth="32" tileheight="32">
+ <tileset firstgid="71" name="cave" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../../graphics/tiles/cave.png" width="512" height="256"/>
  </tileset>
- <layer name="ruleRegions" width="7" height="7">
+ <layer id="1" name="regions" width="7" height="7">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgwA+coRidTSs5cgAAwD96ZMQAAAA=
+   H4sIAAAAAAAACmNgwA+coRidTSs5cgAAwD96ZMQAAAA=
   </data>
  </layer>
- <layer name="ruleSet" width="7" height="7">
+ <layer id="2" name="input_set" width="7" height="7">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoA1gh2J0NrI8AxZxcgAAt2sDDsQAAAA=
+   H4sIAAAAAAAACmNgwA/YoRidTYkcA5ocpQAA/yOthcQAAAA=
   </data>
  </layer>
- <layer name="ruleNotSet" width="7" height="7">
+ <layer id="3" name="output_NotSet" width="7" height="7" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoD9gJ8AnFQAAUPPppcQAAAA=
+   H4sIAAAAAAAACmNgoD9gJ8AnFQAAUPPppcQAAAA=
   </data>
  </layer>
- <layer name="rule_Ground" width="7" height="7">
+ <layer id="4" name="output_Ground" width="7" height="7" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIAzyoXQuFrl6KF2LRa4fSvcSYQclAAD6CzmwxAAAAA==
+   H4sIAAAAAAAACmNgIAzyoXQuFrl6KF2LRa4fSvcSYQclAAD6CzmwxAAAAA==
   </data>
  </layer>
- <layer name="rule_Collision" width="7" height="7">
+ <layer id="5" name="output_Collision" width="7" height="7" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgwA+YoBidTYkcA5ocpQAAeqBqScQAAAA=
+   H4sIAAAAAAAACmNgwA+YoBidTYkcA5ocpQAAeqBqScQAAAA=
   </data>
  </layer>
 </map>
diff --git a/rules/cave/rule_cave_005.tmx b/rules/cave/rule_cave_005.tmx
index 389efd17..fc8c81a5 100644
--- a/rules/cave/rule_cave_005.tmx
+++ b/rules/cave/rule_cave_005.tmx
@@ -1,41 +1,40 @@
 <?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="13" height="7" tilewidth="32" tileheight="32">
- <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32">
+<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" 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="set" tilewidth="32" tileheight="32">
+ <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="67" name="set_rules" tilewidth="32" tileheight="32">
+ <tileset firstgid="67" name="set_rules" tilewidth="32" tileheight="32" tilecount="4" columns="2">
   <image source="../../graphics/tiles/set_rules.png" width="64" height="64"/>
  </tileset>
- <tileset firstgid="71" name="cave" tilewidth="32" tileheight="32">
+ <tileset firstgid="71" name="cave" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../../graphics/tiles/cave.png" width="512" height="256"/>
  </tileset>
- <layer name="ruleRegions" width="13" height="7">
+ <layer id="1" name="regions" width="13" height="7">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIB84o9GU6MEn7kwCm556SAUAagDkCGwBAAA=
+   H4sIAAAAAAAACmNgIB84o9GU6MEn7kwCm556SAUAagDkCGwBAAA=
   </data>
  </layer>
- <layer name="ruleSet" width="13" height="7">
+ <layer id="2" name="input_set" width="13" height="7">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgGByAHY1GFmfHwsanh5B5uPTQGgAAJVBklGwBAAA=
+   H4sIAAAAAAAACmNgIB+wo9GU6MEnzo6FTch+Uu2hBwAAgfk3ZGwBAAA=
   </data>
  </layer>
- <layer name="ruleNotSet" width="13" height="7" opacity="0.6">
+ <layer id="3" name="output_NotSet" width="13" height="7" visible="0" opacity="0.6">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgGJqAHQ8flxwhPewksMkBAFgzOlVsAQAA
+   H4sIAAAAAAAACmNgGJqAHQ8flxwhPewksMkBAFgzOlVsAQAA
   </data>
  </layer>
- <layer name="rule_Ground" width="13" height="7">
+ <layer id="4" name="output_Ground" width="13" height="7">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIB9EQOlIEvRkQOlMNPEsKJ2DRU8FlK5EE6+C0jVY9HRA6U408S4o3YPHjbQCANIIx+JsAQAA
+   H4sIAAAAAAAACmNgIB9EQOlIEvRkQOlMNPEsKJ2DRU8FlK5EE6+C0jVY9HRA6U408S4o3YPHjbQCANIIx+JsAQAA
   </data>
  </layer>
- <layer name="rule_Collision" width="13" height="7">
+ <layer id="5" name="output_Collision" width="13" height="7">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIB8wodGU6MFnFr300BoAAErWG9FsAQAA
+   H4sIAAAAAAAACmNgIB8wodGU6MFnFr300BoAAErWG9FsAQAA
   </data>
  </layer>
 </map>
diff --git a/rules/cave/rule_cave_006.tmx b/rules/cave/rule_cave_006.tmx
index 5dc88e2d..e00e0b56 100644
--- a/rules/cave/rule_cave_006.tmx
+++ b/rules/cave/rule_cave_006.tmx
@@ -1,76 +1,75 @@
 <?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="6" height="6" tilewidth="32" tileheight="32">
- <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32">
+<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" 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="set" tilewidth="32" tileheight="32">
+ <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="67" name="set_rules" tilewidth="32" tileheight="32">
+ <tileset firstgid="67" name="set_rules" tilewidth="32" tileheight="32" tilecount="4" columns="2">
   <image source="../../graphics/tiles/set_rules.png" width="64" height="64"/>
  </tileset>
- <tileset firstgid="71" name="cave" tilewidth="32" tileheight="32">
+ <tileset firstgid="71" name="cave" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../../graphics/tiles/cave.png" width="512" height="256"/>
  </tileset>
- <layer name="ruleRegions" width="6" height="6">
+ <layer id="1" name="regions" width="6" height="6">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgwA2ckWhnLOL4ALp6Zyzi2AAAH/dlMZAAAAA=
+   H4sIAAAAAAAACmNgwA2ckWhnLOL4ALp6Zyzi2AAAH/dlMZAAAAA=
   </data>
  </layer>
- <layer name="ruleSet" width="6" height="6">
+ <layer id="2" name="input_set" width="6" height="6" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIAzECPCppQcEAF5x3w6QAAAA
+   H4sIAAAAAAAACmNgIAzECPCppQcEAF5x3w6QAAAA
   </data>
  </layer>
- <layer name="ruleSet" width="6" height="6">
+ <layer id="3" name="input_set" width="6" height="6" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIAz4CPCppQcEAMFTlWKQAAAA
+   H4sIAAAAAAAACmNgIAz4CPCppQcEAMFTlWKQAAAA
   </data>
  </layer>
- <layer name="ruleSet" width="6" height="6">
+ <layer id="4" name="input_set" width="6" height="6" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIAzYCPCppQcEAItPfPCQAAAA
+   H4sIAAAAAAAACmNgIAzYCPCppQcEAItPfPCQAAAA
   </data>
  </layer>
- <layer name="ruleSet" width="6" height="6">
+ <layer id="5" name="input_set" width="6" height="6" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIAx4CfCppQcEAOr1Fs+QAAAA
+   H4sIAAAAAAAACmNgIAx4CfCppQcEAOr1Fs+QAAAA
   </data>
  </layer>
- <layer name="ruleSet" width="6" height="6">
+ <layer id="6" name="input_set" width="6" height="6" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIAxYCfCppQcEAKDp/12QAAAA
+   H4sIAAAAAAAACmNgIAxYCfCppQcEAKDp/12QAAAA
   </data>
  </layer>
- <layer name="ruleNotSet" width="6" height="6" opacity="0.06">
+ <layer id="7" name="output_NotSet" width="6" height="6" visible="0" opacity="0.96">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgwA3EcLBJBaSYAwCr1UHrkAAAAA==
+   H4sIAAAAAAAACmNgwA3EcLBJBaSYAwCr1UHrkAAAAA==
   </data>
  </layer>
- <layer name="ruleNotSet" width="6" height="6" opacity="0.06">
+ <layer id="8" name="output_NotSet" width="6" height="6" visible="0" opacity="0.96">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgwA34cLBJBaSYAwDclnPrkAAAAA==
+   H4sIAAAAAAAACmNgwA34cLBJBaSYAwDclnPrkAAAAA==
   </data>
  </layer>
- <layer name="ruleNotSet" width="6" height="6" opacity="0.05">
+ <layer id="9" name="output_NotSet" width="6" height="6" visible="0" opacity="0.79">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgwA3YcLBJBaSYAwDxV2LrkAAAAA==
+   H4sIAAAAAAAACmNgwA3YcLBJBaSYAwDxV2LrkAAAAA==
   </data>
  </layer>
- <layer name="ruleNotSet" width="6" height="6" opacity="0.08">
+ <layer id="10" name="output_NotSet" width="6" height="6" visible="0" opacity="0.88">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgwA14cbBJBaSYAwDKPH9LkAAAAA==
+   H4sIAAAAAAAACmNgwA14cbBJBaSYAwDKPH9LkAAAAA==
   </data>
  </layer>
- <layer name="ruleNotSet" width="6" height="6" opacity="0.09">
+ <layer id="11" name="output_NotSet" width="6" height="6" visible="0" opacity="0.92">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgwA1YcbBJBaSYAwDn/W5LkAAAAA==
+   H4sIAAAAAAAACmNgwA1YcbBJBaSYAwDn/W5LkAAAAA==
   </data>
  </layer>
- <layer name="rule_Ground" width="6" height="6">
+ <layer id="12" name="output_Ground" width="6" height="6" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIAy2ofGXEqHnKBp/CxF6QAAAOgJv95AAAAA=
+   H4sIAAAAAAAACmNgIAy2ofGXEqHnKBp/CxF6QAAAOgJv95AAAAA=
   </data>
  </layer>
 </map>
diff --git a/rules/cave/rule_cave_007.tmx b/rules/cave/rule_cave_007.tmx
index c09b703f..6183fcdb 100644
--- a/rules/cave/rule_cave_007.tmx
+++ b/rules/cave/rule_cave_007.tmx
@@ -1,76 +1,75 @@
 <?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="13" height="7" tilewidth="32" tileheight="32">
- <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32">
+<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" 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="set" tilewidth="32" tileheight="32">
+ <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="67" name="set_rules" tilewidth="32" tileheight="32">
+ <tileset firstgid="67" name="set_rules" tilewidth="32" tileheight="32" tilecount="4" columns="2">
   <image source="../../graphics/tiles/set_rules.png" width="64" height="64"/>
  </tileset>
- <tileset firstgid="71" name="cave" tilewidth="32" tileheight="32">
+ <tileset firstgid="71" name="cave" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../../graphics/tiles/cave.png" width="512" height="256"/>
  </tileset>
- <layer name="ruleRegions" width="13" height="7">
+ <layer id="1" name="regions" width="13" height="7">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA84QzGxbHL1DCe3AQBhmwyGbAEAAA==
+   H4sIAAAAAAAACmNgIA84QzGxbHL1DCe3AQBhmwyGbAEAAA==
   </data>
  </layer>
- <layer name="ruleSet" width="13" height="7">
+ <layer id="2" name="input_set" width="13" height="7">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoC4Qg2J0NrI8A5o4LjWUuoMa9hDyDykAACD2PadsAQAA
+   H4sIAAAAAAAACmNgoC4Qg2J0NrI8A5o4LjWUuoMa9hDyDykAACD2PadsAQAA
   </data>
  </layer>
- <layer name="ruleSet" width="13" height="7">
+ <layer id="3" name="input_set" width="13" height="7" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoC7gg2J0NrI8A5o4LjWUuoMa9hDyDykAACKwIxZsAQAA
+   H4sIAAAAAAAACmNgoC7gg2J0NrI8A5o4LjWUuoMa9hDyDykAACKwIxZsAQAA
   </data>
  </layer>
- <layer name="ruleSet" width="13" height="7">
+ <layer id="4" name="input_set" width="13" height="7" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoC5gg2J0NrI8A5o4LjWUuoMa9hDyDykAANyNKXlsAQAA
+   H4sIAAAAAAAACmNgoC5gg2J0NrI8A5o4LjWUuoMa9hDyDykAANyNKXlsAQAA
   </data>
  </layer>
- <layer name="ruleSet" width="13" height="7">
+ <layer id="5" name="input_set" width="13" height="7" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoC7ghWJ0NrI8A5o4LjWUuoMa9hDyDykAAHI53HZsAQAA
+   H4sIAAAAAAAACmNgoC7ghWJ0NrI8A5o4LjWUuoMa9hDyDykAAHI53HZsAQAA
   </data>
  </layer>
- <layer name="ruleSet" width="13" height="7">
+ <layer id="6" name="input_set" width="13" height="7" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoC5ghWJ0NrI8A5o4LjWUuoMa9hDyDykAAIwE1hlsAQAA
+   H4sIAAAAAAAACmNgoC5ghWJ0NrI8A5o4LjWUuoMa9hDyDykAAIwE1hlsAQAA
   </data>
  </layer>
- <layer name="ruleNotSet" width="13" height="7" opacity="0.11">
+ <layer id="7" name="output_NotSet" width="13" height="7" visible="0" opacity="0.11">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA+IQTE6m5AeXHwxHGrIAeTYQ45/SAUAXzfD8GwBAAA=
+   H4sIAAAAAAAACmNgIA+IQTE6m5AeXHwxHGrIAeTYQ45/SAUAXzfD8GwBAAA=
   </data>
  </layer>
- <layer name="ruleNotSet" width="13" height="7" opacity="0.11">
+ <layer id="8" name="output_NotSet" width="13" height="7" visible="0" opacity="0.11">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA/wQTE6m5AeXHw+HGrIAeTYQ45/SAUAXeR57mwBAAA=
+   H4sIAAAAAAAACmNgIA/wQTE6m5AeXHw+HGrIAeTYQ45/SAUAXeR57mwBAAA=
   </data>
  </layer>
- <layer name="ruleNotSet" width="13" height="7" opacity="0.11">
+ <layer id="9" name="output_NotSet" width="13" height="7" visible="0" opacity="0.11">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA+wQTE6m5AeXHw2HGrIAeTYQ45/SAUAnKjAUmwBAAA=
+   H4sIAAAAAAAACmNgIA+wQTE6m5AeXHw2HGrIAeTYQ45/SAUAnKjAUmwBAAA=
   </data>
  </layer>
- <layer name="ruleNotSet" width="13" height="7" opacity="0.11">
+ <layer id="10" name="output_NotSet" width="13" height="7" visible="0" opacity="0.11">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA/wQjE6m5AeXHxeHGrIAeTYQ45/SAUArf9ym2wBAAA=
+   H4sIAAAAAAAACmNgIA/wQjE6m5AeXHxeHGrIAeTYQ45/SAUArf9ym2wBAAA=
   </data>
  </layer>
- <layer name="ruleNotSet" width="13" height="7" opacity="0.11">
+ <layer id="11" name="output_NotSet" width="13" height="7" visible="0" opacity="0.91">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA+wQjE6m5AeXHxWHGrIAeTYQ45/SAUAbLPLJ2wBAAA=
+   H4sIAAAAAAAACmNgIA+wQjE6m5AeXHxWHGrIAeTYQ45/SAUAbLPLJ2wBAAA=
   </data>
  </layer>
- <layer name="rule_Ground" width="13" height="7">
+ <layer id="12" name="output_Ground" width="13" height="7">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoC5YhMZfjMZfAqWXUdledHAESh+j0JxNaPzNFJgFAEOilfhsAQAA
+   H4sIAAAAAAAACmNgoC5YhMZfjMZfAqWXUdledHAESh+j0JxNaPzNFJgFAEOilfhsAQAA
   </data>
  </layer>
 </map>
diff --git a/rules/cave/rule_cave_008.tmx b/rules/cave/rule_cave_008.tmx
index bf370132..dd4779f3 100644
--- a/rules/cave/rule_cave_008.tmx
+++ b/rules/cave/rule_cave_008.tmx
@@ -1,49 +1,48 @@
 <?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="13" height="17" tilewidth="32" tileheight="32">
- <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32">
+<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" 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="set" tilewidth="32" tileheight="32">
+ <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="67" name="set_rules" tilewidth="32" tileheight="32">
+ <tileset firstgid="67" name="set_rules" tilewidth="32" tileheight="32" tilecount="4" columns="2">
   <image source="../../graphics/tiles/set_rules.png" width="64" height="64"/>
  </tileset>
- <tileset firstgid="71" name="cave" tilewidth="32" tileheight="32">
+ <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">
+ <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>
- <layer name="ruleRegions" width="13" height="17">
+ <layer id="1" name="regions" width="13" height="17">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA84I2Fi+MNRDzUAOebSS88ooA0AAAuES0x0AwAA
+   H4sIAAAAAAAACmNgIA84I2Fi+MNRDzUAOebSS88ooA0AAAuES0x0AwAA
   </data>
  </layer>
- <layer name="ruleSet" width="13" height="17">
+ <layer id="2" name="input_set" width="13" height="17">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA+wI2Fi+PTWI4GmRh6NL46mZygBkLv5GUhzP7ZwGgUDAwCsvj4ldAMAAA==
+   H4sIAAAAAAAACmNgIA+wI2Fi+PTWI4GmRh6NL46mZygBkLv5GUhzP7ZwGgUDAwCsvj4ldAMAAA==
   </data>
  </layer>
- <layer name="ruleSet" width="13" height="17">
+ <layer id="3" name="input_set" width="13" height="17">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgGBlAAI3PMSCuGAWjgIEBAFKSi7B0AwAA
+   H4sIAAAAAAAACmNgGBlAAI3PMSCuGAWjgIEBAFKSi7B0AwAA
   </data>
  </layer>
- <layer name="ruleNotSet" width="13" height="17" opacity="0.36">
+ <layer id="4" name="output_NotSet" width="13" height="17" opacity="0.36">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgGAUgwI6EieHTyt5RMPwBAE+qjq10AwAA
+   H4sIAAAAAAAACmNgGAUgwI6EieHTyt5RMPwBAE+qjq10AwAA
   </data>
  </layer>
- <layer name="rule_Ground" width="13" height="17">
+ <layer id="5" name="output_Ground" width="13" height="17">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA9EI2Fi+CCQjYSJ4YPAXCCeB8TzofwWIG4F4jYoPwSIQ4E4DEnPWiBeB8TrofwpQDwViKdB+SlAnArEaUT6FQRKgLgUiMtI0EMr4I2EaalnFNAGAADyhvLUdAMAAA==
+   H4sIAAAAAAAACmNgIA9EI2Fi+CCQjYSJ4YPAXCCeB8TzofwWIG4F4jYoPwSIQ4E4DEnPWiBeB8TrofwpQDwViKdB+SlAnArEaUT6FQRKgLgUiMtI0EMr4I2EaalnFNAGAADyhvLUdAMAAA==
   </data>
  </layer>
- <layer name="rule_Over" width="13" height="17">
+ <layer id="6" name="output_Over" width="13" height="17">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgGAUDCeKQMLHAHQkTC04D8RkgPkuCnlFAGwAAqtusvHQDAAA=
+   H4sIAAAAAAAACmNgGAUDCeKQMLHAHQkTC04D8RkgPkuCnlFAGwAAqtusvHQDAAA=
   </data>
  </layer>
 </map>
diff --git a/rules/cave/rule_cave_009.tmx b/rules/cave/rule_cave_009.tmx
index dd4800c3..4abe0eb8 100644
--- a/rules/cave/rule_cave_009.tmx
+++ b/rules/cave/rule_cave_009.tmx
@@ -1,46 +1,45 @@
 <?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="6" height="6" tilewidth="32" tileheight="32">
- <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32">
+<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" 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="set" tilewidth="32" tileheight="32">
+ <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="67" name="set_rules" tilewidth="32" tileheight="32">
+ <tileset firstgid="67" name="set_rules" tilewidth="32" tileheight="32" tilecount="4" columns="2">
   <image source="../../graphics/tiles/set_rules.png" width="64" height="64"/>
  </tileset>
- <tileset firstgid="71" name="cave" tilewidth="32" tileheight="32">
+ <tileset firstgid="71" name="cave" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../../graphics/tiles/cave.png" width="512" height="256"/>
  </tileset>
- <layer name="ruleRegions" width="6" height="6">
+ <layer id="1" name="regions" width="6" height="6">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgwA2ckWhnLOL4ALp6Zyzi2AAAH/dlMZAAAAA=
+   H4sIAAAAAAAACmNgwA2ckWhnLOL4ALp6Zyzi2AAAH/dlMZAAAAA=
   </data>
  </layer>
- <layer name="ruleSet" width="6" height="6">
+ <layer id="2" name="input_set" width="6" height="6">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIAxUCPCppQcEAFLwSR+QAAAA
+   H4sIAAAAAAAACmNgIAxUCPCppQcEAFLwSR+QAAAA
   </data>
  </layer>
- <layer name="ruleSet" width="6" height="6">
+ <layer id="3" name="input_set" width="6" height="6">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIAyUCfCppQcEAFzYvvuQAAAA
+   H4sIAAAAAAAACmNgIAyUCfCppQcEAFzYvvuQAAAA
   </data>
  </layer>
- <layer name="ruleNotSet" width="6" height="6" opacity="0.36">
+ <layer id="4" name="output_NotSet" width="6" height="6" opacity="0.36">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgwA1UcLBJBaSYAwCeYv2dkAAAAA==
+   H4sIAAAAAAAACmNgwA1UcLBJBaSYAwCeYv2dkAAAAA==
   </data>
  </layer>
- <layer name="ruleNotSet" width="6" height="6" opacity="0.33">
+ <layer id="5" name="output_NotSet" width="6" height="6" opacity="0.33">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgwA2UcbBJBaSYAwA+q0HQkAAAAA==
+   H4sIAAAAAAAACmNgwA2UcbBJBaSYAwA+q0HQkAAAAA==
   </data>
  </layer>
- <layer name="rule_Ground" width="6" height="6">
+ <layer id="6" name="output_Ground" width="6" height="6">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIAyS0fhBROgpQuMnEqEHBAAgX4OJkAAAAA==
+   H4sIAAAAAAAACmNgIAyS0fhBROgpQuMnEqEHBAAgX4OJkAAAAA==
   </data>
  </layer>
 </map>
diff --git a/rules/cave/rule_cave_010.tmx b/rules/cave/rule_cave_010.tmx
index 54dbfda3..e26e41c6 100644
--- a/rules/cave/rule_cave_010.tmx
+++ b/rules/cave/rule_cave_010.tmx
@@ -1,51 +1,50 @@
 <?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="13" height="7" tilewidth="32" tileheight="32">
- <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32">
+<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" 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="set" tilewidth="32" tileheight="32">
+ <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="67" name="set_rules" tilewidth="32" tileheight="32">
+ <tileset firstgid="67" name="set_rules" tilewidth="32" tileheight="32" tilecount="4" columns="2">
   <image source="../../graphics/tiles/set_rules.png" width="64" height="64"/>
  </tileset>
- <tileset firstgid="71" name="cave" tilewidth="32" tileheight="32">
+ <tileset firstgid="71" name="cave" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../../graphics/tiles/cave.png" width="512" height="256"/>
  </tileset>
- <layer name="ruleRegions" width="13" height="7">
+ <layer id="1" name="regions" width="13" height="7">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA84QzGxbHL1DCe3AQBhmwyGbAEAAA==
+   H4sIAAAAAAAACmNgIA84QzGxbHL1DCe3AQBhmwyGbAEAAA==
   </data>
  </layer>
- <layer name="ruleSet" width="13" height="7">
+ <layer id="2" name="input_set" width="13" height="7">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoC5QgWJ0NrI8A5o4LjWUuoMa9hDyDykAADpwCuhsAQAA
+   H4sIAAAAAAAACmNgoC5QgWJ0NrI8A5o4LjWUuoMa9hDyDykAADpwCuhsAQAA
   </data>
  </layer>
- <layer name="ruleSet" width="13" height="7">
+ <layer id="3" name="input_set" width="13" height="7">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoC5QhmJ0NrI8A5o4LjWUuoMa9hDyDykAAJXncL9sAQAA
+   H4sIAAAAAAAACmNgoC5QhmJ0NrI8A5o4LjWUuoMa9hDyDykAAJXncL9sAQAA
   </data>
  </layer>
- <layer name="ruleNotSet" width="13" height="7" opacity="0.33">
+ <layer id="4" name="output_NotSet" width="13" height="7" opacity="0.33">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIB+ooNHEqsfGJ9UsWthDTTdgAwDBPBNdbAEAAA==
+   H4sIAAAAAAAACmNgIB+ooNHEqsfGJ9UsWthDTTdgAwDBPBNdbAEAAA==
   </data>
  </layer>
- <layer name="ruleNotSet" width="13" height="7" opacity="0.36">
+ <layer id="5" name="output_NotSet" width="13" height="7" opacity="0.36">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIB8oo9HEqsfGJ9UsWthDTTdgAwAUJIhnbAEAAA==
+   H4sIAAAAAAAACmNgIB8oo9HEqsfGJ9UsWthDTTdgAwAUJIhnbAEAAA==
   </data>
  </layer>
- <layer name="rule_Ground" width="13" height="7">
+ <layer id="6" name="output_Ground" width="13" height="7">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoC5oQuM3o/EDoXQwle1FB4VQuphCcyah8SdTYBYAy7rYPmwBAAA=
+   H4sIAAAAAAAACmNgoC5oQuM3o/EDoXQwle1FB4VQuphCcyah8SdTYBYAy7rYPmwBAAA=
   </data>
  </layer>
- <layer name="rule_Collision" width="13" height="7">
+ <layer id="7" name="output_Collision" width="13" height="7">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgGAX0AgB8n9a4bAEAAA==
+   H4sIAAAAAAAACmNgGAX0AgB8n9a4bAEAAA==
   </data>
  </layer>
 </map>
diff --git a/rules/cave/rule_cave_050.tmx b/rules/cave/rule_cave_050.tmx
index ae96c130..7786aa40 100644
--- a/rules/cave/rule_cave_050.tmx
+++ b/rules/cave/rule_cave_050.tmx
@@ -1,78 +1,77 @@
 <?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="5" height="5" tilewidth="32" tileheight="32">
- <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32">
+<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" 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="set" tilewidth="32" tileheight="32">
+ <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="67" name="set_rules" tilewidth="32" tileheight="32">
+ <tileset firstgid="67" name="set_rules" tilewidth="32" tileheight="32" tilecount="4" columns="2">
   <image source="../../graphics/tiles/set_rules.png" width="64" height="64"/>
  </tileset>
- <layer name="ruleRegions" width="5" height="5">
+ <layer id="1" name="regions" width="5" height="5">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgwA2csfCdcYjjAwBFZMEtZAAAAA==
+   H4sIAAAAAAAACmNgwA2csfCdcYjjAwBFZMEtZAAAAA==
   </data>
  </layer>
- <layer name="ruleSet" width="5" height="5">
+ <layer id="2" name="input_set" width="5" height="5" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgwA24cfBxieMCAL942VBkAAAA
+   H4sIAAAAAAAACmNgwA24cfBxieMCAL942VBkAAAA
   </data>
  </layer>
- <layer name="ruleSet" width="5" height="5">
+ <layer id="3" name="input_set" width="5" height="5" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgwA2EcfBxieMCAMG3CItkAAAA
+   H4sIAAAAAAAACmNgwA2EcfBxieMCAMG3CItkAAAA
   </data>
  </layer>
- <layer name="ruleSet" width="5" height="5">
+ <layer id="4" name="input_set" width="5" height="5" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgwA1EcPBxieMCAAvusS9kAAAA
+   H4sIAAAAAAAACmNgwA1EcPBxieMCAAvusS9kAAAA
   </data>
  </layer>
- <layer name="ruleSet" width="5" height="5">
+ <layer id="5" name="input_set" width="5" height="5" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgwA1kcPBxieMCACGr/mZkAAAA
+   H4sIAAAAAAAACmNgwA1kcPBxieMCACGr/mZkAAAA
   </data>
  </layer>
- <layer name="ruleSet" width="5" height="5">
+ <layer id="6" name="input_set" width="5" height="5" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgwA1UcPBxieMCALZ2Y0NkAAAA
+   H4sIAAAAAAAACmNgwA1UcPBxieMCALZ2Y0NkAAAA
   </data>
  </layer>
- <layer name="ruleSet" width="5" height="5">
+ <layer id="7" name="input_set" width="5" height="5" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgwA1YcfBxieMCAGrN2sJkAAAA
+   H4sIAAAAAAAACmNgwA1YcfBxieMCAGrN2sJkAAAA
   </data>
  </layer>
- <layer name="ruleSet" width="5" height="5">
+ <layer id="8" name="input_set" width="5" height="5" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgwA3YcfBxieMCAACfMT1kAAAA
+   H4sIAAAAAAAACmNgwA3YcfBxieMCAACfMT1kAAAA
   </data>
  </layer>
- <layer name="ruleSet" width="5" height="5">
+ <layer id="9" name="input_set" width="5" height="5" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgwA3EcfBxieMCAFQVr69kAAAA
+   H4sIAAAAAAAACmNgwA3EcfBxieMCAFQVr69kAAAA
   </data>
  </layer>
- <layer name="ruleSet" width="5" height="5">
+ <layer id="10" name="input_set" width="5" height="5" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgwA3kcfBxieMCAH5Q4OZkAAAA
+   H4sIAAAAAAAACmNgwA3kcfBxieMCAH5Q4OZkAAAA
   </data>
  </layer>
- <layer name="ruleSet" width="5" height="5">
+ <layer id="11" name="input_set" width="5" height="5" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgwA0kcPBxieMCALQJWUJkAAAA
+   H4sIAAAAAAAACmNgwA0kcPBxieMCALQJWUJkAAAA
   </data>
  </layer>
- <layer name="ruleSet" width="5" height="5">
+ <layer id="12" name="input_set" width="5" height="5" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgwA0UcPBxieMCACPUxGdkAAAA
+   H4sIAAAAAAAACmNgwA0UcPBxieMCACPUxGdkAAAA
   </data>
  </layer>
- <layer name="rule_Collision" width="5" height="5">
+ <layer id="13" name="output_Collision" width="5" height="5" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA0wkageBADQPhFKZAAAAA==
+   H4sIAAAAAAAACmNgIA0wkageBADQPhFKZAAAAA==
   </data>
  </layer>
 </map>
diff --git a/rules/cave/rule_cave_100.tmx b/rules/cave/rule_cave_100.tmx
index 186553a6..6f00a2f8 100644
--- a/rules/cave/rule_cave_100.tmx
+++ b/rules/cave/rule_cave_100.tmx
@@ -1,54 +1,53 @@
 <?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="13" height="9" tilewidth="32" tileheight="32">
- <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32">
+<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" 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="set" tilewidth="32" tileheight="32">
+ <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="67" name="set_rules" tilewidth="32" tileheight="32">
+ <tileset firstgid="67" name="set_rules" tilewidth="32" tileheight="32" tilecount="4" columns="2">
   <image source="../../graphics/tiles/set_rules.png" width="64" height="64"/>
  </tileset>
- <tileset firstgid="71" name="cave" tilewidth="32" tileheight="32">
+ <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">
+ <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>
- <layer name="ruleRegions" width="13" height="9">
+ <layer id="1" name="regions" width="13" height="9">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA84kyiOLOeMhPGJk2sPIfupbR42d1PTHlIBAHq5GFfUAQAA
+   H4sIAAAAAAAACmNgIA84kyiOLOeMhPGJk2sPIfupbR42d1PTHlIBAHq5GFfUAQAA
   </data>
  </layer>
- <layer name="ruleSet" width="13" height="9">
+ <layer id="2" name="input_set" width="13" height="9">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoB9gxcFmx8HGB4hVR0ugjIM90AAA6DCU7NQBAAA=
+   H4sIAAAAAAAACmNgoB9gxcFmx8HGB4hVR0ugjIM90AAA6DCU7NQBAAA=
   </data>
  </layer>
- <layer name="ruleSet" width="13" height="9">
+ <layer id="3" name="input_set" width="13" height="9" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoB/gxcEeqkAFB3ugAQAsLTFH1AEAAA==
+   H4sIAAAAAAAACmNgoB/gxcEeqkAFB3ugAQAsLTFH1AEAAA==
   </data>
  </layer>
- <layer name="ruleSet" width="13" height="9">
+ <layer id="4" name="input_set" width="13" height="9" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoB9gw8EeBdQFAM2+xmvUAQAA
+   H4sIAAAAAAAACmNgoB9gw8EeBdQFAM2+xmvUAQAA
   </data>
  </layer>
- <layer name="ruleSet" width="13" height="9">
+ <layer id="5" name="input_set" width="13" height="9" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoB/gw8EeBdQFAEag6ZXUAQAA
+   H4sIAAAAAAAACmNgoB/gw8EeBdQFAEag6ZXUAQAA
   </data>
  </layer>
- <layer name="ruleSet" width="13" height="9">
+ <layer id="6" name="input_set" width="13" height="9" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoB8Qw8EeBdQFAJqF6UzUAQAA
+   H4sIAAAAAAAACmNgoB8Qw8EeBdQFAJqF6UzUAQAA
   </data>
  </layer>
- <layer name="rule_Error" width="13" height="9">
+ <layer id="7" name="output_Error" width="13" height="9" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoB9wIZFNrFkDBchxNz0AAJUJJNPUAQAA
+   H4sIAAAAAAAACmNgoB9wIZFNrFkDBchxNz0AAJUJJNPUAQAA
   </data>
  </layer>
 </map>
diff --git a/rules/example_cave.tmx b/rules/example_cave.tmx
index 19c74e4d..45d4eded 100644
--- a/rules/example_cave.tmx
+++ b/rules/example_cave.tmx
@@ -1,22 +1,21 @@
 <?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="64" height="32" tilewidth="32" tileheight="32">
- <tileset firstgid="1" name="set_cave" tilewidth="32" tileheight="32">
+<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">
+ <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">
+ <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">
+ <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="211" name="set_rules" tilewidth="32" tileheight="32">
+ <tileset firstgid="211" name="set_rules" tilewidth="32" tileheight="32" tilecount="4" columns="2">
   <image source="../graphics/tiles/set_rules.png" width="64" height="64"/>
  </tileset>
- <layer name="set" width="64" height="32">
+ <layer id="1" name="set" width="64" height="32">
   <data encoding="base64" compression="zlib">
    eJztlU0LgzAMhjs6D2PzIGyX3dz//5EiKCujpPlo2jhzeBDF2j5vajqEEAbHcRwlXgbW0JpLgd7r6+V9lAzihpa79Rwo/lxvy/416j6dwL/kNies9+8T+n8Sf0z9j5QLtf6YDKT+rfPL+dwQ2Wj1BQv+tUjnwPpxc4xB99zXzEzqHzNwM4Celfwp2ULvUPdwzp+SAVQL6R7F+M0JkyF/aL77dsWOwfpT3TkZSPv2+t0rMecaZ0MNf0ovguZ5GPPHwunJudo/w/c/oM75D/7c/tI7A4n77o+pudU9IP3/ueu3sgd6+Vvhd/2jcLzjOI7TngW7oCR0
   </data>
diff --git a/rules/rules.txt b/rules/rules.txt
index 8c8a3210..43364f97 100644
--- a/rules/rules.txt
+++ b/rules/rules.txt
@@ -1,14 +1,14 @@
 # lines starting with # or // are comments
 # all other lines will be parsed and treated as filenames.
 
-../rules/firstrule.tmx
+#../rules/firstrule.tmx
 
 ../rules/cave/rule_cave.txt
 
-../rules/icecave/rule_icecave.txt
+#../rules/icecave/rule_icecave.txt
 
-../rules/icemountain/rule_icemountain.txt
+#../rules/icemountain/rule_icemountain.txt
 
-../rules/woodland/rule_woodland.txt
+#../rules/woodland/rule_woodland.txt
 
-../rules/thermin_cave/rules.txt
+#../rules/thermin_cave/rules.txt