3 files changed, 79 insertions, 1 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="32" tilewidth="16" tileheight="16" infinite="0" nextlayerid="4" nextobjectid="4">
+<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="32" height="32" tilewidth="16" tileheight="16" infinite="0" nextlayerid="4" nextobjectid="5">
  <properties>
   <property name="music" value="barren_factory"/>
  </properties>
@@ -96,6 +96,9 @@
    <point/>
   </object>
   <object id="3" name="fish1_enclosure" type="zone" x="176" y="144" width="80" height="96"/>
+  <object id="4" name="fish_destination" type="warp" x="184" y="122">
+   <point/>
+  </object>
  </objectgroup>
  <layer id="1" name="Upper" width="32" height="32">
   <properties>
@@ -38,6 +38,10 @@ ChangeMapOptions = {
   DO_NOT_FADE = 1 -- Prevents fading to and from black
 }
 
+PathfindingOptions = {
+  CARDINAL_DIRECTIONS_ONLY = 1
+}
+
 gamestate = {}
 
 --- Yields until the specified amount of time has passed.
@@ -127,6 +131,23 @@ function HideCutsceneBars(options)
   end
 end
 
+--- Unpauses a sprite's movement.
+-- Use this during cutscenes to allow the sprite's movement to be controlled
+-- either by the InputSystem or the BehaviourSystem.
+function UnpauseSprite(spriteName)
+  local spriteId = getSpriteByAlias(spriteName)
+  local sprite = getSprite(spriteId)
+  sprite.paused = false
+end
+
+--- Re-pauses a sprite's movement.
+-- Use this after UnpauseSprite() when you are done moving the sprite.
+function PauseSprite(spriteName)
+  local spriteId = getSpriteByAlias(spriteName)
+  local sprite = getSprite(spriteId)
+  sprite.paused = true
+end
+
 function GetPosition(spriteName)
   local spriteId = getSpriteByAlias(spriteName)
   local sprite = getSprite(spriteId)
@@ -216,6 +237,12 @@ function WaitForPan()
   end
 end
 
+function CameraFollowSprite(spriteName)
+  local spriteId = getSpriteByAlias(spriteName)
+  camera():setFollowingSprite(spriteId)
+  camera():unlockCamera()
+end
+
 function ReturnCamera(length)
   local playerId = getPlayerSprite()
   camera():panToSprite(playerId, length)
@@ -359,3 +386,30 @@ function SetAnimationSlowdown(spriteName, amount)
   local sprite = getSprite(spriteId)
   sprite.animSlowdown = amount
 end
+
+--- Removes the enclosure zone for the specified sprite.
+-- This allows the sprite to move outside of the confines of the zone.
+function RemoveEnclosureZone(spriteName)
+  local spriteId = getSpriteByAlias(spriteName)
+  local sprite = getSprite(spriteId)
+  sprite.enclosureZone = ""
+end
+
+--- Set a sprite on a path to the specified location.
+function DirectSpriteToLocation(spriteName, warpPoint, options)
+  options = options or 0
+
+  local spriteId = getSpriteByAlias(spriteName)
+  local dest = getMap():getWarpPoint(warpPoint)
+
+  behaviour():directSpriteToLocation(spriteId, dest, options)
+end
+
+--- Blocks until the specified sprite has completed their path.
+function WaitForSpritePath(spriteName)
+  local spriteId = getSpriteByAlias(spriteName)
+
+  while (behaviour():isFollowingPath(spriteId)) do
+    coroutine.yield()
+  end
+end
@@ -9,5 +9,26 @@ function underwater_start.talk_to_fish1()
   StartCutscene()
   DisplayMessage("* You deserved what she did to you.", "Fish", SpeakerType.BOY)
   WaitForEndOfMessage()
+
+  Delay(500)
+
+  PanToSprite("fish1", 1000)
+  WaitForPan()
+
+  Delay(500)
+
+  UnpauseSprite("fish1")
+  RemoveEnclosureZone("fish1")
+  DirectSpriteToLocation("fish1", "fish_destination", PathfindingOptions.CARDINAL_DIRECTIONS_ONLY)
+  CameraFollowSprite("fish1")
+  WaitForSpritePath("fish1")
+
+  Delay(1000)
+  DestroyNamedSprite("fish1")
+
+  Delay(500)
+
+  ReturnCamera(1000)
+
   HideCutsceneBars()
 end
\ No newline at end of file