changelog good to go

readme stuff
icons and changelog and newgrounds
2021-02-14 20:21:34 -05:00 · 2021-02-14 20:15:22 -05:00 · 2021-02-14 19:45:18 -05:00 · 2021-02-14 19:44:41 -05:00 · 2021-02-14 19:03:02 -05:00 · 2021-02-14 03:32:29 -05:00
30 changed files with 544 additions and 306 deletions
@@ -4,6 +4,23 @@ All notable changes will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

+## [0.2.7.1] - 2021-02-14
+### Added
+- Easter eggs
+- readme's in desktop versions of the game
+### Changed
+- New icons, old one was placeholder since October woops!
+- Made the transitions between the story mode levels more seamless.
+- Offset of the Newgrounds logo on boot screen.
+- Made the changelog txt so it can be opened easier by normal people who don't have a markdown reader (most normal people);
+### Fixed
+- Fixed crashes on Week 6 story mode dialogue if spam too fast ([Thanks to Lotusotho for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/357))
+- Should show intro credits on desktop versions of the game more consistently
+- Layering on Week 4 songs with GF and the LIMO LOL HOW TF I MISS THIS
+- Chart's and chart editor now support changeBPM, GOD BLESS MTH FOR THIS ONE I BEEN STRUGGLIN WIT THAT SINCE OCTOBER LMAO ([GOD BLESS MTH](https://github.com/ninjamuffin99/Funkin/pull/382))
+- Fixed sustain note trails ALSO THANKS TO MTH U A REAL ONE ([MTH VERY POWERFUL](https://github.com/ninjamuffin99/Funkin/pull/415))
+- Antialiasing on the skyscraper lights
+
 ## [0.2.7] - 2021-02-02
 ### Added
 - PIXEL DAY UPDATE LOL 1 WEEK LATER
@@ -2,7 +2,7 @@
 <project>
 	<!-- _________________________ Application Settings _________________________ -->

-	<app title="Friday Night Funkin'" file="Funkin" packageName="com.ninjamuffin99.funkin" main="Main" version="0.2.7" company="ninjamuffin99" />
+	<app title="Friday Night Funkin'" file="Funkin" packageName="com.ninjamuffin99.funkin" main="Main" version="0.2.7.1" company="ninjamuffin99" />

 	<!--Switch Export with Unique ApplicationID and Icon-->
 	<set name="APP_ID" value="0x0100f6c013bbc000" />
@@ -43,6 +43,7 @@
 	<assets path="assets/images" />
 	<assets path="assets/data" />
 	<assets path='example_mods' rename='mods' embed='false'/>
+	<assets path='art/readme.txt' rename='do NOT readme.txt' />
 	<!-- <template path='mods' /> -->
 	
 	<!-- <library name="noPreload" preload='false'/> -->
@@ -52,7 +53,7 @@
 	<assets path="assets/sounds" include="*.mp3" if="web" />
 	<assets path="assets/sounds" include="*.ogg" unless="web" />

-	<assets path="CHANGELOG.md"/>
+	<assets path="CHANGELOG.md" rename='changelog.txt'/>

 	<!-- NOTE FOR FUTURE SELF SINCE FONTS ARE ALWAYS FUCKY 
 		TO FIX ONE OF THEM, I CONVERTED IT TO OTF. DUNNO IF YOU NEED TO
@@ -116,7 +117,10 @@
 	<!-- _________________________________ Custom _______________________________ -->

 	<!--Place custom nodes like icons here (higher priority to override the HaxeFlixel icon)-->
-	<icon path="art/icon.png" />
+	
+	<icon path="art/icon16.png" size='16'/>
+	<icon path="art/icon32.png" size='32'/>
+	<icon path="art/icon64.png" size='64'/>


 	<!-- <haxedef name="SKIP_TO_PLAYSTATE" if="debug" /> -->
@@ -0,0 +1,92 @@
+ __                 /                                  
+/ _   _ |_ |_ .  _                                     
+\__) (- |_ |_ | | )                                    
+                                                       
+ __                                                    
+|_   _  _  _  |                                        
+|   |  (- (_| |( \/                                    
+                 /                                     
+                                                       
+ _   _     _                                           
+(_) | )   (_|                                          
+                                                       
+ __                                                    
+|_   _ .  _|  _        _  .  _  |_  |_       _  _  |_  
+|   |  | (_| (_| \/   | ) | (_) | ) |_   \/ (- (_| | ) 
+                 /          _/           /             
+
+HEY
+Thanks for downloadin Friday Night FUNKIN'
+If you downloaded this from any other place than ninja-muffin24.itch.io/FUNKIN
+You might be in DANGER!!! 
+
+The Itch.io release is the only official source for the desktop (PC, Mac, Linux) versions of the game!
+As of right now, the game is FREE! If you paid for it, you got SCAMMED!
+
+Now that that's out of the way....
+THANKS FOR DOWNLOADIN. 
+
+#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-
+    PERMISSIONS XDDDD
+#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-
+
+Little info, you have FULL PERMISSION to stream, letsplay, meme, shitpost, do WHATEVER you want with the game.
+Use the music in videos you do, use art, ANYTHING. GO CRAZY BRO.
+
+If you do make any sort of video, it would be a bro move if you linked the game and spread the word
+
+Play On Newgrounds - https://www.newgrounds.com/portal/view/770371
+Support on Itch.io - https://ninja-muffin24.itch.io/funkin
+
+If not no biggie we don't fully hate you only kinda no biggie.
+
+
+#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-
+    INFO AND LINKS
+#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-
+
+If you wanna dig around, the game is fully open source on Github
+https://github.com/ninjamuffin99/Funkin
+
+It's made in Haxe / HaxeFlixel
+
+MUSIC IS ON SPOTIFY AND BANDCAMP AND EVERYWHERE ELSE PROB TOO
+https://kawaisprite.bandcamp.com/album/friday-night-funkin-ost-vol-1
+
+
+#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-
+    FINAL WORDS / CREDITS
+#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-
+
+Friday Night Funkin' is made by ninjamuffin99 (programmer), PhantomArcade (animator), kawaisprite (musician), and evilsk8r (artist)
+
+https://twitter.com/ninja_muffin99
+https://twitter.com/phantomarcade3k
+https://twitter.com/kawaisprite
+https://twitter.com/evilsk8r
+
+Pico is created by Tom Fulp
+Skid and Pump are created by SrPelo
+BassetFilms did music for lemon monster songs
+
+
+Final important thing, this is made with the support and love to and from Newgrounds.com.
+Go to newgrounds, we love newgrounds. newgrounds good. How many times do I gotta damn say it. Newgrounds newgrounds newgrounds newgrounds
+I love Tom Fulp.
+
+- Cameron ♪(´▽｀)
+
+##################################################################################
+                                                                                  
+ _   _   _____   _      _    ____   ____     ___    _   _   _   _   ____    ____  
+| \ | | | ____| | |    | |  / ___| |  _ \   / _ \  | | | | | \ | | |  _ \  / ___| 
+|  \| | |  _|   | | /\ | | | |  _  | |_) | | | | | | | | | |  \| | | | | | \___ \ 
+| |\  | | |___   \ V  V /  | |_| | |  _ <  | |_| | | |_| | | |\  | | |_| |  ___) |
+|_| \_| |_____|   \_/\_/    \____| |_| \_\  \___/   \___/  |_| \_| |____/  |____/ 
+ _       _  _     ___    ___       __              _       _  _       _        _  
+|_ |  | |_ |_) \_/ | |_|  |  |\ | /__     |_      |_ |  | |_ |_) \_/ / \ |\ | |_  
+|_  \/  |_ | \  |  | | | _|_ | \| \_| o   |_)\/   |_  \/  |_ | \  |  \_/ | \| |_ o
+                                      /      /                                    
+                                                                                  
+##################################################################################
+i stole this from stamper.
@@ -13,4 +13,5 @@ gf-christmas
 monster
 bf-pixel
 senpai
+senpai-angry
 spirit
@@ -37,4 +37,4 @@ fashionably late--but here it is
 yooooooooooo--yooooooooo
 pico funny--pico funny
 updates each friday--on time every time
