rules

46 files changed, 697 insertions, 447 deletions

diff --git a/graphics/tiles/set_cave.png b/graphics/tiles/set_cave.png
index b401c952..daf1a8b3 100644
--- a/graphics/tiles/set_cave.png
+++ b/graphics/tiles/set_cave.png
diff --git a/graphics/tiles/set_rules.png b/graphics/tiles/set_rules.png
index c4421fe3..bf7f93c7 100644
--- a/graphics/tiles/set_rules.png
+++ b/graphics/tiles/set_rules.png
diff --git a/rules/cave/rule_cave.txt b/rules/cave/rule_cave.txt
new file mode 100644
index 00000000..600ee83e
--- /dev/null
+++ b/rules/cave/rule_cave.txt
@@ -0,0 +1,39 @@
+# lines starting with # or // are comments
+# all other lines will be parsed and treated as filenames.
+
+# Rules for caves
+
+# basic stuff: each rule-tile gets a default tile
+../rules/cave/rule_cave_001.tmx
+
+# straight walls:
+../rules/cave/rule_cave_002.tmx
+
+# corners at walls
+../rules/cave/rule_cave_003.tmx
+../rules/cave/rule_cave_004.tmx
+../rules/cave/rule_cave_005.tmx
+
+# water in caves:
+../rules/cave/rule_cave_006.tmx
+../rules/cave/rule_cave_007.tmx
+
+# rules for entrances, has bad exception handling,
+# so mind where to put entrances. (So avoid putting them near corners)
+../rules/cave/rule_cave_008.tmx
+
+# straight carpets
+../rules/cave/rule_cave_009.tmx
+
+# corners in carpets
+../rules/cave/rule_cave_010.tmx
+
+# all tiles, which are walkable, but have unwalkable neighbors,
+# should be unwalkable
+# example: a decorative stone in a sea
+
+../rules/cave/rule_cave_050.tmx
+
+# error handling: some situations cannot be handled properly with this ruleset:
+# so indicate these situations with the error-tile
+../rules/cave/rule_cave_100.tmx
diff --git a/rules/cave/rule_cave_001.tmx b/rules/cave/rule_cave_001.tmx
new file mode 100644
index 00000000..adec3865
--- /dev/null
+++ b/rules/cave/rule_cave_001.tmx
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="17" height="17" 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_cave.png" width="256" height="256"/>
+ </tileset>
+ <tileset firstgid="67" name="set_rules" tilewidth="32" tileheight="32">
+  <image source="../graphics/tiles/set_rules.png" width="64" height="64"/>
+ </tileset>
+ <tileset firstgid="71" name="cave" tilewidth="32" tileheight="32">
+  <image source="../graphics/tiles/cave.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="199" name="cave_x2" tilewidth="32" tileheight="64">
+  <image source="../graphics/tiles/cave_x2.png" width="512" height="64"/>
+ </tileset>
+ <layer name="ruleRegions" width="17" height="17">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgoA5wJpGmFRis7sAlPlDuIFaeXu4YBSMXAAAIMvB/hAQAAA==
+  </data>
+ </layer>
+ <layer name="ruleSet" width="17" height="17">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA9XOSQqAMBBE0YAjzhhRwRH1/md080VocNdRrM2DhKbKGJ146GOAIUYYi7tEqf9KihnmWGCJlbirlXdYbMR7ix32yr0yA44P/wuujnfseDju+WsmnD9dcWd7sesEaEU/nYQEAAA=
+  </data>
+ </layer>
+ <layer name="rule_Ground" width="17" height="17">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgoA7whtL7ofRWNDoaSrtQyT5c4BCU3ovDHS5oNK3ARijtjSZOb3d4o9HogNb2w0ASGj0KRgEMAAB5sOMrhAQAAA==
+  </data>
+ </layer>
+ <layer name="rule_Fringe" width="17" height="17">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgoC2YSGPziQWNA2RvAhp/IZ3tPwilj9PZXlwgYaAdMAoGHQAAoYx+foQEAAA=
+  </data>
+ </layer>
+ <layer name="rule_collision" width="17" height="17">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgoA1gIsCnFaCXPYQAExpNqjy93UEvMFjiZxQMHgAAgZ1QGoQEAAA=
+  </data>
+ </layer>
+</map>
diff --git a/rules/rule_cave_002.tmx b/rules/cave/rule_cave_002.tmx
index d3651535..ef296d97 100644
--- a/rules/rule_cave_002.tmx
+++ b/rules/cave/rule_cave_002.tmx
@@ -4,35 +4,40 @@
   <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_cave.png" width="64" height="64"/>
+  <image source="../graphics/tiles/set_cave.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="7" name="set_rules" tilewidth="32" tileheight="32">
+ <tileset firstgid="67" name="set_rules" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/set_rules.png" width="32" height="32"/>
  </tileset>
- <tileset firstgid="8" name="cave" tilewidth="32" tileheight="32">
+ <tileset firstgid="68" name="cave" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/cave.png" width="512" height="256"/>
  </tileset>
  <layer name="ruleRegions" width="8" height="6">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIAzYSZRnRxNjx6EOlzy6fnwAACINNonAAAAA
+   H4sIAAAAAAAAA2NgIAycSZR3RhNzxqEOlzy6fnwAAPmsh/LAAAAA
   </data>
  </layer>
  <layer name="ruleSet" width="8" height="6">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIAyYyZBnJiCPzxxi1YMAAFQ90tHAAAAA
+   H4sIAAAAAAAAA2NgoA1gx8EmRg+x6kEAAKr4TszAAAAA
   </data>
  </layer>
- <layer name="rule_Ground" width="8" height="6">
+ <layer name="ruleNotSet" width="8" height="6">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIAx0CMjbYBGTRmL7EGEHMpAlQS0AXvcYA8AAAAA=
+   H4sIAAAAAAAAA2NgoD5gp4I4LrXoAAAMdXcLwAAAAA==
   </data>
  </layer>
- <layer name="rule_Over" width="8" height="6">
+ <layer name="rule_Ground" width="8" height="6" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoB+Qp4GZAFJ/Z8vAAAAA
+   H4sIAAAAAAAAA2NgIAwyCMhXYBELR2J3EGEHMogkQS0AWGap4MAAAAA=
   </data>
  </layer>
- <layer name="rule_collision" width="8" height="6">
+ <layer name="rule_Over" width="8" height="6" visible="0">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgoB+IpoGZADCMP5TAAAAA
+  </data>
+ </layer>
+ <layer name="rule_collision" width="8" height="6" visible="0">
   <data encoding="base64" compression="gzip">
    H4sIAAAAAAAAA2NgIAyYyJBnIiCPzxxi1YMAADYuyefAAAAA
   </data>
diff --git a/rules/rule_cave_003.tmx b/rules/cave/rule_cave_003.tmx
index b40d315f..034cc6ba 100644
--- a/rules/rule_cave_003.tmx
+++ b/rules/cave/rule_cave_003.tmx
@@ -4,37 +4,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_cave.png" width="128" height="128"/>
+  <image source="../graphics/tiles/set_cave.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="19" name="set_rules" tilewidth="32" tileheight="32">
+ <tileset firstgid="67" name="set_rules" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/set_rules.png" width="32" height="32"/>
  </tileset>
- <tileset firstgid="20" name="cave" tilewidth="32" tileheight="32">
+ <tileset firstgid="68" name="cave" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/cave.png" width="512" height="256"/>
  </tileset>
  <layer name="ruleRegions" width="13" height="4">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA8IQzGxbHL1kAoA+YlsANAAAAA=
+   H4sIAAAAAAAAA2NgIA84QzGxbHL1kAoAuFNWytAAAAA=
   </data>
  </layer>
  <layer name="ruleSet" width="13" height="4">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA8wE+Dj0sOMhc2AJk4JAAB87igk0AAAAA==
+   H4sIAAAAAAAAA2NgIA+wE+Dj0sOOhc2AJk4JAABwbzCA0AAAAA==
   </data>
  </layer>
- <layer name="rule_Ground" width="13" height="4">
+ <layer name="ruleNotSet" width="13" height="4">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgGF4AALmOIl/QAAAA
+   H4sIAAAAAAAAA2NgIB+wo9EwNjsWNjHm4OKTAgAwnyyb0AAAAA==
   </data>
  </layer>
  <layer name="rule_Over" width="13" height="4">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA/IoPFlkdhaUFqHTLMpAQDFYfeh0AAAAA==
-  </data>
- </layer>
- <layer name="rule_collision" width="13" height="4">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgGF4AALmOIl/QAAAA
+   H4sIAAAAAAAAA2NgIA/4oPF9kdhRUDqGTLMpAQCtYkK20AAAAA==
   </data>
  </layer>
 </map>
diff --git a/rules/rule_cave_004.tmx b/rules/cave/rule_cave_004.tmx
index a9927998..18e652b6 100644
--- a/rules/rule_cave_004.tmx
+++ b/rules/cave/rule_cave_004.tmx
@@ -4,32 +4,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_cave.png" width="64" height="64"/>
+  <image source="../graphics/tiles/set_cave.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="7" name="set_rules" tilewidth="32" tileheight="32">
+ <tileset firstgid="67" name="set_rules" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/set_rules.png" width="32" height="32"/>
  </tileset>
- <tileset firstgid="8" name="cave" tilewidth="32" tileheight="32">
+ <tileset firstgid="68" name="cave" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/cave.png" width="512" height="256"/>
  </tileset>
  <layer name="ruleRegions" width="7" height="7">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgwA/YoRidTSs5cgAA/ScyysQAAAA=
+   H4sIAAAAAAAAA2NgwA+coRidTSs5cgAAwD96ZMQAAAA=
   </data>
  </layer>
  <layer name="ruleSet" width="7" height="7">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgwA+YoRidTYkcA5ocpQAA7ovkGMQAAAA=
+   H4sIAAAAAAAAA2NgoA1gh2J0NrI8AxZxcgAAt2sDDsQAAAA=
   </data>
  </layer>
- <layer name="rule_Ground" width="7" height="7" visible="0">
+ <layer name="ruleNotSet" width="7" height="7">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIAwMoLQeFjkHKG2HRS4ASvsRYQclAAAB3/yXxAAAAA==
+   H4sIAAAAAAAAA2NgoD9gJ8AnFQAAUPPppcQAAAA=
   </data>
  </layer>
