From eda9b238962ca9a7db14bafefce914265040ecf8 Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Mon, 8 Mar 2021 12:06:34 -0500
Subject: Added Nana to hallucination_cliff map

---
 res/maps/hallucination_cliff.tmx    | 11 ++++++++++-
 res/scripts/hallucination_cliff.lua | 11 +++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

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 @@
 <?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="12">
+<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">
  <properties>
   <property name="music" value="red_green_yellow_yellow"/>
  </properties>
@@ -150,6 +150,15 @@
   <object id="11" name="near_bottom_first_ladder" type="warp" x="568" y="632">
    <point/>
   </object>
+  <object id="12" name="nana" type="sprite" x="640" y="704">
+   <properties>
+    <property name="animation" value="nana"/>
+    <property name="direction" value="right"/>
+    <property name="interactionScript" value="talk_to_nana"/>
+    <property name="shadow" type="bool" value="true"/>
+   </properties>
+   <point/>
+  </object>
  </objectgroup>
  <layer id="1" name="Upper" width="48" height="48">
   <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()
   ChangeMap("pink_shell", "fromOutside")
 end
 
+function hallucination_cliff.talk_to_nana()
+  StartCutscene()
+  SetAnimation("nana", "talk")
+  DisplayMessage("* Don't talk to me.", "Nana", SpeakerType.WOMAN)
+  WaitForEndOfMessage()
+
+  SetAnimation("nana", "still")
+  SetDirection("nana", Direction.RIGHT)
+  HideCutsceneBars()
+end
+
 function hallucination_cliff.claus_fall_event()
   -- do not trigger if we don't have claus
   if not gamestate.still_has_claus then
-- 
cgit 1.4.1