15 files changed, 44 insertions, 35 deletions

@@ -781,7 +781,7 @@
   </object>
   <object id="8" name="moveToRight" type="trigger" x="761" y="359.667" width="18" height="60.3333">
    <properties>
-    <property name="script" value="map1_off_right"/>
+    <property name="script" value="off_right"/>
    </properties>
   </object>
   <object id="9" name="fromRight" type="warp" x="748.667" y="382.667">
@@ -642,7 +642,7 @@
   </object>
   <object id="2" name="moveToLeft" type="trigger" x="-20.3333" y="304" width="22.6667" height="91.6667">
    <properties>
-    <property name="script" value="map2_off_left"/>
+    <property name="script" value="off_left"/>
    </properties>
   </object>
  </objectgroup>
@@ -112,7 +112,7 @@ function ChangeMap(map, warp)
 
   playerSprite.controllable = false
   FadeToBlack(150)
-  loadMap("../res/maps/" .. map .. ".tmx", warp, direction)
+  loadMap(map, warp, direction)
 
   local newPlayerId = getPlayerSprite()
   local newPlayerSprite = getSprite(newPlayerId)
@@ -1,4 +1,6 @@
-function default()
+global = {}
+
+function global.no_problem_here()
   StartCutscene()
   DisplayMessage("* No problem here.", "", SpeakerType.NONE)
   HideCutsceneBars()
@@ -1,4 +1,6 @@
-function script0001()
+map1 = {}
+
+function map1.script0001()
   StartCutscene()
   SetAnimation("boney", "barking")
   local barkingNoise = LoopSound("barking_at_hallucination.wav")
@@ -22,3 +24,15 @@ function script0001()
   SetAnimation("flint", "still")
   HideCutsceneBars()
 end
+
+function map1.off_right()
+  ChangeMap("map2", "fromLeft")
+end
+
+function map1.test_trigger()
+  StartCutscene()
+  PlaySound("boney_growl.wav")
+  DisplayMessage("* Hi! Welcome to the funky zone.", "", SpeakerType.NONE)
+  WaitForEndOfMessage()
+  HideCutsceneBars()
+end
@@ -1,3 +0,0 @@
-function map1_off_right()
-  ChangeMap("map2", "fromLeft")
-end
@@ -1,3 +1,5 @@
-function map2_off_left()
+map2 = {}
+
+function map2.off_left()
   ChangeMap("map1", "fromRight")
 end
@@ -1,7 +0,0 @@
-function test_trigger()
-  StartCutscene()
-  PlaySound("boney_growl.wav")
-  DisplayMessage("* Hi! Welcome to the funky zone.", "", SpeakerType.NONE)
-  WaitForEndOfMessage()
-  HideCutsceneBars()
-end
@@ -92,7 +92,7 @@ void CharacterSystem::tick(double dt) {
           Sprite& collider = game_.getSprite(collision.horiz.colliderSprite);
 
           if (collider.walkthroughScript != "") {
-            game_.getSystem<ScriptSystem>().runScript(collider.walkthroughScript);
+            game_.getSystem<ScriptSystem>().runScript(game_.getMap().getName(), collider.walkthroughScript);
           }
         }
 
@@ -102,7 +102,7 @@ void CharacterSystem::tick(double dt) {
           Sprite& collider = game_.getSprite(collision.vert.colliderSprite);
 
           if (collider.walkthroughScript != "") {
-            game_.getSystem<ScriptSystem>().runScript(collider.walkthroughScript);
+            game_.getSystem<ScriptSystem>().runScript(game_.getMap().getName(), collider.walkthroughScript);
           }
         }
 
