From 3a085e93332881aeed5d41777b88717e5f8c4232 Mon Sep 17 00:00:00 2001
From: Eric Myllyoja <ericmyllyoja@gmail.com>
Date: Thu, 8 Sep 2022 02:48:51 -0400
Subject: [PATCH] Combo counter tweaks, stage position tweaks

---
 source/funkin/ComboCounter.hx   |  4 +++-
 source/funkin/play/PlayState.hx |  2 ++
 source/funkin/ui/PopUpStuff.hx  | 34 +++++++++++++++++++--------------
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/source/funkin/ComboCounter.hx b/source/funkin/ComboCounter.hx
index a5f8b71b5..67b7a0fb3 100644
--- a/source/funkin/ComboCounter.hx
+++ b/source/funkin/ComboCounter.hx
@@ -31,6 +31,7 @@ class ComboCounter extends FlxTypedSpriteGroup<FlxSprite>
 		{
 			kill();
 		};
+		effectStuff.setGraphicSize(Std.int(effectStuff.width * 0.7));
 		add(effectStuff);
 
 		grpNumbers = new FlxTypedGroup<ComboNumber>();
@@ -90,7 +91,8 @@ class ComboCounter extends FlxTypedSpriteGroup<FlxSprite>
 
 		while (daCombo > 0)
 		{
-			var comboNumber:ComboNumber = new ComboNumber(420 - (130 * loopNum), 44 * loopNum, daCombo % 10);
+			var comboNumber:ComboNumber = new ComboNumber(450 - (100 * loopNum), 20 + 14 * loopNum, daCombo % 10);
+			comboNumber.setGraphicSize(Std.int(comboNumber.width * 0.7));
 			grpNumbers.add(comboNumber);
 			add(comboNumber);
 
diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx
index 81a992edb..731e1d4c0 100644
--- a/source/funkin/play/PlayState.hx
+++ b/source/funkin/play/PlayState.hx
@@ -370,6 +370,7 @@ class PlayState extends MusicBeatState
 		add(cameraFollowPoint);
 
 		comboPopUps = new PopUpStuff();
+		comboPopUps.cameras = [camHUD];
 		add(comboPopUps);
 
 		grpNoteSplashes = new FlxTypedGroup<NoteSplash>();
@@ -1900,6 +1901,7 @@ class PlayState extends MusicBeatState
 		{
 			var animShit:ComboCounter = new ComboCounter(-100, 300, combo);
 			animShit.scrollFactor.set(0.6, 0.6);
+			animShit.cameras = [camHUD];
 			add(animShit);
 
 			var frameShit:Float = (1 / 24) * 2; // equals 2 frames in the animation
diff --git a/source/funkin/ui/PopUpStuff.hx b/source/funkin/ui/PopUpStuff.hx
index 0542ff14c..b724d7c3f 100644
--- a/source/funkin/ui/PopUpStuff.hx
+++ b/source/funkin/ui/PopUpStuff.hx
@@ -1,10 +1,10 @@
 package funkin.ui;
 
-import funkin.util.Constants;
 import flixel.FlxSprite;
 import flixel.group.FlxGroup.FlxTypedGroup;
 import flixel.tweens.FlxTween;
 import funkin.play.PlayState;
+import funkin.util.Constants;
 
 using StringTools;
 
@@ -20,21 +20,26 @@ class PopUpStuff extends FlxTypedGroup<FlxSprite>
 		if (daRating == null)
 			daRating = "good";
 
-		var rating:FlxSprite = new FlxSprite();
+		var rating:FlxSprite = new FlxSprite(0, 0);
+		rating.scrollFactor.set(0.2, 0.2);
+
+		rating.zIndex = 1000;
 		var ratingPath:String = daRating;
 
 		if (PlayState.instance.currentStageId.startsWith('school'))
 			ratingPath = "weeb/pixelUI/" + ratingPath + "-pixel";
 
 		rating.loadGraphic(Paths.image(ratingPath));
-		rating.x = FlxG.width * 0.55 - 40;
+		rating.x = FlxG.width * 0.50;
+		rating.x -= FlxG.camera.scroll.x * 0.2;
 		// make sure rating is visible lol!
-		if (rating.x < FlxG.camera.scroll.x)
-			rating.x = FlxG.camera.scroll.x;
-		else if (rating.x > FlxG.camera.scroll.x + FlxG.camera.width - rating.width)
-			rating.x = FlxG.camera.scroll.x + FlxG.camera.width - rating.width;
+		//		if (rating.x < FlxG.camera.scroll.x)
+		//			rating.x = FlxG.camera.scroll.x;
+		//		else if (rating.x > FlxG.camera.scroll.x + FlxG.camera.width - rating.width)
+		//			rating.x = FlxG.camera.scroll.x + FlxG.camera.width - rating.width;
 
-		rating.y = FlxG.camera.scroll.y + FlxG.camera.height * 0.4 - 60;
+		// FlxG.camera.scroll.y +
+		rating.y = FlxG.camera.height * 0.4 - 60;
 		rating.acceleration.y = 550;
 		rating.velocity.y -= FlxG.random.int(140, 175);
 		rating.velocity.x -= FlxG.random.int(0, 10);
@@ -76,14 +81,15 @@ class PopUpStuff extends FlxTypedGroup<FlxSprite>
 			pixelShitPart2 = '-pixel';
 		}
 		var comboSpr:FlxSprite = new FlxSprite().loadGraphic(Paths.image(pixelShitPart1 + 'combo' + pixelShitPart2));
-		comboSpr.y = FlxG.camera.scroll.y + FlxG.camera.height * 0.4 + 80;
-		comboSpr.x = FlxG.width * 0.55;
+		comboSpr.y = FlxG.camera.height * 0.4 + 80;
+		comboSpr.x = FlxG.width * 0.50;
+		comboSpr.x -= FlxG.camera.scroll.x * 0.2;
 		// make sure combo is visible lol!
 		// 194 fits 4 combo digits
-		if (comboSpr.x < FlxG.camera.scroll.x + 194)
-			comboSpr.x = FlxG.camera.scroll.x + 194;
-		else if (comboSpr.x > FlxG.camera.scroll.x + FlxG.camera.width - comboSpr.width)
-			comboSpr.x = FlxG.camera.scroll.x + FlxG.camera.width - comboSpr.width;
+		// if (comboSpr.x < FlxG.camera.scroll.x + 194)
+		// 	comboSpr.x = FlxG.camera.scroll.x + 194;
+		// else if (comboSpr.x > FlxG.camera.scroll.x + FlxG.camera.width - comboSpr.width)
+		// 	comboSpr.x = FlxG.camera.scroll.x + FlxG.camera.width - comboSpr.width;
 
 		comboSpr.acceleration.y = 600;
 		comboSpr.velocity.y -= 150;