From c0c671200fec14c4d3ded455afda8a0fffc06c20 Mon Sep 17 00:00:00 2001 From: JordanSantiagoYT Date: Thu, 26 Oct 2023 17:25:31 -0400 Subject: [PATCH] gah removed the gameplay changer substate for android (ONLY IN THE PAUSE MENU) because it causes issues when in the pause menu --- source/GameplayChangersSubstate.hx | 3 ++- source/PauseSubState.hx | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/source/GameplayChangersSubstate.hx b/source/GameplayChangersSubstate.hx index 74af8672752..9a236b9e8af 100644 --- a/source/GameplayChangersSubstate.hx +++ b/source/GameplayChangersSubstate.hx @@ -27,6 +27,7 @@ import flixel.util.FlxTimer; import flixel.input.keyboard.FlxKey; import flixel.graphics.FlxGraphic; import Controls; +import flixel.FlxState; using StringTools; @@ -379,7 +380,7 @@ class GameplayChangersSubstate extends MusicBeatSubstate clearHold(); } } - if(controls.RESET && FlxG.keys.pressed.SHIFT #if android || virtualPad.buttonC.justPressed #end) + if(controls.RESET && FlxG.keys.pressed.SHIFT #if android || virtualPad != null && virtualPad.buttonC.justPressed #end) { for (i in 0...optionsArray.length) { diff --git a/source/PauseSubState.hx b/source/PauseSubState.hx index c935eeb451a..bc9927e6b16 100644 --- a/source/PauseSubState.hx +++ b/source/PauseSubState.hx @@ -43,6 +43,9 @@ class PauseSubState extends MusicBeatSubstate { super(); if(CoolUtil.difficulties.length < 2) menuItemsOG.remove('Change Difficulty'); //No need to change difficulty if there is only one! + #if android + menuItemsOG.remove('Change Gameplay Settings'); + #end if(botplayLockout) menuItemsOG.remove('Toggle Botplay'); //you cant toggle it on MWAHAHAHAHAHA if(PlayState.chartingMode) @@ -311,8 +314,8 @@ class PauseSubState extends MusicBeatSubstate FlxG.sound.music.time = pauseMusic.time; } case "Exit": + if (FlxG.random.int(0, 999) == 10) menuItemsExit = ['Exit To Your Mother']; menuItems = menuItemsExit; - if (FlxG.random.bool(0.1)) menuItemsExit[0] = 'Exit To Your Mother'; regenMenu(); } }