Minor fixes on events

ShadowMario · Jan 29, 2025 · 548b74a · 548b74a
1 parent 84502e5
commit 548b74a
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 7 deletions.
diff --git a/source/states/CreditsState.hx b/source/states/CreditsState.hx
@@ -137,7 +137,7 @@ class CreditsState extends MusicBeatState
 	{
 		if (FlxG.sound.music.volume < 0.7)
 		{
-			FlxG.sound.music.volume += 0.5 * FlxG.elapsed;
+			FlxG.sound.music.volume += 0.5 * elapsed;
 		}
 
 		if(!quitting)

diff --git a/source/states/FreeplayState.hx b/source/states/FreeplayState.hx
@@ -221,7 +221,7 @@ class FreeplayState extends MusicBeatState
 			return;
 
 		if (FlxG.sound.music.volume < 0.7)
-			FlxG.sound.music.volume += 0.5 * FlxG.elapsed;
+			FlxG.sound.music.volume += 0.5 * elapsed;
 
 		lerpScore = Math.floor(FlxMath.lerp(intendedScore, lerpScore, Math.exp(-elapsed * 24)));
 		lerpRating = FlxMath.lerp(intendedRating, lerpRating, Math.exp(-elapsed * 12));

diff --git a/source/states/stages/Limo.hx b/source/states/stages/Limo.hx
@@ -242,7 +242,7 @@ class Limo extends BaseStage
 		//trace('Car drive');
 		FlxG.sound.play(Paths.soundRandom('carPass', 0, 1), 0.7);
 
-		fastCar.velocity.x = (FlxG.random.int(170, 220) / FlxG.elapsed) * 3;
+		fastCar.velocity.x = FlxG.random.int(30600, 39600);
 		fastCarCanDrive = false;
 		carTimer = new FlxTimer().start(2, function(tmr:FlxTimer)
 		{

diff --git a/source/states/stages/Philly.hx b/source/states/stages/Philly.hx
@@ -63,7 +63,7 @@ class Philly extends BaseStage
 				phillyWindowEvent.visible = false;
 				insert(members.indexOf(blammedLightsBlack) + 1, phillyWindowEvent);
 
-				phillyGlowGradient = new PhillyGlowGradient(-400, 225); //This shit was refusing to properly load FlxGradient so fuck it
+				phillyGlowGradient = new PhillyGlowGradient(-400, 225);
 				phillyGlowGradient.visible = false;
 				insert(members.indexOf(blammedLightsBlack) + 1, phillyGlowGradient);
 				if(!ClientPrefs.data.flashing) phillyGlowGradient.intendedAlpha = 0.7;
@@ -77,7 +77,7 @@ class Philly extends BaseStage
 
 	override function update(elapsed:Float)
 	{
-		phillyWindow.alpha -= (Conductor.crochet / 1000) * FlxG.elapsed * 1.5;
+		phillyWindow.alpha -= (Conductor.crochet / 1000) * elapsed * 1.5;
 		if(phillyGlowParticles != null)
 		{
 			phillyGlowParticles.forEachAlive(function(particle:PhillyGlowParticle)
@@ -191,6 +191,7 @@ class Philly extends BaseStage
 									particle.x = -400 + width * i + FlxG.random.float(-width / 5, width / 5);
 									particle.y = phillyGlowGradient.originalY + 200 + (FlxG.random.float(0, 125) + j * 40);
 									particle.color = color;
+									particle.start();
 									phillyGlowParticles.add(particle);
 								}
 							}

diff --git a/source/states/stages/objects/PhillyGlowGradient.hx b/source/states/stages/objects/PhillyGlowGradient.hx
@@ -10,7 +10,7 @@ class PhillyGlowGradient extends FlxSprite
 		super(x, y);
 		originalY = y;
 
-		loadGraphic(Paths.image('philly/gradient'));
+		loadGraphic(Paths.image('philly/gradient')); //This shit was refusing to properly load FlxGradient so fuck it
 		scrollFactor.set(0, 0.75);
 		setGraphicSize(2000, originalHeight);
 		updateHitbox();

diff --git a/source/states/stages/objects/PhillyGlowParticle.hx b/source/states/stages/objects/PhillyGlowParticle.hx
@@ -11,21 +11,27 @@ class PhillyGlowParticle extends FlxSprite
 		this.color = color;
 
 		loadGraphic(Paths.image('philly/particle'));
+		antialiasing = ClientPrefs.data.antialiasing;
+		start();
+	}
+
+	public function start()
+	{
 		lifeTime = FlxG.random.float(0.6, 0.9);
 		decay = FlxG.random.float(0.8, 1);
 		if(!ClientPrefs.data.flashing)
 		{
 			decay *= 0.5;
 			alpha = 0.5;
 		}
+		else alpha = 1;
 
 		originalScale = FlxG.random.float(0.75, 1);
 		scale.set(originalScale, originalScale);
 
 		scrollFactor.set(FlxG.random.float(0.3, 0.75), FlxG.random.float(0.65, 0.75));
 		velocity.set(FlxG.random.float(-40, 40), FlxG.random.float(-175, -250));
 		acceleration.set(FlxG.random.float(-10, 10), 25);
-		antialiasing = ClientPrefs.data.antialiasing;
 	}
 
 	override function update(elapsed:Float)