- <layer name="rule_Over" width="7" height="7" visible="0">
+ <layer name="rule_Ground" width="7" height="7" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgGPoAAFL3durEAAAA
+   H4sIAAAAAAAAA2NgIAxyoHQWFrkaKF2FRa4HSncRYQclAAAu4il9xAAAAA==
   </data>
  </layer>
  <layer name="rule_collision" width="7" height="7">
diff --git a/rules/rule_cave_005.tmx b/rules/cave/rule_cave_005.tmx
index 2c465b78..9c21a292 100644
--- a/rules/rule_cave_005.tmx
+++ b/rules/cave/rule_cave_005.tmx
@@ -4,35 +4,35 @@
   <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_cave.png" width="64" height="64"/>
+  <image source="../graphics/tiles/set_cave.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="7" name="set_rules" tilewidth="32" tileheight="32">
+ <tileset firstgid="67" name="set_rules" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/set_rules.png" width="32" height="32"/>
  </tileset>
- <tileset firstgid="8" name="cave" tilewidth="32" tileheight="32">
+ <tileset firstgid="68" name="cave" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/cave.png" width="512" height="256"/>
  </tileset>
  <layer name="ruleRegions" width="13" height="7">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIB+wo9GU6MEnzk4Cm556SAUApVXbiWwBAAA=
+   H4sIAAAAAAAAA2NgIB84o9GU6MEn7kwCm556SAUAagDkCGwBAAA=
   </data>
  </layer>
  <layer name="ruleSet" width="13" height="7">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIB8wo9GU6MEnzoyFTch+Uu2hBwAAZhB9h2wBAAA=
+   H4sIAAAAAAAAA2NgGByAHY1GFmfHwsanh5B5uPTQGgAAJVBklGwBAAA=
   </data>
  </layer>
- <layer name="rule_Ground" width="13" height="7" visible="0">
+ <layer name="ruleNotSet" width="13" height="7" opacity="0.6">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIB9IQmkpEvRoQmktNHFtKK2LRY8llLZCE7eG0rZY9HhCaS80cW8o7YvHjbQCACaSUn5sAQAA
+   H4sIAAAAAAAAA2NgGJqAHQ8flxwhPewksMkBAFgzOlVsAQAA
   </data>
  </layer>
- <layer name="rule_Over" width="13" height="7">
+ <layer name="rule_Ground" width="13" height="7" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgGAX0AgB8n9a4bAEAAA==
+   H4sIAAAAAAAAA2NgIB+EQukwEvSkQuk0NPF0KJ2JRU8plC5DEy+H0pVY9LRC6TY08XYo3YnHjbQCAPlEcUlsAQAA
   </data>
  </layer>
- <layer name="rule_collision" width="13" height="7" visible="0">
+ <layer name="rule_collision" width="13" height="7">
   <data encoding="base64" compression="gzip">
    H4sIAAAAAAAAA2NgIB8wodGU6MFnFr300BoAAErWG9FsAQAA
   </data>
diff --git a/rules/rule_cave_006.tmx b/rules/cave/rule_cave_006.tmx
index 35ccab82..19f59832 100644
--- a/rules/rule_cave_006.tmx
+++ b/rules/cave/rule_cave_006.tmx
@@ -4,22 +4,27 @@
   <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_cave.png" width="128" height="128"/>
+  <image source="../graphics/tiles/set_cave.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="19" name="set_rules" tilewidth="32" tileheight="32">
+ <tileset firstgid="67" name="set_rules" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/set_rules.png" width="32" height="32"/>
  </tileset>
- <tileset firstgid="20" name="cave" tilewidth="32" tileheight="32">
+ <tileset firstgid="68" name="cave" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/cave.png" width="512" height="256"/>
  </tileset>
  <layer name="ruleRegions" width="6" height="6">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgwA2EkWhhLOL4ALp6YSzi2AAALrUFg5AAAAA=
+   H4sIAAAAAAAAA2NgwA2ckWhnLOL4ALp6Zyzi2AAAH/dlMZAAAAA=
   </data>
  </layer>
  <layer name="ruleSet" width="6" height="6">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIAxYCfCppQcEAKDp/12QAAAA
+   H4sIAAAAAAAAA2NgIAzECPCppQcEAF5x3w6QAAAA
+  </data>
+ </layer>
+ <layer name="ruleSet" width="6" height="6">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgIAz4CPCppQcEAMFTlWKQAAAA
   </data>
  </layer>
  <layer name="ruleSet" width="6" height="6">
@@ -29,17 +34,42 @@
  </layer>
  <layer name="ruleSet" width="6" height="6">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIAw4CfCppQcEAM97YoaQAAAA
+   H4sIAAAAAAAAA2NgIAx4CfCppQcEAOr1Fs+QAAAA
   </data>
  </layer>
  <layer name="ruleSet" width="6" height="6">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIAy4CPCppQcEAOTd4SuQAAAA
+   H4sIAAAAAAAAA2NgIAxYCfCppQcEAKDp/12QAAAA
+  </data>
+ </layer>
+ <layer name="ruleNotSet" width="6" height="6" opacity="0.06">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgwA3EcLBJBaSYAwCr1UHrkAAAAA==
+  </data>
+ </layer>
+ <layer name="ruleNotSet" width="6" height="6" opacity="0.06">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgwA34cLBJBaSYAwDclnPrkAAAAA==
+  </data>
+ </layer>
+ <layer name="ruleNotSet" width="6" height="6" opacity="0.05">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgwA3YcLBJBaSYAwDxV2LrkAAAAA==
+  </data>
+ </layer>
+ <layer name="ruleNotSet" width="6" height="6" opacity="0.08">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgwA14cbBJBaSYAwDKPH9LkAAAAA==
+  </data>
+ </layer>
+ <layer name="ruleNotSet" width="6" height="6" opacity="0.09">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgwA1YcbBJBaSYAwDn/W5LkAAAAA==
   </data>
  </layer>
  <layer name="rule_Ground" width="6" height="6" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIAya0fhFROiZhMZvJEIPCAAAulCFxpAAAAA=
+   H4sIAAAAAAAAA2NgIAw2o/EXEaHnEBp/IxF6QAAAyo+EwZAAAAA=
   </data>
  </layer>
  <layer name="rule_Over" width="6" height="6" visible="0">
diff --git a/rules/cave/rule_cave_007.tmx b/rules/cave/rule_cave_007.tmx
new file mode 100644
index 00000000..b208612f
--- /dev/null
+++ b/rules/cave/rule_cave_007.tmx
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="13" height="7" 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_cave.png" width="256" height="256"/>
+ </tileset>
+ <tileset firstgid="67" name="set_rules" tilewidth="32" tileheight="32">
+  <image source="../graphics/tiles/set_rules.png" width="32" height="32"/>
+ </tileset>
+ <tileset firstgid="68" name="cave" tilewidth="32" tileheight="32">
+  <image source="../graphics/tiles/cave.png" width="512" height="256"/>
+ </tileset>
+ <layer name="ruleRegions" width="13" height="7">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgIA84QzGxbHL1DCe3AQBhmwyGbAEAAA==
+  </data>
+ </layer>
+ <layer name="ruleSet" width="13" height="7">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgoC4Qg2J0NrI8A5o4LjWUuoMa9hDyDykAACD2PadsAQAA
+  </data>
+ </layer>
+ <layer name="ruleSet" width="13" height="7">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgoC7gg2J0NrI8A5o4LjWUuoMa9hDyDykAACKwIxZsAQAA
+  </data>
+ </layer>
+ <layer name="ruleSet" width="13" height="7">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgoC5gg2J0NrI8A5o4LjWUuoMa9hDyDykAANyNKXlsAQAA
+  </data>
+ </layer>
+ <layer name="ruleSet" width="13" height="7">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgoC7ghWJ0NrI8A5o4LjWUuoMa9hDyDykAAHI53HZsAQAA
+  </data>
+ </layer>
+ <layer name="ruleSet" width="13" height="7">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgoC5ghWJ0NrI8A5o4LjWUuoMa9hDyDykAAIwE1hlsAQAA
+  </data>
+ </layer>
+ <layer name="ruleNotSet" width="13" height="7" opacity="0.11">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgIA+IQTE6m5AeXHwxHGrIAeTYQ45/SAUAXzfD8GwBAAA=
+  </data>
+ </layer>
+ <layer name="ruleNotSet" width="13" height="7" opacity="0.11">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgIA/wQTE6m5AeXHw+HGrIAeTYQ45/SAUAXeR57mwBAAA=
+  </data>
+ </layer>
+ <layer name="ruleNotSet" width="13" height="7" opacity="0.11">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgIA+wQTE6m5AeXHw2HGrIAeTYQ45/SAUAnKjAUmwBAAA=
+  </data>
+ </layer>
+ <layer name="ruleNotSet" width="13" height="7" opacity="0.11">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgIA/wQjE6m5AeXHxeHGrIAeTYQ45/SAUArf9ym2wBAAA=
+  </data>
+ </layer>
+ <layer name="ruleNotSet" width="13" height="7" opacity="0.11">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgIA+wQjE6m5AeXHxWHGrIAeTYQ45/SAUAbLPLJ2wBAAA=
+  </data>
+ </layer>
+ <layer name="rule_Ground" width="13" height="7">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgoC6Yj8ZfgMZfCKUXU9ledHAQSh+m0Jz1aPwNFJgFABD1MNRsAQAA
+  </data>
+ </layer>
+</map>
diff --git a/rules/rule_cave_008.tmx b/rules/cave/rule_cave_008.tmx
index abf23123..2c14b528 100644
--- a/rules/rule_cave_008.tmx
+++ b/rules/cave/rule_cave_008.tmx
@@ -4,45 +4,45 @@
   <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_cave.png" width="128" height="256"/>
+  <image source="../graphics/tiles/set_cave.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="35" name="set_rules" tilewidth="32" tileheight="32">
+ <tileset firstgid="67" name="set_rules" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/set_rules.png" width="32" height="32"/>
  </tileset>
- <tileset firstgid="36" name="cave" tilewidth="32" tileheight="32">
+ <tileset firstgid="68" name="cave" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/cave.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="164" name="cave_x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="196" name="cave_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/cave_x2.png" width="512" height="64"/>
  </tileset>
  <layer name="ruleRegions" width="13" height="17">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA8oI2Fi+MNRDzUAOebSS88ooA0AAP6Gu+N0AwAA
