support for carpets in caves with automapping feature

6 files changed, 161 insertions, 26 deletions

diff --git a/rules/example_cave.tmx b/rules/example_cave.tmx
index 6656f692..a1c0d700 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="32" height="32" tilewidth="32" tileheight="32">
+<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="128"/>
+  <image source="../graphics/tiles/set_cave.png" width="128" height="256"/>
  </tileset>
- <tileset firstgid="17" name="set_icecave" tilewidth="32" tileheight="32">
+ <tileset firstgid="33" name="set_icecave" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/set_icecave.png" width="64" height="64"/>
  </tileset>
- <tileset firstgid="21" name="collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="37" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
- <tileset firstgid="23" name="cave" tilewidth="32" tileheight="32">
+ <tileset firstgid="39" name="cave" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/cave.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="151" name="icecave" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/icecave.png" width="512" height="256"/>
+ <tileset firstgid="167" name="cave_x2" tilewidth="32" tileheight="64">
+  <image source="../graphics/tiles/cave_x2.png" width="512" height="64"/>
  </tileset>
- <layer name="set" width="32" height="32" opacity="0.73">
+ <layer name="set" width="64" height="32" opacity="0.73">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+2VyQ6AIAxEcd///3eNCQfSlOKkBTR6mBv0PVvAxjnX/Pnj0wZ5Gr+mF3Wr4UH5pR04fueTm90Fyc2XvnMiDpyTFI3HxelJL1A+4sDx5wj/IGtHZv9owJ8ifKQnyAzWiAcSzX2VzmIJPuewA/OweK8Wps4A9ELrkLpPJWewJ/ixNzOsY/U+bgm+tNfCQeP+Nb7FPUTqWf4H7/DR5Op/bb7koGUiZzgXm9Z+Kv8tOQHu3SuTABAAAA==
+   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=
   </data>
  </layer>
 </map>
diff --git a/rules/rule_cave_001.tmx b/rules/rule_cave_001.tmx
index 9a6415cb..9c68a00c 100644
--- a/rules/rule_cave_001.tmx
+++ b/rules/rule_cave_001.tmx
@@ -1,48 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" width="9" height="9" tilewidth="32" tileheight="32">
+<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="128"/>
+  <image source="../graphics/tiles/set_cave.png" width="128" height="256"/>
  </tileset>
- <tileset firstgid="19" name="set_rules" tilewidth="32" tileheight="32">
+ <tileset firstgid="35" 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="36" name="cave" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/cave.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="148" name="cave_x2" tilewidth="32" tileheight="64">
+ <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="9">
+ <layer name="ruleRegions" width="9" height="17">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA4IE6CJBYPVHEoAAM3doD1EAQAA
+   H4sIAAAAAAAAA2NgIA4oE6CJBYPVHEoBufbTCqC7YyDDGQDhyh7gZAIAAA==
   </data>
  </layer>
- <layer name="ruleSet" width="9" height="9">
+ <layer name="ruleSet" width="9" height="17">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA4wQ2kWKM0KpdmI1A8D7FCaA0pzQmkuEs3hhtI8UJoXSvORaA4/ieqxAQDSzKgZRAEAAA==
+   H4sIAAAAAAAAA2NgIA4wQ2kWKM0KpdmI1A8D7FCaA0pzQmkuEs3hhtI8UJoXSvORaA4/iepxAWEoLUIl8ygF0mh8WSgtR6I58lBaAUorQmklEswAANifSBJkAgAA
   </data>
  </layer>
- <layer name="rule_Ground" width="9" height="9">
+ <layer name="rule_Ground" width="9" height="17">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA5oQGkJKN2ERhMLeqB0F4Xm9EPpOijdjUYTC0hVjw0AAIozh2FEAQAA
+   H4sIAAAAAAAAA2NgIA5YQGkNKD0JjSYWzIHSsyg0Zz6U7oPSs9FoYgGp6nEBezR6FCAAABbPsHJkAgAA
   </data>
  </layer>
- <layer name="rule_Fringe" width="9" height="9">
+ <layer name="rule_Fringe" width="9" height="17">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoAzEUag/D0r7UWhOH5SeQqI+XQrtBQEAy2k8cEQBAAA=
+   H4sIAAAAAAAAA2NgoAzkUai/DkrHUWjOPCi9hER9thTaiw58qWzecAAAJxy7NGQCAAA=
   </data>
  </layer>
- <layer name="rule_Over" width="9" height="9" visible="0">
+ <layer name="rule_Over" width="9" height="17" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgGAWUAgAV+RUNRAEAAA==
+   H4sIAAAAAAAAA2NgGAWjgLYAADPktetkAgAA
   </data>
  </layer>
