fixes and stuff

source/ForeverAssets.hx

@@ -22,29 +22,21 @@ using StringTools;
 class ForeverAssets
 {
 	//
-	public static function generateCombo(asset:String, assetModifier:String = 'base', changeableSkin:String = 'default', baseLibrary:String, negative:Bool,
-			createdColor:FlxColor, scoreInt:Int):FlxSprite
+	public static function generateCombo(asset:String, number:String, allSicks:Bool, assetModifier:String = 'base', changeableSkin:String = 'default',
+			baseLibrary:String, negative:Bool, createdColor:FlxColor, scoreInt:Int):FlxSprite
 	{
-		var newSprite:FlxSprite = new FlxSprite().loadGraphic(Paths.image(ForeverTools.returnSkinAsset(asset, assetModifier, changeableSkin, baseLibrary)));
+		var width = 100;
+		var height = 140;
+
+		if (assetModifier == 'pixel')
+		{
+			width = 10;
+			height = 12;
+		}
+		var newSprite:FlxSprite = new FlxSprite().loadGraphic(Paths.image(ForeverTools.returnSkinAsset(asset, assetModifier, changeableSkin, baseLibrary)),
+			true, width, height);
 		switch (assetModifier)
 		{
-			case 'pixel':
-				newSprite.alpha = 1;
-				newSprite.screenCenter();
-				newSprite.x += (43 * scoreInt) + 20;
-				newSprite.y += 60;
-
-				newSprite.color = FlxColor.WHITE;
-				if (negative)
-					newSprite.color = createdColor;
-
-				newSprite.setGraphicSize(Std.int(newSprite.width * PlayState.daPixelZoom));
-				newSprite.updateHitbox();
-
-				newSprite.acceleration.y = FlxG.random.int(200, 300);
-				newSprite.velocity.y = -FlxG.random.int(140, 160);
-				newSprite.velocity.x = FlxG.random.float(-5, 5);
-
 			default:
 				newSprite.alpha = 1;
 				newSprite.screenCenter();
@@ -55,23 +47,40 @@ class ForeverAssets
 				if (negative)
 					newSprite.color = createdColor;
 
-				newSprite.antialiasing = (!Init.trueSettings.get('Disable Antialiasing'));
-				newSprite.setGraphicSize(Std.int(newSprite.width * 0.5));
-				newSprite.updateHitbox();
+				newSprite.animation.add('base', [
+					(Std.parseInt(number) != null ? Std.parseInt(number) + 1 : 0) + (!allSicks ? 0 : 11)
+				], 0, false);
+				newSprite.animation.play('base');
+		}
 
-				newSprite.acceleration.y = FlxG.random.int(200, 300);
-				newSprite.velocity.y = -FlxG.random.int(140, 160);
-				newSprite.velocity.x = FlxG.random.float(-5, 5);
+		if (assetModifier == 'pixel')
+			newSprite.setGraphicSize(Std.int(newSprite.width * PlayState.daPixelZoom));
+		else
+		{
+			newSprite.antialiasing = (!Init.trueSettings.get('Disable Antialiasing'));
+			newSprite.setGraphicSize(Std.int(newSprite.width * 0.5));
 		}
+		newSprite.updateHitbox();
+
+		newSprite.acceleration.y = FlxG.random.int(200, 300);
+		newSprite.velocity.y = -FlxG.random.int(140, 160);
+		newSprite.velocity.x = FlxG.random.float(-5, 5);
 
 		return newSprite;
 	}
 
 	public static function generateRating(asset:String, perfectSick:Bool, timing:String, assetModifier:String = 'base', changeableSkin:String = 'default',
 			baseLibrary:String):FlxSprite
 	{
+		var width = 500;
+		var height = 163;
+		if (assetModifier == 'pixel')
+		{
+			width = 72;
+			height = 32;
+		}
 		var rating:FlxSprite = new FlxSprite().loadGraphic(Paths.image(ForeverTools.returnSkinAsset('judgements', assetModifier, changeableSkin,
-			baseLibrary)), true, 500, 163);
+			baseLibrary)), true, width, height);
 		switch (assetModifier)
 		{
 			default:

source/Init.hx

@@ -112,7 +112,11 @@ class Init extends FlxState
 			0,
 			"Fixes the judgements to the camera instead of to the world itself, making them easier to read."
 		],
-		'Display Miss Count' => [false, 0, "When enabled, displays the amount of misses you have in a song."],
+		'Display Miss Count' => [
+			false,
+			0,
+			"When enabled, displays the amount of combo breaks you have in a song."
+		],
 	];
 
 	public static var trueSettings:Map<String, Dynamic> = [];
