From 65ddd49d6447c893b808fa02422e9044b009e08f Mon Sep 17 00:00:00 2001 From: Adrian T <68144167+torranx@users.noreply.github.com> Date: Tue, 11 Jun 2024 09:19:07 +0800 Subject: [PATCH] [Enhancement] Move event files to a central directory (#1918) * Move events to a central directory * Update modifier import Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com> * remove old battle-scene-events * Move to field events * Update battle-scene.ts --------- Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com> Co-authored-by: Benjamin Odom --- src/battle-scene.ts | 2 +- src/{battle-scene-events.ts => events/battle-scene.ts} | 6 +++--- src/field/arena.ts | 2 +- src/field/{arena-events.ts => events/arena.ts} | 0 src/phases.ts | 2 +- src/system/game-data.ts | 2 +- src/system/settings/settings.ts | 2 +- src/ui/arena-flyout.ts | 4 ++-- src/ui/battle-flyout.ts | 2 +- src/ui/starter-select-ui-handler.ts | 2 +- src/ui/time-of-day-widget.ts | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) rename src/{battle-scene-events.ts => events/battle-scene.ts} (95%) rename src/field/{arena-events.ts => events/arena.ts} (100%) diff --git a/src/battle-scene.ts b/src/battle-scene.ts index e16506ef658..5d2e2888c64 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -58,7 +58,7 @@ import * as Overrides from "./overrides"; import {InputsController} from "./inputs-controller"; import {UiInputs} from "./ui-inputs"; import { MoneyFormat } from "./enums/money-format"; -import { NewArenaEvent } from "./battle-scene-events"; +import { NewArenaEvent } from "./events/battle-scene"; import { Abilities } from "./data/enums/abilities"; import ArenaFlyout from "./ui/arena-flyout"; import { EaseType } from "./ui/enums/ease-type"; diff --git a/src/battle-scene-events.ts b/src/events/battle-scene.ts similarity index 95% rename from src/battle-scene-events.ts rename to src/events/battle-scene.ts index aaeb590f8ba..b2e4461f8d0 100644 --- a/src/battle-scene-events.ts +++ b/src/events/battle-scene.ts @@ -1,5 +1,5 @@ -import Move from "./data/move"; -import { BerryModifier } from "./modifier/modifier"; +import Move from "../data/move"; +import { BerryModifier } from "../modifier/modifier"; /** Alias for all {@linkcode BattleScene} events */ export enum BattleSceneEventType { @@ -7,7 +7,7 @@ export enum BattleSceneEventType { * Triggers when the corresponding setting is changed * @see {@linkcode CandyUpgradeNotificationChangedEvent} */ - CANDY_UPGRADE_NOTIFICATION_CHANGED = "onCandyUpgradeDisplayChanged", + CANDY_UPGRADE_NOTIFICATION_CHANGED = "onCandyUpgradeNotificationChanged", /** * Triggers when a move is successfully used diff --git a/src/field/arena.ts b/src/field/arena.ts index d34cd2c9bea..0cdf27b7983 100644 --- a/src/field/arena.ts +++ b/src/field/arena.ts @@ -19,7 +19,7 @@ import { Terrain, TerrainType } from "../data/terrain"; import { PostTerrainChangeAbAttr, PostWeatherChangeAbAttr, applyPostTerrainChangeAbAttrs, applyPostWeatherChangeAbAttrs } from "../data/ability"; import Pokemon from "./pokemon"; import * as Overrides from "../overrides"; -import { WeatherChangedEvent, TerrainChangedEvent, TagAddedEvent, TagRemovedEvent } from "./arena-events"; +import { WeatherChangedEvent, TerrainChangedEvent, TagAddedEvent, TagRemovedEvent } from "./events/arena"; export class Arena { public scene: BattleScene; diff --git a/src/field/arena-events.ts b/src/field/events/arena.ts similarity index 100% rename from src/field/arena-events.ts rename to src/field/events/arena.ts diff --git a/src/phases.ts b/src/phases.ts index d09c20ba057..1995bff0083 100644 --- a/src/phases.ts +++ b/src/phases.ts @@ -62,7 +62,7 @@ import { Abilities } from "./data/enums/abilities"; import * as Overrides from "./overrides"; import { TextStyle, addTextObject } from "./ui/text"; import { Type } from "./data/type"; -import { BerryUsedEvent, EncounterPhaseEvent, MoveUsedEvent, TurnEndEvent, TurnInitEvent } from "./battle-scene-events"; +import { BerryUsedEvent, EncounterPhaseEvent, MoveUsedEvent, TurnEndEvent, TurnInitEvent } from "./events/battle-scene"; import { ExpNotification } from "./enums/exp-notification"; diff --git a/src/system/game-data.ts b/src/system/game-data.ts index a6070c6330f..e9b67da2525 100644 --- a/src/system/game-data.ts +++ b/src/system/game-data.ts @@ -32,7 +32,7 @@ import { OutdatedPhase, ReloadSessionPhase } from "#app/phases"; import { Variant, variantData } from "#app/data/variant"; import {setSettingGamepad, SettingGamepad, settingGamepadDefaults} from "./settings/settings-gamepad"; import {setSettingKeyboard, SettingKeyboard} from "#app/system/settings/settings-keyboard"; -import { TerrainChangedEvent, WeatherChangedEvent } from "#app/field/arena-events.js"; +import { TerrainChangedEvent, WeatherChangedEvent } from "#app/field/events/arena"; import { Device } from "#app/enums/devices.js"; import { EnemyAttackStatusEffectChanceModifier } from "../modifier/modifier"; import { StatusEffect } from "#app/data/status-effect.js"; diff --git a/src/system/settings/settings.ts b/src/system/settings/settings.ts index eb2b016b61e..fb446e1e081 100644 --- a/src/system/settings/settings.ts +++ b/src/system/settings/settings.ts @@ -4,7 +4,7 @@ import BattleScene from "../../battle-scene"; import { hasTouchscreen } from "../../touch-controls"; import { updateWindowType } from "../../ui/ui-theme"; import { PlayerGender } from "#app/data/enums/player-gender"; -import { CandyUpgradeNotificationChangedEvent } from "#app/battle-scene-events.js"; +import { CandyUpgradeNotificationChangedEvent } from "../../events/battle-scene"; import { MoneyFormat } from "../../enums/money-format"; import SettingsUiHandler from "#app/ui/settings/settings-ui-handler"; import { EaseType } from "#app/ui/enums/ease-type.js"; diff --git a/src/ui/arena-flyout.ts b/src/ui/arena-flyout.ts index e854de2006b..5793582d6c4 100644 --- a/src/ui/arena-flyout.ts +++ b/src/ui/arena-flyout.ts @@ -4,8 +4,8 @@ import { ArenaTagSide } from "#app/data/arena-tag.js"; import { WeatherType } from "#app/data/weather.js"; import { TerrainType } from "#app/data/terrain.js"; import { addWindow, WindowVariant } from "./ui-theme"; -import { ArenaEvent, ArenaEventType, TagAddedEvent, TagRemovedEvent, TerrainChangedEvent, WeatherChangedEvent } from "#app/field/arena-events.js"; -import { BattleSceneEventType, TurnEndEvent } from "#app/battle-scene-events.js"; +import { ArenaEvent, ArenaEventType, TagAddedEvent, TagRemovedEvent, TerrainChangedEvent, WeatherChangedEvent } from "#app/field/events/arena"; +import { BattleSceneEventType, TurnEndEvent } from "../events/battle-scene"; import { ArenaTagType } from "#app/data/enums/arena-tag-type.js"; import TimeOfDayWidget from "./time-of-day-widget"; import * as Utils from "../utils"; diff --git a/src/ui/battle-flyout.ts b/src/ui/battle-flyout.ts index 956ea65fd83..812969a988d 100644 --- a/src/ui/battle-flyout.ts +++ b/src/ui/battle-flyout.ts @@ -4,7 +4,7 @@ import * as Utils from "../utils"; import BattleScene from "#app/battle-scene.js"; import { UiTheme } from "#app/enums/ui-theme.js"; import Move from "#app/data/move.js"; -import { BattleSceneEventType, BerryUsedEvent, MoveUsedEvent } from "#app/battle-scene-events.js"; +import { BattleSceneEventType, BerryUsedEvent, MoveUsedEvent } from "../events/battle-scene"; import { BerryType } from "#app/data/enums/berry-type.js"; import { Moves } from "#app/data/enums/moves.js"; diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts index 9536fb0cc2e..58d053ac14e 100644 --- a/src/ui/starter-select-ui-handler.ts +++ b/src/ui/starter-select-ui-handler.ts @@ -1,4 +1,4 @@ -import { BattleSceneEventType, CandyUpgradeNotificationChangedEvent } from "#app/battle-scene-events.js"; +import { BattleSceneEventType, CandyUpgradeNotificationChangedEvent } from "../events/battle-scene"; import { pokemonPrevolutions } from "#app/data/pokemon-evolutions"; import { Variant, getVariantTint } from "#app/data/variant"; import { argbFromRgba } from "@material/material-color-utilities"; diff --git a/src/ui/time-of-day-widget.ts b/src/ui/time-of-day-widget.ts index fd5a8b0b15e..da3503fb573 100644 --- a/src/ui/time-of-day-widget.ts +++ b/src/ui/time-of-day-widget.ts @@ -1,7 +1,7 @@ import * as Utils from "../utils"; import BattleScene from "#app/battle-scene.js"; import { TimeOfDay } from "#app/data/enums/time-of-day.js"; -import { BattleSceneEventType } from "#app/battle-scene-events.js"; +import { BattleSceneEventType } from "../events/battle-scene"; import { EaseType } from "./enums/ease-type"; /** A small self contained UI element that displays the time of day as an icon */