9 files changed, 59 insertions, 12 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="48" height="32" tilewidth="16" tileheight="16" infinite="0" nextlayerid="4" nextobjectid="9">
+<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="48" height="32" tilewidth="16" tileheight="16" infinite="0" nextlayerid="4" nextobjectid="10">
  <tileset firstgid="1" name="fromRom" tilewidth="16" tileheight="16" tilecount="240" columns="10">
   <image source="map1_tiles.png" width="160" height="384"/>
   <tile id="77">
@@ -784,6 +784,9 @@
     <property name="script" value="map1_off_right"/>
    </properties>
   </object>
+  <object id="9" name="fromRight" type="warp" x="748.667" y="382.667">
+   <point/>
+  </object>
  </objectgroup>
  <layer id="1" name="Layer 0" width="48" height="32">
   <data encoding="csv">
@@ -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="2">
+<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="3">
  <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">
@@ -640,6 +640,11 @@
   <object id="1" name="fromLeft" type="warp" x="16" y="364.667">
    <point/>
   </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"/>
+   </properties>
+  </object>
  </objectgroup>
  <layer id="1" name="Layer 0" width="64" height="64">
   <data encoding="csv">
@@ -38,3 +38,28 @@ end
 function StopSound(soundId)
   mixer():stopChannel(soundId)
 end
+
+function FadeToBlack(length)
+  local progress = 0.0
+  while progress < length do
+    progress = progress + coroutine.yield()
+    setFadeoutProgress(progress / length)
+  end
+  setFadeoutProgress(1.0)
+end
+
+function RemoveFadeout(length)
+  local progress = length
+  while progress > 0 do
+    progress = progress - coroutine.yield()
+    setFadeoutProgress(progress / length)
+  end
+  setFadeoutProgress(0.0)
+end
+
+function ChangeMap(map, warp)
+  FadeToBlack(150)
+  loadMap("../res/maps/" .. map .. ".tmx", warp)
+  coroutine.yield()
+  RemoveFadeout(150)
+end
@@ -1,9 +1,3 @@
 function map1_off_right()
-  -- Because this script gets triggered within the CharacterSystem's tick method,
-  -- if we immediately cleared out the entities from the old map, we might end up
-  -- returning there and processing stale data. This yield here ensures that we
-  -- are no longer in the CharacterSystem, because processing gets picked back up
-  -- in the ScriptSystem.
-  coroutine.yield()
-  loadMap("../res/maps/map2.tmx", "fromLeft")
+  ChangeMap("map2", "fromLeft")
 end
@@ -0,0 +1,3 @@
+function map2_off_left()
+  ChangeMap("map1", "fromRight")
+end
@@ -79,6 +79,10 @@ public:
 
   const Font& getFont() const { return font_; }
 
+  double getFadeoutProgress() const { return fadeout_; }
+
+  void setFadeoutProgress(double val) { fadeout_ = val; }
+
 private:
 
   void clearSprites();
@@ -94,6 +98,7 @@ private:
   std::map<std::string, int> spritesByAlias_;
   std::unique_ptr<Map> map_;
   Font font_;
+  double fadeout_ = 0.0;
 };
 
 #endif /* end of include guard: GAME_H_E6F1396E */
@@ -14,13 +14,13 @@
 
 void loop(Renderer& renderer) {
   Game game(renderer);
+  game.emplaceSystem<ScriptSystem>();
   game.emplaceSystem<TransformSystem>();
   game.emplaceSystem<InputSystem>();
   game.emplaceSystem<CharacterSystem>();
   game.emplaceSystem<AnimationSystem>();
   game.emplaceSystem<CameraSystem>();
   game.emplaceSystem<MessageSystem>();
-  game.emplaceSystem<ScriptSystem>();
 
   game.loadMap("../res/maps/map1.tmx", "spawn");
 
@@ -234,6 +234,12 @@ void Renderer::render(Game& game) {
     }
   }
 
+  if (game.getFadeoutProgress() > 0.0) {
+    SDL_SetRenderDrawBlendMode(ren_.get(), SDL_BLENDMODE_BLEND);
+    SDL_SetRenderDrawColor(ren_.get(), 0, 0, 0, game.getFadeoutProgress() * 255);
+    SDL_RenderFillRect(ren_.get(), nullptr);
+  }
+
   SDL_SetRenderTarget(ren_.get(), nullptr);
   SDL_RenderCopy(ren_.get(), cameraTex.get(), nullptr, nullptr);
   SDL_RenderPresent(ren_.get());
@@ -56,6 +56,12 @@ ScriptSystem::ScriptSystem(Game& game) : game_(game) {
       game_.loadMap(filename, warpPoint);
     });
 
+  engine_.set_function(
+    "setFadeoutProgress",
+    [&] (double val) {
+      game_.setFadeoutProgress(val);
+    });
+
   engine_.script_file("../res/scripts/common.lua");
 }
 
@@ -64,7 +70,7 @@ void ScriptSystem::tick(double dt) {
     auto result = (*callable_)(dt);
     if (!result.valid()) {
       sol::error e = result;
-      throw std::runtime_error(e.what());
+      throw e;
     }
 
     if (!*callable_) {
@@ -90,7 +96,7 @@ void ScriptSystem::runScript(std::string name) {
   auto result = (*callable_)();
   if (!result.valid()) {
     sol::error e = result;
-    throw std::runtime_error(e.what());
+    throw e;
   }
 
   if (!*callable_) {