-shoutouts to mason--for da homies
+shoutouts to mason--for da homies
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextureAtlas imagePath="bfLol.png">
+	<!-- Created with Adobe Animate version 20.0.0.17400 -->
+	<!-- http://www.adobe.com/products/animate.html -->
+	<SubTexture name="funnyThing instance 10000" x="0" y="0" width="280" height="184" frameX="0" frameY="-12" frameWidth="280" frameHeight="204"/>
+	<SubTexture name="funnyThing instance 10001" x="0" y="0" width="280" height="184" frameX="0" frameY="-12" frameWidth="280" frameHeight="204"/>
+	<SubTexture name="funnyThing instance 10002" x="0" y="0" width="280" height="184" frameX="0" frameY="-12" frameWidth="280" frameHeight="204"/>
+	<SubTexture name="funnyThing instance 10003" x="0" y="0" width="280" height="184" frameX="0" frameY="-12" frameWidth="280" frameHeight="204"/>
+	<SubTexture name="funnyThing instance 10004" x="0" y="0" width="280" height="184" frameX="0" frameY="-12" frameWidth="280" frameHeight="204"/>
+	<SubTexture name="funnyThing instance 10005" x="0" y="0" width="280" height="184" frameX="0" frameY="-12" frameWidth="280" frameHeight="204"/>
+	<SubTexture name="funnyThing instance 10006" x="0" y="0" width="280" height="184" frameX="0" frameY="-12" frameWidth="280" frameHeight="204"/>
+	<SubTexture name="funnyThing instance 10007" x="0" y="0" width="280" height="184" frameX="0" frameY="-12" frameWidth="280" frameHeight="204"/>
+	<SubTexture name="funnyThing instance 10008" x="0" y="0" width="280" height="184" frameX="0" frameY="-12" frameWidth="280" frameHeight="204"/>
+	<SubTexture name="funnyThing instance 10009" x="0" y="0" width="280" height="184" frameX="0" frameY="-12" frameWidth="280" frameHeight="204"/>
+	<SubTexture name="funnyThing instance 10010" x="0" y="189" width="250" height="204" frameX="-11" frameY="0" frameWidth="280" frameHeight="204"/>
+	<SubTexture name="funnyThing instance 10011" x="0" y="189" width="250" height="204" frameX="-11" frameY="0" frameWidth="280" frameHeight="204"/>
+	<SubTexture name="funnyThing instance 10012" x="0" y="189" width="250" height="204" frameX="-11" frameY="0" frameWidth="280" frameHeight="204"/>
+	<SubTexture name="funnyThing instance 10013" x="0" y="189" width="250" height="204" frameX="-11" frameY="0" frameWidth="280" frameHeight="204"/>
+	<SubTexture name="funnyThing instance 10014" x="0" y="189" width="250" height="204" frameX="-11" frameY="0" frameWidth="280" frameHeight="204"/>
+	<SubTexture name="funnyThing instance 10015" x="0" y="189" width="250" height="204" frameX="-11" frameY="0" frameWidth="280" frameHeight="204"/>
+	<SubTexture name="funnyThing instance 10016" x="0" y="189" width="250" height="204" frameX="-11" frameY="0" frameWidth="280" frameHeight="204"/>
+	<SubTexture name="funnyThing instance 10017" x="0" y="189" width="250" height="204" frameX="-11" frameY="0" frameWidth="280" frameHeight="204"/>
+	<SubTexture name="funnyThing instance 10018" x="0" y="189" width="250" height="204" frameX="-11" frameY="0" frameWidth="280" frameHeight="204"/>
+	<SubTexture name="funnyThing instance 10019" x="0" y="189" width="250" height="204" frameX="-11" frameY="0" frameWidth="280" frameHeight="204"/>
+</TextureAtlas>
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextureAtlas imagePath="pauseUI.png">
+	<!-- Created with Adobe Animate version 20.0.0.17400 -->
+	<!-- http://www.adobe.com/products/animate.html -->
+	<SubTexture name="bluecancel instance 10000" x="0" y="0" width="977" height="200"/>
+	<SubTexture name="bluereplay instance 10000" x="261" y="409" width="256" height="200"/>
+	<SubTexture name="cancelyellow instance 10000" x="0" y="205" width="977" height="199"/>
+	<SubTexture name="yellowreplay instance 10000" x="0" y="409" width="256" height="200"/>
+</TextureAtlas>
@@ -2,6 +2,7 @@ package;

 import Section.SwagSection;
 import Song.SwagSong;
+import Conductor.BPMChangeEvent;
 import flixel.FlxG;
 import flixel.FlxSprite;
 import flixel.addons.display.FlxGridOverlay;
@@ -117,11 +118,9 @@ class ChartingState extends MusicBeatState
 				song: 'Test',
 				notes: [],
 				bpm: 150,
-				sections: 0,
 				needsVoices: true,
 				player1: 'bf',
 				player2: 'dad',
-				sectionLengths: [],
 				speed: 1,
 				validScore: false
 			};
@@ -140,6 +139,7 @@ class ChartingState extends MusicBeatState

 		loadSong(_song.song);
 		Conductor.changeBPM(_song.bpm);
+		Conductor.mapBPMChanges(_song);

 		bpmTxt = new FlxText(1000, 50, 0, "", 16);
 		bpmTxt.scrollFactor.set();
@@ -366,6 +366,7 @@ class ChartingState extends MusicBeatState
 			vocals.time = 0;
 			FlxG.sound.music.pause();
 			FlxG.sound.music.time = 0;
+			changeSection();
 		};
 	}

@@ -425,6 +426,7 @@ class ChartingState extends MusicBeatState
 			else if (wname == 'song_bpm')
 			{
 				tempBpm = Std.int(nums.value);
+				Conductor.mapBPMChanges(_song);
 				Conductor.changeBPM(Std.int(nums.value));
 			}
 			else if (wname == 'note_susLength')
@@ -444,12 +446,27 @@ class ChartingState extends MusicBeatState

 	var updatedSection:Bool = false;

+	/* this function got owned LOL
 	function lengthBpmBullshit():Float
 	{
 		if (_song.notes[curSection].changeBPM)
 			return _song.notes[curSection].lengthInSteps * (_song.notes[curSection].bpm / _song.bpm);
 		else
 			return _song.notes[curSection].lengthInSteps;
+	}*/
+
+	function sectionStartTime():Float
+	{
+		var daBPM:Int = _song.bpm;
+		var daPos:Float = 0;
+		for (i in 0...curSection)
+		{
+			if (_song.notes[i].changeBPM) {
+				daBPM = _song.notes[i].bpm;
+			}
+			daPos += 4 * (1000 * 60 / daBPM);
+		}
+		return daPos;
 	}

 	override function update(elapsed:Float)
@@ -459,23 +476,20 @@ class ChartingState extends MusicBeatState
 		Conductor.songPosition = FlxG.sound.music.time;
 		_song.song = typingShit.text;

-		strumLine.y = getYfromStrum(Conductor.songPosition % (Conductor.stepCrochet * lengthBpmBullshit()));
+		strumLine.y = getYfromStrum((Conductor.songPosition - sectionStartTime()) % (Conductor.stepCrochet * _song.notes[curSection].lengthInSteps));

-		if (curBeat % 4 == 0)
+		if (curBeat % 4 == 0 && curStep >= 16 * (curSection + 1))
 		{
-			if (curStep > 16 * (curSection + 1))
+			trace(curStep);
+			trace((_song.notes[curSection].lengthInSteps) * (curSection + 1));
+			trace('DUMBSHIT');
+
+			if (_song.notes[curSection + 1] == null)
 			{
-				trace(curStep);
-				trace((_song.notes[curSection].lengthInSteps) * (curSection + 1));
-				trace('DUMBSHIT');
-
-				if (_song.notes[curSection + 1] == null)
-				{
-					addSection();
-				}
-
-				changeSection(curSection + 1, false);
+				addSection();
 			}
+
+			changeSection(curSection + 1, false);
 		}

 		FlxG.watch.addQuick('daBeat', curBeat);
