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

3 files changed, 25 insertions, 16 deletions

@@ -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;