@@ -182,7 +186,7 @@ class Init extends FlxState
 		FlxG.mouse.useSystemCursor = true; // Use system cursor because it's prettier
 		FlxG.mouse.visible = false; // Hide mouse on start
 
-		// Main.switchState(this, new TestState());
+		// Main.switchState(this, new ChartingState());
 		gotoTitleScreen();
 	}
 

source/gameFolder/gameObjects/userInterface/ClassHUD.hx

@@ -137,7 +137,7 @@ class ClassHUD extends FlxTypedGroup<FlxBasic>
 		{
 			scoreBar.text += ' // Accuracy: ' + Std.string(Math.floor(Timings.getAccuracy() * 100) / 100) + '%' + Timings.comboDisplay;
 			if (Init.trueSettings.get('Display Miss Count'))
-				scoreBar.text += ' // Misses: ' + Std.string(PlayState.misses);
+				scoreBar.text += ' // Combo Breaks: ' + Std.string(PlayState.misses);
 			scoreBar.text += ' // Rank: ' + Std.string(Timings.returnScoreRating().toUpperCase());
 		}
 

source/gameFolder/meta/state/PlayState.hx

@@ -190,6 +190,7 @@ class PlayState extends MusicBeatState
 
 		// cache ratings LOL
 		displayRating('sick', 'early', true);
+		popUpCombo(true);
 
 		stageBuild = new Stage(curStage);
 		add(stageBuild);
@@ -486,15 +487,12 @@ class PlayState extends MusicBeatState
 		}
 
 		// spawn in the notes from the array
-		if (unspawnNotes[0] != null)
+		if ((unspawnNotes[0] != null) && ((unspawnNotes[0].strumTime - Conductor.songPosition) < 3500))
 		{
-			if ((unspawnNotes[0].strumTime - Conductor.songPosition) < 3500)
-			{
-				var dunceNote:Note = unspawnNotes[0];
-				// push note to its correct strumline
-				strumLines.members[Math.floor((dunceNote.noteData + (dunceNote.mustPress ? 4 : 0)) / numberOfKeys)].push(dunceNote);
-				unspawnNotes.splice(unspawnNotes.indexOf(dunceNote), 1);
-			}
+			var dunceNote:Note = unspawnNotes[0];
+			// push note to its correct strumline
+			strumLines.members[Math.floor((dunceNote.noteData + (dunceNote.mustPress ? 4 : 0)) / numberOfKeys)].push(dunceNote);
+			unspawnNotes.splice(unspawnNotes.indexOf(dunceNote), 1);
 		}
 
 		noteCalls();
@@ -1014,7 +1012,7 @@ class PlayState extends MusicBeatState
 
 	private var createdColor = FlxColor.fromRGB(204, 66, 66);
 
-	function popUpCombo()
+	function popUpCombo(?preload:Bool = false)
 	{
 		var comboString:String = Std.string(combo);
 		var negative = false;
@@ -1024,9 +1022,19 @@ class PlayState extends MusicBeatState
 		for (scoreInt in 0...stringArray.length)
 		{
 			// numScore.loadGraphic(Paths.image('UI/' + pixelModifier + 'num' + stringArray[scoreInt]));
-			var numScore = ForeverAssets.generateCombo('numbers/num' + stringArray[scoreInt], assetModifier, changeableSkin, 'UI', negative, createdColor,
-				scoreInt);
+			var numScore = ForeverAssets.generateCombo('combo', stringArray[scoreInt], (!negative ? allSicks : false), assetModifier, changeableSkin, 'UI',
+				negative, createdColor, scoreInt);
 			add(numScore);
+			// hardcoded lmao
+			if (Init.trueSettings.get('SM-like Judgements'))
+			{
+				numScore.cameras = [camHUD];
+				numScore.x += 100;
+				numScore.y += 50;
+			}
+
+			if (preload)
+				numScore.visible = false;
 
 			FlxTween.tween(numScore, {alpha: 0}, 0.2, {
 				onComplete: function(tween:FlxTween)
@@ -1054,13 +1062,13 @@ class PlayState extends MusicBeatState
 		misses++;
 
 		// display negative combo
-		popUpCombo();
 		if (popMiss)
 		{
 			// doesnt matter miss ratings dont have timings
 			displayRating("miss", 'late');
 			healthCall(Timings.judgementsMap.get("miss")[3]);
 		}
+		popUpCombo();
 
 		// gotta do it manually here lol
 		Timings.updateFCDisplay();