From 067408e7a071e415bb62e1a1573b6d3537518f8d Mon Sep 17 00:00:00 2001 From: JordanSantiagoYT Date: Wed, 8 Nov 2023 12:31:51 -0500 Subject: [PATCH] testing a thing --- source/OutdatedState.hx | 30 ++++++++++++-------------- source/PlayState.hx | 4 +++- source/options/SuperSecretDebugMenu.hx | 2 +- versionTest.downloadMe | 11 ++++++++++ 4 files changed, 29 insertions(+), 18 deletions(-) create mode 100644 versionTest.downloadMe diff --git a/source/OutdatedState.hx b/source/OutdatedState.hx index 31c211e6994..801dfa3210e 100644 --- a/source/OutdatedState.hx +++ b/source/OutdatedState.hx @@ -44,22 +44,18 @@ class OutdatedState extends MusicBeatState + "\n\nPress A button to view the full changelog and update\nor B button to ignore this", 32); #else - warnText = new FlxText(0, 0, FlxG.width, - "Your version of JS Engine is outdated!\nYou are on " - + MainMenuState.psychEngineJSVersion - + "\nwhile the most recent version is " - + TitleState.updateVersion - + "." - //+ "\n\nHere's what's new:\n\n" - //+ currChanges - //+ "\n& more changes and bugfixes in the full changelog" - + "\n\nPress Space to view the full changelog, ENTER to update\nor ESCAPE to ignore this", - 32); - #end - warnText.setFormat("VCR OSD Mono", 32, FlxColor.WHITE, CENTER); - warnText.screenCenter(Y); + warnText = new FlxText(0, 10, FlxG.width, + "HEY! Your JS Engine is outdated!\n" + + 'v$MainMenuState.psychEngineJSVersion < v$TitleState.updateVersion\n' + ,32); + warnText.setFormat("VCR OSD Mono", 32, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + warnText.screenCenter(X); add(warnText); + var changelog = new FlxText(100, txt.y + txt.height + 20, 1080, currChanges, 16); + changelog.setFormat(Paths.font("vcr.ttf"), Std.int(16), FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + add(changelog); + #if android addVirtualPad(NONE, A_B); #end @@ -70,8 +66,10 @@ class OutdatedState extends MusicBeatState if(!leftState) { if (FlxG.keys.justPressed.ENTER) { leftState = true; - MusicBeatState.switchState(new UpdateState()); - //CoolUtil.browserLoad("https://github.com/JordanSantiagoYT/FNF-PsychEngine-NoBotplayLag/releases/latest"); + #if windows MusicBeatState.switchState(new UpdateState()); + #else + CoolUtil.browserLoad("https://github.com/JordanSantiagoYT/FNF-PsychEngine-NoBotplayLag/releases/latest"); + #end } if (FlxG.keys.justPressed.SPACE) { CoolUtil.browserLoad("https://github.com/JordanSantiagoYT/FNF-PsychEngine-NoBotplayLag/releases/latest"); diff --git a/source/PlayState.hx b/source/PlayState.hx index f4fe3feba2b..afb4cc85565 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -7484,6 +7484,8 @@ if (unspawnNotes[0] != null && (Conductor.songPosition + 1800 / songSpeed) >= fi //trace(noteDiff, ' ' + Math.abs(note.strumTime - Conductor.songPosition)); if (note != null && note.isSustainNote && ClientPrefs.holdNoteHits) noteDiff = 0; var wife:Float = EtternaFunctions.wife3(noteDiff, Conductor.timeScale); + noteDiff /= playbackRate; + wife /= playbackRate; // boyfriend.playAnim('hey'); vocals.volume = 1; @@ -7514,7 +7516,7 @@ if (unspawnNotes[0] != null && (Conductor.songPosition + 1800 / songSpeed) >= fi if (noteDiff > ClientPrefs.marvWindow && noteDiff < ClientPrefs.sickWindow && !ClientPrefs.noMarvJudge) maxScore -= 150 * Std.int(polyphony); //if you enable marvelous judges and hit a sick, lower the max score by 150 points. otherwise it won't make sense //tryna do MS based judgment due to popular demand - var daRating:Rating = Conductor.judgeNote(note, noteDiff / playbackRate); + var daRating:Rating = Conductor.judgeNote(note, noteDiff); if (!ClientPrefs.complexAccuracy) totalNotesHit += daRating.ratingMod; if (ClientPrefs.complexAccuracy) totalNotesHit += wife; diff --git a/source/options/SuperSecretDebugMenu.hx b/source/options/SuperSecretDebugMenu.hx index 2a9bf0f275d..b5a4146d7b1 100644 --- a/source/options/SuperSecretDebugMenu.hx +++ b/source/options/SuperSecretDebugMenu.hx @@ -146,7 +146,7 @@ class SuperSecretDebugMenu extends BaseOptionsMenu function doDaUpdate():Void { if(ClientPrefs.checkForUpdates) { trace('checking for update'); - var http = new haxe.Http("https://raw.githubusercontent.com/JordanSantiagoYT/FNF-PsychEngine-NoBotplayLag/main/version.downloadMe"); + var http = new haxe.Http("https://raw.githubusercontent.com/JordanSantiagoYT/FNF-PsychEngine-NoBotplayLag/main/versionTest.downloadMe"); var returnedData:Array = []; http.onData = function (data:String) diff --git a/versionTest.downloadMe b/versionTest.downloadMe new file mode 100644 index 00000000000..8d69675ba52 --- /dev/null +++ b/versionTest.downloadMe @@ -0,0 +1,11 @@ +1.13.0; +Added the tankman ascension meme from Guns +ScoreTxt Size - Customize how big your scoreTxt is! +Icons now fully work properly even if you play as the opponent +Removed Optimized Chart Loading +Fixed a potential memory leak that resulted from updating scoreTxt +Added a debug info option that allows you to see more info about your session including the current state as well as your OS version! +Added Song Credits - Now you can give other composers credit at the beginning of a song! +Added events to toggle camera bouncing +Added the time bar color change from Leather Engine 0.5.0 +Added 1 new Icon Bounce - Strident Crisis \ No newline at end of file