From 157769b41a3f29f2e3eb618bc539355e7f4bd992 Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Sun, 18 Apr 2021 13:23:09 -0400
Subject: [PATCH] that pussy be yankin

---
 Project.xml             |  2 +-
 source/MainMenuState.hx |  2 ++
 source/PlayState.hx     | 24 +++++++++++++++---------
 source/TitleState.hx    |  7 +++++--
 4 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/Project.xml b/Project.xml
index 24396968b..cb9b6859b 100644
--- a/Project.xml
+++ b/Project.xml
@@ -2,7 +2,7 @@
 <project>
 	<!-- _________________________ Application Settings _________________________ -->
 
-	<app title="Friday Night Funkin'" file="Funkin" packageName="com.ninjamuffin99.funkin" package="com.ninjamuffin99.funkin" main="Main" version="0.2.7.1" company="ninjamuffin99" />
+	<app title="Friday Night Funkin'" file="Funkin" packageName="com.ninjamuffin99.funkin" package="com.ninjamuffin99.funkin" main="Main" version="0.2.8" company="ninjamuffin99" />
 
 	<!--Switch Export with Unique ApplicationID and Icon-->
 	<set name="APP_ID" value="0x0100f6c013bbc000" />
diff --git a/source/MainMenuState.hx b/source/MainMenuState.hx
index 6e8fb60ef..69972167b 100644
--- a/source/MainMenuState.hx
+++ b/source/MainMenuState.hx
@@ -128,6 +128,8 @@ class MainMenuState extends MusicBeatState
 		versionShit.setFormat("VCR OSD Mono", 16, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK);
 		add(versionShit);
 
+		versionShit.text += '(Newgrounds exclusive preview)';
+
 		// NG.core.calls.event.logEvent('swag').send();
 
 		super.create();
diff --git a/source/PlayState.hx b/source/PlayState.hx
index 05ec046ac..79eb75c2f 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -563,7 +563,7 @@ class PlayState extends MusicBeatState
 
 				tankGround = new BGSprite('tankRolling', 300, 300, 0.5, 0.5, ['BG tank w lighting'], true);
 				add(tankGround);
-				tankGround.active = false;
+				// tankGround.active = false;
 
 				tankmanRun = new FlxTypedGroup<TankmenBG>();
 				add(tankmanRun);
@@ -653,6 +653,11 @@ class PlayState extends MusicBeatState
 				{
 					if (FlxG.random.bool(16))
 					{
+						var tempTankman:TankmenBG = new TankmenBG(20, 500, true);
+						tempTankman.strumTime = 10;
+						tempTankman.resetShit(20, 600, true);
+						tankmanRun.add(tempTankman);
+
 						var tankman:TankmenBG = tankmanRun.recycle(TankmenBG);
 						// new TankmenBG(500, 200 + FlxG.random.int(50, 100), TankmenBG.animationNotes[i][1] < 2);
 						tankman.strumTime = TankmenBG.animationNotes[i][0];
@@ -934,8 +939,12 @@ class PlayState extends MusicBeatState
 			switch (curSong.toLowerCase())
 			{
 				// REMOVE THIS LATER
-				case 'stress':
-					stressIntro();
+				// case 'ugh':
+				// 	ughIntro();
+				// case 'stress':
+				// 	stressIntro();
+				// case 'guns':
+				// 	gunsIntro();
 
 				default:
 					startCountdown();
@@ -967,8 +976,7 @@ class PlayState extends MusicBeatState
 		camFollow.x += 100;
 		camFollow.y += 100;
 
-		/* 
-			FlxG.sound.playMusic(Paths.music('DISTORTO'), 0);
+		/* FlxG.sound.playMusic(Paths.music('DISTORTO'), 0);
 			FlxG.sound.music.fadeIn(5, 0, 0.5);
 
 			dad.visible = false;
@@ -1049,8 +1057,7 @@ class PlayState extends MusicBeatState
 			cameraMovement();
 		};
 
-		/* 
-			camFollow.setPosition(camPos.x, camPos.y);
+		/* camFollow.setPosition(camPos.x, camPos.y);
 
 			camHUD.visible = false;
 
@@ -1124,8 +1131,7 @@ class PlayState extends MusicBeatState
 			cameraMovement();
 		};
 
-		/* 
-			camHUD.visible = false;
+		/* camHUD.visible = false;
 
 			// for story mode shit
 			camFollow.setPosition(camPos.x, camPos.y);
diff --git a/source/TitleState.hx b/source/TitleState.hx
index 2b67aaead..2b547483b 100644
--- a/source/TitleState.hx
+++ b/source/TitleState.hx
@@ -438,12 +438,15 @@ class TitleState extends MusicBeatState
 					if (version.trim() != onlineVersion)
 					{
 						trace('OLD VERSION!');
-						FlxG.switchState(new OutdatedSubState());
+						// FlxG.switchState(new OutdatedSubState());
 					}
 					else
 					{
-						FlxG.switchState(new MainMenuState());
+						// FlxG.switchState(new MainMenuState());
 					}
+
+					// REDO FOR ITCH/FINAL SHIT
+					FlxG.switchState(new MainMenuState());
 				});
 			}
 			#else