rules improved

icecaves have more options now

7 files changed, 180 insertions, 33 deletions

diff --git a/rules/example_icecave.tmx b/rules/example_icecave.tmx
index 4a8223ce..2357fb0d 100644
--- a/rules/example_icecave.tmx
+++ b/rules/example_icecave.tmx
@@ -1,17 +1,20 @@
 <?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_icecave" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/set_icecave.png" width="64" height="64"/>
+  <image source="../graphics/tiles/set_icecave.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="5" name="collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="17" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
- <tileset firstgid="7" name="icecave" tilewidth="32" tileheight="32">
+ <tileset firstgid="19" name="icecave" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/icecave.png" width="512" height="256"/>
  </tileset>
+ <tileset firstgid="147" name="set_rules" tilewidth="32" tileheight="32">
+  <image source="../graphics/tiles/set_rules.png" width="64" height="64"/>
+ </tileset>
  <layer name="set" width="32" height="32" opacity="0.73">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+2UOxLAIAhENeP9z5zGIuPwU5ZAYbGNEt4GkN5a61dXU4+gbH60Dws70kc2X/IwpqizSP4gRN1FebDyOXl6tsOx8nc8WHpRgb/OJ4rPvQdPDRDv8U++ZSdEzb/G1zxwsUg+5UGLQ9dAyv+tOWpXnv4fal9zOarwufwePjXfWszOtyd8jzx1z+Kf9hDJt8x5tKrwszxk85F6AVXE4B0AEAAA
+   H4sIAAAAAAAAA+2V4QqFIAyFrVvSjXt7/8eNwEBk0zPdMqIfB8tg35mba3DODa9eBY0Z9eZb+0g5a1j9RT6Q3K3PgWNNQee7j/Ys+RMh6puVB5TPqaVmEg7Kl3hAaiHheyEfqcWhT/S8KebP3Qck7x/jQeM+ttQA5c6ESj6WAlubXzqLtO/QWXHy/mH9JvzV5T2UZmhN7lz+sR8qfnzmkllJ8XM9ieSnNa+5GHfhc/E1+LkYaR9y+7X8lv/QE/i1NdTkI31urbvwe3nozdfUDrIV56wAEAAA
   </data>
  </layer>
 </map>
diff --git a/rules/icecave/rule_icecave.txt b/rules/icecave/rule_icecave.txt
index 256c72e8..80faf52a 100644
--- a/rules/icecave/rule_icecave.txt
+++ b/rules/icecave/rule_icecave.txt
@@ -20,6 +20,12 @@
 # frozen water: corners at waterside
 ./rule_icecave_007.tmx
 
+# carpet straight
+./rule_icecave_009.tmx
+
+# carpet corners
+./rule_icecave_010.tmx
+
 # error handling: some situations cannot be handled properly with this ruleset:
 # so indicate these situations with the error-tile
 ./rule_icecave_100.tmx
diff --git a/rules/icecave/rule_icecave_001.tmx b/rules/icecave/rule_icecave_001.tmx
index 52363cda..0c109b42 100644
--- a/rules/icecave/rule_icecave_001.tmx
+++ b/rules/icecave/rule_icecave_001.tmx
@@ -1,35 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" width="7" height="3" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" width="9" height="9" tilewidth="32" tileheight="32">
+ <properties>
+  <property name="DeleteTiles" value="true"/>
+ </properties>
  <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"/>
+  <image source="../../graphics/tiles/set_icecave.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="7" name="set_rules" tilewidth="32" tileheight="32">
+ <tileset firstgid="19" 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">
+ <tileset firstgid="23" name="icecave" tilewidth="32" tileheight="32">
   <image source="../../graphics/tiles/icecave.png" width="512" height="256"/>
  </tileset>
- <layer name="ruleRegions" width="7" height="3">
+ <layer name="ruleRegions" width="9" height="9">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgwA/YcdD4AABTkrM4VAAAAA==
+   H4sIAAAAAAAAA2NgIA4IE6CJBbj0DTZzSAEAcsPyckQBAAA=
   </data>
  </layer>
- <layer name="ruleSet" width="7" height="3">
+ <layer name="ruleSet" width="9" height="9">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgwA+YoTQLlGYjoB4EABX4+a9UAAAA
+   H4sIAAAAAAAAA2NgIA4wQ2kWKM0KpdmI1A8D7FCaA02ci0RzuKE0D5o4H4nm8ENpARL1IQMAB+mbhUQBAAA=
   </data>
  </layer>
- <layer name="rule_Ground" width="7" height="3" visible="0">
+ <layer name="rule_Ground" width="9" height="9">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgwA/koTQ/lK4koB4EAPgHSRJUAAAA
+   H4sIAAAAAAAAA2NgIA5oQ2lpNLqVSP0wYASlJdDEyTVHkkrmSONVhR8AABlaPlhEAQAA
   </data>
  </layer>
