From f06cfe0e03f5c04865c9c5e877a837d700cf4114 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=9C=9EHoovy=E2=9C=9E?= <124418090+MemeHovy@users.noreply.github.com> Date: Wed, 25 Oct 2023 11:44:46 -0400 Subject: [PATCH] Fix for showcase mode & misc (#51) * flixel 5.3 fixes and such * oopsie * Update hmm.json * Update hmm.json * fix for showcase mode * Update ClientPrefs.hx --- source/ClientPrefs.hx | 5 ----- source/PlayState.hx | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/source/ClientPrefs.hx b/source/ClientPrefs.hx index 17ac7b0bcde..ffd1ece6a96 100644 --- a/source/ClientPrefs.hx +++ b/source/ClientPrefs.hx @@ -32,7 +32,6 @@ class ClientPrefs { //default settings if it can't find a save file containing y public static var instaRestart:Bool = false; public static var charsAndBG:Bool = true; public static var lowQuality:Bool = false; - public static var fasterChartLoad:Bool = false; public static var shaders:Bool = true; public static var framerate:Int = 60; public static var cursing:Bool = true; @@ -242,7 +241,6 @@ class ClientPrefs { //default settings if it can't find a save file containing y FlxG.save.data.autosaveInterval = autosaveInterval; FlxG.save.data.autosaveCharts = autosaveCharts; FlxG.save.data.rateNameStuff = rateNameStuff; - FlxG.save.data.fasterChartLoad = fasterChartLoad; FlxG.save.data.longFCName = longFCName; FlxG.save.data.botTxtFade = botTxtFade; FlxG.save.data.noteMotionBlur = noteMotionBlur; @@ -490,9 +488,6 @@ class ClientPrefs { //default settings if it can't find a save file containing y if(FlxG.save.data.showcaseMode != null) { showcaseMode = FlxG.save.data.showcaseMode; } - if(FlxG.save.data.fasterChartLoad != null) { - fasterChartLoad = FlxG.save.data.fasterChartLoad; - } if(FlxG.save.data.autoPause != null) { autoPause = FlxG.save.data.autoPause; } diff --git a/source/PlayState.hx b/source/PlayState.hx index 6cb1a4d21eb..0dc8ecf03b6 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -5047,7 +5047,7 @@ if (ClientPrefs.showNPS) { botplaySine += 180 * elapsed; botplayTxt.alpha = 1 - Math.sin((Math.PI * botplaySine) / 180 * playbackRate); } - if(cpuControlled && ClientPrefs.randomBotplayText && !ClientPrefs.communityGameBot && botplayTxt != null) { + if((botplayTxt != null && cpuControlled && !ClientPrefs.showcaseMode) && ClientPrefs.randomBotplayText && !ClientPrefs.communityGameBot) { if(botplayTxt.text == "this text is gonna kick you out of botplay in 10 seconds" && !botplayUsed || botplayTxt.text == "Your Botplay Free Trial will end in 10 seconds." && !botplayUsed) { botplayUsed = true;