6 files changed, 106 insertions, 2 deletions

@@ -2,6 +2,7 @@
 #include "game.h"
 #include "character_system.h"
 #include "message_system.h"
+#include "script_system.h"
 
 struct Input {
   bool left = false;
@@ -32,9 +33,10 @@ void InputSystem::tick(double dt) {
         } else {
           game_.getSystem<MessageSystem>().displayCutsceneBars();
         }*/
-        game_.getSystem<MessageSystem>().displayMessage("Some people always try to avoid fighting when there are enemies around. You know the type, right? They use the dash ability to zoom right by. I guess you could say they're followers of \"peace at any price\".", "Sparrow", SpeakerType::Woman);
+        //game_.getSystem<MessageSystem>().displayMessage("Some people always try to avoid fighting when there are enemies around. You know the type, right? They use the dash ability to zoom right by. I guess you could say they're followers of \"peace at any price\".", "Sparrow", SpeakerType::Woman);
         //game_.getSystem<MessageSystem>().displayMessage("Lucas. You're awful at hide-and-seek, you know that? Try harder.", "Kumatora", SpeakerType::Woman);
         //game_.getSystem<MessageSystem>().displayMessage("Hi Tooth! I hope you're having a good day.", "Lucas", SpeakerType::Boy);
+        game_.getSystem<ScriptSystem>().runScript("script0001");
       } else if (e.key.keysym.sym == SDLK_b) {
         // TODO: Remove this, it's just for testing.
         game_.getSystem<MessageSystem>().advanceText();
@@ -10,6 +10,7 @@
 #include "character_system.h"
 #include "input_system.h"
 #include "message_system.h"
+#include "script_system.h"
 
 void loop(Renderer& renderer) {
   Game game(renderer);
@@ -19,6 +20,7 @@ void loop(Renderer& renderer) {
   game.emplaceSystem<AnimationSystem>();
   game.emplaceSystem<CameraSystem>();
   game.emplaceSystem<MessageSystem>();
+  game.emplaceSystem<ScriptSystem>();
 
   auto map = std::make_unique<Map>("../res/map1.tmx", renderer);
   game.setMap(std::move(map));
@@ -51,6 +51,8 @@ public:
 
   const std::list<MessageLine>& getLines() const { return linesToShow_; }
 
+  bool isMessageActive() const { return !linesToShow_.empty(); }
+
   const std::string& getSpeaker() const { return speakerName_; }
 
   bool isNextArrowShowing() const { return showNextArrow_; }
@@ -0,0 +1,65 @@
+#include "script_system.h"
+#include <iostream>
+#include "game.h"
+#include "message_system.h"
+
+ScriptSystem::ScriptSystem(Game& game) : game_(game) {
+  engine_.open_libraries(
+    sol::lib::base,
+    sol::lib::coroutine,
+    sol::lib::math);
+
+  engine_.new_usertype<MessageSystem>(
+    "message",
+    "displayMessage", &MessageSystem::displayMessage,
+    "hideCutsceneBars", &MessageSystem::hideCutsceneBars,
+    "isMessageActive", sol::property(&MessageSystem::isMessageActive));
+
+  engine_.set_function(
+    "message",
+    [&] () -> MessageSystem& {
+      return game_.getSystem<MessageSystem>();
+    });
+
+  engine_.script_file("../res/scripts/common.lua");
+}
+
+void ScriptSystem::tick(double dt) {
+  if (callable_ && *callable_) {
+    auto result = (*callable_)(dt);
+    if (!result.valid()) {
+      sol::error e = result;
+      throw std::runtime_error(e.what());
+    }
+
+    if (!*callable_) {
+      callable_.reset();
+      runner_.reset();
+    }
+  }
+}
+
+void ScriptSystem::runScript(std::string name) {
+  if (!loadedScripts_.count(name)) {
+    engine_.script_file("../res/scripts/" + name + ".lua");
+    loadedScripts_.insert(name);
+  }
+
+  runner_.reset(new sol::thread(sol::thread::create(engine_.lua_state())));
+  callable_.reset(new sol::coroutine(runner_->state().get<sol::function>(name)));
+
+  if (!*callable_) {
+    throw std::runtime_error("Error running script: " + name);
+  }
+
+  auto result = (*callable_)();
+  if (!result.valid()) {
+    sol::error e = result;
+    throw std::runtime_error(e.what());
+  }
+
+  if (!*callable_) {
+    callable_.reset();
+    runner_.reset();
+  }
+}
@@ -0,0 +1,32 @@
+#ifndef SCRIPT_SYSTEM_H_FD8A95B3
+#define SCRIPT_SYSTEM_H_FD8A95B3
+
+#include <sol/sol.hpp>
+#include <memory>
+#include <set>
+#include <string>
+#include "system.h"
+
+class Game;
+
+class ScriptSystem : public System {
+public:
+
+  static constexpr SystemKey Key = SystemKey::Script;
+
+  explicit ScriptSystem(Game& game);
+
+  void tick(double dt) override;
+
+  void runScript(std::string name);
+
+private:
+
+  Game& game_;
+  sol::state engine_;
+  std::unique_ptr<sol::thread> runner_;
+  std::unique_ptr<sol::coroutine> callable_;
+  std::set<std::string> loadedScripts_;
+};
+
+#endif /* end of include guard: SCRIPT_SYSTEM_H_FD8A95B3 */
@@ -7,7 +7,8 @@ enum class SystemKey {
   Character,
   Animation,
   Camera,
-  Message
+  Message,
+  Script
 };
 
 class System {