[skip ci] **desert canyon DISABLED** - blame @Saulc

2 files changed, 20 insertions, 4 deletions

diff --git a/maps/004-2.tmx b/maps/004-2.tmx
index 0d345926..c0d4017e 100644
--- a/maps/004-2.tmx
+++ b/maps/004-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="147" tilewidth="32" tileheight="32" nextobjectid="76">
+<map version="1.0" tiledversion="1.0.3" orientation="orthogonal" renderorder="right-down" width="160" height="147" tilewidth="32" tileheight="32" nextobjectid="77">
  <properties>
   <property name="authors" value="TMW.org, Saulc"/>
   <property name="license" value="GPL 3.0"/>
@@ -1275,6 +1275,7 @@
     <property name="dest_map" value="004-2-1"/>
     <property name="dest_x" value="26"/>
     <property name="dest_y" value="87"/>
+    <property name="npc_id" value="SCRIPT"/>
    </properties>
   </object>
   <object id="59" name="to cave " type="warp" x="3200" y="2848" width="32" height="32">
@@ -1300,8 +1301,15 @@
   </object>
   <object id="72" name="margin" type="fixme" x="1312" y="4064" width="640" height="640"/>
   <object id="74" name="margin" type="fixme" x="4480" y="736" width="640" height="640"/>
+  <object id="76" name="SCRIPT OVERRIDE" type="warp" x="2272" y="2208" width="64" height="32">
+   <properties>
+    <property name="dest_map" value="010-2"/>
+    <property name="dest_x" value="97"/>
+    <property name="dest_y" value="123"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup color="#ff7f00" name="Spawns">
+ <objectgroup color="#ff7f00" name="Spawns" visible="0">
   <object id="62" name="Maggot" type="Spawn" x="672" y="608" width="1024" height="1408">
    <properties>
     <property name="death" value="150000"/>
diff --git a/maps/010-2.tmx b/maps/010-2.tmx
index dee94102..9f055013 100644
--- a/maps/010-2.tmx
+++ b/maps/010-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="284" height="150" tilewidth="32" tileheight="32" nextobjectid="160">
+<map version="1.0" tiledversion="1.0.3" orientation="orthogonal" renderorder="right-down" width="284" height="150" tilewidth="32" tileheight="32" nextobjectid="161">
  <properties>
   <property name="authors" value="Saulc"/>
   <property name="license" value="GPL 3.0"/>
@@ -1772,7 +1772,7 @@
   <object id="157" name="Margin" type="fixme" x="8448" y="3168" width="640" height="640"/>
   <object id="159" name="Margin" type="fixme" x="384" y="3424" width="640" height="640"/>
  </objectgroup>
- <objectgroup color="#204a87" name="Spawn">
+ <objectgroup color="#204a87" name="Spawn" visible="0">
   <object id="134" name="Snake" type="Spawn" x="3648" y="3200" width="544" height="160">
    <properties>
     <property name="death" value="300000"/>
@@ -1944,6 +1944,7 @@
     <property name="dest_map" value="010-1"/>
     <property name="dest_x" value="124"/>
     <property name="dest_y" value="25"/>
+    <property name="npc_id" value="SCRIPT"/>
    </properties>
   </object>
   <object id="105" name="to cave" type="warp" x="3456" y="4128" width="32" height="32">
@@ -2114,5 +2115,12 @@
     <property name="dest_y" value="105"/>
    </properties>
   </object>
+  <object id="160" name="SCRIPT OVERRIDE" type="warp" x="2976" y="3968" width="288" height="32">
+   <properties>
+    <property name="dest_map" value="004-2"/>
+    <property name="dest_x" value="71"/>
+    <property name="dest_y" value="70"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>