cdnutter
/
pokerogue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

create folder for settings in ui folder

pull/685/head
Greenlamp 2024-05-12 16:51:18 +02:00
parent 2bc5a7665e
commit d9d455f317
13 changed files with 46 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/battle-scene.ts
View File

@ -33,9 +33,6 @@ import TrainerData from './system/trainer-data';
import SoundFade from 'phaser3-rex-plugins/plugins/soundfade'; import SoundFade from 'phaser3-rex-plugins/plugins/soundfade';
import { pokemonPrevolutions } from './data/pokemon-evolutions'; import { pokemonPrevolutions } from './data/pokemon-evolutions';
import PokeballTray from './ui/pokeball-tray'; import PokeballTray from './ui/pokeball-tray';
import { Setting, settingOptions } from './system/settings';
import SettingsUiHandler from './ui/settings-ui-handler';
import MessageUiHandler from './ui/message-ui-handler';
import { Species } from './data/enums/species'; import { Species } from './data/enums/species';
import InvertPostFX from './pipelines/invert'; import InvertPostFX from './pipelines/invert';
import { Achv, ModifierAchv, MoneyAchv, achvs } from './system/achv'; import { Achv, ModifierAchv, MoneyAchv, achvs } from './system/achv';

2
src/inputs-controller.ts
View File

