From 47838e94358fb3ed96f29ebd552d46a222ba1c33 Mon Sep 17 00:00:00 2001 From: JordanSantiagoYT Date: Mon, 21 Oct 2024 22:44:59 -0400 Subject: [PATCH 1/3] haxeflixel logo fix in editorplaystate --- source/editors/EditorPlayState.hx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/source/editors/EditorPlayState.hx b/source/editors/EditorPlayState.hx index f1dfdd27c9d..49c0645a2b9 100644 --- a/source/editors/EditorPlayState.hx +++ b/source/editors/EditorPlayState.hx @@ -47,6 +47,9 @@ class EditorPlayState extends MusicBeatState var startOffset:Float = 0; var startPos:Float = 0; + var pixelShitPart1:String = ""; + var pixelShitPart2:String = ''; + public function new(startPos:Float) { this.startPos = startPos; Conductor.songPosition = startPos - startOffset; @@ -819,15 +822,16 @@ class EditorPlayState extends MusicBeatState spawnNoteSplashOnNote(note); } - var pixelShitPart1:String = ""; - var pixelShitPart2:String = ''; - if (PlayState.isPixelStage) { pixelShitPart1 = 'pixelUI/'; pixelShitPart2 = '-pixel'; } + var normalRating:String = 'ratings/' + ClientPrefs.ratingType.toLowerCase().replace(' ', '-').trim() + '/'; + + pixelShitPart1 += normalRating; + rating.loadGraphic(Paths.image(pixelShitPart1 + daRating + pixelShitPart2)); rating.screenCenter(); rating.x = coolText.x - 40; From 01bd2a8515fc21c9dc1cef491bce27c557ee9d24 Mon Sep 17 00:00:00 2001 From: JordanSantiagoYT Date: Mon, 21 Oct 2024 22:49:29 -0400 Subject: [PATCH 2/3] nvm, fixed now --- source/editors/EditorPlayState.hx | 33 +++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/source/editors/EditorPlayState.hx b/source/editors/EditorPlayState.hx index 49c0645a2b9..ad4969b8ca6 100644 --- a/source/editors/EditorPlayState.hx +++ b/source/editors/EditorPlayState.hx @@ -168,6 +168,7 @@ class EditorPlayState extends MusicBeatState Paths.initNote(4, PlayState.SONG.arrowSkin); Paths.initDefaultSkin(PlayState.SONG.arrowSkin); + cachePopUpScore(); super.create(); } @@ -781,6 +782,28 @@ class EditorPlayState extends MusicBeatState return 0.15 * (!sustainNote ? 1 : 2); } + private function cachePopUpScore() + { + if (PlayState.isPixelStage) + { + pixelShitPart1 = 'pixelUI/'; + pixelShitPart2 = '-pixel'; + } + + var normalRating:String = 'ratings/' + ClientPrefs.ratingType.toLowerCase().replace(' ', '-').trim() + '/'; + + pixelShitPart1 += normalRating; + + Paths.image(pixelShitPart1 + "perfect" + pixelShitPart2); + Paths.image(pixelShitPart1 + "sick" + pixelShitPart2); + Paths.image(pixelShitPart1 + "good" + pixelShitPart2); + Paths.image(pixelShitPart1 + "bad" + pixelShitPart2); + Paths.image(pixelShitPart1 + "shit" + pixelShitPart2); + Paths.image(pixelShitPart1 + "miss" + pixelShitPart2); + + for (i in 0...10) Paths.image(pixelShitPart1 + 'num' + i + pixelShitPart2); + } + var COMBO_X:Float = 400; var COMBO_Y:Float = 340; private function popUpScore(note:Note = null):Void @@ -822,16 +845,6 @@ class EditorPlayState extends MusicBeatState spawnNoteSplashOnNote(note); } - if (PlayState.isPixelStage) - { - pixelShitPart1 = 'pixelUI/'; - pixelShitPart2 = '-pixel'; - } - - var normalRating:String = 'ratings/' + ClientPrefs.ratingType.toLowerCase().replace(' ', '-').trim() + '/'; - - pixelShitPart1 += normalRating; - rating.loadGraphic(Paths.image(pixelShitPart1 + daRating + pixelShitPart2)); rating.screenCenter(); rating.x = coolText.x - 40; From 7c6e9150c1b603da4a268cf23e166764440457ae Mon Sep 17 00:00:00 2001 From: JordanSantiagoYT Date: Mon, 21 Oct 2024 22:54:34 -0400 Subject: [PATCH 3/3] why create comboSpr? lol --- source/editors/EditorPlayState.hx | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/source/editors/EditorPlayState.hx b/source/editors/EditorPlayState.hx index ad4969b8ca6..dafcc93cac1 100644 --- a/source/editors/EditorPlayState.hx +++ b/source/editors/EditorPlayState.hx @@ -856,32 +856,17 @@ class EditorPlayState extends MusicBeatState rating.x += ClientPrefs.comboOffset[0]; rating.y -= ClientPrefs.comboOffset[1]; - var comboSpr:FlxSprite = new FlxSprite().loadGraphic(Paths.image(pixelShitPart1 + 'combo' + pixelShitPart2)); - comboSpr.screenCenter(); - comboSpr.x = coolText.x; - comboSpr.acceleration.y = 600; - comboSpr.velocity.y -= 150; - comboSpr.visible = !ClientPrefs.hideHud; - comboSpr.x += ClientPrefs.comboOffset[0]; - comboSpr.y -= ClientPrefs.comboOffset[1]; - - comboSpr.velocity.x += FlxG.random.int(1, 10); comboGroup.add(rating); if (!PlayState.isPixelStage) { rating.setGraphicSize(Std.int(rating.width * 0.7)); rating.antialiasing = ClientPrefs.globalAntialiasing; - comboSpr.setGraphicSize(Std.int(comboSpr.width * 0.7)); - comboSpr.antialiasing = ClientPrefs.globalAntialiasing; } else { rating.setGraphicSize(Std.int(rating.width * PlayState.daPixelZoom * 0.85)); - comboSpr.setGraphicSize(Std.int(comboSpr.width * PlayState.daPixelZoom * 0.85)); } - - comboSpr.updateHitbox(); rating.updateHitbox(); var seperatedScore:Array = []; @@ -936,15 +921,9 @@ class EditorPlayState extends MusicBeatState coolText.text = Std.string(seperatedScore); FlxTween.tween(rating, {alpha: 0}, 0.2, { - startDelay: Conductor.crochet * 0.001 - }); - - FlxTween.tween(comboSpr, {alpha: 0}, 0.2, { onComplete: function(tween:FlxTween) { coolText.destroy(); - comboSpr.destroy(); - rating.destroy(); }, startDelay: Conductor.crochet * 0.001