11 files changed, 99 insertions, 6 deletions

@@ -52,6 +52,7 @@ add_executable(tanetane
   src/message_system.cpp
   src/script_system.cpp
   src/effect_system.cpp
+  src/behaviour_system.cpp
 )
 
 set_property(TARGET tanetane PROPERTY CXX_STANDARD 17)
@@ -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="10">
+<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="12">
  <tileset firstgid="1" name="fromRom" tilewidth="16" tileheight="16" tilecount="180" columns="10">
   <image source="map2_tiles.png" width="160" height="288"/>
   <tile id="61">
@@ -688,6 +688,21 @@
    </properties>
    <point/>
   </object>
+  <object id="10" name="ionia" type="sprite" x="821.333" y="135.333">
+   <properties>
+    <property name="animation" value="../res/sprites/ionia_anim.txt"/>
+    <property name="collisionHeight" type="int" value="8"/>
+    <property name="collisionOffsetX" type="int" value="-8"/>
+    <property name="collisionOffsetY" type="int" value="-8"/>
+    <property name="collisionWidth" type="int" value="12"/>
+    <property name="shadow" type="bool" value="true"/>
+    <property name="wander" type="bool" value="true"/>
+   </properties>
+   <point/>
+  </object>
+  <object id="11" name="debugWarp_rightside" type="warp" x="911.333" y="431.667">
+   <point/>
+  </object>
  </objectgroup>
  <layer id="1" name="Layer 0" width="64" height="64">
   <data encoding="csv">
@@ -0,0 +1,32 @@
+#include "behaviour_system.h"
+#include <random>
+#include "game.h"
+#include "character_system.h"
+#include "direction.h"
+
+void BehaviourSystem::tick(double dt) {
+  timer_.accumulate(dt);
+  while (timer_.step()) {
+    for (int spriteId : game_.getSprites()) {
+      Sprite& sprite = game_.getSprite(spriteId);
+      if (sprite.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);
+          }
+        }
+      }
+    }
+  }
+}
@@ -0,0 +1,24 @@
+#ifndef BEHAVIOUR_SYSTEM_H_FC908ABE
+#define BEHAVIOUR_SYSTEM_H_FC908ABE
+
+#include "system.h"
+#include "timer.h"
+
+class Game;
+
+class BehaviourSystem : public System {
+public:
+
+  static constexpr SystemKey Key = SystemKey::Behaviour;
+
+  explicit BehaviourSystem(Game& game) : game_(game) {}
+
+  void tick(double dt) override;
+
+private:
+
+  Game& game_;
+  Timer timer_ { 500 };
+};
+
+#endif /* end of include guard: BEHAVIOUR_SYSTEM_H_FC908ABE */
@@ -62,6 +62,10 @@ void Game::loadMap(std::string filename) {
       getSprite(spriteId).hasShadow = p.shadow;
     }
     getSprite(spriteId).interactionScript = p.interactionScript;
+    if (p.wander) {
+      getSystem<CharacterSystem>().initSprite(spriteId);
+      getSprite(spriteId).wander = true;
+    }
   }
 
   for (const Trigger& t : map_->getTriggers()) {
@@ -8,6 +8,7 @@
 #include <memory>
 #include <map>
 #include <set>
+#include <random>
 #include "sprite.h"
 #include "map.h"
 #include "consts.h"
@@ -20,7 +21,7 @@ class Renderer;
 class Game {
 public:
 
-  explicit Game(Renderer& renderer) : font_("../res/font.txt", renderer) {}
+  Game(Renderer& renderer, std::mt19937& rng) : font_("../res/font.txt", renderer), rng_(&rng) {}
 
   Mixer& getMixer() { return mixer_; }
 
@@ -83,6 +84,8 @@ public:
 
   const Font& getFont() const { return font_; }
 
+  std::mt19937& getRng() { return *rng_; }
+
 private:
 
   Mixer mixer_;
@@ -97,6 +100,7 @@ private:
   std::map<std::string, int> spritesByAlias_;
   std::unique_ptr<Map> map_;
   Font font_;
+  std::mt19937* rng_;
 };
 
 #endif /* end of include guard: GAME_H_E6F1396E */
@@ -1,5 +1,6 @@
 #include <iostream>
 #include <memory>
+#include <random>
 #include "renderer.h"
 #include "game.h"
 #include "timer.h"
@@ -12,12 +13,14 @@
 #include "message_system.h"
 #include "script_system.h"
 #include "effect_system.h"
+#include "behaviour_system.h"
 
-void loop(Renderer& renderer) {
-  Game game(renderer);
+void loop(Renderer& renderer, std::mt19937& rng) {
+  Game game(renderer, rng);
   game.emplaceSystem<ScriptSystem>();
   game.emplaceSystem<TransformSystem>();
   game.emplaceSystem<InputSystem>();
+  game.emplaceSystem<BehaviourSystem>();
   game.emplaceSystem<CharacterSystem>();
   game.emplaceSystem<AnimationSystem>();
   game.emplaceSystem<CameraSystem>();
@@ -26,7 +29,7 @@ void loop(Renderer& renderer) {
 
   game.loadMap("map2");
 
-  vec2i warpLoc = game.getMap().getWarpPoint("debugWarp_mailboxes");
+  vec2i warpLoc = game.getMap().getWarpPoint("debugWarp_rightside");
 
   int lucasSprite = game.emplaceSprite("lucas");
   game.getSystem<TransformSystem>().initSprite(lucasSprite, warpLoc);
@@ -83,11 +86,14 @@ void loop(Renderer& renderer) {
 }
 
 int main(int, char**) {
+  std::random_device randomEngine;
+  std::mt19937 rng(randomEngine());
+
   try
   {
     Renderer renderer;
 
-    loop(renderer);
+    loop(renderer, rng);
   } catch (const sdl_error& ex)
   {
     std::cout << "SDL error (" << ex.what() << ")" << std::endl;
@@ -76,6 +76,8 @@ Map::Map(std::string_view name) : name_(name) {
               p.interactionScript = property.getStringValue();
             } else if (property.getName() == "shadow") {
               p.shadow = property.getBoolValue();
+            } else if (property.getName() == "wander") {
+              p.wander = property.getBoolValue();
             }
           }
 
@@ -24,6 +24,7 @@ struct Prototype {
   std::string animationFilename;
   std::string interactionScript;
   bool shadow = false;
+  bool wander = false;
 };
 
 struct Trigger {
@@ -78,6 +78,9 @@ public:
   // Input
   bool controllable = false;
   bool player = false;
+
+  // Behaviour
+  bool wander = false;
 };
 
 #endif /* end of include guard: SPRITE_H_70503825 */
@@ -5,6 +5,7 @@ enum class SystemKey {
   Script,
   Transform,
   Input,
+  Behaviour,
   Character,
   Animation,
   Camera,