Merge branch 'KadeDev:master' into master

This commit is contained in:
Lucky56 2021-06-07 01:06:26 +02:00
commit 56fabb91ba

View File

@ -2729,8 +2729,14 @@ class PlayState extends MusicBeatState
var comboSplit:Array<String> = (combo + "").split(''); var comboSplit:Array<String> = (combo + "").split('');
if (comboSplit.length == 2) // make sure we have 3 digits to display (looks weird otherwise lol)
seperatedScore.push(0); // make sure theres a 0 in front or it looks weird lol! if (comboSplit.length == 1)
{
seperatedScore.push(0);
seperatedScore.push(0);
}
else if (comboSplit.length == 2)
seperatedScore.push(0);
for(i in 0...comboSplit.length) for(i in 0...comboSplit.length)
{ {
@ -2762,8 +2768,7 @@ class PlayState extends MusicBeatState
numScore.velocity.y -= FlxG.random.int(140, 160); numScore.velocity.y -= FlxG.random.int(140, 160);
numScore.velocity.x = FlxG.random.float(-5, 5); numScore.velocity.x = FlxG.random.float(-5, 5);
if (combo >= 10 || combo == 0) add(numScore);
add(numScore);
FlxTween.tween(numScore, {alpha: 0}, 0.2, { FlxTween.tween(numScore, {alpha: 0}, 0.2, {
onComplete: function(tween:FlxTween) onComplete: function(tween:FlxTween)