Added map fadeouts

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

1 files changed, 15 insertions, 6 deletions

@@ -5,6 +5,7 @@
 #include "animation_system.h"
 #include "character_system.h"
 #include "transform_system.h"
+#include "effect_system.h"
 #include "vector.h"
 
 ScriptSystem::ScriptSystem(Game& game) : game_(game) {
@@ -31,6 +32,7 @@ ScriptSystem::ScriptSystem(Game& game) : game_(game) {
     "message",
     "displayMessage", &MessageSystem::displayMessage,
     "showChoice", &MessageSystem::showChoice,
+    "displayCutsceneBars", &MessageSystem::displayCutsceneBars,
     "hideCutsceneBars", &MessageSystem::hideCutsceneBars,
     "isMessageActive", sol::property(&MessageSystem::isMessageActive),
     "getChoiceSelection", &MessageSystem::getChoiceSelection);
@@ -52,6 +54,13 @@ ScriptSystem::ScriptSystem(Game& game) : game_(game) {
       transform.initSprite(spriteId, vec2i{x, y}, layer);
     });
 
+  engine_.new_usertype<EffectSystem>(
+    "effect",
+    "fadeScreen", &EffectSystem::fadeScreen,
+    "isScreenFadeComplete", &EffectSystem::isScreenFadeComplete,
+    "fadeMap", &EffectSystem::fadeMap,
+    "isMapFadeComplete", &EffectSystem::isMapFadeComplete);
+
   engine_.new_usertype<Mixer>(
     "mixer",
     "playSound", &Mixer::playSound,
@@ -83,6 +92,12 @@ ScriptSystem::ScriptSystem(Game& game) : game_(game) {
     });
 
   engine_.set_function(
+    "effect",
+    [&] () -> EffectSystem& {
+      return game_.getSystem<EffectSystem>();
+    });
+
+  engine_.set_function(
     "mixer",
     [&] () -> Mixer& {
       return game_.getMixer();
@@ -130,12 +145,6 @@ ScriptSystem::ScriptSystem(Game& game) : game_(game) {
       game_.loadMap(filename, warpPoint, dir);
     });
 
-  engine_.set_function(
-    "setFadeoutProgress",
-    [&] (double val) {
-      game_.setFadeoutProgress(val);
-    });
-
   engine_.script_file("../res/scripts/common.lua");
 }