yo yo yo, it's hump day!

APRO716 · May 3, 2023 · d96a0a1 · d96a0a1 · APRO716 · May 3, 2023
1 parent 2d62747
commit d96a0a1
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/source/GameplayChangersSubstate.hx b/source/GameplayChangersSubstate.hx
@@ -258,7 +258,6 @@ class GameplayChangersSubstate extends MusicBeatSubstate
 											updateTextFrom(oOption);
 										}
 									}
-									//trace(curOption.options[num]);
 							}
 							updateTextFrom(curOption);
 							curOption.change();

diff --git a/source/LoadingState.hx b/source/LoadingState.hx
@@ -65,6 +65,11 @@ class LoadingState extends MusicBeatState
 			{
 				callbacks = new MultiCallback(onLoad);
 				var introComplete = callbacks.add("introComplete");
+				if (PlayState.SONG != null) {
+					checkLoadSong(getSongPath());
+					if (PlayState.SONG.needsVoices)
+						checkLoadSong(getVocalPath());
+				}
 				checkLibrary("shared");
 				if(directory != null && directory.length > 0 && directory != 'shared') {
 					checkLibrary(directory);

diff --git a/source/PlayState.hx b/source/PlayState.hx
@@ -28,7 +28,7 @@ import flixel.math.FlxPoint;
 import flixel.math.FlxRect;
 #if (flixel >= "5.3.0")
 import flixel.sound.FlxSound;
-#else
+#else 
 import flixel.system.FlxSound;
 #end
 import flixel.text.FlxText;
@@ -4067,10 +4067,9 @@ class PlayState extends MusicBeatState
 				sortedNotesList.sort(sortHitNotes);
 
 				if (sortedNotesList.length > 0) {
-					for (epicNote in sortedNotesList)
-					{
+					for (epicNote in sortedNotesList) {
 						for (doubleNote in pressNotes) {
-							if (Math.abs(doubleNote.strumTime - epicNote.strumTime) < 1) {
+							if (!doubleNote.isSustainNote && Math.abs(doubleNote.strumTime - epicNote.strumTime) < 2) {
 								doubleNote.kill();
 								notes.remove(doubleNote, true);
 								doubleNote.destroy();
@@ -4247,7 +4246,7 @@ class PlayState extends MusicBeatState
 			songMisses++;
 			totalPlayed++;
 			vocals.volume = 0;
-			health -= (daNote.nextNote != null || daNote.nextNote.countMiss ? daNote.missHealth : 0) * healthLoss; // More Accurate lol
+			health -= (daNote.nextNote != null ? daNote.missHealth : 0) * healthLoss; // More Accurate lol (Completely Fixed?)
 			RecalculateRating(true);
 
 			var char:Character = boyfriend;

diff --git a/source/editors/EditorPlayState.hx b/source/editors/EditorPlayState.hx
@@ -551,10 +551,9 @@ class EditorPlayState extends MusicBeatState
 				sortedNotesList.sort(sortHitNotes);
 
 				if (sortedNotesList.length > 0) {
-					for (epicNote in sortedNotesList)
-					{
+					for (epicNote in sortedNotesList) {
 						for (doubleNote in pressNotes) {
-							if (Math.abs(doubleNote.strumTime - epicNote.strumTime) < 1) {
+							if (!doubleNote.isSustainNote && Math.abs(doubleNote.strumTime - epicNote.strumTime) < 2) {
 								doubleNote.kill();
 								notes.remove(doubleNote, true);
 								doubleNote.destroy();
@@ -572,10 +571,9 @@ class EditorPlayState extends MusicBeatState
 							goodNoteHit(epicNote);
 						}
 					}
+				} else if (canMiss) {
+					noteMissPress();
 				}
-				else if (canMiss) {
-						noteMissPress();
-					}
 
 				//more accurate hit time for the ratings? part 2 (Now that the calculations are done, go back to the time it was before for not causing a note stutter)
 				Conductor.songPosition = lastTime;