diff --git a/art/flashFiles/FNF_main_menu_assets.fla b/art/flashFiles/FNF_main_menu_assets.fla
index d143b1869..065adcc21 100644
Binary files a/art/flashFiles/FNF_main_menu_assets.fla and b/art/flashFiles/FNF_main_menu_assets.fla differ
diff --git a/art/flashFiles/campaign_menu_UI_assets.fla b/art/flashFiles/campaign_menu_UI_assets.fla
index 5252e5099..1678850a8 100644
Binary files a/art/flashFiles/campaign_menu_UI_assets.fla and b/art/flashFiles/campaign_menu_UI_assets.fla differ
diff --git a/assets/preload/images/FNF_main_menu_assets-2019.png b/assets/preload/images/FNF_main_menu_assets-2019.png
deleted file mode 100644
index ccecc93eb..000000000
Binary files a/assets/preload/images/FNF_main_menu_assets-2019.png and /dev/null differ
diff --git a/assets/preload/images/FNF_main_menu_assets-2019.xml b/assets/preload/images/FNF_main_menu_assets-2019.xml
deleted file mode 100644
index fac33b181..000000000
--- a/assets/preload/images/FNF_main_menu_assets-2019.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/assets/preload/images/FNF_main_menu_assets.png b/assets/preload/images/FNF_main_menu_assets.png
deleted file mode 100644
index bd0ffbd0e..000000000
Binary files a/assets/preload/images/FNF_main_menu_assets.png and /dev/null differ
diff --git a/assets/preload/images/FNF_main_menu_assets.xml b/assets/preload/images/FNF_main_menu_assets.xml
deleted file mode 100644
index fe5bb0c51..000000000
--- a/assets/preload/images/FNF_main_menu_assets.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/assets/preload/images/campaign_menu_UI_characters.png b/assets/preload/images/campaign_menu_UI_characters.png
index e8453a10a..5f2bf1350 100644
Binary files a/assets/preload/images/campaign_menu_UI_characters.png and b/assets/preload/images/campaign_menu_UI_characters.png differ
diff --git a/assets/preload/images/campaign_menu_UI_characters.xml b/assets/preload/images/campaign_menu_UI_characters.xml
index 79b862b3f..a6a38cf45 100644
--- a/assets/preload/images/campaign_menu_UI_characters.xml
+++ b/assets/preload/images/campaign_menu_UI_characters.xml
@@ -1,161 +1,175 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/assets/preload/images/main_menu.png b/assets/preload/images/main_menu.png
index a2267f5f9..3241e4560 100644
Binary files a/assets/preload/images/main_menu.png and b/assets/preload/images/main_menu.png differ
diff --git a/assets/preload/images/main_menu.xml b/assets/preload/images/main_menu.xml
index 1ff056cec..9a57076f4 100644
--- a/assets/preload/images/main_menu.xml
+++ b/assets/preload/images/main_menu.xml
@@ -1,77 +1,65 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/assets/preload/images/storymenu/week7.png b/assets/preload/images/storymenu/week7.png
new file mode 100644
index 000000000..8c42e319c
Binary files /dev/null and b/assets/preload/images/storymenu/week7.png differ
diff --git a/source/GameOverSubstate.hx b/source/GameOverSubstate.hx
index 11a53d5a5..c427e140d 100644
--- a/source/GameOverSubstate.hx
+++ b/source/GameOverSubstate.hx
@@ -82,6 +82,8 @@ class GameOverSubstate extends MusicBeatSubstate
if (controls.BACK)
{
+ PlayState.deathCounter = 0;
+ PlayState.seenCutscene = false;
FlxG.sound.music.stop();
if (PlayState.isStoryMode)
diff --git a/source/MainMenuState.hx b/source/MainMenuState.hx
index 5baa01eb8..88174cacc 100644
--- a/source/MainMenuState.hx
+++ b/source/MainMenuState.hx
@@ -96,7 +96,8 @@ class MainMenuState extends MusicBeatState
// addMenuItem('options', function () startExitState(new OptionMenu()));
#if CAN_OPEN_LINKS
var hasPopupBlocker = #if web true #else false #end;
- menuItems.createItem('donate', selectDonate, hasPopupBlocker);
+ menuItems.createItem('kickstarter', selectDonate, hasPopupBlocker);
+ // menuItems.createItem('donate', selectDonate, hasPopupBlocker);
#end
menuItems.createItem('options', function() startExitState(new OptionsState()));
// #if newgrounds
@@ -150,9 +151,12 @@ class MainMenuState extends MusicBeatState
function selectDonate()
{
#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/", "&"]);
#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/');
#end
}
#end
diff --git a/source/MenuCharacter.hx b/source/MenuCharacter.hx
index ca5f9b499..5403478e1 100644
--- a/source/MenuCharacter.hx
+++ b/source/MenuCharacter.hx
@@ -25,6 +25,7 @@ class MenuCharacter extends FlxSprite
animation.addByPrefix('mom', "Mom Idle BLACK LINES", 24);
animation.addByPrefix('parents-christmas', "Parent Christmas Idle", 24);
animation.addByPrefix('senpai', "SENPAI idle Black Lines", 24);
+ animation.addByPrefix('tankman', "Tankman Menu BLACK", 24);
// Parent Christmas Idle
animation.play(character);
diff --git a/source/PauseSubState.hx b/source/PauseSubState.hx
index 5dedf9097..1bb3750cf 100644
--- a/source/PauseSubState.hx
+++ b/source/PauseSubState.hx
@@ -168,6 +168,7 @@ class PauseSubState extends MusicBeatSubstate
case "Restart Song":
FlxG.resetState();
case "Exit to menu":
+ PlayState.seenCutscene = false;
PlayState.deathCounter = 0;
if (PlayState.isStoryMode)
FlxG.switchState(new StoryMenuState());
diff --git a/source/PlayState.hx b/source/PlayState.hx
index 75197e6d4..5b1d6fb6d 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -102,6 +102,8 @@ class PlayState extends MusicBeatState
var dialogue:Array = ['blah blah blah', 'coolswag'];
+ public static var seenCutscene:Bool = false;
+
var halloweenBG:FlxSprite;
var isHalloween:Bool = false;
@@ -149,6 +151,8 @@ class PlayState extends MusicBeatState
var detailsPausedText:String = "";
#end
+ var camPos:FlxPoint;
+
override public function create()
{
if (FlxG.sound.music != null)
@@ -632,7 +636,7 @@ class PlayState extends MusicBeatState
dad = new Character(100, 100, SONG.player2);
- var camPos:FlxPoint = new FlxPoint(dad.getGraphicMidpoint().x, dad.getGraphicMidpoint().y);
+ camPos = new FlxPoint(dad.getGraphicMidpoint().x, dad.getGraphicMidpoint().y);
switch (SONG.player2)
{
@@ -841,8 +845,10 @@ class PlayState extends MusicBeatState
// cameras = [FlxG.cameras.list[1]];
startingSong = true;
- if (isStoryMode)
+ if (isStoryMode && !seenCutscene)
{
+ seenCutscene = true;
+
switch (curSong.toLowerCase())
{
case "winter-horrorland":
@@ -881,6 +887,13 @@ class PlayState extends MusicBeatState
case 'thorns':
schoolIntro(doof);
+ case 'ugh':
+ ughIntro();
+ case 'stress':
+ stressIntro();
+ case 'guns':
+ gunsIntro();
+
default:
startCountdown();
}
@@ -889,12 +902,9 @@ class PlayState extends MusicBeatState
{
switch (curSong.toLowerCase())
{
- case 'ugh':
- ughIntro();
+ // REMOVE THIS LATER
case 'stress':
stressIntro();
- case 'guns':
- gunsIntro();
default:
startCountdown();
@@ -968,6 +978,8 @@ class PlayState extends MusicBeatState
function gunsIntro()
{
+ camFollow.setPosition(camPos.x, camPos.y);
+
camHUD.visible = false;
FlxG.sound.playMusic(Paths.music('DISTORTO'), 0);
@@ -1013,6 +1025,9 @@ class PlayState extends MusicBeatState
function stressIntro()
{
+ // for story mode shit
+ camFollow.setPosition(camPos.x, camPos.y);
+
for (i in 0...7)
{
var dummyLoader:FlxSprite = new FlxSprite();
@@ -1487,7 +1502,8 @@ class PlayState extends MusicBeatState
else
vocals = new FlxSound();
- vocals.onComplete = function(){
+ vocals.onComplete = function()
+ {
vocalsFinished = true;
};
FlxG.sound.list.add(vocals);
@@ -1775,14 +1791,14 @@ class PlayState extends MusicBeatState
function resyncVocals():Void
{
if (_exiting)
- return ;
+ return;
vocals.pause();
FlxG.sound.music.play();
Conductor.songPosition = FlxG.sound.music.time;
if (vocalsFinished)
- return ;
+ return;
vocals.time = Conductor.songPosition;
vocals.play();
@@ -2152,6 +2168,7 @@ class PlayState extends MusicBeatState
function endSong():Void
{
+ seenCutscene = false;
deathCounter = 0;
canPause = false;
FlxG.sound.music.volume = 0;
diff --git a/source/StoryMenuState.hx b/source/StoryMenuState.hx
index 4e9444075..692f0449c 100644
--- a/source/StoryMenuState.hx
+++ b/source/StoryMenuState.hx
@@ -29,11 +29,12 @@ class StoryMenuState extends MusicBeatState
['Pico', 'Philly', "Blammed"],
['Satin-Panties', "High", "Milf"],
['Cocoa', 'Eggnog', 'Winter-Horrorland'],
- ['Senpai', 'Roses', 'Thorns']
+ ['Senpai', 'Roses', 'Thorns'],
+ ['Ugh', 'Guns', 'Stress']
];
var curDifficulty:Int = 1;
- public static var weekUnlocked:Array = [true, true, true, true, true, true, true];
+ public static var weekUnlocked:Array = [true, true, true, true, true, true, true, true];
var weekCharacters:Array = [
['dad', 'bf', 'gf'],
@@ -42,7 +43,8 @@ class StoryMenuState extends MusicBeatState
['pico', 'bf', 'gf'],
['mom', 'bf', 'gf'],
['parents-christmas', 'bf', 'gf'],
- ['senpai', 'bf', 'gf']
+ ['senpai', 'bf', 'gf'],
+ ['tankman', 'bf', 'gf']
];
var weekNames:Array = [
@@ -52,7 +54,8 @@ class StoryMenuState extends MusicBeatState
"PICO",
"MOMMY MUST MURDER",
"RED SNOW",
- "hating simulator ft. moawling"
+ "hating simulator ft. moawling",
+ "cock Joke"
];
var txtWeekTitle:FlxText;
@@ -112,7 +115,7 @@ class StoryMenuState extends MusicBeatState
add(grpLocks);
trace("Line 70");
-
+
#if discord_rpc
// Updating Discord Rich Presence
DiscordClient.changePresence("In the Menus", null);
@@ -419,6 +422,9 @@ class StoryMenuState extends MusicBeatState
case 'dad':
grpWeekCharacters.members[0].offset.set(120, 200);
grpWeekCharacters.members[0].setGraphicSize(Std.int(grpWeekCharacters.members[0].width * 1));
+ case 'tankman':
+ grpWeekCharacters.members[0].offset.set(60, -20);
+ grpWeekCharacters.members[0].setGraphicSize(Std.int(grpWeekCharacters.members[0].width * 1));
default:
grpWeekCharacters.members[0].offset.set(100, 100);