- <layer name="rule_collision" width="7" height="3">
+ <layer name="rule_collision" width="9" height="9">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgwA+YCMhjAwBsElWnVAAAAA==
+   H4sIAAAAAAAAA2NgIA4wEeBTCkg1D5d6cs2hxD8ARG/fIUQBAAA=
+  </data>
+ </layer>
+ <layer name="rule_Fringe" width="9" height="9">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgIA8YkKmPWubhUh9AojkBaDQ5AACqeTmWRAEAAA==
+  </data>
+ </layer>
+ <layer name="rule_Error" width="9" height="9">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgGAWUAgAV+RUNRAEAAA==
+  </data>
+ </layer>
+ <layer name="rule_Over" width="9" height="9">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgGAWUAgAV+RUNRAEAAA==
   </data>
  </layer>
 </map>
diff --git a/rules/icecave/rule_icecave_006.tmx b/rules/icecave/rule_icecave_006.tmx
index 00629a67..51730477 100644
--- a/rules/icecave/rule_icecave_006.tmx
+++ b/rules/icecave/rule_icecave_006.tmx
@@ -4,17 +4,17 @@
   <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"/>
+  <image source="../../graphics/tiles/set_icecave.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="7" name="set_rules" tilewidth="32" tileheight="32">
-  <image source="../../graphics/tiles/set_rules.png" width="32" height="32"/>
+ <tileset firstgid="19" name="set_rules" tilewidth="32" tileheight="32">
+  <image source="../../graphics/tiles/set_rules.png" width="64" height="64"/>
  </tileset>
- <tileset firstgid="8" name="icecave" tilewidth="32" tileheight="32">
+ <tileset firstgid="23" name="icecave" tilewidth="32" tileheight="32">
   <image source="../../graphics/tiles/icecave.png" width="512" height="256"/>
  </tileset>
  <layer name="ruleRegions" width="6" height="6">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgwA3YkWh2LOL4ALp6dizi2AAAMuRB2ZAAAAA=
+   H4sIAAAAAAAAA2NgwA2EkWhhLOL4ALp6YSzi2AAALrUFg5AAAAA=
   </data>
  </layer>
  <layer name="ruleSet" width="6" height="6">
@@ -22,14 +22,19 @@
    H4sIAAAAAAAAA2NgIAzYCPCppQcEAItPfPCQAAAA
   </data>
  </layer>
- <layer name="ruleNotSet" width="6" height="6">
+ <layer name="ruleSet" width="6" height="6">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgIAy4CPCppQcEAOTd4SuQAAAA
+  </data>
+ </layer>
+ <layer name="ruleSet" width="6" height="6">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgwA3YcLBJBaSYAwDxV2LrkAAAAA==
+   H4sIAAAAAAAAA2NgIAz4CPCppQcEAMFTlWKQAAAA
   </data>
  </layer>
- <layer name="rule_Ground" width="6" height="6">
+ <layer name="rule_Ground" width="6" height="6" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIAzK0fhpROhpQ+OXEqEHBAAdwEJNkAAAAA==
+   H4sIAAAAAAAAA2NgIAza0PilROiZisZvIUIPCAAASt1u8JAAAAA=
   </data>
  </layer>
 </map>
diff --git a/rules/icecave/rule_icecave_007.tmx b/rules/icecave/rule_icecave_007.tmx
index e8522525..601aaeac 100644
--- a/rules/icecave/rule_icecave_007.tmx
+++ b/rules/icecave/rule_icecave_007.tmx
@@ -4,17 +4,17 @@
   <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"/>
+  <image source="../../graphics/tiles/set_icecave.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="7" name="set_rules" tilewidth="32" tileheight="32">
-  <image source="../../graphics/tiles/set_rules.png" width="32" height="32"/>
+ <tileset firstgid="19" name="set_rules" tilewidth="32" tileheight="32">
+  <image source="../../graphics/tiles/set_rules.png" width="64" height="64"/>
  </tileset>
- <tileset firstgid="8" name="icecave" tilewidth="32" tileheight="32">
+ <tileset firstgid="23" name="icecave" tilewidth="32" tileheight="32">
   <image source="../../graphics/tiles/icecave.png" width="512" height="256"/>
  </tileset>
  <layer name="ruleRegions" width="13" height="7">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA+wQzGxbHL1DCe3AQBjNkMpbAEAAA==
+   H4sIAAAAAAAAA2NgIA8IQzGxbHL1DCe3AQDj6TXRbAEAAA==
   </data>
  </layer>
  <layer name="ruleSet" width="13" height="7">
@@ -22,14 +22,19 @@
    H4sIAAAAAAAAA2NgoC5gg2J0NrI8A5o4LjWUuoMa9hDyDykAANyNKXlsAQAA
   </data>
  </layer>