@@ -674,21 +688,18 @@ class ChartingState extends MusicBeatState

 	function recalculateSteps():Int
 	{
-		var steps:Int = 0;
-		var timeShit:Float = 0;
-
-		for (i in 0...curSection)
+		var lastChange:BPMChangeEvent = {
+			stepTime: 0,
+			songTime: 0,
+			bpm: 0
+		}
+		for (i in 0...Conductor.bpmChangeMap.length)
 		{
-			steps += 16;
-
-			if (_song.notes[i].changeBPM)
-				timeShit += (((60 / _song.notes[i].bpm) * 1000) / 4) * 16;
-			else
-				timeShit += (((60 / _song.bpm) * 1000) / 4) * 16;
+			if (FlxG.sound.music.time > Conductor.bpmChangeMap[i].songTime)
+				lastChange = Conductor.bpmChangeMap[i];
 		}

-		steps += Math.floor((FlxG.sound.music.time - timeShit) / Conductor.stepCrochet);
-		curStep = steps;
+		curStep = lastChange.stepTime + Math.floor((FlxG.sound.music.time - lastChange.songTime) / Conductor.stepCrochet);
 		updateBeat();

 		return curStep;
@@ -702,7 +713,7 @@ class ChartingState extends MusicBeatState
 		vocals.pause();

 		// Basically old shit from changeSection???
-		FlxG.sound.music.time = lengthBpmBullshit() * Conductor.stepCrochet * curSection;
+		FlxG.sound.music.time = sectionStartTime();

 		if (songBeginning)
 		{
@@ -732,15 +743,15 @@ class ChartingState extends MusicBeatState
 				FlxG.sound.music.pause();
 				vocals.pause();

-				var daNum:Int = 0;
+				/*var daNum:Int = 0;
 				var daLength:Float = 0;
 				while (daNum <= sec)
 				{
 					daLength += lengthBpmBullshit();
 					daNum++;
-				}
+				}*/

-				FlxG.sound.music.time = (daLength - lengthBpmBullshit()) * Conductor.stepCrochet;
+				FlxG.sound.music.time = sectionStartTime();
 				vocals.time = FlxG.sound.music.time;
 				updateCurStep();
 			}
@@ -815,10 +826,16 @@ class ChartingState extends MusicBeatState
 		if (_song.notes[curSection].changeBPM && _song.notes[curSection].bpm > 0)
 		{
 			Conductor.changeBPM(_song.notes[curSection].bpm);
+			FlxG.log.add('CHANGED BPM!');
 		}
 		else
 		{
-			Conductor.changeBPM(tempBpm);
+			//get last bpm
+			var daBPM:Int = _song.bpm;
+			for (i in 0...curSection)
+				if (_song.notes[i].changeBPM)
+					daBPM = _song.notes[i].bpm;
+			Conductor.changeBPM(daBPM);
 		}

 		/* // PORT BULLSHIT, INCASE THERE'S NO SUSTAIN DATA FOR A NOTE
@@ -846,7 +863,7 @@ class ChartingState extends MusicBeatState
 			note.setGraphicSize(GRID_SIZE, GRID_SIZE);
 			note.updateHitbox();
 			note.x = Math.floor(daNoteInfo * GRID_SIZE);
-			note.y = Math.floor(getYfromStrum(daStrumTime)) % gridBG.height;
+			note.y = Math.floor(getYfromStrum((daStrumTime - sectionStartTime()) % (Conductor.stepCrochet * _song.notes[curSection].lengthInSteps)));

 			curRenderedNotes.add(note);

@@ -925,7 +942,7 @@ class ChartingState extends MusicBeatState

 	private function addNote():Void
 	{
-		var noteStrum = getStrumTime(dummyArrow.y) + (curSection * (Conductor.stepCrochet * 16));
+		var noteStrum = getStrumTime(dummyArrow.y) + sectionStartTime();
 		var noteData = Math.floor(FlxG.mouse.x / GRID_SIZE);
 		var noteSus = 0;

@@ -938,7 +955,7 @@ class ChartingState extends MusicBeatState
 			_song.notes[curSection].sectionNotes.push([noteStrum, (noteData + 4) % 8, noteSus]);
 		}

-		trace(getStrumTime(dummyArrow.y) + (curSection * (Conductor.stepCrochet * lengthBpmBullshit())));
+		trace(noteStrum);
 		trace(curSection);

 		updateGrid();
@@ -957,6 +974,7 @@ class ChartingState extends MusicBeatState
 		return FlxMath.remapToRange(strumTime, 0, 16 * Conductor.stepCrochet, gridBG.y, gridBG.y + gridBG.height);
 	}

+	/*
 	function calculateSectionLengths(?sec:SwagSection):Int
 	{
 		var daLength:Int = 0;
@@ -978,7 +996,7 @@ class ChartingState extends MusicBeatState
 		}

 		return daLength;
-	}
+	}*/

 	private var daSpacing:Float = 0.3;

@@ -1014,10 +1032,7 @@ class ChartingState extends MusicBeatState
 	function autosaveSong():Void
 	{
 		FlxG.save.data.autosave = Json.stringify({
-			"song": _song,
-			"bpm": Conductor.bpm,
-			"sections": _song.notes.length,
-			'notes': _song.notes
+			"song": _song
 		});
 		FlxG.save.flush();
 	}
@@ -1025,10 +1040,7 @@ class ChartingState extends MusicBeatState
 	private function saveLevel()
 	{
 		var json = {
-			"song": _song,
-			"bpm": Conductor.bpm,
-			"sections": _song.notes.length,
-			'notes': _song.notes
+			"song": _song
 		};

 		var data:String = Json.stringify(json);
@@ -1,9 +1,19 @@
 package;

+import Song.SwagSong;
+
 /**
 * ...
 * @author
 */
+
+typedef BPMChangeEvent =
+{
+	var stepTime:Int;
+	var songTime:Float;
+	var bpm:Int;
+}
+
 class Conductor
 {
 	public static var bpm:Int = 100;
@@ -16,10 +26,39 @@ class Conductor
 	public static var safeFrames:Int = 10;
 	public static var safeZoneOffset:Float = (safeFrames / 60) * 1000; // is calculated in create(), is safeFrames in milliseconds

+	public static var bpmChangeMap:Array<BPMChangeEvent> = [];
+
 	public function new()
 	{
 	}

+	public static function mapBPMChanges(song:SwagSong)
+	{
+		bpmChangeMap = [];
+
+		var curBPM:Int = song.bpm;
+		var totalSteps:Int = 0;
+		var totalPos:Float = 0;
+		for (i in 0...song.notes.length)
+		{
+			if(song.notes[i].changeBPM && song.notes[i].bpm != curBPM)
+			{
+				curBPM = song.notes[i].bpm;
+				var event:BPMChangeEvent = {
+					stepTime: totalSteps,
+					songTime: totalPos,
+					bpm: curBPM
+				};
+				bpmChangeMap.push(event);
+			}
+
+			var deltaSteps:Int = song.notes[i].lengthInSteps;
+			totalSteps += deltaSteps;
+			totalPos += ((60 / curBPM) * 1000 / 4) * deltaSteps;
+		}
+		trace("new BPM map BUDDY " + bpmChangeMap);
+	}
+
 	public static function changeBPM(newBpm:Int)
 	{
 		bpm = newBpm;
@@ -171,13 +171,13 @@ class DialogueBox extends FlxSpriteGroup
 			dialogueStarted = true;
 		}

-		if (FlxG.keys.justPressed.ANY)
+		if (FlxG.keys.justPressed.ANY  && dialogueStarted == true)
 		{
 			remove(dialogue);
-
+				
 			FlxG.sound.play('assets/sounds/clickText' + TitleState.soundExt, 0.8);

-			if (dialogueList[1] == null)
+			if (dialogueList[1] == null && dialogueList[0] != null)
 			{
 				if (!isEnding)
 				{
@@ -209,7 +209,7 @@ class DialogueBox extends FlxSpriteGroup
 				startDialogue();
 			}
 		}
-
+		
 		super.update(elapsed);
 	}

@@ -218,7 +218,6 @@ class DialogueBox extends FlxSpriteGroup
 	function startDialogue():Void
 	{
 		cleanDialog();
-
 		// var theDialog:Alphabet = new Alphabet(0, 70, dialogueList[0], false, true);
 		// dialogue = theDialog;
 		// add(theDialog);
@@ -0,0 +1,88 @@
+package;
+
+import flixel.FlxG;
+import flixel.FlxSprite;
+import flixel.graphics.frames.FlxAtlasFrames;
+
+class GitarooPause extends MusicBeatState
+{
+	var replayButton:FlxSprite;
+	var cancelButton:FlxSprite;
+
+	var replaySelect:Bool = false;
+
+	public function new():Void
+	{
+		super();
+	}
+
+	override function create()
+	{
+		if (FlxG.sound.music != null)
+			FlxG.sound.music.stop();
+
+		var bg:FlxSprite = new FlxSprite().loadGraphic('assets/images/pauseAlt/pauseBG.png');
+		add(bg);
+
+		var bf:FlxSprite = new FlxSprite(0, 30);
+		bf.frames = FlxAtlasFrames.fromSparrow('assets/images/pauseAlt/bfLol.png', 'assets/images/pauseAlt/bfLol.xml');
+		bf.animation.addByPrefix('lol', "funnyThing", 13);
+		bf.animation.play('lol');
+		add(bf);
+		bf.screenCenter(X);
+
+		replayButton = new FlxSprite(FlxG.width * 0.28, FlxG.height * 0.7);
+		replayButton.frames = FlxAtlasFrames.fromSparrow('assets/images/pauseAlt/pauseUI.png', 'assets/images/pauseAlt/pauseUI.xml');
+		replayButton.animation.addByPrefix('selected', 'bluereplay', 0, false);
+		replayButton.animation.appendByPrefix('selected', 'yellowreplay');
+		replayButton.animation.play('selected');
+		add(replayButton);
+
+		cancelButton = new FlxSprite(FlxG.width * 0.58, replayButton.y);
+		cancelButton.frames = FlxAtlasFrames.fromSparrow('assets/images/pauseAlt/pauseUI.png', 'assets/images/pauseAlt/pauseUI.xml');
+		cancelButton.animation.addByPrefix('selected', 'bluecancel', 0, false);
+		cancelButton.animation.appendByPrefix('selected', 'cancelyellow');
+		cancelButton.animation.play('selected');
+		add(cancelButton);
+
+		changeThing();
+
+		super.create();
+	}
+
+	override function update(elapsed:Float)
+	{
+		if (controls.LEFT_P || controls.RIGHT_P)
+			changeThing();
+
+		if (controls.ACCEPT)
+		{
+			if (replaySelect)
+			{
+				FlxG.switchState(new PlayState());
+			}
+			else
+			{
+				FlxG.switchState(new MainMenuState());
+			}
+		}
+
+		super.update(elapsed);
+	}
+
+	function changeThing():Void
+	{
+		replaySelect = !replaySelect;
+
+		if (replaySelect)
+		{
+			cancelButton.animation.curAnim.curFrame = 0;
+			replayButton.animation.curAnim.curFrame = 1;
+		}
+		else
+		{
+			cancelButton.animation.curAnim.curFrame = 1;
+			replayButton.animation.curAnim.curFrame = 0;
+		}
+	}
+}
@@ -3,6 +3,7 @@ package;
 import flixel.FlxG;
 import flixel.FlxObject;
 import flixel.FlxSprite;
+import flixel.addons.transition.FlxTransitionableState;
 import flixel.effects.FlxFlicker;
 import flixel.graphics.frames.FlxAtlasFrames;
 import flixel.group.FlxGroup.FlxTypedGroup;
@@ -32,6 +33,9 @@ class MainMenuState extends MusicBeatState

 	override function create()
 	{
+		transIn = FlxTransitionableState.defaultTransIn;
+		transOut = FlxTransitionableState.defaultTransOut;
+
 		if (!FlxG.sound.music.playing)
 		{
 			FlxG.sound.playMusic('assets/music/freakyMenu' + TitleState.soundExt);
@@ -1,5 +1,6 @@
 package;

+import Conductor.BPMChangeEvent;
 import flixel.FlxG;
 import flixel.addons.transition.FlxTransitionableState;
 import flixel.addons.ui.FlxUIState;
@@ -11,9 +12,6 @@ class MusicBeatState extends FlxUIState
 	private var lastBeat:Float = 0;
 	private var lastStep:Float = 0;

-	private var totalBeats:Int = 0;
-	private var totalSteps:Int = 0;
-
 	private var curStep:Int = 0;
 	private var curBeat:Int = 0;
 	private var controls(get, never):Controls;
@@ -35,59 +33,47 @@ class MusicBeatState extends FlxUIState

 	override function update(elapsed:Float)
 	{
-		everyStep();
+		//everyStep();
+		var oldStep:Int = curStep;

 		updateCurStep();
-		// Needs to be ROUNED, rather than ceil or floor
 		updateBeat();

+		if (oldStep != curStep && curStep > 0)
+			stepHit();
+
 		super.update(elapsed);
 	}

 	private function updateBeat():Void
 	{
-		curBeat = Math.round(curStep / 4);
-	}
-
-	/**
-	 * CHECKS EVERY FRAME
-	 */
-	private function everyStep():Void
-	{
-		if (Conductor.songPosition > lastStep + Conductor.stepCrochet - Conductor.safeZoneOffset
-			|| Conductor.songPosition < lastStep + Conductor.safeZoneOffset)
-		{
-			if (Conductor.songPosition > lastStep + Conductor.stepCrochet)
-			{
-				stepHit();
-			}
-		}
+		curBeat = Math.floor(curStep / 4);
 	}

 	private function updateCurStep():Void
 	{
-		curStep = Math.floor(Conductor.songPosition / Conductor.stepCrochet);
+		var lastChange:BPMChangeEvent = {
+			stepTime: 0,
+			songTime: 0,
+			bpm: 0
+		}
+		for (i in 0...Conductor.bpmChangeMap.length)
+		{
+			if (Conductor.songPosition >= Conductor.bpmChangeMap[i].songTime)
+				lastChange = Conductor.bpmChangeMap[i];
+		}
+
+		curStep = lastChange.stepTime + Math.floor((Conductor.songPosition - lastChange.songTime) / Conductor.stepCrochet);
 	}

 	public function stepHit():Void
 	{
-		totalSteps += 1;
-		lastStep += Conductor.stepCrochet;
-
-		// If the song is at least 3 steps behind
-		if (Conductor.songPosition > lastStep + (Conductor.stepCrochet * 3))
-		{
-			lastStep = Conductor.songPosition;
-			totalSteps = Math.ceil(lastStep / Conductor.stepCrochet);
-		}
-
-		if (totalSteps % 4 == 0)
+		if (curStep % 4 == 0)
 			beatHit();
 	}

 	public function beatHit():Void
 	{
-		lastBeat += Conductor.crochet;
-		totalBeats += 1;
+		//do literally nothing dumbass
 	}
 }
@@ -1,5 +1,6 @@
 package;

+import Conductor.BPMChangeEvent;
 import flixel.FlxG;
 import flixel.FlxSubState;

@@ -13,9 +14,6 @@ class MusicBeatSubstate extends FlxSubState
 	private var lastBeat:Float = 0;
 	private var lastStep:Float = 0;

-	private var totalBeats:Int = 0;
-	private var totalSteps:Int = 0;
-
 	private var curStep:Int = 0;
 	private var curBeat:Int = 0;
 	private var controls(get, never):Controls;
@@ -34,46 +32,43 @@ class MusicBeatSubstate extends FlxSubState

 	override function update(elapsed:Float)
 	{
-		everyStep();
+		//everyStep();
+		var oldStep:Int = curStep;

 		updateCurStep();
-		curBeat = Math.round(curStep / 4);
+		curBeat = Math.floor(curStep / 4);
+
+		if (oldStep != curStep && curStep > 0)
+			stepHit();
+

 		super.update(elapsed);
 	}

-	/**
-	 * CHECKS EVERY FRAME
-	 */
-	private function everyStep():Void
-	{
-		if (Conductor.songPosition > lastStep + Conductor.stepCrochet - Conductor.safeZoneOffset
-			|| Conductor.songPosition < lastStep + Conductor.safeZoneOffset)
-		{
-			if (Conductor.songPosition > lastStep + Conductor.stepCrochet)
-			{
-				stepHit();
-			}
-		}
-	}
-
 	private function updateCurStep():Void
 	{
-		curStep = Math.floor(Conductor.songPosition / Conductor.stepCrochet);
+		var lastChange:BPMChangeEvent = {
+			stepTime: 0,
+			songTime: 0,
+			bpm: 0
+		}
+		for (i in 0...Conductor.bpmChangeMap.length)
+		{
+			if (Conductor.songPosition > Conductor.bpmChangeMap[i].songTime)
+				lastChange = Conductor.bpmChangeMap[i];
+		}
+
+		curStep = lastChange.stepTime + Math.floor((Conductor.songPosition - lastChange.songTime) / Conductor.stepCrochet);
 	}

 	public function stepHit():Void
 	{
-		totalSteps += 1;
-		lastStep += Conductor.stepCrochet;
-
-		if (totalSteps % 4 == 0)
+		if (curStep % 4 == 0)
 			beatHit();
 	}

 	public function beatHit():Void
 	{
-		lastBeat += Conductor.crochet;
-		totalBeats += 1;
+		//do literally nothing dumbass
 	}
 }
@@ -14,6 +14,8 @@ import io.newgrounds.objects.events.Result.GetVersionResult;
 import lime.app.Application;
 import openfl.display.Stage;

+using StringTools;
+
 /**
 * MADE BY GEOKURELI THE LEGENED GOD HERO MVP
 */
@@ -28,6 +30,7 @@ class NGio
 	public static var ngScoresLoaded(default, null):FlxSignal = new FlxSignal();

 	public static var GAME_VER:String = "";
+	public static var GAME_VER_NUMS:String = '';
 	public static var gotOnlineVer:Bool = false;

 	public static function noLogin(api:String)
@@ -43,7 +46,8 @@ class NGio
 			{
 				var call = NG.core.calls.app.getCurrentVersion(GAME_VER).addDataHandler(function(response:Response<GetCurrentVersionResult>)
 				{
-					GAME_VER = response.result.data.current_version;
+					GAME_VER = response.result.data.currentVersion;
+					GAME_VER_NUMS = GAME_VER.split(" ")[0].trim();
 					trace('CURRENT NG VERSION: ' + GAME_VER);
 					gotOnlineVer = true;
 				});
@@ -51,33 +51,7 @@ class Note extends FlxSprite

 		switch (daStage)
 		{
-			case 'school':
-				loadGraphic('assets/images/weeb/pixelUI/arrows-pixels.png', true, 17, 17);
-
-				animation.add('greenScroll', [6]);
-				animation.add('redScroll', [7]);
-				animation.add('blueScroll', [5]);
-				animation.add('purpleScroll', [4]);
-
-				if (isSustainNote)
-				{
-					loadGraphic('assets/images/weeb/pixelUI/arrowEnds.png', true, 7, 6);
-
-					animation.add('purpleholdend', [4]);
-					animation.add('greenholdend', [6]);
-					animation.add('redholdend', [7]);
-					animation.add('blueholdend', [5]);
-
-					animation.add('purplehold', [0]);
-					animation.add('greenhold', [2]);
-					animation.add('redhold', [3]);
-					animation.add('bluehold', [1]);
-				}
-
-				setGraphicSize(Std.int(width * PlayState.daPixelZoom));
-				updateHitbox();
-
-			case 'schoolEvil': // COPY PASTED CUZ I AM LAZY
+			case 'school' | 'schoolEvil':
 				loadGraphic('assets/images/weeb/pixelUI/arrows-pixels.png', true, 17, 17);

 				animation.add('greenScroll', [6]);
@@ -174,18 +148,18 @@ class Note extends FlxSprite
 			{
 				switch (prevNote.noteData)
 				{
+					case 0:
+						prevNote.animation.play('purplehold');
+					case 1:
+						prevNote.animation.play('bluehold');
 					case 2:
 						prevNote.animation.play('greenhold');
 					case 3:
 						prevNote.animation.play('redhold');
-					case 1:
-						prevNote.animation.play('bluehold');
-					case 0:
-						prevNote.animation.play('purplehold');
 				}

-				prevNote.offset.y = -19;
-				prevNote.scale.y *= (2.25 * FlxMath.roundDecimal(PlayState.SONG.speed, 1));
+				prevNote.scale.y *= Conductor.stepCrochet / 100 * 1.5 * PlayState.SONG.speed;
+				prevNote.updateHitbox();
 				// prevNote.setGraphicSize();
 			}
 		}
@@ -4,6 +4,7 @@ import Controls.Control;
 import flixel.FlxG;
 import flixel.FlxSprite;
 import flixel.FlxSubState;
+import flixel.addons.transition.FlxTransitionableState;
 import flixel.group.FlxGroup.FlxTypedGroup;
 import flixel.input.keyboard.FlxKey;
 import flixel.system.FlxSound;
@@ -140,6 +140,7 @@ class PlayState extends MusicBeatState
 		if (SONG == null)
 			SONG = Song.loadFromJson('tutorial');

+		Conductor.mapBPMChanges(SONG);
 		Conductor.changeBPM(SONG.bpm);

 		switch (SONG.song.toLowerCase())
@@ -210,6 +211,7 @@ class PlayState extends MusicBeatState
 				light.visible = false;
 				light.setGraphicSize(Std.int(light.width * 0.85));
 				light.updateHitbox();
+				light.antialiasing = true;
 				phillyCityLights.add(light);
 			}

@@ -484,8 +486,6 @@ class PlayState extends MusicBeatState
 			defaultCamZoom = 0.9;
 			curStage = 'stage';
 			var bg:FlxSprite = new FlxSprite(-600, -200).loadGraphic('assets/images/stageback.png');
-			// bg.setGraphicSize(Std.int(bg.width * 2.5));
-			// bg.updateHitbox();
 			bg.antialiasing = true;
 			bg.scrollFactor.set(0.9, 0.9);
 			bg.active = false;
@@ -515,9 +515,7 @@ class PlayState extends MusicBeatState
 		{
 			case 'limo':
 				gfVersion = 'gf-car';
-			case 'mall':
-				gfVersion = 'gf-christmas';
-			case 'mallEvil':
+			case 'mall' | 'mallEvil':
 				gfVersion = 'gf-christmas';
 			case 'school':
 				gfVersion = 'gf-pixel';
@@ -531,10 +529,6 @@ class PlayState extends MusicBeatState
 		gf = new Character(400, 130, gfVersion);
 		gf.scrollFactor.set(0.95, 0.95);

-		// Shitty layering but whatev it works LOL
-		if (curStage == 'limo')
-			add(limo);
-
 		dad = new Character(100, 100, SONG.player2);

 		var camPos:FlxPoint = new FlxPoint(dad.getGraphicMidpoint().x, dad.getGraphicMidpoint().y);
@@ -616,6 +610,11 @@ class PlayState extends MusicBeatState
 		}

 		add(gf);
+
+		// Shitty layering but whatev it works LOL
+		if (curStage == 'limo')
+			add(limo);
+
 		add(dad);
 		add(boyfriend);

@@ -771,6 +770,7 @@ class PlayState extends MusicBeatState
 		senpaiEvil.frames = FlxAtlasFrames.fromSparrow('assets/images/weeb/senpaiCrazy.png', 'assets/images/weeb/senpaiCrazy.xml');
 		senpaiEvil.animation.addByPrefix('idle', 'Senpai Pre Explosion', 24, false);
 		senpaiEvil.setGraphicSize(Std.int(senpaiEvil.width * 6));
+		senpaiEvil.scrollFactor.set();
 		senpaiEvil.updateHitbox();
 		senpaiEvil.screenCenter();

@@ -1084,7 +1084,7 @@ class PlayState extends MusicBeatState

 			switch (curStage)
 			{
-				case 'school':
+				case 'school' | 'schoolEvil':
 					babyArrow.loadGraphic('assets/images/weeb/pixelUI/arrows-pixels.png', true, 17, 17);
 					babyArrow.animation.add('green', [6]);
 					babyArrow.animation.add('red', [7]);
@@ -1097,6 +1097,16 @@ class PlayState extends MusicBeatState

 					switch (Math.abs(i))
 					{
+						case 0:
+							babyArrow.x += Note.swagWidth * 0;
+							babyArrow.animation.add('static', [0]);
+							babyArrow.animation.add('pressed', [4, 8], 12, false);
+							babyArrow.animation.add('confirm', [12, 16], 24, false);
+						case 1:
+							babyArrow.x += Note.swagWidth * 1;
+							babyArrow.animation.add('static', [1]);
+							babyArrow.animation.add('pressed', [5, 9], 12, false);
+							babyArrow.animation.add('confirm', [13, 17], 24, false);
 						case 2:
 							babyArrow.x += Note.swagWidth * 2;
 							babyArrow.animation.add('static', [2]);
@@ -1107,53 +1117,6 @@ class PlayState extends MusicBeatState
 							babyArrow.animation.add('static', [3]);
 							babyArrow.animation.add('pressed', [7, 11], 12, false);
 							babyArrow.animation.add('confirm', [15, 19], 24, false);
-						case 1:
-							babyArrow.x += Note.swagWidth * 1;
-							babyArrow.animation.add('static', [1]);
-							babyArrow.animation.add('pressed', [5, 9], 12, false);
-							babyArrow.animation.add('confirm', [13, 17], 24, false);
-						case 0:
-							babyArrow.x += Note.swagWidth * 0;
-							babyArrow.animation.add('static', [0]);
-							babyArrow.animation.add('pressed', [4, 8], 12, false);
-							babyArrow.animation.add('confirm', [12, 16], 24, false);
-					}
-
-				case 'schoolEvil':
-					// ALL THIS IS COPY PASTED CUZ IM LAZY
-
-					babyArrow.loadGraphic('assets/images/weeb/pixelUI/arrows-pixels.png', true, 17, 17);
-					babyArrow.animation.add('green', [6]);
-					babyArrow.animation.add('red', [7]);
-					babyArrow.animation.add('blue', [5]);
-					babyArrow.animation.add('purplel', [4]);
-
-					babyArrow.setGraphicSize(Std.int(babyArrow.width * daPixelZoom));
-					babyArrow.updateHitbox();
-					babyArrow.antialiasing = false;
-
-					switch (Math.abs(i))
-					{
-						case 2:
-							babyArrow.x += Note.swagWidth * 2;
-							babyArrow.animation.add('static', [2]);
-							babyArrow.animation.add('pressed', [6, 10], 12, false);
-							babyArrow.animation.add('confirm', [14, 18], 12, false);
-						case 3:
-							babyArrow.x += Note.swagWidth * 3;
-							babyArrow.animation.add('static', [3]);
-							babyArrow.animation.add('pressed', [7, 11], 12, false);
-							babyArrow.animation.add('confirm', [15, 19], 24, false);
-						case 1:
-							babyArrow.x += Note.swagWidth * 1;
-							babyArrow.animation.add('static', [1]);
-							babyArrow.animation.add('pressed', [5, 9], 12, false);
-							babyArrow.animation.add('confirm', [13, 17], 24, false);
-						case 0:
-							babyArrow.x += Note.swagWidth * 0;
-							babyArrow.animation.add('static', [0]);
-							babyArrow.animation.add('pressed', [4, 8], 12, false);
-							babyArrow.animation.add('confirm', [12, 16], 24, false);
 					}

 				default:
@@ -1168,6 +1131,16 @@ class PlayState extends MusicBeatState

 					switch (Math.abs(i))
 					{
+						case 0:
+							babyArrow.x += Note.swagWidth * 0;
+							babyArrow.animation.addByPrefix('static', 'arrowLEFT');
+							babyArrow.animation.addByPrefix('pressed', 'left press', 24, false);
+							babyArrow.animation.addByPrefix('confirm', 'left confirm', 24, false);
+						case 1:
+							babyArrow.x += Note.swagWidth * 1;
+							babyArrow.animation.addByPrefix('static', 'arrowDOWN');
+							babyArrow.animation.addByPrefix('pressed', 'down press', 24, false);
+							babyArrow.animation.addByPrefix('confirm', 'down confirm', 24, false);
 						case 2:
 							babyArrow.x += Note.swagWidth * 2;
 							babyArrow.animation.addByPrefix('static', 'arrowUP');
@@ -1178,25 +1151,18 @@ class PlayState extends MusicBeatState
 							babyArrow.animation.addByPrefix('static', 'arrowRIGHT');
 							babyArrow.animation.addByPrefix('pressed', 'right press', 24, false);
 							babyArrow.animation.addByPrefix('confirm', 'right confirm', 24, false);
-						case 1:
-							babyArrow.x += Note.swagWidth * 1;
-							babyArrow.animation.addByPrefix('static', 'arrowDOWN');
-							babyArrow.animation.addByPrefix('pressed', 'down press', 24, false);
-							babyArrow.animation.addByPrefix('confirm', 'down confirm', 24, false);
-						case 0:
-							babyArrow.x += Note.swagWidth * 0;
-							babyArrow.animation.addByPrefix('static', 'arrowLEFT');
-							babyArrow.animation.addByPrefix('pressed', 'left press', 24, false);
-							babyArrow.animation.addByPrefix('confirm', 'left confirm', 24, false);
 					}
 			}

 			babyArrow.updateHitbox();
 			babyArrow.scrollFactor.set();

-			babyArrow.y -= 10;
-			babyArrow.alpha = 0;
-			FlxTween.tween(babyArrow, {y: babyArrow.y + 10, alpha: 1}, 1, {ease: FlxEase.circOut, startDelay: 0.5 + (0.2 * i)});
+			if (!isStoryMode)
+			{
+				babyArrow.y -= 10;
+				babyArrow.alpha = 0;
+				FlxTween.tween(babyArrow, {y: babyArrow.y + 10, alpha: 1}, 1, {ease: FlxEase.circOut, startDelay: 0.5 + (0.2 * i)});
+			}

 			babyArrow.ID = i;

@@ -1445,11 +1411,12 @@ class PlayState extends MusicBeatState
 			camHUD.zoom = FlxMath.lerp(1, camHUD.zoom, 0.95);
 		}

-		FlxG.watch.addQuick("beatShit", totalBeats);
+		FlxG.watch.addQuick("beatShit", curBeat);
+		FlxG.watch.addQuick("stepShit", curStep);

 		if (curSong == 'Fresh')
 		{
-			switch (totalBeats)
+			switch (curBeat)
 			{
 				case 16:
 					camZooming = true;
@@ -1468,7 +1435,7 @@ class PlayState extends MusicBeatState

 		if (curSong == 'Bopeebo')
 		{
-			switch (totalBeats)
+			switch (curBeat)
 			{
 				case 128, 129, 130:
 					vocals.volume = 0;
@@ -1503,7 +1470,14 @@ class PlayState extends MusicBeatState
 			vocals.stop();
 			FlxG.sound.music.stop();

-			openSubState(new GameOverSubstate(boyfriend.getScreenPosition().x, boyfriend.getScreenPosition().y));
+			// 1 / 1000 chance for Gitaroo Man easter egg
+			if (FlxG.random.bool(0.1))
+			{
+				// gitaroo man easter egg
+				FlxG.switchState(new GitarooPause());
+			}
+			else
+				openSubState(new GameOverSubstate(boyfriend.getScreenPosition().x, boyfriend.getScreenPosition().y));

 			// FlxG.switchState(new GameOverState(boyfriend.getScreenPosition().x, boyfriend.getScreenPosition().y));
 		}
@@ -1535,6 +1509,20 @@ class PlayState extends MusicBeatState
 					daNote.active = true;
 				}

+				daNote.y = (strumLine.y - (Conductor.songPosition - daNote.strumTime) * (0.45 * FlxMath.roundDecimal(SONG.speed, 2)));
+
+				// i am so fucking sorry for this if condition
+				if (daNote.isSustainNote
+					&& daNote.y + daNote.offset.y <= strumLine.y + Note.swagWidth / 2
+					&& (!daNote.mustPress || (daNote.wasGoodHit || (daNote.prevNote.wasGoodHit && !daNote.canBeHit))))
+				{
+					var swagRect = new FlxRect(0, strumLine.y + Note.swagWidth / 2 - daNote.y, daNote.width * 2, daNote.height * 2);
+					swagRect.y /= daNote.scale.y;
+					swagRect.height -= swagRect.y;
+
+					daNote.clipRect = swagRect;
+				}
+
 				if (!daNote.mustPress && daNote.wasGoodHit)
 				{
 					if (SONG.song != 'Tutorial')
@@ -1548,18 +1536,16 @@ class PlayState extends MusicBeatState
 							altAnim = '-alt';
 					}

-					trace("DA ALT THO?: " + SONG.notes[Math.floor(curStep / 16)].altAnim);
-
 					switch (Math.abs(daNote.noteData))
 					{
+						case 0:
+							dad.playAnim('singLEFT' + altAnim, true);
+						case 1:
+							dad.playAnim('singDOWN' + altAnim, true);
 						case 2:
 							dad.playAnim('singUP' + altAnim, true);
 						case 3:
 							dad.playAnim('singRIGHT' + altAnim, true);
-						case 1:
-							dad.playAnim('singDOWN' + altAnim, true);
-						case 0:
-							dad.playAnim('singLEFT' + altAnim, true);
 					}

 					dad.holdTimer = 0;
@@ -1572,25 +1558,32 @@ class PlayState extends MusicBeatState
 					daNote.destroy();
 				}

-				daNote.y = (strumLine.y - (Conductor.songPosition - daNote.strumTime) * (0.45 * FlxMath.roundDecimal(PlayState.SONG.speed, 2)));
-
 				// WIP interpolation shit? Need to fix the pause issue
 				// daNote.y = (strumLine.y - (songTime - daNote.strumTime) * (0.45 * PlayState.SONG.speed));

 				if (daNote.y < -daNote.height)
 				{
-					if (daNote.tooLate || !daNote.wasGoodHit)
+					if (daNote.isSustainNote && daNote.wasGoodHit)
 					{
-						health -= 0.0475;
-						vocals.volume = 0;
+						daNote.kill();
+						notes.remove(daNote, true);
+						daNote.destroy();
 					}
+					else
+					{
+						if (daNote.tooLate || !daNote.wasGoodHit)
+						{
+							health -= 0.0475;
+							vocals.volume = 0;
+						}

-					daNote.active = false;
-					daNote.visible = false;
+						daNote.active = false;
+						daNote.visible = false;

-					daNote.kill();
-					notes.remove(daNote, true);
-					daNote.destroy();
+						daNote.kill();
+						notes.remove(daNote, true);
+						daNote.destroy();
+					}
 				}
 			});
 		}
@@ -1626,6 +1619,9 @@ class PlayState extends MusicBeatState
 			{
 				FlxG.sound.playMusic('assets/music/freakyMenu' + TitleState.soundExt);

+				transIn = FlxTransitionableState.defaultTransIn;
+				transOut = FlxTransitionableState.defaultTransOut;
+
 				FlxG.switchState(new StoryMenuState());

 				// if ()
@@ -1664,20 +1660,14 @@ class PlayState extends MusicBeatState
 					FlxG.sound.play('assets/sounds/Lights_Shut_off' + TitleState.soundExt);
 				}

-				if (SONG.song.toLowerCase() == 'senpai')
-				{
-					transIn = null;
-					transOut = null;
-					prevCamFollow = camFollow;
-				}
+				FlxTransitionableState.skipNextTransIn = true;
+				FlxTransitionableState.skipNextTransOut = true;
+				prevCamFollow = camFollow;

 				PlayState.SONG = Song.loadFromJson(PlayState.storyPlaylist[0].toLowerCase() + difficulty, PlayState.storyPlaylist[0]);
 				FlxG.sound.music.stop();

 				FlxG.switchState(new PlayState());
-
-				transIn = FlxTransitionableState.defaultTransIn;
-				transOut = FlxTransitionableState.defaultTransOut;
 			}
 		}
 		else
