Correct 099-3 warp scope and subject the monsters there to respawn rules

2 files changed, 69 insertions, 35 deletions

diff --git a/maps/099-1.tmx b/maps/099-1.tmx
index 060d4399..0bfa1093 100644
--- a/maps/099-1.tmx
+++ b/maps/099-1.tmx
@@ -1340,7 +1340,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,0,0,0,0,0,0,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 id="8" name="Collision" width="190" height="180">
+ <layer id="8" name="Collision" width="190" height="180" visible="0">
   <data encoding="csv">
 402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,
 402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,
@@ -1524,7 +1524,7 @@
 402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402
 </data>
  </layer>
- <layer id="12" name="Heights" width="190" height="180">
+ <layer id="12" name="Heights" width="190" height="180" visible="0">
   <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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -1754,8 +1754,8 @@
   <object id="10" name="To Room" type="warp" x="4448" y="4192" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-3"/>
-    <property name="dest_x" value="92"/>
-    <property name="dest_y" value="41"/>
+    <property name="dest_x" value="72"/>
+    <property name="dest_y" value="26"/>
    </properties>
   </object>
   <object id="12" name="To Room" type="warp" x="4224" y="4480" width="32" height="32">
diff --git a/maps/099-3.tmx b/maps/099-3.tmx
index 42fd92d4..566dd3b7 100644
--- a/maps/099-3.tmx
+++ b/maps/099-3.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="150" height="130" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="28">
+<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="150" height="130" tilewidth="32" tileheight="32" infinite="0" nextlayerid="12" nextobjectid="34">
  <properties>
   <property name="manaplus version" value="2"/>
   <property name="music" value="ghoulish-fun.ogg"/>
@@ -987,7 +987,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
 </data>
  </layer>
- <layer id="8" name="Collision" width="150" height="130">
+ <layer id="8" name="Collision" width="150" height="130" visible="0">
   <data encoding="csv">
 1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,
 1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,
@@ -1121,7 +1121,7 @@
 1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710,1710
 </data>
  </layer>
- <layer id="10" name="Heights" width="150" height="130">
+ <layer id="10" name="Heights" width="150" height="130" visible="0">
   <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,
@@ -1259,99 +1259,99 @@
   <object id="1" name="To Hallway" type="warp" x="2304" y="800" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-1"/>
-    <property name="dest_x" value="119"/>
-    <property name="dest_y" value="115"/>
+    <property name="dest_x" value="139"/>
+    <property name="dest_y" value="130"/>
    </properties>
   </object>
   <object id="2" name="To Hallway" type="warp" x="928" y="1952" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-1"/>
-    <property name="dest_x" value="48"/>
-    <property name="dest_y" value="17"/>
+    <property name="dest_x" value="68"/>
+    <property name="dest_y" value="32"/>
    </properties>
   </object>
   <object id="3" name="To Hallway" type="warp" x="1120" y="1952" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-1"/>
-    <property name="dest_x" value="76"/>
-    <property name="dest_y" value="26"/>
+    <property name="dest_x" value="96"/>
+    <property name="dest_y" value="41"/>
    </properties>
   </object>
   <object id="4" name="To Hallway" type="warp" x="1312" y="1952" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-1"/>
-    <property name="dest_x" value="128"/>
-    <property name="dest_y" value="18"/>
+    <property name="dest_x" value="148"/>
+    <property name="dest_y" value="33"/>
    </properties>
   </object>
   <object id="5" name="To Hallway" type="warp" x="1504" y="1952" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-1"/>
-    <property name="dest_x" value="110"/>
-    <property name="dest_y" value="45"/>
+    <property name="dest_x" value="130"/>
+    <property name="dest_y" value="60"/>
    </properties>
   </object>
   <object id="6" name="To Hallway" type="warp" x="1696" y="1952" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-1"/>
-    <property name="dest_x" value="120"/>
-    <property name="dest_y" value="79"/>
+    <property name="dest_x" value="140"/>
+    <property name="dest_y" value="94"/>
    </properties>
   </object>
   <object id="7" name="To Hallway" type="warp" x="1888" y="1952" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-1"/>