+   H4sIAAAAAAAAA2NgIA84I2Fi+MNRDzUAOebSS88ooA0AAAuES0x0AwAA
   </data>
  </layer>
  <layer name="ruleSet" width="13" height="17">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA8wI2Fi+PTWo4SmRhGNL4umZygBkLsVGEhzP7ZwGgUDAwCz0pxudAMAAA==
+   H4sIAAAAAAAAA2NgIA+wI2Fi+PTWI4GmRh6NL46mZygBkLv5GUhzP7ZwGgUDAwCsvj4ldAMAAA==
   </data>
  </layer>
- <layer name="ruleSet" width="13" height="17" visible="0">
+ <layer name="ruleSet" width="13" height="17">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgGBlAHo0vPSCuGAWjgIEBAJuXOqJ0AwAA
+   H4sIAAAAAAAAA2NgGBlAAI3PMSCuGAWjgIEBAFKSi7B0AwAA
   </data>
  </layer>
- <layer name="rule_Ground" width="13" height="17" visible="0">
+ <layer name="ruleNotSet" width="13" height="17" opacity="0.36">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA9YIGFi+CDggYSJ4YNAFRBXA3ENlJ8IxElAnAzlGwKxERAbI+npAuJuIO6B8guBuAiIi6F8RyB2AmJnIv0KAoFAHATEwSTooRXQQMK01DMKaAMAxpB53HQDAAA=
+   H4sIAAAAAAAAA2NgGAUgwI6EieHTyt5RMPwBAE+qjq10AwAA
   </data>
  </layer>
- <layer name="rule_Over" width="13" height="17" visible="0">
+ <layer name="rule_Ground" width="13" height="17" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgGAUDCayRMLFABQkTC1YA8UogXkWCnlFAGwAAfDIGenQDAAA=
+   H4sIAAAAAAAAA2NgIA9EIGFi+CCQgYSJ4YPALCCeDcRzoPxGIG4C4mYoPxCIg4A4GEnPKiBeDcRroPyJQDwJiCdD+YlAnATEyUT6FQQKgbgIiItJ0EMr4IGEaalnFNAGAABjdzU5dAMAAA==
   </data>
  </layer>
- <layer name="rule_collision" width="13" height="17" visible="0">
+ <layer name="rule_Over" width="13" height="17" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgGAWjYBTQEwAAX9FJ7XQDAAA=
+   H4sIAAAAAAAAA2NgGAUDCaKRMLHABQkTC04A8UkgPkWCnlFAGwAAqLF2T3QDAAA=
   </data>
  </layer>
 </map>
diff --git a/rules/rule_cave_009.tmx b/rules/cave/rule_cave_009.tmx
index caef3e02..d4673c98 100644
--- a/rules/rule_cave_009.tmx
+++ b/rules/cave/rule_cave_009.tmx
@@ -4,32 +4,42 @@
   <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_cave.png" width="128" height="256"/>
+  <image source="../graphics/tiles/set_cave.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="35" name="set_rules" tilewidth="32" tileheight="32">
+ <tileset firstgid="67" name="set_rules" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/set_rules.png" width="32" height="32"/>
  </tileset>
- <tileset firstgid="36" name="cave" tilewidth="32" tileheight="32">
+ <tileset firstgid="68" name="cave" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/cave.png" width="512" height="256"/>
  </tileset>
  <layer name="ruleRegions" width="6" height="6">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgwA2UkWhlLOL4ALp6ZSzi2AAA/nb1W5AAAAA=
+   H4sIAAAAAAAAA2NgwA2ckWhnLOL4ALp6Zyzi2AAAH/dlMZAAAAA=
   </data>
  </layer>
  <layer name="ruleSet" width="6" height="6">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIAyECfCppQcEAGKdKiOQAAAA
+   H4sIAAAAAAAAA2NgIAxUCPCppQcEAFLwSR+QAAAA
   </data>
  </layer>
  <layer name="ruleSet" width="6" height="6">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIAxECPCppQcEAGy13ceQAAAA
+   H4sIAAAAAAAAA2NgIAyUCfCppQcEAFzYvvuQAAAA
+  </data>
+ </layer>
+ <layer name="ruleNotSet" width="6" height="6" opacity="0.36">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgwA1UcLBJBaSYAwCeYv2dkAAAAA==
+  </data>
+ </layer>
+ <layer name="ruleNotSet" width="6" height="6" opacity="0.33">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgwA2UcbBJBaSYAwA+q0HQkAAAAA==
   </data>
  </layer>
  <layer name="rule_Ground" width="6" height="6">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIAwc0Pj6ROjxR+PbEaEHBAA7s+VPkAAAAA==
+   H4sIAAAAAAAAA2NgIAwS0Pj+ROjJR+PHEaEHBABsEgLRkAAAAA==
   </data>
  </layer>
 </map>
diff --git a/rules/rule_cave_010.tmx b/rules/cave/rule_cave_010.tmx
index b4f169e2..d50d51a3 100644
--- a/rules/rule_cave_010.tmx
+++ b/rules/cave/rule_cave_010.tmx
@@ -4,32 +4,42 @@
   <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_cave.png" width="128" height="256"/>
+  <image source="../graphics/tiles/set_cave.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="35" name="set_rules" tilewidth="32" tileheight="32">
+ <tileset firstgid="67" name="set_rules" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/set_rules.png" width="32" height="32"/>
  </tileset>
- <tileset firstgid="36" name="cave" tilewidth="32" tileheight="32">
+ <tileset firstgid="68" name="cave" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/cave.png" width="512" height="256"/>
  </tileset>
  <layer name="ruleRegions" width="13" height="7">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA8oQzGxbHL1DCe3AQCixQ1VbAEAAA==
+   H4sIAAAAAAAAA2NgIA84QzGxbHL1DCe3AQBhmwyGbAEAAA==
   </data>
  </layer>
  <layer name="ruleSet" width="13" height="7">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoC4QhmJ0NrI8A5o4LjWUuoMa9hDyDykAANBtPQZsAQAA
+   H4sIAAAAAAAAA2NgoC5QgWJ0NrI8A5o4LjWUuoMa9hDyDykAADpwCuhsAQAA
   </data>
  </layer>
  <layer name="ruleSet" width="13" height="7">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoC4QgWJ0NrI8A5o4LjWUuoMa9hDyDykAAH/6R1FsAQAA
+   H4sIAAAAAAAAA2NgoC5QhmJ0NrI8A5o4LjWUuoMa9hDyDykAAJXncL9sAQAA
+  </data>
+ </layer>
+ <layer name="ruleNotSet" width="13" height="7" opacity="0.24">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgIA+oQDE6m5AeXHwVHGrIAeTYQ45/SAUA+4NElGwBAAA=
+  </data>
+ </layer>
+ <layer name="ruleNotSet" width="13" height="7" opacity="0.23">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgIA8oQzE6m5AeXHxlHGrIAeTYQ45/SAUAS72rUmwBAAA=
   </data>
  </layer>
  <layer name="rule_Ground" width="13" height="7">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoC6IR+MnoPH1oLQBle1FB35QOoBCc/LR+AUUmAUAm85AR2wBAAA=
+   H4sIAAAAAAAAA2NgoC6oR+M3oPH9oHQAle1FB3lQuoBCc/rR+BMoMAsA4AFgUmwBAAA=
   </data>
  </layer>
  <layer name="rule_collision" width="13" height="7">
diff --git a/rules/cave/rule_cave_050.tmx b/rules/cave/rule_cave_050.tmx
new file mode 100644
index 00000000..b7b94fd0
--- /dev/null
+++ b/rules/cave/rule_cave_050.tmx
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="5" height="5" 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_cave.png" width="256" height="256"/>
+ </tileset>
+ <tileset firstgid="67" name="set_rules" tilewidth="32" tileheight="32">
+  <image source="../graphics/tiles/set_rules.png" width="64" height="64"/>
+ </tileset>
+ <layer name="ruleRegions" width="5" height="5">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgwA2csfCdcYjjAwBFZMEtZAAAAA==
+  </data>
+ </layer>
+ <layer name="ruleSet" width="5" height="5">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgwA24cfBxieMCAL942VBkAAAA
+  </data>
+ </layer>
+ <layer name="ruleSet" width="5" height="5">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgwA2EcfBxieMCAMG3CItkAAAA
+  </data>
+ </layer>
+ <layer name="ruleSet" width="5" height="5">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgwA1EcPBxieMCAAvusS9kAAAA
+  </data>
+ </layer>
+ <layer name="ruleSet" width="5" height="5">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgwA1kcPBxieMCACGr/mZkAAAA
+  </data>
+ </layer>
+ <layer name="ruleSet" width="5" height="5">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgwA1UcPBxieMCALZ2Y0NkAAAA
+  </data>
+ </layer>
+ <layer name="ruleSet" width="5" height="5">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgwA1YcfBxieMCAGrN2sJkAAAA
+  </data>
+ </layer>
+ <layer name="ruleSet" width="5" height="5">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgwA3YcfBxieMCAACfMT1kAAAA
+  </data>
+ </layer>
+ <layer name="ruleSet" width="5" height="5">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgwA3EcfBxieMCAFQVr69kAAAA
+  </data>
+ </layer>
+ <layer name="ruleSet" width="5" height="5">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgwA3kcfBxieMCAH5Q4OZkAAAA
+  </data>
+ </layer>
+ <layer name="ruleSet" width="5" height="5">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgwA0kcPBxieMCALQJWUJkAAAA
+  </data>
+ </layer>
+ <layer name="ruleSet" width="5" height="5">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgwA0UcPBxieMCACPUxGdkAAAA
+  </data>
+ </layer>
+ <layer name="rule_Collision" width="5" height="5">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgIA0wkageBADQPhFKZAAAAA==
+  </data>
+ </layer>
+</map>
diff --git a/rules/cave/rule_cave_100.tmx b/rules/cave/rule_cave_100.tmx
new file mode 100644
index 00000000..3dfc8ab3
--- /dev/null
+++ b/rules/cave/rule_cave_100.tmx
@@ -0,0 +1,53 @@
+<?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="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_cave.png" width="256" height="256"/>
+ </tileset>
+ <tileset firstgid="67" name="set_rules" tilewidth="32" tileheight="32">
+  <image source="../graphics/tiles/set_rules.png" width="64" height="64"/>
+ </tileset>
+ <tileset firstgid="71" name="cave" tilewidth="32" tileheight="32">
+  <image source="../graphics/tiles/cave.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="199" name="cave_x2" tilewidth="32" tileheight="64">
+  <image source="../graphics/tiles/cave_x2.png" width="512" height="64"/>
+ </tileset>
+ <layer name="ruleRegions" width="13" height="9">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgIA84kyiOLOeMhPGJk2sPIfupbR42d1PTHlIBAHq5GFfUAQAA
+  </data>
+ </layer>
+ <layer name="ruleSet" width="13" height="9">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgoB9gxcFmx8HGB4hVR0ugjIM90AAA6DCU7NQBAAA=
+  </data>
+ </layer>
+ <layer name="ruleSet" width="13" height="9">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgoB/gxcEeqkAFB3ugAQAsLTFH1AEAAA==
+  </data>
+ </layer>
+ <layer name="ruleSet" width="13" height="9">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgoB9gw8EeBdQFAM2+xmvUAQAA
+  </data>
+ </layer>
+ <layer name="ruleSet" width="13" height="9">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgoB/gw8EeBdQFAEag6ZXUAQAA
+  </data>
+ </layer>
+ <layer name="ruleSet" width="13" height="9">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgoB8Qw8EeBdQFAJqF6UzUAQAA
+  </data>
+ </layer>
+ <layer name="rule_Error" width="13" height="9" visible="0">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgoB9wIZFNrFkDBchxNz0AAJUJJNPUAQAA
+  </data>
+ </layer>
+</map>
diff --git a/rules/example_cave.tmx b/rules/example_cave.tmx
index a1c0d700..876670f4 100644
--- a/rules/example_cave.tmx
+++ b/rules/example_cave.tmx
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.0" orientation="orthogonal" width="64" height="32" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="set_cave" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/set_cave.png" width="128" height="256"/>
+  <image source="../graphics/tiles/set_cave.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="33" name="set_icecave" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/set_icecave.png" width="64" height="64"/>
- </tileset>
- <tileset firstgid="37" name="collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="65" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
- <tileset firstgid="39" name="cave" tilewidth="32" tileheight="32">
+ <tileset firstgid="67" name="cave" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/cave.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="167" name="cave_x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="195" name="cave_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/cave_x2.png" width="512" height="64"/>
  </tileset>
