renamed inputHandler to inputController

This commit is contained in:
Greenlamp 2024-05-02 23:19:00 +02:00
parent b108cdd4bd
commit 6de2051338
28 changed files with 32 additions and 32 deletions

View File

@ -60,7 +60,7 @@ import CandyBar from './ui/candy-bar';
import { Variant, variantData } from './data/variant';
import { Localizable } from './plugins/i18n';
import { STARTING_WAVE_OVERRIDE, OPP_SPECIES_OVERRIDE, SEED_OVERRIDE, STARTING_BIOME_OVERRIDE } from './overrides';
import {Button, InputHandler} from "#app/inputHandler";
import {Button, InputsController} from "#app/inputsController";
export const bypassLogin = import.meta.env.VITE_BYPASS_LOGIN === "1";
@ -84,7 +84,7 @@ export type AnySound = Phaser.Sound.WebAudioSound | Phaser.Sound.HTML5AudioSound
export default class BattleScene extends SceneBase {
public rexUI: UIPlugin;
public inputHandler: InputHandler;
public inputController: InputsController;
public sessionPlayTime: integer = null;
public masterVolume: number = 0.5;
@ -205,7 +205,7 @@ export default class BattleScene extends SceneBase {
}
async preload() {
this.load.scenePlugin('inputHandler', InputHandler);
this.load.scenePlugin('inputController', InputsController);
if (DEBUG_RNG) {
const scene = this;
const originalRealInRange = Phaser.Math.RND.realInRange;
@ -249,13 +249,13 @@ export default class BattleScene extends SceneBase {
}
listenInputs() {
this.inputHandler.events.on('input_down', (event) => {
this.inputController.events.on('input_down', (event) => {
const actions = this.getActionsKeyDown();
const [inputSuccess, vibrationLength] = actions[event.button]();
if (inputSuccess && this.enableVibration && typeof navigator.vibrate !== 'undefined')
navigator.vibrate(vibrationLength);
}, this);
this.inputHandler.events.on('input_up', (event) => {
this.inputController.events.on('input_up', (event) => {
const actions = this.getActionsKeyUp();
if (!actions.hasOwnProperty(event.button)) return;
const [inputSuccess, vibrationLength] = actions[event.button]();

View File

@ -27,7 +27,7 @@ export enum Button {
SLOW_DOWN
}
export class InputHandler extends Phaser.Plugins.ScenePlugin {
export class InputsController extends Phaser.Plugins.ScenePlugin {
private game: Phaser.Game;
private buttonKeys;
private gamepads;

View File

@ -5,7 +5,7 @@ import UiHandler from "./ui-handler";
import { addWindow } from "./ui-theme";
import * as Utils from "../utils";
import { argbFromRgba } from "@material/material-color-utilities";
import {Button} from "#app/inputHandler";
import {Button} from "#app/inputsController";
export interface OptionSelectConfig {
xOffset?: number;

View File

@ -4,7 +4,7 @@ import MessageUiHandler from "./message-ui-handler";
import { TextStyle, addTextObject } from "./text";
import { Mode } from "./ui";
import { addWindow } from "./ui-theme";
import {Button} from "#app/inputHandler";
import {Button} from "#app/inputsController";
export default class AchvsUiHandler extends MessageUiHandler {
private achvsContainer: Phaser.GameObjects.Container;

View File

@ -1,7 +1,7 @@
import BattleScene from "../battle-scene";
import { Mode } from "./ui";
import UiHandler from "./ui-handler";
import {Button} from "#app/inputHandler";
import {Button} from "#app/inputsController";
export default abstract class AwaitableUiHandler extends UiHandler {
protected awaitingActionInput: boolean;

View File

@ -6,7 +6,7 @@ import { Command } from "./command-ui-handler";
import { Mode } from "./ui";
import UiHandler from "./ui-handler";
import { addWindow } from "./ui-theme";
import {Button} from "#app/inputHandler";
import {Button} from "#app/inputsController";
export default class BallUiHandler extends UiHandler {
private pokeballSelectContainer: Phaser.GameObjects.Container;

View File

@ -6,7 +6,7 @@ import MessageUiHandler from "./message-ui-handler";
import { getStatName, Stat } from "../data/pokemon-stat";
import { addWindow } from "./ui-theme";
import BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext";
import {Button} from "#app/inputHandler";
import {Button} from "#app/inputsController";
export default class BattleMessageUiHandler extends MessageUiHandler {
private levelUpStatsContainer: Phaser.GameObjects.Container;

View File

@ -5,7 +5,7 @@ import PartyUiHandler, { PartyUiMode } from "./party-ui-handler";
import { Mode } from "./ui";
import UiHandler from "./ui-handler";
import i18next from '../plugins/i18n';
import {Button} from "#app/inputHandler";
import {Button} from "#app/inputsController";
export enum Command {
FIGHT = 0,

View File

@ -1,7 +1,7 @@
import BattleScene from "../battle-scene";
import AbstractOptionSelectUiHandler, { OptionSelectConfig } from "./abstact-option-select-ui-handler";
import { Mode } from "./ui";
import {Button} from "#app/inputHandler";
import {Button} from "#app/inputsController";
export default class ConfirmUiHandler extends AbstractOptionSelectUiHandler {
private switchCheck: boolean;

View File

@ -9,7 +9,7 @@ import { getPokemonSpecies } from "../data/pokemon-species";
import { addWindow } from "./ui-theme";
import { Tutorial, handleTutorial } from "../tutorial";
import { EggTier } from "../data/enums/egg-type";
import {Button} from "#app/inputHandler";
import {Button} from "#app/inputsController";
const defaultText = 'Select a machine.';

View File

@ -2,7 +2,7 @@ import BattleScene from "../battle-scene";
import { EggHatchPhase } from "../egg-hatch-phase";
import { Mode } from "./ui";
import UiHandler from "./ui-handler";
import {Button} from "#app/inputHandler";
import {Button} from "#app/inputsController";
export default class EggHatchSceneHandler extends UiHandler {
public eggHatchContainer: Phaser.GameObjects.Container;

View File

@ -6,7 +6,7 @@ import MessageUiHandler from "./message-ui-handler";
import { EGG_SEED, Egg, GachaType, getEggGachaTypeDescriptor, getEggHatchWavesMessage, getEggDescriptor } from "../data/egg";
import * as Utils from "../utils";
import { addWindow } from "./ui-theme";
import {Button} from "#app/inputHandler";
import {Button} from "#app/inputsController";
export default class EggListUiHandler extends MessageUiHandler {
private eggListContainer: Phaser.GameObjects.Container;

View File

@ -2,7 +2,7 @@ import BattleScene from "../battle-scene";
import MessageUiHandler from "./message-ui-handler";
import { TextStyle, addTextObject } from "./text";
import { Mode } from "./ui";
import {Button} from "#app/inputHandler";
import {Button} from "#app/inputsController";
export default class EvolutionSceneHandler extends MessageUiHandler {
public evolutionContainer: Phaser.GameObjects.Container;

View File

@ -8,7 +8,7 @@ import * as Utils from "../utils";
import { CommandPhase } from "../phases";
import { MoveCategory } from "#app/data/move.js";
import i18next from '../plugins/i18n';
import {Button} from "#app/inputHandler";
import {Button} from "#app/inputsController";
export default class FightUiHandler extends UiHandler {
private movesContainer: Phaser.GameObjects.Container;

View File

@ -6,7 +6,7 @@ import { WindowVariant, addWindow } from "./ui-theme";
import InputText from "phaser3-rex-plugins/plugins/inputtext";
import * as Utils from "../utils";
import i18next from '../plugins/i18n';
import {Button} from "#app/inputHandler";
import {Button} from "#app/inputsController";
export interface FormModalConfig extends ModalConfig {
errorMessage?: string;

View File

@ -6,7 +6,7 @@ import { addWindow } from "./ui-theme";
import * as Utils from "../utils";
import { DexAttr, GameData } from "../system/game-data";
import { speciesStarters } from "../data/pokemon-species";
import {Button} from "#app/inputHandler";
import {Button} from "#app/inputsController";
interface DisplayStat {
label?: string;

View File

@ -9,7 +9,7 @@ import { OptionSelectConfig, OptionSelectItem } from "./abstact-option-select-ui
import { Tutorial, handleTutorial } from "../tutorial";
import { updateUserInfo } from "../account";
import i18next from '../plugins/i18n';
import {Button} from "#app/inputHandler";
import {Button} from "#app/inputsController";
export enum MenuOptions {
GAME_SETTINGS,

View File

@ -3,7 +3,7 @@ import { TextStyle, addTextObject } from "./text";
import { Mode } from "./ui";
import UiHandler from "./ui-handler";
import { WindowVariant, addWindow } from "./ui-theme";
import {Button} from "#app/inputHandler";
import {Button} from "#app/inputsController";
export interface ModalConfig {
buttonActions: Function[];

View File

@ -6,7 +6,7 @@ import AwaitableUiHandler from "./awaitable-ui-handler";
import { Mode } from "./ui";
import { LockModifierTiersModifier, PokemonHeldItemModifier } from "../modifier/modifier";
import { handleTutorial, Tutorial } from "../tutorial";
import {Button} from "#app/inputHandler";
import {Button} from "#app/inputsController";
export const SHOP_OPTIONS_ROW_LIMIT = 6;

View File

@ -16,7 +16,7 @@ import { pokemonEvolutions } from "../data/pokemon-evolutions";
import { addWindow } from "./ui-theme";
import { SpeciesFormChangeItemTrigger } from "../data/pokemon-forms";
import { getVariantTint } from "#app/data/variant";
import {Button} from "#app/inputHandler";
import {Button} from "#app/inputsController";
const defaultMessage = 'Choose a Pokémon.';

View File

@ -8,7 +8,7 @@ import * as Utils from "../utils";
import PokemonData from "../system/pokemon-data";
import { PokemonHeldItemModifier } from "../modifier/modifier";
import MessageUiHandler from "./message-ui-handler";
import {Button} from "#app/inputHandler";
import {Button} from "#app/inputsController";
const sessionSlotCount = 5;

View File

@ -5,7 +5,7 @@ import { TextStyle, addTextObject } from "./text";
import { Mode } from "./ui";
import UiHandler from "./ui-handler";
import { addWindow } from "./ui-theme";
import {Button} from "#app/inputHandler";
import {Button} from "#app/inputsController";
export default class SettingsUiHandler extends UiHandler {
private settingsContainer: Phaser.GameObjects.Container;

View File

@ -27,7 +27,7 @@ import { argbFromRgba } from "@material/material-color-utilities";
import { OptionSelectItem } from "./abstact-option-select-ui-handler";
import { pokemonPrevolutions } from "#app/data/pokemon-evolutions";
import { Variant, getVariantTint } from "#app/data/variant";
import {Button} from "#app/inputHandler";
import {Button} from "#app/inputsController";
export type StarterSelectCallback = (starters: Starter[]) => void;

View File

@ -17,7 +17,7 @@ import { Nature, getNatureStatMultiplier } from "../data/nature";
import { loggedInUser } from "../account";
import { PlayerGender } from "../system/game-data";
import { Variant, getVariantTint } from "#app/data/variant";
import {Button} from "#app/inputHandler";
import {Button} from "#app/inputsController";
enum Page {
PROFILE,

View File

@ -5,7 +5,7 @@ import { Mode } from "./ui";
import UiHandler from "./ui-handler";
import * as Utils from "../utils";
import { getMoveTargets } from "../data/move";
import {Button} from "#app/inputHandler";
import {Button} from "#app/inputsController";
export type TargetSelectCallback = (cursor: integer) => void;

View File

@ -1,7 +1,7 @@
import BattleScene from "../battle-scene";
import { TextStyle, getTextColor } from "./text";
import UI, { Mode } from "./ui";
import {Button} from "#app/inputHandler";
import {Button} from "#app/inputsController";
export default abstract class UiHandler {
protected scene: BattleScene;

View File

@ -35,7 +35,7 @@ import SavingIconHandler from './saving-icon-handler';
import UnavailableModalUiHandler from './unavailable-modal-ui-handler';
import OutdatedModalUiHandler from './outdated-modal-ui-handler';
import SessionReloadModalUiHandler from './session-reload-modal-ui-handler';
import {Button} from "#app/inputHandler";
import {Button} from "#app/inputsController";
export enum Mode {
MESSAGE,

View File

@ -4,7 +4,7 @@ import MessageUiHandler from "./message-ui-handler";
import { TextStyle, addTextObject } from "./text";
import { Mode } from "./ui";
import { addWindow } from "./ui-theme";
import {Button} from "#app/inputHandler";
import {Button} from "#app/inputsController";
const itemRows = 4;
const itemCols = 17;