-    <property name="dest_x" value="113"/>
-    <property name="dest_y" value="98"/>
+    <property name="dest_x" value="133"/>
+    <property name="dest_y" value="113"/>
    </properties>
   </object>
   <object id="8" name="To Hallway" type="warp" x="2528" y="1952" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-1"/>
-    <property name="dest_x" value="125"/>
-    <property name="dest_y" value="98"/>
+    <property name="dest_x" value="145"/>
+    <property name="dest_y" value="113"/>
    </properties>
   </object>
   <object id="9" name="To Hallway" type="warp" x="2720" y="1952" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-1"/>
-    <property name="dest_x" value="60"/>
-    <property name="dest_y" value="93"/>
+    <property name="dest_x" value="80"/>
+    <property name="dest_y" value="108"/>
    </properties>
   </object>
   <object id="10" name="To Hallway" type="warp" x="2912" y="1952" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-1"/>
-    <property name="dest_x" value="20"/>
-    <property name="dest_y" value="55"/>
+    <property name="dest_x" value="40"/>
+    <property name="dest_y" value="70"/>
    </properties>
   </object>
   <object id="11" name="To Hallway" type="warp" x="3104" y="1952" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-1"/>
-    <property name="dest_x" value="14"/>
-    <property name="dest_y" value="55"/>
+    <property name="dest_x" value="34"/>
+    <property name="dest_y" value="70"/>
    </properties>
   </object>
   <object id="12" name="To Hallway" type="warp" x="3296" y="1952" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-1"/>
-    <property name="dest_x" value="15"/>
-    <property name="dest_y" value="68"/>
+    <property name="dest_x" value="35"/>
+    <property name="dest_y" value="83"/>
    </properties>
   </object>
   <object id="13" name="To Hallway" type="warp" x="3488" y="1952" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-1"/>
-    <property name="dest_x" value="19"/>
-    <property name="dest_y" value="94"/>
+    <property name="dest_x" value="39"/>
+    <property name="dest_y" value="109"/>
    </properties>
   </object>
   <object id="14" name="To Hallway" type="warp" x="3680" y="1952" width="32" height="32">
    <properties>
     <property name="dest_map" value="099-1"/>
-    <property name="dest_x" value="57"/>
-    <property name="dest_y" value="52"/>
+    <property name="dest_x" value="77"/>
+    <property name="dest_y" value="67"/>
    </properties>
   </object>
   <object id="15" name="Object" type="switch" x="928" y="2208" width="32" height="32"/>
@@ -1363,4 +1363,38 @@
   <object id="24" name="Object" type="switch" x="3104" y="2208" width="32" height="32"/>
   <object id="27" name="Object" type="switch" x="3680" y="2208" width="32" height="32"/>
  </objectgroup>
+ <objectgroup id="11" name="Spawns" visible="0">
+  <object id="29" name="Void Scorpion" type="spawn" x="640" y="640" width="3200" height="1920">
+   <properties>
+    <property name="death" value="60000"/>
+    <property name="max_beings" value="15"/>
+    <property name="monster_id" value="1159"/>
+    <property name="spawn" value="60000"/>
+   </properties>
+  </object>
+  <object id="30" name="Void Shroom" type="spawn" x="640" y="672" width="3200" height="1920">
+   <properties>
+    <property name="death" value="60000"/>
+    <property name="max_beings" value="15"/>
+    <property name="monster_id" value="1160"/>
+    <property name="spawn" value="60000"/>
+   </properties>
+  </object>
+  <object id="31" name="Void Maggot" type="spawn" x="640" y="704" width="3200" height="1920">
+   <properties>
+    <property name="death" value="60000"/>
+    <property name="max_beings" value="20"/>
+    <property name="monster_id" value="1156"/>
+    <property name="spawn" value="60000"/>
+   </properties>
+  </object>
+  <object id="33" name="Void Archant" type="spawn" x="640" y="736" width="3200" height="1920">
+   <properties>
+    <property name="death" value="60000"/>
+    <property name="max_beings" value="20"/>
+    <property name="monster_id" value="1152"/>
+    <property name="spawn" value="60000"/>
+   </properties>
+  </object>
+ </objectgroup>
 </map>