Added "let's switch places!" Claus sprite

He will wander randomly until you get close, and will then run at you. Talking to him or bumping into him does nothing currently. If you move out of his range of interest he will go back to wandering at a walking pace.

#10

6 files changed, 142 insertions, 18 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="64" height="64" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="7">
+<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="14">
  <properties>
   <property name="music" value="red_green_yellow_yellow"/>
  </properties>
@@ -156,6 +156,37 @@
   <object id="6" name="fromRight" type="warp" x="1007.9" y="445.781">
    <point/>
   </object>
+  <object id="7" name="switch_claus" type="sprite" x="864" y="784">
+   <properties>
+    <property name="animation" value="claus"/>
+    <property name="enclosureZone" value="switch_claus_enclosure"/>
+    <property name="interactionScript" value="lets_switch_places"/>
+    <property name="movementSpeed" type="int" value="1"/>
+    <property name="shadow" type="bool" value="true"/>
+    <property name="wander" type="bool" value="true"/>
+   </properties>
+   <point/>
+  </object>
+  <object id="8" name="switch_claus_enclosure" type="zone" x="768" y="656" width="144" height="160"/>
+  <object id="9" name="switch_claus_attention" type="trigger" x="752" y="640" width="176" height="176">
+   <properties>
+    <property name="script" value="switch_claus_attention"/>
+   </properties>
+  </object>
+  <object id="10" name="switch_claus_lose_interest_left" type="trigger" x="720" y="608" width="16" height="112">
+   <properties>
+    <property name="script" value="switch_claus_lose_interest"/>
+   </properties>
+  </object>
+  <object id="11" name="switch_claus_lose_interest_up" type="trigger" x="736" y="608" width="144" height="16">
+   <properties>
+    <property name="script" value="switch_claus_lose_interest"/>
+   </properties>
+  </object>
+  <object id="12" name="switch_claus_hidden" type="zone" x="800" y="704" width="112" height="112"/>
+  <object id="13" name="switch_claus_rsvp" type="warp" x="816" y="688">
+   <point/>
+  </object>
  </objectgroup>
  <layer id="1" name="Upper" width="64" height="64">
   <properties>
