Make delayLengths a JsonMap

projects/hollywoo-flixel/src/hollywoo_flixel/FlxMovie.hx

@@ -17,13 +17,13 @@ import openfl.Assets;
 class FlxMovie extends Movie<FlxSprite, ActorFlxSprite, FlxSound, String, FlxSprite, FlxSound, FlxCamera, FlxLightSource> {
     // Think of HollywooFlixelDSL.kiss as the corresponding Kiss file for this class!
 
-    public function new(director:FlxDirector, lightSourceJsonFile:String, positionsJson:String, ?voiceLinesAssetPath:String) {
+    public function new(director:FlxDirector, lightSourceJsonFile:String, positionsJson:String, delayLengthsJson:String, ?voiceLinesAssetPath:String) {
         var voiceLinesJson = null;
         if (voiceLinesAssetPath != null) {
             voiceLinesJson = Assets.getText(voiceLinesAssetPath);
         }
 
-        super(director, lightSourceJsonFile, new FlxLightSource([], FlxColor.TRANSPARENT), positionsJson, voiceLinesJson);
+        super(director, lightSourceJsonFile, new FlxLightSource([], FlxColor.TRANSPARENT), positionsJson, delayLengthsJson, voiceLinesJson);
     }
     public var uiCamera:FlxCamera;
     public var screenCamera:FlxCamera;

projects/hollywoo/src/hollywoo/DelayLength.hx

@@ -0,0 +1,7 @@
+package hollywoo;
+
+import kiss.Prelude;
+import kiss.List;
+
+@:build(kiss.Kiss.build())
+class DelayLength {}

projects/hollywoo/src/hollywoo/DelayLength.kiss

@@ -0,0 +1,4 @@
+(defNew [&prop :Float length])
+
+(method stringify [] "$length")
+(method parse [:String data] (new DelayLength (Std.parseFloat data)))

projects/hollywoo/src/hollywoo/Movie.kiss

@@ -155,6 +155,7 @@
             :String lightSourceJsonFile
             :LightSource defaultLightSource
             :String stagePositionsJson
+            :String delayLengthsJson
             &opt :String voiceLinesJson
         ]
         [
@@ -162,6 +163,8 @@
                 (new JsonMap stagePositionsJson (new StagePosition 0 0 0))
             :JsonMap<JsonableArray<LightSource>> lightSources
                 (new JsonMap lightSourceJsonFile (new JsonableArray [] defaultLightSource))
+            :JsonMap<DelayLength> delayLengths
+                (new JsonMap delayLengthsJson (new DelayLength 0.5))
         ]
 
         (set director.movie this)
@@ -203,31 +206,35 @@
             (#unless subclass (method ,nameAndType ,argList ,@body))
         }))
 
-(hollywooMethod :Void delay true [sec :Continuation cc]
+(hollywooMethod :Void delay true [:Dynamic length :Continuation cc]
-    (case delayHandling
+    (let [sec (typeCase [length]
-        (Auto
+                    ([:Float sec] sec)
-            (Timer.delay cc (* 1000 sec)))
+                    ([:String key] .length (delayLengths.get key))
-        (AutoWithSkip
+                    (never otherwise))]
-            (let [autoDelay
+        (case delayHandling
-                        (Timer.delay
+            (Auto
-                            ->{
+                (Timer.delay cc (* 1000 sec)))
-                                (director.stopWaitForInput cc)
+            (AutoWithSkip
-                                (cc)
+                (let [autoDelay
-                            }
+                            (Timer.delay
-                            (* 1000 sec))]
+                                ->{
-                (director.startWaitForInput 
+                                    (director.stopWaitForInput cc)
+                                    (cc)
+                                }
+                                (* 1000 sec))]
+                    (director.startWaitForInput 
+                        ->{
+                            (director.stopWaitForInput cc)
+                            (autoDelay.stop)
+                            (cc)
+                        })))
+            (Manual
+                (director.startWaitForInput
                     ->{
                         (director.stopWaitForInput cc)
-                        (autoDelay.stop)
                         (cc)
-                    })))
+                    }))
-        (Manual
+            (otherwise (throw "Unsupported delay type $delayHandling")))))
-            (director.startWaitForInput
-                ->{
-                    (director.stopWaitForInput cc)
-                    (cc)
-                }))
-        (otherwise (throw "Unsupported delay type $delayHandling"))))
 
 (hollywooMethod newSet true [name :Set set]
     (assert isLoading)