From 1cf3ccd05b193e6090c3a61c0e2f54524e1a4ba7 Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Tue, 23 Feb 2021 10:14:36 -0500
Subject: Added connection between hallucination_cliff and
 hallucination_hot_spring

---
 res/maps/hallucination_cliff.tmx         | 10 +++++++++-
 res/maps/hallucination_hot_spring.tmx    | 12 +++++++++++-
 res/scripts/hallucination_cliff.lua      |  4 ++++
 res/scripts/hallucination_hot_spring.lua |  5 +++++
 4 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 res/scripts/hallucination_hot_spring.lua

(limited to 'res')

diff --git a/res/maps/hallucination_cliff.tmx b/res/maps/hallucination_cliff.tmx
index c7cf718..e6bd65e 100644
--- a/res/maps/hallucination_cliff.tmx
+++ b/res/maps/hallucination_cliff.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="48" height="48" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="3">
+<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="48" height="48" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="5">
  <tileset firstgid="1" source="hallucination.tsx"/>
  <layer id="2" name="Background" width="48" height="48">
   <data encoding="csv">
@@ -114,6 +114,14 @@
     <property name="script" value="off_bottom"/>
    </properties>
   </object>
+  <object id="3" name="moveToLeft" type="trigger" x="-6" y="619.5" width="8.25" height="59.75">
+   <properties>
+    <property name="script" value="off_left"/>
+   </properties>
+  </object>
+  <object id="4" name="fromLeft" type="warp" x="16" y="647.25">
+   <point/>
+  </object>
  </objectgroup>
  <layer id="1" name="Upper" width="48" height="48">
   <properties>
diff --git a/res/maps/hallucination_hot_spring.tmx b/res/maps/hallucination_hot_spring.tmx
index b2d9b31..7de1c87 100644
--- a/res/maps/hallucination_hot_spring.tmx
+++ b/res/maps/hallucination_hot_spring.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="32" height="16" tilewidth="16" tileheight="16" infinite="0" nextlayerid="2" nextobjectid="1">
+<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="32" height="16" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="3">
  <tileset firstgid="1" source="hallucination.tsx"/>
  <layer id="2" name="Lower" width="32" height="16">
   <data encoding="csv">
@@ -21,6 +21,16 @@
 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,462,463,7,7,14,15,14,15,15,14,1,1,14
 </data>
  </layer>
+ <objectgroup id="2" name="Objects">
+  <object id="1" name="fromRight" type="warp" x="496" y="215.636">
+   <point/>
+  </object>
+  <object id="2" name="moveToRight" type="trigger" x="510.364" y="189.818" width="8" height="57.0909">
+   <properties>
+    <property name="script" value="off_right"/>
+   </properties>
+  </object>
+ </objectgroup>
  <layer id="1" name="Upper (most)" width="32" height="16">
   <properties>
    <property name="above" type="bool" value="true"/>
diff --git a/res/scripts/hallucination_cliff.lua b/res/scripts/hallucination_cliff.lua
index f351e1e..412ff03 100644
--- a/res/scripts/hallucination_cliff.lua
+++ b/res/scripts/hallucination_cliff.lua
@@ -3,3 +3,7 @@ hallucination_cliff = {}
 function hallucination_cliff.off_bottom()
   ChangeMap("hallucination_interior", "fromTop")
 end
+
+function hallucination_cliff.off_left()
+  ChangeMap("hallucination_hot_spring", "fromRight")
+end
diff --git a/res/scripts/hallucination_hot_spring.lua b/res/scripts/hallucination_hot_spring.lua
new file mode 100644
index 0000000..0abd63e
--- /dev/null
+++ b/res/scripts/hallucination_hot_spring.lua
@@ -0,0 +1,5 @@
+hallucination_hot_spring = {}
+
+function hallucination_hot_spring.off_right()
+  ChangeMap("hallucination_cliff", "fromLeft")
+end
-- 
cgit 1.4.1