diff --git a/src/configs/pad_generic.ts b/src/configs/pad_generic.ts index 491ed392713..1fd5c413a12 100644 --- a/src/configs/pad_generic.ts +++ b/src/configs/pad_generic.ts @@ -79,6 +79,12 @@ const pad_generic = { LS: SettingGamepad.Button_Speed_Up, RS: SettingGamepad.Button_Slow_Down }, + blacklist: [ + "LC_N", + "LC_S", + "LC_W", + "LC_E", + ] }; export default pad_generic; diff --git a/src/system/settings-gamepad.ts b/src/system/settings-gamepad.ts index 386ff8a0202..34ec7d192e0 100644 --- a/src/system/settings-gamepad.ts +++ b/src/system/settings-gamepad.ts @@ -31,23 +31,23 @@ export enum SettingGamepad { export const settingGamepadOptions: SettingOptions = { [SettingGamepad.Default_Controller]: ['Default', 'Change'], [SettingGamepad.Gamepad_Support]: ['Auto', 'Disabled'], - [SettingGamepad.Button_Up]: [`KEY ${Button.UP.toString()}`, 'Change'], - [SettingGamepad.Button_Down]: [`KEY ${Button.DOWN.toString()}`, 'Change'], - [SettingGamepad.Button_Left]: [`KEY ${Button.LEFT.toString()}`, 'Change'], - [SettingGamepad.Button_Right]: [`KEY ${Button.RIGHT.toString()}`, 'Change'], - [SettingGamepad.Button_Action]: [`KEY ${Button.ACTION.toString()}`, 'Change'], - [SettingGamepad.Button_Cancel]: [`KEY ${Button.CANCEL.toString()}`, 'Change'], - [SettingGamepad.Button_Menu]: [`KEY ${Button.MENU.toString()}`, 'Change'], - [SettingGamepad.Button_Stats]: [`KEY ${Button.STATS.toString()}`, 'Change'], - [SettingGamepad.Button_Cycle_Form]: [`KEY ${Button.CYCLE_FORM.toString()}`, 'Change'], - [SettingGamepad.Button_Cycle_Shiny]: [`KEY ${Button.CYCLE_SHINY.toString()}`, 'Change'], - [SettingGamepad.Button_Cycle_Gender]: [`KEY ${Button.CYCLE_GENDER.toString()}`, 'Change'], - [SettingGamepad.Button_Cycle_Ability]: [`KEY ${Button.CYCLE_ABILITY.toString()}`, 'Change'], - [SettingGamepad.Button_Cycle_Nature]: [`KEY ${Button.CYCLE_NATURE.toString()}`, 'Change'], - [SettingGamepad.Button_Cycle_Variant]: [`KEY ${Button.CYCLE_VARIANT.toString()}`, 'Change'], - [SettingGamepad.Button_Speed_Up]: [`KEY ${Button.SPEED_UP.toString()}`, 'Change'], - [SettingGamepad.Button_Slow_Down]: [`KEY ${Button.SLOW_DOWN.toString()}`, 'Change'], - [SettingGamepad.Button_Submit]: [`KEY ${Button.SUBMIT.toString()}`, 'Change'] + [SettingGamepad.Button_Up]: [`KEY ${Button.UP.toString()}`, 'Press action to assign'], + [SettingGamepad.Button_Down]: [`KEY ${Button.DOWN.toString()}`, 'Press action to assign'], + [SettingGamepad.Button_Left]: [`KEY ${Button.LEFT.toString()}`, 'Press action to assign'], + [SettingGamepad.Button_Right]: [`KEY ${Button.RIGHT.toString()}`, 'Press action to assign'], + [SettingGamepad.Button_Action]: [`KEY ${Button.ACTION.toString()}`, 'Press action to assign'], + [SettingGamepad.Button_Cancel]: [`KEY ${Button.CANCEL.toString()}`, 'Press action to assign'], + [SettingGamepad.Button_Menu]: [`KEY ${Button.MENU.toString()}`, 'Press action to assign'], + [SettingGamepad.Button_Stats]: [`KEY ${Button.STATS.toString()}`, 'Press action to assign'], + [SettingGamepad.Button_Cycle_Form]: [`KEY ${Button.CYCLE_FORM.toString()}`, 'Press action to assign'], + [SettingGamepad.Button_Cycle_Shiny]: [`KEY ${Button.CYCLE_SHINY.toString()}`, 'Press action to assign'], + [SettingGamepad.Button_Cycle_Gender]: [`KEY ${Button.CYCLE_GENDER.toString()}`, 'Press action to assign'], + [SettingGamepad.Button_Cycle_Ability]: [`KEY ${Button.CYCLE_ABILITY.toString()}`, 'Press action to assign'], + [SettingGamepad.Button_Cycle_Nature]: [`KEY ${Button.CYCLE_NATURE.toString()}`, 'Press action to assign'], + [SettingGamepad.Button_Cycle_Variant]: [`KEY ${Button.CYCLE_VARIANT.toString()}`, 'Press action to assign'], + [SettingGamepad.Button_Speed_Up]: [`KEY ${Button.SPEED_UP.toString()}`, 'Press action to assign'], + [SettingGamepad.Button_Slow_Down]: [`KEY ${Button.SLOW_DOWN.toString()}`, 'Press action to assign'], + [SettingGamepad.Button_Submit]: [`KEY ${Button.SUBMIT.toString()}`, 'Press action to assign'], }; export const settingGamepadDefaults: SettingDefaults = { diff --git a/src/system/settings-keyboard.ts b/src/system/settings-keyboard.ts index 2b2b0e32a17..57dbcac16cf 100644 --- a/src/system/settings-keyboard.ts +++ b/src/system/settings-keyboard.ts @@ -5,7 +5,7 @@ import {Mode} from "#app/ui/ui"; import SettingsKeyboardUiHandler from "#app/ui/settings/settings-keyboard-ui-handler"; export enum SettingKeyboard { - Default_Layout = "DEFAULT_LAYOUT", + // Default_Layout = "DEFAULT_LAYOUT", Button_Up = "BUTTON_UP", Alt_Button_Up = "ALT_BUTTON_UP", Button_Down = "BUTTON_DOWN", @@ -43,45 +43,45 @@ export enum SettingKeyboard { } export const settingKeyboardOptions: SettingOptions = { - [SettingKeyboard.Default_Layout]: ['Default'], - [SettingKeyboard.Button_Up]: [`KEY ${Button.UP.toString()}`, 'Change'], - [SettingKeyboard.Alt_Button_Up]: [`KEY ${Button.UP.toString()}`, 'Change'], - [SettingKeyboard.Button_Down]: [`KEY ${Button.DOWN.toString()}`, 'Change'], - [SettingKeyboard.Alt_Button_Down]: [`KEY ${Button.DOWN.toString()}`, 'Change'], - [SettingKeyboard.Button_Left]: [`KEY ${Button.LEFT.toString()}`, 'Change'], - [SettingKeyboard.Alt_Button_Left]: [`KEY ${Button.LEFT.toString()}`, 'Change'], - [SettingKeyboard.Button_Right]: [`KEY ${Button.RIGHT.toString()}`, 'Change'], - [SettingKeyboard.Alt_Button_Right]: [`KEY ${Button.RIGHT.toString()}`, 'Change'], - [SettingKeyboard.Button_Action]: [`KEY ${Button.ACTION.toString()}`, 'Change'], - [SettingKeyboard.Alt_Button_Action]: [`KEY ${Button.ACTION.toString()}`, 'Change'], - [SettingKeyboard.Button_Cancel]: [`KEY ${Button.CANCEL.toString()}`, 'Change'], - [SettingKeyboard.Alt_Button_Cancel]: [`KEY ${Button.CANCEL.toString()}`, 'Change'], - [SettingKeyboard.Button_Menu]: [`KEY ${Button.MENU.toString()}`, 'Change'], - [SettingKeyboard.Alt_Button_Menu]: [`KEY ${Button.MENU.toString()}`, 'Change'], - [SettingKeyboard.Button_Stats]: [`KEY ${Button.STATS.toString()}`, 'Change'], - [SettingKeyboard.Alt_Button_Stats]: [`KEY ${Button.STATS.toString()}`, 'Change'], - [SettingKeyboard.Button_Cycle_Form]: [`KEY ${Button.CYCLE_FORM.toString()}`, 'Change'], - [SettingKeyboard.Alt_Button_Cycle_Form]: [`KEY ${Button.CYCLE_FORM.toString()}`, 'Change'], - [SettingKeyboard.Button_Cycle_Shiny]: [`KEY ${Button.CYCLE_SHINY.toString()}`, 'Change'], - [SettingKeyboard.Alt_Button_Cycle_Shiny]: [`KEY ${Button.CYCLE_SHINY.toString()}`, 'Change'], - [SettingKeyboard.Button_Cycle_Gender]: [`KEY ${Button.CYCLE_GENDER.toString()}`, 'Change'], - [SettingKeyboard.Alt_Button_Cycle_Gender]: [`KEY ${Button.CYCLE_GENDER.toString()}`, 'Change'], - [SettingKeyboard.Button_Cycle_Ability]: [`KEY ${Button.CYCLE_ABILITY.toString()}`, 'Change'], - [SettingKeyboard.Alt_Button_Cycle_Ability]: [`KEY ${Button.CYCLE_ABILITY.toString()}`, 'Change'], - [SettingKeyboard.Button_Cycle_Nature]: [`KEY ${Button.CYCLE_NATURE.toString()}`, 'Change'], - [SettingKeyboard.Alt_Button_Cycle_Nature]: [`KEY ${Button.CYCLE_NATURE.toString()}`, 'Change'], - [SettingKeyboard.Button_Cycle_Variant]: [`KEY ${Button.CYCLE_VARIANT.toString()}`, 'Change'], - [SettingKeyboard.Alt_Button_Cycle_Variant]: [`KEY ${Button.CYCLE_VARIANT.toString()}`, 'Change'], - [SettingKeyboard.Button_Speed_Up]: [`KEY ${Button.SPEED_UP.toString()}`, 'Change'], - [SettingKeyboard.Alt_Button_Speed_Up]: [`KEY ${Button.SPEED_UP.toString()}`, 'Change'], - [SettingKeyboard.Button_Slow_Down]: [`KEY ${Button.SLOW_DOWN.toString()}`, 'Change'], - [SettingKeyboard.Alt_Button_Slow_Down]: [`KEY ${Button.SLOW_DOWN.toString()}`, 'Change'], - [SettingKeyboard.Button_Submit]: [`KEY ${Button.SUBMIT.toString()}`, 'Change'], - [SettingKeyboard.Alt_Button_Submit]: [`KEY ${Button.SUBMIT.toString()}`, 'Change'] + // [SettingKeyboard.Default_Layout]: ['Default'], + [SettingKeyboard.Button_Up]: [`KEY ${Button.UP.toString()}`, 'Press action to assign'], + [SettingKeyboard.Alt_Button_Up]: [`KEY ${Button.UP.toString()}`, 'Press action to assign'], + [SettingKeyboard.Button_Down]: [`KEY ${Button.DOWN.toString()}`, 'Press action to assign'], + [SettingKeyboard.Alt_Button_Down]: [`KEY ${Button.DOWN.toString()}`, 'Press action to assign'], + [SettingKeyboard.Button_Left]: [`KEY ${Button.LEFT.toString()}`, 'Press action to assign'], + [SettingKeyboard.Alt_Button_Left]: [`KEY ${Button.LEFT.toString()}`, 'Press action to assign'], + [SettingKeyboard.Button_Right]: [`KEY ${Button.RIGHT.toString()}`, 'Press action to assign'], + [SettingKeyboard.Alt_Button_Right]: [`KEY ${Button.RIGHT.toString()}`, 'Press action to assign'], + [SettingKeyboard.Button_Action]: [`KEY ${Button.ACTION.toString()}`, 'Press action to assign'], + [SettingKeyboard.Alt_Button_Action]: [`KEY ${Button.ACTION.toString()}`, 'Press action to assign'], + [SettingKeyboard.Button_Cancel]: [`KEY ${Button.CANCEL.toString()}`, 'Press action to assign'], + [SettingKeyboard.Alt_Button_Cancel]: [`KEY ${Button.CANCEL.toString()}`, 'Press action to assign'], + [SettingKeyboard.Button_Menu]: [`KEY ${Button.MENU.toString()}`, 'Press action to assign'], + [SettingKeyboard.Alt_Button_Menu]: [`KEY ${Button.MENU.toString()}`, 'Press action to assign'], + [SettingKeyboard.Button_Stats]: [`KEY ${Button.STATS.toString()}`, 'Press action to assign'], + [SettingKeyboard.Alt_Button_Stats]: [`KEY ${Button.STATS.toString()}`, 'Press action to assign'], + [SettingKeyboard.Button_Cycle_Form]: [`KEY ${Button.CYCLE_FORM.toString()}`, 'Press action to assign'], + [SettingKeyboard.Alt_Button_Cycle_Form]: [`KEY ${Button.CYCLE_FORM.toString()}`, 'Press action to assign'], + [SettingKeyboard.Button_Cycle_Shiny]: [`KEY ${Button.CYCLE_SHINY.toString()}`, 'Press action to assign'], + [SettingKeyboard.Alt_Button_Cycle_Shiny]: [`KEY ${Button.CYCLE_SHINY.toString()}`, 'Press action to assign'], + [SettingKeyboard.Button_Cycle_Gender]: [`KEY ${Button.CYCLE_GENDER.toString()}`, 'Press action to assign'], + [SettingKeyboard.Alt_Button_Cycle_Gender]: [`KEY ${Button.CYCLE_GENDER.toString()}`, 'Press action to assign'], + [SettingKeyboard.Button_Cycle_Ability]: [`KEY ${Button.CYCLE_ABILITY.toString()}`, 'Press action to assign'], + [SettingKeyboard.Alt_Button_Cycle_Ability]: [`KEY ${Button.CYCLE_ABILITY.toString()}`, 'Press action to assign'], + [SettingKeyboard.Button_Cycle_Nature]: [`KEY ${Button.CYCLE_NATURE.toString()}`, 'Press action to assign'], + [SettingKeyboard.Alt_Button_Cycle_Nature]: [`KEY ${Button.CYCLE_NATURE.toString()}`, 'Press action to assign'], + [SettingKeyboard.Button_Cycle_Variant]: [`KEY ${Button.CYCLE_VARIANT.toString()}`, 'Press action to assign'], + [SettingKeyboard.Alt_Button_Cycle_Variant]: [`KEY ${Button.CYCLE_VARIANT.toString()}`, 'Press action to assign'], + [SettingKeyboard.Button_Speed_Up]: [`KEY ${Button.SPEED_UP.toString()}`, 'Press action to assign'], + [SettingKeyboard.Alt_Button_Speed_Up]: [`KEY ${Button.SPEED_UP.toString()}`, 'Press action to assign'], + [SettingKeyboard.Button_Slow_Down]: [`KEY ${Button.SLOW_DOWN.toString()}`, 'Press action to assign'], + [SettingKeyboard.Alt_Button_Slow_Down]: [`KEY ${Button.SLOW_DOWN.toString()}`, 'Press action to assign'], + [SettingKeyboard.Button_Submit]: [`KEY ${Button.SUBMIT.toString()}`, 'Press action to assign'], + [SettingKeyboard.Alt_Button_Submit]: [`KEY ${Button.SUBMIT.toString()}`, 'Press action to assign'], }; export const settingKeyboardDefaults: SettingDefaults = { - [SettingKeyboard.Default_Layout]: 0, + // [SettingKeyboard.Default_Layout]: 0, [SettingKeyboard.Button_Up]: 0, [SettingKeyboard.Alt_Button_Up]: 0, [SettingKeyboard.Button_Down]: 0, @@ -168,6 +168,7 @@ export function setSettingKeyboard(scene: BattleScene, setting: SettingKeyboard, const cancelHandler = (success: boolean = false) : boolean => { scene.ui.revertMode(); (scene.ui.getHandler() as SettingsKeyboardUiHandler).updateBindings(); + (scene.ui.getHandler() as SettingsKeyboardUiHandler).updateBindings(); return success; } scene.ui.setOverlayMode(Mode.KEYBOARD_BINDING, { @@ -177,27 +178,27 @@ export function setSettingKeyboard(scene: BattleScene, setting: SettingKeyboard, } } break; - case SettingKeyboard.Default_Layout: - if (value && scene.ui) { - const cancelHandler = () => { - scene.ui.revertMode(); - (scene.ui.getHandler() as SettingsKeyboardUiHandler).setOptionCursor(Object.values(SettingKeyboard).indexOf(SettingKeyboard.Default_Layout), 0, true); - (scene.ui.getHandler() as SettingsKeyboardUiHandler).updateBindings(); - return false; - }; - const changeKeyboardHandler = (keyboardLayout: string) => { - scene.inputController.setChosenKeyboardLayout(keyboardLayout); - cancelHandler(); - return true; - }; - scene.ui.setOverlayMode(Mode.OPTION_SELECT, { - options: [{ - label: 'Default', - handler: changeKeyboardHandler, - }] - }); - return false; - } + // case SettingKeyboard.Default_Layout: + // if (value && scene.ui) { + // const cancelHandler = () => { + // scene.ui.revertMode(); + // (scene.ui.getHandler() as SettingsKeyboardUiHandler).setOptionCursor(Object.values(SettingKeyboard).indexOf(SettingKeyboard.Default_Layout), 0, true); + // (scene.ui.getHandler() as SettingsKeyboardUiHandler).updateBindings(); + // return false; + // }; + // const changeKeyboardHandler = (keyboardLayout: string) => { + // scene.inputController.setChosenKeyboardLayout(keyboardLayout); + // cancelHandler(); + // return true; + // }; + // scene.ui.setOverlayMode(Mode.OPTION_SELECT, { + // options: [{ + // label: 'Default', + // handler: changeKeyboardHandler, + // }] + // }); + // return false; + // } } return true; diff --git a/src/ui/settings/abrast-binding-ui-handler.ts b/src/ui/settings/abrast-binding-ui-handler.ts index 9a46129a017..097cb0a3e86 100644 --- a/src/ui/settings/abrast-binding-ui-handler.ts +++ b/src/ui/settings/abrast-binding-ui-handler.ts @@ -4,6 +4,7 @@ import {Mode} from "../ui"; import {addWindow} from "../ui-theme"; import {addTextObject, TextStyle} from "../text"; import {Button} from "../../enums/buttons"; +import {SettingKeyboard} from "#app/system/settings-keyboard"; /** * Abstract class for handling UI elements related to button bindings. @@ -24,7 +25,6 @@ export default abstract class AbstractBindingUiHandler extends UiHandler { protected actionLabel: Phaser.GameObjects.Text; protected cancelLabel: Phaser.GameObjects.Text; - // State for listening and button pressed tracking. protected listening: boolean = false; protected buttonPressed: number | null = null; @@ -36,6 +36,8 @@ export default abstract class AbstractBindingUiHandler extends UiHandler { protected cancelFn: (boolean?) => boolean; protected swapAction: () => boolean; + protected confirmText: string; + // The specific setting being modified. protected target; @@ -105,7 +107,7 @@ export default abstract class AbstractBindingUiHandler extends UiHandler { this.cancelLabel.setOrigin(0, 0.5); this.cancelLabel.setPositionRelative(this.actionBg, 10, this.actionBg.height / 2); - this.actionLabel = addTextObject(this.scene, 0, 0, 'Confirm Swap', TextStyle.SETTINGS_LABEL); + this.actionLabel = addTextObject(this.scene, 0, 0, this.confirmText, TextStyle.SETTINGS_LABEL); this.actionLabel.setOrigin(0, 0.5); this.actionLabel.setPositionRelative(this.actionBg, this.actionBg.width - 75, this.actionBg.height / 2); diff --git a/src/ui/settings/abstract-settings-ui-handler.ts b/src/ui/settings/abstract-settings-ui-handler.ts index 2b78bb646dc..541a9371f67 100644 --- a/src/ui/settings/abstract-settings-ui-handler.ts +++ b/src/ui/settings/abstract-settings-ui-handler.ts @@ -6,6 +6,7 @@ import {addWindow} from "../ui-theme"; import {addTextObject, TextStyle} from "../text"; import {Button} from "../../enums/buttons"; import {getIconWithSettingName, getKeyWithSettingName} from "#app/configs/configHandler"; +import {setSettingKeyboard, SettingKeyboard} from "#app/system/settings-keyboard"; export interface InputsIcons { [key: string]: Phaser.GameObjects.Sprite; @@ -63,6 +64,7 @@ export default abstract class AbstractSettingsUiUiHandler extends UiHandler { abstract navigateMenuRight(): boolean; abstract saveSettingToLocalStorage(setting, cursor): void; abstract getActiveConfig(): InterfaceConfig; + abstract setSetting(scene: BattleScene, setting, value: integer): boolean; /** * Constructor for the AbstractSettingsUiUiHandler. @@ -388,6 +390,11 @@ export default abstract class AbstractSettingsUiUiHandler extends UiHandler { } else { const cursor = this.cursor + this.scrollCursor; // Calculate the absolute cursor position. switch (button) { + case Button.ACTION: + if (!this.optionCursors || !this.optionValueLabels) return; + const setting = this.settingDevice[Object.keys(this.settingDevice)[cursor]]; + success = this.setSetting(this.scene, setting, 1); + break; case Button.UP: // Move up in the menu. if (!this.optionValueLabels) return false; if (cursor) { // If not at the top, move the cursor up. @@ -420,16 +427,16 @@ export default abstract class AbstractSettingsUiUiHandler extends UiHandler { success = successA && successB; // Indicates a successful cursor and scroll adjustment. } break; - case Button.LEFT: // Move selection left within the current option set. - if (!this.optionCursors || !this.optionValueLabels) return; - if (this.optionCursors[cursor]) - success = this.setOptionCursor(cursor, this.optionCursors[cursor] - 1, true); - break; - case Button.RIGHT: // Move selection right within the current option set. - if (!this.optionCursors || !this.optionValueLabels) return; - if (this.optionCursors[cursor] < this.optionValueLabels[cursor].length - 1) - success = this.setOptionCursor(cursor, this.optionCursors[cursor] + 1, true); - break; + // case Button.LEFT: // Move selection left within the current option set. + // if (!this.optionCursors || !this.optionValueLabels) return; + // if (this.optionCursors[cursor]) + // success = this.setOptionCursor(cursor, this.optionCursors[cursor] - 1, true); + // break; + // case Button.RIGHT: // Move selection right within the current option set. + // if (!this.optionCursors || !this.optionValueLabels) return; + // if (this.optionCursors[cursor] < this.optionValueLabels[cursor].length - 1) + // success = this.setOptionCursor(cursor, this.optionCursors[cursor] + 1, true); + // break; case Button.CYCLE_FORM: success = this.navigateMenuLeft(); break; diff --git a/src/ui/settings/gamepad-binding-ui-handler.ts b/src/ui/settings/gamepad-binding-ui-handler.ts index a84b46b8941..e2b56e85c5c 100644 --- a/src/ui/settings/gamepad-binding-ui-handler.ts +++ b/src/ui/settings/gamepad-binding-ui-handler.ts @@ -9,8 +9,8 @@ export default class GamepadBindingUiHandler extends AbstractBindingUiHandler { constructor(scene: BattleScene, mode: Mode) { super(scene, mode); - // Listen to gamepad button down events to initiate binding. - scene.input.gamepad.on('down', this.gamepadButtonDown, this); + this.scene.input.gamepad.on('down', this.gamepadButtonDown, this); + this.confirmText = "Confirm swap"; } getSelectedDevice() { @@ -18,9 +18,8 @@ export default class GamepadBindingUiHandler extends AbstractBindingUiHandler { } gamepadButtonDown(pad: Phaser.Input.Gamepad.Gamepad, button: Phaser.Input.Gamepad.Button, value: number): void { - const blacklist = [12, 13, 14, 15]; // d-pad buttons are blacklisted. // Check conditions before processing the button press. - if (!this.listening || pad.id.toLowerCase() !== this.getSelectedDevice() || blacklist.includes(button.index) || this.buttonPressed !== null) return; + if (!this.listening || pad.id.toLowerCase() !== this.getSelectedDevice() || this.buttonPressed !== null) return; const activeConfig = this.scene.inputController.getActiveConfig(Device.GAMEPAD); const type = activeConfig.padType const key = getKeyWithKeycode(activeConfig, button.index); diff --git a/src/ui/settings/keyboard-binding-ui-handler.ts b/src/ui/settings/keyboard-binding-ui-handler.ts index 4d7d19c6a8e..ac9a2d0ed1c 100644 --- a/src/ui/settings/keyboard-binding-ui-handler.ts +++ b/src/ui/settings/keyboard-binding-ui-handler.ts @@ -11,6 +11,7 @@ export default class KeyboardBindingUiHandler extends AbstractBindingUiHandler { super(scene, mode); // Listen to gamepad button down events to initiate binding. scene.input.keyboard.on('keydown', this.onKeyDown, this); + this.confirmText = "Confirm"; } getSelectedDevice() { diff --git a/src/ui/settings/settings-gamepad-ui-handler.ts b/src/ui/settings/settings-gamepad-ui-handler.ts index 2a7d55ddfea..1a7e3b396d9 100644 --- a/src/ui/settings/settings-gamepad-ui-handler.ts +++ b/src/ui/settings/settings-gamepad-ui-handler.ts @@ -2,6 +2,7 @@ import BattleScene from "../../battle-scene"; import {addTextObject, TextStyle} from "../text"; import {Mode} from "../ui"; import { + setSettingGamepad, SettingGamepad, settingGamepadBlackList, settingGamepadDefaults, @@ -14,6 +15,7 @@ import {InterfaceConfig} from "#app/inputs-controller"; import AbstractSettingsUiUiHandler from "#app/ui/settings/abstract-settings-ui-handler"; import {Device} from "#app/enums/devices"; import {truncateString} from "#app/utils"; +import {setSettingKeyboard, SettingKeyboard} from "#app/system/settings-keyboard"; /** * Class representing the settings UI handler for gamepads. @@ -41,6 +43,10 @@ export default class SettingsGamepadUiHandler extends AbstractSettingsUiUiHandle this.settingBlacklisted = settingGamepadBlackList; } + setSetting(scene: BattleScene, setting, value: integer): boolean { + return setSettingGamepad(scene, setting, value); + } + /** * Setup UI elements. */ diff --git a/src/ui/settings/settings-keyboard-ui-handler.ts b/src/ui/settings/settings-keyboard-ui-handler.ts index 90ba9fe3a72..38305d4633a 100644 --- a/src/ui/settings/settings-keyboard-ui-handler.ts +++ b/src/ui/settings/settings-keyboard-ui-handler.ts @@ -2,6 +2,7 @@ import BattleScene from "../../battle-scene"; import {Mode} from "../ui"; import cfg_keyboard_azerty from "#app/configs/cfg_keyboard_azerty"; import { + setSettingKeyboard, SettingKeyboard, settingKeyboardBlackList, settingKeyboardDefaults, @@ -33,7 +34,7 @@ export default class SettingsKeyboardUiHandler extends AbstractSettingsUiUiHandl this.settingDeviceDefaults = settingKeyboardDefaults; this.settingDeviceOptions = settingKeyboardOptions; this.configs = [cfg_keyboard_azerty]; - this.commonSettingsCount = 1; + this.commonSettingsCount = 0; this.textureOverride = 'keyboard'; this.localStoragePropertyName = 'settingsKeyboard'; this.settingBlacklisted = settingKeyboardBlackList; @@ -42,6 +43,10 @@ export default class SettingsKeyboardUiHandler extends AbstractSettingsUiUiHandl deleteEvent.on('up', this.onDeleteDown, this); } + setSetting(scene: BattleScene, setting, value: integer): boolean { + return setSettingKeyboard(scene, setting, value); + } + /** * Setup UI elements. */