From 43acfc0997e8261f5c06d47408c3a046343f1da7 Mon Sep 17 00:00:00 2001 From: KadeDev Date: Fri, 26 Mar 2021 08:44:33 -0700 Subject: [PATCH] do some stinky stuff --- source/PlayState.hx | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/source/PlayState.hx b/source/PlayState.hx index 3d725c2..895a8e8 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -800,6 +800,7 @@ class PlayState extends MusicBeatState songName.setFormat(Paths.font("vcr.ttf"), 16, FlxColor.WHITE, RIGHT, FlxTextBorderStyle.OUTLINE,FlxColor.BLACK); songName.scrollFactor.set(); add(songName); + songName.cameras = [camHUD]; } healthBarBG = new FlxSprite(0, FlxG.height * 0.9).loadGraphic(Paths.image('healthBar')); @@ -817,7 +818,7 @@ class PlayState extends MusicBeatState add(healthBar); // Add Kade Engine watermark - var kadeEngineWatermark = new FlxText(FlxG.width * 0.03,FlxG.height * 0.94,0,SONG.song + " " + (storyDifficulty == 2 ? "Hard" : storyDifficulty == 1 ? "Normal" : "Easy") + " - KE " + MainMenuState.kadeEngineVer, 16); + var kadeEngineWatermark = new FlxText(FlxG.width * 0.03,FlxG.height * 0.94,0,SONG.song + " " + (storyDifficulty == 2 ? "Hard" : storyDifficulty == 1 ? "Normal" : "Easy") + " - KE " + MainMenuState.kadeEngineVer + " - " + (FlxG.save.data.etternaMode ? "E.Mode" : "FNF"), 16); kadeEngineWatermark.setFormat(Paths.font("vcr.ttf"), 16, FlxColor.WHITE, RIGHT, FlxTextBorderStyle.OUTLINE,FlxColor.BLACK); kadeEngineWatermark.scrollFactor.set(); add(kadeEngineWatermark); @@ -853,7 +854,11 @@ class PlayState extends MusicBeatState iconP2.cameras = [camHUD]; scoreTxt.cameras = [camHUD]; doof.cameras = [camHUD]; - + songPosBG.cameras = [camHUD]; + songPosBar.cameras = [camHUD]; + kadeEngineWatermark.cameras = [camHUD]; + if (loadRep) + replayTxt.cameras = [camHUD]; // if (SONG.song == 'South') // FlxG.camera.alpha = 0.7; // UI_camera.zoom = 1; @@ -1167,6 +1172,10 @@ class PlayState extends MusicBeatState songName.setFormat(Paths.font("vcr.ttf"), 16, FlxColor.WHITE, RIGHT, FlxTextBorderStyle.OUTLINE,FlxColor.BLACK); songName.scrollFactor.set(); add(songName); + + songPosBG.cameras = [camHUD]; + songPosBar.cameras = [camHUD]; + songName.cameras = [camHUD]; } #if desktop @@ -1591,7 +1600,7 @@ class PlayState extends MusicBeatState if (FlxG.save.data.accuracyDisplay) { - scoreTxt.text = "Score:" + (FlxG.save.data.etternaMode ? etternaModeScore + " (" + songScore + ")" : "" + songScore) + " | Misses:" + misses + " | Accuracy:" + truncateFloat(accuracy, 2) + "% | " + generateRanking(); + scoreTxt.text = "Score:" + (FlxG.save.data.etternaMode ? etternaModeScore + " (" + songScore + ")" : "" + songScore) + " | Combo Breaks:" + misses + " | Accuracy:" + truncateFloat(accuracy, 2) + "% | " + generateRanking(); } else { @@ -2038,6 +2047,7 @@ class PlayState extends MusicBeatState { score = -3000; combo = 0; + misses++; health -= 0.2; } shits++; @@ -2049,6 +2059,7 @@ class PlayState extends MusicBeatState { score = -3000; combo = 0; + misses++; health -= 0.2; } ss = false; @@ -2061,6 +2072,7 @@ class PlayState extends MusicBeatState { score = -1000; health -= 0.03; + misses++; combo = 0; } else @@ -2076,6 +2088,7 @@ class PlayState extends MusicBeatState score = -1000; health -= 0.03; combo = 0; + misses++; } else score = 100;