8 files changed, 58 insertions, 2 deletions

@@ -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="3" nextobjectid="5">
+<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="6">
  <properties>
   <property name="music" value="red_green_yellow_yellow"/>
  </properties>
@@ -45,6 +45,9 @@
     <property name="script" value="enter_hot_spring"/>
    </properties>
   </object>
+  <object id="5" name="exit_area_from_underwater" type="warp" x="304" y="176">
+   <point/>
+  </object>
  </objectgroup>
  <layer id="1" name="Upper (most)" width="32" height="16">
   <properties>
@@ -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="4">
+<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="5">
  <properties>
   <property name="music" value="red_green_yellow_yellow"/>
  </properties>
@@ -145,6 +145,9 @@
    </properties>
    <point/>
   </object>
+  <object id="4" name="exit_area_from_time_passage" type="warp" x="144" y="592">
+   <point/>
+  </object>
  </objectgroup>
  <layer id="1" name="Upper" width="64" height="64">
   <properties>
@@ -522,3 +522,22 @@ function SetMovementSpeed(spriteName, speed)
   local sprite = getSprite(spriteId)
   sprite.movementSpeed = speed
 end
+
+--- Performs the beginning of the exit area transition.
+-- This does the circle effect and plays the sound effect. The circle effect
+-- then gets removed and replaced with a screen fade.
+function ExitAreaTransition()
+  DisablePlayerControl()
+  --character():halt(getPlayerSprite())
+  coroutine.yield()
+  PlaySound("exit_area.wav")
+  FadeoutMusic(679)
+  effect():circleTransition(679, 1.0)
+  while not effect():isCircleTransitionComplete() do
+    coroutine.yield()
+  end
+  character():halt(getPlayerSprite())
+  FadeToBlack(1)
+  effect():circleTransition(1, 0.0)
+  Delay(1000)
+end
@@ -1,5 +1,12 @@
 time_passage = {}
 
+function time_passage.exit_area()
+  ExitAreaTransition()
+  ChangeMap("hallucination_interior", "exit_area_from_time_passage", ChangeMapOptions.DO_NOT_FADE)
+  RemoveFadeout(1000)
+  EnablePlayerControl()
+end
+
 function time_passage.off_bottom()
   ChangeMap("time_passage_antechamber", "fromTop")
 end
@@ -1,5 +1,10 @@
 time_passage_antechamber = {}
 
+function time_passage_antechamber.exit_area()
+  loadMapScripts("time_passage")
+  time_passage.exit_area()
+end
+
 function time_passage_antechamber.enter_door()
   CreateAnimatedSpriteAtWarpPoint("entryway", "entryway", "entryway_appear", "time_passage", Direction.DOWN, SpriteLayer.NORMAL)
   PlaySound("door_open.wav")
@@ -12,6 +12,20 @@ function underwater.leave()
   SetAnimationSlowdown("lucas", 1)
 end
 
+function underwater.exit_area()
+  ExitAreaTransition()
+  underwater.leave()
+  ChangeMap("hallucination_hot_spring", "exit_area_from_underwater", ChangeMapOptions.DO_NOT_FADE)
+  MoveSpriteToWarp("kuma", "exit_area_from_underwater")
+  MoveSpriteToWarp("duster", "exit_area_from_underwater")
+  MoveSpriteToWarp("boney", "exit_area_from_underwater")
+  character():addSpriteToParty(getPlayerSprite(), getSpriteByAlias("kuma"))
+  character():addSpriteToParty(getPlayerSprite(), getSpriteByAlias("duster"))
+  character():addSpriteToParty(getPlayerSprite(), getSpriteByAlias("boney"))
+  RemoveFadeout(1000)
+  EnablePlayerControl()
+end
+
 function underwater.fish2()
   StartCutscene()
   DisplayMessage("* What are you complaining about?\nYou're so powerful now...\n\fYou owe it all to her.", "Fish", SpeakerType.BOY)
@@ -5,6 +5,11 @@ function underwater_start.init()
   underwater.make_lucas_underwater()
 end
 
+function underwater_start.exit_area()
+  loadMapScripts("underwater")
+  underwater.exit_area()
+end
+
 function underwater_start.talk_to_fish1()
   StartCutscene()
   DisplayMessage("* You deserved what she did to you.", "Fish", SpeakerType.BOY)