From 68c2e17714e7c1cd7b47f65a08933ddff9e5fa2a Mon Sep 17 00:00:00 2001
From: Star Rauchenberger <fefferburbia@gmail.com>
Date: Sun, 14 Mar 2021 15:38:02 -0400
Subject: Added Magic (DCMC) to hallucination_interior

---
 res/maps/hallucination_interior.tmx    | 13 ++++++++++++-
 res/scripts/hallucination_interior.lua | 19 +++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

(limited to 'res')

diff --git a/res/maps/hallucination_interior.tmx b/res/maps/hallucination_interior.tmx
index ba43c66..a741b6c 100644
--- a/res/maps/hallucination_interior.tmx
+++ b/res/maps/hallucination_interior.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="64" height="64" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="17">
+<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="64" height="64" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="19">
  <properties>
   <property name="music" value="red_green_yellow_yellow"/>
  </properties>
@@ -196,6 +196,17 @@
    </properties>
    <point/>
   </object>
+  <object id="17" name="magic_dcmc" type="sprite" x="304" y="240">
+   <properties>
+    <property name="animation" value="magic"/>
+    <property name="interactionScript" value="talk_to_magic"/>
+    <property name="shadow" type="bool" value="true"/>
+   </properties>
+   <point/>
+  </object>
+  <object id="18" name="magic_walkaway" type="warp" x="348.667" y="111">
+   <point/>
+  </object>
  </objectgroup>
  <layer id="1" name="Upper" width="64" height="64">
   <properties>
diff --git a/res/scripts/hallucination_interior.lua b/res/scripts/hallucination_interior.lua
index 9754de3..8851d2d 100644
--- a/res/scripts/hallucination_interior.lua
+++ b/res/scripts/hallucination_interior.lua
@@ -12,6 +12,25 @@ function hallucination_interior.off_right()
   ChangeMap("hallucination_mirror", "fromLeft")
 end
 
+function hallucination_interior.talk_to_magic()
+  StartCutscene()
+  SetAnimation("magic_dcmc", "talk")
+  DisplayMessage("* Blah blah blah you should come to the show!", "Magic", SpeakerType.MAN)
+  WaitForEndOfMessage()
+
+  SetAnimation("magic_dcmc", "still")
+  Delay(1000)
+
+  UnpauseSprite("magic_dcmc")
+  SetMovementSpeed("magic_dcmc", 1)
+  DirectSpriteToLocation("magic_dcmc", "magic_walkaway", PathfindingOptions.CARDINAL_DIRECTIONS_ONLY)
+  WaitForSpritePath("magic_dcmc")
+  
+  DisableSprite()
+
+  HideCutsceneBars()
+end
+
 function hallucination_interior.mailbox1()
   StartCutscene()
   DisplayMessage("* The mailbox lid is open...\n* Peek inside?", "", SpeakerType.NONE)
-- 
cgit 1.4.1