summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKelly Rauchenberger <fefferburbia@gmail.com>2021-02-23 10:14:36 -0500
committerKelly Rauchenberger <fefferburbia@gmail.com>2021-02-23 10:14:36 -0500
commit1cf3ccd05b193e6090c3a61c0e2f54524e1a4ba7 (patch)
treec81dde510625d28a47cd15d678ed70809cd5dff5
parent3ecf5bbc1c81908bfd3355999a37e8e96e15b8b5 (diff)
downloadtanetane-1cf3ccd05b193e6090c3a61c0e2f54524e1a4ba7.tar.gz
tanetane-1cf3ccd05b193e6090c3a61c0e2f54524e1a4ba7.tar.bz2
tanetane-1cf3ccd05b193e6090c3a61c0e2f54524e1a4ba7.zip
Added connection between hallucination_cliff and hallucination_hot_spring
-rw-r--r--res/maps/hallucination_cliff.tmx10
-rw-r--r--res/maps/hallucination_hot_spring.tmx12
-rw-r--r--res/scripts/hallucination_cliff.lua4
-rw-r--r--res/scripts/hallucination_hot_spring.lua5
4 files changed, 29 insertions, 2 deletions
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 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<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"> 2<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">
3 <tileset firstgid="1" source="hallucination.tsx"/> 3 <tileset firstgid="1" source="hallucination.tsx"/>
4 <layer id="2" name="Background" width="48" height="48"> 4 <layer id="2" name="Background" width="48" height="48">
5 <data encoding="csv"> 5 <data encoding="csv">
@@ -114,6 +114,14 @@
114 <property name="script" value="off_bottom"/> 114 <property name="script" value="off_bottom"/>
115 </properties> 115 </properties>
116 </object> 116 </object>
117 <object id="3" name="moveToLeft" type="trigger" x="-6" y="619.5" width="8.25" height="59.75">
118 <properties>
119 <property name="script" value="off_left"/>
120 </properties>
121 </object>
122 <object id="4" name="fromLeft" type="warp" x="16" y="647.25">
123 <point/>
124 </object>
117 </objectgroup> 125 </objectgroup>
118 <layer id="1" name="Upper" width="48" height="48"> 126 <layer id="1" name="Upper" width="48" height="48">
119 <properties> 127 <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 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<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"> 2<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">
3 <tileset firstgid="1" source="hallucination.tsx"/> 3 <tileset firstgid="1" source="hallucination.tsx"/>
4 <layer id="2" name="Lower" width="32" height="16"> 4 <layer id="2" name="Lower" width="32" height="16">
5 <data encoding="csv"> 5 <data encoding="csv">
@@ -21,6 +21,16 @@
217,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 217,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
22</data> 22</data>
23 </layer> 23 </layer>
24 <objectgroup id="2" name="Objects">
25 <object id="1" name="fromRight" type="warp" x="496" y="215.636">
26 <point/>
27 </object>
28 <object id="2" name="moveToRight" type="trigger" x="510.364" y="189.818" width="8" height="57.0909">
29 <properties>
30 <property name="script" value="off_right"/>
31 </properties>
32 </object>
33 </objectgroup>
24 <layer id="1" name="Upper (most)" width="32" height="16"> 34 <layer id="1" name="Upper (most)" width="32" height="16">
25 <properties> 35 <properties>
26 <property name="above" type="bool" value="true"/> 36 <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 = {}
3function hallucination_cliff.off_bottom() 3function hallucination_cliff.off_bottom()
4 ChangeMap("hallucination_interior", "fromTop") 4 ChangeMap("hallucination_interior", "fromTop")
5end 5end
6
7function hallucination_cliff.off_left()
8 ChangeMap("hallucination_hot_spring", "fromRight")
9end
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 @@
1hallucination_hot_spring = {}
2
3function hallucination_hot_spring.off_right()
4 ChangeMap("hallucination_cliff", "fromLeft")
5end