+ <tileset firstgid="211" name="set_rules" tilewidth="32" tileheight="32">
+  <image source="../graphics/tiles/set_rules.png" width="64" height="64"/>
+ </tileset>
  <layer name="set" width="64" height="32" opacity="0.73">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+2XyQ7CMAxEW3YoHOiV9f+/EiFRKbI8jbe0FcphDjQl42c7DrRN07RVVVViPYL3WxGh9TlYbyDOCxPX28Ge7nclQn6S3EXU5ML4cOpIDC+lT8+wX3/PJf5j8vakRZ3AP32fMtMeQDoBz7n5Jf6UH/WA1m/nzIF0zyh+7vz3YD0X21EZw1hcaC/Uf576c+dgqj7U9v9WUAeLD62zdPaieErxR3lF1zcVNwu9M2CdaCr+u0DDu7mzaOVfA9H+o+seDwt/qnR2DfFp+If4EDvXA9w73hxr+cdmgZa/zfDTHGj5W/DdvYP/K3RXl+BPc4DWLTnw8Jes/5l5dsjkx8oviRnV/RzAvhPWf+NgRzmIvEOssy83/3L1t3pG36EefkkO9swzS79R7yh2z90vueNo/1vPG41hDnbt3pGztlR8kfvTuUpl/a1Vsh4RftzvKun/rqiemKoPI/q/5JmYwm+p7JL4ovZPPz9HvHPvRLMvRf/MVlX17/oAYjbMzAAgAAA=
+   H4sIAAAAAAAAA+2X2wrCMAxA52WC8wKOKSj4MP//I2WgUEqSpkl6QftwGNtakpO0u/Rd1/WNRgPlyhizM4x3rsB5RUCNG4ixklhUvFL+EGvmOEkMjv8zo7/r6vc7Rc005Oo/hFubMYNraX/IMdTjR4U1sIwds8bvRn41+dfSP2v3zQfq3sLBO4fmhJ6htfj7Hpify4Rch/bIBbhmuX41czG/Y8Afq4/1+ufGkPhz/fxaUPOh/nPrcAt45/TfEvfGQF6zg+Q7isrL0l+z/6mcXP/lfG/kr9lLsT2Q9GImKO2f4/3v+r4U/hJS+nOfY1b9T+Ee6z94R2qc/z+k8Zbka+0v+X/9zhkQf04OkrytvqG0/tweST1y+qdyx3KIdbCglHttaB1OFThY8ms+jUaj8W+8Afgjpy8AIAAA
   </data>
  </layer>
 </map>
diff --git a/rules/example_icecave.tmx b/rules/example_icecave.tmx
index dceda71f..4a8223ce 100644
--- a/rules/example_icecave.tmx
+++ b/rules/example_icecave.tmx
@@ -1,26 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.0" orientation="orthogonal" width="32" height="32" tilewidth="32" tileheight="32">
- <tileset firstgid="1" name="set_rule" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/set_rules.png" width="32" height="32"/>
- </tileset>
- <tileset firstgid="2" name="set_icecave" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="set_icecave" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/set_icecave.png" width="64" height="64"/>
  </tileset>
- <tileset firstgid="6" name="collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="5" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
- <tileset firstgid="8" name="icecave" tilewidth="32" tileheight="32">
+ <tileset firstgid="7" name="icecave" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/icecave.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="136" name="cave" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/cave.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="264" name="set" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/set_cave.png" width="64" height="64"/>
- </tileset>
  <layer name="set" width="32" height="32" opacity="0.73">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+2UOxLAIAhEHTPe/8ppLDIOP2UJFBbbKOFtAOmttX51NfUIyuZH+7CwI31k8yUPY4o6i+QPQtRdlAcrn5OnZzscK3/Hg6UXFfjrfKL43Hvw1ADxHv/kW3ZC1PxrfM0DF4vkUx60OHQNpPzfmqN25en/ofY1l6MKn8vv4VPzrcXsfHvC98hT9yz+aQ+RfMucR6sKP8tDNh+pF4uzagMAEAAA
+   H4sIAAAAAAAAA+2UOxLAIAhENeP9z5zGIuPwU5ZAYbGNEt4GkN5a61dXU4+gbH60Dws70kc2X/IwpqizSP4gRN1FebDyOXl6tsOx8nc8WHpRgb/OJ4rPvQdPDRDv8U++ZSdEzb/G1zxwsUg+5UGLQ9dAyv+tOWpXnv4fal9zOarwufwePjXfWszOtyd8jzx1z+Kf9hDJt8x5tKrwszxk85F6AVXE4B0AEAAA
   </data>
  </layer>
 </map>
diff --git a/rules/example_mountain.tmx b/rules/example_mountain.tmx
index eb2da987..7021ef5a 100644
--- a/rules/example_mountain.tmx
+++ b/rules/example_mountain.tmx
@@ -16,12 +16,12 @@
   <image source="../graphics/tiles/cave.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="394" name="set" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/set_cave.png" width="64" height="64"/>
+  <image source="../graphics/tiles/set_cave.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="398" name="icecave" tilewidth="32" tileheight="32">
+ <tileset firstgid="458" name="icecave" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/icecave.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="526" name="set_icecave" tilewidth="32" tileheight="32">
+ <tileset firstgid="586" name="set_icecave" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/set_icecave.png" width="64" height="64"/>
  </tileset>
  <layer name="Underground" width="32" height="32">
diff --git a/rules/example_woodland.tmx b/rules/example_woodland.tmx
index 4b106217..3c266a8c 100644
--- a/rules/example_woodland.tmx
+++ b/rules/example_woodland.tmx
@@ -17,7 +17,7 @@
  </tileset>
  <layer name="Set" width="30" height="30">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+2UOw7AIAxDKQv99/637VSpQgESx7C0QxYU/LADxBBC/GhNrxrNG8nuwW3plJgIt6aV67G4Wn1mxtLe1JlrzdOTc2uO3vkyin12D5PB1c4Z5aL32sP1vqla36JgJoCN+rV4tbCRnHPfUk9L41mfyZ61XFbeR0UXfb+I37PBXY1nQKrkdxvElHLehV7LnC6Qq9Fm/AFILt6/ysJl188dw70BLc919BAOAAA=
+   H4sIAAAAAAAAA+2UOw6AMAxDSwfKn/vfFjEgoSiF2E27wOAtzWucTwwhxI+qu6k1ryW7BvctT47JcJ9yyXxeXGt+T4+1t6kyF/WzxGctts+I6S+iHJedwRJuyexbd6MW1zJj3lxkp9D+jgZmIthsvUitCJvxWdatxcgdznEH55rl3ag5z6fWh7zs/iL1Xm+2F+4E/qHkxsh650ZMzedFiUX6tJNcS26PG8D4YpknJI6dXUY/tw33AH+y0woQDgAA
   </data>
  </layer>
 </map>
diff --git a/rules/icecave/rule_icecave.txt b/rules/icecave/rule_icecave.txt
new file mode 100644
index 00000000..c3ab437c
--- /dev/null
+++ b/rules/icecave/rule_icecave.txt
@@ -0,0 +1,25 @@
+# lines starting with # or // are comments
+# all other lines will be parsed and treated as filenames.
+
+# ice caves... similar to usual caves
+
+# basic stuff: each rule-tile gets a default tile
+../rules/icecave/rule_icecave_001.tmx
+
+# straight walls:
+../rules/icecave/rule_icecave_002.tmx
+
+# corners at walls
+../rules/icecave/rule_icecave_003.tmx
+../rules/icecave/rule_icecave_004.tmx
+../rules/icecave/rule_icecave_005.tmx
+
+# frozen water straight waterside
+../rules/icecave/rule_icecave_006.tmx
+
+# frozen water: corners at waterside
+../rules/icecave/rule_icecave_007.tmx
+
+# error handling: some situations cannot be handled properly with this ruleset:
+# so indicate these situations with the error-tile
+../rules/icecave/rule_cave_100.tmx
diff --git a/rules/rule_icecave_001.tmx b/rules/icecave/rule_icecave_001.tmx
index 27473ee1..4d07cb41 100644
--- a/rules/rule_icecave_001.tmx
+++ b/rules/icecave/rule_icecave_001.tmx
@@ -7,9 +7,9 @@
   <image source="../graphics/tiles/set_icecave.png" width="64" height="64"/>
  </tileset>
  <tileset firstgid="7" name="set_rules" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/set_rules.png" width="32" height="32"/>
