From fe4c61124e11f3f342ab13397c7fea544480ad41 Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Mon, 19 Apr 2021 02:46:02 -0400
Subject: [PATCH] they hate to see a girlboss winning
---
source/MainMenuState.hx | 7 ++-
source/PlayState.hx | 134 ++++++++++++++++++++--------------------
2 files changed, 72 insertions(+), 69 deletions(-)
diff --git a/source/MainMenuState.hx b/source/MainMenuState.hx
index 69972167b..492b0d4ba 100644
--- a/source/MainMenuState.hx
+++ b/source/MainMenuState.hx
@@ -157,11 +157,14 @@ class MainMenuState extends MusicBeatState
{
#if linux
// 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
// 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
diff --git a/source/PlayState.hx b/source/PlayState.hx
index 7d68d4a7f..3291808ae 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -959,87 +959,87 @@ class PlayState extends MusicBeatState
function ughIntro()
{
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');
- vid.finishCallback = function()
- {
- remove(blackShit);
- FlxTween.tween(FlxG.camera, {zoom: defaultCamZoom}, (Conductor.crochet / 1000) * 5, {ease: FlxEase.quadInOut});
- startCountdown();
- cameraMovement();
- };
+ var blackShit:FlxSprite = new FlxSprite(-200, -200).makeGraphic(FlxG.width * 2, FlxG.height * 2, FlxColor.BLACK);
+ blackShit.scrollFactor.set();
+ add(blackShit);
- 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;
- camFollow.y += 100;
- */
+ FlxG.camera.zoom = defaultCamZoom * 1.2;
- FlxG.sound.playMusic(Paths.music('DISTORTO'), 0);
- 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.x += 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)
- {
- camFollow.x += 800;
+ 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;
- 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');
- // play sound
- FlxG.sound.play(Paths.sound('bfBeep'), function()
+ camFollow.x += 800;
+ camFollow.y += 100;
+ FlxTween.tween(FlxG.camera, {zoom: defaultCamZoom * 1.2}, 0.27, {ease: FlxEase.quadInOut});
+
+ new FlxTimer().start(1.5, function(bep:FlxTimer)
{
- boyfriend.playAnim('idle');
- });
- });
-
- 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)
+ boyfriend.playAnim('singUP');
+ // play sound
+ FlxG.sound.play(Paths.sound('bfBeep'), function()
{
- dad.visible = true;
- gfCutsceneLayer.remove(tankCutscene);
+ boyfriend.playAnim('idle');
});
-
- 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()