summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKelly Rauchenberger <fefferburbia@gmail.com>2021-03-08 12:06:34 -0500
committerKelly Rauchenberger <fefferburbia@gmail.com>2021-03-08 12:06:34 -0500
commiteda9b238962ca9a7db14bafefce914265040ecf8 (patch)
treeecfafa86446d0cf1299698b74bd7b2ff51f38b3d
parent17657b6037f17761e61dafc6b71ee8bc670f9c51 (diff)
downloadtanetane-eda9b238962ca9a7db14bafefce914265040ecf8.tar.gz
tanetane-eda9b238962ca9a7db14bafefce914265040ecf8.tar.bz2
tanetane-eda9b238962ca9a7db14bafefce914265040ecf8.zip
Added Nana to hallucination_cliff map
-rw-r--r--res/maps/hallucination_cliff.tmx11
-rw-r--r--res/scripts/hallucination_cliff.lua11
2 files changed, 21 insertions, 1 deletions
diff --git a/res/maps/hallucination_cliff.tmx b/res/maps/hallucination_cliff.tmx index ae4656d..817f2ad 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="12"> 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="13">
3 <properties> 3 <properties>
4 <property name="music" value="red_green_yellow_yellow"/> 4 <property name="music" value="red_green_yellow_yellow"/>
5 </properties> 5 </properties>
@@ -150,6 +150,15 @@
150 <object id="11" name="near_bottom_first_ladder" type="warp" x="568" y="632"> 150 <object id="11" name="near_bottom_first_ladder" type="warp" x="568" y="632">
151 <point/> 151 <point/>
152 </object> 152 </object>
153 <object id="12" name="nana" type="sprite" x="640" y="704">
154 <properties>
155 <property name="animation" value="nana"/>
156 <property name="direction" value="right"/>
157 <property name="interactionScript" value="talk_to_nana"/>
158 <property name="shadow" type="bool" value="true"/>
159 </properties>
160 <point/>
161 </object>
153 </objectgroup> 162 </objectgroup>
154 <layer id="1" name="Upper" width="48" height="48"> 163 <layer id="1" name="Upper" width="48" height="48">
155 <properties> 164 <properties>
diff --git a/res/scripts/hallucination_cliff.lua b/res/scripts/hallucination_cliff.lua index d4ba921..35da0b1 100644 --- a/res/scripts/hallucination_cliff.lua +++ b/res/scripts/hallucination_cliff.lua
@@ -14,6 +14,17 @@ function hallucination_cliff.enter_door()
14 ChangeMap("pink_shell", "fromOutside") 14 ChangeMap("pink_shell", "fromOutside")
15end 15end
16 16
17function hallucination_cliff.talk_to_nana()
18 StartCutscene()
19 SetAnimation("nana", "talk")
20 DisplayMessage("* Don't talk to me.", "Nana", SpeakerType.WOMAN)
21 WaitForEndOfMessage()
22
23 SetAnimation("nana", "still")
24 SetDirection("nana", Direction.RIGHT)
25 HideCutsceneBars()
26end
27
17function hallucination_cliff.claus_fall_event() 28function hallucination_cliff.claus_fall_event()
18 -- do not trigger if we don't have claus 29 -- do not trigger if we don't have claus
19 if not gamestate.still_has_claus then 30 if not gamestate.still_has_claus then