@ -6,7 +6,7 @@ import pad_xbox360 from "./configs/pad_xbox360";
import pad_dualshock from "./configs/pad_dualshock"; import pad_dualshock from "./configs/pad_dualshock";
import {Button} from "./enums/buttons"; import {Button} from "./enums/buttons";
import {Mode} from "./ui/ui"; import {Mode} from "./ui/ui";
import SettingsGamepadUiHandler from "./ui/settings-gamepad-ui-handler"; import SettingsGamepadUiHandler from "./ui/settings/settings-gamepad-ui-handler";
import {SettingGamepad} from "./system/settings-gamepad"; import {SettingGamepad} from "./system/settings-gamepad";
import { import {
getCurrenlyAssignedIconFromInputIndex, getCurrentlyAssignedIconToSettingName, getCurrenlyAssignedIconFromInputIndex, getCurrentlyAssignedIconToSettingName,

4
src/system/settings-gamepad.ts
View File

@ -1,7 +1,7 @@
import BattleScene from "../battle-scene"; import BattleScene from "../battle-scene";
import {SettingDefaults, SettingOptions} from "./settings"; import {SettingDefaults, SettingOptions} from "./settings";
import SettingsGamepadUiHandler from "../ui/settings-gamepad-ui-handler"; import SettingsGamepadUiHandler from "../ui/settings/settings-gamepad-ui-handler";
import {Mode} from "#app/ui/ui"; import {Mode} from "../ui/ui";
import {truncateString} from "../utils"; import {truncateString} from "../utils";
import {Button} from "../enums/buttons"; import {Button} from "../enums/buttons";

4
src/system/settings.ts
View File

@ -3,8 +3,8 @@ import BattleScene from "../battle-scene";
import { hasTouchscreen } from "../touch-controls"; import { hasTouchscreen } from "../touch-controls";
import { updateWindowType } from "../ui/ui-theme"; import { updateWindowType } from "../ui/ui-theme";
import { PlayerGender } from "./game-data"; import { PlayerGender } from "./game-data";
import { Mode } from "#app/ui/ui"; import { Mode } from "../ui/ui";
import SettingsUiHandler from "#app/ui/settings-ui-handler"; import SettingsUiHandler from "../ui/settings/settings-ui-handler";
export enum Setting { export enum Setting {
Game_Speed = "GAME_SPEED", Game_Speed = "GAME_SPEED",

4
src/ui-inputs.ts
View File

@ -4,9 +4,9 @@ import {InputsController} from "./inputs-controller";
import MessageUiHandler from "./ui/message-ui-handler"; import MessageUiHandler from "./ui/message-ui-handler";
import StarterSelectUiHandler from "./ui/starter-select-ui-handler"; import StarterSelectUiHandler from "./ui/starter-select-ui-handler";
import {Setting, settingOptions} from "./system/settings"; import {Setting, settingOptions} from "./system/settings";
import SettingsUiHandler from "./ui/settings-ui-handler"; import SettingsUiHandler from "./ui/settings/settings-ui-handler";
import {Button} from "./enums/buttons"; import {Button} from "./enums/buttons";
import SettingsGamepadUiHandler from "#app/ui/settings-gamepad-ui-handler"; import SettingsGamepadUiHandler from "./ui/settings/settings-gamepad-ui-handler";
export interface ActionKeys { export interface ActionKeys {
[key in Button]: () => void; [key in Button]: () => void;

10
src/ui/gamepad-binding-ui-handler.ts → src/ui/settings/gamepad-binding-ui-handler.ts
View File

@ -1,11 +1,11 @@
import UiHandler from "./ui-handler"; import UiHandler from "../ui-handler";
import BattleScene from "#app/battle-scene"; import BattleScene from "#app/battle-scene";
import {Mode} from "./ui"; import {Mode} from "../ui";
import {Button} from "../enums/buttons"; import {Button} from "../../enums/buttons";
import {addWindow} from "./ui-theme"; import {addWindow} from "../ui-theme";
import {addTextObject, TextStyle} from "#app/ui/text"; import {addTextObject, TextStyle} from "#app/ui/text";
import Phaser from "phaser"; import Phaser from "phaser";
import {SettingGamepad} from "../system/settings-gamepad"; import {SettingGamepad} from "../../system/settings-gamepad";
export default class GamepadBindingUiHandler extends UiHandler { export default class GamepadBindingUiHandler extends UiHandler {

8
src/ui/keyboard-binding-ui-handler.ts → src/ui/settings/keyboard-binding-ui-handler.ts
View File

@ -1,7 +1,7 @@
import UiHandler from "#app/ui/ui-handler"; import UiHandler from "../ui-handler";
import BattleScene from "#app/battle-scene"; import BattleScene from "../../battle-scene";
import {Mode} from "#app/ui/ui"; import {Mode} from "../ui";
import {Button} from "#app/enums/buttons"; import {Button} from "../../enums/buttons";
export default class KeyboardBindingUiHandler extends UiHandler { export default class KeyboardBindingUiHandler extends UiHandler {

6
src/ui/option-select-ui-handler.ts → src/ui/settings/option-select-ui-handler.ts
View File

@ -1,6 +1,6 @@
import BattleScene from "../battle-scene"; import BattleScene from "../../battle-scene";
import AbstractOptionSelectUiHandler from "./abstact-option-select-ui-handler"; import AbstractOptionSelectUiHandler from "../abstact-option-select-ui-handler";
import { Mode } from "./ui"; import { Mode } from "../ui";
export default class OptionSelectUiHandler extends AbstractOptionSelectUiHandler { export default class OptionSelectUiHandler extends AbstractOptionSelectUiHandler {
constructor(scene: BattleScene, mode: Mode = Mode.OPTION_SELECT) { constructor(scene: BattleScene, mode: Mode = Mode.OPTION_SELECT) {

16
src/ui/settings-gamepad-ui-handler.ts → src/ui/settings/settings-gamepad-ui-handler.ts
View File

@ -1,15 +1,15 @@
import BattleScene from "../battle-scene"; import BattleScene from "../../battle-scene";
import {TextStyle, addTextObject} from "./text"; import {TextStyle, addTextObject} from "../text";
import {Mode} from "./ui"; import {Mode} from "../ui";
import UiHandler from "./ui-handler"; import UiHandler from "../ui-handler";
import {addWindow} from "./ui-theme"; import {addWindow} from "../ui-theme";
import {Button} from "../enums/buttons"; import {Button} from "../../enums/buttons";
import { import {
SettingGamepad, SettingGamepad,
settingGamepadDefaults, settingGamepadDefaults,
settingGamepadOptions settingGamepadOptions
} from "../system/settings-gamepad"; } from "../../system/settings-gamepad";
import {truncateString} from "../utils"; import {truncateString} from "../../utils";
import { import {
getCurrentlyAssignedIconToSettingName, getCurrentlyAssignedIconToSettingName,
getKeyForSettingName getKeyForSettingName

8
src/ui/settings-keyboard-ui-handler.ts → src/ui/settings/settings-keyboard-ui-handler.ts
View File

@ -1,7 +1,7 @@
import UiHandler from "#app/ui/ui-handler"; import UiHandler from "../ui-handler";
import BattleScene from "#app/battle-scene"; import BattleScene from "../../battle-scene";
import {Mode} from "#app/ui/ui"; import {Mode} from "../ui";
import {Button} from "#app/enums/buttons"; import {Button} from "../../enums/buttons";
export default class SettingsKeyboardUiHandler extends UiHandler { export default class SettingsKeyboardUiHandler extends UiHandler {

16
src/ui/settings-ui-handler.ts → src/ui/settings/settings-ui-handler.ts
View File

@ -1,11 +1,11 @@
import BattleScene from "../battle-scene"; import BattleScene from "../../battle-scene";
import { Setting, reloadSettings, settingDefaults, settingOptions } from "../system/settings"; import { Setting, reloadSettings, settingDefaults, settingOptions } from "../../system/settings";
import { hasTouchscreen, isMobile } from "../touch-controls"; import { hasTouchscreen, isMobile } from "../../touch-controls";
import { TextStyle, addTextObject } from "./text"; import { TextStyle, addTextObject } from "../text";
import { Mode } from "./ui"; import { Mode } from "../ui";
import UiHandler from "./ui-handler"; import UiHandler from "../ui-handler";
import { addWindow } from "./ui-theme"; import { addWindow } from "../ui-theme";
import {Button} from "../enums/buttons"; import {Button} from "../../enums/buttons";
export default class SettingsUiHandler extends UiHandler { export default class SettingsUiHandler extends UiHandler {
private settingsContainer: Phaser.GameObjects.Container; private settingsContainer: Phaser.GameObjects.Container;

2
src/ui/title-ui-handler.ts
View File

@ -1,6 +1,6 @@
import BattleScene from "../battle-scene"; import BattleScene from "../battle-scene";
import { DailyRunScoreboard } from "./daily-run-scoreboard"; import { DailyRunScoreboard } from "./daily-run-scoreboard";
import OptionSelectUiHandler from "./option-select-ui-handler"; import OptionSelectUiHandler from "./settings/option-select-ui-handler";
import { Mode } from "./ui"; import { Mode } from "./ui";
import * as Utils from "../utils"; import * as Utils from "../utils";
import { TextStyle, addTextObject } from "./text"; import { TextStyle, addTextObject } from "./text";

12
src/ui/ui.ts
View File

@ -12,13 +12,13 @@ import SummaryUiHandler from './summary-ui-handler';
import StarterSelectUiHandler from './starter-select-ui-handler'; import StarterSelectUiHandler from './starter-select-ui-handler';
import EvolutionSceneHandler from './evolution-scene-handler'; import EvolutionSceneHandler from './evolution-scene-handler';
import TargetSelectUiHandler from './target-select-ui-handler'; import TargetSelectUiHandler from './target-select-ui-handler';
import SettingsUiHandler from './settings-ui-handler'; import SettingsUiHandler from './settings/settings-ui-handler';
import SettingsGamepadUiHandler from "./settings-gamepad-ui-handler"; import SettingsGamepadUiHandler from "./settings/settings-gamepad-ui-handler";
import { TextStyle, addTextObject } from './text'; import { TextStyle, addTextObject } from './text';
import AchvBar from './achv-bar'; import AchvBar from './achv-bar';
import MenuUiHandler from './menu-ui-handler'; import MenuUiHandler from './menu-ui-handler';
import AchvsUiHandler from './achvs-ui-handler'; import AchvsUiHandler from './achvs-ui-handler';
import OptionSelectUiHandler from './option-select-ui-handler'; import OptionSelectUiHandler from './settings/option-select-ui-handler';
import EggHatchSceneHandler from './egg-hatch-scene-handler'; import EggHatchSceneHandler from './egg-hatch-scene-handler';
import EggListUiHandler from './egg-list-ui-handler'; import EggListUiHandler from './egg-list-ui-handler';
import EggGachaUiHandler from './egg-gacha-ui-handler'; import EggGachaUiHandler from './egg-gacha-ui-handler';
@ -37,9 +37,9 @@ import UnavailableModalUiHandler from './unavailable-modal-ui-handler';
import OutdatedModalUiHandler from './outdated-modal-ui-handler'; import OutdatedModalUiHandler from './outdated-modal-ui-handler';
import SessionReloadModalUiHandler from './session-reload-modal-ui-handler'; import SessionReloadModalUiHandler from './session-reload-modal-ui-handler';
import {Button} from "../enums/buttons"; import {Button} from "../enums/buttons";
import GamepadBindingUiHandler from "./gamepad-binding-ui-handler"; import GamepadBindingUiHandler from "./settings/gamepad-binding-ui-handler";
import SettingsKeyboardUiHandler from "#app/ui/settings-keyboard-ui-handler"; import SettingsKeyboardUiHandler from "#app/ui/settings/settings-keyboard-ui-handler";
import KeyboardBindingUiHandler from "#app/ui/keyboard-binding-ui-handler"; import KeyboardBindingUiHandler from "#app/ui/settings/keyboard-binding-ui-handler";
export enum Mode { export enum Mode {
MESSAGE, MESSAGE,