2.10.0

Project.xml

@@ -60,6 +60,7 @@
 		<library name="week4"    preload="true" />
 		<library name="week5"    preload="true" />
 		<library name="week6"    preload="true" />
+		<library name="week7"    preload="true" />
 	</section>
 
 	<section if="NO_PRELOAD_ALL">
@@ -73,6 +74,7 @@
 		<library name="week4"    preload="false" />
 		<library name="week5"    preload="false" />
 		<library name="week6"    preload="false" />
+		<library name="week7"    preload="false" />
 	</section>
 
 	<assets path="assets/songs"    library="songs"    exclude="*.ogg" if="web"/>
@@ -93,6 +95,8 @@
 	<assets path="assets/week5"    library="week5"    exclude="*.mp3" unless="web"/>
 	<assets path="assets/week6"    library="week6"    exclude="*.ogg" if="web"/>
 	<assets path="assets/week6"    library="week6"    exclude="*.mp3" unless="web"/>
+	<assets path="assets/week7"    library="week7"    exclude="*.ogg" if="web"/>
+	<assets path="assets/week7"    library="week7"    exclude="*.mp3" unless="web"/>
 
 	<assets path='art/readme.txt' rename='do NOT readme.txt' />
 	<!-- <template path='mods' /> -->

source/Controls.hx

@@ -521,6 +521,7 @@ class Controls extends FlxActionSet
 		inline bindKeys(Control.BACK, [BACKSPACE, ESCAPE]);
 		inline bindKeys(Control.PAUSE, [P, ENTER, ESCAPE]);
 		inline bindKeys(Control.RESET, [R]);
+		inline bindKeys(Control.CHEAT, [INSERT]); // freeplay easteregg
 	}
 
 	function removeKeyboard()

source/FreeplayState.hx

@@ -203,6 +203,7 @@ class FreeplayState extends MusicBeatState
 		var upP = controls.UP_P;
 		var downP = controls.DOWN_P;
 		var accepted = controls.ACCEPT;
+		var secret = controls.CHEAT;
 
 		if (upP)
 		{
@@ -235,13 +236,20 @@ class FreeplayState extends MusicBeatState
 				var poop:String = Highscore.formatSong(songs[curSelected].songName.toLowerCase(), curDifficulty);
 
 				trace(poop);
+
+				if (secret){
+					PlayState.secretMode = true;
+
+					FlxG.sound.play(Paths.sound('GF_1', 'shared'));
+					trace('Just because you heard the sound, doesn\'t mean you\'ve found the secret!');
+				}
 
 				PlayState.SONG = Song.loadFromJson(poop, songs[curSelected].songName.toLowerCase());
 				PlayState.isStoryMode = false;
 				PlayState.storyDifficulty = curDifficulty;
 
 				PlayState.storyWeek = songs[curSelected].week;
-				trace('CUR WEEK' + PlayState.storyWeek);
+				trace('CUR WEEK' + PlayState.storyWeek + '\nSecret Mode: ' + PlayState.secretMode);
 				LoadingState.loadAndSwitchState(new PlayState());
 			}
 		}

source/MainMenuState.hx

@@ -36,7 +36,7 @@ class MainMenuState extends MusicBeatState
 	var video:MP4Handler;
 
 	//VERSION
-	public static var nightly:String = "Pre-Release 1";
+	public static var nightly:String = "";
 	public static var gameVer:String = "2.10.0";
 
 	override function create()

source/PauseSubState.hx

@@ -108,6 +108,7 @@ class PauseSubState extends MusicBeatSubstate
 				case "Restart Song":
 					FlxG.resetState();
 				case "Exit to menu":
+					PlayState.secretMode = false; // reset secret mode
 					FlxG.switchState(new MainMenuState());
 			}
 		}

source/PlayState.hx

@@ -1,5 +1,6 @@
 package;
 
+import flixel.math.FlxRandom;
 #if desktop
 import Discord.DiscordClient;
 #end
@@ -148,6 +149,8 @@ class PlayState extends MusicBeatState
 	var ogBF = SONG.player1;
 	var inPanic = false;
 
+	public static var secretMode:Bool = false;
+
 	override public function create()
 	{
 		trace('ENDCUTSCENE PLAYED? ' + playedEndCutscene);
@@ -1931,7 +1934,19 @@ class PlayState extends MusicBeatState
 						daNote.visible = false;
 
 						//Miss Animation
-						boyfriend.playAnim('singLEFTmiss', true);
+						switch (Math.abs(daNote.noteData)){
+							case 0:
+								boyfriend.playAnim('singLEFTmiss', true);
+							case 1:
+								boyfriend.playAnim('singDOWNmiss', true);
+							case 2:
+								boyfriend.playAnim('singUPmiss', true);
+							case 3:
+								boyfriend.playAnim('singRIGHTmiss', true);
+							default:
+								boyfriend.playAnim('singLEFTmiss', true); // just in case lmao
+						}
+
 
 						daNote.kill();
 						notes.remove(daNote, true);
@@ -1978,6 +1993,7 @@ class PlayState extends MusicBeatState
 
 		if (inCutscene == false){
 			canPause = false;
+			secretMode = false;
 			FlxG.sound.music.volume = 0;
 			vocals.volume = 0;
 			if (SONG.validScore)
@@ -2736,7 +2752,7 @@ class PlayState extends MusicBeatState
 					//doesnt work and i dont feel like fixing it
 					case 15:
 						dad.playAnim('ugh', true);
-						trace('test');
+						trace('Ugh! - Needs Fixing');
 					case 111:
 						dad.playAnim('ugh', true);
 					case 131:
@@ -2748,6 +2764,28 @@ class PlayState extends MusicBeatState
 				 }
 			}
 
+		if (curSong.toLowerCase() == 'guns' && secretMode){
+			// i don't really care if this is coded properly cuz its just a dumb lil easteregg
+			if (curBeat >= 224 && curBeat < 256)
+				dad.y -= 25;
+			if (curBeat >= 256 && curBeat < 288)
+				boyfriend.y -= 25;
+			if (curBeat >= 288 && curBeat < 320)
+				dad.y -= 25;
+			if (curBeat >= 320 && curBeat < 353)
+				boyfriend.y -= 25;
+			if (curBeat >= 353 && curBeat < 385){
+				boyfriend.y += 55;
+				dad.y += 55;
+			}
+
+			//Cam Y
+			if (curBeat >= 224 && curBeat < 353)
+				camFollow.y -= 25;
+			if (curBeat >= 353 && curBeat < 385)
+				camFollow.y += 55;
+		}
+
 		if (curSong.toLowerCase() == 'stress') 
 			{
 				switch (curBeat)