@@ -1973,18 +1963,18 @@ class PlayState extends MusicBeatState
 					switch (daNote.noteData)
 					{
 						// NOTES YOU ARE HOLDING
+						case 0:
+							if (left)
+								goodNoteHit(daNote);
+						case 1:
+							if (down)
+								goodNoteHit(daNote);
 						case 2:
 							if (up)
 								goodNoteHit(daNote);
 						case 3:
 							if (right)
 								goodNoteHit(daNote);
-						case 1:
-							if (down)
-								goodNoteHit(daNote);
-						case 0:
-							if (left)
-								goodNoteHit(daNote);
 					}
 				}
 			});
@@ -2002,6 +1992,16 @@ class PlayState extends MusicBeatState
 		{
 			switch (spr.ID)
 			{
+				case 0:
+					if (leftP && spr.animation.curAnim.name != 'confirm')
+						spr.animation.play('pressed');
+					if (leftR)
+						spr.animation.play('static');
+				case 1:
+					if (downP && spr.animation.curAnim.name != 'confirm')
+						spr.animation.play('pressed');
+					if (downR)
+						spr.animation.play('static');
 				case 2:
 					if (upP && spr.animation.curAnim.name != 'confirm')
 						spr.animation.play('pressed');
@@ -2012,16 +2012,6 @@ class PlayState extends MusicBeatState
 						spr.animation.play('pressed');
 					if (rightR)
 						spr.animation.play('static');
-				case 1:
-					if (downP && spr.animation.curAnim.name != 'confirm')
-						spr.animation.play('pressed');
-					if (downR)
-						spr.animation.play('static');
-				case 0:
-					if (leftP && spr.animation.curAnim.name != 'confirm')
-						spr.animation.play('pressed');
-					if (leftR)
-						spr.animation.play('static');
 			}

 			if (spr.animation.curAnim.name == 'confirm' && !curStage.startsWith('school'))
@@ -2062,14 +2052,14 @@ class PlayState extends MusicBeatState

 			switch (direction)
 			{
+				case 0:
+					boyfriend.playAnim('singLEFTmiss', true);
+				case 1:
+					boyfriend.playAnim('singDOWNmiss', true);
 				case 2:
 					boyfriend.playAnim('singUPmiss', true);
 				case 3:
 					boyfriend.playAnim('singRIGHTmiss', true);
-				case 1:
-					boyfriend.playAnim('singDOWNmiss', true);
-				case 0:
-					boyfriend.playAnim('singLEFTmiss', true);
 			}
 		}
 	}
