mirror of
https://github.com/pagefaultgames/pokerogue.git
synced 2025-07-07 00:42:16 +02:00
tried to fix the plugin loading issue on prod
This commit is contained in:
parent
7715dbd993
commit
59363163e1
@ -84,8 +84,6 @@ export type AnySound = Phaser.Sound.WebAudioSound | Phaser.Sound.HTML5AudioSound
|
||||
|
||||
export default class BattleScene extends SceneBase {
|
||||
public rexUI: UIPlugin;
|
||||
public inputController: InputsController;
|
||||
public uiInputs: UiInputs;
|
||||
|
||||
public sessionPlayTime: integer = null;
|
||||
public masterVolume: number = 0.5;
|
||||
@ -178,6 +176,7 @@ export default class BattleScene extends SceneBase {
|
||||
|
||||
constructor() {
|
||||
super('battle');
|
||||
Phaser.Plugins.PluginCache.register('UiInputs', UiInputs, 'uiInputs');
|
||||
|
||||
initSpecies();
|
||||
initMoves();
|
||||
@ -201,8 +200,6 @@ export default class BattleScene extends SceneBase {
|
||||
}
|
||||
|
||||
async preload() {
|
||||
this.load.scenePlugin('inputController', InputsController);
|
||||
this.load.scenePlugin('uiInputs', UiInputs);
|
||||
if (DEBUG_RNG) {
|
||||
const scene = this;
|
||||
const originalRealInRange = Phaser.Math.RND.realInRange;
|
||||
|
@ -1,10 +1,10 @@
|
||||
import Phaser, {Time} from "phaser";
|
||||
import * as Utils from "./utils";
|
||||
import {initTouchControls} from './touch-controls';
|
||||
import pad_generic from "#app/configs/pad_generic";
|
||||
import pad_unlicensedSNES from "#app/configs/pad_unlicensedSNES";
|
||||
import pad_xbox360 from "#app/configs/pad_xbox360";
|
||||
import pad_dualshock from "#app/configs/pad_dualshock";
|
||||
import pad_generic from "./configs/pad_generic";
|
||||
import pad_unlicensedSNES from "./configs/pad_unlicensedSNES";
|
||||
import pad_xbox360 from "./configs/pad_xbox360";
|
||||
import pad_dualshock from "./configs/pad_dualshock";
|
||||
|
||||
|
||||
export enum Button {
|
||||
|
11
src/main.ts
11
src/main.ts
@ -8,6 +8,8 @@ import InputTextPlugin from 'phaser3-rex-plugins/plugins/inputtext-plugin.js';
|
||||
import BBCodeText from 'phaser3-rex-plugins/plugins/bbcodetext';
|
||||
import TransitionImagePackPlugin from 'phaser3-rex-plugins/templates/transitionimagepack/transitionimagepack-plugin.js';
|
||||
import { LoadingScene } from './loading-scene';
|
||||
import {InputsController} from "#app/inputs-controller";
|
||||
import {UiInputs} from "#app/ui-inputs";
|
||||
|
||||
|
||||
// Catch global errors and display them in an alert so users can report the issue.
|
||||
@ -52,6 +54,14 @@ const config: Phaser.Types.Core.GameConfig = {
|
||||
key: 'rexUI',
|
||||
plugin: UIPlugin,
|
||||
mapping: 'rexUI'
|
||||
}, {
|
||||
key: 'InputsController',
|
||||
plugin: InputsController,
|
||||
mapping: 'inputsController'
|
||||
}, {
|
||||
key: 'UiInputs',
|
||||
plugin: UiInputs,
|
||||
mapping: 'uiInputs'
|
||||
}]
|
||||
},
|
||||
input: {
|
||||
@ -90,7 +100,6 @@ Phaser.GameObjects.NineSlice.prototype.setPositionRelative = setPositionRelative
|
||||
Phaser.GameObjects.Text.prototype.setPositionRelative = setPositionRelative;
|
||||
BBCodeText.prototype.setPositionRelative = setPositionRelative;
|
||||
Phaser.GameObjects.Rectangle.prototype.setPositionRelative = setPositionRelative;
|
||||
|
||||
document.fonts.load('16px emerald').then(() => document.fonts.load('10px pkmnems'));
|
||||
|
||||
let game;
|
||||
|
@ -1,10 +1,10 @@
|
||||
import Phaser from "phaser";
|
||||
import UI, {Mode} from "./ui/ui";
|
||||
import {Button} from "#app/inputs-controller";
|
||||
import MessageUiHandler from "#app/ui/message-ui-handler";
|
||||
import StarterSelectUiHandler from "#app/ui/starter-select-ui-handler";
|
||||
import {Setting, settingOptions} from "#app/system/settings";
|
||||
import SettingsUiHandler from "#app/ui/settings-ui-handler";
|
||||
import {Mode} from "./ui/ui";
|
||||
import {Button} from "./inputs-controller";
|
||||
import MessageUiHandler from "./ui/message-ui-handler";
|
||||
import StarterSelectUiHandler from "./ui/starter-select-ui-handler";
|
||||
import {Setting, settingOptions} from "./system/settings";
|
||||
import SettingsUiHandler from "./ui/settings-ui-handler";
|
||||
|
||||
|
||||
export class UiInputs extends Phaser.Plugins.ScenePlugin {
|
||||
@ -16,10 +16,10 @@ export class UiInputs extends Phaser.Plugins.ScenePlugin {
|
||||
super(scene, pluginManager, pluginKey);
|
||||
this.game = pluginManager.game;
|
||||
this.scene = scene;
|
||||
this.events = this.scene.inputController.events
|
||||
}
|
||||
|
||||
boot() {
|
||||
this.events = this.scene.inputsController.events;
|
||||
this.listenInputs();
|
||||
}
|
||||
|
||||
|
@ -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/inputs-controller";
|
||||
import {Button} from "../inputs-controller";
|
||||
|
||||
export interface OptionSelectConfig {
|
||||
xOffset?: number;
|
||||
|
@ -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/inputs-controller";
|
||||
import {Button} from "../inputs-controller";
|
||||
|
||||
export default class AchvsUiHandler extends MessageUiHandler {
|
||||
private achvsContainer: Phaser.GameObjects.Container;
|
||||
|
@ -1,7 +1,7 @@
|
||||
import BattleScene from "../battle-scene";
|
||||
import { Mode } from "./ui";
|
||||
import UiHandler from "./ui-handler";
|
||||
import {Button} from "#app/inputs-controller";
|
||||
import {Button} from "../inputs-controller";
|
||||
|
||||
export default abstract class AwaitableUiHandler extends UiHandler {
|
||||
protected awaitingActionInput: boolean;
|
||||
|
@ -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/inputs-controller";
|
||||
import {Button} from "../inputs-controller";
|
||||
|
||||
export default class BallUiHandler extends UiHandler {
|
||||
private pokeballSelectContainer: Phaser.GameObjects.Container;
|
||||
|
@ -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/inputs-controller";
|
||||
import {Button} from "../inputs-controller";
|
||||
|
||||
export default class BattleMessageUiHandler extends MessageUiHandler {
|
||||
private levelUpStatsContainer: Phaser.GameObjects.Container;
|
||||
|
@ -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/inputs-controller";
|
||||
import {Button} from "../inputs-controller";
|
||||
|
||||
export enum Command {
|
||||
FIGHT = 0,
|
||||
|
@ -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/inputs-controller";
|
||||
import {Button} from "../inputs-controller";
|
||||
|
||||
export default class ConfirmUiHandler extends AbstractOptionSelectUiHandler {
|
||||
private switchCheck: boolean;
|
||||
|
@ -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/inputs-controller";
|
||||
import {Button} from "../inputs-controller";
|
||||
|
||||
const defaultText = 'Select a machine.';
|
||||
|
||||
|
@ -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/inputs-controller";
|
||||
import {Button} from "../inputs-controller";
|
||||
|
||||
export default class EggHatchSceneHandler extends UiHandler {
|
||||
public eggHatchContainer: Phaser.GameObjects.Container;
|
||||
|
@ -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/inputs-controller";
|
||||
import {Button} from "../inputs-controller";
|
||||
|
||||
export default class EggListUiHandler extends MessageUiHandler {
|
||||
private eggListContainer: Phaser.GameObjects.Container;
|
||||
|
@ -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/inputs-controller";
|
||||
import {Button} from "../inputs-controller";
|
||||
|
||||
export default class EvolutionSceneHandler extends MessageUiHandler {
|
||||
public evolutionContainer: Phaser.GameObjects.Container;
|
||||
|
@ -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/inputs-controller";
|
||||
import {Button} from "../inputs-controller";
|
||||
|
||||
export default class FightUiHandler extends UiHandler {
|
||||
private movesContainer: Phaser.GameObjects.Container;
|
||||
|
@ -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/inputs-controller";
|
||||
import {Button} from "../inputs-controller";
|
||||
|
||||
export interface FormModalConfig extends ModalConfig {
|
||||
errorMessage?: string;
|
||||
|
@ -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/inputs-controller";
|
||||
import {Button} from "../inputs-controller";
|
||||
|
||||
interface DisplayStat {
|
||||
label?: string;
|
||||
|
@ -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/inputs-controller";
|
||||
import {Button} from "../inputs-controller";
|
||||
|
||||
export enum MenuOptions {
|
||||
GAME_SETTINGS,
|
||||
|
@ -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/inputs-controller";
|
||||
import {Button} from "../inputs-controller";
|
||||
|
||||
export interface ModalConfig {
|
||||
buttonActions: Function[];
|
||||
|
@ -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/inputs-controller";
|
||||
import {Button} from "../inputs-controller";
|
||||
|
||||
export const SHOP_OPTIONS_ROW_LIMIT = 6;
|
||||
|
||||
|
@ -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/inputs-controller";
|
||||
import {Button} from "../inputs-controller";
|
||||
|
||||
const defaultMessage = 'Choose a Pokémon.';
|
||||
|
||||
|
@ -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/inputs-controller";
|
||||
import {Button} from "../inputs-controller";
|
||||
|
||||
const sessionSlotCount = 5;
|
||||
|
||||
|
@ -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/inputs-controller";
|
||||
import {Button} from "../inputs-controller";
|
||||
|
||||
export default class SettingsUiHandler extends UiHandler {
|
||||
private settingsContainer: Phaser.GameObjects.Container;
|
||||
|
@ -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/inputs-controller";
|
||||
import {Button} from "../inputs-controller";
|
||||
|
||||
export type StarterSelectCallback = (starters: Starter[]) => void;
|
||||
|
||||
|
@ -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/inputs-controller";
|
||||
import {Button} from "../inputs-controller";
|
||||
|
||||
enum Page {
|
||||
PROFILE,
|
||||
|
@ -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/inputs-controller";
|
||||
import {Button} from "../inputs-controller";
|
||||
|
||||
export type TargetSelectCallback = (cursor: integer) => void;
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
import BattleScene from "../battle-scene";
|
||||
import { TextStyle, getTextColor } from "./text";
|
||||
import UI, { Mode } from "./ui";
|
||||
import {Button} from "#app/inputs-controller";
|
||||
import {Button} from "../inputs-controller";
|
||||
|
||||
export default abstract class UiHandler {
|
||||
protected scene: BattleScene;
|
||||
|
@ -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/inputs-controller";
|
||||
import {Button} from "../inputs-controller";
|
||||
|
||||
export enum Mode {
|
||||
MESSAGE,
|
||||
|
@ -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/inputs-controller";
|
||||
import {Button} from "../inputs-controller";
|
||||
|
||||
const itemRows = 4;
|
||||
const itemCols = 17;
|
||||
|
Loading…
Reference in New Issue
Block a user