1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-01-30 16:36:55 +00:00

wtf cutscene shit

This commit is contained in:
Cameron Taylor 2021-04-18 06:53:23 -04:00
parent 5bc6bebb67
commit 08971e185d
2 changed files with 20 additions and 3 deletions

View file

@ -40,7 +40,7 @@
<classpath name="source" /> <classpath name="source" />
<assets path='assets/preload/music' include="*mp4" embed='false' /> <!-- <assets path='assets/preload/music' include="*mp4" embed='false' /> -->
<assets path="assets/preload" rename="assets" exclude="*.ogg" if="web"/> <assets path="assets/preload" rename="assets" exclude="*.ogg" if="web"/>
<assets path="assets/preload" rename="assets" exclude="*.mp3" unless="web"/> <assets path="assets/preload" rename="assets" exclude="*.mp3" unless="web"/>

View file

@ -934,8 +934,8 @@ class PlayState extends MusicBeatState
switch (curSong.toLowerCase()) switch (curSong.toLowerCase())
{ {
// REMOVE THIS LATER // REMOVE THIS LATER
// case 'stress': case 'stress':
// stressIntro(); stressIntro();
default: default:
startCountdown(); startCountdown();
@ -949,9 +949,14 @@ class PlayState extends MusicBeatState
{ {
inCutscene = true; inCutscene = true;
var blackShit:FlxSprite = new FlxSprite(-200, -200).makeGraphic(FlxG.width * 2, FlxG.height * 2, FlxColor.BLACK);
blackShit.scrollFactor.set();
add(blackShit);
var vid:FlxVideo = new FlxVideo('music/ughCutscene.mp4'); var vid:FlxVideo = new FlxVideo('music/ughCutscene.mp4');
vid.finishCallback = function() vid.finishCallback = function()
{ {
remove(blackShit);
FlxTween.tween(FlxG.camera, {zoom: defaultCamZoom}, (Conductor.crochet / 1000) * 5, {ease: FlxEase.quadInOut}); FlxTween.tween(FlxG.camera, {zoom: defaultCamZoom}, (Conductor.crochet / 1000) * 5, {ease: FlxEase.quadInOut});
startCountdown(); startCountdown();
cameraMovement(); cameraMovement();
@ -1030,9 +1035,15 @@ class PlayState extends MusicBeatState
{ {
inCutscene = true; inCutscene = true;
var blackShit:FlxSprite = new FlxSprite(-200, -200).makeGraphic(FlxG.width * 2, FlxG.height * 2, FlxColor.BLACK);
blackShit.scrollFactor.set();
add(blackShit);
var vid:FlxVideo = new FlxVideo('music/gunsCutscene.mp4'); var vid:FlxVideo = new FlxVideo('music/gunsCutscene.mp4');
vid.finishCallback = function() vid.finishCallback = function()
{ {
remove(blackShit);
FlxTween.tween(FlxG.camera, {zoom: defaultCamZoom}, (Conductor.crochet / 1000) * 5, {ease: FlxEase.quadInOut}); FlxTween.tween(FlxG.camera, {zoom: defaultCamZoom}, (Conductor.crochet / 1000) * 5, {ease: FlxEase.quadInOut});
startCountdown(); startCountdown();
cameraMovement(); cameraMovement();
@ -1099,9 +1110,15 @@ class PlayState extends MusicBeatState
{ {
inCutscene = true; inCutscene = true;
var blackShit:FlxSprite = new FlxSprite(-200, -200).makeGraphic(FlxG.width * 2, FlxG.height * 2, FlxColor.BLACK);
blackShit.scrollFactor.set();
add(blackShit);
var vid:FlxVideo = new FlxVideo('music/stressCutscene.mp4'); var vid:FlxVideo = new FlxVideo('music/stressCutscene.mp4');
vid.finishCallback = function() vid.finishCallback = function()
{ {
remove(blackShit);
FlxTween.tween(FlxG.camera, {zoom: defaultCamZoom}, (Conductor.crochet / 1000) * 5, {ease: FlxEase.quadInOut}); FlxTween.tween(FlxG.camera, {zoom: defaultCamZoom}, (Conductor.crochet / 1000) * 5, {ease: FlxEase.quadInOut});
startCountdown(); startCountdown();
cameraMovement(); cameraMovement();