Merge branch 'main' of https://github.com/poec987/FNF-V3

assets/preload/data/roses/rosesDialogue.txt

@@ -1,6 +1,22 @@
-:dad:HUH??!
-:dad:How the fuck did you beat me, the sigma gigachad wolf?!
-:bf:...
-:dad:Don't make me reveal my DARK SIDE!
-:dad:I will protect you from this PREDATOR kitten.
-:bf:erm i am a minor
+:bf:well i win
+:dad:....
+:dad:(SHIT! My BETA is showing! I gotta REMATCH his ass!)
+:dad:FUCK!
+:dad:REMATCH RIGHT FUCKING NOW!
+:dad:THIS TIME, I WILL FUCKING WIN! RIGHT SIGMAS??
+:bf:you are such a beta
+:bf:quite sad to see you lose to an "alpha"
+:dad:ERK...
+:dad:HHRrrRggrGh GRhjrhjhgrrgh!
+:dad:My BAD side is showing!
+:dad:You better prepare yourself...
+:dad:because I am gonna (doc) scratch your disc
+:dad:and by disc... i mean haha you know... YOUR FUCKING DICK
+:bf:i am a minor and i WILL cancel you on X
+:dad:...
+:dad:FINE THEN, I WILL KILL YOU AND THE GIRL WILL BE MINE >:3
+:bf:okay buddy
+:bf:and i thought **I** was emo
+:dad:GRGr...
+:dad:start the song mf
+:bf:okay

assets/preload/data/senpai/senpaiDialogue.txt

@@ -1,5 +1,13 @@
 :dad:Hello alpha male.
-:dad:My kitten over there seems quite scared of your EXISTENCE.
-:bf:why am i here
-:dad:I will spit some bars because I am a SIGMA.
-:bf:oh no
+:dad:I lift the waits cause i am SIGMIO THE SIGMA
+:dad:You look like a fucking TWINK
+:bf::[
+:dad:My fellow sigmas over here will beat yo ass and-
+:bf:i am dave strider's great great grandchild
+:bf:i know the BARS
+:dad:D-DAVE?!
+:dad:S-S-S-STRIDER?!!?!
+:dad:WELL, I AM MICHAEL YIIK'S GREAT GREAT GREAT GRANDCHILD!!!!
+:dad:We shall rap to the DEATH to see who can get this lovely mistress!
+:dad:I will win and open the DOOR for her and gift her DISCORD NITRO.
+:bf:its fuckin on

assets/preload/data/thorns/thornsDialogue.txt

@@ -1,13 +1,17 @@
-:dad:It appears I am standing in front of the cause of this hell.
-:dad:Jo560hs... Is this worth it?
-:dad:Your energy is morphing the world into utter chaos.
-:dad:Everything is now low quality because of you.
-:dad:Is this your idea of fun?
-:bf:no
-:dad:Oh? So you aren't intending the downfall of humanity?
-:bf:no
-:dad:Welp...
-:dad:I am sorry, but I must end this now.
-:dad:You don't mind if I rip you apart and feed you to the devil right?
-:dad:It's only fair.
+:dad:It has been a while hasn't it?
+:dad:Mr. Dearest will pay for what he has done.
+:dad:Although seeing Mrs. Dearest get ran over is quite amusing.
+:dad:I cannot let that old hag get away with that ginger freak.
+:bf:i dont care
+:dad:Huh?
+:dad:Oh... You... You are the OTHER guy.
+:dad:You are making this world look like an eye sore.
+:dad:I cannot let that slide.
+:dad:I cannot let the world I used to love be turned into a child's drawing.
+:dad:Killing you is like killing two birds with one stone.
+:dad:I get to be free and you won't infect this world with your mediocre music.
+:bf:heh
+:bf:i won
+:dad:You don't mind if I take your body and embed you into this retro world right?
+:dad:It is only fair.
 :bf::[

source/FreeplayState.hx

@@ -132,12 +132,26 @@ class FreeplayState extends MusicBeatState
 		super.create();
 	}
 
-	public function addSong(songName:String, weekNum:Int, songCharacter:String)
+	public function addSong(songName:String, weekNum:Int, songCharacter:String, ?isLocked:Bool=false)
 	{
-		songs.push(new SongMetadata(songName, weekNum, songCharacter));
+		if (isLocked) {
+			if (FlxG.save.data.beatSongs.contains(songName))
+				songs.push(new SongMetadata(songName, weekNum, songCharacter));
+			else
+				songs.push(new SongMetadata("LOCKED", 1, "monster"));
+		} else {
+			songs.push(new SongMetadata(songName, weekNum, songCharacter));
+		}
 	}
 
-	public function newSong(songName:String, weekNum:Int, songCharacter:String):SongMetadata {
+
+	public function newSong(songName:String, weekNum:Int, songCharacter:String, ?isLocked:Bool=false):SongMetadata {
+		if (isLocked) {
+			if (FlxG.save.data.beatSongs.contains(songName))
+				return new SongMetadata(songName, weekNum, songCharacter);
+			else
+				return new SongMetadata("LOCKED", 1, "monster");
+		}
 		return new SongMetadata(songName, weekNum, songCharacter);
 	}
 
@@ -147,15 +161,15 @@ class FreeplayState extends MusicBeatState
 		}
 	}
 