@@ -2085,12 +2075,12 @@ class PlayState extends MusicBeatState

 		if (leftP)
 			noteMiss(0);
+		if (downP)
+			noteMiss(1);
 		if (upP)
 			noteMiss(2);
 		if (rightP)
 			noteMiss(3);
-		if (downP)
-			noteMiss(1);
 	}

 	function noteCheck(keyP:Bool, note:Note):Void
@@ -2120,14 +2110,14 @@ class PlayState extends MusicBeatState

 			switch (note.noteData)
 			{
+				case 0:
+					boyfriend.playAnim('singLEFT', true);
+				case 1:
+					boyfriend.playAnim('singDOWN', true);
 				case 2:
 					boyfriend.playAnim('singUP', true);
 				case 3:
 					boyfriend.playAnim('singRIGHT', true);
-				case 1:
-					boyfriend.playAnim('singDOWN', true);
-				case 0:
-					boyfriend.playAnim('singLEFT', true);
 			}

 			playerStrums.forEach(function(spr:FlxSprite)
@@ -2141,9 +2131,12 @@ class PlayState extends MusicBeatState
 			note.wasGoodHit = true;
 			vocals.volume = 1;

-			note.kill();
-			notes.remove(note, true);
-			note.destroy();
+			if (!note.isSustainNote)
+			{
+				note.kill();
+				notes.remove(note, true);
+				note.destroy();
+			}
 		}
 	}

