peak cinema music

poec987 · Jun 18, 2024 · 00da6e9 · 00da6e9
1 parent 798f934
commit 00da6e9
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 12 deletions.
diff --git a/assets/preload/data/thorns/thorns-easy.json b/assets/preload/data/thorns/thorns-easy.json
diff --git a/assets/preload/data/thorns/thorns.json b/assets/preload/data/thorns/thorns.json
diff --git a/assets/preload/music/freakyMenu.mp3 b/assets/preload/music/freakyMenu.mp3
diff --git a/assets/preload/music/freakyMenu.ogg b/assets/preload/music/freakyMenu.ogg
diff --git a/source/ChartingState.hx b/source/ChartingState.hx
@@ -122,6 +122,7 @@ class ChartingState extends MusicBeatState
 				player1: 'bf',
 				player2: 'dad',
 				speed: 1,
+				normal: false,
 				validScore: false
 			};
 		}

diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx
@@ -311,10 +311,6 @@ class FreeplayState extends MusicBeatState
 		intendedScore = Highscore.getScore(songs[curSelected].songName, curDifficulty);
 		#end
 
-		#if PRELOAD_ALL
-		//FlxG.sound.playMusic(Paths.inst(songs[curSelected].songName), 0);
-		#end
-
 		var bullShit:Int = 0;
 
 		for (i in 0...iconArray.length)

diff --git a/source/PlayState.hx b/source/PlayState.hx
@@ -2337,20 +2337,20 @@ class PlayState extends MusicBeatState
 		if (precheck) { // Before animation & health shit
 			switch (zeNoteType) {
 				case "Normal":
-					trace("Normal Note Hit");
+					// trace("Normal Note Hit");
 				case "Test":
-					trace("Test Note PRE HIT");
+					// trace("Test Note PRE HIT");
 				default:
-					trace(zeNoteType + "was HITTTEEEEEEEEEEEEED");
+					// trace(zeNoteType + "was HITTTEEEEEEEEEEEEED");
 			}
 		} else { // AFTER the note shit happened
 			switch (zeNoteType) {
 				case "Normal":
-					trace("Normal Note Hit");
+					// trace("Normal Note Hit");
 				case "Test":
-					trace("Test Note POST HIT");
+					// trace("Test Note POST HIT");
 				default:
-					trace(zeNoteType + "was HITTTEEEEEEEEEEEEED");
+					// trace(zeNoteType + "was HITTTEEEEEEEEEEEEED");
 			}
 		}
 	}

diff --git a/source/Song.hx b/source/Song.hx
@@ -14,6 +14,7 @@ typedef SwagSong =
 	var bpm:Int;
 	var needsVoices:Bool;
 	var speed:Float;
+	var normal:Bool;
 
 	var player1:String;
 	var player2:String;
@@ -27,6 +28,7 @@ class Song
 	public var bpm:Int;
 	public var needsVoices:Bool = true;
 	public var speed:Float = 1;
+	public var normal:Bool = false;
 
 	public var player1:String = 'bf';
 	public var player2:String = 'dad';