cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-04-04 19:14:32 +00:00
Code Issues Releases Wiki Activity

they hate to see a girlboss winning

Browse source
This commit is contained in:
Cameron Taylor 2021-04-19 02:46:02 -04:00
parent 56cbb276fa
commit fe4c61124e
2 changed files with 72 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
source/MainMenuState.hx
View file

@ -157,11 +157,14 @@ class MainMenuState extends MusicBeatState
{ {
#if linux #if linux
// Sys.command('/usr/bin/xdg-open', ["https://ninja-muffin24.itch.io/funkin", "&"]); // Sys.command('/usr/bin/xdg-open', ["https://ninja-muffin24.itch.io/funkin", "&"]);
Sys.command('/usr/bin/xdg-open', ["https://www.kickstarter.com/projects/funkin/", "&"]); Sys.command('/usr/bin/xdg-open', [
"https://www.kickstarter.com/projects/funkin/friday-night-funkin-the-full-ass-game/",
"&"
]);
#else #else
// FlxG.openURL('https://ninja-muffin24.itch.io/funkin'); // FlxG.openURL('https://ninja-muffin24.itch.io/funkin');
FlxG.openURL('https://www.kickstarter.com/projects/funkin/'); FlxG.openURL('https://www.kickstarter.com/projects/funkin/friday-night-funkin-the-full-ass-game/');
#end #end
} }
#end #end

134
source/PlayState.hx
View file

@ -959,87 +959,87 @@ class PlayState extends MusicBeatState
function ughIntro() function ughIntro()
{ {
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 blackShit:FlxSprite = new FlxSprite(-200, -200).makeGraphic(FlxG.width * 2, FlxG.height * 2, FlxColor.BLACK);
vid.finishCallback = function() blackShit.scrollFactor.set();
{ add(blackShit);
remove(blackShit);
FlxTween.tween(FlxG.camera, {zoom: defaultCamZoom}, (Conductor.crochet / 1000) * 5, {ease: FlxEase.quadInOut});
startCountdown();
cameraMovement();
};
FlxG.camera.zoom = defaultCamZoom * 1.2; var vid:FlxVideo = new FlxVideo('music/ughCutscene.mp4');
vid.finishCallback = function()
{
remove(blackShit);
FlxTween.tween(FlxG.camera, {zoom: defaultCamZoom}, (Conductor.crochet / 1000) * 5, {ease: FlxEase.quadInOut});
startCountdown();
cameraMovement();
};
camFollow.x += 100; FlxG.camera.zoom = defaultCamZoom * 1.2;
camFollow.y += 100;
*/
FlxG.sound.playMusic(Paths.music('DISTORTO'), 0); camFollow.x += 100;
FlxG.sound.music.fadeIn(5, 0, 0.5);
dad.visible = false;
var tankCutscene:TankCutscene = new TankCutscene(-20, 320);
tankCutscene.frames = Paths.getSparrowAtlas('cutsceneStuff/tankTalkSong1');
tankCutscene.animation.addByPrefix('wellWell', 'TANK TALK 1 P1', 24, false);
tankCutscene.animation.addByPrefix('killYou', 'TANK TALK 1 P2', 24, false);
tankCutscene.animation.play('wellWell');
tankCutscene.antialiasing = true;
gfCutsceneLayer.add(tankCutscene);
camHUD.visible = false;
FlxG.camera.zoom *= 1.2;
camFollow.y += 100; camFollow.y += 100;
tankCutscene.startSyncAudio = FlxG.sound.load(Paths.sound('wellWellWell')); /*
FlxG.sound.playMusic(Paths.music('DISTORTO'), 0);
FlxG.sound.music.fadeIn(5, 0, 0.5);
new FlxTimer().start(3, function(tmr:FlxTimer) dad.visible = false;
{ var tankCutscene:TankCutscene = new TankCutscene(-20, 320);
camFollow.x += 800; tankCutscene.frames = Paths.getSparrowAtlas('cutsceneStuff/tankTalkSong1');
tankCutscene.animation.addByPrefix('wellWell', 'TANK TALK 1 P1', 24, false);
tankCutscene.animation.addByPrefix('killYou', 'TANK TALK 1 P2', 24, false);
tankCutscene.animation.play('wellWell');
tankCutscene.antialiasing = true;
gfCutsceneLayer.add(tankCutscene);
camHUD.visible = false;
FlxG.camera.zoom *= 1.2;
camFollow.y += 100; camFollow.y += 100;
FlxTween.tween(FlxG.camera, {zoom: defaultCamZoom * 1.2}, 0.27, {ease: FlxEase.quadInOut});
new FlxTimer().start(1.5, function(bep:FlxTimer) tankCutscene.startSyncAudio = FlxG.sound.load(Paths.sound('wellWellWell'));
new FlxTimer().start(3, function(tmr:FlxTimer)
{ {
boyfriend.playAnim('singUP'); camFollow.x += 800;
// play sound camFollow.y += 100;
FlxG.sound.play(Paths.sound('bfBeep'), function() FlxTween.tween(FlxG.camera, {zoom: defaultCamZoom * 1.2}, 0.27, {ease: FlxEase.quadInOut});
new FlxTimer().start(1.5, function(bep:FlxTimer)
{ {
boyfriend.playAnim('idle'); boyfriend.playAnim('singUP');
}); // play sound
}); FlxG.sound.play(Paths.sound('bfBeep'), function()
new FlxTimer().start(3, function(swaggy:FlxTimer)
{
camFollow.x -= 800;
camFollow.y -= 100;
FlxTween.tween(FlxG.camera, {zoom: defaultCamZoom * 1.2}, 0.5, {ease: FlxEase.quadInOut});
tankCutscene.animation.play('killYou');
FlxG.sound.play(Paths.sound('killYou'));
new FlxTimer().start(6.1, function(swagasdga:FlxTimer)
{
FlxTween.tween(FlxG.camera, {zoom: defaultCamZoom}, (Conductor.crochet / 1000) * 5, {ease: FlxEase.quadInOut});
FlxG.sound.music.fadeOut((Conductor.crochet / 1000) * 5, 0);
new FlxTimer().start((Conductor.crochet / 1000) * 5, function(money:FlxTimer)
{ {
dad.visible = true; boyfriend.playAnim('idle');
gfCutsceneLayer.remove(tankCutscene);
}); });
cameraMovement();
startCountdown();
camHUD.visible = true;
}); });
});
}); new FlxTimer().start(3, function(swaggy:FlxTimer)
{
camFollow.x -= 800;
camFollow.y -= 100;
FlxTween.tween(FlxG.camera, {zoom: defaultCamZoom * 1.2}, 0.5, {ease: FlxEase.quadInOut});
tankCutscene.animation.play('killYou');
FlxG.sound.play(Paths.sound('killYou'));
new FlxTimer().start(6.1, function(swagasdga:FlxTimer)
{
FlxTween.tween(FlxG.camera, {zoom: defaultCamZoom}, (Conductor.crochet / 1000) * 5, {ease: FlxEase.quadInOut});
FlxG.sound.music.fadeOut((Conductor.crochet / 1000) * 5, 0);
new FlxTimer().start((Conductor.crochet / 1000) * 5, function(money:FlxTimer)
{
dad.visible = true;
gfCutsceneLayer.remove(tankCutscene);
});
cameraMovement();
startCountdown();
camHUD.visible = true;
});
});
});*/
} }
function gunsIntro() function gunsIntro()