Added map fadeouts

Screen fadeouts and map fadeouts are now handled by the effect system.

2 files changed, 24 insertions, 11 deletions

@@ -41,6 +41,7 @@ function StartCutscene()
   local playerSprite = getSprite(playerId)
   playerSprite.controllable = false
   character():halt(playerId)
+  message():displayCutsceneBars()
 end
 
 function DisplayMessage(msg, name, type)
@@ -107,21 +108,27 @@ function StopSound(soundId)
 end
 
 function FadeToBlack(length)
-  local progress = 0.0
-  while progress < length do
-    progress = progress + coroutine.yield()
-    setFadeoutProgress(progress / length)
-  end
-  setFadeoutProgress(1.0)
+  effect():fadeScreen(length, 1.0)
+  repeat
+    coroutine.yield()
+  until effect():isScreenFadeComplete()
 end
 
 function RemoveFadeout(length)
-  local progress = length
-  while progress > 0 do
-    progress = progress - coroutine.yield()
-    setFadeoutProgress(progress / length)
+  effect():fadeScreen(length, 0.0)
+  repeat
+    coroutine.yield()
+  until effect():isScreenFadeComplete()
+end
+
+function FadeMap(length, amount)
+  effect():fadeMap(length, amount)
+end
+
+function WaitForMapFade()
+  while not effect():isMapFadeComplete() do
+    coroutine.yield()
   end
-  setFadeoutProgress(0.0)
 end
 
 function SetPartyDirection(spriteId, direction)
@@ -26,6 +26,9 @@ end
 
 function map2.mailbox_lightning()
   StartCutscene()
+  FadeMap(500, 0.5)
+  WaitForMapFade()
+
   DisplayMessage("* ...?", "", SpeakerType.NONE)
   WaitForEndOfMessage()
 
@@ -44,6 +47,9 @@ function map2.mailbox_lightning()
   SetAnimation("lucas", "lightning_collapse!")
   WaitForAnimation("lucas")
 
+  FadeMap(500, 0.0)
+  WaitForMapFade()
+
   DisplayMessage("* It was lightning.\n\fAh.", "", SpeakerType.NONE)
   WaitForEndOfMessage()
   HideCutsceneBars()