+  <image source="../graphics/tiles/set_rules.png" width="64" height="64"/>
  </tileset>
- <tileset firstgid="8" name="icecave" tilewidth="32" tileheight="32">
+ <tileset firstgid="11" name="icecave" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/icecave.png" width="512" height="256"/>
  </tileset>
  <layer name="ruleRegions" width="7" height="3">
@@ -22,19 +22,14 @@
    H4sIAAAAAAAAA2NgwA+YoTQLlGYjoB4EABX4+a9UAAAA
   </data>
  </layer>
- <layer name="rule_Ground" width="7" height="3">
+ <layer name="rule_Ground" width="7" height="3" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgwA9koDQPlC4joB4EAA7ZdPpUAAAA
-  </data>
- </layer>
- <layer name="rule_Over" width="7" height="3">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoD4AAHbqzHRUAAAA
+   H4sIAAAAAAAAA2NgwA/koTQ/lK4koB4EAPgHSRJUAAAA
   </data>
  </layer>
  <layer name="rule_collision" width="7" height="3">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgwA+YCPCxAQAHvcVWVAAAAA==
+   H4sIAAAAAAAAA2NgwA+YCMhjAwBsElWnVAAAAA==
   </data>
  </layer>
 </map>
diff --git a/rules/rule_icecave_002.tmx b/rules/icecave/rule_icecave_002.tmx
index 70ed15b1..72ae97b7 100644
--- a/rules/rule_icecave_002.tmx
+++ b/rules/icecave/rule_icecave_002.tmx
@@ -22,6 +22,11 @@
    H4sIAAAAAAAAA2NgIA4wk6mGGU2cGHPQ1aKbQQwAAE/ZWtvYAAAA
   </data>
  </layer>
+ <layer name="ruleNotSet" width="9" height="6">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgoB1gprIcPj3oAAAVANpz2AAAAA==
+  </data>
+ </layer>
  <layer name="rule_Ground" width="9" height="6" visible="0">
   <data encoding="base64" compression="gzip">
    H4sIAAAAAAAAA2NgIA7oEKHGBouYNBrfh0j70IEsieoBzY672NgAAAA=
diff --git a/rules/rule_icecave_003.tmx b/rules/icecave/rule_icecave_003.tmx
index 42a9fd46..7ae48f94 100644
--- a/rules/rule_icecave_003.tmx
+++ b/rules/icecave/rule_icecave_003.tmx
@@ -22,9 +22,9 @@
    H4sIAAAAAAAAA2NgIA8wE+Dj0sOMhc2AJk4JAAB87igk0AAAAA==
   </data>
  </layer>
- <layer name="rule_Ground" width="13" height="4">
+ <layer name="ruleNotSet" width="13" height="4">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgGF4AALmOIl/QAAAA
+   H4sIAAAAAAAAA2NgIB8wo9EwNjMWNjHm4OKTAgA8hSQr0AAAAA==
   </data>
  </layer>
  <layer name="rule_Over" width="13" height="4">
@@ -32,9 +32,4 @@
    H4sIAAAAAAAAA2NgIA8IoPEFkdhyUFqBTLMpAQC88ad90AAAAA==
   </data>
  </layer>
- <layer name="rule_collision" width="13" height="4">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgGF4AALmOIl/QAAAA
-  </data>
- </layer>
 </map>
diff --git a/rules/rule_icecave_004.tmx b/rules/icecave/rule_icecave_004.tmx
index ff0f7842..43b422b3 100644
--- a/rules/rule_icecave_004.tmx
+++ b/rules/icecave/rule_icecave_004.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" width="7" height="7" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" width="7" height="6" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
@@ -12,29 +12,29 @@
  <tileset firstgid="8" name="cave" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/icecave.png" width="512" height="256"/>
  </tileset>
- <layer name="ruleRegions" width="7" height="7">
+ <layer name="ruleRegions" width="7" height="6">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgwA/YoRidTSs5cgAA/ScyysQAAAA=
+   H4sIAAAAAAAAA2NgwA/YoRidTSs5XAAAA96rtqgAAAA=
   </data>
  </layer>
- <layer name="ruleSet" width="7" height="7">
+ <layer name="ruleSet" width="7" height="6">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgwA+YoRidTYkcA5ocpQAA7ovkGMQAAAA=
+   H4sIAAAAAAAAA2NgwA+YoRidTYkcA5ocMQAANSMN1qgAAAA=
   </data>
  </layer>
- <layer name="rule_Ground" width="7" height="7" visible="0">
+ <layer name="ruleNotSet" width="7" height="6">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIAwMoLQeFjkHKG2HRS4ASvsRYQclAAAB3/yXxAAAAA==
+   H4sIAAAAAAAAA2NgoD9gJsDHBgB9Q1zQqAAAAA==
   </data>
  </layer>
- <layer name="rule_Over" width="7" height="7" visible="0">
+ <layer name="rule_Ground" width="7" height="6" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgGPoAAFL3durEAAAA
+   H4sIAAAAAAAAA2NgIAwMoLQeFjkHKG2HRS4ASvsRYQchAADQPpdKqAAAAA==
   </data>
  </layer>
- <layer name="rule_collision" width="7" height="7" visible="0">
+ <layer name="rule_collision" width="7" height="6" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgwA+YoBidTYkcA5ocpQAAeqBqScQAAAA=
+   H4sIAAAAAAAAA2NgwA+YoBidTYkcA5ocMQAAqilRnqgAAAA=
   </data>
  </layer>
 </map>
diff --git a/rules/rule_icecave_005.tmx b/rules/icecave/rule_icecave_005.tmx
index e91c330a..f0e766d1 100644
--- a/rules/rule_icecave_005.tmx
+++ b/rules/icecave/rule_icecave_005.tmx
@@ -22,14 +22,14 @@
    H4sIAAAAAAAAA2NgIB8wo9GU6MEnzoyFTch+Uu2hBwAAZhB9h2wBAAA=
   </data>
  </layer>
- <layer name="rule_Ground" width="13" height="7" visible="0">
+ <layer name="ruleNotSet" width="13" height="7">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIB9IQmkpEvRoQmktNHFtKK2LRY8llLZCE7eG0rZY9HhCaS80cW8o7YvHjbQCACaSUn5sAQAA
+   H4sIAAAAAAAAA2NgGJqAGQ8flxwhPcwksMkBAHO5eppsAQAA
   </data>
  </layer>
- <layer name="rule_Over" width="13" height="7" visible="0">
+ <layer name="rule_Ground" width="13" height="7" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgGAX0AgB8n9a4bAEAAA==
+   H4sIAAAAAAAAA2NgIB9IQmkpEvRoQmktNHFtKK2LRY8llLZCE7eG0rZY9HhCaS80cW8o7YvHjbQCACaSUn5sAQAA
   </data>
  </layer>
  <layer name="rule_collision" width="13" height="7" visible="0">
diff --git a/rules/rule_icecave_006.tmx b/rules/icecave/rule_icecave_006.tmx
index e99f15e8..25b6a251 100644
--- a/rules/rule_icecave_006.tmx
+++ b/rules/icecave/rule_icecave_006.tmx
@@ -22,19 +22,14 @@
    H4sIAAAAAAAAA2NgIAzYCPCppQcEAItPfPCQAAAA
   </data>
  </layer>
- <layer name="rule_Ground" width="6" height="6" visible="0">
+ <layer name="ruleNotSet" width="6" height="6">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIAzK0fhpROhpQ+OXEqEHBAAdwEJNkAAAAA==
+   H4sIAAAAAAAAA2NgwA3YcLBJBaSYAwDxV2LrkAAAAA==
   </data>
  </layer>
- <layer name="rule_Over" width="6" height="6" visible="0">
+ <layer name="rule_Ground" width="6" height="6">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgGFwAAJwFCnCQAAAA
-  </data>
- </layer>
- <layer name="rule_collision" width="6" height="6" visible="0">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIAyYCPCppQcEAK7BCLmQAAAA
+   H4sIAAAAAAAAA2NgIAzK0fhpROhpQ+OXEqEHBAAdwEJNkAAAAA==
   </data>
  </layer>
 </map>
diff --git a/rules/rule_icecave_007.tmx b/rules/icecave/rule_icecave_007.tmx
index bd66a738..bf926e67 100644
--- a/rules/rule_icecave_007.tmx
+++ b/rules/icecave/rule_icecave_007.tmx
@@ -22,19 +22,14 @@
    H4sIAAAAAAAAA2NgoC5gg2J0NrI8A5o4LjWUuoMa9hDyDykAANyNKXlsAQAA
   </data>
  </layer>
- <layer name="rule_Ground" width="13" height="7">
+ <layer name="ruleNotSet" width="13" height="7">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoC5IRuOnoPFToXQ6le1FB61Qup1Cc4rR+CUUmAUAMdZruGwBAAA=
+   H4sIAAAAAAAAA2NgIA+wQTE6m5AeXHw2HGrIAeTYQ45/SAUAnKjAUmwBAAA=
   </data>
  </layer>
- <layer name="rule_Over" width="13" height="7">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgGAX0AgB8n9a4bAEAAA==
-  </data>
- </layer>
- <layer name="rule_collision" width="13" height="7">
+ <layer name="rule_Ground" width="13" height="7">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoC5gIpKPLk5tQC17CPmHFAAAYw7+ZmwBAAA=
+   H4sIAAAAAAAAA2NgoC5IRuOnoPFToXQ6le1FB61Qup1Cc4rR+CUUmAUAMdZruGwBAAA=
   </data>
  </layer>
 </map>
