From a058c88f174ba2c0e75633537601a82db5efaeb7 Mon Sep 17 00:00:00 2001 From: JordanSantiagoYT Date: Sat, 9 Nov 2024 19:13:53 -0500 Subject: [PATCH 1/4] oops! the engine watermark was incorrectly positioned for the JSE one. it should be fixed now --- source/PlayState.hx | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/source/PlayState.hx b/source/PlayState.hx index a824423b872..52f9cd7b37d 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -1349,7 +1349,7 @@ class PlayState extends MusicBeatState EngineWatermark.text = "JS Engine v" + MainMenuState.psychEngineJSVersion; EngineWatermark.x = FlxG.width - EngineWatermark.width - 5; case 'JS Engine': - if (!ClientPrefs.downScroll) EngineWatermark.y = FlxG.height * 0.1 + 50; + if (!ClientPrefs.downScroll) EngineWatermark.y = FlxG.height * 0.1 - 70; EngineWatermark.text = "Playing " + SONG.song + " on " + CoolUtil.difficultyString() + " - JSE v" + MainMenuState.psychEngineJSVersion; case 'Dave Engine': EngineWatermark.setFormat(Paths.font("comic.ttf"), 16, FlxColor.WHITE, RIGHT, OUTLINE,FlxColor.BLACK); @@ -1532,7 +1532,7 @@ class PlayState extends MusicBeatState iconP2.cameras = [camHUD]; if (EngineWatermark != null) EngineWatermark.cameras = [camHUD]; judgementCounter.cameras = [camHUD]; - scoreTxt.cameras = [camHUD]; + if (scoreTxt != null) scoreTxt.cameras = [camHUD]; if (botplayTxt != null) botplayTxt.cameras = [camHUD]; timeBar.cameras = [camHUD]; timeBarBG.cameras = [camHUD]; @@ -4965,8 +4965,15 @@ class PlayState extends MusicBeatState if (ClientPrefs.songLoading) FlxG.sound.music.volume = 0; if (ClientPrefs.songLoading) vocals.volume = opponentVocals.volume = 0; - FlxTransitionableState.skipNextTransOut = noTrans; - FlxG.resetState(); + if(noTrans) + { + FlxTransitionableState.skipNextTransOut = true; + FlxG.resetState(); + } + else + { + FlxG.resetState(); + } } public var totalPlayed:Int = 0; From 18777d2f593d7b0125a25c477e46f7b96dfaa714 Mon Sep 17 00:00:00 2001 From: JordanSantiagoYT Date: Sun, 10 Nov 2024 00:15:13 -0500 Subject: [PATCH 2/4] this was stupid --- source/Note.hx | 1 - 1 file changed, 1 deletion(-) diff --git a/source/Note.hx b/source/Note.hx index cd266701dc9..0ec068a363a 100644 --- a/source/Note.hx +++ b/source/Note.hx @@ -529,7 +529,6 @@ class Note extends FlxSprite case 'Rainbow': var superCoolColor = new FlxColor(0xFFFF0000); superCoolColor.hue = (strumTime / 5000 * 360) % 360; - var coolDarkColor = superCoolColor; rgbShader.r = superCoolColor; rgbShader.g = FlxColor.WHITE; rgbShader.b = superCoolColor.getDarkened(0.7); From dcb565309ea428f81eab952b5c94e4c9d9026910 Mon Sep 17 00:00:00 2001 From: JordanSantiagoYT Date: Sun, 10 Nov 2024 12:43:35 -0500 Subject: [PATCH 3/4] idk --- source/PlayState.hx | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/source/PlayState.hx b/source/PlayState.hx index 52f9cd7b37d..3ea45a37d3e 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -358,10 +358,6 @@ class PlayState extends MusicBeatState public var songHits:Int = 0; public var songMisses:Float = 0; public var scoreTxt:FlxText; - var comboTxt:FlxText; - var missTxt:FlxText; - var accuracyTxt:FlxText; - var npsTxt:FlxText; var timeTxt:FlxText; var hitTxt:FlxText; @@ -2489,6 +2485,9 @@ class PlayState extends MusicBeatState } } + var comboInfo = ClientPrefs.showComboInfo; + var showNPS = ClientPrefs.showNPS; + var missString:String = ''; public function updateScore(miss:Bool = false) { scoreTxtUpdateFrame++; @@ -2506,37 +2505,41 @@ class PlayState extends MusicBeatState formattedCombo = formatNumber(combo); formattedNPS = formatNumber(nps); formattedMaxNPS = formatNumber(maxNPS); - npsString = ClientPrefs.showNPS ? ' $divider ' + (cpuControlled && ClientPrefs.botWatermark ? 'Bot ' : '') + 'NPS/Max: ' + formattedNPS + '/' + formattedMaxNPS : ''; + npsString = showNPS ? ' $divider ' + (cpuControlled && ClientPrefs.botWatermark ? 'Bot ' : '') + 'NPS/Max: ' + formattedNPS + '/' + formattedMaxNPS : ''; accuracy = Highscore.floorDecimal(ratingPercent * 100, 2) + '%'; fcString = ratingFC; + missString = (!instakillOnMiss ? switch(ClientPrefs.scoreStyle) + { + case 'Kade Engine', 'VS Impostor': ' $divider Combo Breaks: ' + formattedSongMisses; + case 'Doki Doki+': ' $divider Breaks: ' + formattedSongMisses; + default: + ' $divider Misses: ' + formattedSongMisses; + } : ''); botText = cpuControlled && ClientPrefs.botWatermark ? ' $divider Botplay Mode' : ''; if (cpuControlled && ClientPrefs.botWatermark) - tempScore = 'Bot Score: ' + formattedScore + (ClientPrefs.showComboInfo ? ' $divider Bot Combo: ' + formattedCombo : '') + npsString + botText; + tempScore = 'Bot Score: ' + formattedScore + (comboInfo ? ' $divider Bot Combo: ' + formattedCombo : '') + npsString + botText; else switch (ClientPrefs.scoreStyle) { - case 'Kade Engine': - tempScore = 'Score: ' + formattedScore + ' $divider Combo Breaks: ' + formattedSongMisses + (ClientPrefs.showComboInfo ? ' $divider Combo: ' + formattedCombo : '') + npsString + ' $divider Accuracy: ' + accuracy + ' $divider (' + fcString + ') ' + ratingName; - - case "Doki Doki+": - tempScore = 'Score: ' + formattedScore + ' $divider Breaks: ' + formattedSongMisses + (ClientPrefs.showComboInfo ? ' $divider Combo: ' + formattedCombo : '') + npsString + ' $divider Accuracy: ' + accuracy + ' $divider (' + fcString + ') ' + ratingName; + case 'Kade Engine', 'Doki Doki+': + tempScore = 'Score: ' + formattedScore + missString + (comboInfo ? ' $divider Combo: ' + formattedCombo : '') + npsString + ' $divider Accuracy: ' + accuracy + ' $divider (' + fcString + ') ' + ratingName; case "Dave Engine": - tempScore = 'Score: ' + formattedScore + ' $divider Misses: ' + formattedSongMisses + (ClientPrefs.showComboInfo ? ' $divider Combo: ' + formattedCombo : '') + npsString + ' $divider Accuracy: ' + accuracy + ' $divider ' + fcString; + tempScore = 'Score: ' + formattedScore + missString + (comboInfo ? ' $divider Combo: ' + formattedCombo : '') + npsString + ' $divider Accuracy: ' + accuracy + ' $divider ' + fcString; case "Forever Engine": - tempScore = 'Score: ' + formattedScore + ' $divider Accuracy: ' + Highscore.floorDecimal(ratingPercent * 100, 2) + '% [' + fcString + ']' + ' $divider Combo Breaks: ' + formattedSongMisses + (ClientPrefs.showComboInfo ? ' $divider Combo: ' + formattedCombo : '') + npsString + ' $divider Rank: ' + ratingName; + tempScore = 'Score: ' + formattedScore + ' $divider Accuracy: $accuracy [' + fcString + ']' + missString + (comboInfo ? ' $divider Combo: ' + formattedCombo : '') + npsString + ' $divider Rank: ' + ratingName; case "Psych Engine", "JS Engine", "TGT V4": - tempScore = 'Score: ' + formattedScore + ' $divider Misses: ' + formattedSongMisses + (ClientPrefs.showComboInfo ? ' $divider Combo: ' + formattedCombo : '') + npsString + ' $divider Rating: ' + ratingName + (ratingName != '?' ? ' (${accuracy}) - $fcString' : ''); + tempScore = 'Score: ' + formattedScore + missString + (comboInfo ? ' $divider Combo: ' + formattedCombo : '') + npsString + ' $divider Rating: ' + ratingName + (ratingName != '?' ? ' (${accuracy}) - $fcString' : ''); case "Leather Engine": - tempScore = '< Score: ' + formattedScore + ' $divider Misses: ' + formattedSongMisses + (ClientPrefs.showComboInfo ? ' $divider Combo: ' + formattedCombo : '') + npsString + ' $divider Rating: ' + ratingName + (ratingName != '?' ? ' (${accuracy}) - $fcString' : ''); + tempScore = '< Score: ' + formattedScore + missString + (comboInfo ? ' $divider Combo: ' + formattedCombo : '') + npsString + ' $divider Rating: ' + ratingName + (ratingName != '?' ? ' (${accuracy}) - $fcString' : ''); case 'VS Impostor': - tempScore = 'Score: ' + formattedScore + ' $divider Combo Breaks: ' + formattedSongMisses + (ClientPrefs.showComboInfo ? ' $divider Combo: ' + formattedCombo : '') + npsString + ' $divider Accuracy: ' + Highscore.floorDecimal(ratingPercent * 100, 2) + '% [' + fcString + ']'; + tempScore = 'Score: ' + formattedScore + missString + (comboInfo ? ' $divider Combo: ' + formattedCombo : '') + npsString + ' $divider Accuracy: $accuracy [' + fcString + ']'; case 'Vanilla': tempScore = 'Score: ' + formattedScore; @@ -6436,6 +6439,8 @@ class PlayState extends MusicBeatState if (SONG.notes[curSection].changeBPM) { Conductor.changeBPM(SONG.notes[curSection].bpm); + SustainSplash.startCrochet = Conductor.stepCrochet; + SustainSplash.frameRate = Math.floor(24 / 100 * Conductor.bpm); setOnLuas('curBpm', Conductor.bpm); setOnLuas('crochet', Conductor.crochet); setOnLuas('stepCrochet', Conductor.stepCrochet); From 8bd6d1e34d939e0e67900bc89fe0e23394677e81 Mon Sep 17 00:00:00 2001 From: JordanSantiagoYT Date: Mon, 11 Nov 2024 00:31:52 -0500 Subject: [PATCH 4/4] interesting --- assets/preload/data/funnyTips.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/preload/data/funnyTips.txt b/assets/preload/data/funnyTips.txt index 152a9636bf5..c32c1cc618f 100644 --- a/assets/preload/data/funnyTips.txt +++ b/assets/preload/data/funnyTips.txt @@ -95,4 +95,5 @@ Did you know that if you press 7 twice while on this menu, nothing will happen? If your game is lagging, try changing "Anti-Aliasing" to false If your game is lagging, try closing some process in your peecee If your game is lagging, just buy a new pc! -Jordan when added buldi JSE 1.38.0 Jordan \ No newline at end of file +Jordan when added buldi JSE 1.38.0 Jordan +JS Engine is mentioned in the Funkipedia Mods Wiki exactly 7 times. \ No newline at end of file