- <layer name="ruleNotSet" width="13" height="7">
+ <layer name="ruleSet" width="13" height="7">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgoC7ggmJ0NrI8A5o4LjWUuoMa9hDyDykAAN2upiFsAQAA
+  </data>
+ </layer>
+ <layer name="ruleSet" width="13" height="7">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA+wQTE6m5AeXHw2HGrIAeTYQ45/SAUAnKjAUmwBAAA=
+   H4sIAAAAAAAAA2NgoC7gg2J0NrI8A5o4LjWUuoMa9hDyDykAACKwIxZsAQAA
   </data>
  </layer>
  <layer name="rule_Ground" width="13" height="7">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoC5IRuOnoPFToXQ6le1FB61Qup1Cc4rR+CUUmAUAMdZruGwBAAA=
+   H4sIAAAAAAAAA2NgoC4oQuMXo/FLoHQZle1FB1Og9DQKzWlC4zdTYBYAacXSPGwBAAA=
   </data>
  </layer>
 </map>
diff --git a/rules/icecave/rule_icecave_009.tmx b/rules/icecave/rule_icecave_009.tmx
new file mode 100644
index 00000000..d96ebe80
--- /dev/null
+++ b/rules/icecave/rule_icecave_009.tmx
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="6" 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="128" height="128"/>
+ </tileset>
+ <tileset firstgid="19" name="set_rules" tilewidth="32" tileheight="32">
+  <image source="../../graphics/tiles/set_rules.png" width="64" height="64"/>
+ </tileset>
+ <tileset firstgid="23" name="icecave" tilewidth="32" tileheight="32">
+  <image source="../../graphics/tiles/icecave.png" width="512" height="256"/>
+ </tileset>
+ <layer name="ruleRegions" width="6" height="6">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgwA2EkWhhLOL4ALp6YSzi2AAALrUFg5AAAAA=
+  </data>
+ </layer>
+ <layer name="ruleSet" width="6" height="6">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgIAzYCfCppQcEAJIt/ZSQAAAA
+  </data>
+ </layer>
+ <layer name="ruleSet" width="6" height="6">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgIAy4CfCppQcEAP2/YE+QAAAA
+  </data>
+ </layer>
+ <layer name="ruleSet" width="6" height="6">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgIAz4CfCppQcEANgxFAaQAAAA
+  </data>
+ </layer>
+ <layer name="ruleNotSet" width="6" height="6">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgwA3YcbBJBaSYAwA8zLY9kAAAAA==
+  </data>
+ </layer>
+ <layer name="ruleNotSet" width="6" height="6">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgwA24cbBJBaSYAwCnbhfQkAAAAA==
+  </data>
+ </layer>
+ <layer name="ruleNotSet" width="6" height="6">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgwA34cbBJBaSYAwARDac9kAAAAA==
+  </data>
+ </layer>
+ <layer name="rule_Ground" width="6" height="6">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgIAyM0fhKROhxQuMbEqEHBABmYFlZkAAAAA==
+  </data>
+ </layer>
+</map>
diff --git a/rules/icecave/rule_icecave_010.tmx b/rules/icecave/rule_icecave_010.tmx
new file mode 100644
index 00000000..eb8e8e84
--- /dev/null
+++ b/rules/icecave/rule_icecave_010.tmx
@@ -0,0 +1,55 @@
+<?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_icecave" tilewidth="32" tileheight="32">
+  <image source="../../graphics/tiles/set_icecave.png" width="128" height="128"/>
+ </tileset>
+ <tileset firstgid="19" name="set_rules" tilewidth="32" tileheight="32">
+  <image source="../../graphics/tiles/set_rules.png" width="64" height="64"/>
+ </tileset>
+ <tileset firstgid="23" name="icecave" tilewidth="32" tileheight="32">
+  <image source="../../graphics/tiles/icecave.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">
+   H4sIAAAAAAAAA2NgoC5gh2J0NrI8A5o4LjWUuoMa9hDyDykAANMIrO9sAQAA
+  </data>
+ </layer>
+ <layer name="ruleSet" width="13" height="7">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgoC7ghmJ0NrI8A5o4LjWUuoMa9hDyDykAANIrI7dsAQAA
+  </data>
+ </layer>
+ <layer name="ruleSet" width="13" height="7">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgoC7gh2J0NrI8A5o4LjWUuoMa9hDyDykAAC01poBsAQAA
+  </data>
+ </layer>
+ <layer name="ruleNotSet" width="13" height="7">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgIA+wQzE6m5AeXHx2HGrIAeTYQ45/SAUAzKE5fmwBAAA=
+  </data>
+ </layer>
+ <layer name="ruleNotSet" width="13" height="7">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgIA9wQzE6m5AeXHxuHGrIAeTYQ45/SAUATchkcWwBAAA=
+  </data>
+ </layer>
+ <layer name="ruleNotSet" width="13" height="7">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgIA/wQzE6m5AeXHx+HGrIAeTYQ45/SAUADe2AwmwBAAA=
+  </data>
+ </layer>
+ <layer name="rule_Ground" width="13" height="7">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgoC4IQuMHo/EVobQyle1FB45Q2plCc5LQ+MkUmAUA1eCGkGwBAAA=
+  </data>
+ </layer>
+</map>