diff --git a/rules/icecave/rule_icecave_100.tmx b/rules/icecave/rule_icecave_100.tmx
new file mode 100644
index 00000000..0f4e5f18
--- /dev/null
+++ b/rules/icecave/rule_icecave_100.tmx
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="9" height="6" 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_icecave" tilewidth="32" tileheight="32">
+  <image source="../graphics/tiles/set_icecave.png" width="64" height="64"/>
+ </tileset>
+ <tileset firstgid="7" name="set_rules" tilewidth="32" tileheight="32">
+  <image source="../graphics/tiles/set_rules.png" width="64" height="64"/>
+ </tileset>
+ <tileset firstgid="11" name="icecave" tilewidth="32" tileheight="32">
+  <image source="../graphics/tiles/icecave.png" width="512" height="256"/>
+ </tileset>
+ <layer name="ruleRegions" width="9" height="6">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgIA6wEyHOjkSzo/FJMQdZDJc5hAAAESWSztgAAAA=
+  </data>
+ </layer>
+ <layer name="ruleSet" width="9" height="6">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgoB5gw8FmJkIvLjXE6MUGAC5qS5vYAAAA
+  </data>
+ </layer>
+ <layer name="rule_Error" width="9" height="6">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgoB7gIIJNjF5ixAkBAK6TbhnYAAAA
+  </data>
+ </layer>
+</map>
diff --git a/rules/rule_icemountain.tmx b/rules/icemountain/rule_icemountain.tmx
index 6413eac4..6413eac4 100644
--- a/rules/rule_icemountain.tmx
+++ b/rules/icemountain/rule_icemountain.tmx
diff --git a/rules/icemountain/rule_icemountain.txt b/rules/icemountain/rule_icemountain.txt
new file mode 100644
index 00000000..c7223339
--- /dev/null
+++ b/rules/icemountain/rule_icemountain.txt
@@ -0,0 +1,18 @@
+# lines starting with # or // are comments
+# all other lines will be parsed and treated as filenames.
+
+# ice mountains. In this Ruleset you have 3 colors setting
+# the height of the current tile:
+# black: usual height
+# light red: above
+# dark red: below
+# the transitions "black<->dark red" and "black<->light red" can be mapped with
+# this ruleset.
+# When you wan tto have more than 3 different heights, you should use the
+# transition "light red<->dark red". So there is no wall at this transition and
+# you can start over from the red to black, having a wall to another height.
+
+../rules/icemountain/rule_icemountain_001.tmx
+../rules/icemountain/rule_icemountain_002.tmx
+../rules/icemountain/rule_icemountain_003.tmx
+../rules/icemountain/rule_icemountain_004.tmx
diff --git a/rules/rule_icemountain_001.tmx b/rules/icemountain/rule_icemountain_001.tmx
index 1b656d31..1b656d31 100644
--- a/rules/rule_icemountain_001.tmx
+++ b/rules/icemountain/rule_icemountain_001.tmx
diff --git a/rules/rule_icemountain_002.tmx b/rules/icemountain/rule_icemountain_002.tmx
index 91e0fecf..91e0fecf 100644
--- a/rules/rule_icemountain_002.tmx
+++ b/rules/icemountain/rule_icemountain_002.tmx
diff --git a/rules/rule_icemountain_003.tmx b/rules/icemountain/rule_icemountain_003.tmx
index 33e81f56..33e81f56 100644
--- a/rules/rule_icemountain_003.tmx
+++ b/rules/icemountain/rule_icemountain_003.tmx
diff --git a/rules/rule_icemountain_004.tmx b/rules/icemountain/rule_icemountain_004.tmx
index b39d9bb0..b39d9bb0 100644
--- a/rules/rule_icemountain_004.tmx
+++ b/rules/icemountain/rule_icemountain_004.tmx
diff --git a/rules/rule_cave_001.tmx b/rules/rule_cave_001.tmx
deleted file mode 100644
index 9c68a00c..00000000
--- a/rules/rule_cave_001.tmx
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" width="9" height="17" 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_cave.png" width="128" height="256"/>
- </tileset>
- <tileset firstgid="35" name="set_rules" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/set_rules.png" width="32" height="32"/>
- </tileset>
- <tileset firstgid="36" name="cave" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/cave.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="164" name="cave_x2" tilewidth="32" tileheight="64">
-  <image source="../graphics/tiles/cave_x2.png" width="512" height="64"/>
- </tileset>
- <layer name="ruleRegions" width="9" height="17">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA4oE6CJBYPVHEoBufbTCqC7YyDDGQDhyh7gZAIAAA==
-  </data>
- </layer>
- <layer name="ruleSet" width="9" height="17">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA4wQ2kWKM0KpdmI1A8D7FCaA0pzQmkuEs3hhtI8UJoXSvORaA4/iepxAWEoLUIl8ygF0mh8WSgtR6I58lBaAUorQmklEswAANifSBJkAgAA
-  </data>
- </layer>
- <layer name="rule_Ground" width="9" height="17">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA5YQGkNKD0JjSYWzIHSsyg0Zz6U7oPSs9FoYgGp6nEBezR6FCAAABbPsHJkAgAA
-  </data>
- </layer>
- <layer name="rule_Fringe" width="9" height="17">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoAzkUai/DkrHUWjOPCi9hER9thTaiw58qWzecAAAJxy7NGQCAAA=
-  </data>
- </layer>
- <layer name="rule_Over" width="9" height="17" visible="0">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgGAWjgLYAADPktetkAgAA
-  </data>
- </layer>
- <layer name="rule_collision" width="9" height="17" visible="0">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA4wEeDTGzARoEk1Z7gDavmTnHAGABmZ+IlkAgAA
-  </data>
- </layer>
-</map>
diff --git a/rules/rule_cave_007.tmx b/rules/rule_cave_007.tmx
deleted file mode 100644
index 873568d9..00000000
--- a/rules/rule_cave_007.tmx
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" width="13" height="7" 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_cave.png" width="128" height="128"/>
- </tileset>
- <tileset firstgid="19" name="set_rules" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/set_rules.png" width="32" height="32"/>
- </tileset>
- <tileset firstgid="20" name="cave" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/cave.png" width="512" height="256"/>
- </tileset>
- <layer name="ruleRegions" width="13" height="7">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA8IQzGxbHL1DCe3AQDj6TXRbAEAAA==
-  </data>
- </layer>
- <layer name="ruleSet" width="13" height="7">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoC5gg2J0NrI8A5o4LjWUuoMa9hDyDykAANyNKXlsAQAA
-  </data>
- </layer>
- <layer name="ruleSet" width="13" height="7">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoC5ghWJ0NrI8A5o4LjWUuoMa9hDyDykAAIwE1hlsAQAA
-  </data>
- </layer>
- <layer name="ruleSet" width="13" height="7">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoC7ghGJ0NrI8A5o4LjWUuoMa9hDyDykAAI0nWUFsAQAA
-  </data>
- </layer>
- <layer name="ruleSet" width="13" height="7">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoC7ggmJ0NrI8A5o4LjWUuoMa9hDyDykAAN2upiFsAQAA
-  </data>
- </layer>
- <layer name="rule_Ground" width="13" height="7" visible="0">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoC7IR+MXoPELoXQxle1FBxOh9GQKzalH4zdQYBYAu+pCZmwBAAA=
-  </data>
- </layer>
- <layer name="rule_Over" width="13" height="7" visible="0">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgGAX0AgB8n9a4bAEAAA==
-  </data>
- </layer>
- <layer name="rule_collision" width="13" height="7">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgGAX0AgB8n9a4bAEAAA==
-  </data>
- </layer>
-</map>
diff --git a/rules/rule_woodland.txt b/rules/rule_woodland.txt
new file mode 100644
index 00000000..b400e243
--- /dev/null
+++ b/rules/rule_woodland.txt
@@ -0,0 +1,38 @@
+# lines starting with # or // are comments
+# all other lines will be parsed and treated as filenames.
+
+# Rules for Woodlands.
+#
+# grass and high grass
+../rules/rule_woodland_001.tmx
+
+# straight borders of grass and high grass
+../rules/rule_woodland_002.tmx
+
+# borders at corners for grass and highgrass
+../rules/rule_woodland_003.tmx
+
+# this one is needed to grow trees and other stuff of Fringe into high grass
+# XXX       The O can be Tree in high grass. So there wont be setup borders
+# XOX   <-- If O is low grass, make borders of course
+# XXX
+../rules/rule_woodland_004.tmx
+
+# straight borders of grass and high grass
+../rules/rule_woodland_012.tmx
+
+# borders at corners for grass and highgrass
+../rules/rule_woodland_013.tmx
+
+# add trees 1-9 except 7
+# put the trees in one of the first rules, since these rules make
+# trouble with the surrounding floor tiles
+../rules/rule_woodland_100.tmx
+
+# add tree 7. This is seperated due to its extra height.
+../rules/rule_woodland_101.tmx
+
+
+# water
+../rules/rule_woodland_020.tmx
+../rules/rule_woodland_021.tmx
diff --git a/rules/rule_woodland_001.tmx b/rules/rule_woodland_001.tmx
index 8ba4a0b9..0a1e9941 100644
--- a/rules/rule_woodland_001.tmx
+++ b/rules/rule_woodland_001.tmx
@@ -19,9 +19,9 @@
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <tileset firstgid="627" name="set_rules" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/set_rules.png" width="32" height="32"/>
+  <image source="../graphics/tiles/set_rules.png" width="64" height="64"/>
  </tileset>
- <tileset firstgid="628" name="set_woodland" tilewidth="32" tileheight="32">
+ <tileset firstgid="631" name="set_woodland" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/set_woodland.png" width="192" height="192"/>
  </tileset>
  <layer name="RuleRegions" width="13" height="8">
@@ -31,12 +31,12 @@
  </layer>
  <layer name="RuleSet" width="13" height="8">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA+UMEHoUib86ioJyBMCVVD91VC6BkrXQuk6KF1PoT0NUP2NULqJQvOoBQA6sWeDoAEAAA==
+   H4sIAAAAAAAAA2NgIA+UM0HoCib86moIyBMCtVD9dVC6Hko3QOlGKN1EoT3NUP0tULqVQvOoBQBSVsxLoAEAAA==
   </data>
  </layer>
  <layer name="rule_Ground" width="13" height="8">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA8IQukQMvUTCxRJpKltz0ADAPeDJtegAQAA
+   H4sIAAAAAAAAA2NgIA8IQukQAurCyTQfBhRJpKltz0ADANGJTwegAQAA
   </data>
  </layer>
  <layer name="rule_Over" width="13" height="8" visible="0">