@@ -54,7 +54,7 @@ void InputSystem::tick(double dt) {
 
                 Sprite& collider = game_.getSprite(collision.horiz.colliderSprite);
                 if (collider.interactionScript != "") {
-                  game_.getSystem<ScriptSystem>().runScript(collider.interactionScript);
+                  game_.getSystem<ScriptSystem>().runScript(game_.getMap().getName(), collider.interactionScript);
                   activated = true;
                 }
               } else if (collision.vert.colliderSprite != -1) {
@@ -62,7 +62,7 @@ void InputSystem::tick(double dt) {
 
                 Sprite& collider = game_.getSprite(collision.vert.colliderSprite);
                 if (collider.interactionScript != "") {
-                  game_.getSystem<ScriptSystem>().runScript(collider.interactionScript);
+                  game_.getSystem<ScriptSystem>().runScript(game_.getMap().getName(), collider.interactionScript);
                   activated = true;
                 }
               }
@@ -70,7 +70,7 @@ void InputSystem::tick(double dt) {
           }
 
           if (inFrontOfSomething && !activated) {
-            game_.getSystem<ScriptSystem>().runScript("default");
+            game_.getSystem<ScriptSystem>().runScript("global", "no_problem_here");
           }
         }
       } else if (e.key.keysym.sym == SDLK_LEFT) {
@@ -22,7 +22,7 @@ void loop(Renderer& renderer) {
   game.emplaceSystem<CameraSystem>();
   game.emplaceSystem<MessageSystem>();
 
-  game.loadMap("../res/maps/map1.tmx", "spawn", Direction::down);
+  game.loadMap("map1", "spawn", Direction::down);
   game.getSprite(game.getSpriteByAlias("lucas")).controllable = true;
 
   renderer.render(game);
@@ -5,10 +5,11 @@
 #include <tmxlite/TileLayer.hpp>
 #include <tmxlite/Tileset.hpp>
 
-Map::Map(std::string_view filename) : filename_(filename) {
+Map::Map(std::string_view name) : name_(name) {
+  std::string filename = "../res/maps/" + std::string(name) + ".tmx";
   tmx::Map mapfile;
-  if (!mapfile.load(filename.data())) {
-    throw std::invalid_argument("Could not find map file: " + std::string(filename));
+  if (!mapfile.load(filename.c_str())) {
+    throw std::invalid_argument("Could not find map file: " + filename);
   }
 
   const tmx::Vector2u& mapSize = mapfile.getTileCount();
@@ -35,9 +35,9 @@ struct Trigger {
 class Map {
 public:
 
-  explicit Map(std::string_view filename);
+  explicit Map(std::string_view name);
 
-  const std::string& getName() const { return filename_; }
+  const std::string& getName() const { return name_; }
 
   const vec2i& getMapSize() const { return mapSize_; }
 
@@ -61,7 +61,7 @@ public:
 
 private:
 
-  std::string filename_;
+  std::string name_;
   vec2i mapSize_;
   vec2i tileSize_;
   std::vector<std::vector<Tile>> layers_;
@@ -120,17 +120,17 @@ void ScriptSystem::tick(double dt) {
   }
 }
 
-void ScriptSystem::runScript(std::string name) {
-  if (!loadedScripts_.count(name)) {
-    engine_.script_file("../res/scripts/" + name + ".lua");
-    loadedScripts_.insert(name);
+void ScriptSystem::runScript(std::string mapName, std::string scriptName) {
+  if (!loadedScripts_.count(mapName)) {
+    engine_.script_file("../res/scripts/" + mapName + ".lua");
+    loadedScripts_.insert(mapName);
   }
 
   runner_.reset(new sol::thread(sol::thread::create(engine_.lua_state())));
-  callable_.reset(new sol::coroutine(runner_->state().get<sol::function>(name)));
+  callable_.reset(new sol::coroutine(runner_->state().traverse_get<sol::function>(mapName, scriptName)));
 
   if (!*callable_) {
-    throw std::runtime_error("Error running script: " + name);
+    throw std::runtime_error("Error running script: " + mapName + "." + scriptName);
   }
 
   auto result = (*callable_)();
@@ -18,7 +18,7 @@ public:
 
   void tick(double dt) override;
 
-  void runScript(std::string name);
+  void runScript(std::string mapName, std::string scriptName);
 
 private: