5 files changed, 44 insertions, 70 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="6">
+<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="7">
  <tileset firstgid="1" source="forest.tsx"/>
  <layer id="2" name="Lower" width="32" height="16">
   <data encoding="csv">
@@ -34,6 +34,7 @@
   <object id="5" name="boney_start" type="warp" x="197.84" y="144">
    <point/>
   </object>
+  <object id="6" name="hotspring_enclosure" type="zone" x="224" y="104" width="96" height="56"/>
  </objectgroup>
  <layer id="1" name="Upper" width="32" height="16">
   <properties>
@@ -1,49 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <tileset version="1.4" tiledversion="1.4.3" name="forest" tilewidth="16" tileheight="16" tilecount="80" columns="10">
  <image source="forest_tiles.png" width="160" height="128"/>
- <tile id="6">
-  <properties>
-   <property name="solid" type="bool" value="true"/>
-  </properties>
- </tile>
- <tile id="7">
-  <properties>
-   <property name="solid" type="bool" value="true"/>
-  </properties>
- </tile>
- <tile id="8">
-  <properties>
-   <property name="solid" type="bool" value="true"/>
-  </properties>
- </tile>
- <tile id="9">
-  <properties>
-   <property name="solid" type="bool" value="true"/>
-  </properties>
- </tile>
- <tile id="10">
-  <properties>
-   <property name="solid" type="bool" value="true"/>
-  </properties>
- </tile>
  <tile id="11">
   <properties>
-   <property name="solid" type="bool" value="true"/>
+   <property name="medium" value="water"/>
   </properties>
  </tile>
  <tile id="12">
   <properties>
-   <property name="solid" type="bool" value="true"/>
+   <property name="medium" value="water"/>
   </properties>
  </tile>
  <tile id="13">
   <properties>
-   <property name="solid" type="bool" value="true"/>
-  </properties>
- </tile>
- <tile id="14">
-  <properties>
-   <property name="solid" type="bool" value="true"/>
+   <property name="medium" value="water"/>
   </properties>
  </tile>
  <tile id="15">
@@ -51,44 +21,9 @@
    <property name="medium" value="water"/>
   </properties>
  </tile>
- <tile id="16">
-  <properties>
-   <property name="solid" type="bool" value="true"/>
-  </properties>
- </tile>
- <tile id="18">
-  <properties>
-   <property name="solid" type="bool" value="true"/>
-  </properties>
- </tile>
  <tile id="19">
   <properties>
    <property name="medium" value="water"/>
   </properties>
  </tile>
- <tile id="22">
-  <properties>
-   <property name="solid" type="bool" value="true"/>
-  </properties>
- </tile>
- <tile id="23">
-  <properties>
-   <property name="solid" type="bool" value="true"/>
-  </properties>
- </tile>
- <tile id="24">
-  <properties>
-   <property name="solid" type="bool" value="true"/>
-  </properties>
- </tile>
- <tile id="25">
-  <properties>
-   <property name="solid" type="bool" value="true"/>
-  </properties>
- </tile>
- <tile id="26">
-  <properties>
-   <property name="solid" type="bool" value="true"/>
-  </properties>
- </tile>
 </tileset>
@@ -414,6 +414,14 @@ function SetAnimationSlowdown(spriteName, amount)
   sprite.animSlowdown = amount
 end
 
+--- Sets the enclosure zone for a sprite.
+-- The sprite will be prevented from exiting the area defined by that zone.
+function AddEnclosureZone(spriteName, zone)
+  local spriteId = getSpriteByAlias(spriteName)
+  local sprite = getSprite(spriteId)
+  sprite.enclosureZone = zone
+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)
@@ -607,3 +615,10 @@ function IsSpriteInZone(spriteName, zoneName)
 
   return (pos:x() >= zone.ul:x()) and (pos:x() <= zone.dr:x()) and (pos:y() >= zone.ul:y()) and (pos:y() <= zone.dr:y())
 end
+
+--- Sets the name of the script on the current map that will be executed when the player interacts with this sprite.
+function SetInteractionScript(spriteName, scriptName)
+  local spriteId = getSpriteByAlias(spriteName)
+  local sprite = getSprite(spriteId)
+  sprite.interactionScript = scriptName
+end
@@ -3,15 +3,37 @@ finale = {}
 function finale.init()
   character():breakUpParty(getPlayerSprite())
 
+  AddEnclosureZone("lucas", "hotspring_enclosure")
+
   MoveSpriteToWarp("kuma", "kumatora_start")
   SetDirection("kuma", Direction.UP)
   SetAnimation("kuma", "swim_still")
+  MakeSpriteSolid("kuma")
+  SetInteractionScript("kuma", "talk_to_kuma")
 
   MoveSpriteToWarp("duster", "duster_start")
   SetDirection("duster", Direction.RIGHT)
   SetAnimation("duster", "swim_still")
+  MakeSpriteSolid("duster")
+  SetInteractionScript("duster", "talk_to_duster")
 
   MoveSpriteToWarp("boney", "boney_start")
   SetDirection("boney", Direction.DOWN)
   SetAnimation("boney", "asleep")
 end
+
+function finale.talk_to_kuma()
+  SetDirection("kuma", Direction.UP)
+  StartCutscene()
+  DisplayMessage("* Kumatora doesn't respond.\n\f* She is grumbling to herself, and picking at the grass growing over the wall.", "", SpeakerType.NONE)
+  WaitForEndOfMessage()
+  HideCutsceneBars()
+end
+
+function finale.talk_to_duster()
+  SetDirection("duster", Direction.RIGHT)
+  StartCutscene()
+  DisplayMessage("* Duster doesn't respond.\n\f* He is simply staring at his own reflection in the water.", "", SpeakerType.NONE)
+  WaitForEndOfMessage()
+  HideCutsceneBars()
+end
@@ -54,7 +54,8 @@ ScriptSystem::ScriptSystem(Game& game) : game_(game) {
     "movementSpeed", &Sprite::movementSpeed,
     "solid", &Sprite::solid,
     "behaviourType", &Sprite::behaviourType,
-    "followSpriteId", &Sprite::followSpriteId);
+    "followSpriteId", &Sprite::followSpriteId,
+    "interactionScript", &Sprite::interactionScript);
 
   engine_.new_usertype<MessageSystem>(
     "message",