5 files changed, 39 insertions, 9 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