@@ -34,7 +34,8 @@ SpriteLayer = {
 BehaviourType = {
   NONE = 0,
   WANDER = 1,
-  PATH = 2
+  PATH = 2,
+  FOLLOW = 3
 }
 
 CutsceneOptions = {
@@ -440,6 +441,13 @@ function WaitForSpritePath(spriteName)
   end
 end
 
+--- Sets a sprite to wander.
+function StartWandering(spriteName)
+  local spriteId = getSpriteByAlias(spriteName)
+  local sprite = getSprite(spriteId)
+  sprite.behaviourType = BehaviourType.WANDER
+end
+
 --- Turns off the sprite's behaviour.
 function DisableBehaviour(spriteName)
   local spriteId = getSpriteByAlias(spriteName)
@@ -447,6 +455,23 @@ function DisableBehaviour(spriteName)
   sprite.behaviourType = BehaviourType.NONE
 end
 
+--- Directs a sprite to start following a target sprite.
+function FollowSprite(spriteName, targetName)
+  local spriteId = getSpriteByAlias(spriteName)
+  local targetId = getSpriteByAlias(targetName)
+  local sprite = getSprite(spriteId)
+  sprite.followSpriteId = targetId
+  sprite.behaviourType = BehaviourType.FOLLOW
+end
+
+--- Makes a sprite stop following whatever sprite it was following.
+function StopFollowingSprite(spriteName)
+  local spriteId = getSpriteByAlias(spriteName)
+  local sprite = getSprite(spriteId)
+  sprite.followSpriteId = -1
+  sprite.behaviourType = BehaviourType.NONE
+end
+
 --- Fades out the currently playing music.
 -- This does not block. If you want it to block, call Delay for the same amount
 -- of time.
@@ -479,6 +504,21 @@ function EnablePlayerControl()
 end
 
 --- Makes the specified sprite face toward the †arget sprite.
+-- This version of the function uses any of the eight directions.
+-- @param spriteName the name of the sprite to change the direction of
+-- @param targetName the name of the sprite to face toward
+function FaceTowardSprite(spriteName, targetName)
+  local spriteId = getSpriteByAlias(spriteName)
+  local targetId = getSpriteByAlias(targetName)
+  local sprite = getSprite(spriteId)
+  local target = getSprite(targetId)
+  local diff = vec2i.new(target.loc:x() - sprite.loc:x(), target.loc:y() - sprite.loc:y())
+  local dir = directionFacingPoint(diff)
+
+  SetDirection(spriteName, dir)
+end
+
+--- Makes the specified sprite face toward the †arget sprite.
 -- This version of the function uses the closest cardinal direction.
 -- @param spriteName the name of the sprite to change the direction of
 -- @param targetName the name of the sprite to face toward
@@ -226,3 +226,47 @@ function hallucination_interior.mailbox_time_passage()
 
   EnablePlayerControl()
 end
+
+function hallucination_interior.switch_claus_attention()
+  gamestate.switch_claus_lost_interest = false
+
+  Halt("switch_claus")
+  DisableBehaviour("switch_claus")
+  ShowExpression("switch_claus", "surprise")
+  FaceTowardSprite("switch_claus", "lucas")
+  Delay(1000)
+
+  RemoveExpression("switch_claus")
+
+  if gamestate.switch_claus_lost_interest then
+    SetMovementSpeed("switch_claus", 1)
+    StartWandering("switch_claus")
+  else
+    SetMovementSpeed("switch_claus", 2)
+
+    if IsSpriteInZone("switch_claus", "switch_claus_hidden") then
+      MakeSpriteNotSolid("lucas")
+      DirectSpriteToLocation("switch_claus", "switch_claus_rsvp")
+      MakeSpriteSolid("lucas")
+      WaitForSpritePath("switch_claus")
+    end
+
+    if gamestate.switch_claus_lost_interest then
+      SetMovementSpeed("switch_claus", 1)
+      StartWandering("switch_claus")
+    else
+      FollowSprite("switch_claus", "lucas")
+    end
+  end
+end
+
+function hallucination_interior.switch_claus_lose_interest()
+  gamestate.switch_claus_lost_interest = true
+
+  SetMovementSpeed("switch_claus", 1)
+  StartWandering("switch_claus")
+end
+
+function hallucination_interior.lets_switch_places()
+  -- TODO: let's switch places
+end
@@ -19,22 +19,27 @@ void BehaviourSystem::tick(double dt) {
   while (timer_.step()) {
     for (int spriteId : game_.getSprites()) {
       Sprite& sprite = game_.getSprite(spriteId);
-      if (!sprite.paused && sprite.behaviourType == BehaviourType::Wander) {
-        // 75% chance of changing what's happening
-        if (std::bernoulli_distribution(0.75)(game_.getRng())) {
-          // 50% chance of choosing a direction or stopping
-          if (std::bernoulli_distribution(0.5)(game_.getRng())) {
-            Direction dir;
-            switch (std::uniform_int_distribution(0,3)(game_.getRng())) {
-              case 0: dir = Direction::left; break;
-              case 1: dir = Direction::up; break;
-              case 2: dir = Direction::right; break;
-              default: dir = Direction::down; break;
+      if (!sprite.paused) {
+        if (sprite.behaviourType == BehaviourType::Wander) {
+          // 75% chance of changing what's happening
+          if (std::bernoulli_distribution(0.75)(game_.getRng())) {
+            // 50% chance of choosing a direction or stopping
+            if (std::bernoulli_distribution(0.5)(game_.getRng())) {
+              Direction dir;
+              switch (std::uniform_int_distribution(0,3)(game_.getRng())) {
+                case 0: dir = Direction::left; break;
+                case 1: dir = Direction::up; break;
+                case 2: dir = Direction::right; break;
+                default: dir = Direction::down; break;
+              }
+              game_.getSystem<CharacterSystem>().moveInDirection(spriteId, dir);
+            } else {
+              game_.getSystem<CharacterSystem>().stopDirecting(spriteId);
             }
-            game_.getSystem<CharacterSystem>().moveInDirection(spriteId, dir);
-          } else {
-            game_.getSystem<CharacterSystem>().stopDirecting(spriteId);
           }
+        } else if (sprite.behaviourType == BehaviourType::Follow) {
+          Sprite& target = game_.getSprite(sprite.followSpriteId);
+          game_.getSystem<CharacterSystem>().moveInDirection(spriteId, directionFacingPoint(target.loc - sprite.loc));
         }
       }
     }
@@ -52,7 +52,8 @@ ScriptSystem::ScriptSystem(Game& game) : game_(game) {
     "enclosureZone", &Sprite::enclosureZone,
     "movementSpeed", &Sprite::movementSpeed,
     "solid", &Sprite::solid,
-    "behaviourType", &Sprite::behaviourType);
+    "behaviourType", &Sprite::behaviourType,
+    "followSpriteId", &Sprite::followSpriteId);
 
   engine_.new_usertype<MessageSystem>(
     "message",
@@ -242,6 +243,7 @@ ScriptSystem::ScriptSystem(Game& game) : game_(game) {
       loadMapScripts(filename);
     });
 
+  engine_.set_function("directionFacingPoint", &directionFacingPoint);
   engine_.set_function("cardinalDirectionFacingPoint", &cardinalDirectionFacingPoint);
 
   engine_.script_file("../res/scripts/common.lua");
@@ -45,7 +45,8 @@ enum class CharacterMedium {
 enum class BehaviourType {
   None,
   Wander,
-  Path
+  Path,
+  Follow
 };
 
 enum class MirrorType {
@@ -128,6 +129,7 @@ public:
   vec2i pathfindingDestination;
   bool cardinalDirectionsOnly = false;
   std::deque<PathfindingInstruction> path;
+  int followSpriteId = -1;
 
   // Mirror
   MirrorType mirrorType = MirrorType::None;