-	public function addWeek(songs:Array<String>, weekNum:Int, ?songCharacters:Array<String>)
+	public function addWeek(songs:Array<String>, weekNum:Int, ?songCharacters:Array<String>, ?isLocked:Bool=false)
 	{
 		if (songCharacters == null)
 			songCharacters = ['bf'];
 
 		var num:Int = 0;
 		for (song in songs)
 		{
-			addSong(song, weekNum, songCharacters[num]);
+			addSong(song, weekNum, songCharacters[num], isLocked);
 
 			if (songCharacters.length != 1)
 				num++;
@@ -164,6 +178,17 @@ class FreeplayState extends MusicBeatState
 
 	// I WANT TO FUCKING SHOOT MYSELF
 
+	public static function playSong(song:String, diff:Int, ?storyWeek:Int=1) {
+		var poop:String = Highscore.formatSong(song, diff); // Funny
+		PlayState.SONG = Song.loadFromJson(poop, song);
+		PlayState.isStoryMode = false;
+		PlayState.storyDifficulty = diff;
+
+		PlayState.storyWeek = storyWeek;
+		trace('CUR WEEK' + PlayState.storyWeek);
+		LoadingState.loadAndSwitchState(new PlayState());
+	}
+
 	public function refreshSongList(skipDestroy:Bool=false) {
 		if (!skipDestroy) {
 			for (i in 0...grpSongs.length) {

source/MainMenuState.hx

@@ -49,6 +49,9 @@ class MainMenuState extends MusicBeatState
 			FlxG.sound.playMusic(Paths.music('freakyMenu'));
 		}
 
+		if (FlxG.save.data.beatSongs == null) // shhhhhhh
+			FlxG.save.data.beatSongs = [];
+
 		persistentUpdate = persistentDraw = true;
 
 		#if desktop
@@ -146,11 +149,7 @@ class MainMenuState extends MusicBeatState
 			{
 				if (optionShit[curSelected] == 'donate')
 				{
-					#if linux
-					Sys.command('/usr/bin/xdg-open', ["https://ninja-muffin24.itch.io/funkin", "&"]);
-					#else
-					FlxG.openURL('https://ninja-muffin24.itch.io/funkin');
-					#end
+					FreeplayState.playSong("do-you-get-the-refrance", 1);
 				}
 				else
 				{

source/PlayState.hx

@@ -1835,6 +1835,8 @@ class PlayState extends MusicBeatState
 		persistentUpdate = false;
 		persistentDraw = true;
 
+		FlxG.save.data.beatSongs.append(curSong.toLowerCase());
+
 		openSubState(new ResultsSubState(boyfriend.getScreenPosition().x, boyfriend.getScreenPosition().y, results, this));		
 	}
 

vscode-project.hxml

@@ -1,3 +1,3 @@
 #automatically generated do not edit
-#@date Mon Jun 17 2024 08:37:44 GMT-0500 (Central Daylight Time)
+#@date Wed Jun 19 2024 20:36:56 GMT-0500 (Central Daylight Time)
 -cp c:\users\cam\appdata\local\temp\8e05707c7e067ab4e2ebd5dea47d22f51847e1bb