@@ -2237,6 +2230,7 @@ class PlayState extends MusicBeatState

 	override function stepHit()
 	{
+		super.stepHit();
 		if (SONG.needsVoices)
 		{
 			if (vocals.time > Conductor.songPosition + 20 || vocals.time < Conductor.songPosition - 20)
@@ -2245,12 +2239,10 @@ class PlayState extends MusicBeatState
 			}
 		}

-		if (dad.curCharacter == 'spooky' && totalSteps % 4 == 2)
+		if (dad.curCharacter == 'spooky' && curStep % 4 == 2)
 		{
 			// dad.dance();
 		}
-
-		super.stepHit();
 	}

 	var lightningStrikeBeat:Int = 0;
@@ -2258,7 +2250,6 @@ class PlayState extends MusicBeatState

 	override function beatHit()
 	{
-		wiggleShit.update(Conductor.crochet);
 		super.beatHit();

 		if (generatedMusic)
@@ -2273,23 +2264,24 @@ class PlayState extends MusicBeatState
 				Conductor.changeBPM(SONG.notes[Math.floor(curStep / 16)].bpm);
 				FlxG.log.add('CHANGED BPM!');
 			}
-			else
-				Conductor.changeBPM(SONG.bpm);
+			// else
+			// Conductor.changeBPM(SONG.bpm);

 			// Dad doesnt interupt his own notes
 			if (SONG.notes[Math.floor(curStep / 16)].mustHitSection)
 				dad.dance();
 		}
 		// FlxG.log.add('change bpm' + SONG.notes[Std.int(curStep / 16)].changeBPM);