- <layer name="rule_collision" width="9" height="9">
+ <layer name="rule_collision" width="9" height="17" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIA4wEeDTGzARoEk1hxIAAHxaZCxEAQAA
+   H4sIAAAAAAAAA2NgIA4wEeDTGzARoEk1Z7gDavmTnHAGABmZ+IlkAgAA
   </data>
  </layer>
 </map>
diff --git a/rules/rule_cave_008.tmx b/rules/rule_cave_008.tmx
new file mode 100644
index 00000000..abf23123
--- /dev/null
+++ b/rules/rule_cave_008.tmx
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="13" 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="13" height="17">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgIA8oI2Fi+MNRDzUAOebSS88ooA0AAP6Gu+N0AwAA
+  </data>
+ </layer>
+ <layer name="ruleSet" width="13" height="17">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgIA8wI2Fi+PTWo4SmRhGNL4umZygBkLsVGEhzP7ZwGgUDAwCz0pxudAMAAA==
+  </data>
+ </layer>
+ <layer name="ruleSet" width="13" height="17" visible="0">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgGBlAHo0vPSCuGAWjgIEBAJuXOqJ0AwAA
+  </data>
+ </layer>
+ <layer name="rule_Ground" width="13" height="17" visible="0">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgIA9YIGFi+CDggYSJ4YNAFRBXA3ENlJ8IxElAnAzlGwKxERAbI+npAuJuIO6B8guBuAiIi6F8RyB2AmJnIv0KAoFAHATEwSTooRXQQMK01DMKaAMAxpB53HQDAAA=
+  </data>
+ </layer>
+ <layer name="rule_Over" width="13" height="17" visible="0">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgGAUDCayRMLFABQkTC1YA8UogXkWCnlFAGwAAfDIGenQDAAA=
+  </data>
+ </layer>
+ <layer name="rule_collision" width="13" height="17" visible="0">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgGAWjYBTQEwAAX9FJ7XQDAAA=
+  </data>
+ </layer>
+</map>
diff --git a/rules/rule_cave_009.tmx b/rules/rule_cave_009.tmx
new file mode 100644
index 00000000..caef3e02
--- /dev/null
+++ b/rules/rule_cave_009.tmx
@@ -0,0 +1,35 @@
+<?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" 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>
+ <layer name="ruleRegions" width="6" height="6">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgwA2UkWhlLOL4ALp6ZSzi2AAA/nb1W5AAAAA=
+  </data>
+ </layer>
+ <layer name="ruleSet" width="6" height="6">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgIAyECfCppQcEAGKdKiOQAAAA
+  </data>
+ </layer>
+ <layer name="ruleSet" width="6" height="6">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgIAxECPCppQcEAGy13ceQAAAA
+  </data>
+ </layer>
+ <layer name="rule_Ground" width="6" height="6">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgIAwc0Pj6ROjxR+PbEaEHBAA7s+VPkAAAAA==
+  </data>
+ </layer>
+</map>
diff --git a/rules/rule_cave_010.tmx b/rules/rule_cave_010.tmx
new file mode 100644
index 00000000..b4f169e2
--- /dev/null
+++ b/rules/rule_cave_010.tmx
@@ -0,0 +1,40 @@
+<?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="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>
+ <layer name="ruleRegions" width="13" height="7">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgIA8oQzGxbHL1DCe3AQCixQ1VbAEAAA==
+  </data>
+ </layer>
+ <layer name="ruleSet" width="13" height="7">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgoC4QhmJ0NrI8A5o4LjWUuoMa9hDyDykAANBtPQZsAQAA
+  </data>
+ </layer>
+ <layer name="ruleSet" width="13" height="7">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgoC4QgWJ0NrI8A5o4LjWUuoMa9hDyDykAAH/6R1FsAQAA
+  </data>
+ </layer>
+ <layer name="rule_Ground" width="13" height="7">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgoC6IR+MnoPH1oLQBle1FB35QOoBCc/LR+AUUmAUAm85AR2wBAAA=
+  </data>
+ </layer>
+ <layer name="rule_collision" width="13" height="7">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgGAX0AgB8n9a4bAEAAA==
+  </data>
+ </layer>
+</map>
diff --git a/rules/rules.txt b/rules/rules.txt
index 3a1b6448..ee6b3686 100644
--- a/rules/rules.txt
+++ b/rules/rules.txt
@@ -1,14 +1,26 @@
 # 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
 
+# ice mountains and caves... similar to usual caves
 ../rules/rule_icecave_001.tmx
 ../rules/rule_icecave_002.tmx
 ../rules/rule_icecave_003.tmx