Update 008-2 with the new dungeon building objects

1 files changed, 70 insertions, 10 deletions

diff --git a/maps/008-2.tmx b/maps/008-2.tmx
index c32f48c8..ab1623fc 100644
--- a/maps/008-2.tmx
+++ b/maps/008-2.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.0.3" orientation="orthogonal" renderorder="right-down" width="160" height="280" tilewidth="32" tileheight="32" nextobjectid="36">
+<map version="1.2" tiledversion="1.3.2" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="160" height="280" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="49">
  <properties>
   <property name="author" value="Jesusalva"/>
   <property name="license" value="GPL v2+, CC BY SA 3.0+"/>
@@ -17,7 +17,7 @@
  <tileset firstgid="138" name="cave_x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
   <image source="../graphics/tilesets/cave_x2.png" width="512" height="64"/>
  </tileset>
- <layer name="Ground" width="160" height="280">
+ <layer id="1" name="Ground" width="160" height="280">
   <data encoding="csv">
 30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,31,103,104,104,104,104,105,14,14,14,45,27,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
 30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,31,119,120,120,120,120,121,14,14,14,61,43,50,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
@@ -301,7 +301,7 @@
 30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,80,14,14,14,14,135,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,137,14,14,14,14,14,14,75,78,78,78,78,78,82,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30
 </data>
  </layer>
- <layer name="Fringe" width="160" height="280">
+ <layer id="2" name="Fringe" width="160" height="280">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -585,7 +585,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Over" width="160" height="280">
+ <layer id="3" name="Over" width="160" height="280">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -869,7 +869,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Collision" width="160" height="280">
+ <layer id="4" name="Collision" width="160" height="280">
   <data encoding="csv">
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
@@ -1153,7 +1153,7 @@
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
 </data>
  </layer>
- <layer name="Heights" width="160" height="280">
+ <layer id="5" name="Heights" width="160" height="280">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -1437,7 +1437,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <objectgroup name="Objects">
+ <objectgroup id="6" name="Objects">
   <object id="1" name="Margin" type="fixme" x="0" y="0" width="640" height="640"/>
   <object id="2" name="Margin" type="fixme" x="4480" y="8320" width="640" height="640"/>
   <object id="4" name="Margin" type="fixme" x="4480" y="0" width="640" height="640"/>
@@ -1465,8 +1465,68 @@
     <property name="dest_y" value="237"/>
    </properties>
   </object>
+  <object id="36" name="Collision" type="dyncollision" x="2560" y="6656" width="288" height="32">
+   <properties>
+    <property name="colid" value="3"/>
+   </properties>
+  </object>
+  <object id="37" name="Switch" type="switch" x="3392" y="7584" width="32" height="32">
+   <properties>
+    <property name="args" value="12"/>
+    <property name="callfunc" value="massprovoke"/>
+   </properties>
+  </object>
+  <object id="39" name="Switch" type="switch" x="2112" y="4576" width="32" height="32">
+   <properties>
+    <property name="args" value="12, 10000"/>
+    <property name="callfunc" value="grenade"/>
+    <property name="enabled" value="1"/>
+   </properties>
+  </object>
+  <object id="40" name="Switch" type="switch" x="3552" y="5312" width="32" height="32">
+   <properties>
+    <property name="callfunc" value="ALCReset"/>
+   </properties>
+  </object>
+  <object id="41" name="Lousy Creak" type="function" x="4288" y="640" width="96" height="64">
+   <properties>
+    <property name="args" value="12"/>
+    <property name="callfunc" value="massprovoke"/>
+   </properties>
+  </object>
+  <object id="44" name="Disarm Collision" type="function" x="1696" y="7552" width="96" height="64">
+   <properties>
+    <property name="doevent" value="#008-2_84_208::OnDisable"/>
+   </properties>
+  </object>
+  <object id="45" name="Trap" type="trap" x="2304" y="7904" width="32" height="32">
+   <properties>
+    <property name="damage" value="200"/>
+    <property name="disarmtime" value="0"/>
+    <property name="stuntime" value="1"/>
+   </properties>
+  </object>
+  <object id="46" name="Trap" type="trap" x="2784" y="7680" width="32" height="32">
+   <properties>
+    <property name="damage" value="200"/>
+    <property name="disarmtime" value="0"/>
+    <property name="stuntime" value="1"/>
+   </properties>
+  </object>
+  <object id="47" name="Trap" type="trap" x="1472" y="6752" width="32" height="32">
+   <properties>
+    <property name="damage" value="200"/>
+    <property name="disarmtime" value="10"/>
+    <property name="stuntime" value="2"/>
+   </properties>
+  </object>
+  <object id="48" name="Trap" type="trap" x="2720" y="3744" width="32" height="32">
+   <properties>
+    <property name="damage" value="400"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup color="#7fff00" name="Monsters Layer 1" visible="0">
+ <objectgroup color="#7fff00" id="7" name="Monsters Layer 1" visible="0">
   <object id="10" name="Slime Blast" type="Spawn" x="2048" y="7424" width="1024" height="832">
    <properties>
     <property name="death" value="15000"/>
@@ -1564,7 +1624,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup color="#ff7f00" name="Monsters Layer 2" visible="0">
+ <objectgroup color="#ff7f00" id="8" name="Monsters Layer 2" visible="0">
   <object id="22" name="Bandit" type="Spawn" x="512" y="768" width="1376" height="2560">
    <properties>
     <property name="death" value="25000"/>
@@ -1638,7 +1698,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup color="#7f00ff" name="Monsters Layer 3" visible="0">
+ <objectgroup color="#7f00ff" id="9" name="Monsters Layer 3" visible="0">
   <object id="31" name="Plushroom Field" type="Spawn" x="256" y="704" width="4704" height="2560">
    <properties>
     <property name="death" value="45000"/>