+		wiggleShit.update(Conductor.crochet);

 		// HARDCODING FOR MILF ZOOMS!
-		if (curSong.toLowerCase() == 'milf' && curBeat >= 168 && curBeat <= 200 && camZooming && FlxG.camera.zoom < 1.35)
+		if (curSong.toLowerCase() == 'milf' && curBeat >= 168 && curBeat < 200 && camZooming && FlxG.camera.zoom < 1.35)
 		{
 			FlxG.camera.zoom += 0.015;
 			camHUD.zoom += 0.03;
 		}

-		if (camZooming && FlxG.camera.zoom < 1.35 && totalBeats % 4 == 0)
+		if (camZooming && FlxG.camera.zoom < 1.35 && curBeat % 4 == 0)
 		{
 			FlxG.camera.zoom += 0.015;
 			camHUD.zoom += 0.03;
@@ -2301,7 +2293,7 @@ class PlayState extends MusicBeatState
 		iconP1.updateHitbox();
 		iconP2.updateHitbox();

-		if (totalBeats % gfSpeed == 0)
+		if (curBeat % gfSpeed == 0)
 		{
 			gf.dance();
 		}
@@ -2311,7 +2303,7 @@ class PlayState extends MusicBeatState
 			boyfriend.playAnim('idle');
 		}

