diff --git a/haxe_libraries/hollywoo.hxml b/haxe_libraries/hollywoo.hxml index 0a29948..19967e2 100644 --- a/haxe_libraries/hollywoo.hxml +++ b/haxe_libraries/hollywoo.hxml @@ -1,6 +1,6 @@ -# @install: lix --silent download "gh://github.com/kiss-lang/hollywoo#98ba861d9cfab20d1ddeadeb1585959bce39eee7" into hollywoo/0.0.0/github/98ba861d9cfab20d1ddeadeb1585959bce39eee7 -# @run: haxelib run-dir hollywoo "${HAXE_LIBCACHE}/hollywoo/0.0.0/github/98ba861d9cfab20d1ddeadeb1585959bce39eee7" +# @install: lix --silent download "gh://github.com/kiss-lang/hollywoo#85d80621508b287834d102032d7c442e586d321c" into hollywoo/0.0.0/github/85d80621508b287834d102032d7c442e586d321c +# @run: haxelib run-dir hollywoo "${HAXE_LIBCACHE}/hollywoo/0.0.0/github/85d80621508b287834d102032d7c442e586d321c" -lib kiss -lib kiss-tools --cp ${HAXE_LIBCACHE}/hollywoo/0.0.0/github/98ba861d9cfab20d1ddeadeb1585959bce39eee7/src/ +-cp ${HAXE_LIBCACHE}/hollywoo/0.0.0/github/85d80621508b287834d102032d7c442e586d321c/src/ -D hollywoo=0.0.0 \ No newline at end of file diff --git a/haxe_libraries/kiss-flixel.hxml b/haxe_libraries/kiss-flixel.hxml index f3ffbd2..f6234e9 100644 --- a/haxe_libraries/kiss-flixel.hxml +++ b/haxe_libraries/kiss-flixel.hxml @@ -1,4 +1,4 @@ -# @install: lix --silent download "gh://github.com/kiss-lang/kiss-flixel#9bfb28a5c3de902cd0017765215621d34d55e0ab" into kiss-flixel/0.0.0/github/9bfb28a5c3de902cd0017765215621d34d55e0ab +# @install: lix --silent download "gh://github.com/kiss-lang/kiss-flixel#7cc19461bb915185dc7c204b722b85eaa20bb9b3" into kiss-flixel/0.0.0/github/7cc19461bb915185dc7c204b722b85eaa20bb9b3 -lib flixel -lib flixel-addons -lib flixel-ui @@ -6,6 +6,6 @@ -lib kiss-tools -lib lime -lib openfl --cp ${HAXE_LIBCACHE}/kiss-flixel/0.0.0/github/9bfb28a5c3de902cd0017765215621d34d55e0ab/src/ +-cp ${HAXE_LIBCACHE}/kiss-flixel/0.0.0/github/7cc19461bb915185dc7c204b722b85eaa20bb9b3/src/ -D kiss-flixel=0.0.0 --macro kiss_flixel.ShaderFrontend.use() \ No newline at end of file diff --git a/haxe_libraries/kiss-tools.hxml b/haxe_libraries/kiss-tools.hxml index fbd19ef..7426078 100644 --- a/haxe_libraries/kiss-tools.hxml +++ b/haxe_libraries/kiss-tools.hxml @@ -1,4 +1,4 @@ -# @install: lix --silent download "gh://github.com/kiss-lang/kiss-tools#93ad23d10bd1e6446113f7fa1b1ec9595ed03d7d" into kiss-tools/0.0.0/github/93ad23d10bd1e6446113f7fa1b1ec9595ed03d7d +# @install: lix --silent download "gh://github.com/kiss-lang/kiss-tools#4148f3268fb0768d3febe26a3c2f1898a5a086aa" into kiss-tools/0.0.0/github/4148f3268fb0768d3febe26a3c2f1898a5a086aa -lib kiss --cp ${HAXE_LIBCACHE}/kiss-tools/0.0.0/github/93ad23d10bd1e6446113f7fa1b1ec9595ed03d7d/src/ +-cp ${HAXE_LIBCACHE}/kiss-tools/0.0.0/github/4148f3268fb0768d3febe26a3c2f1898a5a086aa/src/ -D kiss-tools=0.0.0 \ No newline at end of file diff --git a/haxe_libraries/kiss.hxml b/haxe_libraries/kiss.hxml index 1fe3d78..e49638b 100644 --- a/haxe_libraries/kiss.hxml +++ b/haxe_libraries/kiss.hxml @@ -1,12 +1,12 @@ -# @install: lix --silent download "gh://github.com/kiss-lang/kiss#a2aaca9f7ed54ba7d8b09f510dd3a1962ce0af5a" into kiss/0.0.1/github/a2aaca9f7ed54ba7d8b09f510dd3a1962ce0af5a -# @run: haxelib run-dir kiss "${HAXE_LIBCACHE}/kiss/0.0.1/github/a2aaca9f7ed54ba7d8b09f510dd3a1962ce0af5a" +# @install: lix --silent download "gh://github.com/kiss-lang/kiss#f2cff4803e6723409c12d8896510d9e59191a1c5" into kiss/0.0.1/github/f2cff4803e6723409c12d8896510d9e59191a1c5 +# @run: haxelib run-dir kiss "${HAXE_LIBCACHE}/kiss/0.0.1/github/f2cff4803e6723409c12d8896510d9e59191a1c5" -lib haxe-strings -lib hscript -lib tink_json -lib tink_macro -lib tink_syntaxhub -lib uuid --cp ${HAXE_LIBCACHE}/kiss/0.0.1/github/a2aaca9f7ed54ba7d8b09f510dd3a1962ce0af5a/src +-cp ${HAXE_LIBCACHE}/kiss/0.0.1/github/f2cff4803e6723409c12d8896510d9e59191a1c5/src -D kiss=0.0.1 -w -WUnusedPattern --macro kiss.KissFrontend.use() \ No newline at end of file diff --git a/src/hollywoo_flixel/HollywooFlixelDSL.kiss b/src/hollywoo_flixel/HollywooFlixelDSL.kiss index 76fae25..5ab71eb 100644 --- a/src/hollywoo_flixel/HollywooFlixelDSL.kiss +++ b/src/hollywoo_flixel/HollywooFlixelDSL.kiss @@ -30,10 +30,10 @@ (method &override :Void _showScene [:Scene scene :Appearance appearance :FlxCamera camera :Continuation cc] (super._showScene scene appearance camera - (makeCC + (makeCC cc (whenLet [overlaidProps (dictGet overlaidPropsInScenes sceneKey)] (doFor =>sprite key overlaidProps - (overlayPropOnCurrentSet key (makeCC null)))) + (overlayPropOnCurrentSet key (makeCC null null)))) (whenLet [tweenedPositions (dictGet tweenedPositionsOfSpritesInScenes sceneKey)] (doFor =>sprite point tweenedPositions (set sprite.x point.x) @@ -111,13 +111,13 @@ (return)) (let [oldCC cc] (set cc - (makeCC + (makeCC oldCC (finalPositions) (when soundLoop - (stopSound skipping soundLoop (makeCC null))) + (stopSound skipping soundLoop (makeCC null null))) (when oldCC (oldCC))))) (when soundLoop - (loopSound skipping soundLoop (makeCC null) volumeMod)) + (loopSound skipping soundLoop (makeCC null null) volumeMod)) (tween (FlxTween.linearMotion sprite sprite.x sprite.y destX destY speed false (tweenOpts (unless connectedSprites cc)))) (when connectedSprites @@ -281,11 +281,11 @@ (when soundLoop (let [oldCC cc] (set cc - (makeCC - (stopSound skipping soundLoop (makeCC null)) + (makeCC oldCC + (stopSound skipping soundLoop (makeCC null null)) (when oldCC (oldCC))))) - (loopSound skipping soundLoop (makeCC null) volumeMod)) + (loopSound skipping soundLoop (makeCC null null) volumeMod)) (tween (FlxTween.angle sprite sprite.angle angle duration (tweenOpts cc)))) @@ -396,7 +396,7 @@ (FlxG.state.add plate) plate))) (delay skipping delayLength - (makeCC + (makeCC (when delayWhileShown cc) (doFor plate plates (FlxG.state.remove plate true)) (set plates null) (when delayWhileShown (cc)))) @@ -576,7 +576,7 @@ (if (= barMax barProgress) (wrappedCC) (delay skipping delayAmount - (makeCC + (makeCC null (+= barProgress 1) (checkDelay)) @@ -623,7 +623,7 @@ lastScene (dictGet scenes sceneKey) scene (dictGet scenes name) camera scene.camera - finish (makeCC + finish (makeCC cc // Needs to be done 1 more time: (set inCamera.x inCameraPos.x) (set outCamera.x outCameraPos.x) @@ -632,7 +632,7 @@ (set outCamera null) (set sceneKey lastSceneKey) (_hideCurrentScene - (makeCC + (makeCC cc (set sceneKey name) (cc))))] @@ -654,7 +654,7 @@ scene (hollywoo.Movie.appearanceFlag shownScenes name) camera - (makeCC + (makeCC finish (linearMotion skipping inCameraPos 0 0 speed finish soundLoop volumeMod [outCameraPos])))))