diff --git a/assets/preload/music/gunsCutscene.mp4 b/assets/preload/music/gunsCutscene.mp4 new file mode 100644 index 000000000..2e3a42c97 Binary files /dev/null and b/assets/preload/music/gunsCutscene.mp4 differ diff --git a/source/PlayState.hx b/source/PlayState.hx index e1714e224..d92751df5 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -1029,49 +1029,58 @@ class PlayState extends MusicBeatState { inCutscene = true; - camFollow.setPosition(camPos.x, camPos.y); - - camHUD.visible = false; - - FlxG.sound.playMusic(Paths.music('DISTORTO'), 0); - FlxG.sound.music.fadeIn(5, 0, 0.5); - - camFollow.y += 100; - - FlxTween.tween(FlxG.camera, {zoom: defaultCamZoom * 1.3}, 4, {ease: FlxEase.quadInOut}); - - dad.visible = false; - var tankCutscene:TankCutscene = new TankCutscene(20, 320); - tankCutscene.frames = Paths.getSparrowAtlas('cutsceneStuff/tankTalkSong2'); - tankCutscene.animation.addByPrefix('tankyguy', 'TANK TALK 2', 24, false); - tankCutscene.animation.play('tankyguy'); - tankCutscene.antialiasing = true; - gfCutsceneLayer.add(tankCutscene); // add(); - - tankCutscene.startSyncAudio = FlxG.sound.load(Paths.sound('tankSong2')); - - new FlxTimer().start(4.1, function(ugly:FlxTimer) + var vid:FlxVideo = new FlxVideo('music/gunsCutscene.mp4'); + vid.finishCallback = function() { - FlxTween.tween(FlxG.camera, {zoom: defaultCamZoom * 1.4}, 0.4, {ease: FlxEase.quadOut}); - FlxTween.tween(FlxG.camera, {zoom: defaultCamZoom * 1.3}, 0.7, {ease: FlxEase.quadInOut, startDelay: 0.45}); - - gf.playAnim('sad'); - }); - - new FlxTimer().start(11, function(tmr:FlxTimer) - { - FlxG.sound.music.fadeOut((Conductor.crochet / 1000) * 5, 0); - - FlxTween.tween(FlxG.camera, {zoom: defaultCamZoom}, (Conductor.crochet * 5) / 1000, {ease: FlxEase.quartIn}); + FlxTween.tween(FlxG.camera, {zoom: defaultCamZoom}, (Conductor.crochet / 1000) * 5, {ease: FlxEase.quadInOut}); startCountdown(); - new FlxTimer().start((Conductor.crochet * 25) / 1000, function(daTim:FlxTimer) + cameraMovement(); + }; + + /* + camFollow.setPosition(camPos.x, camPos.y); + + camHUD.visible = false; + + FlxG.sound.playMusic(Paths.music('DISTORTO'), 0); + FlxG.sound.music.fadeIn(5, 0, 0.5); + + camFollow.y += 100; + + FlxTween.tween(FlxG.camera, {zoom: defaultCamZoom * 1.3}, 4, {ease: FlxEase.quadInOut}); + + dad.visible = false; + var tankCutscene:TankCutscene = new TankCutscene(20, 320); + tankCutscene.frames = Paths.getSparrowAtlas('cutsceneStuff/tankTalkSong2'); + tankCutscene.animation.addByPrefix('tankyguy', 'TANK TALK 2', 24, false); + tankCutscene.animation.play('tankyguy'); + tankCutscene.antialiasing = true; + gfCutsceneLayer.add(tankCutscene); // add(); + + tankCutscene.startSyncAudio = FlxG.sound.load(Paths.sound('tankSong2')); + + new FlxTimer().start(4.1, function(ugly:FlxTimer) { - dad.visible = true; - gfCutsceneLayer.remove(tankCutscene); + FlxTween.tween(FlxG.camera, {zoom: defaultCamZoom * 1.4}, 0.4, {ease: FlxEase.quadOut}); + FlxTween.tween(FlxG.camera, {zoom: defaultCamZoom * 1.3}, 0.7, {ease: FlxEase.quadInOut, startDelay: 0.45}); + + gf.playAnim('sad'); }); - camHUD.visible = true; - }); + new FlxTimer().start(11, function(tmr:FlxTimer) + { + FlxG.sound.music.fadeOut((Conductor.crochet / 1000) * 5, 0); + + FlxTween.tween(FlxG.camera, {zoom: defaultCamZoom}, (Conductor.crochet * 5) / 1000, {ease: FlxEase.quartIn}); + startCountdown(); + new FlxTimer().start((Conductor.crochet * 25) / 1000, function(daTim:FlxTimer) + { + dad.visible = true; + gfCutsceneLayer.remove(tankCutscene); + }); + + camHUD.visible = true; + });*/ } /** diff --git a/source/TitleState.hx b/source/TitleState.hx index afc229ad2..2b67aaead 100644 --- a/source/TitleState.hx +++ b/source/TitleState.hx @@ -47,7 +47,7 @@ import sys.thread.Thread; class TitleState extends MusicBeatState { - static var initialized:Bool = false; + public static var initialized:Bool = false; var blackScreen:FlxSprite; var credGroup:FlxGroup; diff --git a/source/VideoState.hx b/source/VideoState.hx index 18d5f0877..2e9afffaf 100644 --- a/source/VideoState.hx +++ b/source/VideoState.hx @@ -64,6 +64,7 @@ class VideoState extends MusicBeatState netStream.dispose(); FlxG.removeChild(video); + TitleState.initialized = false; FlxG.switchState(new TitleState()); }