@@ -44,9 +44,9 @@
    H4sIAAAAAAAAA2NgGAWDGQAAkhj1hqABAAA=
   </data>
  </layer>
- <layer name="rule_Collision" width="13" height="8" visible="0">
+ <layer name="rule_Collision" width="13" height="8">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgGAWDGQAAkhj1hqABAAA=
+   H4sIAAAAAAAAA2NgoC0oYqKxBcMcAACZ09jqoAEAAA==
   </data>
  </layer>
 </map>
diff --git a/rules/rule_woodland_002.tmx b/rules/rule_woodland_002.tmx
index bc9b24e7..cf351372 100644
--- a/rules/rule_woodland_002.tmx
+++ b/rules/rule_woodland_002.tmx
@@ -19,9 +19,9 @@
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <tileset firstgid="627" name="set_rules" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/set_rules.png" width="32" height="32"/>
+  <image source="../graphics/tiles/set_rules.png" width="64" height="64"/>
  </tileset>
- <tileset firstgid="628" name="set_woodland" tilewidth="32" tileheight="32">
+ <tileset firstgid="631" name="set_woodland" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/set_woodland.png" width="192" height="192"/>
  </tileset>
  <layer name="RuleRegions" width="11" height="4">
@@ -29,54 +29,9 @@
    H4sIAAAAAAAAA2NgIA0UM0EwNjYyTcgMYtWiAwACeJUBsAAAAA==
   </data>
  </layer>
- <layer name="RuleSet_T1" width="11" height="4">
+ <layer name="RuleSet" width="11" height="4">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA1UMZHGJ8YMUgAA7MbjsbAAAAA=
-  </data>
- </layer>
- <layer name="RuleSet_T2" width="11" height="4">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA1UM5HGJ8YMUgAArQAxprAAAAA=
-  </data>
- </layer>
- <layer name="RuleSet_T3" width="11" height="4">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA3UMJHGJ8YMUgAAalMNwbAAAAA=
-  </data>
- </layer>
- <layer name="RuleSet_T4" width="11" height="4">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA3UMpHGJ8YMUgAAK5Xf1rAAAAA=
-  </data>
- </layer>
- <layer name="RuleSet_T5" width="11" height="4">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA3UMZHGJ8YMUgAA6N+o7rAAAAA=
-  </data>
- </layer>
- <layer name="RuleSet_T6" width="11" height="4">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA3UM5HGJ8YMUgAAqRl6+bAAAAA=
-  </data>
- </layer>
- <layer name="RuleSet_T7" width="11" height="4">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA00MJHGJ8YMUgAAHFoc17AAAAA=
-  </data>
- </layer>
- <layer name="RuleSet_T8" width="11" height="4">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA00MpHGJ8YMUgAAXZzOwLAAAAA=
-  </data>
- </layer>
- <layer name="RuleSet_T9" width="11" height="4">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA00MUEwOhtZnhgziFWLDgDUOKdOsAAAAA==
-  </data>
- </layer>
- <layer name="RuleSet" width="11" height="4" visible="0">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA2UMDEwlDJB2CC6BIkNkyfGDGQ9pAAAi+jCBLAAAAA=
+   H4sIAAAAAAAAA2NgIB1UMKHS6GxSzSEFAACH8TKAsAAAAA==
   </data>
  </layer>
  <layer name="rule_Ground" width="11" height="4" visible="0">
@@ -84,7 +39,7 @@
    H4sIAAAAAAAAA2NgIB0EQ+lQJLEUMsxxIUMPAKqukWKwAAAA
   </data>
  </layer>
- <layer name="rule_Over" width="11" height="4" visible="0">
+ <layer name="rule_Over" width="11" height="4">
   <data encoding="base64" compression="gzip">
    H4sIAAAAAAAAA2NgGFoAAG9eUC+wAAAA
   </data>
diff --git a/rules/rule_woodland_003.tmx b/rules/rule_woodland_003.tmx
index fe6548ff..8e6ea14c 100644
--- a/rules/rule_woodland_003.tmx
+++ b/rules/rule_woodland_003.tmx
@@ -19,9 +19,9 @@
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <tileset firstgid="627" name="set_rules" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/set_rules.png" width="32" height="32"/>
+  <image source="../graphics/tiles/set_rules.png" width="64" height="64"/>
  </tileset>
- <tileset firstgid="628" name="set_woodland" tilewidth="32" tileheight="32">
+ <tileset firstgid="631" name="set_woodland" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/set_woodland.png" width="192" height="192"/>
  </tileset>
  <layer name="RuleRegions" width="13" height="7">
@@ -29,57 +29,12 @@
    H4sIAAAAAAAAA2NgIA8UM0EwsWxy9QwntwEAiQQxgGwBAAA=
   </data>
  </layer>
- <layer name="RuleSet_T1" width="13" height="7" visible="0">
+ <layer name="RuleSet_" width="13" height="7">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoC6oYoJgdDayPDKNzsbGJ9cd1LCHkH9IAQA/w3KVbAEAAA==
+   H4sIAAAAAAAAA2NgIA9UMEEwOpuQHlx8ZLMoBeTYQ45/SAUACreonWwBAAA=
   </data>
  </layer>
- <layer name="RuleSet_T2" width="13" height="7" visible="0">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoC6oZoJgdDayPDKNzsbGJ9cd1LCHkH9IAQAwRvcDbAEAAA==
-  </data>
- </layer>
- <layer name="RuleSet_T3" width="13" height="7" visible="0">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoC6oYYJgdDayPDKNzsbGJ9cd1LCHkH9IAQCf0Y1UbAEAAA==
-  </data>
- </layer>
- <layer name="RuleSet_T4" width="13" height="7" visible="0">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoC6oZYJgdDayPDKNzsbGJ9cd1LCHkH9IAQCQVAjCbAEAAA==
-  </data>
- </layer>
- <layer name="RuleSet_T5" width="13" height="7" visible="0">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoC6oY4JgdDayPDKNzsbGJ9cd1LCHkH9IAQDA3feibAEAAA==
-  </data>
- </layer>
- <layer name="RuleSet_T6" width="13" height="7" visible="0">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoC6oZ4JgdDayPDKNzsbGJ9cd1LCHkH9IAQDPWHI0bAEAAA==
-  </data>
- </layer>
- <layer name="RuleSet_T7" width="13" height="7" visible="0">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoC5oYIJgdDayPDKNzsbGJ9cd1LCHkH9IAQAMW+o9bAEAAA==
-  </data>
- </layer>
- <layer name="RuleSet_T8" width="13" height="7" visible="0">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoC5oZIJgdDayPDKNzsbGJ9cd1LCHkH9IAQAD3m+rbAEAAA==
-  </data>
- </layer>
- <layer name="RuleSet_T9" width="13" height="7">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA80MeHnk2sepeaQaw+1/YMNAADRwtidbAEAAA==
-  </data>
- </layer>
- <layer name="RuleSet_" width="13" height="7" visible="0">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA+UMkEwOruECYLR2TB1yHKlWNilaHrIdRup9pDjH1IBAMakXT1sAQAA
-  </data>
- </layer>
- <layer name="rule_Ground" width="13" height="7">
+ <layer name="rule_Ground" width="13" height="7" visible="0">
   <data encoding="base64" compression="gzip">
    H4sIAAAAAAAAA2NgIA8EovGDyDQHBpyhtCuF5hACyVA6FU08EY2fRAO7Aabxn2NsAQAA
   </data>
diff --git a/rules/rule_woodland_004.tmx b/rules/rule_woodland_004.tmx
index d11a157d..8b8e65b9 100644
--- a/rules/rule_woodland_004.tmx
+++ b/rules/rule_woodland_004.tmx
@@ -19,9 +19,9 @@
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <tileset firstgid="627" name="set_rules" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/set_rules.png" width="32" height="32"/>
+  <image source="../graphics/tiles/set_rules.png" width="64" height="64"/>
  </tileset>
- <tileset firstgid="628" name="set_woodland" tilewidth="32" tileheight="32">
+ <tileset firstgid="631" name="set_woodland" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/set_woodland.png" width="192" height="192"/>
  </tileset>
  <layer name="RuleRegions" width="21" height="5" visible="0">
@@ -29,59 +29,59 @@
    H4sIAAAAAAAAA2NgoA0oZkJgavCHkpnUBgDe2nMipAEAAA==
   </data>
  </layer>
- <layer name="RuleSet_T1" width="21" height="5" visible="0">
+ <layer name="RuleSet_T1" width="21" height="5">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoA2oYqIujW4utfnUdic1AQDB20LupAEAAA==
+   H4sIAAAAAAAAA2NgoA2oZaIujW4utfnUdic1AQBhBjMKpAEAAA==
   </data>
  </layer>
- <layer name="RuleSet_T2" width="21" height="5" visible="0">
+ <layer name="RuleSet_T2" width="21" height="5">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoA2oZqIujW4utfnUdic1AQA6KPSKpAEAAA==
+   H4sIAAAAAAAAA2NgoA2oY6IujW4utfnUdic1AQBsEuinpAEAAA==
   </data>
  </layer>
  <layer name="RuleSet_T3" width="21" height="5">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoA2oYaIujW4utfnUdic1AQCa9YVupAEAAA==
+   H4sIAAAAAAAAA2NgoA2oZ6IujW4utfnUdic1AQCX4V7DpAEAAA==
   </data>
  </layer>
- <layer name="RuleSet_T4" width="21" height="5" visible="0">
+ <layer name="RuleSet_T4" width="21" height="5">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoA2oZaIujW4utfnUdic1AQBhBjMKpAEAAA==
+   H4sIAAAAAAAAA2NgoA1oYKIujW4utfnUdic1AQDJWfqrpAEAAA==
   </data>
  </layer>
- <layer name="RuleSet_T5" width="21" height="5" visible="0">
+ <layer name="RuleSet_T5" width="21" height="5">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoA2oY6IujW4utfnUdic1AQBsEuinpAEAAA==
+   H4sIAAAAAAAAA2NgoA1oZKIujW4utfnUdic1AQAyqkzPpAEAAA==
   </data>
  </layer>
- <layer name="RuleSet_T6" width="21" height="5" visible="0">
+ <layer name="RuleSet_T6" width="21" height="5">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoA2oZ6IujW4utfnUdic1AQCX4V7DpAEAAA==
+   H4sIAAAAAAAAA2NgoA1oYqIujW4utfnUdic1AQA/vpdipAEAAA==
   </data>
  </layer>
