7 files changed, 38 insertions, 3 deletions

@@ -696,6 +696,7 @@
     <property name="collisionOffsetY" type="int" value="-8"/>
     <property name="collisionWidth" type="int" value="12"/>
     <property name="enclosureZone" value="ionia_enclosure"/>
+    <property name="interactionScript" value="talk_to_ionia"/>
     <property name="movementSpeed" type="int" value="1"/>
     <property name="shadow" type="bool" value="true"/>
     <property name="wander" type="bool" value="true"/>
@@ -49,6 +49,11 @@ function StartCutscene()
   playerSprite.controllable = false
   character():halt(playerId)
   message():displayCutsceneBars()
+
+  local allSprites = getAllSprites()
+  for k,v in pairs(allSprites) do
+    getSprite(v).paused = true
+  end
 end
 
 --- Queues a message for display.
@@ -94,6 +99,11 @@ function HideCutsceneBars()
   local playerId = getPlayerSprite()
   local playerSprite = getSprite(playerId)
   playerSprite.controllable = true
+
+  local allSprites = getAllSprites()
+  for k,v in pairs(allSprites) do
+    getSprite(v).paused = false
+  end
 end
 
 function GetPosition(spriteName)
@@ -120,6 +130,11 @@ function WaitForAnimation(spriteName)
   until sprite.animFinished
 end
 
+function Halt(spriteName)
+  local spriteId = getSpriteByAlias(spriteName)
+  character():halt(spriteId)
+end
+
 function PlaySound(filename)
   mixer():playSound("../res/sfx/" .. filename)
 end
@@ -172,3 +172,14 @@ function map2.approach_doria()
 
   HideCutsceneBars()
 end
+
+function map2.talk_to_ionia()
+  Halt("ionia")
+  StartCutscene()
+  SetAnimation("ionia", "talk")
+  DisplayMessage("* Kumatora!", "Ionia", SpeakerType.MAN)
+  WaitForEndOfMessage()
+
+  SetAnimation("ionia", "still")
+  HideCutsceneBars()
+end
@@ -9,7 +9,7 @@ void BehaviourSystem::tick(double dt) {
   while (timer_.step()) {
     for (int spriteId : game_.getSprites()) {
       Sprite& sprite = game_.getSprite(spriteId);
-      if (sprite.wander) {
+      if (sprite.wander && !sprite.paused) {
         // 75% chance of changing what's happening
         if (std::bernoulli_distribution(0.75)(game_.getRng())) {
           // 50% chance of choosing a direction or stopping
@@ -96,7 +96,7 @@ void CharacterSystem::tick(double dt) {
     for (int spriteId : game_.getSprites()) {
       Sprite& sprite = game_.getSprite(spriteId);
 
-      if (sprite.orientable) {
+      if (sprite.orientable && !sprite.paused) {
         vec2i pLoc = sprite.loc;
 
         if (sprite.characterState == CharacterState::Still ||
@@ -36,7 +36,8 @@ ScriptSystem::ScriptSystem(Game& game) : game_(game) {
     "getCurrentFrame", [] (const Sprite& sprite) -> const SpriteFrame& {
       return sprite.frames[sprite.animations[sprite.animationId].frameIndices[sprite.animationFrame]];
     },
-    "persistent", &Sprite::persistent);
+    "persistent", &Sprite::persistent,
+    "paused", &Sprite::paused);
 
   engine_.new_usertype<MessageSystem>(
     "message",
@@ -168,6 +169,12 @@ ScriptSystem::ScriptSystem(Game& game) : game_(game) {
     });
 
   engine_.set_function(
+    "getAllSprites",
+    [&] () -> const std::set<int>& {
+      return game_.getSprites();
+    });
+
+  engine_.set_function(
     "loadMap",
     [&] (std::string filename) {
       game_.loadMap(filename);
@@ -43,6 +43,7 @@ public:
 
   std::string alias;
   bool persistent = false;
+  bool paused = false;
 
   // Transform
   vec2i loc { 0, 0 };