-		if (totalBeats % 8 == 7 && curSong == 'Bopeebo')
+		if (curBeat % 8 == 7 && curSong == 'Bopeebo')
 		{
 			boyfriend.playAnim('hey', true);

@@ -2343,7 +2335,7 @@ class PlayState extends MusicBeatState
 				if (!trainMoving)
 					trainCooldown += 1;

-				if (totalBeats % 4 == 0)
+				if (curBeat % 4 == 0)
 				{
 					phillyCityLights.forEach(function(light:FlxSprite)
 					{
@@ -2356,7 +2348,7 @@ class PlayState extends MusicBeatState
 					// phillyCityLights.members[curLight].alpha = 1;
 				}

-				if (totalBeats % 8 == 4 && FlxG.random.bool(30) && !trainMoving && trainCooldown > 8)
+				if (curBeat % 8 == 4 && FlxG.random.bool(30) && !trainMoving && trainCooldown > 8)
 				{
 					trainCooldown = FlxG.random.int(-4, 0);
 					trainStart();
@@ -12,8 +12,6 @@ typedef SwagSong =
 	var song:String;
 	var notes:Array<SwagSection>;
 	var bpm:Int;
-	var sections:Int;
-	var sectionLengths:Array<Dynamic>;
 	var needsVoices:Bool;
 	var speed:Float;

@@ -27,25 +25,17 @@ class Song
 	public var song:String;
 	public var notes:Array<SwagSection>;
 	public var bpm:Int;
-	public var sections:Int;
-	public var sectionLengths:Array<Dynamic> = [];
 	public var needsVoices:Bool = true;
 	public var speed:Float = 1;

 	public var player1:String = 'bf';
 	public var player2:String = 'dad';

-	public function new(song, notes, bpm, sections)
+	public function new(song, notes, bpm)
 	{
 		this.song = song;
 		this.notes = notes;
 		this.bpm = bpm;
-		this.sections = sections;
-
-		for (i in 0...notes.length)
-		{
-			this.sectionLengths.push(notes[i]);
-		}
 	}

 	public static function loadFromJson(jsonInput:String, ?folder:String):SwagSong
@@ -72,9 +62,7 @@ class Song

 				daNotes = songData.notes;
 				daSong = songData.song;
-				daSections = songData.sections;
-				daBpm = songData.bpm;
-				daSectionLengths = songData.sectionLengths; */
+				daBpm = songData.bpm; */

 		return parseJSONshit(rawJson);
 	}
@@ -2,6 +2,7 @@ package;

 import flixel.FlxG;
 import flixel.FlxSprite;
+import flixel.addons.transition.FlxTransitionableState;
 import flixel.graphics.frames.FlxAtlasFrames;
 import flixel.group.FlxGroup.FlxTypedGroup;
 import flixel.group.FlxGroup;
@@ -69,6 +70,9 @@ class StoryMenuState extends MusicBeatState

 	override function create()
 	{
+		transIn = FlxTransitionableState.defaultTransIn;
+		transOut = FlxTransitionableState.defaultTransOut;
+
 		if (FlxG.sound.music != null)
 		{
 			if (!FlxG.sound.music.playing)
@@ -88,7 +88,10 @@ class TitleState extends MusicBeatState
 		#elseif CHARTING
 		FlxG.switchState(new ChartingState());
 		#else
-		startIntro();
+		new FlxTimer().start(1, function(tmr:FlxTimer)
+		{
+			startIntro();
+		});
 		#end
 	}

@@ -223,7 +226,8 @@ class TitleState extends MusicBeatState

 	override function update(elapsed:Float)
 	{
-		Conductor.songPosition = FlxG.sound.music.time;
+		if (FlxG.sound.music != null)
+			Conductor.songPosition = FlxG.sound.music.time;
 		// FlxG.watch.addQuick('amp', FlxG.sound.music.amplitude);

 		if (FlxG.keys.justPressed.F)
@@ -270,7 +274,7 @@ class TitleState extends MusicBeatState

 				var version:String = "v" + Application.current.meta.get('version');

-				if (version.trim() != NGio.GAME_VER.trim() && !OutdatedSubState.leftState)
+				if (version.trim() != NGio.GAME_VER_NUMS && !OutdatedSubState.leftState)
 				{
 					trace('OLD VERSION!');
 					FlxG.switchState(new OutdatedSubState());
Author	SHA1	Message	Date
Cameron Taylor	50fccded66	changelog good to go	2021-02-14 20:21:34 -05:00
Cameron Taylor	58b421fe0a	readme stuff	2021-02-14 20:15:22 -05:00
Cameron Taylor	b460f2c1c9	icons and changelog and newgrounds	2021-02-14 19:45:18 -05:00
Cameron TaylorandGitHub	0bf80f78df	Merge pull request #357 from lotusotho/senpaidialoguebug-fix Fixed bug that makes the whole game crash at the start of week 6	2021-02-14 19:44:41 -05:00
Cameron Taylor	23ecbe3e2e	Gitaroo easter egg	2021-02-14 19:03:02 -05:00
Cameron Taylor	6661a26734	Merge branch 'master' of https://github.com/ninjamuffin99/ld47	2021-02-14 03:32:29 -05:00
Cameron Taylor	1fde747147	icons and cleanin	2021-02-14 03:32:24 -05:00
Cameron TaylorandGitHub	f25ce8c2fa	Update CHANGELOG.md	2021-02-13 18:10:52 -05:00
Cameron TaylorandGitHub	4d214fd8b9	Merge pull request #415 from PrincessMtH/master Better sustain note trails	2021-02-13 18:10:06 -05:00
MtH	2479eaa5db	better sustain notes & organizing	2021-02-13 23:39:31 +01:00
Cameron Taylor	3758171893	more seamless storymode transitions	2021-02-12 01:20:20 -05:00
Cameron TaylorandGitHub	7e3d26021a	Merge pull request #402 from TheDrawingCoder-Gamer/patch-1 Use haxe switch case 'or'	2021-02-11 22:14:24 -05:00
Cameron TaylorandGitHub	a5ce2d3540	Update CHANGELOG.md	2021-02-11 22:07:04 -05:00
Cameron TaylorandGitHub	57359cf40c	Merge pull request #382 from PrincessMtH/master BPM change functionality & implementation	2021-02-11 22:05:30 -05:00
MtH	e4f17360b6	entirely phase out totalBeats/totalSteps in favor of the more reliable curStep/curBeat	2021-02-12 03:19:43 +01:00
MtH	7d0f5c4045	totalSteps & totalBeats synced with bpm changes	2021-02-12 01:58:11 +01:00
MtH	404db74fd9	actually huge overhaul OOPS lol. trims off unnecessary data, supports bpm changes proper and according to my proposed system, also just happens to fix other issues with the chart editor	2021-02-11 23:13:50 +01:00
MtH	9b0bc41cc5	BPM map, trim off useless song stuff, adjust MILF cam zoom	2021-02-11 23:06:26 +01:00
BulbyandGitHub	201556e09b	Use haxe switch case 'or'	2021-02-11 14:54:16 -05:00
MtH	a5477c841b	Merge branch 'master' of https://github.com/ninjamuffin99/Funkin	2021-02-11 11:09:23 +01:00
MtH	edc5166900	tweak changeBPM functionality	2021-02-08 04:07:56 +01:00
LotusothoandGitHub	7ca2a9b86a	Deleted bool I created before	2021-02-04 22:40:02 +01:00
LotusothoandGitHub	b8139d5c7f	Fixed bug at the start of the dialogue	2021-02-04 22:36:01 +01:00
LotusothoandGitHub	17fa98004c	Merge pull request #3 from ninjamuffin99/master merge changes 3	2021-02-04 22:29:12 +01:00
LotusothoandGitHub	4b03e739e6	Merge pull request #2 from ninjamuffin99/master merge changes 2	2020-12-15 01:18:31 +01:00