- <layer name="RuleSet_T7" width="21" height="5" visible="0">
+ <layer name="RuleSet_T7" width="21" height="5">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoA1oYKIujW4utfnUdic1AQDJWfqrpAEAAA==
+   H4sIAAAAAAAAA2NgoA1oZqIujW4utfnUdic1AQDETSEGpAEAAA==
   </data>
  </layer>
- <layer name="RuleSet_T8" width="21" height="5" visible="0">
+ <layer name="RuleSet_T8" width="21" height="5">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoA1oZKIujW4utfnUdic1AQAyqkzPpAEAAA==
+   H4sIAAAAAAAAA2NgoA1oYaIujW4utfnUdic1AQBkkFDipAEAAA==
   </data>
  </layer>
- <layer name="RuleSet_T9" width="21" height="5" visible="0">
+ <layer name="RuleSet_T9" width="21" height="5">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoA1oYqIujW4utfnUdic1AQA/vpdipAEAAA==
+   H4sIAAAAAAAAA2NgoA1oZaIujW4utfnUdic1AQCfY+aGpAEAAA==
   </data>
  </layer>
  <layer name="RuleSet" width="21" height="5">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoA0oZUJgZD42NcToh4lho7HpJYYmx53Y3EVrAADlZ0o/pAEAAA==
+   H4sIAAAAAAAAA2NgoA2oYEJgZD42NcToh4lho7HpJYYmx53Y3EVrAABj6CQIpAEAAA==
   </data>
  </layer>
  <layer name="RuleSet" width="21" height="5">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoC8oYUKlkcVhmFpmUgKINZMSdxMLAFmicbCkAQAA
+   H4sIAAAAAAAAA2NgoC8oZ0KlkcVhmFpmUgKINZMSdxMLAJhpqxSkAQAA
   </data>
  </layer>
  <layer name="rule_Ground" width="21" height="5" visible="0">
diff --git a/rules/rule_woodland_012.tmx b/rules/rule_woodland_012.tmx
index 0593239b..64a63da8 100644
--- a/rules/rule_woodland_012.tmx
+++ b/rules/rule_woodland_012.tmx
@@ -19,9 +19,9 @@
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <tileset firstgid="627" name="set_rules" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/set_rules.png" width="32" height="32"/>
+  <image source="../graphics/tiles/set_rules.png" width="64" height="64"/>
  </tileset>
- <tileset firstgid="628" name="set_woodland" tilewidth="32" tileheight="32">
+ <tileset firstgid="631" name="set_woodland" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/set_woodland.png" width="192" height="192"/>
  </tileset>
  <layer name="RuleRegions" width="11" height="4">
@@ -31,7 +31,7 @@
  </layer>
  <layer name="RuleSet" width="11" height="4">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA2UMDEwlDJB2CC6BIkNkyfGDGQ9pAAAi+jCBLAAAAA=
+   H4sIAAAAAAAAA2NgIB1UMKHS6GxSzSEFAACH8TKAsAAAAA==
   </data>
  </layer>
  <layer name="rule_Ground" width="11" height="4" visible="0">
diff --git a/rules/rule_woodland_013.tmx b/rules/rule_woodland_013.tmx
index 8727d4d1..5ec10bfa 100644
--- a/rules/rule_woodland_013.tmx
+++ b/rules/rule_woodland_013.tmx
@@ -19,9 +19,9 @@
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <tileset firstgid="627" name="set_rules" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/set_rules.png" width="32" height="32"/>
+  <image source="../graphics/tiles/set_rules.png" width="64" height="64"/>
  </tileset>
- <tileset firstgid="628" name="set_woodland" tilewidth="32" tileheight="32">
+ <tileset firstgid="631" name="set_woodland" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/set_woodland.png" width="192" height="192"/>
  </tileset>
  <layer name="RuleRegions" width="13" height="7">
@@ -31,7 +31,7 @@
  </layer>
  <layer name="RuleSet_" width="13" height="7">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA+UMkEwOruECYLR2TB1yHKlWNilaHrIdRup9pDjH1IBAMakXT1sAQAA
+   H4sIAAAAAAAAA2NgIA9UMEEwOpuQHlx8ZLMoBeTYQ45/SAUACreonWwBAAA=
   </data>
  </layer>
  <layer name="rule_Ground" width="13" height="7">
diff --git a/rules/rule_woodland_020.tmx b/rules/rule_woodland_020.tmx
new file mode 100644
index 00000000..29a4f294
--- /dev/null
+++ b/rules/rule_woodland_020.tmx
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="11" height="4" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="Woodland" tilewidth="32" tileheight="32">
+  <image source="../graphics/tiles/Woodland_ground.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="257" name="Collision" tilewidth="32" tileheight="32">
+  <image source="../graphics/tiles/collision.png" width="64" height="32"/>
+ </tileset>
+ <tileset firstgid="259" name="set_rules" tilewidth="32" tileheight="32">
+  <image source="../graphics/tiles/set_rules.png" width="64" height="64"/>
+ </tileset>
+ <tileset firstgid="263" name="set_woodland" tilewidth="32" tileheight="32">
+  <image source="../graphics/tiles/set_woodland.png" width="192" height="192"/>
+ </tileset>
+ <layer name="RuleRegions" width="11" height="4">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgIA0wM0IwNjYyTcgMYtWiAwAPMLB1sAAAAA==
+  </data>
+ </layer>
+ <layer name="RuleSet" width="11" height="4">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgIB3wMKLS6GxSzSEFAABpH13dsAAAAA==
+  </data>
+ </layer>
+ <layer name="rule_Ground" width="11" height="4">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgIB2EQekIJLF0MsxxJ0MPAAI3UbmwAAAA
+  </data>
+ </layer>
+</map>
diff --git a/rules/rule_woodland_021.tmx b/rules/rule_woodland_021.tmx
new file mode 100644
index 00000000..119b913e
--- /dev/null
+++ b/rules/rule_woodland_021.tmx
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="13" height="7" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="Woodland" tilewidth="32" tileheight="32">
+  <image source="../graphics/tiles/Woodland_ground.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="257" name="Woodland Water" tilewidth="32" tileheight="32">
+  <image source="../graphics/tiles/Woodland_water.png" width="512" height="96"/>
+ </tileset>
+ <tileset firstgid="305" name="Collision" tilewidth="32" tileheight="32">
+  <image source="../graphics/tiles/collision.png" width="64" height="32"/>
+ </tileset>
+ <tileset firstgid="307" name="set_rules" tilewidth="32" tileheight="32">
+  <image source="../graphics/tiles/set_rules.png" width="64" height="64"/>
+ </tileset>
+ <tileset firstgid="311" name="set_woodland" tilewidth="32" tileheight="32">
+  <image source="../graphics/tiles/set_woodland.png" width="192" height="192"/>
+ </tileset>
+ <layer name="RuleRegions" width="13" height="7">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgIA8YM0IwsWxy9QwntwEAaXughWwBAAA=
+  </data>
+ </layer>
+ <layer name="RuleSet_" width="13" height="7">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgIA/YMEIwOpuQHlx8ZLMoBeTYQ45/SAUAR4tpqmwBAAA=
+  </data>
+ </layer>
+ <layer name="rule_Ground" width="13" height="7">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgIA+Yo/HNyDQHBtygtAeF5hACaVA6A01cHY2vRgO7ARr84c9sAQAA
+  </data>
+ </layer>
+ <layer name="rule_Over" width="13" height="7" visible="0">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgGAX0AgB8n9a4bAEAAA==
+  </data>
+ </layer>
+ <layer name="rule_Collision" width="13" height="7" visible="0">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgGAX0AgB8n9a4bAEAAA==
+  </data>
+ </layer>
+</map>
diff --git a/rules/rules.txt b/rules/rules.txt
index ee6b3686..c476c61a 100644
--- a/rules/rules.txt
+++ b/rules/rules.txt
@@ -1,65 +1,11 @@
 # lines starting with # or // are comments
 # all other lines will be parsed and treated as filenames.
 
-# basic stuff
-../rules/rule_cave_001.tmx
-# straight walls:
-../rules/rule_cave_002.tmx
-# corners at walls
-../rules/rule_cave_003.tmx
-../rules/rule_cave_004.tmx
-../rules/rule_cave_005.tmx
-# water in caves:
-../rules/rule_cave_006.tmx
-../rules/rule_cave_007.tmx
-# rules for entrances, has bad exception handling,
-# so mind where to put entrances. (So avoid putting them near corners)
-../rules/rule_cave_008.tmx
-# straight carpets
-../rules/rule_cave_009.tmx
-# corners in carpets
-../rules/rule_cave_010.tmx
+../rules/cave/rule_cave.txt
 
-# ice mountains and caves... similar to usual caves
-../rules/rule_icecave_001.tmx
-../rules/rule_icecave_002.tmx
-../rules/rule_icecave_003.tmx
-../rules/rule_icecave_004.tmx
-../rules/rule_icecave_005.tmx
-../rules/rule_icecave_006.tmx
-../rules/rule_icecave_007.tmx
+../rules/icecave/rule_icecave.txt
 
-../rules/rule_icemountain_001.tmx
-../rules/rule_icemountain_002.tmx
-../rules/rule_icemountain_003.tmx
-../rules/rule_icemountain_004.tmx
+../rules/icemountain/rule_icemountain.txt
 
+../rules/rule_woodland.txt
 
-# Rules for Woodlands.
-#
-# grass and high grass
-../rules/rule_woodland_001.tmx
-
-# straight borders of grass and high grass
-../rules/rule_woodland_002.tmx
-
-# borders at corners for grass and highgrass
-../rules/rule_woodland_003.tmx
-
-# this one is needed to grow trees and other stuff of Fringe into high grass
-# XXX       The O can be Tree in high grass. So there wont be setup borders
-# XOX   <-- If O is low grass, make borders of course
-# XXX
-../rules/rule_woodland_004.tmx
-
-# straight borders of grass and high grass
-../rules/rule_woodland_012.tmx
-
-# borders at corners for grass and highgrass
-../rules/rule_woodland_013.tmx
-
-# add trees 1-9 except 7
-../rules/rule_woodland_100.tmx
-
-# add tree 7. This is seperated due to its extra height.
-../rules/rule_woodland_101.tmx