From 8c11d7b2190b205dc27e4318e341118149f7477f Mon Sep 17 00:00:00 2001 From: Yoshman29 Date: Tue, 1 Nov 2022 18:29:01 +0100 Subject: [PATCH] combo group --- buildnumber.txt | 2 +- source/funkin/game/PlayState.hx | 15 +++------------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/buildnumber.txt b/buildnumber.txt index c3530354..cebfe351 100644 --- a/buildnumber.txt +++ b/buildnumber.txt @@ -1 +1 @@ -943 \ No newline at end of file +946 \ No newline at end of file diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index c822476f..01a20da8 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -215,8 +215,7 @@ class PlayState extends MusicBeatState var camPos:FlxPoint = new FlxPoint(dad.getGraphicMidpoint().x, dad.getGraphicMidpoint().y); - comboGroup = new FlxTypedGroup(); - comboOffset = FlxPoint.get(FlxG.width * 0.55, -60); + comboGroup = new FlxSpriteGroup(FlxG.width * 0.55, (FlxG.height * 0.5) - 60); boyfriend = new Character(770, 100, SONG.player1, true); @@ -1074,8 +1073,7 @@ class PlayState extends MusicBeatState public var endingSong:Bool = false; - public var comboGroup:FlxTypedGroup; - public var comboOffset:FlxPoint; + public var comboGroup:FlxSpriteGroup; private function popUpScore(strumtime:Float, score:Int = 350):Void { @@ -1134,13 +1132,8 @@ class PlayState extends MusicBeatState comboSpr.velocity.y -= 150; comboSpr.velocity.x += FlxG.random.int(1, 10); - rating.x += comboOffset.x; - rating.y += comboOffset.y; - comboGroup.add(rating); - - comboSpr.x += comboOffset.x; - comboSpr.y += comboOffset.y; comboGroup.add(comboSpr); + comboGroup.add(rating); if (!curStage.startsWith('school')) { @@ -1185,8 +1178,6 @@ class PlayState extends MusicBeatState numScore.velocity.y -= FlxG.random.int(140, 160); numScore.velocity.x = FlxG.random.float(-5, 5); - numScore.x += comboOffset.x; - numScore.y += comboOffset.y; comboGroup.add(numScore); FlxTween.tween(numScore, {alpha: 0}, 0.2, {