From 852a08301aa00180a3ec391661f8c8f92be57e52 Mon Sep 17 00:00:00 2001
From: NightKev <34855794+DayKev@users.noreply.github.com>
Date: Mon, 21 Oct 2024 19:57:46 -0700
Subject: [PATCH] Convert overly long import lines to multi-line imports
This should hopefully prevent most merge conflicts with imports
- Replace `* as Utils` with `{ ... }`
- Add `#phases`, `#mystery-encounters`, `#balance` import mappings
- Replace many instances of relative with absolute imports
---
src/account.ts | 6 +-
src/battle-scene.ts | 226 ++++++----
src/battle.ts | 42 +-
src/data/ability.ts | 402 +++++++++--------
src/data/arena-tag.ts | 18 +-
src/data/balance/biomes.ts | 13 +-
src/data/balance/egg-moves.ts | 6 +-
src/data/balance/passives.ts | 4 +-
src/data/balance/pokemon-evolutions.ts | 6 +-
src/data/battle-anims.ts | 55 ++-
src/data/battler-tags.ts | 77 ++--
src/data/berry.ts | 28 +-
src/data/challenge.ts | 110 ++---
src/data/daily-run.ts | 12 +-
src/data/egg.ts | 60 ++-
src/data/move.ts | 400 ++++++++++-------
.../encounters/a-trainers-test-encounter.ts | 8 +-
.../encounters/absolute-avarice-encounter.ts | 14 +-
.../an-offer-you-cant-refuse-encounter.ts | 16 +-
.../encounters/berries-abound-encounter.ts | 12 +-
.../encounters/bug-type-superfan-encounter.ts | 14 +-
.../encounters/clowning-around-encounter.ts | 10 +-
.../encounters/dancing-lessons-encounter.ts | 18 +-
.../encounters/dark-deal-encounter.ts | 8 +-
.../encounters/delibirdy-encounter.ts | 14 +-
.../department-store-sale-encounter.ts | 4 +-
.../encounters/field-trip-encounter.ts | 6 +-
.../encounters/fiery-fallout-encounter.ts | 12 +-
.../encounters/fight-or-flight-encounter.ts | 16 +-
.../encounters/fun-and-games-encounter.ts | 16 +-
.../global-trade-system-encounter.ts | 36 +-
.../encounters/lost-at-sea-encounter.ts | 10 +-
.../mysterious-challengers-encounter.ts | 12 +-
.../encounters/mysterious-chest-encounter.ts | 12 +-
.../encounters/part-timer-encounter.ts | 14 +-
.../encounters/safari-zone-encounter.ts | 16 +-
.../shady-vitamin-dealer-encounter.ts | 12 +-
.../slumbering-snorlax-encounter.ts | 12 +-
.../teleporting-hijinks-encounter.ts | 14 +-
.../the-expert-pokemon-breeder-encounter.ts | 8 +-
.../the-pokemon-salesman-encounter.ts | 14 +-
.../encounters/the-strong-stuff-encounter.ts | 10 +-
.../the-winstrate-challenge-encounter.ts | 12 +-
.../encounters/training-session-encounter.ts | 12 +-
.../encounters/trash-to-treasure-encounter.ts | 10 +-
.../encounters/uncommon-breed-encounter.ts | 16 +-
.../encounters/weird-dream-encounter.ts | 8 +-
.../mystery-encounter-option.ts | 6 +-
.../mystery-encounter-requirements.ts | 2 +-
.../mystery-encounter-save-data.ts | 2 +-
.../mystery-encounters/mystery-encounter.ts | 10 +-
.../mystery-encounters/mystery-encounters.ts | 44 +-
.../can-learn-move-requirement.ts | 4 +-
.../utils/encounter-phase-utils.ts | 65 +--
.../utils/encounter-pokemon-utils.ts | 6 +-
src/data/nature.ts | 8 +-
src/data/pokemon-forms.ts | 2 +-
src/data/pokemon-species.ts | 20 +-
src/data/status-effect.ts | 8 +-
src/data/terrain.ts | 6 +-
src/data/trainer-config.ts | 20 +-
src/data/trainer-names.ts | 4 +-
src/data/variant.ts | 2 +-
src/data/weather.ts | 10 +-
src/field/anims.ts | 10 +-
src/field/arena.ts | 43 +-
src/field/damage-number-handler.ts | 34 +-
src/field/mystery-encounter-intro.ts | 2 +-
src/field/pokemon-sprite-sparkle-handler.ts | 10 +-
src/field/pokemon.ts | 424 ++++++++++++------
src/field/trainer.ts | 18 +-
src/game-mode.ts | 12 +-
src/inputs-controller.ts | 14 +-
src/loading-scene.ts | 20 +-
src/modifier/modifier-type.ts | 104 ++++-
src/modifier/modifier.ts | 39 +-
src/overrides.ts | 8 +-
src/phases/add-enemy-buff-modifier-phase.ts | 6 +-
src/phases/attempt-capture-phase.ts | 15 +-
src/phases/attempt-run-phase.ts | 16 +-
src/phases/battle-end-phase.ts | 4 +-
src/phases/berry-phase.ts | 10 +-
src/phases/check-status-effect-phase.ts | 2 +-
src/phases/check-switch-phase.ts | 12 +-
src/phases/command-phase.ts | 16 +-
src/phases/common-anim-phase.ts | 2 +-
src/phases/damage-phase.ts | 8 +-
src/phases/egg-hatch-phase.ts | 30 +-
src/phases/egg-lapse-phase.ts | 4 +-
src/phases/encounter-phase.ts | 39 +-
src/phases/end-card-phase.ts | 2 +-
src/phases/enemy-command-phase.ts | 2 +-
.../enemy-party-member-pokemon-phase.ts | 2 +-
src/phases/evolution-phase.ts | 34 +-
src/phases/exp-phase.ts | 8 +-
src/phases/faint-phase.ts | 29 +-
src/phases/field-phase.ts | 2 +-
src/phases/form-change-phase.ts | 26 +-
src/phases/game-over-modifier-reward-phase.ts | 2 +-
src/phases/game-over-phase.ts | 26 +-
src/phases/hide-party-exp-bar-phase.ts | 2 +-
src/phases/learn-move-phase.ts | 4 +-
src/phases/level-cap-phase.ts | 2 +-
src/phases/level-up-phase.ts | 12 +-
src/phases/login-phase.ts | 16 +-
src/phases/modifier-reward-phase.ts | 2 +-
src/phases/money-reward-phase.ts | 8 +-
src/phases/move-anim-test-phase.ts | 8 +-
src/phases/move-effect-phase.ts | 79 +++-
src/phases/move-end-phase.ts | 2 +-
src/phases/move-header-phase.ts | 2 +-
src/phases/move-phase.ts | 33 +-
src/phases/mystery-encounter-phases.ts | 45 +-
src/phases/new-battle-phase.ts | 2 +-
src/phases/new-biome-encounter-phase.ts | 2 +-
src/phases/next-encounter-phase.ts | 2 +-
src/phases/obtain-status-effect-phase.ts | 4 +-
src/phases/party-heal-phase.ts | 6 +-
src/phases/party-member-pokemon-phase.ts | 2 +-
.../player-party-member-pokemon-phase.ts | 2 +-
src/phases/pokemon-anim-phase.ts | 2 +-
src/phases/pokemon-heal-phase.ts | 12 +-
src/phases/pokemon-phase.ts | 2 +-
src/phases/post-game-over-phase.ts | 4 +-
src/phases/post-summon-phase.ts | 4 +-
src/phases/post-turn-status-effect-phase.ts | 19 +-
src/phases/quiet-form-change-phase.ts | 10 +-
src/phases/reload-session-phase.ts | 4 +-
src/phases/return-phase.ts | 2 +-
src/phases/ribbon-modifier-reward-phase.ts | 2 +-
src/phases/scan-ivs-phase.ts | 4 +-
src/phases/select-biome-phase.ts | 18 +-
src/phases/select-gender-phase.ts | 2 +-
src/phases/select-modifier-phase.ts | 21 +-
src/phases/select-starter-phase.ts | 4 +-
src/phases/select-target-phase.ts | 4 +-
src/phases/shiny-sparkle-phase.ts | 2 +-
src/phases/show-ability-phase.ts | 2 +-
src/phases/show-party-exp-bar-phase.ts | 14 +-
src/phases/show-trainer-phase.ts | 4 +-
src/phases/stat-stage-change-phase.ts | 12 +-
src/phases/summon-missing-phase.ts | 2 +-
src/phases/summon-phase.ts | 10 +-
src/phases/switch-biome-phase.ts | 4 +-
src/phases/switch-phase.ts | 4 +-
src/phases/switch-summon-phase.ts | 4 +-
src/phases/test-message-phase.ts | 2 +-
src/phases/title-phase.ts | 21 +-
src/phases/toggle-double-position-phase.ts | 2 +-
src/phases/trainer-message-test-phase.ts | 6 +-
src/phases/trainer-victory-phase.ts | 12 +-
src/phases/turn-end-phase.ts | 14 +-
src/phases/turn-init-phase.ts | 14 +-
src/phases/turn-start-phase.ts | 45 +-
src/phases/unavailable-phase.ts | 2 +-
src/phases/victory-phase.ts | 20 +-
src/phases/weather-effect-phase.ts | 24 +-
src/pipelines/field-sprite.ts | 8 +-
src/pipelines/sprite.ts | 14 +-
src/system/achv.ts | 26 +-
src/system/egg-data.ts | 2 +-
src/system/game-data.ts | 66 +--
src/system/game-speed.ts | 10 +-
src/system/session-history.ts | 2 +-
src/system/settings/settings.ts | 2 +-
.../abilities/ability_duplication.test.ts | 2 +-
src/test/abilities/ability_timing.test.ts | 6 +-
src/test/abilities/battery.test.ts | 6 +-
src/test/abilities/competitive.test.ts | 2 +-
src/test/abilities/contrary.test.ts | 2 +-
src/test/abilities/costar.test.ts | 10 +-
src/test/abilities/dancer.test.ts | 2 +-
src/test/abilities/defiant.test.ts | 2 +-
src/test/abilities/dry_skin.test.ts | 2 +-
src/test/abilities/flash_fire.test.ts | 8 +-
src/test/abilities/flower_gift.test.ts | 6 +-
src/test/abilities/forecast.test.ts | 14 +-
src/test/abilities/galvanize.test.ts | 6 +-
src/test/abilities/gorilla_tactics.test.ts | 6 +-
src/test/abilities/heatproof.test.ts | 6 +-
src/test/abilities/hustle.test.ts | 4 +-
src/test/abilities/ice_face.test.ts | 10 +-
src/test/abilities/illuminate.test.ts | 2 +-
src/test/abilities/imposter.test.ts | 2 +-
src/test/abilities/intrepid_sword.test.ts | 2 +-
src/test/abilities/libero.test.ts | 2 +-
src/test/abilities/magic_guard.test.ts | 2 +-
src/test/abilities/moxie.test.ts | 6 +-
src/test/abilities/mycelium_might.test.ts | 4 +-
src/test/abilities/no_guard.test.ts | 4 +-
src/test/abilities/parental_bond.test.ts | 2 +-
src/test/abilities/pastel_veil.test.ts | 6 +-
src/test/abilities/power_construct.test.ts | 4 +-
src/test/abilities/power_spot.test.ts | 6 +-
src/test/abilities/protean.test.ts | 2 +-
src/test/abilities/quick_draw.test.ts | 2 +-
src/test/abilities/sand_spit.test.ts | 2 +-
src/test/abilities/sand_veil.test.ts | 6 +-
src/test/abilities/sap_sipper.test.ts | 4 +-
src/test/abilities/schooling.test.ts | 4 +-
src/test/abilities/screen_cleaner.test.ts | 6 +-
src/test/abilities/serene_grace.test.ts | 8 +-
src/test/abilities/sheer_force.test.ts | 20 +-
src/test/abilities/shield_dust.test.ts | 6 +-
src/test/abilities/shields_down.test.ts | 4 +-
src/test/abilities/simple.test.ts | 2 +-
src/test/abilities/stall.test.ts | 2 +-
src/test/abilities/steely_spirit.test.ts | 2 +-
src/test/abilities/sturdy.test.ts | 4 +-
src/test/abilities/sweet_veil.test.ts | 8 +-
src/test/abilities/tera_shell.test.ts | 6 +-
src/test/abilities/unseen_fist.test.ts | 6 +-
src/test/abilities/volt_absorb.test.ts | 2 +-
src/test/abilities/wind_power.test.ts | 4 +-
src/test/abilities/wonder_skin.test.ts | 2 +-
src/test/abilities/zen_mode.test.ts | 20 +-
src/test/abilities/zero_to_hero.test.ts | 4 +-
src/test/account.test.ts | 4 +-
src/test/arena/arena_gravity.test.ts | 8 +-
src/test/arena/weather_fog.test.ts | 4 +-
src/test/arena/weather_sandstorm.test.ts | 4 +-
src/test/arena/weather_strong_winds.test.ts | 4 +-
src/test/battle/battle-order.test.ts | 6 +-
src/test/battle/battle.test.ts | 32 +-
src/test/battle/double_battle.test.ts | 4 +-
src/test/battle/special_battle.test.ts | 2 +-
src/test/battlerTags/octolock.test.ts | 4 +-
src/test/battlerTags/stockpiling.test.ts | 2 +-
src/test/battlerTags/substitute.test.ts | 6 +-
src/test/boss-pokemon.test.ts | 8 +-
src/test/daily_mode.test.ts | 4 +-
src/test/eggs/egg.test.ts | 6 +-
src/test/eggs/manaphy-egg.test.ts | 4 +-
src/test/endless_boss.test.ts | 4 +-
src/test/enemy_command.test.ts | 6 +-
src/test/escape-calculations.test.ts | 14 +-
src/test/evolution.test.ts | 8 +-
src/test/field/pokemon.test.ts | 6 +-
src/test/final_boss.test.ts | 8 +-
src/test/game-mode.test.ts | 2 +-
src/test/internals.test.ts | 4 +-
src/test/items/dire_hit.test.ts | 14 +-
.../double_battle_chance_booster.test.ts | 8 +-
src/test/items/eviolite.test.ts | 18 +-
src/test/items/exp_booster.test.ts | 6 +-
src/test/items/leek.test.ts | 8 +-
src/test/items/leftovers.test.ts | 4 +-
src/test/items/light_ball.test.ts | 18 +-
src/test/items/lock_capsule.test.ts | 6 +-
src/test/items/metal_powder.test.ts | 10 +-
src/test/items/quick_powder.test.ts | 10 +-
src/test/items/scope_lens.test.ts | 2 +-
.../items/temp_stat_stage_booster.test.ts | 10 +-
src/test/items/thick_club.test.ts | 18 +-
src/test/moves/after_you.test.ts | 4 +-
src/test/moves/alluring_voice.test.ts | 6 +-
src/test/moves/aromatherapy.test.ts | 4 +-
src/test/moves/astonish.test.ts | 10 +-
src/test/moves/aurora_veil.test.ts | 6 +-
src/test/moves/baneful_bunker.test.ts | 2 +-
src/test/moves/beak_blast.test.ts | 10 +-
src/test/moves/beat_up.test.ts | 10 +-
src/test/moves/belly_drum.test.ts | 4 +-
src/test/moves/burning_jealousy.test.ts | 4 +-
src/test/moves/ceaseless_edge.test.ts | 8 +-
src/test/moves/chilly_reception.test.ts | 4 +-
src/test/moves/clangorous_soul.test.ts | 2 +-
src/test/moves/crafty_shield.test.ts | 6 +-
src/test/moves/double_team.test.ts | 4 +-
src/test/moves/dragon_cheer.test.ts | 4 +-
src/test/moves/dragon_rage.test.ts | 4 +-
src/test/moves/dynamax_cannon.test.ts | 4 +-
src/test/moves/effectiveness.test.ts | 6 +-
src/test/moves/fillet_away.test.ts | 2 +-
src/test/moves/fissure.test.ts | 6 +-
src/test/moves/flame_burst.test.ts | 4 +-
src/test/moves/flower_shield.test.ts | 4 +-
src/test/moves/focus_punch.test.ts | 10 +-
src/test/moves/follow_me.test.ts | 4 +-
src/test/moves/foresight.test.ts | 6 +-
src/test/moves/freeze_dry.test.ts | 6 +-
src/test/moves/freezy_frost.test.ts | 2 +-
src/test/moves/fusion_flare.test.ts | 2 +-
src/test/moves/fusion_flare_bolt.test.ts | 8 +-
src/test/moves/gastro_acid.test.ts | 6 +-
src/test/moves/glaive_rush.test.ts | 6 +-
src/test/moves/growth.test.ts | 4 +-
src/test/moves/guard_split.test.ts | 2 +-
src/test/moves/guard_swap.test.ts | 4 +-
src/test/moves/hard_press.test.ts | 2 +-
src/test/moves/haze.test.ts | 2 +-
src/test/moves/heal_bell.test.ts | 4 +-
src/test/moves/heart_swap.test.ts | 4 +-
src/test/moves/hyper_beam.test.ts | 12 +-
src/test/moves/jaw_lock.test.ts | 12 +-
src/test/moves/lash_out.test.ts | 2 +-
src/test/moves/light_screen.test.ts | 6 +-
src/test/moves/lucky_chant.test.ts | 12 +-
src/test/moves/lunar_blessing.test.ts | 4 +-
src/test/moves/magnet_rise.test.ts | 4 +-
src/test/moves/make_it_rain.test.ts | 4 +-
src/test/moves/mat_block.test.ts | 6 +-
src/test/moves/miracle_eye.test.ts | 6 +-
src/test/moves/multi_target.test.ts | 14 +-
src/test/moves/nightmare.test.ts | 4 +-
src/test/moves/octolock.test.ts | 6 +-
src/test/moves/parting_shot.test.ts | 8 +-
src/test/moves/power_shift.test.ts | 6 +-
src/test/moves/power_split.test.ts | 2 +-
src/test/moves/power_swap.test.ts | 4 +-
src/test/moves/power_trick.test.ts | 2 +-
src/test/moves/purify.test.ts | 2 +-
src/test/moves/reflect.test.ts | 6 +-
src/test/moves/relic_song.test.ts | 2 +-
src/test/moves/rollout.test.ts | 2 +-
src/test/moves/roost.test.ts | 10 +-
src/test/moves/safeguard.test.ts | 4 +-
src/test/moves/scale_shot.test.ts | 8 +-
src/test/moves/shell_trap.test.ts | 10 +-
src/test/moves/sparkly_swirl.test.ts | 4 +-
src/test/moves/speed_swap.test.ts | 2 +-
src/test/moves/spit_up.test.ts | 6 +-
src/test/moves/spotlight.test.ts | 2 +-
src/test/moves/steamroller.test.ts | 2 +-
src/test/moves/stockpile.test.ts | 4 +-
src/test/moves/substitute.test.ts | 2 +-
src/test/moves/swallow.test.ts | 6 +-
src/test/moves/tackle.test.ts | 4 +-
src/test/moves/tail_whip.test.ts | 4 +-
src/test/moves/tailwind.test.ts | 4 +-
src/test/moves/tar_shot.test.ts | 6 +-
src/test/moves/tera_blast.test.ts | 2 +-
src/test/moves/thousand_arrows.test.ts | 8 +-
src/test/moves/throat_chop.test.ts | 6 +-
src/test/moves/thunder_wave.test.ts | 2 +-
src/test/moves/tidy_up.test.ts | 6 +-
src/test/moves/torment.test.ts | 2 +-
src/test/moves/transform.test.ts | 2 +-
src/test/moves/u_turn.test.ts | 8 +-
src/test/moves/whirlwind.test.ts | 2 +-
src/test/moves/wide_guard.test.ts | 4 +-
.../mystery-encounter/encounter-test-utils.ts | 12 +-
.../a-trainers-test-encounter.test.ts | 20 +-
.../absolute-avarice-encounter.test.ts | 18 +-
...an-offer-you-cant-refuse-encounter.test.ts | 16 +-
.../berries-abound-encounter.test.ts | 18 +-
.../bug-type-superfan-encounter.test.ts | 18 +-
.../clowning-around-encounter.test.ts | 24 +-
.../dancing-lessons-encounter.test.ts | 22 +-
.../encounters/delibirdy-encounter.test.ts | 18 +-
.../department-store-sale-encounter.test.ts | 16 +-
.../encounters/field-trip-encounter.test.ts | 14 +-
.../fiery-fallout-encounter.test.ts | 20 +-
.../fight-or-flight-encounter.test.ts | 18 +-
.../fun-and-games-encounter.test.ts | 22 +-
.../global-trade-system-encounter.test.ts | 18 +-
.../encounters/lost-at-sea-encounter.test.ts | 16 +-
.../mysterious-challengers-encounter.test.ts | 18 +-
.../encounters/part-timer-encounter.test.ts | 16 +-
.../teleporting-hijinks-encounter.test.ts | 10 +-
.../the-expert-breeder-encounter.test.ts | 20 +-
.../the-pokemon-salesman-encounter.test.ts | 16 +-
.../the-strong-stuff-encounter.test.ts | 20 +-
.../the-winstrate-challenge-encounter.test.ts | 24 +-
.../trash-to-treasure-encounter.test.ts | 18 +-
.../uncommon-breed-encounter.test.ts | 24 +-
.../encounters/weird-dream-encounter.test.ts | 16 +-
.../mystery-encounter-utils.test.ts | 10 +-
.../mystery-encounter.test.ts | 2 +-
src/test/phases/learn-move-phase.test.ts | 2 +-
.../phases/mystery-encounter-phase.test.ts | 2 +-
src/test/phases/phases.test.ts | 6 +-
src/test/phases/select-modifier-phase.test.ts | 6 +-
src/test/ui/battle_info.test.ts | 6 +-
src/test/ui/starter-select.test.ts | 6 +-
src/test/ui/transfer-item.test.ts | 12 +-
src/test/ui/type-hints.test.ts | 8 +-
src/test/utils/gameManager.ts | 36 +-
src/test/utils/gameManagerUtils.ts | 2 +-
src/test/utils/helpers/challengeModeHelper.ts | 12 +-
src/test/utils/helpers/classicModeHelper.ts | 12 +-
src/test/utils/helpers/dailyModeHelper.ts | 12 +-
src/test/utils/helpers/moveHelper.ts | 6 +-
src/test/utils/helpers/overridesHelper.ts | 8 +-
src/test/utils/helpers/reloadHelper.ts | 8 +-
src/test/utils/helpers/settingsHelper.ts | 6 +-
src/test/utils/phaseInterceptor.ts | 94 ++--
src/test/vitest.setup.ts | 8 +-
src/tutorial.ts | 6 +-
src/ui-inputs.ts | 18 +-
src/ui/abstact-option-select-ui-handler.ts | 10 +-
src/ui/admin-ui-handler.ts | 6 +-
src/ui/arena-flyout.ts | 19 +-
src/ui/ball-ui-handler.ts | 2 +-
src/ui/battle-flyout.ts | 8 +-
src/ui/battle-info.ts | 20 +-
src/ui/battle-message-ui-handler.ts | 2 +-
src/ui/bgm-bar.ts | 6 +-
src/ui/candy-bar.ts | 8 +-
src/ui/challenges-select-ui-handler.ts | 14 +-
src/ui/char-sprite.ts | 6 +-
src/ui/command-ui-handler.ts | 2 +-
src/ui/daily-run-scoreboard.ts | 14 +-
src/ui/egg-gacha-ui-handler.ts | 26 +-
src/ui/egg-hatch-scene-handler.ts | 2 +-
src/ui/egg-summary-ui-handler.ts | 2 +-
src/ui/fight-ui-handler.ts | 18 +-
src/ui/form-modal-ui-handler.ts | 6 +-
src/ui/game-stats-ui-handler.ts | 10 +-
src/ui/login-form-ui-handler.ts | 10 +-
src/ui/menu-ui-handler.ts | 46 +-
src/ui/message-ui-handler.ts | 8 +-
src/ui/modifier-select-ui-handler.ts | 21 +-
src/ui/move-info-overlay.ts | 20 +-
src/ui/mystery-encounter-ui-handler.ts | 33 +-
src/ui/party-ui-handler.ts | 16 +-
src/ui/pokemon-hatch-info-container.ts | 10 +-
src/ui/pokemon-icon-anim-handler.ts | 6 +-
src/ui/pokemon-info-container.ts | 30 +-
src/ui/registration-form-ui-handler.ts | 8 +-
src/ui/run-history-ui-handler.ts | 22 +-
src/ui/run-info-ui-handler.ts | 42 +-
src/ui/save-slot-select-ui-handler.ts | 20 +-
src/ui/saving-icon-handler.ts | 8 +-
src/ui/starter-select-ui-handler.ts | 97 ++--
src/ui/stats-container.ts | 2 +-
src/ui/summary-ui-handler.ts | 58 +--
src/ui/target-select-ui-handler.ts | 12 +-
src/ui/time-of-day-widget.ts | 12 +-
src/ui/title-ui-handler.ts | 16 +-
src/ui/ui.ts | 6 +-
src/ui/unavailable-modal-ui-handler.ts | 6 +-
tsconfig.json | 3 +
433 files changed, 3509 insertions(+), 2742 deletions(-)
diff --git a/src/account.ts b/src/account.ts
index 692ff2b0d81f..4eacf31fba69 100644
--- a/src/account.ts
+++ b/src/account.ts
@@ -1,5 +1,5 @@
import { bypassLogin } from "./battle-scene";
-import * as Utils from "./utils";
+import { randomString, apiFetch } from "#app/utils";
export interface UserInfo {
username: string;
@@ -11,7 +11,7 @@ export interface UserInfo {
export let loggedInUser: UserInfo | null = null;
// This is a random string that is used to identify the client session - unique per session (tab or window) so that the game will only save on the one that the server is expecting
-export const clientSessionId = Utils.randomString(32);
+export const clientSessionId = randomString(32);
export function initLoggedInUser(): void {
loggedInUser = { username: "Guest", lastSessionSlot: -1, discordId: "", googleId: "", hasAdminRole: false };
@@ -43,7 +43,7 @@ export function updateUserInfo(): Promise<[boolean, integer]> {
});
return resolve([ true, 200 ]);
}
- Utils.apiFetch("account/info", true).then(response => {
+ apiFetch("account/info", true).then(response => {
if (!response.ok) {
resolve([ false, response.status ]);
return;
diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index a21e1b093425..2f086c83a265 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -2,20 +2,80 @@ import Phaser from "phaser";
import UI from "#app/ui/ui";
import Pokemon, { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon";
import PokemonSpecies, { allSpecies, getPokemonSpecies, PokemonSpeciesFilter } from "#app/data/pokemon-species";
-import { Constructor, isNullOrUndefined, randSeedInt } from "#app/utils";
-import * as Utils from "#app/utils";
-import { ConsumableModifier, ConsumablePokemonModifier, DoubleBattleChanceBoosterModifier, ExpBalanceModifier, ExpShareModifier, FusePokemonModifier, HealingBoosterModifier, Modifier, ModifierBar, ModifierPredicate, MultipleParticipantExpBonusModifier, overrideHeldItems, overrideModifiers, PersistentModifier, PokemonExpBoosterModifier, PokemonFormChangeItemModifier, PokemonHeldItemModifier, PokemonHpRestoreModifier, PokemonIncrementingStatModifier, RememberMoveModifier, TerastallizeModifier, TurnHeldItemTransferModifier } from "./modifier/modifier";
+import {
+ Constructor,
+ fixedInt,
+ getIvsFromId,
+ randSeedInt,
+ getEnumValues,
+ randomString,
+ IntegerHolder,
+ shiftCharCodes,
+ formatMoney,
+ isNullOrUndefined,
+ BooleanHolder,
+ executeIf,
+ NumberHolder,
+} from "#app/utils";
+import {
+ ConsumableModifier,
+ ConsumablePokemonModifier,
+ DoubleBattleChanceBoosterModifier,
+ ExpBalanceModifier,
+ ExpShareModifier,
+ FusePokemonModifier,
+ HealingBoosterModifier,
+ Modifier,
+ ModifierBar,
+ ModifierPredicate,
+ MultipleParticipantExpBonusModifier,
+ overrideHeldItems,
+ overrideModifiers,
+ PersistentModifier,
+ PokemonExpBoosterModifier,
+ PokemonFormChangeItemModifier,
+ PokemonHeldItemModifier,
+ PokemonHpRestoreModifier,
+ PokemonIncrementingStatModifier,
+ RememberMoveModifier,
+ TerastallizeModifier,
+ TurnHeldItemTransferModifier,
+} from "#app/modifier/modifier";
import { PokeballType } from "#app/data/pokeball";
-import { initCommonAnims, initMoveAnim, loadCommonAnimAssets, loadMoveAnimAssets, populateAnims } from "#app/data/battle-anims";
+import {
+ initCommonAnims,
+ initMoveAnim,
+ loadCommonAnimAssets,
+ loadMoveAnimAssets,
+ populateAnims,
+} from "#app/data/battle-anims";
import { Phase } from "#app/phase";
import { initGameSpeed } from "#app/system/game-speed";
import { Arena, ArenaBase } from "#app/field/arena";
import { GameData } from "#app/system/game-data";
import { addTextObject, getTextColor, TextStyle } from "#app/ui/text";
import { allMoves } from "#app/data/move";
-import { getDefaultModifierTypeForTier, getEnemyModifierTypesForWave, getLuckString, getLuckTextTint, getModifierPoolForType, getModifierType, getPartyLuckValue, ModifierPoolType, modifierTypes, PokemonHeldItemModifierType } from "#app/modifier/modifier-type";
+import {
+ getDefaultModifierTypeForTier,
+ getEnemyModifierTypesForWave,
+ getLuckString,
+ getLuckTextTint,
+ getModifierPoolForType,
+ getModifierType,
+ getPartyLuckValue,
+ ModifierPoolType,
+ modifierTypes,
+ PokemonHeldItemModifierType,
+} from "#app/modifier/modifier-type";
import AbilityBar from "#app/ui/ability-bar";
-import { allAbilities, applyAbAttrs, applyPostBattleInitAbAttrs, BlockItemTheftAbAttr, DoubleBattleChanceAbAttr, PostBattleInitAbAttr } from "#app/data/ability";
+import {
+ allAbilities,
+ applyAbAttrs,
+ applyPostBattleInitAbAttrs,
+ BlockItemTheftAbAttr,
+ DoubleBattleChanceAbAttr,
+ PostBattleInitAbAttr,
+} from "#app/data/ability";
import Battle, { BattleType, FixedBattleConfig } from "#app/battle";
import { GameMode, GameModes, getGameMode } from "#app/game-mode";
import FieldSpritePipeline from "#app/pipelines/field-sprite";
@@ -25,7 +85,7 @@ import { trainerConfigs, TrainerSlot } from "#app/data/trainer-config";
import Trainer, { TrainerVariant } from "#app/field/trainer";
import TrainerData from "#app/system/trainer-data";
import SoundFade from "phaser3-rex-plugins/plugins/soundfade";
-import { pokemonPrevolutions } from "#app/data/balance/pokemon-evolutions";
+import { pokemonPrevolutions } from "#balance/pokemon-evolutions";
import PokeballTray from "#app/ui/pokeball-tray";
import InvertPostFX from "#app/pipelines/invert";
import { Achv, achvs, ModifierAchv, MoneyAchv } from "#app/system/achv";
@@ -35,14 +95,21 @@ import UIPlugin from "phaser3-rex-plugins/templates/ui/ui-plugin";
import { addUiThemeOverrides } from "#app/ui/ui-theme";
import PokemonData from "#app/system/pokemon-data";
import { Nature } from "#app/data/nature";
-import { FormChangeItem, pokemonFormChanges, SpeciesFormChange, SpeciesFormChangeManualTrigger, SpeciesFormChangeTimeOfDayTrigger, SpeciesFormChangeTrigger } from "#app/data/pokemon-forms";
-import { FormChangePhase } from "#app/phases/form-change-phase";
+import {
+ FormChangeItem,
+ pokemonFormChanges,
+ SpeciesFormChange,
+ SpeciesFormChangeManualTrigger,
+ SpeciesFormChangeTimeOfDayTrigger,
+ SpeciesFormChangeTrigger,
+} from "#app/data/pokemon-forms";
+import { FormChangePhase } from "#phases/form-change-phase";
import { getTypeRgb } from "#app/data/type";
import PokemonSpriteSparkleHandler from "#app/field/pokemon-sprite-sparkle-handler";
import CharSprite from "#app/ui/char-sprite";
import DamageNumberHandler from "#app/field/damage-number-handler";
import PokemonInfoContainer from "#app/ui/pokemon-info-container";
-import { biomeDepths, getBiomeName } from "#app/data/balance/biomes";
+import { biomeDepths, getBiomeName } from "#balance/biomes";
import { SceneBase } from "#app/scene-base";
import CandyBar from "#app/ui/candy-bar";
import { Variant, variantData } from "#app/data/variant";
@@ -68,34 +135,41 @@ import i18next from "i18next";
import { TrainerType } from "#enums/trainer-type";
import { battleSpecDialogue } from "#app/data/dialogue";
import { LoadingScene } from "#app/loading-scene";
-import { LevelCapPhase } from "#app/phases/level-cap-phase";
-import { LoginPhase } from "#app/phases/login-phase";
-import { MessagePhase } from "#app/phases/message-phase";
-import { MovePhase } from "#app/phases/move-phase";
-import { NewBiomeEncounterPhase } from "#app/phases/new-biome-encounter-phase";
-import { NextEncounterPhase } from "#app/phases/next-encounter-phase";
-import { PokemonAnimPhase } from "#app/phases/pokemon-anim-phase";
-import { QuietFormChangePhase } from "#app/phases/quiet-form-change-phase";
-import { ReturnPhase } from "#app/phases/return-phase";
-import { SelectBiomePhase } from "#app/phases/select-biome-phase";
-import { ShowTrainerPhase } from "#app/phases/show-trainer-phase";
-import { SummonPhase } from "#app/phases/summon-phase";
-import { SwitchPhase } from "#app/phases/switch-phase";
-import { TitlePhase } from "#app/phases/title-phase";
-import { ToggleDoublePositionPhase } from "#app/phases/toggle-double-position-phase";
-import { TurnInitPhase } from "#app/phases/turn-init-phase";
-import { ShopCursorTarget } from "#app/enums/shop-cursor-target";
-import MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter";
-import { allMysteryEncounters, ANTI_VARIANCE_WEIGHT_MODIFIER, AVERAGE_ENCOUNTERS_PER_RUN_TARGET, BASE_MYSTERY_ENCOUNTER_SPAWN_WEIGHT, MYSTERY_ENCOUNTER_SPAWN_MAX_WEIGHT, mysteryEncountersByBiome } from "#app/data/mystery-encounters/mystery-encounters";
-import { MysteryEncounterSaveData } from "#app/data/mystery-encounters/mystery-encounter-save-data";
+import { LevelCapPhase } from "#phases/level-cap-phase";
+import { LoginPhase } from "#phases/login-phase";
+import { MessagePhase } from "#phases/message-phase";
+import { MovePhase } from "#phases/move-phase";
+import { NewBiomeEncounterPhase } from "#phases/new-biome-encounter-phase";
+import { NextEncounterPhase } from "#phases/next-encounter-phase";
+import { PokemonAnimPhase } from "#phases/pokemon-anim-phase";
+import { QuietFormChangePhase } from "#phases/quiet-form-change-phase";
+import { ReturnPhase } from "#phases/return-phase";
+import { SelectBiomePhase } from "#phases/select-biome-phase";
+import { ShowTrainerPhase } from "#phases/show-trainer-phase";
+import { SummonPhase } from "#phases/summon-phase";
+import { SwitchPhase } from "#phases/switch-phase";
+import { TitlePhase } from "#phases/title-phase";
+import { ToggleDoublePositionPhase } from "#phases/toggle-double-position-phase";
+import { TurnInitPhase } from "#phases/turn-init-phase";
+import { ShopCursorTarget } from "#enums/shop-cursor-target";
+import MysteryEncounter from "#mystery-encounters/mystery-encounter";
+import {
+ allMysteryEncounters,
+ ANTI_VARIANCE_WEIGHT_MODIFIER,
+ AVERAGE_ENCOUNTERS_PER_RUN_TARGET,
+ BASE_MYSTERY_ENCOUNTER_SPAWN_WEIGHT,
+ MYSTERY_ENCOUNTER_SPAWN_MAX_WEIGHT,
+ mysteryEncountersByBiome,
+} from "#mystery-encounters/mystery-encounters";
+import { MysteryEncounterSaveData } from "#mystery-encounters/mystery-encounter-save-data";
import { MysteryEncounterType } from "#enums/mystery-encounter-type";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import HeldModifierConfig from "#app/interfaces/held-modifier-config";
-import { ExpPhase } from "#app/phases/exp-phase";
-import { ShowPartyExpBarPhase } from "#app/phases/show-party-exp-bar-phase";
+import { ExpPhase } from "#phases/exp-phase";
+import { ShowPartyExpBarPhase } from "#phases/show-party-exp-bar-phase";
import { MysteryEncounterMode } from "#enums/mystery-encounter-mode";
import { ExpGainsSpeed } from "#enums/exp-gains-speed";
-import { FRIENDSHIP_GAIN_FROM_BATTLE } from "#app/data/balance/starters";
+import { FRIENDSHIP_GAIN_FROM_BATTLE } from "#balance/starters";
export const bypassLogin = import.meta.env.VITE_BYPASS_LOGIN === "1";
@@ -628,7 +702,7 @@ export default class BattleScene extends SceneBase {
}
this.playTimeTimer = this.time.addEvent({
- delay: Utils.fixedInt(1000),
+ delay: fixedInt(1000),
repeat: -1,
callback: () => {
if (this.gameData) {
@@ -897,7 +971,7 @@ export default class BattleScene extends SceneBase {
overrideModifiers(this, false);
overrideHeldItems(this, pokemon, false);
if (boss && !dataSource) {
- const secondaryIvs = Utils.getIvsFromId(Utils.randSeedInt(4294967296));
+ const secondaryIvs = getIvsFromId(randSeedInt(4294967296));
for (let s = 0; s < pokemon.ivs.length; s++) {
pokemon.ivs[s] = Math.round(Phaser.Math.Linear(Math.min(pokemon.ivs[s], secondaryIvs[s]), Math.max(pokemon.ivs[s], secondaryIvs[s]), 0.75));
@@ -1027,7 +1101,7 @@ export default class BattleScene extends SceneBase {
* Generates a random number using the current battle's seed
*
* This calls {@linkcode Battle.randSeedInt}(`scene`, {@linkcode range}, {@linkcode min}) in `src/battle.ts`
- * which calls {@linkcode Utils.randSeedInt randSeedInt}({@linkcode range}, {@linkcode min}) in `src/utils.ts`
+ * which calls {@linkcode randSeedInt randSeedInt}({@linkcode range}, {@linkcode min}) in `src/utils.ts`
*
* @param range How large of a range of random numbers to choose from. If {@linkcode range} <= 1, returns {@linkcode min}
* @param min The minimum integer to pick, default `0`
@@ -1051,7 +1125,7 @@ export default class BattleScene extends SceneBase {
this.lockModifierTiers = false;
- this.pokeballCounts = Object.fromEntries(Utils.getEnumValues(PokeballType).filter(p => p <= PokeballType.MASTER_BALL).map(t => [ t, 0 ]));
+ this.pokeballCounts = Object.fromEntries(getEnumValues(PokeballType).filter(p => p <= PokeballType.MASTER_BALL).map(t => [ t, 0 ]));
this.pokeballCounts[PokeballType.POKEBALL] += 5;
if (Overrides.POKEBALL_OVERRIDE.active) {
this.pokeballCounts = Overrides.POKEBALL_OVERRIDE.pokeballs;
@@ -1080,7 +1154,7 @@ export default class BattleScene extends SceneBase {
// Reset RNG after end of game or save & quit.
// This needs to happen after clearing this.currentBattle or the seed will be affected by the last wave played
- this.setSeed(Overrides.SEED_OVERRIDE || Utils.randomString(24));
+ this.setSeed(Overrides.SEED_OVERRIDE || randomString(24));
console.log("Seed:", this.seed);
this.resetSeed();
@@ -1120,7 +1194,7 @@ export default class BattleScene extends SceneBase {
...allSpecies,
...allMoves,
...allAbilities,
- ...Utils.getEnumValues(ModifierPoolType).map(mpt => getModifierPoolForType(mpt)).map(mp => Object.values(mp).flat().map(mt => mt.modifierType).filter(mt => "localize" in mt).map(lpb => lpb as unknown as Localizable)).flat()
+ ...getEnumValues(ModifierPoolType).map(mpt => getModifierPoolForType(mpt)).map(mp => Object.values(mp).flat().map(mt => mt.modifierType).filter(mt => "localize" in mt).map(lpb => lpb as unknown as Localizable)).flat()
];
for (const item of localizable) {
item.localize();
@@ -1149,7 +1223,7 @@ export default class BattleScene extends SceneBase {
}
getDoubleBattleChance(newWaveIndex: number, playerField: PlayerPokemon[]) {
- const doubleChance = new Utils.IntegerHolder(newWaveIndex % 10 === 0 ? 32 : 8);
+ const doubleChance = new IntegerHolder(newWaveIndex % 10 === 0 ? 32 : 8);
this.applyModifiers(DoubleBattleChanceBoosterModifier, true, doubleChance);
playerField.forEach(p => applyAbAttrs(DoubleBattleChanceAbAttr, p, null, false, doubleChance));
return Math.max(doubleChance.value, 1);
@@ -1191,13 +1265,13 @@ export default class BattleScene extends SceneBase {
if (trainerConfigs[trainerType].doubleOnly) {
doubleTrainer = true;
} else if (trainerConfigs[trainerType].hasDouble) {
- doubleTrainer = !Utils.randSeedInt(this.getDoubleBattleChance(newWaveIndex, playerField));
+ doubleTrainer = !randSeedInt(this.getDoubleBattleChance(newWaveIndex, playerField));
// Add a check that special trainers can't be double except for tate and liza - they should use the normal double chance
if (trainerConfigs[trainerType].trainerTypeDouble && ![ TrainerType.TATE, TrainerType.LIZA ].includes(trainerType)) {
doubleTrainer = false;
}
}
- const variant = doubleTrainer ? TrainerVariant.DOUBLE : (Utils.randSeedInt(2) ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT);
+ const variant = doubleTrainer ? TrainerVariant.DOUBLE : (randSeedInt(2) ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT);
newTrainer = trainerData !== undefined ? trainerData.toTrainer(this) : new Trainer(this, trainerType, variant);
this.field.add(newTrainer);
}
@@ -1213,7 +1287,7 @@ export default class BattleScene extends SceneBase {
if (double === undefined && newWaveIndex > 1) {
if (newBattleType === BattleType.WILD && !this.gameMode.isWaveFinal(newWaveIndex)) {
- newDouble = !Utils.randSeedInt(this.getDoubleBattleChance(newWaveIndex, playerField));
+ newDouble = !randSeedInt(this.getDoubleBattleChance(newWaveIndex, playerField));
} else if (newBattleType === BattleType.TRAINER) {
newDouble = newTrainer?.variant === TrainerVariant.DOUBLE;
}
@@ -1341,7 +1415,7 @@ export default class BattleScene extends SceneBase {
scale: scale,
x: (defaultWidth - scaledWidth) / 2,
y: defaultHeight - scaledHeight,
- duration: !instant ? Utils.fixedInt(Math.abs(this.field.scale - scale) * 200) : 0,
+ duration: !instant ? fixedInt(Math.abs(this.field.scale - scale) * 200) : 0,
ease: "Sine.easeInOut",
onComplete: () => resolve()
});
@@ -1377,19 +1451,19 @@ export default class BattleScene extends SceneBase {
case Species.SQUAWKABILLY:
case Species.TATSUGIRI:
case Species.PALDEA_TAUROS:
- return Utils.randSeedInt(species.forms.length);
+ return randSeedInt(species.forms.length);
case Species.PIKACHU:
- return Utils.randSeedInt(8);
+ return randSeedInt(8);
case Species.EEVEE:
- return Utils.randSeedInt(2);
+ return randSeedInt(2);
case Species.GRENINJA:
- return Utils.randSeedInt(2);
+ return randSeedInt(2);
case Species.ZYGARDE:
- return Utils.randSeedInt(4);
+ return randSeedInt(4);
case Species.MINIOR:
- return Utils.randSeedInt(6);
+ return randSeedInt(6);
case Species.ALCREMIE:
- return Utils.randSeedInt(9);
+ return randSeedInt(9);
case Species.MEOWSTIC:
case Species.INDEEDEE:
case Species.BASCULEGION:
@@ -1406,7 +1480,7 @@ export default class BattleScene extends SceneBase {
if (this.gameMode.hasMysteryEncounters) {
return 1; // Wandering form
} else {
- return Utils.randSeedInt(species.forms.length);
+ return randSeedInt(species.forms.length);
}
}
@@ -1416,7 +1490,7 @@ export default class BattleScene extends SceneBase {
case Species.WORMADAM:
case Species.ROTOM:
case Species.LYCANROC:
- return Utils.randSeedInt(species.forms.length);
+ return randSeedInt(species.forms.length);
}
return 0;
}
@@ -1427,7 +1501,7 @@ export default class BattleScene extends SceneBase {
private getGeneratedOffsetGym(): boolean {
let ret = false;
this.executeWithSeedOffset(() => {
- ret = !Utils.randSeedInt(2);
+ ret = !randSeedInt(2);
}, 0, this.seed.toString());
return ret;
}
@@ -1435,7 +1509,7 @@ export default class BattleScene extends SceneBase {
private getGeneratedWaveCycleOffset(): integer {
let ret = 0;
this.executeWithSeedOffset(() => {
- ret = Utils.randSeedInt(8) * 5;
+ ret = randSeedInt(8) * 5;
}, 0, this.seed.toString());
return ret;
}
@@ -1457,7 +1531,7 @@ export default class BattleScene extends SceneBase {
isBoss = true;
} else {
this.executeWithSeedOffset(() => {
- isBoss = waveIndex % 10 === 0 || (this.gameMode.hasRandomBosses && Utils.randSeedInt(100) < Math.min(Math.max(Math.ceil((waveIndex - 250) / 50), 0) * 2, 30));
+ isBoss = waveIndex % 10 === 0 || (this.gameMode.hasRandomBosses && randSeedInt(100) < Math.min(Math.max(Math.ceil((waveIndex - 250) / 50), 0) * 2, 30));
}, waveIndex << 2);
}
if (!isBoss) {
@@ -1484,7 +1558,7 @@ export default class BattleScene extends SceneBase {
const infectedIndexes: integer[] = [];
const spread = (index: number, spreadTo: number) => {
const partyMember = party[index + spreadTo];
- if (!partyMember.pokerus && !Utils.randSeedInt(10)) {
+ if (!partyMember.pokerus && !randSeedInt(10)) {
partyMember.pokerus = true;
infectedIndexes.push(index + spreadTo);
}
@@ -1507,7 +1581,7 @@ export default class BattleScene extends SceneBase {
resetSeed(waveIndex?: integer): void {
const wave = waveIndex || this.currentBattle?.waveIndex || 0;
- this.waveSeed = Utils.shiftCharCodes(this.seed, wave);
+ this.waveSeed = shiftCharCodes(this.seed, wave);
Phaser.Math.RND.sow([ this.waveSeed ]);
console.log("Wave Seed:", this.waveSeed, wave);
this.rngCounter = 0;
@@ -1521,7 +1595,7 @@ export default class BattleScene extends SceneBase {
const tempRngOffset = this.rngOffset;
const tempRngSeedOverride = this.rngSeedOverride;
const state = Phaser.Math.RND.state();
- Phaser.Math.RND.sow([ Utils.shiftCharCodes(seedOverride || this.seed, offset) ]);
+ Phaser.Math.RND.sow([ shiftCharCodes(seedOverride || this.seed, offset) ]);
this.rngCounter = 0;
this.rngOffset = offset;
this.rngSeedOverride = seedOverride || "";
@@ -1641,7 +1715,7 @@ export default class BattleScene extends SceneBase {
if (this.money === undefined) {
return;
}
- const formattedMoney = Utils.formatMoney(this.moneyFormat, this.money);
+ const formattedMoney = formatMoney(this.moneyFormat, this.money);
this.moneyText.setText(i18next.t("battleScene:moneyOwned", { formattedMoney }));
this.fieldUI.moveAbove(this.moneyText, this.luckText);
if (forceVisible) {
@@ -1765,12 +1839,12 @@ export default class BattleScene extends SceneBase {
}
return s;
})) ] : allSpecies.filter(s => s.isCatchable());
- return filteredSpecies[Utils.randSeedInt(filteredSpecies.length)];
+ return filteredSpecies[randSeedInt(filteredSpecies.length)];
}
generateRandomBiome(waveIndex: integer): Biome {
const relWave = waveIndex % 250;
- const biomes = Utils.getEnumValues(Biome).slice(1, Utils.getEnumValues(Biome).filter(b => b >= 40).length * -1);
+ const biomes = getEnumValues(Biome).slice(1, getEnumValues(Biome).filter(b => b >= 40).length * -1);
const maxDepth = biomeDepths[Biome.END][0] - 2;
const depthWeights = new Array(maxDepth + 1).fill(null)
.map((_, i: integer) => ((1 - Math.min(Math.abs((i / (maxDepth - 1)) - (relWave / 250)) + 0.25, 1)) / 0.75) * 250);
@@ -1781,7 +1855,7 @@ export default class BattleScene extends SceneBase {
biomeThresholds.push(totalWeight);
}
- const randInt = Utils.randSeedInt(totalWeight);
+ const randInt = randSeedInt(totalWeight);
for (const biome of biomes) {
if (randInt < biomeThresholds[biome]) {
@@ -1789,7 +1863,7 @@ export default class BattleScene extends SceneBase {
}
}
- return biomes[Utils.randSeedInt(biomes.length)];
+ return biomes[randSeedInt(biomes.length)];
}
isBgmPlaying(): boolean {
@@ -1974,7 +2048,7 @@ export default class BattleScene extends SceneBase {
this.bgmResumeTimer.destroy();
}
if (resumeBgm) {
- this.bgmResumeTimer = this.time.delayedCall((pauseDuration || Utils.fixedInt(sound.totalDuration * 1000)), () => {
+ this.bgmResumeTimer = this.time.delayedCall((pauseDuration || fixedInt(sound.totalDuration * 1000)), () => {
this.resumeBgm();
this.bgmResumeTimer = null;
});
@@ -2483,7 +2557,7 @@ export default class BattleScene extends SceneBase {
const args: unknown[] = [];
if (modifier instanceof PokemonHpRestoreModifier) {
if (!(modifier as PokemonHpRestoreModifier).fainted) {
- const hpRestoreMultiplier = new Utils.IntegerHolder(1);
+ const hpRestoreMultiplier = new IntegerHolder(1);
this.applyModifiers(HealingBoosterModifier, true, hpRestoreMultiplier);
args.push(hpRestoreMultiplier.value);
} else {
@@ -2491,7 +2565,7 @@ export default class BattleScene extends SceneBase {
}
} else if (modifier instanceof FusePokemonModifier) {
args.push(this.getPokemonById(modifier.fusePokemonId) as PlayerPokemon);
- } else if (modifier instanceof RememberMoveModifier && !Utils.isNullOrUndefined(cost)) {
+ } else if (modifier instanceof RememberMoveModifier && !isNullOrUndefined(cost)) {
args.push(cost);
}
@@ -2564,8 +2638,8 @@ export default class BattleScene extends SceneBase {
tryTransferHeldItemModifier(itemModifier: PokemonHeldItemModifier, target: Pokemon, playSound: boolean, transferQuantity: integer = 1, instant?: boolean, ignoreUpdate?: boolean): Promise<boolean> {
return new Promise(resolve => {
const source = itemModifier.pokemonId ? itemModifier.getPokemon(target.scene) : null;
- const cancelled = new Utils.BooleanHolder(false);
- Utils.executeIf(!!source && source.isPlayer() !== target.isPlayer(), () => applyAbAttrs(BlockItemTheftAbAttr, source! /* checked in condition*/, cancelled)).then(() => {
+ const cancelled = new BooleanHolder(false);
+ executeIf(!!source && source.isPlayer() !== target.isPlayer(), () => applyAbAttrs(BlockItemTheftAbAttr, source! /* checked in condition*/, cancelled)).then(() => {
if (cancelled.value) {
return resolve(false);
}
@@ -2674,7 +2748,7 @@ export default class BattleScene extends SceneBase {
pokemonModifierChance = Math.ceil(pokemonModifierChance * this.currentBattle.trainer.getPartyMemberModifierChanceMultiplier(i)); // eslint-disable-line
let count = 0;
for (let c = 0; c < chances; c++) {
- if (!Utils.randSeedInt(modifierChance)) {
+ if (!randSeedInt(modifierChance)) {
count++;
}
}
@@ -2825,7 +2899,7 @@ export default class BattleScene extends SceneBase {
if (mods.length < 1) {
return mods;
}
- const rand = Utils.randSeedInt(mods.length);
+ const rand = randSeedInt(mods.length);
return [ mods[rand], ...shuffleModifiers(mods.filter((_, i) => i !== rand)) ];
};
modifiers = shuffleModifiers(modifiers);
@@ -3007,7 +3081,7 @@ export default class BattleScene extends SceneBase {
*/
initFinalBossPhaseTwo(pokemon: Pokemon): void {
if (pokemon instanceof EnemyPokemon && pokemon.isBoss() && !pokemon.formIndex && pokemon.bossSegmentIndex < 1) {
- this.fadeOutBgm(Utils.fixedInt(2000), false);
+ this.fadeOutBgm(fixedInt(2000), false);
this.ui.showDialogue(battleSpecDialogue[BattleSpec.FINAL_BOSS].firstStageWin, pokemon.species.name, undefined, () => {
const finalBossMBH = getModifierType(modifierTypes.MINI_BLACK_HOLE).newModifier(pokemon) as TurnHeldItemTransferModifier;
finalBossMBH.setTransferrableFalse();
@@ -3093,7 +3167,7 @@ export default class BattleScene extends SceneBase {
if (Overrides.XP_MULTIPLIER_OVERRIDE !== null) {
expMultiplier = Overrides.XP_MULTIPLIER_OVERRIDE;
}
- const pokemonExp = new Utils.NumberHolder(expValue * expMultiplier);
+ const pokemonExp = new NumberHolder(expValue * expMultiplier);
this.applyModifiers(PokemonExpBoosterModifier, true, partyMember, pokemonExp);
partyMemberExp.push(Math.floor(pokemonExp.value));
}
@@ -3209,7 +3283,7 @@ export default class BattleScene extends SceneBase {
while (i < this.mysteryEncounterSaveData.queuedEncounters.length && !!encounter) {
const candidate = this.mysteryEncounterSaveData.queuedEncounters[i];
const forcedChance = candidate.spawnPercent;
- if (Utils.randSeedInt(100) < forcedChance) {
+ if (randSeedInt(100) < forcedChance) {
encounter = allMysteryEncounters[candidate.type];
}
@@ -3236,7 +3310,7 @@ export default class BattleScene extends SceneBase {
});
const totalWeight = tierWeights.reduce((a, b) => a + b);
- const tierValue = Utils.randSeedInt(totalWeight);
+ const tierValue = randSeedInt(totalWeight);
const commonThreshold = totalWeight - tierWeights[0];
const greatThreshold = totalWeight - tierWeights[0] - tierWeights[1];
const ultraThreshold = totalWeight - tierWeights[0] - tierWeights[1] - tierWeights[2];
@@ -3303,7 +3377,7 @@ export default class BattleScene extends SceneBase {
console.log("No Mystery Encounters found, falling back to Mysterious Challengers.");
return allMysteryEncounters[MysteryEncounterType.MYSTERIOUS_CHALLENGERS];
}
- encounter = availableEncounters[Utils.randSeedInt(availableEncounters.length)];
+ encounter = availableEncounters[randSeedInt(availableEncounters.length)];
// New encounter object to not dirty flags
encounter = new MysteryEncounter(encounter);
encounter.populateDialogueTokensFromRequirements(this);
diff --git a/src/battle.ts b/src/battle.ts
index 6086c2ceb4e5..a3d4d0433f0b 100644
--- a/src/battle.ts
+++ b/src/battle.ts
@@ -1,10 +1,18 @@
import BattleScene from "./battle-scene";
-import { Command } from "./ui/command-ui-handler";
-import * as Utils from "./utils";
+import { Command } from "#app/ui/command-ui-handler";
+import {
+ randomString,
+ getEnumValues,
+ IntegerHolder,
+ randSeedInt,
+ shiftCharCodes,
+ randSeedItem,
+ randInt,
+} from "#app/utils";
import Trainer, { TrainerVariant } from "./field/trainer";
-import { GameMode } from "./game-mode";
-import { MoneyMultiplierModifier, PokemonHeldItemModifier } from "./modifier/modifier";
-import { PokeballType } from "./data/pokeball";
+import { GameMode } from "#app/game-mode";
+import { MoneyMultiplierModifier, PokemonHeldItemModifier } from "#app/modifier/modifier";
+import { PokeballType } from "#app/data/pokeball";
import { trainerConfigs } from "#app/data/trainer-config";
import Pokemon, { EnemyPokemon, PlayerPokemon, QueuedMove } from "#app/field/pokemon";
import { ArenaTagType } from "#enums/arena-tag-type";
@@ -14,7 +22,7 @@ import { PlayerGender } from "#enums/player-gender";
import { Species } from "#enums/species";
import { TrainerType } from "#enums/trainer-type";
import i18next from "#app/plugins/i18n";
-import MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter";
+import MysteryEncounter from "#mystery-encounters/mystery-encounter";
import { MysteryEncounterMode } from "#enums/mystery-encounter-mode";
import { CustomModifierSettings } from "#app/modifier/modifier-type";
import { ModifierTier } from "#app/modifier/modifier-tier";
@@ -78,7 +86,7 @@ export default class Battle {
public postBattleLoot: PokemonHeldItemModifier[] = [];
public escapeAttempts: number = 0;
public lastMove: Moves;
- public battleSeed: string = Utils.randomString(16, true);
+ public battleSeed: string = randomString(16, true);
private battleSeedState: string | null = null;
public moneyScattered: number = 0;
public lastUsedPokeball: PokeballType | null = null;
@@ -154,7 +162,7 @@ export default class Battle {
incrementTurn(scene: BattleScene): void {
this.turn++;
- this.turnCommands = Object.fromEntries(Utils.getEnumValues(BattlerIndex).map(bt => [ bt, null ]));
+ this.turnCommands = Object.fromEntries(getEnumValues(BattlerIndex).map(bt => [ bt, null ]));
this.battleSeedState = null;
}
@@ -176,7 +184,7 @@ export default class Battle {
}
pickUpScatteredMoney(scene: BattleScene): void {
- const moneyAmount = new Utils.IntegerHolder(scene.currentBattle.moneyScattered);
+ const moneyAmount = new IntegerHolder(scene.currentBattle.moneyScattered);
scene.applyModifiers(MoneyMultiplierModifier, true, moneyAmount);
if (scene.arena.getTag(ArenaTagType.HAPPY_HOUR)) {
@@ -382,7 +390,7 @@ export default class Battle {
}
/**
- * Generates a random number using the current battle's seed. Calls {@linkcode Utils.randSeedInt}
+ * Generates a random number using the current battle's seed. Calls {@linkcode randSeedInt}
* @param range How large of a range of random numbers to choose from. If {@linkcode range} <= 1, returns {@linkcode min}
* @param min The minimum integer to pick, default `0`
* @returns A random integer between {@linkcode min} and ({@linkcode min} + {@linkcode range} - 1)
@@ -397,12 +405,12 @@ export default class Battle {
if (this.battleSeedState) {
Phaser.Math.RND.state(this.battleSeedState);
} else {
- Phaser.Math.RND.sow([ Utils.shiftCharCodes(this.battleSeed, this.turn << 6) ]);
+ Phaser.Math.RND.sow([ shiftCharCodes(this.battleSeed, this.turn << 6) ]);
console.log("Battle Seed:", this.battleSeed);
}
scene.rngCounter = this.rngCounter++;
scene.rngSeedOverride = this.battleSeed;
- const ret = Utils.randSeedInt(range, min);
+ const ret = randSeedInt(range, min);
this.battleSeedState = Phaser.Math.RND.state();
Phaser.Math.RND.state(state);
scene.rngCounter = tempRngCounter;
@@ -479,13 +487,13 @@ export class FixedBattleConfig {
*/
function getRandomTrainerFunc(trainerPool: (TrainerType | TrainerType[])[], randomGender: boolean = false, seedOffset: number = 0): GetTrainerFunc {
return (scene: BattleScene) => {
- const rand = Utils.randSeedInt(trainerPool.length);
+ const rand = randSeedInt(trainerPool.length);
const trainerTypes: TrainerType[] = [];
scene.executeWithSeedOffset(() => {
for (const trainerPoolEntry of trainerPool) {
const trainerType = Array.isArray(trainerPoolEntry)
- ? Utils.randSeedItem(trainerPoolEntry)
+ ? randSeedItem(trainerPoolEntry)
: trainerPoolEntry;
trainerTypes.push(trainerType);
}
@@ -493,7 +501,7 @@ function getRandomTrainerFunc(trainerPool: (TrainerType | TrainerType[])[], rand
let trainerGender = TrainerVariant.DEFAULT;
if (randomGender) {
- trainerGender = (Utils.randInt(2) === 0) ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT;
+ trainerGender = (randInt(2) === 0) ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT;
}
/* 1/3 chance for evil team grunts to be double battles */
@@ -501,7 +509,7 @@ function getRandomTrainerFunc(trainerPool: (TrainerType | TrainerType[])[], rand
const isEvilTeamGrunt = evilTeamGrunts.includes(trainerTypes[rand]);
if (trainerConfigs[trainerTypes[rand]].hasDouble && isEvilTeamGrunt) {
- return new Trainer(scene, trainerTypes[rand], (Utils.randInt(3) === 0) ? TrainerVariant.DOUBLE : trainerGender);
+ return new Trainer(scene, trainerTypes[rand], (randInt(3) === 0) ? TrainerVariant.DOUBLE : trainerGender);
}
return new Trainer(scene, trainerTypes[rand], trainerGender);
@@ -522,7 +530,7 @@ export interface FixedBattleConfigs {
*/
export const classicFixedBattles: FixedBattleConfigs = {
[5]: new FixedBattleConfig().setBattleType(BattleType.TRAINER)
- .setGetTrainerFunc(scene => new Trainer(scene, TrainerType.YOUNGSTER, Utils.randSeedInt(2) ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT)),
+ .setGetTrainerFunc(scene => new Trainer(scene, TrainerType.YOUNGSTER, randSeedInt(2) ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT)),
[8]: new FixedBattleConfig().setBattleType(BattleType.TRAINER)
.setGetTrainerFunc(scene => new Trainer(scene, TrainerType.RIVAL, scene.gameData.gender === PlayerGender.MALE ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT)),
[25]: new FixedBattleConfig().setBattleType(BattleType.TRAINER)
diff --git a/src/data/ability.ts b/src/data/ability.ts
index 0d5cf2751ce8..b6a05c6e63c6 100644
--- a/src/data/ability.ts
+++ b/src/data/ability.ts
@@ -1,20 +1,62 @@
-import Pokemon, { HitResult, PlayerPokemon, PokemonMove } from "../field/pokemon";
+import Pokemon, { HitResult, PlayerPokemon, PokemonMove } from "#app/field/pokemon";
import { Type } from "./type";
-import { Constructor } from "#app/utils";
-import * as Utils from "../utils";
-import { getPokemonNameWithAffix } from "../messages";
+import {
+ BooleanHolder,
+ Constructor,
+ NumberHolder,
+ toDmgValue,
+ randSeedItem,
+ isNullOrUndefined,
+ randSeedInt,
+} from "#app/utils";
+import { getPokemonNameWithAffix } from "#app/messages";
import { Weather, WeatherType } from "./weather";
import { BattlerTag, GroundedTag } from "./battler-tags";
-import { StatusEffect, getNonVolatileStatusEffects, getStatusEffectDescriptor, getStatusEffectHealText } from "./status-effect";
+import {
+ StatusEffect,
+ getNonVolatileStatusEffects,
+ getStatusEffectDescriptor,
+ getStatusEffectHealText,
+} from "./status-effect";
import { Gender } from "./gender";
-import Move, { AttackMove, MoveCategory, MoveFlags, MoveTarget, FlinchAttr, OneHitKOAttr, HitHealAttr, allMoves, StatusMove, SelfStatusMove, VariablePowerAttr, applyMoveAttrs, IncrementMovePriorityAttr, VariableMoveTypeAttr, RandomMovesetMoveAttr, RandomMoveAttr, NaturePowerAttr, CopyMoveAttr, MoveAttr, MultiHitAttr, ChargeAttr, SacrificialAttr, SacrificialAttrOnHit, NeutralDamageAgainstFlyingTypeMultiplierAttr, FixedDamageAttr } from "./move";
+import Move, {
+ AttackMove,
+ MoveCategory,
+ MoveFlags,
+ MoveTarget,
+ FlinchAttr,
+ OneHitKOAttr,
+ HitHealAttr,
+ allMoves,
+ StatusMove,
+ SelfStatusMove,
+ VariablePowerAttr,
+ applyMoveAttrs,
+ IncrementMovePriorityAttr,
+ VariableMoveTypeAttr,
+ RandomMovesetMoveAttr,
+ RandomMoveAttr,
+ NaturePowerAttr,
+ CopyMoveAttr,
+ MoveAttr,
+ MultiHitAttr,
+ ChargeAttr,
+ SacrificialAttr,
+ SacrificialAttrOnHit,
+ NeutralDamageAgainstFlyingTypeMultiplierAttr,
+ FixedDamageAttr,
+} from "./move";
import { ArenaTagSide, ArenaTrapTag } from "./arena-tag";
-import { BerryModifier, PokemonHeldItemModifier } from "../modifier/modifier";
+import { BerryModifier, PokemonHeldItemModifier } from "#app/modifier/modifier";
import { TerrainType } from "./terrain";
-import { SpeciesFormChangeManualTrigger, SpeciesFormChangeRevertWeatherFormTrigger, SpeciesFormChangeWeatherTrigger } from "./pokemon-forms";
+import {
+ SpeciesFormChangeManualTrigger,
+ SpeciesFormChangeRevertWeatherFormTrigger,
+ SpeciesFormChangeWeatherTrigger,
+} from "./pokemon-forms";
import i18next from "i18next";
import { Localizable } from "#app/interfaces/locales";
-import { Command } from "../ui/command-ui-handler";
+import { Command } from "#app/ui/command-ui-handler";
import { BerryModifierType } from "#app/modifier/modifier-type";
import { getPokeballName } from "./pokeball";
import { BattlerIndex } from "#app/battle";
@@ -23,11 +65,11 @@ import { ArenaTagType } from "#enums/arena-tag-type";
import { BattlerTagType } from "#enums/battler-tag-type";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
-import { Stat, type BattleStat, type EffectiveStat, BATTLE_STATS, EFFECTIVE_STATS, getStatKey } from "#app/enums/stat";
-import { MovePhase } from "#app/phases/move-phase";
-import { PokemonHealPhase } from "#app/phases/pokemon-heal-phase";
-import { ShowAbilityPhase } from "#app/phases/show-ability-phase";
-import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
+import { Stat, type BattleStat, type EffectiveStat, BATTLE_STATS, EFFECTIVE_STATS, getStatKey } from "#enums/stat";
+import { MovePhase } from "#phases/move-phase";
+import { PokemonHealPhase } from "#phases/pokemon-heal-phase";
+import { ShowAbilityPhase } from "#phases/show-ability-phase";
+import { StatStageChangePhase } from "#phases/stat-stage-change-phase";
import BattleScene from "#app/battle-scene";
export class Ability implements Localizable {
@@ -144,7 +186,7 @@ export abstract class AbAttr {
this.showAbility = showAbility;
}
- apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder | null, args: any[]): boolean | Promise<boolean> {
+ apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder | null, args: any[]): boolean | Promise<boolean> {
return false;
}
@@ -163,7 +205,7 @@ export abstract class AbAttr {
}
export class BlockRecoilDamageAttr extends AbAttr {
- apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): boolean {
cancelled.value = true;
return true;
@@ -186,11 +228,11 @@ export class DoubleBattleChanceAbAttr extends AbAttr {
/**
* Increases the chance of a double battle occurring
- * @param args [0] {@linkcode Utils.NumberHolder} for double battle chance
+ * @param args [0] {@linkcode NumberHolder} for double battle chance
* @returns true if the ability was applied
*/
- apply(_pokemon: Pokemon, _passive: boolean, _simulated: boolean, _cancelled: Utils.BooleanHolder, args: any[]): boolean {
- const doubleBattleChance = args[0] as Utils.NumberHolder;
+ apply(_pokemon: Pokemon, _passive: boolean, _simulated: boolean, _cancelled: BooleanHolder, args: any[]): boolean {
+ const doubleBattleChance = args[0] as NumberHolder;
// This is divided because the chance is generated as a number from 0 to doubleBattleChance.value using Utils.randSeedInt
// A double battle will initiate if the generated number is 0
doubleBattleChance.value = doubleBattleChance.value / 4;
@@ -265,16 +307,16 @@ export class PostBattleInitStatStageChangeAbAttr extends PostBattleInitAbAttr {
type PreDefendAbAttrCondition = (pokemon: Pokemon, attacker: Pokemon, move: Move) => boolean;
export class PreDefendAbAttr extends AbAttr {
- applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move | null, cancelled: Utils.BooleanHolder | null, args: any[]): boolean | Promise<boolean> {
+ applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move | null, cancelled: BooleanHolder | null, args: any[]): boolean | Promise<boolean> {
return false;
}
}
export class PreDefendFullHpEndureAbAttr extends PreDefendAbAttr {
- applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: BooleanHolder, args: any[]): boolean {
if (pokemon.isFullHp()
&& pokemon.getMaxHp() > 1 //Checks if pokemon has wonder_guard (which forces 1hp)
- && (args[0] as Utils.NumberHolder).value >= pokemon.hp) { //Damage >= hp
+ && (args[0] as NumberHolder).value >= pokemon.hp) { //Damage >= hp
return simulated || pokemon.addTag(BattlerTagType.STURDY, 1);
}
@@ -283,7 +325,7 @@ export class PreDefendFullHpEndureAbAttr extends PreDefendAbAttr {
}
export class BlockItemTheftAbAttr extends AbAttr {
- apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): boolean {
cancelled.value = true;
return true;
@@ -298,9 +340,9 @@ export class BlockItemTheftAbAttr extends AbAttr {
}
export class StabBoostAbAttr extends AbAttr {
- apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
- if ((args[0] as Utils.NumberHolder).value > 1) {
- (args[0] as Utils.NumberHolder).value += 0.5;
+ apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): boolean {
+ if ((args[0] as NumberHolder).value > 1) {
+ (args[0] as NumberHolder).value += 0.5;
return true;
}
@@ -319,9 +361,9 @@ export class ReceivedMoveDamageMultiplierAbAttr extends PreDefendAbAttr {
this.damageMultiplier = damageMultiplier;
}
- applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: BooleanHolder, args: any[]): boolean {
if (this.condition(pokemon, attacker, move)) {
- (args[0] as Utils.NumberHolder).value = Utils.toDmgValue((args[0] as Utils.NumberHolder).value * this.damageMultiplier);
+ (args[0] as NumberHolder).value = toDmgValue((args[0] as NumberHolder).value * this.damageMultiplier);
return true;
}
@@ -359,17 +401,17 @@ export class TypeImmunityAbAttr extends PreDefendAbAttr {
* @param passive - Whether the ability is passive.
* @param attacker {@linkcode Pokemon} The attacking Pokemon.
* @param move {@linkcode Move} The attacking move.
- * @param cancelled {@linkcode Utils.BooleanHolder} - A holder for a boolean value indicating if the move was cancelled.
- * @param args [0] {@linkcode Utils.NumberHolder} gets set to 0 if move is immuned by an ability.
+ * @param cancelled {@linkcode BooleanHolder} - A holder for a boolean value indicating if the move was cancelled.
+ * @param args [0] {@linkcode NumberHolder} gets set to 0 if move is immuned by an ability.
* @param args [1] - Whether the move is simulated.
*/
- applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: BooleanHolder, args: any[]): boolean {
// Field moves should ignore immunity
if ([ MoveTarget.BOTH_SIDES, MoveTarget.ENEMY_SIDE, MoveTarget.USER_SIDE ].includes(move.moveTarget)) {
return false;
}
if (attacker !== pokemon && attacker.getMoveType(move) === this.immuneType) {
- (args[0] as Utils.NumberHolder).value = 0;
+ (args[0] as NumberHolder).value = 0;
return true;
}
return false;
@@ -394,7 +436,7 @@ export class AttackTypeImmunityAbAttr extends TypeImmunityAbAttr {
* Type immunity abilities that do not give additional benefits (HP recovery, stat boosts, etc) are not immune to status moves of the type
* Example: Levitate
*/
- applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: BooleanHolder, args: any[]): boolean {
// this is a hacky way to fix the Levitate/Thousand Arrows interaction, but it works for now...
if (move.category !== MoveCategory.STATUS && !move.hasAttr(NeutralDamageAgainstFlyingTypeMultiplierAttr)) {
return super.applyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args);
@@ -408,14 +450,14 @@ export class TypeImmunityHealAbAttr extends TypeImmunityAbAttr {
super(immuneType);
}
- applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: BooleanHolder, args: any[]): boolean {
const ret = super.applyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args);
if (ret) {
if (!pokemon.isFullHp() && !simulated) {
const abilityName = (!passive ? pokemon.getAbility() : pokemon.getPassiveAbility()).name;
pokemon.scene.unshiftPhase(new PokemonHealPhase(pokemon.scene, pokemon.getBattlerIndex(),
- Utils.toDmgValue(pokemon.getMaxHp() / 4), i18next.t("abilityTriggers:typeImmunityHeal", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), abilityName }), true));
+ toDmgValue(pokemon.getMaxHp() / 4), i18next.t("abilityTriggers:typeImmunityHeal", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), abilityName }), true));
cancelled.value = true; // Suppresses "No Effect" message
}
return true;
@@ -436,7 +478,7 @@ class TypeImmunityStatStageChangeAbAttr extends TypeImmunityAbAttr {
this.stages = stages;
}
- applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: BooleanHolder, args: any[]): boolean {
const ret = super.applyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args);
if (ret) {
@@ -461,7 +503,7 @@ class TypeImmunityAddBattlerTagAbAttr extends TypeImmunityAbAttr {
this.turnCount = turnCount;
}
- applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: BooleanHolder, args: any[]): boolean {
const ret = super.applyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args);
if (ret) {
@@ -480,10 +522,10 @@ export class NonSuperEffectiveImmunityAbAttr extends TypeImmunityAbAttr {
super(null, condition);
}
- applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: BooleanHolder, args: any[]): boolean {
if (move instanceof AttackMove && pokemon.getAttackTypeEffectiveness(attacker.getMoveType(move), attacker) < 2) {
cancelled.value = true; // Suppresses "No Effect" message
- (args[0] as Utils.NumberHolder).value = 0;
+ (args[0] as NumberHolder).value = 0;
return true;
}
@@ -515,9 +557,9 @@ export class FullHpResistTypeAbAttr extends PreDefendAbAttr {
* @param args `[0]` a container for the move's current type effectiveness multiplier
* @returns `true` if the move's effectiveness is reduced; `false` otherwise
*/
- applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move | null, cancelled: Utils.BooleanHolder | null, args: any[]): boolean | Promise<boolean> {
+ applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move | null, cancelled: BooleanHolder | null, args: any[]): boolean | Promise<boolean> {
const typeMultiplier = args[0];
- if (!(typeMultiplier && typeMultiplier instanceof Utils.NumberHolder)) {
+ if (!(typeMultiplier && typeMultiplier instanceof NumberHolder)) {
return false;
}
@@ -547,8 +589,8 @@ export class PostDefendAbAttr extends AbAttr {
}
export class FieldPriorityMoveImmunityAbAttr extends PreDefendAbAttr {
- applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean {
- const attackPriority = new Utils.IntegerHolder(move.priority);
+ applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: BooleanHolder, args: any[]): boolean {
+ const attackPriority = new NumberHolder(move.priority);
applyMoveAttrs(IncrementMovePriorityAttr, attacker, null, move, attackPriority);
applyAbAttrs(ChangeMovePriorityAbAttr, attacker, null, simulated, move, attackPriority);
@@ -580,7 +622,7 @@ export class MoveImmunityAbAttr extends PreDefendAbAttr {
this.immuneCondition = immuneCondition;
}
- applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: BooleanHolder, args: any[]): boolean {
if (this.immuneCondition(pokemon, attacker, move)) {
cancelled.value = true;
return true;
@@ -601,8 +643,8 @@ export class MoveImmunityAbAttr extends PreDefendAbAttr {
* @extends PreDefendAbAttr
*/
export class WonderSkinAbAttr extends PreDefendAbAttr {
- applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean {
- const moveAccuracy = args[0] as Utils.NumberHolder;
+ applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: BooleanHolder, args: any[]): boolean {
+ const moveAccuracy = args[0] as NumberHolder;
if (move.category === MoveCategory.STATUS && moveAccuracy.value >= 50) {
moveAccuracy.value = 50;
return true;
@@ -622,7 +664,7 @@ export class MoveImmunityStatStageChangeAbAttr extends MoveImmunityAbAttr {
this.stages = stages;
}
- applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: BooleanHolder, args: any[]): boolean {
const ret = super.applyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args);
if (ret && !simulated) {
pokemon.scene.unshiftPhase(new StatStageChangePhase(pokemon.scene, pokemon.getBattlerIndex(), true, [ this.stat ], this.stages));
@@ -931,8 +973,8 @@ export class PostDefendContactDamageAbAttr extends PostDefendAbAttr {
override applyPostDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _hitResult: HitResult, _args: any[]): boolean {
if (!simulated && move.checkFlag(MoveFlags.MAKES_CONTACT, attacker, pokemon)
&& !attacker.hasAbilityWithAttr(BlockNonDirectDamageAbAttr) && !move.hitsSubstitute(attacker, pokemon)) {
- attacker.damageAndUpdate(Utils.toDmgValue(attacker.getMaxHp() * (1 / this.damageRatio)), HitResult.OTHER);
- attacker.turnData.damageTaken += Utils.toDmgValue(attacker.getMaxHp() * (1 / this.damageRatio));
+ attacker.damageAndUpdate(toDmgValue(attacker.getMaxHp() * (1 / this.damageRatio)), HitResult.OTHER);
+ attacker.turnData.damageTaken += toDmgValue(attacker.getMaxHp() * (1 / this.damageRatio));
return true;
}
@@ -1133,18 +1175,18 @@ export class MoveEffectChanceMultiplierAbAttr extends AbAttr {
this.chanceMultiplier = chanceMultiplier;
}
/**
- * @param args [0]: {@linkcode Utils.NumberHolder} Move additional effect chance. Has to be higher than or equal to 0.
+ * @param args [0]: {@linkcode NumberHolder} Move additional effect chance. Has to be higher than or equal to 0.
* [1]: {@linkcode Moves } Move used by the ability user.
*/
- apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): boolean {
// Disable showAbility during getTargetBenefitScore
this.showAbility = args[4];
- if ((args[0] as Utils.NumberHolder).value <= 0 || (args[1] as Move).id === Moves.ORDER_UP) {
+ if ((args[0] as NumberHolder).value <= 0 || (args[1] as Move).id === Moves.ORDER_UP) {
return false;
}
- (args[0] as Utils.NumberHolder).value *= this.chanceMultiplier;
- (args[0] as Utils.NumberHolder).value = Math.min((args[0] as Utils.NumberHolder).value, 100);
+ (args[0] as NumberHolder).value *= this.chanceMultiplier;
+ (args[0] as NumberHolder).value = Math.min((args[0] as NumberHolder).value, 100);
return true;
}
@@ -1157,15 +1199,15 @@ export class MoveEffectChanceMultiplierAbAttr extends AbAttr {
*/
export class IgnoreMoveEffectsAbAttr extends PreDefendAbAttr {
/**
- * @param args [0]: {@linkcode Utils.NumberHolder} Move additional effect chance.
+ * @param args [0]: {@linkcode NumberHolder} Move additional effect chance.
*/
- applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ applyPreDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, cancelled: BooleanHolder, args: any[]): boolean {
- if ((args[0] as Utils.NumberHolder).value <= 0) {
+ if ((args[0] as NumberHolder).value <= 0) {
return false;
}
- (args[0] as Utils.NumberHolder).value = 0;
+ (args[0] as NumberHolder).value = 0;
return true;
}
@@ -1179,7 +1221,7 @@ export class VariableMovePowerAbAttr extends PreAttackAbAttr {
}
export class FieldPreventExplosiveMovesAbAttr extends AbAttr {
- apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean | Promise<boolean> {
+ apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): boolean | Promise<boolean> {
cancelled.value = true;
return true;
}
@@ -1190,7 +1232,7 @@ export class FieldPreventExplosiveMovesAbAttr extends AbAttr {
* If this ability cannot stack, a BooleanHolder can be used to prevent this from stacking.
* @see {@link applyFieldStatMultiplierAbAttrs}
* @see {@link applyFieldStat}
- * @see {@link Utils.BooleanHolder}
+ * @see {@link BooleanHolder}
*/
export class FieldMultiplyStatAbAttr extends AbAttr {
private stat: Stat;
@@ -1210,13 +1252,13 @@ export class FieldMultiplyStatAbAttr extends AbAttr {
* @param pokemon {@linkcode Pokemon} the Pokemon using this ability
* @param passive {@linkcode boolean} unused
* @param stat {@linkcode Stat} the type of the checked stat
- * @param statValue {@linkcode Utils.NumberHolder} the value of the checked stat
+ * @param statValue {@linkcode NumberHolder} the value of the checked stat
* @param checkedPokemon {@linkcode Pokemon} the Pokemon this ability is targeting
- * @param hasApplied {@linkcode Utils.BooleanHolder} whether or not another multiplier has been applied to this stat
+ * @param hasApplied {@linkcode BooleanHolder} whether or not another multiplier has been applied to this stat
* @param args {any[]} unused
* @returns true if this changed the checked stat, false otherwise.
*/
- applyFieldStat(pokemon: Pokemon, passive: boolean, simulated: boolean, stat: Stat, statValue: Utils.NumberHolder, checkedPokemon: Pokemon, hasApplied: Utils.BooleanHolder, args: any[]): boolean {
+ applyFieldStat(pokemon: Pokemon, passive: boolean, simulated: boolean, stat: Stat, statValue: NumberHolder, checkedPokemon: Pokemon, hasApplied: BooleanHolder, args: any[]): boolean {
if (!this.canStack && hasApplied.value) {
return false;
}
@@ -1243,10 +1285,10 @@ export class MoveTypeChangeAbAttr extends PreAttackAbAttr {
// TODO: Decouple this into two attributes (type change / power boost)
applyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, args: any[]): boolean {
if (this.condition && this.condition(pokemon, defender, move)) {
- if (args[0] && args[0] instanceof Utils.NumberHolder) {
+ if (args[0] && args[0] instanceof NumberHolder) {
args[0].value = this.newType;
}
- if (args[1] && args[1] instanceof Utils.NumberHolder) {
+ if (args[1] && args[1] instanceof NumberHolder) {
args[1].value *= this.powerMultiplier;
}
return true;
@@ -1358,14 +1400,14 @@ export class AddSecondStrikeAbAttr extends PreAttackAbAttr {
* @param defender n/a
* @param {Move} move the move used by the ability source
* @param args\[0\] the number of Pokemon this move is targeting
- * @param {Utils.IntegerHolder} args\[1\] the number of strikes with this move
- * @param {Utils.NumberHolder} args\[2\] the damage multiplier for the current strike
+ * @param {NumberHolder} args\[1\] the number of strikes with this move
+ * @param {NumberHolder} args\[2\] the damage multiplier for the current strike
* @returns
*/
applyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, args: any[]): boolean {
const numTargets = args[0] as integer;
- const hitCount = args[1] as Utils.IntegerHolder;
- const multiplier = args[2] as Utils.NumberHolder;
+ const hitCount = args[1] as NumberHolder;
+ const multiplier = args[2] as NumberHolder;
if (this.canApplyPreAttack(move, numTargets)) {
this.showAbility = !!hitCount?.value;
@@ -1409,7 +1451,7 @@ export class DamageBoostAbAttr extends PreAttackAbAttr {
*/
applyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, args: any[]): boolean {
if (this.condition(pokemon, defender, move)) {
- const power = args[0] as Utils.NumberHolder;
+ const power = args[0] as NumberHolder;
power.value = Math.floor(power.value * this.damageMultiplier);
return true;
}
@@ -1430,7 +1472,7 @@ export class MovePowerBoostAbAttr extends VariableMovePowerAbAttr {
applyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, args: any[]): boolean {
if (this.condition(pokemon, defender, move)) {
- (args[0] as Utils.NumberHolder).value *= this.powerMultiplier;
+ (args[0] as NumberHolder).value *= this.powerMultiplier;
return true;
}
@@ -1478,7 +1520,7 @@ export class VariableMovePowerBoostAbAttr extends VariableMovePowerAbAttr {
applyPreAttack(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move, args: any[]): boolean {
const multiplier = this.mult(pokemon, defender, move);
if (multiplier !== 1) {
- (args[0] as Utils.NumberHolder).value *= multiplier;
+ (args[0] as NumberHolder).value *= multiplier;
return true;
}
@@ -1506,7 +1548,7 @@ export class FieldMovePowerBoostAbAttr extends AbAttr {
applyPreAttack(pokemon: Pokemon | null, passive: boolean | null, simulated: boolean, defender: Pokemon | null, move: Move, args: any[]): boolean {
if (this.condition(pokemon, defender, move)) {
- (args[0] as Utils.NumberHolder).value *= this.powerMultiplier;
+ (args[0] as NumberHolder).value *= this.powerMultiplier;
return true;
}
@@ -1568,7 +1610,7 @@ export class StatMultiplierAbAttr extends AbAttr {
this.condition = condition ?? null;
}
- applyStatStage(pokemon: Pokemon, _passive: boolean, simulated: boolean, stat: BattleStat, statValue: Utils.NumberHolder, args: any[]): boolean | Promise<boolean> {
+ applyStatStage(pokemon: Pokemon, _passive: boolean, simulated: boolean, stat: BattleStat, statValue: NumberHolder, args: any[]): boolean | Promise<boolean> {
const move = (args[0] as Move);
if (stat === this.stat && (!this.condition || this.condition(pokemon, null, move))) {
statValue.value *= this.multiplier;
@@ -1933,9 +1975,9 @@ export class IgnoreOpponentStatStagesAbAttr extends AbAttr {
this.stats = stats ?? BATTLE_STATS;
}
- apply(_pokemon: Pokemon, _passive: boolean, simulated: boolean, _cancelled: Utils.BooleanHolder, args: any[]) {
+ apply(_pokemon: Pokemon, _passive: boolean, simulated: boolean, _cancelled: BooleanHolder, args: any[]) {
if (this.stats.includes(args[0])) {
- (args[1] as Utils.BooleanHolder).value = true;
+ (args[1] as BooleanHolder).value = true;
return true;
}
return false;
@@ -1947,7 +1989,7 @@ export class IntimidateImmunityAbAttr extends AbAttr {
super(false);
}
- apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): boolean {
cancelled.value = true;
return true;
}
@@ -1972,7 +2014,7 @@ export class PostIntimidateStatStageChangeAbAttr extends AbAttr {
this.overwrites = !!overwrites;
}
- apply(pokemon: Pokemon, passive: boolean, simulated:boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ apply(pokemon: Pokemon, passive: boolean, simulated:boolean, cancelled: BooleanHolder, args: any[]): boolean {
if (!simulated) {
pokemon.scene.pushPhase(new StatStageChangePhase(pokemon.scene, pokemon.getBattlerIndex(), false, this.stats, this.stages));
}
@@ -2108,7 +2150,7 @@ export class PostSummonStatStageChangeAbAttr extends PostSummonAbAttr {
return true;
}
for (const opponent of pokemon.getOpponents()) {
- const cancelled = new Utils.BooleanHolder(false);
+ const cancelled = new BooleanHolder(false);
if (this.intimidate) {
applyAbAttrs(IntimidateImmunityAbAttr, opponent, cancelled, simulated);
applyAbAttrs(PostIntimidateStatStageChangeAbAttr, opponent, cancelled, simulated);
@@ -2141,7 +2183,7 @@ export class PostSummonAllyHealAbAttr extends PostSummonAbAttr {
if (target?.isActive(true)) {
if (!simulated) {
target.scene.unshiftPhase(new PokemonHealPhase(target.scene, target.getBattlerIndex(),
- Utils.toDmgValue(pokemon.getMaxHp() / this.healRatio), i18next.t("abilityTriggers:postSummonAllyHeal", { pokemonNameWithAffix: getPokemonNameWithAffix(target), pokemonName: pokemon.name }), true, !this.showAnim));
+ toDmgValue(pokemon.getMaxHp() / this.healRatio), i18next.t("abilityTriggers:postSummonAllyHeal", { pokemonNameWithAffix: getPokemonNameWithAffix(target), pokemonName: pokemon.name }), true, !this.showAnim));
}
return true;
@@ -2307,7 +2349,7 @@ export class PostSummonCopyAbilityAbAttr extends PostSummonAbAttr {
let target: Pokemon;
if (targets.length > 1) {
- pokemon.scene.executeWithSeedOffset(() => target = Utils.randSeedItem(targets), pokemon.scene.currentBattle.waveIndex);
+ pokemon.scene.executeWithSeedOffset(() => target = randSeedItem(targets), pokemon.scene.currentBattle.waveIndex);
} else {
target = targets[0];
}
@@ -2428,7 +2470,7 @@ export class PostSummonTransformAbAttr extends PostSummonAbAttr {
let target: Pokemon;
if (targets.length > 1) {
- pokemon.scene.executeWithSeedOffset(() => target = Utils.randSeedItem(targets), pokemon.scene.currentBattle.waveIndex);
+ pokemon.scene.executeWithSeedOffset(() => target = randSeedItem(targets), pokemon.scene.currentBattle.waveIndex);
} else {
target = targets[0];
}
@@ -2616,7 +2658,7 @@ export class PreSwitchOutHealAbAttr extends PreSwitchOutAbAttr {
applyPreSwitchOut(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean | Promise<boolean> {
if (!pokemon.isFullHp()) {
if (!simulated) {
- const healAmount = Utils.toDmgValue(pokemon.getMaxHp() * 0.33);
+ const healAmount = toDmgValue(pokemon.getMaxHp() * 0.33);
pokemon.heal(healAmount);
pokemon.updateInfo();
}
@@ -2664,7 +2706,7 @@ export class PreSwitchOutFormChangeAbAttr extends PreSwitchOutAbAttr {
}
export class PreStatStageChangeAbAttr extends AbAttr {
- applyPreStatStageChange(pokemon: Pokemon | null, passive: boolean, simulated: boolean, stat: BattleStat, cancelled: Utils.BooleanHolder, args: any[]): boolean | Promise<boolean> {
+ applyPreStatStageChange(pokemon: Pokemon | null, passive: boolean, simulated: boolean, stat: BattleStat, cancelled: BooleanHolder, args: any[]): boolean | Promise<boolean> {
return false;
}
}
@@ -2688,12 +2730,12 @@ export class ProtectStatAbAttr extends PreStatStageChangeAbAttr {
* @param _passive
* @param simulated
* @param stat the {@linkcode BattleStat} being affected
- * @param cancelled The {@linkcode Utils.BooleanHolder} that will be set to true if the stat is protected
+ * @param cancelled The {@linkcode BooleanHolder} that will be set to true if the stat is protected
* @param _args
* @returns true if the stat is protected, false otherwise
*/
- applyPreStatStageChange(_pokemon: Pokemon, _passive: boolean, _simulated: boolean, stat: BattleStat, cancelled: Utils.BooleanHolder, _args: any[]): boolean {
- if (Utils.isNullOrUndefined(this.protectedStat) || stat === this.protectedStat) {
+ applyPreStatStageChange(_pokemon: Pokemon, _passive: boolean, _simulated: boolean, stat: BattleStat, cancelled: BooleanHolder, _args: any[]): boolean {
+ if (isNullOrUndefined(this.protectedStat) || stat === this.protectedStat) {
cancelled.value = true;
return true;
}
@@ -2749,7 +2791,7 @@ export class ConfusionOnStatusEffectAbAttr extends PostAttackAbAttr {
}
export class PreSetStatusAbAttr extends AbAttr {
- applyPreSetStatus(pokemon: Pokemon, passive: boolean, simulated: boolean, effect: StatusEffect | undefined, cancelled: Utils.BooleanHolder, args: any[]): boolean | Promise<boolean> {
+ applyPreSetStatus(pokemon: Pokemon, passive: boolean, simulated: boolean, effect: StatusEffect | undefined, cancelled: BooleanHolder, args: any[]): boolean | Promise<boolean> {
return false;
}
}
@@ -2779,7 +2821,7 @@ export class PreSetStatusEffectImmunityAbAttr extends PreSetStatusAbAttr {
* @param args - n/a
* @returns A boolean indicating the result of the status application.
*/
- applyPreSetStatus(pokemon: Pokemon, passive: boolean, simulated: boolean, effect: StatusEffect, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ applyPreSetStatus(pokemon: Pokemon, passive: boolean, simulated: boolean, effect: StatusEffect, cancelled: BooleanHolder, args: any[]): boolean {
if (this.immuneEffects.length < 1 || this.immuneEffects.includes(effect)) {
cancelled.value = true;
return true;
@@ -2815,7 +2857,7 @@ export class StatusEffectImmunityAbAttr extends PreSetStatusEffectImmunityAbAttr
export class UserFieldStatusEffectImmunityAbAttr extends PreSetStatusEffectImmunityAbAttr { }
export class PreApplyBattlerTagAbAttr extends AbAttr {
- applyPreApplyBattlerTag(pokemon: Pokemon, passive: boolean, simulated: boolean, tag: BattlerTag, cancelled: Utils.BooleanHolder, args: any[]): boolean | Promise<boolean> {
+ applyPreApplyBattlerTag(pokemon: Pokemon, passive: boolean, simulated: boolean, tag: BattlerTag, cancelled: BooleanHolder, args: any[]): boolean | Promise<boolean> {
return false;
}
}
@@ -2833,7 +2875,7 @@ export class PreApplyBattlerTagImmunityAbAttr extends PreApplyBattlerTagAbAttr {
this.immuneTagTypes = Array.isArray(immuneTagTypes) ? immuneTagTypes : [ immuneTagTypes ];
}
- applyPreApplyBattlerTag(pokemon: Pokemon, passive: boolean, simulated: boolean, tag: BattlerTag, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ applyPreApplyBattlerTag(pokemon: Pokemon, passive: boolean, simulated: boolean, tag: BattlerTag, cancelled: BooleanHolder, args: any[]): boolean {
if (this.immuneTagTypes.includes(tag.tagType)) {
cancelled.value = true;
if (!simulated) {
@@ -2867,15 +2909,15 @@ export class BattlerTagImmunityAbAttr extends PreApplyBattlerTagImmunityAbAttr {
export class UserFieldBattlerTagImmunityAbAttr extends PreApplyBattlerTagImmunityAbAttr { }
export class BlockCritAbAttr extends AbAttr {
- apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
- (args[0] as Utils.BooleanHolder).value = true;
+ apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): boolean {
+ (args[0] as BooleanHolder).value = true;
return true;
}
}
export class BonusCritAbAttr extends AbAttr {
- apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
- (args[0] as Utils.BooleanHolder).value = true;
+ apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): boolean {
+ (args[0] as BooleanHolder).value = true;
return true;
}
}
@@ -2889,8 +2931,8 @@ export class MultCritAbAttr extends AbAttr {
this.multAmount = multAmount;
}
- apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
- const critMult = args[0] as Utils.NumberHolder;
+ apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): boolean {
+ const critMult = args[0] as NumberHolder;
if (critMult.value > 1) {
critMult.value *= this.multAmount;
return true;
@@ -2916,24 +2958,24 @@ export class ConditionalCritAbAttr extends AbAttr {
/**
* @param pokemon {@linkcode Pokemon} user.
- * @param args [0] {@linkcode Utils.BooleanHolder} If true critical hit is guaranteed.
+ * @param args [0] {@linkcode BooleanHolder} If true critical hit is guaranteed.
* [1] {@linkcode Pokemon} Target.
* [2] {@linkcode Move} used by ability user.
*/
- apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): boolean {
const target = (args[1] as Pokemon);
const move = (args[2] as Move);
if (!this.condition(pokemon, target, move)) {
return false;
}
- (args[0] as Utils.BooleanHolder).value = true;
+ (args[0] as BooleanHolder).value = true;
return true;
}
}
export class BlockNonDirectDamageAbAttr extends AbAttr {
- apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): boolean {
cancelled.value = true;
return true;
}
@@ -2957,11 +2999,11 @@ export class BlockStatusDamageAbAttr extends AbAttr {
/**
* @param {Pokemon} pokemon The pokemon with the ability
* @param {boolean} passive N/A
- * @param {Utils.BooleanHolder} cancelled Whether to cancel the status damage
+ * @param {BooleanHolder} cancelled Whether to cancel the status damage
* @param {any[]} args N/A
* @returns Returns true if status damage is blocked
*/
- apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): boolean {
if (pokemon.status && this.effects.includes(pokemon.status.effect)) {
cancelled.value = true;
return true;
@@ -2971,7 +3013,7 @@ export class BlockStatusDamageAbAttr extends AbAttr {
}
export class BlockOneHitKOAbAttr extends AbAttr {
- apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): boolean {
cancelled.value = true;
return true;
}
@@ -2997,12 +3039,12 @@ export class ChangeMovePriorityAbAttr extends AbAttr {
this.changeAmount = changeAmount;
}
- apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): boolean {
if (!this.moveFunc(pokemon, args[0] as Move)) {
return false;
}
- (args[1] as Utils.IntegerHolder).value += this.changeAmount;
+ (args[1] as NumberHolder).value += this.changeAmount;
return true;
}
}
@@ -3010,7 +3052,7 @@ export class ChangeMovePriorityAbAttr extends AbAttr {
export class IgnoreContactAbAttr extends AbAttr { }
export class PreWeatherEffectAbAttr extends AbAttr {
- applyPreWeatherEffect(pokemon: Pokemon, passive: Boolean, simulated: boolean, weather: Weather | null, cancelled: Utils.BooleanHolder, args: any[]): boolean | Promise<boolean> {
+ applyPreWeatherEffect(pokemon: Pokemon, passive: Boolean, simulated: boolean, weather: Weather | null, cancelled: BooleanHolder, args: any[]): boolean | Promise<boolean> {
return false;
}
}
@@ -3026,7 +3068,7 @@ export class BlockWeatherDamageAttr extends PreWeatherDamageAbAttr {
this.weatherTypes = weatherTypes;
}
- applyPreWeatherEffect(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: Weather, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ applyPreWeatherEffect(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: Weather, cancelled: BooleanHolder, args: any[]): boolean {
if (!this.weatherTypes.length || this.weatherTypes.indexOf(weather?.weatherType) > -1) {
cancelled.value = true;
}
@@ -3044,7 +3086,7 @@ export class SuppressWeatherEffectAbAttr extends PreWeatherEffectAbAttr {
this.affectsImmutable = !!affectsImmutable;
}
- applyPreWeatherEffect(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: Weather, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ applyPreWeatherEffect(pokemon: Pokemon, passive: boolean, simulated: boolean, weather: Weather, cancelled: BooleanHolder, args: any[]): boolean {
if (this.affectsImmutable || weather.isImmutable()) {
cancelled.value = true;
return true;
@@ -3315,7 +3357,7 @@ export class PostWeatherLapseHealAbAttr extends PostWeatherLapseAbAttr {
const abilityName = (!passive ? pokemon.getAbility() : pokemon.getPassiveAbility()).name;
if (!simulated) {
scene.unshiftPhase(new PokemonHealPhase(scene, pokemon.getBattlerIndex(),
- Utils.toDmgValue(pokemon.getMaxHp() / (16 / this.healFactor)), i18next.t("abilityTriggers:postWeatherLapseHeal", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), abilityName }), true));
+ toDmgValue(pokemon.getMaxHp() / (16 / this.healFactor)), i18next.t("abilityTriggers:postWeatherLapseHeal", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), abilityName }), true));
}
return true;
}
@@ -3342,7 +3384,7 @@ export class PostWeatherLapseDamageAbAttr extends PostWeatherLapseAbAttr {
if (!simulated) {
const abilityName = (!passive ? pokemon.getAbility() : pokemon.getPassiveAbility()).name;
scene.queueMessage(i18next.t("abilityTriggers:postWeatherLapseDamage", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), abilityName }));
- pokemon.damageAndUpdate(Utils.toDmgValue(pokemon.getMaxHp() / (16 / this.damageFactor)), HitResult.OTHER);
+ pokemon.damageAndUpdate(toDmgValue(pokemon.getMaxHp() / (16 / this.damageFactor)), HitResult.OTHER);
}
return true;
@@ -3422,7 +3464,7 @@ export class PostTurnStatusHealAbAttr extends PostTurnAbAttr {
const scene = pokemon.scene;
const abilityName = (!passive ? pokemon.getAbility() : pokemon.getPassiveAbility()).name;
scene.unshiftPhase(new PokemonHealPhase(scene, pokemon.getBattlerIndex(),
- Utils.toDmgValue(pokemon.getMaxHp() / 8), i18next.t("abilityTriggers:poisonHeal", { pokemonName: getPokemonNameWithAffix(pokemon), abilityName }), true));
+ toDmgValue(pokemon.getMaxHp() / 8), i18next.t("abilityTriggers:poisonHeal", { pokemonName: getPokemonNameWithAffix(pokemon), abilityName }), true));
}
return true;
}
@@ -3512,7 +3554,7 @@ export class PostTurnLootAbAttr extends PostTurnAbAttr {
return true;
}
- const randomIdx = Utils.randSeedInt(berriesEaten.length);
+ const randomIdx = randSeedInt(berriesEaten.length);
const chosenBerryType = berriesEaten[randomIdx];
const chosenBerry = new BerryModifierType(chosenBerryType);
berriesEaten.splice(randomIdx); // Remove berry from memory
@@ -3607,7 +3649,7 @@ export class PostTurnHealAbAttr extends PostTurnAbAttr {
const scene = pokemon.scene;
const abilityName = (!passive ? pokemon.getAbility() : pokemon.getPassiveAbility()).name;
scene.unshiftPhase(new PokemonHealPhase(scene, pokemon.getBattlerIndex(),
- Utils.toDmgValue(pokemon.getMaxHp() / 16), i18next.t("abilityTriggers:postTurnHeal", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), abilityName }), true));
+ toDmgValue(pokemon.getMaxHp() / 16), i18next.t("abilityTriggers:postTurnHeal", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), abilityName }), true));
}
return true;
@@ -3659,7 +3701,7 @@ export class PostTurnHurtIfSleepingAbAttr extends PostTurnAbAttr {
for (const opp of pokemon.getOpponents()) {
if ((opp.status?.effect === StatusEffect.SLEEP || opp.hasAbility(Abilities.COMATOSE)) && !opp.hasAbilityWithAttr(BlockNonDirectDamageAbAttr)) {
if (!simulated) {
- opp.damageAndUpdate(Utils.toDmgValue(opp.getMaxHp() / 8), HitResult.OTHER);
+ opp.damageAndUpdate(toDmgValue(opp.getMaxHp() / 8), HitResult.OTHER);
pokemon.scene.queueMessage(i18next.t("abilityTriggers:badDreams", { pokemonName: getPokemonNameWithAffix(opp) }));
}
hadEffect = true;
@@ -3712,7 +3754,7 @@ export class PostBiomeChangeWeatherChangeAbAttr extends PostBiomeChangeAbAttr {
this.weatherType = weatherType;
}
- apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): boolean {
if (!pokemon.scene.arena.weather?.isImmutable()) {
if (simulated) {
return pokemon.scene.arena.weather?.weatherType !== this.weatherType;
@@ -3734,7 +3776,7 @@ export class PostBiomeChangeTerrainChangeAbAttr extends PostBiomeChangeAbAttr {
this.terrainType = terrainType;
}
- apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): boolean {
if (simulated) {
return pokemon.scene.arena.terrain?.terrainType !== this.terrainType;
} else {
@@ -3815,15 +3857,15 @@ export class StatStageChangeMultiplierAbAttr extends AbAttr {
this.multiplier = multiplier;
}
- override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
- (args[0] as Utils.IntegerHolder).value *= this.multiplier;
+ override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): boolean {
+ (args[0] as NumberHolder).value *= this.multiplier;
return true;
}
}
export class StatStageChangeCopyAbAttr extends AbAttr {
- apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean | Promise<boolean> {
+ apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): boolean | Promise<boolean> {
if (!simulated) {
pokemon.scene.unshiftPhase(new StatStageChangePhase(pokemon.scene, pokemon.getBattlerIndex(), true, (args[0] as BattleStat[]), (args[1] as number), true, false, false));
}
@@ -3836,7 +3878,7 @@ export class BypassBurnDamageReductionAbAttr extends AbAttr {
super(false);
}
- apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): boolean {
cancelled.value = true;
return true;
@@ -3857,26 +3899,26 @@ export class ReduceBurnDamageAbAttr extends AbAttr {
* @param pokemon N/A
* @param passive N/A
* @param cancelled N/A
- * @param args `[0]` {@linkcode Utils.NumberHolder} The damage value being modified
+ * @param args `[0]` {@linkcode NumberHolder} The damage value being modified
* @returns `true`
*/
- apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
- (args[0] as Utils.NumberHolder).value = Utils.toDmgValue((args[0] as Utils.NumberHolder).value * this.multiplier);
+ apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): boolean {
+ (args[0] as NumberHolder).value = toDmgValue((args[0] as NumberHolder).value * this.multiplier);
return true;
}
}
export class DoubleBerryEffectAbAttr extends AbAttr {
- apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
- (args[0] as Utils.NumberHolder).value *= 2;
+ apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): boolean {
+ (args[0] as NumberHolder).value *= 2;
return true;
}
}
export class PreventBerryUseAbAttr extends AbAttr {
- apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): boolean {
cancelled.value = true;
return true;
@@ -3899,14 +3941,14 @@ export class HealFromBerryUseAbAttr extends AbAttr {
this.healPercent = Math.max(Math.min(healPercent, 1), 0);
}
- apply(pokemon: Pokemon, passive: boolean, simulated: boolean, ...args: [Utils.BooleanHolder, any[]]): boolean {
+ apply(pokemon: Pokemon, passive: boolean, simulated: boolean, ...args: [BooleanHolder, any[]]): boolean {
const { name: abilityName } = passive ? pokemon.getPassiveAbility() : pokemon.getAbility();
if (!simulated) {
pokemon.scene.unshiftPhase(
new PokemonHealPhase(
pokemon.scene,
pokemon.getBattlerIndex(),
- Utils.toDmgValue(pokemon.getMaxHp() * this.healPercent),
+ toDmgValue(pokemon.getMaxHp() * this.healPercent),
i18next.t("abilityTriggers:healFromBerryUse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), abilityName }),
true
)
@@ -3917,8 +3959,8 @@ export class HealFromBerryUseAbAttr extends AbAttr {
}
export class RunSuccessAbAttr extends AbAttr {
- apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
- (args[0] as Utils.IntegerHolder).value = 256;
+ apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): boolean {
+ (args[0] as NumberHolder).value = 256;
return true;
}
@@ -3940,7 +3982,7 @@ export class CheckTrappedAbAttr extends AbAttr {
this.arenaTrapCondition = condition;
}
- applyCheckTrapped(pokemon: Pokemon, passive: boolean, simulated: boolean, trapped: Utils.BooleanHolder, otherPokemon: Pokemon, args: any[]): boolean | Promise<boolean> {
+ applyCheckTrapped(pokemon: Pokemon, passive: boolean, simulated: boolean, trapped: BooleanHolder, otherPokemon: Pokemon, args: any[]): boolean | Promise<boolean> {
return false;
}
}
@@ -3960,12 +4002,12 @@ export class ArenaTrapAbAttr extends CheckTrappedAbAttr {
* If the user has Arena Trap and the enemy is not grounded, it is not trapped.
* @param pokemon The {@link Pokemon} with this {@link AbAttr}
* @param passive N/A
- * @param trapped {@link Utils.BooleanHolder} indicating whether the other Pokemon is trapped or not
+ * @param trapped {@link BooleanHolder} indicating whether the other Pokemon is trapped or not
* @param otherPokemon The {@link Pokemon} that is affected by an Arena Trap ability
* @param args N/A
* @returns if enemy Pokemon is trapped or not
*/
- applyCheckTrapped(pokemon: Pokemon, passive: boolean, simulated: boolean, trapped: Utils.BooleanHolder, otherPokemon: Pokemon, args: any[]): boolean {
+ applyCheckTrapped(pokemon: Pokemon, passive: boolean, simulated: boolean, trapped: BooleanHolder, otherPokemon: Pokemon, args: any[]): boolean {
if (this.arenaTrapCondition(pokemon, otherPokemon)) {
if (otherPokemon.getTypes(true).includes(Type.GHOST) || (otherPokemon.getTypes(true).includes(Type.STELLAR) && otherPokemon.getTypes().includes(Type.GHOST))) {
trapped.value = false;
@@ -3987,8 +4029,8 @@ export class ArenaTrapAbAttr extends CheckTrappedAbAttr {
}
export class MaxMultiHitAbAttr extends AbAttr {
- apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
- (args[0] as Utils.IntegerHolder).value = 0;
+ apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): boolean {
+ (args[0] as NumberHolder).value = 0;
return true;
}
@@ -4008,7 +4050,7 @@ export class PostBattleLootAbAttr extends PostBattleAbAttr {
applyPostBattle(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
const postBattleLoot = pokemon.scene.currentBattle.postBattleLoot;
if (!simulated && postBattleLoot.length) {
- const randItem = Utils.randSeedItem(postBattleLoot);
+ const randItem = randSeedItem(postBattleLoot);
//@ts-ignore - TODO see below
if (pokemon.scene.tryTransferHeldItemModifier(randItem, pokemon, true, 1, true)) { // TODO: fix. This is a promise!?
postBattleLoot.splice(postBattleLoot.indexOf(randItem), 1);
@@ -4123,14 +4165,14 @@ export class PostFaintContactDamageAbAttr extends PostFaintAbAttr {
applyPostFaint(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker?: Pokemon, move?: Move, hitResult?: HitResult, ...args: any[]): boolean {
if (move !== undefined && attacker !== undefined && move.checkFlag(MoveFlags.MAKES_CONTACT, attacker, pokemon)) { //If the mon didn't die to indirect damage
- const cancelled = new Utils.BooleanHolder(false);
+ const cancelled = new BooleanHolder(false);
pokemon.scene.getField(true).map(p => applyAbAttrs(FieldPreventExplosiveMovesAbAttr, p, cancelled, simulated));
if (cancelled.value || attacker.hasAbilityWithAttr(BlockNonDirectDamageAbAttr)) {
return false;
}
if (!simulated) {
- attacker.damageAndUpdate(Utils.toDmgValue(attacker.getMaxHp() * (1 / this.damageRatio)), HitResult.OTHER);
- attacker.turnData.damageTaken += Utils.toDmgValue(attacker.getMaxHp() * (1 / this.damageRatio));
+ attacker.damageAndUpdate(toDmgValue(attacker.getMaxHp() * (1 / this.damageRatio)), HitResult.OTHER);
+ attacker.turnData.damageTaken += toDmgValue(attacker.getMaxHp() * (1 / this.damageRatio));
}
return true;
}
@@ -4166,9 +4208,9 @@ export class PostFaintHPDamageAbAttr extends PostFaintAbAttr {
}
export class RedirectMoveAbAttr extends AbAttr {
- apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): boolean {
if (this.canRedirect(args[0] as Moves)) {
- const target = args[1] as Utils.IntegerHolder;
+ const target = args[1] as NumberHolder;
const newTarget = pokemon.getBattlerIndex();
if (target.value !== newTarget) {
target.value = newTarget;
@@ -4209,9 +4251,9 @@ export class ReduceStatusEffectDurationAbAttr extends AbAttr {
this.statusEffect = statusEffect;
}
- apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): boolean {
if (args[0] === this.statusEffect) {
- (args[1] as Utils.IntegerHolder).value = Utils.toDmgValue((args[1] as Utils.IntegerHolder).value / 2);
+ (args[1] as NumberHolder).value = toDmgValue((args[1] as NumberHolder).value / 2);
return true;
}
@@ -4238,7 +4280,7 @@ export class FlinchStatStageChangeAbAttr extends FlinchEffectAbAttr {
this.stages = stages;
}
- apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): boolean {
if (!simulated) {
pokemon.scene.unshiftPhase(new StatStageChangePhase(pokemon.scene, pokemon.getBattlerIndex(), true, this.stats, this.stages));
}
@@ -4249,7 +4291,7 @@ export class FlinchStatStageChangeAbAttr extends FlinchEffectAbAttr {
export class IncreasePpAbAttr extends AbAttr { }
export class ForceSwitchOutImmunityAbAttr extends AbAttr {
- apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): boolean {
cancelled.value = true;
return true;
}
@@ -4260,7 +4302,7 @@ export class ReduceBerryUseThresholdAbAttr extends AbAttr {
super();
}
- apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): boolean {
const hpRatio = pokemon.getHpRatio();
if (args[0].value < hpRatio) {
@@ -4285,8 +4327,8 @@ export class WeightMultiplierAbAttr extends AbAttr {
this.multiplier = multiplier;
}
- apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
- (args[0] as Utils.NumberHolder).value *= this.multiplier;
+ apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): boolean {
+ (args[0] as NumberHolder).value *= this.multiplier;
return true;
}
@@ -4297,7 +4339,7 @@ export class SyncEncounterNatureAbAttr extends AbAttr {
super(false);
}
- apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): boolean {
(args[0] as Pokemon).setNature(pokemon.getNature());
return true;
@@ -4313,7 +4355,7 @@ export class MoveAbilityBypassAbAttr extends AbAttr {
this.moveIgnoreFunc = moveIgnoreFunc || ((pokemon, move) => true);
}
- apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): boolean {
if (this.moveIgnoreFunc(pokemon, (args[0] as Move))) {
cancelled.value = true;
return true;
@@ -4327,7 +4369,7 @@ export class SuppressFieldAbilitiesAbAttr extends AbAttr {
super(false);
}
- apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): boolean {
const ability = (args[0] as Ability);
if (!ability.hasAttr(UnsuppressableAbilityAbAttr) && !ability.hasAttr(SuppressFieldAbilitiesAbAttr)) {
cancelled.value = true;
@@ -4353,12 +4395,12 @@ export class InfiltratorAbAttr extends AbAttr {
* @param passive n/a
* @param simulated n/a
* @param cancelled n/a
- * @param args `[0]` a {@linkcode Utils.BooleanHolder | BooleanHolder} containing the flag
+ * @param args `[0]` a {@linkcode BooleanHolder | BooleanHolder} containing the flag
* @returns `true` if the bypass flag was successfully set; `false` otherwise.
*/
override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: null, args: any[]): boolean {
const bypassed = args[0];
- if (args[0] instanceof Utils.BooleanHolder) {
+ if (args[0] instanceof BooleanHolder) {
bypassed.value = true;
return true;
}
@@ -4406,7 +4448,7 @@ export class IgnoreTypeImmunityAbAttr extends AbAttr {
this.allowedMoveTypes = allowedMoveTypes;
}
- apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): boolean {
if (this.defenderType === (args[1] as Type) && this.allowedMoveTypes.includes(args[0] as Type)) {
cancelled.value = true;
return true;
@@ -4429,7 +4471,7 @@ export class IgnoreTypeStatusEffectImmunityAbAttr extends AbAttr {
this.defenderType = defenderType;
}
- apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): boolean {
if (this.statusEffect.includes(args[0] as StatusEffect) && this.defenderType.includes(args[1] as Type)) {
cancelled.value = true;
return true;
@@ -4540,10 +4582,10 @@ export class FormBlockDamageAbAttr extends ReceivedMoveDamageMultiplierAbAttr {
* @param args Additional arguments.
* @returns `true` if the immunity was applied.
*/
- override applyPreDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ override applyPreDefend(pokemon: Pokemon, _passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, _cancelled: BooleanHolder, args: any[]): boolean {
if (this.condition(pokemon, attacker, move) && !move.hitsSubstitute(attacker, pokemon)) {
if (!simulated) {
- (args[0] as Utils.NumberHolder).value = this.multiplier;
+ (args[0] as NumberHolder).value = this.multiplier;
pokemon.removeTag(this.tagType);
if (this.recoilDamageFunc) {
pokemon.damageAndUpdate(this.recoilDamageFunc(pokemon), HitResult.OTHER, false, false, true, true);
@@ -4587,15 +4629,15 @@ export class BypassSpeedChanceAbAttr extends AbAttr {
* bypass move order in their priority bracket when pokemon choose damaging move
* @param {Pokemon} pokemon {@linkcode Pokemon} the Pokemon applying this ability
* @param {boolean} passive N/A
- * @param {Utils.BooleanHolder} cancelled N/A
- * @param {any[]} args [0] {@linkcode Utils.BooleanHolder} set to true when the ability activated
+ * @param {BooleanHolder} cancelled N/A
+ * @param {any[]} args [0] {@linkcode BooleanHolder} set to true when the ability activated
* @returns {boolean} - whether the ability was activated.
*/
- apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
+ apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): boolean {
if (simulated) {
return false;
}
- const bypassSpeed = args[0] as Utils.BooleanHolder;
+ const bypassSpeed = args[0] as BooleanHolder;
if (!bypassSpeed.value && pokemon.randSeedInt(100) < this.chance) {
const turnCommand =
@@ -4637,9 +4679,9 @@ export class PreventBypassSpeedChanceAbAttr extends AbAttr {
* @argument {boolean} bypassSpeed - determines if a Pokemon is able to bypass speed at the moment
* @argument {boolean} canCheckHeldItems - determines if a Pokemon has access to Quick Claw's effects or not
*/
- apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: Utils.BooleanHolder, args: any[]): boolean {
- const bypassSpeed = args[0] as Utils.BooleanHolder;
- const canCheckHeldItems = args[1] as Utils.BooleanHolder;
+ apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: BooleanHolder, args: any[]): boolean {
+ const bypassSpeed = args[0] as BooleanHolder;
+ const canCheckHeldItems = args[1] as BooleanHolder;
const turnCommand = pokemon.scene.currentBattle.turnCommands[pokemon.getBattlerIndex()];
const isCommandFight = turnCommand?.command === Command.FIGHT;
@@ -4708,7 +4750,7 @@ async function applyAbAttrsInternal<TAttr extends AbAttr>(
}
}
-export function applyAbAttrs(attrType: Constructor<AbAttr>, pokemon: Pokemon, cancelled: Utils.BooleanHolder | null, simulated: boolean = false, ...args: any[]): Promise<void> {
+export function applyAbAttrs(attrType: Constructor<AbAttr>, pokemon: Pokemon, cancelled: BooleanHolder | null, simulated: boolean = false, ...args: any[]): Promise<void> {
return applyAbAttrsInternal<AbAttr>(attrType, pokemon, (attr, passive) => attr.apply(pokemon, passive, simulated, cancelled, args), args, false, simulated);
}
@@ -4718,7 +4760,7 @@ export function applyPostBattleInitAbAttrs(attrType: Constructor<PostBattleInitA
}
export function applyPreDefendAbAttrs(attrType: Constructor<PreDefendAbAttr>,
- pokemon: Pokemon, attacker: Pokemon, move: Move | null, cancelled: Utils.BooleanHolder | null, simulated: boolean = false, ...args: any[]): Promise<void> {
+ pokemon: Pokemon, attacker: Pokemon, move: Move | null, cancelled: BooleanHolder | null, simulated: boolean = false, ...args: any[]): Promise<void> {
return applyAbAttrsInternal<PreDefendAbAttr>(attrType, pokemon, (attr, passive) => attr.applyPreDefend(pokemon, passive, simulated, attacker, move, cancelled, args), args, false, simulated);
}
@@ -4733,7 +4775,7 @@ export function applyPostMoveUsedAbAttrs(attrType: Constructor<PostMoveUsedAbAtt
}
export function applyStatMultiplierAbAttrs(attrType: Constructor<StatMultiplierAbAttr>,
- pokemon: Pokemon, stat: BattleStat, statValue: Utils.NumberHolder, simulated: boolean = false, ...args: any[]): Promise<void> {
+ pokemon: Pokemon, stat: BattleStat, statValue: NumberHolder, simulated: boolean = false, ...args: any[]): Promise<void> {
return applyAbAttrsInternal<StatMultiplierAbAttr>(attrType, pokemon, (attr, passive) => attr.applyStatStage(pokemon, passive, simulated, stat, statValue, args), args);
}
export function applyPostSetStatusAbAttrs(attrType: Constructor<PostSetStatusAbAttr>,
@@ -4746,13 +4788,13 @@ export function applyPostSetStatusAbAttrs(attrType: Constructor<PostSetStatusAbA
* @param attrType {@linkcode FieldMultiplyStatAbAttr} should always be FieldMultiplyBattleStatAbAttr for the time being
* @param pokemon {@linkcode Pokemon} the Pokemon applying this ability
* @param stat {@linkcode Stat} the type of the checked stat
- * @param statValue {@linkcode Utils.NumberHolder} the value of the checked stat
+ * @param statValue {@linkcode NumberHolder} the value of the checked stat
* @param checkedPokemon {@linkcode Pokemon} the Pokemon with the checked stat
- * @param hasApplied {@linkcode Utils.BooleanHolder} whether or not a FieldMultiplyBattleStatAbAttr has already affected this stat
+ * @param hasApplied {@linkcode BooleanHolder} whether or not a FieldMultiplyBattleStatAbAttr has already affected this stat
* @param args unused
*/
export function applyFieldStatMultiplierAbAttrs(attrType: Constructor<FieldMultiplyStatAbAttr>,
- pokemon: Pokemon, stat: Stat, statValue: Utils.NumberHolder, checkedPokemon: Pokemon, hasApplied: Utils.BooleanHolder, simulated: boolean = false, ...args: any[]): Promise<void> {
+ pokemon: Pokemon, stat: Stat, statValue: NumberHolder, checkedPokemon: Pokemon, hasApplied: BooleanHolder, simulated: boolean = false, ...args: any[]): Promise<void> {
return applyAbAttrsInternal<FieldMultiplyStatAbAttr>(attrType, pokemon, (attr, passive) => attr.applyFieldStat(pokemon, passive, simulated, stat, statValue, checkedPokemon, hasApplied, args), args);
}
@@ -4787,7 +4829,7 @@ export function applyPreSwitchOutAbAttrs(attrType: Constructor<PreSwitchOutAbAtt
}
export function applyPreStatStageChangeAbAttrs(attrType: Constructor<PreStatStageChangeAbAttr>,
- pokemon: Pokemon | null, stat: BattleStat, cancelled: Utils.BooleanHolder, simulated: boolean = false, ...args: any[]): Promise<void> {
+ pokemon: Pokemon | null, stat: BattleStat, cancelled: BooleanHolder, simulated: boolean = false, ...args: any[]): Promise<void> {
return applyAbAttrsInternal<PreStatStageChangeAbAttr>(attrType, pokemon, (attr, passive) => attr.applyPreStatStageChange(pokemon, passive, simulated, stat, cancelled, args), args, false, simulated);
}
@@ -4797,17 +4839,17 @@ export function applyPostStatStageChangeAbAttrs(attrType: Constructor<PostStatSt
}
export function applyPreSetStatusAbAttrs(attrType: Constructor<PreSetStatusAbAttr>,
- pokemon: Pokemon, effect: StatusEffect | undefined, cancelled: Utils.BooleanHolder, simulated: boolean = false, ...args: any[]): Promise<void> {
+ pokemon: Pokemon, effect: StatusEffect | undefined, cancelled: BooleanHolder, simulated: boolean = false, ...args: any[]): Promise<void> {
return applyAbAttrsInternal<PreSetStatusAbAttr>(attrType, pokemon, (attr, passive) => attr.applyPreSetStatus(pokemon, passive, simulated, effect, cancelled, args), args, false, simulated);
}
export function applyPreApplyBattlerTagAbAttrs(attrType: Constructor<PreApplyBattlerTagAbAttr>,
- pokemon: Pokemon, tag: BattlerTag, cancelled: Utils.BooleanHolder, simulated: boolean = false, ...args: any[]): Promise<void> {
+ pokemon: Pokemon, tag: BattlerTag, cancelled: BooleanHolder, simulated: boolean = false, ...args: any[]): Promise<void> {
return applyAbAttrsInternal<PreApplyBattlerTagAbAttr>(attrType, pokemon, (attr, passive) => attr.applyPreApplyBattlerTag(pokemon, passive, simulated, tag, cancelled, args), args, false, simulated);
}
export function applyPreWeatherEffectAbAttrs(attrType: Constructor<PreWeatherEffectAbAttr>,
- pokemon: Pokemon, weather: Weather | null, cancelled: Utils.BooleanHolder, simulated: boolean = false, ...args: any[]): Promise<void> {
+ pokemon: Pokemon, weather: Weather | null, cancelled: BooleanHolder, simulated: boolean = false, ...args: any[]): Promise<void> {
return applyAbAttrsInternal<PreWeatherDamageAbAttr>(attrType, pokemon, (attr, passive) => attr.applyPreWeatherEffect(pokemon, passive, simulated, weather, cancelled, args), args, true, simulated);
}
@@ -4832,7 +4874,7 @@ export function applyPostTerrainChangeAbAttrs(attrType: Constructor<PostTerrainC
}
export function applyCheckTrappedAbAttrs(attrType: Constructor<CheckTrappedAbAttr>,
- pokemon: Pokemon, trapped: Utils.BooleanHolder, otherPokemon: Pokemon, messages: string[], simulated: boolean = false, ...args: any[]): Promise<void> {
+ pokemon: Pokemon, trapped: BooleanHolder, otherPokemon: Pokemon, messages: string[], simulated: boolean = false, ...args: any[]): Promise<void> {
return applyAbAttrsInternal<CheckTrappedAbAttr>(attrType, pokemon, (attr, passive) => attr.applyCheckTrapped(pokemon, passive, simulated, trapped, otherPokemon, args), args, false, simulated, messages);
}
@@ -5070,7 +5112,7 @@ export function initAbilities() {
.bypassFaint()
.ignorable(),
new Ability(Abilities.SHED_SKIN, 3)
- .conditionalAttr(pokemon => !Utils.randSeedInt(3), PostTurnResetStatusAbAttr),
+ .conditionalAttr(pokemon => !randSeedInt(3), PostTurnResetStatusAbAttr),
new Ability(Abilities.GUTS, 3)
.attr(BypassBurnDamageReductionAbAttr)
.conditionalAttr(pokemon => !!pokemon.status || pokemon.hasAbility(Abilities.COMATOSE), StatMultiplierAbAttr, Stat.ATK, 1.5),
@@ -5189,7 +5231,7 @@ export function initAbilities() {
.attr(ChangeMovePriorityAbAttr, (pokemon, move: Move) => true, -0.2),
new Ability(Abilities.TECHNICIAN, 4)
.attr(MovePowerBoostAbAttr, (user, target, move) => {
- const power = new Utils.NumberHolder(move.power);
+ const power = new NumberHolder(move.power);
applyMoveAttrs(VariablePowerAttr, user, target, move, power);
return power.value <= 60;
}, 1.5),
@@ -5282,7 +5324,7 @@ export function initAbilities() {
.attr(PostDefendMoveDisableAbAttr, 30)
.bypassFaint(),
new Ability(Abilities.HEALER, 5)
- .conditionalAttr(pokemon => pokemon.getAlly() && Utils.randSeedInt(10) < 3, PostTurnResetStatusAbAttr, true),
+ .conditionalAttr(pokemon => pokemon.getAlly() && randSeedInt(10) < 3, PostTurnResetStatusAbAttr, true),
new Ability(Abilities.FRIEND_GUARD, 5)
.ignorable()
.unimplemented(),
@@ -5546,7 +5588,7 @@ export function initAbilities() {
.attr(FormBlockDamageAbAttr,
(target, user, move) => !!target.getTag(BattlerTagType.DISGUISE) && target.getMoveEffectiveness(user, move) > 0, 0, BattlerTagType.DISGUISE,
(pokemon, abilityName) => i18next.t("abilityTriggers:disguiseAvoidedDamage", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), abilityName: abilityName }),
- (pokemon) => Utils.toDmgValue(pokemon.getMaxHp() / 8))
+ (pokemon) => toDmgValue(pokemon.getMaxHp() / 8))
.attr(PostBattleInitFormChangeAbAttr, () => 0)
.bypassFaint()
.ignorable(),
diff --git a/src/data/arena-tag.ts b/src/data/arena-tag.ts
index aa6aec6f73a3..a5b9b29cdcb7 100644
--- a/src/data/arena-tag.ts
+++ b/src/data/arena-tag.ts
@@ -7,7 +7,13 @@ import { getPokemonNameWithAffix } from "#app/messages";
import Pokemon, { HitResult, PokemonMove } from "#app/field/pokemon";
import { StatusEffect } from "#app/data/status-effect";
import { BattlerIndex } from "#app/battle";
-import { BlockNonDirectDamageAbAttr, ChangeMovePriorityAbAttr, InfiltratorAbAttr, ProtectStatAbAttr, applyAbAttrs } from "#app/data/ability";
+import {
+ BlockNonDirectDamageAbAttr,
+ ChangeMovePriorityAbAttr,
+ InfiltratorAbAttr,
+ ProtectStatAbAttr,
+ applyAbAttrs,
+} from "#app/data/ability";
import { Stat } from "#enums/stat";
import { CommonAnim, CommonBattleAnim } from "#app/data/battle-anims";
import i18next from "i18next";
@@ -15,11 +21,11 @@ import { Abilities } from "#enums/abilities";
import { ArenaTagType } from "#enums/arena-tag-type";
import { BattlerTagType } from "#enums/battler-tag-type";
import { Moves } from "#enums/moves";
-import { MoveEffectPhase } from "#app/phases/move-effect-phase";
-import { PokemonHealPhase } from "#app/phases/pokemon-heal-phase";
-import { ShowAbilityPhase } from "#app/phases/show-ability-phase";
-import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
-import { CommonAnimPhase } from "#app/phases/common-anim-phase";
+import { MoveEffectPhase } from "#phases/move-effect-phase";
+import { PokemonHealPhase } from "#phases/pokemon-heal-phase";
+import { ShowAbilityPhase } from "#phases/show-ability-phase";
+import { StatStageChangePhase } from "#phases/stat-stage-change-phase";
+import { CommonAnimPhase } from "#phases/common-anim-phase";
export enum ArenaTagSide {
BOTH,
diff --git a/src/data/balance/biomes.ts b/src/data/balance/biomes.ts
index 2ce693c360b0..c22cad9108c3 100644
--- a/src/data/balance/biomes.ts
+++ b/src/data/balance/biomes.ts
@@ -1,12 +1,11 @@
import { Type } from "#app/data/type";
-import * as Utils from "#app/utils";
-import { pokemonEvolutions, SpeciesFormEvolution } from "#app/data/balance/pokemon-evolutions";
+import { randInt, getEnumValues } from "#app/utils";
+import { pokemonEvolutions, SpeciesFormEvolution } from "#balance/pokemon-evolutions";
import i18next from "i18next";
import { Biome } from "#enums/biome";
import { Species } from "#enums/species";
import { TimeOfDay } from "#enums/time-of-day";
import { TrainerType } from "#enums/trainer-type";
-// import beautify from "json-beautify";
export function getBiomeName(biome: Biome | -1) {
if (biome === -1) {
@@ -7666,7 +7665,7 @@ export function initBiomes() {
if (biome === Biome.END) {
const biomeList = Object.keys(Biome).filter(key => !isNaN(Number(key)));
biomeList.pop(); // Removes Biome.END from the list
- const randIndex = Utils.randInt(biomeList.length, 1); // Will never be Biome.TOWN
+ const randIndex = randInt(biomeList.length, 1); // Will never be Biome.TOWN
biome = Biome[biomeList[randIndex]];
}
const linkedBiomes: (Biome | [ Biome, integer ])[] = Array.isArray(biomeLinks[biome])
@@ -7689,15 +7688,15 @@ export function initBiomes() {
traverseBiome(Biome.TOWN, 0);
biomeDepths[Biome.END] = [ Object.values(biomeDepths).map(d => d[0]).reduce((max: integer, value: integer) => Math.max(max, value), 0) + 1, 1 ];
- for (const biome of Utils.getEnumValues(Biome)) {
+ for (const biome of getEnumValues(Biome)) {
biomePokemonPools[biome] = {};
biomeTrainerPools[biome] = {};
- for (const tier of Utils.getEnumValues(BiomePoolTier)) {
+ for (const tier of getEnumValues(BiomePoolTier)) {
biomePokemonPools[biome][tier] = {};
biomeTrainerPools[biome][tier] = [];
- for (const tod of Utils.getEnumValues(TimeOfDay)) {
+ for (const tod of getEnumValues(TimeOfDay)) {
biomePokemonPools[biome][tier][tod] = [];
}
}
diff --git a/src/data/balance/egg-moves.ts b/src/data/balance/egg-moves.ts
index 8df92e179d90..6a29fc3f8f97 100644
--- a/src/data/balance/egg-moves.ts
+++ b/src/data/balance/egg-moves.ts
@@ -1,5 +1,5 @@
import { allMoves } from "#app/data/move";
-import * as Utils from "#app/utils";
+import { getEnumKeys, getEnumValues } from "#app/utils";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
@@ -579,8 +579,8 @@ export const speciesEggMoves = {
function parseEggMoves(content: string): void {
let output = "";
- const speciesNames = Utils.getEnumKeys(Species);
- const speciesValues = Utils.getEnumValues(Species);
+ const speciesNames = getEnumKeys(Species);
+ const speciesValues = getEnumValues(Species);
const lines = content.split(/\n/g);
lines.forEach((line, l) => {
diff --git a/src/data/balance/passives.ts b/src/data/balance/passives.ts
index 6fb0e80e085e..3563de641731 100644
--- a/src/data/balance/passives.ts
+++ b/src/data/balance/passives.ts
@@ -1,5 +1,5 @@
-import { Abilities } from "#app/enums/abilities";
-import { Species } from "#app/enums/species";
+import { Abilities } from "#enums/abilities";
+import { Species } from "#enums/species";
export const starterPassiveAbilities = {
[Species.BULBASAUR]: Abilities.GRASSY_SURGE,
diff --git a/src/data/balance/pokemon-evolutions.ts b/src/data/balance/pokemon-evolutions.ts
index c838f6b2c497..603342b6309d 100644
--- a/src/data/balance/pokemon-evolutions.ts
+++ b/src/data/balance/pokemon-evolutions.ts
@@ -3,7 +3,7 @@ import { PokeballType } from "#app/data/pokeball";
import Pokemon from "#app/field/pokemon";
import { Stat } from "#enums/stat";
import { Type } from "#app/data/type";
-import * as Utils from "#app/utils";
+import { randSeedInt } from "#app/utils";
import { WeatherType } from "#app/data/weather";
import { Nature } from "#app/data/nature";
import { Biome } from "#enums/biome";
@@ -1172,7 +1172,7 @@ export const pokemonEvolutions: PokemonEvolutions = {
[Species.TANDEMAUS]: [
new SpeciesFormEvolution(Species.MAUSHOLD, "", "three", 25, null, new SpeciesEvolutionCondition(p => {
let ret = false;
- p.scene.executeWithSeedOffset(() => ret = !Utils.randSeedInt(4), p.id);
+ p.scene.executeWithSeedOffset(() => ret = !randSeedInt(4), p.id);
return ret;
})),
new SpeciesEvolution(Species.MAUSHOLD, 25, null, null)
@@ -1340,7 +1340,7 @@ export const pokemonEvolutions: PokemonEvolutions = {
new SpeciesFormEvolution(Species.DUDUNSPARCE, "", "three-segment", 32, null, new SpeciesEvolutionCondition(p => {
let ret = false;
if (p.moveset.filter(m => m?.moveId === Moves.HYPER_DRILL).length > 0) {
- p.scene.executeWithSeedOffset(() => ret = !Utils.randSeedInt(4), p.id);
+ p.scene.executeWithSeedOffset(() => ret = !randSeedInt(4), p.id);
}
return ret;
}), SpeciesWildEvolutionDelay.LONG),
diff --git a/src/data/battle-anims.ts b/src/data/battle-anims.ts
index 03bf0809fa6f..daea63b4a7da 100644
--- a/src/data/battle-anims.ts
+++ b/src/data/battle-anims.ts
@@ -1,13 +1,20 @@
//import { battleAnimRawData } from "./battle-anim-raw-data";
-import BattleScene from "../battle-scene";
-import { AttackMove, BeakBlastHeaderAttr, ChargeAttr, DelayedAttackAttr, MoveFlags, SelfStatusMove, allMoves } from "./move";
-import Pokemon from "../field/pokemon";
-import * as Utils from "../utils";
-import { BattlerIndex } from "../battle";
+import BattleScene from "#app/battle-scene";
+import {
+ AttackMove,
+ BeakBlastHeaderAttr,
+ ChargeAttr,
+ DelayedAttackAttr,
+ MoveFlags,
+ SelfStatusMove,
+ allMoves,
+} from "./move";
+import Pokemon from "#app/field/pokemon";
+import { getFrameMs, getEnumKeys, getEnumValues, animationFileName, isNullOrUndefined } from "#app/utils";
+import { BattlerIndex } from "#app/battle";
import { Element } from "json-stable-stringify";
import { Moves } from "#enums/moves";
import { SubstituteTag } from "./battler-tags";
-import { isNullOrUndefined } from "../utils";
import Phaser from "phaser";
import { EncounterAnim } from "#enums/encounter-anims";
//import fs from 'vite-plugin-fs/browser';
@@ -401,7 +408,7 @@ class AnimTimedUpdateBgEvent extends AnimTimedBgEvent {
if (Object.keys(tweenProps).length) {
scene.tweens.add(Object.assign({
targets: moveAnim.bgSprite,
- duration: Utils.getFrameMs(this.duration * 3)
+ duration: getFrameMs(this.duration * 3)
}, tweenProps));
}
return this.duration * 2;
@@ -437,7 +444,7 @@ class AnimTimedAddBgEvent extends AnimTimedBgEvent {
scene.tweens.add({
targets: moveAnim.bgSprite,
- duration: Utils.getFrameMs(this.duration * 3)
+ duration: getFrameMs(this.duration * 3)
});
return this.duration * 2;
@@ -455,8 +462,8 @@ export const encounterAnims = new Map<EncounterAnim, AnimConfig>();
export function initCommonAnims(scene: BattleScene): Promise<void> {
return new Promise(resolve => {
- const commonAnimNames = Utils.getEnumKeys(CommonAnim);
- const commonAnimIds = Utils.getEnumValues(CommonAnim);
+ const commonAnimNames = getEnumKeys(CommonAnim);
+ const commonAnimIds = getEnumValues(CommonAnim);
const commonAnimFetches: Promise<Map<CommonAnim, AnimConfig>>[] = [];
for (let ca = 0; ca < commonAnimIds.length; ca++) {
const commonAnimId = commonAnimIds[ca];
@@ -490,7 +497,7 @@ export function initMoveAnim(scene: BattleScene, move: Moves): Promise<void> {
const defaultMoveAnim = allMoves[move] instanceof AttackMove ? Moves.TACKLE : allMoves[move] instanceof SelfStatusMove ? Moves.FOCUS_ENERGY : Moves.TAIL_WHIP;
const fetchAnimAndResolve = (move: Moves) => {
- scene.cachedFetch(`./battle-anims/${Utils.animationFileName(move)}.json`)
+ scene.cachedFetch(`./battle-anims/${animationFileName(move)}.json`)
.then(response => {
const contentType = response.headers.get("content-type");
if (!response.ok || contentType?.indexOf("application/json") === -1) {
@@ -546,7 +553,7 @@ function useDefaultAnim(move: Moves, defaultMoveAnim: Moves) {
* @remarks use {@linkcode useDefaultAnim} to use a default animation
*/
function logMissingMoveAnim(move: Moves, ...optionalParams: any[]) {
- const moveName = Utils.animationFileName(move);
+ const moveName = animationFileName(move);
console.warn(`Could not load animation file for move '${moveName}'`, ...optionalParams);
}
@@ -557,7 +564,7 @@ function logMissingMoveAnim(move: Moves, ...optionalParams: any[]) {
*/
export async function initEncounterAnims(scene: BattleScene, encounterAnim: EncounterAnim | EncounterAnim[]): Promise<void> {
const anims = Array.isArray(encounterAnim) ? encounterAnim : [ encounterAnim ];
- const encounterAnimNames = Utils.getEnumKeys(EncounterAnim);
+ const encounterAnimNames = getEnumKeys(EncounterAnim);
const encounterAnimFetches: Promise<Map<EncounterAnim, AnimConfig>>[] = [];
for (const anim of anims) {
if (encounterAnims.has(anim) && !isNullOrUndefined(encounterAnims.get(anim))) {
@@ -919,7 +926,7 @@ export abstract class BattleAnim {
let f = 0;
scene.tweens.addCounter({
- duration: Utils.getFrameMs(3),
+ duration: getFrameMs(3),
repeat: anim?.frames.length ?? 0,
onRepeat: () => {
if (!f) {
@@ -1053,7 +1060,7 @@ export abstract class BattleAnim {
r = Math.max((anim.frames.length - f) + event.execute(scene, this), r);
}
}
- const targets = Utils.getEnumValues(AnimFrameTarget);
+ const targets = getEnumValues(AnimFrameTarget);
for (const i of targets) {
const count = i === AnimFrameTarget.GRAPHIC ? g : i === AnimFrameTarget.USER ? u : t;
if (count < spriteCache[i].length) {
@@ -1081,7 +1088,7 @@ export abstract class BattleAnim {
}
if (r) {
scene.tweens.addCounter({
- duration: Utils.getFrameMs(r),
+ duration: getFrameMs(r),
onComplete: () => cleanUpAndComplete()
});
} else {
@@ -1165,7 +1172,7 @@ export abstract class BattleAnim {
let existingFieldSprites = scene.field.getAll().slice(0);
scene.tweens.addCounter({
- duration: Utils.getFrameMs(3) * frameTimeMult,
+ duration: getFrameMs(3) * frameTimeMult,
repeat: anim!.frames.length,
onRepeat: () => {
existingFieldSprites = scene.field.getAll().slice(0);
@@ -1218,7 +1225,7 @@ export abstract class BattleAnim {
totalFrames = Math.max((anim.frames.length - frameCount) + event.execute(scene, this, frameTimedEventPriority), totalFrames);
}
}
- const targets = Utils.getEnumValues(AnimFrameTarget);
+ const targets = getEnumValues(AnimFrameTarget);
for (const i of targets) {
const count = graphicFrameCount;
if (count < spriteCache[i].length) {
@@ -1243,7 +1250,7 @@ export abstract class BattleAnim {
}
if (totalFrames) {
scene.tweens.addCounter({
- duration: Utils.getFrameMs(totalFrames),
+ duration: getFrameMs(totalFrames),
onComplete: () => cleanUpAndComplete()
});
} else {
@@ -1341,15 +1348,15 @@ export class EncounterBattleAnim extends BattleAnim {
}
export async function populateAnims() {
- const commonAnimNames = Utils.getEnumKeys(CommonAnim).map(k => k.toLowerCase());
+ const commonAnimNames = getEnumKeys(CommonAnim).map(k => k.toLowerCase());
const commonAnimMatchNames = commonAnimNames.map(k => k.replace(/\_/g, ""));
- const commonAnimIds = Utils.getEnumValues(CommonAnim) as CommonAnim[];
- const chargeAnimNames = Utils.getEnumKeys(ChargeAnim).map(k => k.toLowerCase());
+ const commonAnimIds = getEnumValues(CommonAnim) as CommonAnim[];
+ const chargeAnimNames = getEnumKeys(ChargeAnim).map(k => k.toLowerCase());
const chargeAnimMatchNames = chargeAnimNames.map(k => k.replace(/\_/g, " "));
- const chargeAnimIds = Utils.getEnumValues(ChargeAnim) as ChargeAnim[];
+ const chargeAnimIds = getEnumValues(ChargeAnim) as ChargeAnim[];
const commonNamePattern = /name: (?:Common:)?(Opp )?(.*)/;
const moveNameToId = {};
- for (const move of Utils.getEnumValues(Moves).slice(1)) {
+ for (const move of getEnumValues(Moves).slice(1)) {
const moveName = Moves[move].toUpperCase().replace(/\_/g, "");
moveNameToId[moveName] = move;
}
diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts
index e0616c341be6..97ecdb7e971c 100644
--- a/src/data/battler-tags.ts
+++ b/src/data/battler-tags.ts
@@ -1,11 +1,26 @@
import { ChargeAnim, CommonAnim, CommonBattleAnim, MoveChargeAnim } from "./battle-anims";
-import { getPokemonNameWithAffix } from "../messages";
-import Pokemon, { MoveResult, HitResult } from "../field/pokemon";
+import { getPokemonNameWithAffix } from "#app/messages";
+import Pokemon, { MoveResult, HitResult } from "#app/field/pokemon";
import { StatusEffect } from "./status-effect";
-import * as Utils from "../utils";
-import { ChargeAttr, MoveFlags, allMoves, MoveCategory, applyMoveAttrs, StatusCategoryOnAllyAttr, HealOnAllyAttr, ConsecutiveUseDoublePowerAttr } from "./move";
+import { toDmgValue, BooleanHolder, getFrameMs, IntegerHolder } from "#app/utils";
+import {
+ ChargeAttr,
+ MoveFlags,
+ allMoves,
+ MoveCategory,
+ applyMoveAttrs,
+ StatusCategoryOnAllyAttr,
+ HealOnAllyAttr,
+ ConsecutiveUseDoublePowerAttr,
+} from "./move";
import { Type } from "./type";
-import { BlockNonDirectDamageAbAttr, FlinchEffectAbAttr, ReverseDrainAbAttr, applyAbAttrs, ProtectStatAbAttr } from "./ability";
+import {
+ BlockNonDirectDamageAbAttr,
+ FlinchEffectAbAttr,
+ ReverseDrainAbAttr,
+ applyAbAttrs,
+ ProtectStatAbAttr,
+} from "./ability";
import { TerrainType } from "./terrain";
import { WeatherType } from "./weather";
import { allAbilities } from "./ability";
@@ -15,14 +30,14 @@ import { BattlerTagType } from "#enums/battler-tag-type";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import i18next from "#app/plugins/i18n";
-import { Stat, type BattleStat, type EffectiveStat, EFFECTIVE_STATS, getStatKey } from "#app/enums/stat";
-import { CommonAnimPhase } from "#app/phases/common-anim-phase";
-import { MoveEffectPhase } from "#app/phases/move-effect-phase";
-import { MovePhase } from "#app/phases/move-phase";
-import { PokemonHealPhase } from "#app/phases/pokemon-heal-phase";
-import { ShowAbilityPhase } from "#app/phases/show-ability-phase";
-import { StatStageChangePhase, StatStageChangeCallback } from "#app/phases/stat-stage-change-phase";
-import { PokemonAnimType } from "#app/enums/pokemon-anim-type";
+import { Stat, type BattleStat, type EffectiveStat, EFFECTIVE_STATS, getStatKey } from "#enums/stat";
+import { CommonAnimPhase } from "#phases/common-anim-phase";
+import { MoveEffectPhase } from "#phases/move-effect-phase";
+import { MovePhase } from "#phases/move-phase";
+import { PokemonHealPhase } from "#phases/pokemon-heal-phase";
+import { ShowAbilityPhase } from "#phases/show-ability-phase";
+import { StatStageChangePhase, StatStageChangeCallback } from "#phases/stat-stage-change-phase";
+import { PokemonAnimType } from "#enums/pokemon-anim-type";
import BattleScene from "#app/battle-scene";
export enum BattlerTagLapseType {
@@ -641,7 +656,7 @@ export class ConfusedTag extends BattlerTag {
if (pokemon.randSeedInt(3) === 0) {
const atk = pokemon.getEffectiveStat(Stat.ATK);
const def = pokemon.getEffectiveStat(Stat.DEF);
- const damage = Utils.toDmgValue(((((2 * pokemon.level / 5 + 2) * 40 * atk / def) / 50) + 2) * (pokemon.randSeedIntRange(85, 100) / 100));
+ const damage = toDmgValue(((((2 * pokemon.level / 5 + 2) * 40 * atk / def) / 50) + 2) * (pokemon.randSeedIntRange(85, 100) / 100));
pokemon.scene.queueMessage(i18next.t("battlerTags:confusedLapseHurtItself"));
pokemon.damageAndUpdate(damage);
pokemon.battleData.hitCount++;
@@ -812,13 +827,13 @@ export class SeedTag extends BattlerTag {
if (ret) {
const source = pokemon.getOpponents().find(o => o.getBattlerIndex() === this.sourceIndex);
if (source) {
- const cancelled = new Utils.BooleanHolder(false);
+ const cancelled = new BooleanHolder(false);
applyAbAttrs(BlockNonDirectDamageAbAttr, pokemon, cancelled);
if (!cancelled.value) {
pokemon.scene.unshiftPhase(new CommonAnimPhase(pokemon.scene, source.getBattlerIndex(), pokemon.getBattlerIndex(), CommonAnim.LEECH_SEED));
- const damage = pokemon.damageAndUpdate(Utils.toDmgValue(pokemon.getMaxHp() / 8));
+ const damage = pokemon.damageAndUpdate(toDmgValue(pokemon.getMaxHp() / 8));
const reverseDrain = pokemon.hasAbilityWithAttr(ReverseDrainAbAttr, false);
pokemon.scene.unshiftPhase(new PokemonHealPhase(pokemon.scene, source.getBattlerIndex(),
!reverseDrain ? damage : damage * -1,
@@ -860,11 +875,11 @@ export class NightmareTag extends BattlerTag {
pokemon.scene.queueMessage(i18next.t("battlerTags:nightmareLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
pokemon.scene.unshiftPhase(new CommonAnimPhase(pokemon.scene, pokemon.getBattlerIndex(), undefined, CommonAnim.CURSE)); // TODO: Update animation type
- const cancelled = new Utils.BooleanHolder(false);
+ const cancelled = new BooleanHolder(false);
applyAbAttrs(BlockNonDirectDamageAbAttr, pokemon, cancelled);
if (!cancelled.value) {
- pokemon.damageAndUpdate(Utils.toDmgValue(pokemon.getMaxHp() / 4));
+ pokemon.damageAndUpdate(toDmgValue(pokemon.getMaxHp() / 4));
}
}
@@ -1004,7 +1019,7 @@ export class IngrainTag extends TrappedTag {
new PokemonHealPhase(
pokemon.scene,
pokemon.getBattlerIndex(),
- Utils.toDmgValue(pokemon.getMaxHp() / 16),
+ toDmgValue(pokemon.getMaxHp() / 16),
i18next.t("battlerTags:ingrainLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }),
true
)
@@ -1067,7 +1082,7 @@ export class AquaRingTag extends BattlerTag {
new PokemonHealPhase(
pokemon.scene,
pokemon.getBattlerIndex(),
- Utils.toDmgValue(pokemon.getMaxHp() / 16),
+ toDmgValue(pokemon.getMaxHp() / 16),
i18next.t("battlerTags:aquaRingLapse", {
moveName: this.getMoveName(),
pokemonName: getPokemonNameWithAffix(pokemon)
@@ -1161,11 +1176,11 @@ export abstract class DamagingTrapTag extends TrappedTag {
);
pokemon.scene.unshiftPhase(new CommonAnimPhase(pokemon.scene, pokemon.getBattlerIndex(), undefined, this.commonAnim));
- const cancelled = new Utils.BooleanHolder(false);
+ const cancelled = new BooleanHolder(false);
applyAbAttrs(BlockNonDirectDamageAbAttr, pokemon, cancelled);
if (!cancelled.value) {
- pokemon.damageAndUpdate(Utils.toDmgValue(pokemon.getMaxHp() / 8));
+ pokemon.damageAndUpdate(toDmgValue(pokemon.getMaxHp() / 8));
}
}
@@ -1356,7 +1371,7 @@ export class ContactDamageProtectedTag extends ProtectedTag {
if (effectPhase instanceof MoveEffectPhase && effectPhase.move.getMove().hasFlag(MoveFlags.MAKES_CONTACT)) {
const attacker = effectPhase.getPokemon();
if (!attacker.hasAbilityWithAttr(BlockNonDirectDamageAbAttr)) {
- attacker.damageAndUpdate(Utils.toDmgValue(attacker.getMaxHp() * (1 / this.damageRatio)), HitResult.OTHER);
+ attacker.damageAndUpdate(toDmgValue(attacker.getMaxHp() * (1 / this.damageRatio)), HitResult.OTHER);
}
}
}
@@ -1709,7 +1724,7 @@ export class SemiInvulnerableTag extends BattlerTag {
onRemove(pokemon: Pokemon): void {
// Wait 2 frames before setting visible for battle animations that don't immediately show the sprite invisible
pokemon.scene.tweens.addCounter({
- duration: Utils.getFrameMs(2),
+ duration: getFrameMs(2),
onComplete: () => pokemon.setVisible(true)
});
}
@@ -1860,12 +1875,12 @@ export class SaltCuredTag extends BattlerTag {
if (ret) {
pokemon.scene.unshiftPhase(new CommonAnimPhase(pokemon.scene, pokemon.getBattlerIndex(), pokemon.getBattlerIndex(), CommonAnim.SALT_CURE));
- const cancelled = new Utils.BooleanHolder(false);
+ const cancelled = new BooleanHolder(false);
applyAbAttrs(BlockNonDirectDamageAbAttr, pokemon, cancelled);
if (!cancelled.value) {
const pokemonSteelOrWater = pokemon.isOfType(Type.STEEL) || pokemon.isOfType(Type.WATER);
- pokemon.damageAndUpdate(Utils.toDmgValue(pokemonSteelOrWater ? pokemon.getMaxHp() / 4 : pokemon.getMaxHp() / 8));
+ pokemon.damageAndUpdate(toDmgValue(pokemonSteelOrWater ? pokemon.getMaxHp() / 4 : pokemon.getMaxHp() / 8));
pokemon.scene.queueMessage(
i18next.t("battlerTags:saltCuredLapse", {
@@ -1907,11 +1922,11 @@ export class CursedTag extends BattlerTag {
if (ret) {
pokemon.scene.unshiftPhase(new CommonAnimPhase(pokemon.scene, pokemon.getBattlerIndex(), pokemon.getBattlerIndex(), CommonAnim.SALT_CURE));
- const cancelled = new Utils.BooleanHolder(false);
+ const cancelled = new BooleanHolder(false);
applyAbAttrs(BlockNonDirectDamageAbAttr, pokemon, cancelled);
if (!cancelled.value) {
- pokemon.damageAndUpdate(Utils.toDmgValue(pokemon.getMaxHp() / 4));
+ pokemon.damageAndUpdate(toDmgValue(pokemon.getMaxHp() / 4));
pokemon.scene.queueMessage(i18next.t("battlerTags:cursedLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
}
}
@@ -2173,7 +2188,7 @@ export class GulpMissileTag extends BattlerTag {
return true;
}
- const cancelled = new Utils.BooleanHolder(false);
+ const cancelled = new BooleanHolder(false);
applyAbAttrs(BlockNonDirectDamageAbAttr, attacker, cancelled);
if (!cancelled.value) {
@@ -2289,7 +2304,7 @@ export class HealBlockTag extends MoveRestrictionBattlerTag {
* @returns `true` if the move cannot be used because the target is an ally
*/
override isMoveTargetRestricted(move: Moves, user: Pokemon, target: Pokemon) {
- const moveCategory = new Utils.IntegerHolder(allMoves[move].category);
+ const moveCategory = new IntegerHolder(allMoves[move].category);
applyMoveAttrs(StatusCategoryOnAllyAttr, user, target, allMoves[move], moveCategory);
if (allMoves[move].hasAttr(HealOnAllyAttr) && moveCategory.value === MoveCategory.STATUS ) {
return true;
@@ -2506,7 +2521,7 @@ export class MysteryEncounterPostSummonTag extends BattlerTag {
const ret = super.lapse(pokemon, lapseType);
if (lapseType === BattlerTagLapseType.CUSTOM) {
- const cancelled = new Utils.BooleanHolder(false);
+ const cancelled = new BooleanHolder(false);
applyAbAttrs(ProtectStatAbAttr, pokemon, cancelled);
if (!cancelled.value) {
if (pokemon.mysteryEncounterBattleEffects) {
diff --git a/src/data/berry.ts b/src/data/berry.ts
index 7243c4c1b2e9..bc43c6a063a2 100644
--- a/src/data/berry.ts
+++ b/src/data/berry.ts
@@ -1,14 +1,14 @@
-import { getPokemonNameWithAffix } from "../messages";
-import Pokemon, { HitResult } from "../field/pokemon";
+import { getPokemonNameWithAffix } from "#app/messages";
+import Pokemon, { HitResult } from "#app/field/pokemon";
import { getStatusEffectHealText } from "./status-effect";
-import * as Utils from "../utils";
+import { NumberHolder, toDmgValue, randSeedInt } from "#app/utils";
import { DoubleBerryEffectAbAttr, ReduceBerryUseThresholdAbAttr, applyAbAttrs } from "./ability";
import i18next from "i18next";
import { BattlerTagType } from "#enums/battler-tag-type";
import { BerryType } from "#enums/berry-type";
-import { Stat, type BattleStat } from "#app/enums/stat";
-import { PokemonHealPhase } from "#app/phases/pokemon-heal-phase";
-import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
+import { Stat, type BattleStat } from "#enums/stat";
+import { PokemonHealPhase } from "#phases/pokemon-heal-phase";
+import { StatStageChangePhase } from "#phases/stat-stage-change-phase";
export function getBerryName(berryType: BerryType): string {
return i18next.t(`berry:${BerryType[berryType]}.name`);
@@ -34,7 +34,7 @@ export function getBerryPredicate(berryType: BerryType): BerryPredicate {
case BerryType.APICOT:
case BerryType.SALAC:
return (pokemon: Pokemon) => {
- const threshold = new Utils.NumberHolder(0.25);
+ const threshold = new NumberHolder(0.25);
// Offset BerryType such that LIECHI -> Stat.ATK = 1, GANLON -> Stat.DEF = 2, so on and so forth
const stat: BattleStat = berryType - BerryType.ENIGMA;
applyAbAttrs(ReduceBerryUseThresholdAbAttr, pokemon, null, false, threshold);
@@ -42,19 +42,19 @@ export function getBerryPredicate(berryType: BerryType): BerryPredicate {
};
case BerryType.LANSAT:
return (pokemon: Pokemon) => {
- const threshold = new Utils.NumberHolder(0.25);
+ const threshold = new NumberHolder(0.25);
applyAbAttrs(ReduceBerryUseThresholdAbAttr, pokemon, null, false, threshold);
return pokemon.getHpRatio() < 0.25 && !pokemon.getTag(BattlerTagType.CRIT_BOOST);
};
case BerryType.STARF:
return (pokemon: Pokemon) => {
- const threshold = new Utils.NumberHolder(0.25);
+ const threshold = new NumberHolder(0.25);
applyAbAttrs(ReduceBerryUseThresholdAbAttr, pokemon, null, false, threshold);
return pokemon.getHpRatio() < 0.25;
};
case BerryType.LEPPA:
return (pokemon: Pokemon) => {
- const threshold = new Utils.NumberHolder(0.25);
+ const threshold = new NumberHolder(0.25);
applyAbAttrs(ReduceBerryUseThresholdAbAttr, pokemon, null, false, threshold);
return !!pokemon.getMoveset().find(m => !m?.getPpRatio());
};
@@ -71,7 +71,7 @@ export function getBerryEffectFunc(berryType: BerryType): BerryEffectFunc {
if (pokemon.battleData) {
pokemon.battleData.berriesEaten.push(berryType);
}
- const hpHealed = new Utils.NumberHolder(Utils.toDmgValue(pokemon.getMaxHp() / 4));
+ const hpHealed = new NumberHolder(toDmgValue(pokemon.getMaxHp() / 4));
applyAbAttrs(DoubleBerryEffectAbAttr, pokemon, null, false, hpHealed);
pokemon.scene.unshiftPhase(new PokemonHealPhase(pokemon.scene, pokemon.getBattlerIndex(),
hpHealed.value, i18next.t("battle:hpHealBerry", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), berryName: getBerryName(berryType) }), true));
@@ -98,7 +98,7 @@ export function getBerryEffectFunc(berryType: BerryType): BerryEffectFunc {
}
// Offset BerryType such that LIECHI -> Stat.ATK = 1, GANLON -> Stat.DEF = 2, so on and so forth
const stat: BattleStat = berryType - BerryType.ENIGMA;
- const statStages = new Utils.NumberHolder(1);
+ const statStages = new NumberHolder(1);
applyAbAttrs(DoubleBerryEffectAbAttr, pokemon, null, false, statStages);
pokemon.scene.unshiftPhase(new StatStageChangePhase(pokemon.scene, pokemon.getBattlerIndex(), true, [ stat ], statStages.value));
};
@@ -114,8 +114,8 @@ export function getBerryEffectFunc(berryType: BerryType): BerryEffectFunc {
if (pokemon.battleData) {
pokemon.battleData.berriesEaten.push(berryType);
}
- const randStat = Utils.randSeedInt(Stat.SPD, Stat.ATK);
- const stages = new Utils.NumberHolder(2);
+ const randStat = randSeedInt(Stat.SPD, Stat.ATK);
+ const stages = new NumberHolder(2);
applyAbAttrs(DoubleBerryEffectAbAttr, pokemon, null, false, stages);
pokemon.scene.unshiftPhase(new StatStageChangePhase(pokemon.scene, pokemon.getBattlerIndex(), true, [ randStat ], stages.value));
};
diff --git a/src/data/challenge.ts b/src/data/challenge.ts
index a64a90e5d14c..bca5b63a2827 100644
--- a/src/data/challenge.ts
+++ b/src/data/challenge.ts
@@ -1,8 +1,8 @@
-import * as Utils from "#app/utils";
+import { BooleanHolder, NumberHolder, randSeedItem } from "#app/utils";
import i18next from "i18next";
import { defaultStarterSpecies, DexAttrProps, GameData } from "#app/system/game-data";
import PokemonSpecies, { getPokemonSpecies, getPokemonSpeciesForm } from "#app/data/pokemon-species";
-import { speciesStarterCosts } from "#app/data/balance/starters";
+import { speciesStarterCosts } from "#balance/starters";
import Pokemon, { PokemonMove } from "#app/field/pokemon";
import { BattleType, FixedBattleConfig } from "#app/battle";
import Trainer, { TrainerVariant } from "#app/field/trainer";
@@ -14,7 +14,7 @@ import { TrainerType } from "#enums/trainer-type";
import { Nature } from "#app/data/nature";
import { Moves } from "#enums/moves";
import { TypeColor, TypeShadow } from "#enums/color";
-import { pokemonEvolutions } from "#app/data/balance/pokemon-evolutions";
+import { pokemonEvolutions } from "#balance/pokemon-evolutions";
import { pokemonFormChanges } from "#app/data/pokemon-forms";
/** A constant for the default max cost of the starting party before a run */
@@ -271,31 +271,31 @@ export abstract class Challenge {
/**
* An apply function for STARTER_CHOICE challenges. Derived classes should alter this.
* @param pokemon {@link PokemonSpecies} The pokemon to check the validity of.
- * @param valid {@link Utils.BooleanHolder} A BooleanHolder, the value gets set to false if the pokemon isn't allowed.
+ * @param valid {@link BooleanHolder} A BooleanHolder, the value gets set to false if the pokemon isn't allowed.
* @param dexAttr {@link DexAttrProps} The dex attributes of the pokemon.
* @param soft {@link boolean} If true, allow it if it could become a valid pokemon.
* @returns {@link boolean} Whether this function did anything.
*/
- applyStarterChoice(pokemon: PokemonSpecies, valid: Utils.BooleanHolder, dexAttr: DexAttrProps, soft: boolean = false): boolean {
+ applyStarterChoice(pokemon: PokemonSpecies, valid: BooleanHolder, dexAttr: DexAttrProps, soft: boolean = false): boolean {
return false;
}
/**
* An apply function for STARTER_POINTS challenges. Derived classes should alter this.
- * @param points {@link Utils.NumberHolder} The amount of points you have available.
+ * @param points {@link NumberHolder} The amount of points you have available.
* @returns {@link boolean} Whether this function did anything.
*/
- applyStarterPoints(points: Utils.NumberHolder): boolean {
+ applyStarterPoints(points: NumberHolder): boolean {
return false;
}
/**
* An apply function for STARTER_COST challenges. Derived classes should alter this.
* @param species {@link Species} The pokemon to change the cost of.
- * @param cost {@link Utils.NumberHolder} The cost of the starter.
+ * @param cost {@link NumberHolder} The cost of the starter.
* @returns {@link boolean} Whether this function did anything.
*/
- applyStarterCost(species: Species, cost: Utils.NumberHolder): boolean {
+ applyStarterCost(species: Species, cost: NumberHolder): boolean {
return false;
}
@@ -311,10 +311,10 @@ export abstract class Challenge {
/**
* An apply function for POKEMON_IN_BATTLE challenges. Derived classes should alter this.
* @param pokemon {@link Pokemon} The pokemon to check the validity of.
- * @param valid {@link Utils.BooleanHolder} A BooleanHolder, the value gets set to false if the pokemon isn't allowed.
+ * @param valid {@link BooleanHolder} A BooleanHolder, the value gets set to false if the pokemon isn't allowed.
* @returns {@link boolean} Whether this function did anything.
*/
- applyPokemonInBattle(pokemon: Pokemon, valid: Utils.BooleanHolder): boolean {
+ applyPokemonInBattle(pokemon: Pokemon, valid: BooleanHolder): boolean {
return false;
}
@@ -330,42 +330,42 @@ export abstract class Challenge {
/**
* An apply function for TYPE_EFFECTIVENESS challenges. Derived classes should alter this.
- * @param effectiveness {@linkcode Utils.NumberHolder} The current effectiveness of the move.
+ * @param effectiveness {@linkcode NumberHolder} The current effectiveness of the move.
* @returns Whether this function did anything.
*/
- applyTypeEffectiveness(effectiveness: Utils.NumberHolder): boolean {
+ applyTypeEffectiveness(effectiveness: NumberHolder): boolean {
return false;
}
/**
* An apply function for AI_LEVEL challenges. Derived classes should alter this.
- * @param level {@link Utils.IntegerHolder} The generated level.
+ * @param level {@link NumberHolder} The generated level.
* @param levelCap {@link Number} The current level cap.
* @param isTrainer {@link Boolean} Whether this is a trainer pokemon.
* @param isBoss {@link Boolean} Whether this is a non-trainer boss pokemon.
* @returns {@link boolean} Whether this function did anything.
*/
- applyLevelChange(level: Utils.IntegerHolder, levelCap: number, isTrainer: boolean, isBoss: boolean): boolean {
+ applyLevelChange(level: NumberHolder, levelCap: number, isTrainer: boolean, isBoss: boolean): boolean {
return false;
}
/**
* An apply function for AI_MOVE_SLOTS challenges. Derived classes should alter this.
* @param pokemon {@link Pokemon} The pokemon that is being considered.
- * @param moveSlots {@link Utils.IntegerHolder} The amount of move slots.
+ * @param moveSlots {@link NumberHolder} The amount of move slots.
* @returns {@link boolean} Whether this function did anything.
*/
- applyMoveSlot(pokemon: Pokemon, moveSlots: Utils.IntegerHolder): boolean {
+ applyMoveSlot(pokemon: Pokemon, moveSlots: NumberHolder): boolean {
return false;
}
/**
* An apply function for PASSIVE_ACCESS challenges. Derived classes should alter this.
* @param pokemon {@link Pokemon} The pokemon to change.
- * @param hasPassive {@link Utils.BooleanHolder} Whether it should have its passive.
+ * @param hasPassive {@link BooleanHolder} Whether it should have its passive.
* @returns {@link boolean} Whether this function did anything.
*/
- applyPassiveAccess(pokemon: Pokemon, hasPassive: Utils.BooleanHolder): boolean {
+ applyPassiveAccess(pokemon: Pokemon, hasPassive: BooleanHolder): boolean {
return false;
}
@@ -383,10 +383,10 @@ export abstract class Challenge {
* @param pokemon {@link Pokemon} What pokemon would learn the move.
* @param moveSource {@link MoveSourceType} What source the pokemon would get the move from.
* @param move {@link Moves} The move in question.
- * @param level {@link Utils.IntegerHolder} The level threshold for access.
+ * @param level {@link NumberHolder} The level threshold for access.
* @returns {@link boolean} Whether this function did anything.
*/
- applyMoveAccessLevel(pokemon: Pokemon, moveSource: MoveSourceType, move: Moves, level: Utils.IntegerHolder): boolean {
+ applyMoveAccessLevel(pokemon: Pokemon, moveSource: MoveSourceType, move: Moves, level: NumberHolder): boolean {
return false;
}
@@ -395,10 +395,10 @@ export abstract class Challenge {
* @param pokemon {@link Pokemon} What pokemon would learn the move.
* @param moveSource {@link MoveSourceType} What source the pokemon would get the move from.
* @param move {@link Moves} The move in question.
- * @param weight {@link Utils.IntegerHolder} The base weight of the move
+ * @param weight {@link NumberHolder} The base weight of the move
* @returns {@link boolean} Whether this function did anything.
*/
- applyMoveWeight(pokemon: Pokemon, moveSource: MoveSourceType, move: Moves, level: Utils.IntegerHolder): boolean {
+ applyMoveWeight(pokemon: Pokemon, moveSource: MoveSourceType, move: Moves, level: NumberHolder): boolean {
return false;
}
}
@@ -413,7 +413,7 @@ export class SingleGenerationChallenge extends Challenge {
super(Challenges.SINGLE_GENERATION, 9);
}
- applyStarterChoice(pokemon: PokemonSpecies, valid: Utils.BooleanHolder, dexAttr: DexAttrProps, soft: boolean = false): boolean {
+ applyStarterChoice(pokemon: PokemonSpecies, valid: BooleanHolder, dexAttr: DexAttrProps, soft: boolean = false): boolean {
const generations = [ pokemon.generation ];
if (soft) {
const speciesToCheck = [ pokemon.speciesId ];
@@ -435,7 +435,7 @@ export class SingleGenerationChallenge extends Challenge {
return false;
}
- applyPokemonInBattle(pokemon: Pokemon, valid: Utils.BooleanHolder): boolean {
+ applyPokemonInBattle(pokemon: Pokemon, valid: BooleanHolder): boolean {
const baseGeneration = pokemon.species.speciesId === Species.VICTINI ? 5 : getPokemonSpecies(pokemon.species.speciesId).generation;
const fusionGeneration = pokemon.isFusion() ? pokemon.fusionSpecies?.speciesId === Species.VICTINI ? 5 : getPokemonSpecies(pokemon.fusionSpecies!.speciesId).generation : 0; // TODO: is the bang on fusionSpecies correct?
if (pokemon.isPlayer() && (baseGeneration !== this.value || (pokemon.isFusion() && fusionGeneration !== this.value))) {
@@ -449,19 +449,19 @@ export class SingleGenerationChallenge extends Challenge {
let trainerTypes: TrainerType[] = [];
switch (waveIndex) {
case 182:
- trainerTypes = [ TrainerType.LORELEI, TrainerType.WILL, TrainerType.SIDNEY, TrainerType.AARON, TrainerType.SHAUNTAL, TrainerType.MALVA, Utils.randSeedItem([ TrainerType.HALA, TrainerType.MOLAYNE ]), TrainerType.MARNIE_ELITE, TrainerType.RIKA ];
+ trainerTypes = [ TrainerType.LORELEI, TrainerType.WILL, TrainerType.SIDNEY, TrainerType.AARON, TrainerType.SHAUNTAL, TrainerType.MALVA, randSeedItem([ TrainerType.HALA, TrainerType.MOLAYNE ]), TrainerType.MARNIE_ELITE, TrainerType.RIKA ];
break;
case 184:
trainerTypes = [ TrainerType.BRUNO, TrainerType.KOGA, TrainerType.PHOEBE, TrainerType.BERTHA, TrainerType.MARSHAL, TrainerType.SIEBOLD, TrainerType.OLIVIA, TrainerType.NESSA_ELITE, TrainerType.POPPY ];
break;
case 186:
- trainerTypes = [ TrainerType.AGATHA, TrainerType.BRUNO, TrainerType.GLACIA, TrainerType.FLINT, TrainerType.GRIMSLEY, TrainerType.WIKSTROM, TrainerType.ACEROLA, Utils.randSeedItem([ TrainerType.BEA_ELITE, TrainerType.ALLISTER_ELITE ]), TrainerType.LARRY_ELITE ];
+ trainerTypes = [ TrainerType.AGATHA, TrainerType.BRUNO, TrainerType.GLACIA, TrainerType.FLINT, TrainerType.GRIMSLEY, TrainerType.WIKSTROM, TrainerType.ACEROLA, randSeedItem([ TrainerType.BEA_ELITE, TrainerType.ALLISTER_ELITE ]), TrainerType.LARRY_ELITE ];
break;
case 188:
trainerTypes = [ TrainerType.LANCE, TrainerType.KAREN, TrainerType.DRAKE, TrainerType.LUCIAN, TrainerType.CAITLIN, TrainerType.DRASNA, TrainerType.KAHILI, TrainerType.RAIHAN_ELITE, TrainerType.HASSEL ];
break;
case 190:
- trainerTypes = [ TrainerType.BLUE, Utils.randSeedItem([ TrainerType.RED, TrainerType.LANCE_CHAMPION ]), Utils.randSeedItem([ TrainerType.STEVEN, TrainerType.WALLACE ]), TrainerType.CYNTHIA, Utils.randSeedItem([ TrainerType.ALDER, TrainerType.IRIS ]), TrainerType.DIANTHA, TrainerType.HAU, TrainerType.LEON, Utils.randSeedItem([ TrainerType.GEETA, TrainerType.NEMONA ]) ];
+ trainerTypes = [ TrainerType.BLUE, randSeedItem([ TrainerType.RED, TrainerType.LANCE_CHAMPION ]), randSeedItem([ TrainerType.STEVEN, TrainerType.WALLACE ]), TrainerType.CYNTHIA, randSeedItem([ TrainerType.ALDER, TrainerType.IRIS ]), TrainerType.DIANTHA, TrainerType.HAU, TrainerType.LEON, randSeedItem([ TrainerType.GEETA, TrainerType.NEMONA ]) ];
break;
}
if (trainerTypes.length === 0) {
@@ -537,7 +537,7 @@ export class SingleTypeChallenge extends Challenge {
super(Challenges.SINGLE_TYPE, 18);
}
- override applyStarterChoice(pokemon: PokemonSpecies, valid: Utils.BooleanHolder, dexAttr: DexAttrProps, soft: boolean = false): boolean {
+ override applyStarterChoice(pokemon: PokemonSpecies, valid: BooleanHolder, dexAttr: DexAttrProps, soft: boolean = false): boolean {
const speciesForm = getPokemonSpeciesForm(pokemon.speciesId, dexAttr.formIndex);
const types = [ speciesForm.type1, speciesForm.type2 ];
if (soft && !SingleTypeChallenge.SPECIES_OVERRIDES.includes(pokemon.speciesId)) {
@@ -568,7 +568,7 @@ export class SingleTypeChallenge extends Challenge {
return false;
}
- applyPokemonInBattle(pokemon: Pokemon, valid: Utils.BooleanHolder): boolean {
+ applyPokemonInBattle(pokemon: Pokemon, valid: BooleanHolder): boolean {
if (pokemon.isPlayer() && !pokemon.isOfType(this.value - 1, false, false, true)
&& !SingleTypeChallenge.TYPE_OVERRIDES.some(o => o.type === (this.value - 1) && (pokemon.isFusion() && o.fusion ? pokemon.fusionSpecies! : pokemon.species).speciesId === o.species)) { // TODO: is the bang on fusionSpecies correct?
valid.value = false;
@@ -628,7 +628,7 @@ export class FreshStartChallenge extends Challenge {
super(Challenges.FRESH_START, 1);
}
- applyStarterChoice(pokemon: PokemonSpecies, valid: Utils.BooleanHolder): boolean {
+ applyStarterChoice(pokemon: PokemonSpecies, valid: BooleanHolder): boolean {
if (!defaultStarterSpecies.includes(pokemon.speciesId)) {
valid.value = false;
return true;
@@ -636,7 +636,7 @@ export class FreshStartChallenge extends Challenge {
return false;
}
- applyStarterCost(species: Species, cost: Utils.NumberHolder): boolean {
+ applyStarterCost(species: Species, cost: NumberHolder): boolean {
if (defaultStarterSpecies.includes(species)) {
cost.value = speciesStarterCosts[species];
return true;
@@ -688,7 +688,7 @@ export class InverseBattleChallenge extends Challenge {
return 0;
}
- applyTypeEffectiveness(effectiveness: Utils.NumberHolder): boolean {
+ applyTypeEffectiveness(effectiveness: NumberHolder): boolean {
if (effectiveness.value < 1) {
effectiveness.value = 2;
return true;
@@ -719,7 +719,7 @@ export class LowerStarterMaxCostChallenge extends Challenge {
return (DEFAULT_PARTY_MAX_COST - overrideValue).toString();
}
- applyStarterChoice(pokemon: PokemonSpecies, valid: Utils.BooleanHolder): boolean {
+ applyStarterChoice(pokemon: PokemonSpecies, valid: BooleanHolder): boolean {
if (speciesStarterCosts[pokemon.speciesId] > DEFAULT_PARTY_MAX_COST - this.value) {
valid.value = false;
return true;
@@ -753,7 +753,7 @@ export class LowerStarterPointsChallenge extends Challenge {
return (DEFAULT_PARTY_MAX_COST - overrideValue).toString();
}
- applyStarterPoints(points: Utils.NumberHolder): boolean {
+ applyStarterPoints(points: NumberHolder): boolean {
points.value -= this.value;
return true;
}
@@ -771,29 +771,29 @@ export class LowerStarterPointsChallenge extends Challenge {
* @param gameMode {@link GameMode} The current gameMode
* @param challengeType {@link ChallengeType} ChallengeType.STARTER_CHOICE
* @param pokemon {@link PokemonSpecies} The pokemon to check the validity of.
- * @param valid {@link Utils.BooleanHolder} A BooleanHolder, the value gets set to false if the pokemon isn't allowed.
+ * @param valid {@link BooleanHolder} A BooleanHolder, the value gets set to false if the pokemon isn't allowed.
* @param dexAttr {@link DexAttrProps} The dex attributes of the pokemon.
* @param soft {@link boolean} If true, allow it if it could become a valid pokemon.
* @returns True if any challenge was successfully applied.
*/
-export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.STARTER_CHOICE, pokemon: PokemonSpecies, valid: Utils.BooleanHolder, dexAttr: DexAttrProps, soft: boolean): boolean;
+export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.STARTER_CHOICE, pokemon: PokemonSpecies, valid: BooleanHolder, dexAttr: DexAttrProps, soft: boolean): boolean;
/**
* Apply all challenges that modify available total starter points.
* @param gameMode {@link GameMode} The current gameMode
* @param challengeType {@link ChallengeType} ChallengeType.STARTER_POINTS
- * @param points {@link Utils.NumberHolder} The amount of points you have available.
+ * @param points {@link NumberHolder} The amount of points you have available.
* @returns True if any challenge was successfully applied.
*/
-export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.STARTER_POINTS, points: Utils.NumberHolder): boolean;
+export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.STARTER_POINTS, points: NumberHolder): boolean;
/**
* Apply all challenges that modify the cost of a starter.
* @param gameMode {@link GameMode} The current gameMode
* @param challengeType {@link ChallengeType} ChallengeType.STARTER_COST
* @param species {@link Species} The pokemon to change the cost of.
- * @param points {@link Utils.NumberHolder} The cost of the pokemon.
+ * @param points {@link NumberHolder} The cost of the pokemon.
* @returns True if any challenge was successfully applied.
*/
-export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.STARTER_COST, species: Species, cost: Utils.NumberHolder): boolean;
+export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.STARTER_COST, species: Species, cost: NumberHolder): boolean;
/**
* Apply all challenges that modify a starter after selection.
* @param gameMode {@link GameMode} The current gameMode
@@ -807,10 +807,10 @@ export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType
* @param gameMode {@link GameMode} The current gameMode
* @param challengeType {@link ChallengeType} ChallengeType.POKEMON_IN_BATTLE
* @param pokemon {@link Pokemon} The pokemon to check the validity of.
- * @param valid {@link Utils.BooleanHolder} A BooleanHolder, the value gets set to false if the pokemon isn't allowed.
+ * @param valid {@link BooleanHolder} A BooleanHolder, the value gets set to false if the pokemon isn't allowed.
* @returns True if any challenge was successfully applied.
*/
-export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.POKEMON_IN_BATTLE, pokemon: Pokemon, valid: Utils.BooleanHolder): boolean;
+export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.POKEMON_IN_BATTLE, pokemon: Pokemon, valid: BooleanHolder): boolean;
/**
* Apply all challenges that modify what fixed battles there are.
* @param gameMode {@link GameMode} The current gameMode
@@ -824,39 +824,39 @@ export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType
* Apply all challenges that modify type effectiveness.
* @param gameMode {@linkcode GameMode} The current gameMode
* @param challengeType {@linkcode ChallengeType} ChallengeType.TYPE_EFFECTIVENESS
- * @param effectiveness {@linkcode Utils.NumberHolder} The current effectiveness of the move.
+ * @param effectiveness {@linkcode NumberHolder} The current effectiveness of the move.
* @returns True if any challenge was successfully applied.
*/
-export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.TYPE_EFFECTIVENESS, effectiveness: Utils.NumberHolder): boolean;
+export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.TYPE_EFFECTIVENESS, effectiveness: NumberHolder): boolean;
/**
* Apply all challenges that modify what level AI are.
* @param gameMode {@link GameMode} The current gameMode
* @param challengeType {@link ChallengeType} ChallengeType.AI_LEVEL
- * @param level {@link Utils.IntegerHolder} The generated level of the pokemon.
+ * @param level {@link NumberHolder} The generated level of the pokemon.
* @param levelCap {@link Number} The maximum level cap for the current wave.
* @param isTrainer {@link Boolean} Whether this is a trainer pokemon.
* @param isBoss {@link Boolean} Whether this is a non-trainer boss pokemon.
* @returns True if any challenge was successfully applied.
*/
-export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.AI_LEVEL, level: Utils.IntegerHolder, levelCap: number, isTrainer: boolean, isBoss: boolean): boolean;
+export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.AI_LEVEL, level: NumberHolder, levelCap: number, isTrainer: boolean, isBoss: boolean): boolean;
/**
* Apply all challenges that modify how many move slots the AI has.
* @param gameMode {@link GameMode} The current gameMode
* @param challengeType {@link ChallengeType} ChallengeType.AI_MOVE_SLOTS
* @param pokemon {@link Pokemon} The pokemon being considered.
- * @param moveSlots {@link Utils.IntegerHolder} The amount of move slots.
+ * @param moveSlots {@link NumberHolder} The amount of move slots.
* @returns True if any challenge was successfully applied.
*/
-export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.AI_MOVE_SLOTS, pokemon: Pokemon, moveSlots: Utils.IntegerHolder): boolean;
+export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.AI_MOVE_SLOTS, pokemon: Pokemon, moveSlots: NumberHolder): boolean;
/**
* Apply all challenges that modify whether a pokemon has its passive.
* @param gameMode {@link GameMode} The current gameMode
* @param challengeType {@link ChallengeType} ChallengeType.PASSIVE_ACCESS
* @param pokemon {@link Pokemon} The pokemon to modify.
- * @param hasPassive {@link Utils.BooleanHolder} Whether it has its passive.
+ * @param hasPassive {@link BooleanHolder} Whether it has its passive.
* @returns True if any challenge was successfully applied.
*/
-export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.PASSIVE_ACCESS, pokemon: Pokemon, hasPassive: Utils.BooleanHolder): boolean;
+export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.PASSIVE_ACCESS, pokemon: Pokemon, hasPassive: BooleanHolder): boolean;
/**
* Apply all challenges that modify the game modes settings.
* @param gameMode {@link GameMode} The current gameMode
@@ -871,10 +871,10 @@ export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType
* @param pokemon {@link Pokemon} What pokemon would learn the move.
* @param moveSource {@link MoveSourceType} What source the pokemon would get the move from.
* @param move {@link Moves} The move in question.
- * @param level {@link Utils.IntegerHolder} The level threshold for access.
+ * @param level {@link NumberHolder} The level threshold for access.
* @returns True if any challenge was successfully applied.
*/
-export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.MOVE_ACCESS, pokemon: Pokemon, moveSource: MoveSourceType, move: Moves, level: Utils.IntegerHolder): boolean;
+export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.MOVE_ACCESS, pokemon: Pokemon, moveSource: MoveSourceType, move: Moves, level: NumberHolder): boolean;
/**
* Apply all challenges that modify what weight a pokemon gives to move generation
* @param gameMode {@link GameMode} The current gameMode
@@ -882,10 +882,10 @@ export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType
* @param pokemon {@link Pokemon} What pokemon would learn the move.
* @param moveSource {@link MoveSourceType} What source the pokemon would get the move from.
* @param move {@link Moves} The move in question.
- * @param weight {@link Utils.IntegerHolder} The weight of the move.
+ * @param weight {@link NumberHolder} The weight of the move.
* @returns True if any challenge was successfully applied.
*/
-export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.MOVE_WEIGHT, pokemon: Pokemon, moveSource: MoveSourceType, move: Moves, weight: Utils.IntegerHolder): boolean;
+export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType.MOVE_WEIGHT, pokemon: Pokemon, moveSource: MoveSourceType, move: Moves, weight: NumberHolder): boolean;
export function applyChallenges(gameMode: GameMode, challengeType: ChallengeType, ...args: any[]): boolean {
let ret = false;
gameMode.challenges.forEach(c => {
diff --git a/src/data/daily-run.ts b/src/data/daily-run.ts
index 0decab63f4f2..b52e74b6d812 100644
--- a/src/data/daily-run.ts
+++ b/src/data/daily-run.ts
@@ -3,9 +3,9 @@ import { Species } from "#enums/species";
import BattleScene from "#app/battle-scene";
import { PlayerPokemon } from "#app/field/pokemon";
import { Starter } from "#app/ui/starter-select-ui-handler";
-import * as Utils from "#app/utils";
+import { apiFetch, randSeedGauss, randSeedInt, randSeedItem } from "#app/utils";
import PokemonSpecies, { PokemonSpeciesForm, getPokemonSpecies, getPokemonSpeciesForm } from "#app/data/pokemon-species";
-import { speciesStarterCosts } from "#app/data/balance/starters";
+import { speciesStarterCosts } from "#balance/starters";
export interface DailyRunConfig {
seed: integer;
@@ -14,7 +14,7 @@ export interface DailyRunConfig {
export function fetchDailyRunSeed(): Promise<string | null> {
return new Promise<string | null>((resolve, reject) => {
- Utils.apiFetch("daily/seed").then(response => {
+ apiFetch("daily/seed").then(response => {
if (!response.ok) {
resolve(null);
return;
@@ -41,8 +41,8 @@ export function getDailyRunStarters(scene: BattleScene, seed: string): Starter[]
}
const starterCosts: integer[] = [];
- starterCosts.push(Math.min(Math.round(3.5 + Math.abs(Utils.randSeedGauss(1))), 8));
- starterCosts.push(Utils.randSeedInt(9 - starterCosts[0], 1));
+ starterCosts.push(Math.min(Math.round(3.5 + Math.abs(randSeedGauss(1))), 8));
+ starterCosts.push(randSeedInt(9 - starterCosts[0], 1));
starterCosts.push(10 - (starterCosts[0] + starterCosts[1]));
for (let c = 0; c < starterCosts.length; c++) {
@@ -50,7 +50,7 @@ export function getDailyRunStarters(scene: BattleScene, seed: string): Starter[]
const costSpecies = Object.keys(speciesStarterCosts)
.map(s => parseInt(s) as Species)
.filter(s => speciesStarterCosts[s] === cost);
- const randPkmSpecies = getPokemonSpecies(Utils.randSeedItem(costSpecies));
+ const randPkmSpecies = getPokemonSpecies(randSeedItem(costSpecies));
const starterSpecies = getPokemonSpecies(randPkmSpecies.getTrainerSpeciesForLevel(startingLevel, true, PartyMemberStrength.STRONGER));
starters.push(getDailyRunStarter(scene, starterSpecies, startingLevel));
}
diff --git a/src/data/egg.ts b/src/data/egg.ts
index 0f88c53b7480..7f28e00cff33 100644
--- a/src/data/egg.ts
+++ b/src/data/egg.ts
@@ -1,17 +1,41 @@
import BattleScene from "#app/battle-scene";
import PokemonSpecies, { getPokemonSpecies } from "#app/data/pokemon-species";
-import { speciesStarterCosts } from "#app/data/balance/starters";
+import { speciesStarterCosts } from "#balance/starters";
import { VariantTier } from "#enums/variant-tier";
-import * as Utils from "#app/utils";
+import { randInt, randomString, randSeedInt, getIvsFromId } from "#app/utils";
import Overrides from "#app/overrides";
-import { pokemonPrevolutions } from "#app/data/balance/pokemon-evolutions";
+import { pokemonPrevolutions } from "#balance/pokemon-evolutions";
import { PlayerPokemon } from "#app/field/pokemon";
import i18next from "i18next";
import { EggTier } from "#enums/egg-type";
import { Species } from "#enums/species";
import { EggSourceType } from "#enums/egg-source-types";
-import { MANAPHY_EGG_MANAPHY_RATE, SAME_SPECIES_EGG_HA_RATE, GACHA_EGG_HA_RATE, GACHA_DEFAULT_RARE_EGGMOVE_RATE, SAME_SPECIES_EGG_RARE_EGGMOVE_RATE, GACHA_MOVE_UP_RARE_EGGMOVE_RATE, GACHA_DEFAULT_SHINY_RATE, GACHA_SHINY_UP_SHINY_RATE, SAME_SPECIES_EGG_SHINY_RATE, EGG_PITY_LEGENDARY_THRESHOLD, EGG_PITY_EPIC_THRESHOLD, EGG_PITY_RARE_THRESHOLD, SHINY_VARIANT_CHANCE, SHINY_EPIC_CHANCE, GACHA_DEFAULT_COMMON_EGG_THRESHOLD, GACHA_DEFAULT_RARE_EGG_THRESHOLD, GACHA_DEFAULT_EPIC_EGG_THRESHOLD, GACHA_LEGENDARY_UP_THRESHOLD_OFFSET, HATCH_WAVES_MANAPHY_EGG, HATCH_WAVES_COMMON_EGG, HATCH_WAVES_RARE_EGG, HATCH_WAVES_EPIC_EGG, HATCH_WAVES_LEGENDARY_EGG } from "#app/data/balance/rates";
-import { speciesEggTiers } from "#app/data/balance/species-egg-tiers";
+import {
+ MANAPHY_EGG_MANAPHY_RATE,
+ SAME_SPECIES_EGG_HA_RATE,
+ GACHA_EGG_HA_RATE,
+ GACHA_DEFAULT_RARE_EGGMOVE_RATE,
+ SAME_SPECIES_EGG_RARE_EGGMOVE_RATE,
+ GACHA_MOVE_UP_RARE_EGGMOVE_RATE,
+ GACHA_DEFAULT_SHINY_RATE,
+ GACHA_SHINY_UP_SHINY_RATE,
+ SAME_SPECIES_EGG_SHINY_RATE,
+ EGG_PITY_LEGENDARY_THRESHOLD,
+ EGG_PITY_EPIC_THRESHOLD,
+ EGG_PITY_RARE_THRESHOLD,
+ SHINY_VARIANT_CHANCE,
+ SHINY_EPIC_CHANCE,
+ GACHA_DEFAULT_COMMON_EGG_THRESHOLD,
+ GACHA_DEFAULT_RARE_EGG_THRESHOLD,
+ GACHA_DEFAULT_EPIC_EGG_THRESHOLD,
+ GACHA_LEGENDARY_UP_THRESHOLD_OFFSET,
+ HATCH_WAVES_MANAPHY_EGG,
+ HATCH_WAVES_COMMON_EGG,
+ HATCH_WAVES_RARE_EGG,
+ HATCH_WAVES_EPIC_EGG,
+ HATCH_WAVES_LEGENDARY_EGG,
+} from "#balance/rates";
+import { speciesEggTiers } from "#balance/species-egg-tiers";
export const EGG_SEED = 1073741824;
@@ -146,7 +170,7 @@ export class Egg {
this.checkForPityTierOverrides(eggOptions.scene!); // TODO: is this bang correct?
}
- this._id = eggOptions?.id ?? Utils.randInt(EGG_SEED, EGG_SEED * this._tier);
+ this._id = eggOptions?.id ?? randInt(EGG_SEED, EGG_SEED * this._tier);
this._sourceType = eggOptions?.sourceType ?? undefined;
this._hatchWaves = eggOptions?.hatchWaves ?? this.getEggTierDefaultHatchWaves();
@@ -179,7 +203,7 @@ export class Egg {
};
if (eggOptions?.scene) {
- const seedOverride = Utils.randomString(24);
+ const seedOverride = randomString(24);
eggOptions?.scene.executeWithSeedOffset(() => {
generateEggProperties(eggOptions);
}, 0, seedOverride);
@@ -220,14 +244,14 @@ export class Egg {
let pokemonSpecies = getPokemonSpecies(this._species);
// Special condition to have Phione eggs also have a chance of generating Manaphy
if (this._species === Species.PHIONE && this._sourceType === EggSourceType.SAME_SPECIES_EGG) {
- pokemonSpecies = getPokemonSpecies(Utils.randSeedInt(MANAPHY_EGG_MANAPHY_RATE) ? Species.PHIONE : Species.MANAPHY);
+ pokemonSpecies = getPokemonSpecies(randSeedInt(MANAPHY_EGG_MANAPHY_RATE) ? Species.PHIONE : Species.MANAPHY);
}
// Sets the hidden ability if a hidden ability exists and
// the override is set or the egg hits the chance
let abilityIndex: number | undefined = undefined;
- const sameSpeciesEggHACheck = (this._sourceType === EggSourceType.SAME_SPECIES_EGG && !Utils.randSeedInt(SAME_SPECIES_EGG_HA_RATE));
- const gachaEggHACheck = (!(this._sourceType === EggSourceType.SAME_SPECIES_EGG) && !Utils.randSeedInt(GACHA_EGG_HA_RATE));
+ const sameSpeciesEggHACheck = (this._sourceType === EggSourceType.SAME_SPECIES_EGG && !randSeedInt(SAME_SPECIES_EGG_HA_RATE));
+ const gachaEggHACheck = (!(this._sourceType === EggSourceType.SAME_SPECIES_EGG) && !randSeedInt(GACHA_EGG_HA_RATE));
if (pokemonSpecies.abilityHidden && (this._overrideHiddenAbility || sameSpeciesEggHACheck || gachaEggHACheck)) {
abilityIndex = 2;
}
@@ -237,7 +261,7 @@ export class Egg {
ret.shiny = this._isShiny;
ret.variant = this._variantTier;
- const secondaryIvs = Utils.getIvsFromId(Utils.randSeedInt(4294967295));
+ const secondaryIvs = getIvsFromId(randSeedInt(4294967295));
for (let s = 0; s < ret.ivs.length; s++) {
ret.ivs[s] = Math.max(ret.ivs[s], secondaryIvs[s]);
@@ -326,7 +350,7 @@ export class Egg {
}
const tierMultiplier = this.isManaphyEgg() ? 2 : Math.pow(2, 3 - this.tier);
- return Utils.randSeedInt(baseChance * tierMultiplier) ? Utils.randSeedInt(3) : 3;
+ return randSeedInt(baseChance * tierMultiplier) ? randSeedInt(3) : 3;
}
private getEggTierDefaultHatchWaves(eggTier?: EggTier): number {
@@ -347,7 +371,7 @@ export class Egg {
private rollEggTier(): EggTier {
const tierValueOffset = this._sourceType === EggSourceType.GACHA_LEGENDARY ? GACHA_LEGENDARY_UP_THRESHOLD_OFFSET : 0;
- const tierValue = Utils.randInt(256);
+ const tierValue = randInt(256);
return tierValue >= GACHA_DEFAULT_COMMON_EGG_THRESHOLD + tierValueOffset ? EggTier.COMMON : tierValue >= GACHA_DEFAULT_RARE_EGG_THRESHOLD + tierValueOffset ? EggTier.RARE : tierValue >= GACHA_DEFAULT_EPIC_EGG_THRESHOLD + tierValueOffset ? EggTier.EPIC : EggTier.LEGENDARY;
}
@@ -366,11 +390,11 @@ export class Egg {
* when Utils.randSeedInt(8) = 1, and by making the generatePlayerPokemon() species
* check pass when Utils.randSeedInt(8) = 0, we can tell them apart during tests.
*/
- const rand = (Utils.randSeedInt(MANAPHY_EGG_MANAPHY_RATE) !== 1);
+ const rand = (randSeedInt(MANAPHY_EGG_MANAPHY_RATE) !== 1);
return rand ? Species.PHIONE : Species.MANAPHY;
} else if (this.tier === EggTier.LEGENDARY
&& this._sourceType === EggSourceType.GACHA_LEGENDARY) {
- if (!Utils.randSeedInt(2)) {
+ if (!randSeedInt(2)) {
return getLegendaryGachaSpeciesForTimestamp(scene, this.timestamp);
}
}
@@ -444,7 +468,7 @@ export class Egg {
let species: Species;
- const rand = Utils.randSeedInt(totalWeight);
+ const rand = randSeedInt(totalWeight);
for (let s = 0; s < speciesWeights.length; s++) {
if (rand < speciesWeights[s]) {
species = speciesPool[s];
@@ -479,7 +503,7 @@ export class Egg {
break;
}
- return !Utils.randSeedInt(shinyChance);
+ return !randSeedInt(shinyChance);
}
// Uses the same logic as pokemon.generateVariant(). I would like to only have this logic in one
@@ -489,7 +513,7 @@ export class Egg {
return VariantTier.STANDARD;
}
- const rand = Utils.randSeedInt(10);
+ const rand = randSeedInt(10);
if (rand >= SHINY_VARIANT_CHANCE) {
return VariantTier.STANDARD; // 6/10
} else if (rand >= SHINY_EPIC_CHANCE) {
diff --git a/src/data/move.ts b/src/data/move.ts
index 0d9c57bf0944..d214cedadfb8 100644
--- a/src/data/move.ts
+++ b/src/data/move.ts
@@ -1,19 +1,89 @@
import { ChargeAnim, initMoveAnim, loadMoveAnimAssets, MoveChargeAnim } from "./battle-anims";
-import { EncoreTag, GulpMissileTag, HelpingHandTag, SemiInvulnerableTag, ShellTrapTag, StockpilingTag, SubstituteTag, TrappedTag, TypeBoostTag } from "./battler-tags";
-import { getPokemonNameWithAffix } from "../messages";
-import Pokemon, { AttackMoveResult, EnemyPokemon, HitResult, MoveResult, PlayerPokemon, PokemonMove, TurnMove } from "../field/pokemon";
-import { getNonVolatileStatusEffects, getStatusEffectHealText, isNonVolatileStatusEffect, StatusEffect } from "./status-effect";
+import {
+ EncoreTag,
+ GulpMissileTag,
+ HelpingHandTag,
+ SemiInvulnerableTag,
+ ShellTrapTag,
+ StockpilingTag,
+ SubstituteTag,
+ TrappedTag,
+ TypeBoostTag,
+} from "./battler-tags";
+import { getPokemonNameWithAffix } from "#app/messages";
+import Pokemon, {
+ AttackMoveResult,
+ EnemyPokemon,
+ HitResult,
+ MoveResult,
+ PlayerPokemon,
+ PokemonMove,
+ TurnMove,
+} from "#app/field/pokemon";
+import {
+ getNonVolatileStatusEffects,
+ getStatusEffectHealText,
+ isNonVolatileStatusEffect,
+ StatusEffect,
+} from "./status-effect";
import { getTypeDamageMultiplier, Type } from "./type";
-import { Constructor, NumberHolder } from "#app/utils";
-import * as Utils from "../utils";
+import {
+ BooleanHolder,
+ Constructor,
+ NumberHolder,
+ toDmgValue,
+ randSeedItem,
+ randSeedInt,
+ getEnumValues,
+ toReadableString,
+ isNullOrUndefined,
+} from "#app/utils";
import { WeatherType } from "./weather";
import { ArenaTagSide, ArenaTrapTag, WeakenMoveTypeTag } from "./arena-tag";
-import { allAbilities, AllyMoveCategoryPowerBoostAbAttr, applyAbAttrs, applyPostAttackAbAttrs, applyPreAttackAbAttrs, applyPreDefendAbAttrs, BlockItemTheftAbAttr, BlockNonDirectDamageAbAttr, BlockOneHitKOAbAttr, BlockRecoilDamageAttr, ConfusionOnStatusEffectAbAttr, FieldMoveTypePowerBoostAbAttr, FieldPreventExplosiveMovesAbAttr, ForceSwitchOutImmunityAbAttr, HealFromBerryUseAbAttr, IgnoreContactAbAttr, IgnoreMoveEffectsAbAttr, IgnoreProtectOnContactAbAttr, InfiltratorAbAttr, MaxMultiHitAbAttr, MoveAbilityBypassAbAttr, MoveEffectChanceMultiplierAbAttr, MoveTypeChangeAbAttr, ReverseDrainAbAttr, UncopiableAbilityAbAttr, UnsuppressableAbilityAbAttr, UnswappableAbilityAbAttr, UserFieldMoveTypePowerBoostAbAttr, VariableMovePowerAbAttr, WonderSkinAbAttr } from "./ability";
-import { AttackTypeBoosterModifier, BerryModifier, PokemonHeldItemModifier, PokemonMoveAccuracyBoosterModifier, PokemonMultiHitModifier, PreserveBerryModifier } from "../modifier/modifier";
-import { BattlerIndex, BattleType } from "../battle";
+import {
+ allAbilities,
+ AllyMoveCategoryPowerBoostAbAttr,
+ applyAbAttrs,
+ applyPostAttackAbAttrs,
+ applyPreAttackAbAttrs,
+ applyPreDefendAbAttrs,
+ BlockItemTheftAbAttr,
+ BlockNonDirectDamageAbAttr,
+ BlockOneHitKOAbAttr,
+ BlockRecoilDamageAttr,
+ ConfusionOnStatusEffectAbAttr,
+ FieldMoveTypePowerBoostAbAttr,
+ FieldPreventExplosiveMovesAbAttr,
+ ForceSwitchOutImmunityAbAttr,
+ HealFromBerryUseAbAttr,
+ IgnoreContactAbAttr,
+ IgnoreMoveEffectsAbAttr,
+ IgnoreProtectOnContactAbAttr,
+ InfiltratorAbAttr,
+ MaxMultiHitAbAttr,
+ MoveAbilityBypassAbAttr,
+ MoveEffectChanceMultiplierAbAttr,
+ MoveTypeChangeAbAttr,
+ ReverseDrainAbAttr,
+ UncopiableAbilityAbAttr,
+ UnsuppressableAbilityAbAttr,
+ UnswappableAbilityAbAttr,
+ UserFieldMoveTypePowerBoostAbAttr,
+ VariableMovePowerAbAttr,
+ WonderSkinAbAttr,
+} from "./ability";
+import {
+ AttackTypeBoosterModifier,
+ BerryModifier,
+ PokemonHeldItemModifier,
+ PokemonMoveAccuracyBoosterModifier,
+ PokemonMultiHitModifier,
+ PreserveBerryModifier,
+} from "#app/modifier/modifier";
+import { BattlerIndex, BattleType } from "#app/battle";
import { TerrainType } from "./terrain";
import { ModifierPoolType } from "#app/modifier/modifier-type";
-import { Command } from "../ui/command-ui-handler";
+import { Command } from "#app/ui/command-ui-handler";
import i18next from "i18next";
import { Localizable } from "#app/interfaces/locales";
import { getBerryEffectFunc } from "./berry";
@@ -24,16 +94,16 @@ import { Biome } from "#enums/biome";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import { MoveUsedEvent } from "#app/events/battle-scene";
-import { BATTLE_STATS, type BattleStat, EFFECTIVE_STATS, type EffectiveStat, getStatKey, Stat } from "#app/enums/stat";
-import { BattleEndPhase } from "#app/phases/battle-end-phase";
-import { MoveEndPhase } from "#app/phases/move-end-phase";
-import { MovePhase } from "#app/phases/move-phase";
-import { NewBattlePhase } from "#app/phases/new-battle-phase";
-import { PokemonHealPhase } from "#app/phases/pokemon-heal-phase";
-import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
-import { SwitchPhase } from "#app/phases/switch-phase";
-import { SwitchSummonPhase } from "#app/phases/switch-summon-phase";
-import { ShowAbilityPhase } from "#app/phases/show-ability-phase";
+import { BATTLE_STATS, type BattleStat, EFFECTIVE_STATS, type EffectiveStat, getStatKey, Stat } from "#enums/stat";
+import { BattleEndPhase } from "#phases/battle-end-phase";
+import { MoveEndPhase } from "#phases/move-end-phase";
+import { MovePhase } from "#phases/move-phase";
+import { NewBattlePhase } from "#phases/new-battle-phase";
+import { PokemonHealPhase } from "#phases/pokemon-heal-phase";
+import { StatStageChangePhase } from "#phases/stat-stage-change-phase";
+import { SwitchPhase } from "#phases/switch-phase";
+import { SwitchSummonPhase } from "#phases/switch-summon-phase";
+import { ShowAbilityPhase } from "#phases/show-ability-phase";
import { SpeciesFormChangeRevertWeatherFormTrigger } from "./pokemon-forms";
import { GameMode } from "#app/game-mode";
import { applyChallenges, ChallengeType } from "./challenge";
@@ -346,7 +416,7 @@ export default class Move implements Localizable {
return false;
}
- const bypassed = new Utils.BooleanHolder(false);
+ const bypassed = new BooleanHolder(false);
// TODO: Allow this to be simulated
applyAbAttrs(InfiltratorAbAttr, user, null, false, bypassed);
@@ -627,7 +697,7 @@ export default class Move implements Localizable {
break;
case MoveFlags.IGNORE_ABILITIES:
if (user.hasAbilityWithAttr(MoveAbilityBypassAbAttr)) {
- const abilityEffectsIgnored = new Utils.BooleanHolder(false);
+ const abilityEffectsIgnored = new BooleanHolder(false);
applyAbAttrs(MoveAbilityBypassAbAttr, user, abilityEffectsIgnored, false, this);
if (abilityEffectsIgnored.value) {
return true;
@@ -667,10 +737,10 @@ export default class Move implements Localizable {
* @param user {@linkcode Pokemon} using the move
* @param target {@linkcode Pokemon} receiving the move
* @param move {@linkcode Move} using the move
- * @param cancelled {@linkcode Utils.BooleanHolder} to hold boolean value
+ * @param cancelled {@linkcode BooleanHolder} to hold boolean value
* @returns string of the failed text, or null
*/
- getFailedText(user: Pokemon, target: Pokemon, move: Move, cancelled: Utils.BooleanHolder): string | null {
+ getFailedText(user: Pokemon, target: Pokemon, move: Move, cancelled: BooleanHolder): string | null {
for (const attr of this.attrs) {
const failedText = attr.getFailedText(user, target, move, cancelled);
if (failedText !== null) {
@@ -727,7 +797,7 @@ export default class Move implements Localizable {
* @returns The calculated accuracy of the move.
*/
calculateBattleAccuracy(user: Pokemon, target: Pokemon, simulated: boolean = false) {
- const moveAccuracy = new Utils.NumberHolder(this.accuracy);
+ const moveAccuracy = new NumberHolder(this.accuracy);
applyMoveAttrs(VariableAccuracyAttr, user, target, this, moveAccuracy);
applyPreDefendAbAttrs(WonderSkinAbAttr, target, user, this, { value: false }, simulated, moveAccuracy);
@@ -769,8 +839,8 @@ export default class Move implements Localizable {
return -1;
}
- const power = new Utils.NumberHolder(this.power);
- const typeChangeMovePowerMultiplier = new Utils.NumberHolder(1);
+ const power = new NumberHolder(this.power);
+ const typeChangeMovePowerMultiplier = new NumberHolder(1);
applyPreAttackAbAttrs(MoveTypeChangeAbAttr, source, target, this, true, null, typeChangeMovePowerMultiplier);
@@ -809,7 +879,7 @@ export default class Move implements Localizable {
applyMoveAttrs(VariablePowerAttr, source, target, this, power);
- source.scene.applyModifiers(PokemonMultiHitModifier, source.isPlayer(), source, new Utils.IntegerHolder(0), power);
+ source.scene.applyModifiers(PokemonMultiHitModifier, source.isPlayer(), source, new NumberHolder(0), power);
if (!this.hasAttr(TypelessAttr)) {
source.scene.arena.applyTags(WeakenMoveTypeTag, simulated, this.type, power);
@@ -846,7 +916,7 @@ export class AttackMove extends Move {
attackScore = Math.pow(effectiveness - 1, 2) * effectiveness < 1 ? -2 : 2;
if (attackScore) {
if (this.category === MoveCategory.PHYSICAL) {
- const atk = new Utils.IntegerHolder(user.getEffectiveStat(Stat.ATK, target));
+ const atk = new NumberHolder(user.getEffectiveStat(Stat.ATK, target));
applyMoveAttrs(VariableAtkAttr, user, target, move, atk);
if (atk.value > user.getEffectiveStat(Stat.SPATK, target)) {
const statRatio = user.getEffectiveStat(Stat.SPATK, target) / atk.value;
@@ -857,7 +927,7 @@ export class AttackMove extends Move {
}
}
} else {
- const spAtk = new Utils.IntegerHolder(user.getEffectiveStat(Stat.SPATK, target));
+ const spAtk = new NumberHolder(user.getEffectiveStat(Stat.SPATK, target));
applyMoveAttrs(VariableAtkAttr, user, target, move, spAtk);
if (spAtk.value > user.getEffectiveStat(Stat.ATK, target)) {
const statRatio = user.getEffectiveStat(Stat.ATK, target) / spAtk.value;
@@ -869,7 +939,7 @@ export class AttackMove extends Move {
}
}
- const power = new Utils.NumberHolder(this.power);
+ const power = new NumberHolder(this.power);
applyMoveAttrs(VariablePowerAttr, user, target, move, power);
attackScore += Math.floor(power.value / 5);
@@ -933,10 +1003,10 @@ export abstract class MoveAttr {
* @param user {@linkcode Pokemon} using the move
* @param target {@linkcode Pokemon} target of the move
* @param move {@linkcode Move} with this attribute
- * @param cancelled {@linkcode Utils.BooleanHolder} which stores if the move should fail
+ * @param cancelled {@linkcode BooleanHolder} which stores if the move should fail
* @returns the string representing failure of this {@linkcode Move}
*/
- getFailedText(user: Pokemon, target: Pokemon, move: Move, cancelled: Utils.BooleanHolder): string | null {
+ getFailedText(user: Pokemon, target: Pokemon, move: Move, cancelled: BooleanHolder): string | null {
return null;
}
@@ -1024,7 +1094,7 @@ export class MoveEffectAttr extends MoveAttr {
* @returns Move effect chance value.
*/
getMoveChance(user: Pokemon, target: Pokemon, move: Move, selfEffect?: Boolean, showAbility?: Boolean): integer {
- const moveChance = new Utils.NumberHolder(this.effectChanceOverride ?? move.chance);
+ const moveChance = new NumberHolder(this.effectChanceOverride ?? move.chance);
applyAbAttrs(MoveEffectChanceMultiplierAbAttr, user, null, false, moveChance, move, target, selfEffect, showAbility);
@@ -1139,7 +1209,7 @@ export class RespectAttackTypeImmunityAttr extends MoveAttr { }
export class IgnoreOpponentStatStagesAttr extends MoveAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
- (args[0] as Utils.BooleanHolder).value = true;
+ (args[0] as BooleanHolder).value = true;
return true;
}
@@ -1147,7 +1217,7 @@ export class IgnoreOpponentStatStagesAttr extends MoveAttr {
export class HighCritAttr extends MoveAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
- (args[0] as Utils.IntegerHolder).value++;
+ (args[0] as NumberHolder).value++;
return true;
}
@@ -1159,7 +1229,7 @@ export class HighCritAttr extends MoveAttr {
export class CritOnlyAttr extends MoveAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
- (args[0] as Utils.BooleanHolder).value = true;
+ (args[0] as BooleanHolder).value = true;
return true;
}
@@ -1179,7 +1249,7 @@ export class FixedDamageAttr extends MoveAttr {
}
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
- (args[0] as Utils.IntegerHolder).value = this.getDamage(user, target, move);
+ (args[0] as NumberHolder).value = this.getDamage(user, target, move);
return true;
}
@@ -1195,7 +1265,7 @@ export class UserHpDamageAttr extends FixedDamageAttr {
}
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
- (args[0] as Utils.IntegerHolder).value = user.hp;
+ (args[0] as NumberHolder).value = user.hp;
return true;
}
@@ -1207,7 +1277,7 @@ export class TargetHalfHpDamageAttr extends FixedDamageAttr {
}
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
- (args[0] as Utils.IntegerHolder).value = Utils.toDmgValue(target.hp / 2);
+ (args[0] as NumberHolder).value = toDmgValue(target.hp / 2);
return true;
}
@@ -1223,7 +1293,7 @@ export class MatchHpAttr extends FixedDamageAttr {
}
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
- (args[0] as Utils.IntegerHolder).value = target.hp - user.hp;
+ (args[0] as NumberHolder).value = target.hp - user.hp;
return true;
}
@@ -1253,7 +1323,7 @@ export class CounterDamageAttr extends FixedDamageAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
const damage = user.turnData.attacksReceived.filter(ar => this.moveFilter(allMoves[ar.move])).reduce((total: integer, ar: AttackMoveResult) => total + ar.damage, 0);
- (args[0] as Utils.IntegerHolder).value = Utils.toDmgValue(damage * this.multiplier);
+ (args[0] as NumberHolder).value = toDmgValue(damage * this.multiplier);
return true;
}
@@ -1279,13 +1349,13 @@ export class RandomLevelDamageAttr extends FixedDamageAttr {
}
getDamage(user: Pokemon, target: Pokemon, move: Move): number {
- return Utils.toDmgValue(user.level * (user.randSeedIntRange(50, 150) * 0.01));
+ return toDmgValue(user.level * (user.randSeedIntRange(50, 150) * 0.01));
}
}
export class ModifiedDamageAttr extends MoveAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
- const initialDamage = args[0] as Utils.IntegerHolder;
+ const initialDamage = args[0] as NumberHolder;
initialDamage.value = this.getModifiedDamage(user, target, move, initialDamage.value);
return true;
@@ -1328,7 +1398,7 @@ export class RecoilAttr extends MoveEffectAttr {
return false;
}
- const cancelled = new Utils.BooleanHolder(false);
+ const cancelled = new BooleanHolder(false);
if (!this.unblockable) {
applyAbAttrs(BlockRecoilDamageAttr, user, cancelled);
applyAbAttrs(BlockNonDirectDamageAbAttr, user, cancelled);
@@ -1340,7 +1410,7 @@ export class RecoilAttr extends MoveEffectAttr {
const damageValue = (!this.useHp ? user.turnData.damageDealt : user.getMaxHp()) * this.damageRatio;
const minValue = user.turnData.damageDealt ? 1 : 0;
- const recoilDamage = Utils.toDmgValue(damageValue, minValue);
+ const recoilDamage = toDmgValue(damageValue, minValue);
if (!recoilDamage) {
return false;
}
@@ -1457,11 +1527,11 @@ export class HalfSacrificialAttr extends MoveEffectAttr {
return false;
}
- const cancelled = new Utils.BooleanHolder(false);
+ const cancelled = new BooleanHolder(false);
// Check to see if the Pokemon has an ability that blocks non-direct damage
applyAbAttrs(BlockNonDirectDamageAbAttr, user, cancelled);
if (!cancelled.value) {
- user.damageAndUpdate(Utils.toDmgValue(user.getMaxHp() / 2), HitResult.OTHER, false, true, true);
+ user.damageAndUpdate(toDmgValue(user.getMaxHp() / 2), HitResult.OTHER, false, true, true);
user.scene.queueMessage(i18next.t("moveTriggers:cutHpPowerUpMove", { pokemonName: getPokemonNameWithAffix(user) })); // Queue recoil message
}
return true;
@@ -1520,7 +1590,7 @@ export class AddSubstituteAttr extends MoveEffectAttr {
return (user, target, move) => !user.getTag(SubstituteTag) && user.hp > Math.floor(user.getMaxHp() * this.hpCost) && user.getMaxHp() > 1;
}
- getFailedText(user: Pokemon, target: Pokemon, move: Move, cancelled: Utils.BooleanHolder): string | null {
+ getFailedText(user: Pokemon, target: Pokemon, move: Move, cancelled: BooleanHolder): string | null {
if (user.getTag(SubstituteTag)) {
return i18next.t("moveTriggers:substituteOnOverlap", { pokemonName: getPokemonNameWithAffix(user) });
} else if (user.hp <= Math.floor(user.getMaxHp() / 4) || user.getMaxHp() === 1) {
@@ -1568,7 +1638,7 @@ export class HealAttr extends MoveEffectAttr {
*/
addHealPhase(target: Pokemon, healRatio: number) {
target.scene.unshiftPhase(new PokemonHealPhase(target.scene, target.getBattlerIndex(),
- Utils.toDmgValue(target.getMaxHp() * healRatio), i18next.t("moveTriggers:healHp", { pokemonName: getPokemonNameWithAffix(target) }), true, !this.showAnim));
+ toDmgValue(target.getMaxHp() * healRatio), i18next.t("moveTriggers:healHp", { pokemonName: getPokemonNameWithAffix(target) }), true, !this.showAnim));
}
getTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer {
@@ -1649,7 +1719,7 @@ export class FlameBurstAttr extends MoveEffectAttr {
*/
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean | Promise<boolean> {
const targetAlly = target.getAlly();
- const cancelled = new Utils.BooleanHolder(false);
+ const cancelled = new BooleanHolder(false);
if (targetAlly) {
applyAbAttrs(BlockNonDirectDamageAbAttr, targetAlly, cancelled);
@@ -1715,11 +1785,11 @@ export class IgnoreWeatherTypeDebuffAttr extends MoveAttr {
* @param user {@linkcode Pokemon} that used the move
* @param target N/A
* @param move {@linkcode Move} with this attribute
- * @param args [0] {@linkcode Utils.NumberHolder} for arenaAttackTypeMultiplier
+ * @param args [0] {@linkcode NumberHolder} for arenaAttackTypeMultiplier
* @returns true if the function succeeds
*/
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
- const weatherModifier = args[0] as Utils.NumberHolder;
+ const weatherModifier = args[0] as NumberHolder;
//If the type-based attack power modifier due to weather (e.g. Water moves in Sun) is below 1, set it to 1
if (user.scene.arena.weather?.weatherType === this.weather) {
weatherModifier.value = Math.max(weatherModifier.value, 1);
@@ -1870,7 +1940,7 @@ export class HitHealAttr extends MoveEffectAttr {
message = i18next.t("battle:drainMessage", { pokemonName: getPokemonNameWithAffix(target) });
} else {
// Default healing formula used by draining moves like Absorb, Draining Kiss, Bitter Blade, etc.
- healAmount = Utils.toDmgValue(user.turnData.currDamageDealt * this.healRatio);
+ healAmount = toDmgValue(user.turnData.currDamageDealt * this.healRatio);
message = i18next.t("battle:regainHealth", { pokemonName: getPokemonNameWithAffix(user) });
}
if (reverseDrain) {
@@ -1928,7 +1998,7 @@ export class IncrementMovePriorityAttr extends MoveAttr {
* @param user {@linkcode Pokemon} using this move
* @param target {@linkcode Pokemon} target of this move
* @param move {@linkcode Move} being used
- * @param args [0] {@linkcode Utils.IntegerHolder} for move priority.
+ * @param args [0] {@linkcode NumberHolder} for move priority.
* @returns true if function succeeds
*/
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
@@ -1936,7 +2006,7 @@ export class IncrementMovePriorityAttr extends MoveAttr {
return false;
}
- (args[0] as Utils.IntegerHolder).value += this.increaseAmount;
+ (args[0] as NumberHolder).value += this.increaseAmount;
return true;
}
}
@@ -1974,15 +2044,15 @@ export class MultiHitAttr extends MoveAttr {
* @param user {@linkcode Pokemon} that used the attack
* @param target {@linkcode Pokemon} targeted by the attack
* @param move {@linkcode Move} being used
- * @param args [0] {@linkcode Utils.IntegerHolder} storing the hit count of the attack
+ * @param args [0] {@linkcode NumberHolder} storing the hit count of the attack
* @returns True
*/
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
- const hitType = new Utils.NumberHolder(this.intrinsicMultiHitType);
+ const hitType = new NumberHolder(this.intrinsicMultiHitType);
applyMoveAttrs(ChangeMultiHitTypeAttr, user, target, move, hitType);
this.multiHitType = hitType.value;
- (args[0] as Utils.NumberHolder).value = this.getHitCount(user, target);
+ (args[0] as NumberHolder).value = this.getHitCount(user, target);
return true;
}
@@ -2003,7 +2073,7 @@ export class MultiHitAttr extends MoveAttr {
case MultiHitType._2_TO_5:
{
const rand = user.randSeedInt(16);
- const hitValue = new Utils.IntegerHolder(rand);
+ const hitValue = new NumberHolder(rand);
applyAbAttrs(MaxMultiHitAbAttr, user, null, false, hitValue);
if (hitValue.value >= 10) {
return 2;
@@ -2041,7 +2111,7 @@ export class ChangeMultiHitTypeAttr extends MoveAttr {
export class WaterShurikenMultiHitTypeAttr extends ChangeMultiHitTypeAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
if (user.species.speciesId === Species.GRENINJA && user.hasAbility(Abilities.BATTLE_BOND) && user.formIndex === 2) {
- (args[0] as Utils.IntegerHolder).value = MultiHitType._3;
+ (args[0] as NumberHolder).value = MultiHitType._3;
return true;
}
return false;
@@ -2108,7 +2178,7 @@ export class MultiStatusEffectAttr extends StatusEffectAttr {
}
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
- this.effect = Utils.randSeedItem(this.effects);
+ this.effect = randSeedItem(this.effects);
const result = super.apply(user, target, move, args);
return result;
}
@@ -2240,7 +2310,7 @@ export class RemoveHeldItemAttr extends MoveEffectAttr {
return false;
}
- const cancelled = new Utils.BooleanHolder(false);
+ const cancelled = new BooleanHolder(false);
applyAbAttrs(BlockItemTheftAbAttr, target, cancelled); // Check for abilities that block item theft
if (cancelled.value === true) {
@@ -2313,7 +2383,7 @@ export class EatBerryAttr extends MoveEffectAttr {
return false;
}
this.chosenBerry = heldBerries[user.randSeedInt(heldBerries.length)];
- const preserve = new Utils.BooleanHolder(false);
+ const preserve = new BooleanHolder(false);
target.scene.applyModifiers(PreserveBerryModifier, target.isPlayer(), target, preserve); // check for berry pouch preservation
if (!preserve.value) {
this.reduceBerryModifier(target);
@@ -2338,7 +2408,7 @@ export class EatBerryAttr extends MoveEffectAttr {
eatBerry(consumer: Pokemon) {
getBerryEffectFunc(this.chosenBerry!.berryType)(consumer); // consumer eats the berry
- applyAbAttrs(HealFromBerryUseAbAttr, consumer, new Utils.BooleanHolder(false));
+ applyAbAttrs(HealFromBerryUseAbAttr, consumer, new BooleanHolder(false));
}
}
@@ -2362,7 +2432,7 @@ export class StealEatBerryAttr extends EatBerryAttr {
if (move.hitsSubstitute(user, target)) {
return false;
}
- const cancelled = new Utils.BooleanHolder(false);
+ const cancelled = new BooleanHolder(false);
applyAbAttrs(BlockItemTheftAbAttr, target, cancelled); // check for abilities that block item theft
if (cancelled.value === true) {
return false;
@@ -2475,11 +2545,11 @@ export class BypassBurnDamageReductionAttr extends MoveAttr {
* @param user N/A
* @param target N/A
* @param move {@linkcode Move} with this attribute
- * @param args [0] {@linkcode Utils.BooleanHolder} for burnDamageReductionCancelled
+ * @param args [0] {@linkcode BooleanHolder} for burnDamageReductionCancelled
* @returns true if the function succeeds
*/
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
- (args[0] as Utils.BooleanHolder).value = true;
+ (args[0] as BooleanHolder).value = true;
return true;
}
@@ -2560,14 +2630,14 @@ export class OneHitKOAttr extends MoveAttr {
return false;
}
- (args[0] as Utils.BooleanHolder).value = true;
+ (args[0] as BooleanHolder).value = true;
return true;
}
getCondition(): MoveConditionFunc {
return (user, target, move) => {
- const cancelled = new Utils.BooleanHolder(false);
+ const cancelled = new BooleanHolder(false);
applyAbAttrs(BlockOneHitKOAbAttr, target, cancelled);
return !cancelled.value && user.level >= target.level;
};
@@ -2602,7 +2672,7 @@ export class ChargeAttr extends OverrideMoveEffectAttr {
return new Promise(resolve => {
const lastMove = user.getLastXMoves().find(() => true);
if (!lastMove || lastMove.move !== move.id || (lastMove.result !== MoveResult.OTHER && lastMove.turn !== user.scene.currentBattle.turn)) {
- (args[0] as Utils.BooleanHolder).value = true;
+ (args[0] as BooleanHolder).value = true;
new MoveChargeAnim(this.chargeAnim, move.id, user).play(user.scene, false, () => {
user.scene.queueMessage(this.chargeText.replace("{TARGET}", getPokemonNameWithAffix(target)).replace("{USER}", getPokemonNameWithAffix(user)));
if (this.tagType) {
@@ -2704,7 +2774,7 @@ export class DelayedAttackAttr extends OverrideMoveEffectAttr {
return new Promise(resolve => {
if (args.length < 2 || !args[1]) {
new MoveChargeAnim(this.chargeAnim, move.id, user).play(user.scene, false, () => {
- (args[0] as Utils.BooleanHolder).value = true;
+ (args[0] as BooleanHolder).value = true;
user.scene.queueMessage(this.chargeText.replace("{TARGET}", getPokemonNameWithAffix(target)).replace("{USER}", getPokemonNameWithAffix(user)));
user.pushMoveHistory({ move: move.id, targets: [ target.getBattlerIndex() ], result: MoveResult.OTHER });
user.scene.arena.addTag(this.tagType, 3, move.id, user.id, ArenaTagSide.BOTH, false, target.getBattlerIndex());
@@ -2734,7 +2804,7 @@ export class AwaitCombinedPledgeAttr extends OverrideMoveEffectAttr {
* @param target n/a
* @param move the {@linkcode Move} being used
* @param args
- * - [0] a {@linkcode Utils.BooleanHolder} indicating whether the move's base
+ * - [0] a {@linkcode BooleanHolder} indicating whether the move's base
* effects should be overridden this turn.
* @returns `true` if base move effects were overridden; `false` otherwise
*/
@@ -2745,7 +2815,7 @@ export class AwaitCombinedPledgeAttr extends OverrideMoveEffectAttr {
return false;
}
- const overridden = args[0] as Utils.BooleanHolder;
+ const overridden = args[0] as BooleanHolder;
const allyMovePhase = user.scene.findPhase<MovePhase>((phase) => phase instanceof MovePhase && phase.pokemon.isPlayer() === user.isPlayer());
if (allyMovePhase) {
@@ -3102,7 +3172,7 @@ export class CutHpStatStageBoostAttr extends StatStageChangeAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): Promise<boolean> {
return new Promise<boolean>(resolve => {
- user.damageAndUpdate(Utils.toDmgValue(user.getMaxHp() / this.cutRatio), HitResult.OTHER, false, true);
+ user.damageAndUpdate(toDmgValue(user.getMaxHp() / this.cutRatio), HitResult.OTHER, false, true);
user.updateInfo().then(() => {
const ret = super.apply(user, target, move, args);
if (this.messageCallback) {
@@ -3297,7 +3367,7 @@ export class LessPPMorePowerAttr extends VariablePowerAttr {
* @param user {@linkcode Pokemon} using this move
* @param target {@linkcode Pokemon} target of this move
* @param move {@linkcode Move} being used
- * @param args [0] {@linkcode Utils.NumberHolder} of power
+ * @param args [0] {@linkcode NumberHolder} of power
* @returns true if the function succeeds
*/
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
@@ -3310,7 +3380,7 @@ export class LessPPMorePowerAttr extends VariablePowerAttr {
ppRemains = 0;
}
- const power = args[0] as Utils.NumberHolder;
+ const power = args[0] as NumberHolder;
switch (ppRemains) {
case 0:
@@ -3343,7 +3413,7 @@ export class MovePowerMultiplierAttr extends VariablePowerAttr {
}
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
- const power = args[0] as Utils.NumberHolder;
+ const power = args[0] as NumberHolder;
power.value *= this.powerMultiplierFunc(user, target, move);
return true;
@@ -3383,7 +3453,7 @@ export class BeatUpAttr extends VariablePowerAttr {
* @returns true if the function succeeds
*/
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
- const power = args[0] as Utils.NumberHolder;
+ const power = args[0] as NumberHolder;
const party = user.isPlayer() ? user.scene.getParty() : user.scene.getEnemyParty();
const allyCount = party.filter(pokemon => {
@@ -3398,7 +3468,7 @@ export class BeatUpAttr extends VariablePowerAttr {
const doublePowerChanceMessageFunc = (user: Pokemon, target: Pokemon, move: Move) => {
let message: string = "";
user.scene.executeWithSeedOffset(() => {
- const rand = Utils.randSeedInt(100);
+ const rand = randSeedInt(100);
if (rand < move.chance) {
message = i18next.t("moveTriggers:goingAllOutForAttack", { pokemonName: getPokemonNameWithAffix(user) });
}
@@ -3409,9 +3479,9 @@ const doublePowerChanceMessageFunc = (user: Pokemon, target: Pokemon, move: Move
export class DoublePowerChanceAttr extends VariablePowerAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
let rand: integer;
- user.scene.executeWithSeedOffset(() => rand = Utils.randSeedInt(100), user.scene.currentBattle.turn << 6, user.scene.waveSeed);
+ user.scene.executeWithSeedOffset(() => rand = randSeedInt(100), user.scene.currentBattle.turn << 6, user.scene.waveSeed);
if (rand! < move.chance) {
- const power = args[0] as Utils.NumberHolder;
+ const power = args[0] as NumberHolder;
power.value *= 2;
return true;
}
@@ -3459,7 +3529,7 @@ export class ConsecutiveUseMultiBasePowerAttr extends ConsecutiveUsePowerMultipl
export class WeightPowerAttr extends VariablePowerAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
- const power = args[0] as Utils.NumberHolder;
+ const power = args[0] as NumberHolder;
const targetWeight = target.getWeight();
const weightThresholds = [ 10, 25, 50, 100, 200 ];
@@ -3493,7 +3563,7 @@ export class ElectroBallPowerAttr extends VariablePowerAttr {
* @returns true if the function succeeds
*/
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
- const power = args[0] as Utils.NumberHolder;
+ const power = args[0] as NumberHolder;
const statRatio = target.getEffectiveStat(Stat.SPD) / user.getEffectiveStat(Stat.SPD);
const statThresholds = [ 0.25, 1 / 3, 0.5, 1, -1 ];
@@ -3528,7 +3598,7 @@ export class GyroBallPowerAttr extends VariablePowerAttr {
* @returns true if the function succeeds
*/
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
- const power = args[0] as Utils.NumberHolder;
+ const power = args[0] as NumberHolder;
const userSpeed = user.getEffectiveStat(Stat.SPD);
if (userSpeed < 1) {
// Gen 6+ always have 1 base power
@@ -3543,7 +3613,7 @@ export class GyroBallPowerAttr extends VariablePowerAttr {
export class LowHpPowerAttr extends VariablePowerAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
- const power = args[0] as Utils.NumberHolder;
+ const power = args[0] as NumberHolder;
const hpRatio = user.getHpRatio();
switch (true) {
@@ -3573,7 +3643,7 @@ export class LowHpPowerAttr extends VariablePowerAttr {
export class CompareWeightPowerAttr extends VariablePowerAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
- const power = args[0] as Utils.NumberHolder;
+ const power = args[0] as NumberHolder;
const userWeight = user.getWeight();
const targetWeight = target.getWeight();
@@ -3607,7 +3677,7 @@ export class CompareWeightPowerAttr extends VariablePowerAttr {
export class HpPowerAttr extends VariablePowerAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
- (args[0] as Utils.NumberHolder).value = Utils.toDmgValue(150 * user.getHpRatio());
+ (args[0] as NumberHolder).value = toDmgValue(150 * user.getHpRatio());
return true;
}
@@ -3635,7 +3705,7 @@ export class OpponentHighHpPowerAttr extends VariablePowerAttr {
* @returns true
*/
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
- (args[0] as Utils.NumberHolder).value = Utils.toDmgValue(this.maxBasePower * target.getHpRatio());
+ (args[0] as NumberHolder).value = toDmgValue(this.maxBasePower * target.getHpRatio());
return true;
}
@@ -3645,7 +3715,7 @@ export class FirstAttackDoublePowerAttr extends VariablePowerAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
console.log(target.getLastXMoves(1), target.scene.currentBattle.turn);
if (!target.getLastXMoves(1).find(m => m.turn === target.scene.currentBattle.turn)) {
- (args[0] as Utils.NumberHolder).value *= 2;
+ (args[0] as NumberHolder).value *= 2;
return true;
}
@@ -3657,7 +3727,7 @@ export class FirstAttackDoublePowerAttr extends VariablePowerAttr {
export class TurnDamagedDoublePowerAttr extends VariablePowerAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
if (user.turnData.attacksReceived.find(r => r.damage && r.sourceId === target.id)) {
- (args[0] as Utils.NumberHolder).value *= 2;
+ (args[0] as NumberHolder).value *= 2;
return true;
}
@@ -3670,7 +3740,7 @@ const magnitudeMessageFunc = (user: Pokemon, target: Pokemon, move: Move) => {
user.scene.executeWithSeedOffset(() => {
const magnitudeThresholds = [ 5, 15, 35, 65, 75, 95 ];
- const rand = Utils.randSeedInt(100);
+ const rand = randSeedInt(100);
let m = 0;
for (; m < magnitudeThresholds.length; m++) {
@@ -3686,14 +3756,14 @@ const magnitudeMessageFunc = (user: Pokemon, target: Pokemon, move: Move) => {
export class MagnitudePowerAttr extends VariablePowerAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
- const power = args[0] as Utils.NumberHolder;
+ const power = args[0] as NumberHolder;
const magnitudeThresholds = [ 5, 15, 35, 65, 75, 95 ];
const magnitudePowers = [ 10, 30, 50, 70, 90, 100, 110, 150 ];
let rand: integer;
- user.scene.executeWithSeedOffset(() => rand = Utils.randSeedInt(100), user.scene.currentBattle.turn << 6, user.scene.waveSeed);
+ user.scene.executeWithSeedOffset(() => rand = randSeedInt(100), user.scene.currentBattle.turn << 6, user.scene.waveSeed);
let m = 0;
for (; m < magnitudeThresholds.length; m++) {
@@ -3711,7 +3781,7 @@ export class MagnitudePowerAttr extends VariablePowerAttr {
export class AntiSunlightPowerDecreaseAttr extends VariablePowerAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
if (!user.scene.arena.weather?.isEffectSuppressed(user.scene)) {
- const power = args[0] as Utils.NumberHolder;
+ const power = args[0] as NumberHolder;
const weatherType = user.scene.arena.weather?.weatherType || WeatherType.NONE;
switch (weatherType) {
case WeatherType.RAIN:
@@ -3738,7 +3808,7 @@ export class FriendshipPowerAttr extends VariablePowerAttr {
}
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
- const power = args[0] as Utils.NumberHolder;
+ const power = args[0] as NumberHolder;
const friendshipPower = Math.floor(Math.min(user instanceof PlayerPokemon ? user.friendship : user.species.baseFriendship, 255) / 2.5);
power.value = Math.max(!this.invert ? friendshipPower : 102 - friendshipPower, 1);
@@ -3749,7 +3819,7 @@ export class FriendshipPowerAttr extends VariablePowerAttr {
export class HitCountPowerAttr extends VariablePowerAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
- (args[0] as Utils.NumberHolder).value += Math.min(user.battleData.hitCount, 6) * 50;
+ (args[0] as NumberHolder).value += Math.min(user.battleData.hitCount, 6) * 50;
return true;
}
@@ -3779,7 +3849,7 @@ export class PositiveStatStagePowerAttr extends VariablePowerAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
const positiveStatStages: number = countPositiveStatStages(user);
- (args[0] as Utils.NumberHolder).value += positiveStatStages * 20;
+ (args[0] as NumberHolder).value += positiveStatStages * 20;
return true;
}
}
@@ -3802,7 +3872,7 @@ export class PunishmentPowerAttr extends VariablePowerAttr {
*/
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
const positiveStatStages: number = countPositiveStatStages(target);
- (args[0] as Utils.NumberHolder).value = Math.min(
+ (args[0] as NumberHolder).value = Math.min(
this.PUNISHMENT_MAX_BASE_POWER,
this.PUNISHMENT_MIN_BASE_POWER + positiveStatStages * 20
);
@@ -3818,18 +3888,18 @@ export class PresentPowerAttr extends VariablePowerAttr {
*/
const firstHit = (user.turnData.hitCount === user.turnData.hitsLeft);
- const powerSeed = Utils.randSeedInt(firstHit ? 100 : 80);
+ const powerSeed = randSeedInt(firstHit ? 100 : 80);
if (powerSeed <= 40) {
- (args[0] as Utils.NumberHolder).value = 40;
+ (args[0] as NumberHolder).value = 40;
} else if (40 < powerSeed && powerSeed <= 70) {
- (args[0] as Utils.NumberHolder).value = 80;
+ (args[0] as NumberHolder).value = 80;
} else if (70 < powerSeed && powerSeed <= 80) {
- (args[0] as Utils.NumberHolder).value = 120;
+ (args[0] as NumberHolder).value = 120;
} else if (80 < powerSeed && powerSeed <= 100) {
// If this move is multi-hit, disable all other hits
user.stopMultiHit();
target.scene.unshiftPhase(new PokemonHealPhase(target.scene, target.getBattlerIndex(),
- Utils.toDmgValue(target.getMaxHp() / 4), i18next.t("moveTriggers:regainedHealth", { pokemonName: getPokemonNameWithAffix(target) }), true));
+ toDmgValue(target.getMaxHp() / 4), i18next.t("moveTriggers:regainedHealth", { pokemonName: getPokemonNameWithAffix(target) }), true));
}
return true;
@@ -3839,7 +3909,7 @@ export class PresentPowerAttr extends VariablePowerAttr {
export class WaterShurikenPowerAttr extends VariablePowerAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
if (user.species.speciesId === Species.GRENINJA && user.hasAbility(Abilities.BATTLE_BOND) && user.formIndex === 2) {
- (args[0] as Utils.IntegerHolder).value = 20;
+ (args[0] as NumberHolder).value = 20;
return true;
}
return false;
@@ -3861,7 +3931,7 @@ export class SpitUpPowerAttr extends VariablePowerAttr {
const stockpilingTag = user.getTag(StockpilingTag);
if (stockpilingTag && stockpilingTag.stockpiledCount > 0) {
- const power = args[0] as Utils.IntegerHolder;
+ const power = args[0] as NumberHolder;
power.value = this.multiplier * stockpilingTag.stockpiledCount;
return true;
}
@@ -3929,12 +3999,12 @@ export class MultiHitPowerIncrementAttr extends VariablePowerAttr {
* @param user {@linkcode Pokemon} that used the move
* @param target {@linkcode Pokemon} that the move was used on
* @param move {@linkcode Move} with this attribute
- * @param args [0] {@linkcode Utils.NumberHolder} for final calculated power of move
+ * @param args [0] {@linkcode NumberHolder} for final calculated power of move
* @returns true if attribute application succeeds
*/
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
const hitsTotal = user.turnData.hitCount - Math.max(user.turnData.hitsLeft, 0);
- const power = args[0] as Utils.NumberHolder;
+ const power = args[0] as NumberHolder;
power.value = move.power * (1 + hitsTotal % this.maxHits);
@@ -3966,11 +4036,11 @@ export class LastMoveDoublePowerAttr extends VariablePowerAttr {
* @param user {@linkcode Pokemon} that used the move
* @param target N/A
* @param move N/A
- * @param args [0] {@linkcode Utils.NumberHolder} that holds the resulting power of the move
+ * @param args [0] {@linkcode NumberHolder} that holds the resulting power of the move
* @returns true if attribute application succeeds, false otherwise
*/
apply(user: Pokemon, _target: Pokemon, _move: Move, args: any[]): boolean {
- const power = args[0] as Utils.NumberHolder;
+ const power = args[0] as NumberHolder;
const enemy = user.getOpponent(0);
const pokemonActed: Pokemon[] = [];
@@ -4015,7 +4085,7 @@ export class LastMoveDoublePowerAttr extends VariablePowerAttr {
export class CombinedPledgePowerAttr extends VariablePowerAttr {
override apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
const power = args[0];
- if (!(power instanceof Utils.NumberHolder)) {
+ if (!(power instanceof NumberHolder)) {
return false;
}
const combinedPledgeMove = user.turnData.combiningPledge;
@@ -4034,7 +4104,7 @@ export class CombinedPledgePowerAttr extends VariablePowerAttr {
export class CombinedPledgeStabBoostAttr extends MoveAttr {
override apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
const stabMultiplier = args[0];
- if (!(stabMultiplier instanceof Utils.NumberHolder)) {
+ if (!(stabMultiplier instanceof NumberHolder)) {
return false;
}
const combinedPledgeMove = user.turnData.combiningPledge;
@@ -4053,7 +4123,7 @@ export class VariableAtkAttr extends MoveAttr {
}
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
- //const atk = args[0] as Utils.IntegerHolder;
+ //const atk = args[0] as Utils.NumberHolder;
return false;
}
}
@@ -4063,7 +4133,7 @@ export class TargetAtkUserAtkAttr extends VariableAtkAttr {
super();
}
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
- (args[0] as Utils.IntegerHolder).value = target.getEffectiveStat(Stat.ATK, target);
+ (args[0] as NumberHolder).value = target.getEffectiveStat(Stat.ATK, target);
return true;
}
}
@@ -4074,7 +4144,7 @@ export class DefAtkAttr extends VariableAtkAttr {
}
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
- (args[0] as Utils.IntegerHolder).value = user.getEffectiveStat(Stat.DEF, target);
+ (args[0] as NumberHolder).value = user.getEffectiveStat(Stat.DEF, target);
return true;
}
}
@@ -4085,7 +4155,7 @@ export class VariableDefAttr extends MoveAttr {
}
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
- //const def = args[0] as Utils.IntegerHolder;
+ //const def = args[0] as Utils.NumberHolder;
return false;
}
}
@@ -4096,7 +4166,7 @@ export class DefDefAttr extends VariableDefAttr {
}
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
- (args[0] as Utils.IntegerHolder).value = target.getEffectiveStat(Stat.DEF, user);
+ (args[0] as NumberHolder).value = target.getEffectiveStat(Stat.DEF, user);
return true;
}
}
@@ -4114,7 +4184,7 @@ export class VariableAccuracyAttr extends MoveAttr {
export class ThunderAccuracyAttr extends VariableAccuracyAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
if (!user.scene.arena.weather?.isEffectSuppressed(user.scene)) {
- const accuracy = args[0] as Utils.NumberHolder;
+ const accuracy = args[0] as NumberHolder;
const weatherType = user.scene.arena.weather?.weatherType || WeatherType.NONE;
switch (weatherType) {
case WeatherType.SUNNY:
@@ -4140,7 +4210,7 @@ export class ThunderAccuracyAttr extends VariableAccuracyAttr {
export class StormAccuracyAttr extends VariableAccuracyAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
if (!user.scene.arena.weather?.isEffectSuppressed(user.scene)) {
- const accuracy = args[0] as Utils.NumberHolder;
+ const accuracy = args[0] as NumberHolder;
const weatherType = user.scene.arena.weather?.weatherType || WeatherType.NONE;
switch (weatherType) {
case WeatherType.RAIN:
@@ -4171,7 +4241,7 @@ export class AlwaysHitMinimizeAttr extends VariableAccuracyAttr {
*/
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
if (target.getTag(BattlerTagType.MINIMIZED)) {
- const accuracy = args[0] as Utils.NumberHolder;
+ const accuracy = args[0] as NumberHolder;
accuracy.value = -1;
return true;
@@ -4184,7 +4254,7 @@ export class AlwaysHitMinimizeAttr extends VariableAccuracyAttr {
export class ToxicAccuracyAttr extends VariableAccuracyAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
if (user.isOfType(Type.POISON)) {
- const accuracy = args[0] as Utils.NumberHolder;
+ const accuracy = args[0] as NumberHolder;
accuracy.value = -1;
return true;
}
@@ -4196,7 +4266,7 @@ export class ToxicAccuracyAttr extends VariableAccuracyAttr {
export class BlizzardAccuracyAttr extends VariableAccuracyAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
if (!user.scene.arena.weather?.isEffectSuppressed(user.scene)) {
- const accuracy = args[0] as Utils.NumberHolder;
+ const accuracy = args[0] as NumberHolder;
const weatherType = user.scene.arena.weather?.weatherType || WeatherType.NONE;
if (weatherType === WeatherType.HAIL || weatherType === WeatherType.SNOW) {
accuracy.value = -1;
@@ -4216,7 +4286,7 @@ export class VariableMoveCategoryAttr extends MoveAttr {
export class PhotonGeyserCategoryAttr extends VariableMoveCategoryAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
- const category = (args[0] as Utils.NumberHolder);
+ const category = (args[0] as NumberHolder);
if (user.getEffectiveStat(Stat.ATK, target, move) > user.getEffectiveStat(Stat.SPATK, target, move)) {
category.value = MoveCategory.PHYSICAL;
@@ -4236,7 +4306,7 @@ export class PhotonGeyserCategoryAttr extends VariableMoveCategoryAttr {
*/
export class TeraMoveCategoryAttr extends VariableMoveCategoryAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
- const category = (args[0] as Utils.NumberHolder);
+ const category = (args[0] as NumberHolder);
if (user.isTerastallized() && user.getEffectiveStat(Stat.ATK, target, move) > user.getEffectiveStat(Stat.SPATK, target, move)) {
category.value = MoveCategory.PHYSICAL;
@@ -4259,12 +4329,12 @@ export class TeraBlastPowerAttr extends VariablePowerAttr {
* @param target n/a
* @param move {@linkcode Move} the Move with this attribute (i.e. Tera Blast)
* @param args
- * - [0] {@linkcode Utils.NumberHolder} the applied move's power, factoring in
+ * - [0] {@linkcode NumberHolder} the applied move's power, factoring in
* previously applied power modifiers.
* @returns
*/
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
- const power = args[0] as Utils.NumberHolder;
+ const power = args[0] as NumberHolder;
if (user.isTerastallized() && user.getTeraType() === Type.STELLAR) {
power.value = 100;
return true;
@@ -4284,11 +4354,11 @@ export class StatusCategoryOnAllyAttr extends VariableMoveCategoryAttr {
* @param user {@linkcode Pokemon} using the move
* @param target {@linkcode Pokemon} target of the move
* @param move {@linkcode Move} with this attribute
- * @param args [0] {@linkcode Utils.NumberHolder} The category of the move
+ * @param args [0] {@linkcode NumberHolder} The category of the move
* @returns true if the function succeeds
*/
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
- const category = (args[0] as Utils.NumberHolder);
+ const category = (args[0] as NumberHolder);
if (user.getAlly() === target) {
category.value = MoveCategory.STATUS;
@@ -4301,7 +4371,7 @@ export class StatusCategoryOnAllyAttr extends VariableMoveCategoryAttr {
export class ShellSideArmCategoryAttr extends VariableMoveCategoryAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
- const category = (args[0] as Utils.NumberHolder);
+ const category = (args[0] as NumberHolder);
const predictedPhysDmg = target.getBaseDamage(user, move, MoveCategory.PHYSICAL, true, true);
const predictedSpecDmg = target.getBaseDamage(user, move, MoveCategory.SPECIAL, true, true);
@@ -4333,12 +4403,12 @@ export class TeraStarstormTypeAttr extends VariableMoveTypeAttr {
* @param user the {@linkcode Pokemon} using the move
* @param target n/a
* @param move n/a
- * @param args[0] {@linkcode Utils.NumberHolder} the move type
+ * @param args[0] {@linkcode NumberHolder} the move type
* @returns `true` if the move type is changed to {@linkcode Type.STELLAR}, `false` otherwise
*/
override apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
if (user.isTerastallized() && (user.hasFusionSpecies(Species.TERAPAGOS) || user.species.speciesId === Species.TERAPAGOS)) {
- const moveType = args[0] as Utils.NumberHolder;
+ const moveType = args[0] as NumberHolder;
moveType.value = Type.STELLAR;
return true;
@@ -4350,7 +4420,7 @@ export class TeraStarstormTypeAttr extends VariableMoveTypeAttr {
export class FormChangeItemTypeAttr extends VariableMoveTypeAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
const moveType = args[0];
- if (!(moveType instanceof Utils.NumberHolder)) {
+ if (!(moveType instanceof NumberHolder)) {
return false;
}
@@ -4368,7 +4438,7 @@ export class FormChangeItemTypeAttr extends VariableMoveTypeAttr {
export class TechnoBlastTypeAttr extends VariableMoveTypeAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
const moveType = args[0];
- if (!(moveType instanceof Utils.NumberHolder)) {
+ if (!(moveType instanceof NumberHolder)) {
return false;
}
@@ -4402,7 +4472,7 @@ export class TechnoBlastTypeAttr extends VariableMoveTypeAttr {
export class AuraWheelTypeAttr extends VariableMoveTypeAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
const moveType = args[0];
- if (!(moveType instanceof Utils.NumberHolder)) {
+ if (!(moveType instanceof NumberHolder)) {
return false;
}
@@ -4427,7 +4497,7 @@ export class AuraWheelTypeAttr extends VariableMoveTypeAttr {
export class RagingBullTypeAttr extends VariableMoveTypeAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
const moveType = args[0];
- if (!(moveType instanceof Utils.NumberHolder)) {
+ if (!(moveType instanceof NumberHolder)) {
return false;
}
@@ -4455,7 +4525,7 @@ export class RagingBullTypeAttr extends VariableMoveTypeAttr {
export class IvyCudgelTypeAttr extends VariableMoveTypeAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
const moveType = args[0];
- if (!(moveType instanceof Utils.NumberHolder)) {
+ if (!(moveType instanceof NumberHolder)) {
return false;
}
@@ -4490,7 +4560,7 @@ export class IvyCudgelTypeAttr extends VariableMoveTypeAttr {
export class WeatherBallTypeAttr extends VariableMoveTypeAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
const moveType = args[0];
- if (!(moveType instanceof Utils.NumberHolder)) {
+ if (!(moveType instanceof NumberHolder)) {
return false;
}
@@ -4532,12 +4602,12 @@ export class TerrainPulseTypeAttr extends VariableMoveTypeAttr {
* @param user {@linkcode Pokemon} using this move
* @param target N/A
* @param move N/A
- * @param args [0] {@linkcode Utils.NumberHolder} The move's type to be modified
+ * @param args [0] {@linkcode NumberHolder} The move's type to be modified
* @returns true if the function succeeds
*/
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
const moveType = args[0];
- if (!(moveType instanceof Utils.NumberHolder)) {
+ if (!(moveType instanceof NumberHolder)) {
return false;
}
@@ -4573,7 +4643,7 @@ export class TerrainPulseTypeAttr extends VariableMoveTypeAttr {
export class HiddenPowerTypeAttr extends VariableMoveTypeAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
const moveType = args[0];
- if (!(moveType instanceof Utils.NumberHolder)) {
+ if (!(moveType instanceof NumberHolder)) {
return false;
}
@@ -4608,7 +4678,7 @@ export class TeraBlastTypeAttr extends VariableMoveTypeAttr {
*/
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
const moveType = args[0];
- if (!(moveType instanceof Utils.NumberHolder)) {
+ if (!(moveType instanceof NumberHolder)) {
return false;
}
@@ -4624,7 +4694,7 @@ export class TeraBlastTypeAttr extends VariableMoveTypeAttr {
export class MatchUserTypeAttr extends VariableMoveTypeAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
const moveType = args[0];
- if (!(moveType instanceof Utils.NumberHolder)) {
+ if (!(moveType instanceof NumberHolder)) {
return false;
}
const userTypes = user.getTypes(true);
@@ -4650,7 +4720,7 @@ export class MatchUserTypeAttr extends VariableMoveTypeAttr {
export class CombinedPledgeTypeAttr extends VariableMoveTypeAttr {
override apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
const moveType = args[0];
- if (!(moveType instanceof Utils.NumberHolder)) {
+ if (!(moveType instanceof NumberHolder)) {
return false;
}
@@ -4693,7 +4763,7 @@ export class VariableMoveTypeMultiplierAttr extends MoveAttr {
export class NeutralDamageAgainstFlyingTypeMultiplierAttr extends VariableMoveTypeMultiplierAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
if (!target.getTag(BattlerTagType.IGNORE_FLYING)) {
- const multiplier = args[0] as Utils.NumberHolder;
+ const multiplier = args[0] as NumberHolder;
//When a flying type is hit, the first hit is always 1x multiplier.
if (target.isOfType(Type.FLYING)) {
multiplier.value = 1;
@@ -4707,9 +4777,9 @@ export class NeutralDamageAgainstFlyingTypeMultiplierAttr extends VariableMoveTy
export class WaterSuperEffectTypeMultiplierAttr extends VariableMoveTypeMultiplierAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
- const multiplier = args[0] as Utils.NumberHolder;
+ const multiplier = args[0] as NumberHolder;
if (target.isOfType(Type.WATER)) {
- const effectivenessAgainstWater = new Utils.NumberHolder(getTypeDamageMultiplier(move.type, Type.WATER));
+ const effectivenessAgainstWater = new NumberHolder(getTypeDamageMultiplier(move.type, Type.WATER));
applyChallenges(user.scene.gameMode, ChallengeType.TYPE_EFFECTIVENESS, effectivenessAgainstWater);
if (effectivenessAgainstWater.value !== 0) {
multiplier.value *= 2 / effectivenessAgainstWater.value;
@@ -4727,11 +4797,11 @@ export class IceNoEffectTypeAttr extends VariableMoveTypeMultiplierAttr {
* @param user n/a
* @param target The {@linkcode Pokemon} targeted by the move
* @param move n/a
- * @param args `[0]` a {@linkcode Utils.NumberHolder | NumberHolder} containing a type effectiveness multiplier
+ * @param args `[0]` a {@linkcode NumberHolder | NumberHolder} containing a type effectiveness multiplier
* @returns `true` if this Ice-type immunity applies; `false` otherwise
*/
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
- const multiplier = args[0] as Utils.NumberHolder;
+ const multiplier = args[0] as NumberHolder;
if (target.isOfType(Type.ICE)) {
multiplier.value = 0;
return true;
@@ -4742,7 +4812,7 @@ export class IceNoEffectTypeAttr extends VariableMoveTypeMultiplierAttr {
export class FlyingTypeMultiplierAttr extends VariableMoveTypeMultiplierAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
- const multiplier = args[0] as Utils.NumberHolder;
+ const multiplier = args[0] as NumberHolder;
multiplier.value *= target.getAttackTypeEffectiveness(Type.FLYING, user);
return true;
}
@@ -4750,7 +4820,7 @@ export class FlyingTypeMultiplierAttr extends VariableMoveTypeMultiplierAttr {
export class OneHitKOAccuracyAttr extends VariableAccuracyAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
- const accuracy = args[0] as Utils.NumberHolder;
+ const accuracy = args[0] as NumberHolder;
if (user.level < target.level) {
accuracy.value = 0;
} else {
@@ -4772,7 +4842,7 @@ export class SheerColdAccuracyAttr extends OneHitKOAccuracyAttr {
* @returns Returns true if move is successful, false if misses.
*/
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
- const accuracy = args[0] as Utils.NumberHolder;
+ const accuracy = args[0] as NumberHolder;
if (user.level < target.level) {
accuracy.value = 0;
} else {
@@ -4814,15 +4884,15 @@ export class NoEffectAttr extends MoveAttr {
}
const crashDamageFunc = (user: Pokemon, move: Move) => {
- const cancelled = new Utils.BooleanHolder(false);
+ const cancelled = new BooleanHolder(false);
applyAbAttrs(BlockNonDirectDamageAbAttr, user, cancelled);
if (cancelled.value) {
return false;
}
- user.damageAndUpdate(Utils.toDmgValue(user.getMaxHp() / 2), HitResult.OTHER, false, true);
+ user.damageAndUpdate(toDmgValue(user.getMaxHp() / 2), HitResult.OTHER, false, true);
user.scene.queueMessage(i18next.t("moveTriggers:keptGoingAndCrashed", { pokemonName: getPokemonNameWithAffix(user) }));
- user.turnData.damageTaken += Utils.toDmgValue(user.getMaxHp() / 2);
+ user.turnData.damageTaken += toDmgValue(user.getMaxHp() / 2);
return true;
};
@@ -5592,7 +5662,7 @@ export class RevivalBlessingAttr extends MoveEffectAttr {
const pokemon = faintedPokemon[user.randSeedInt(faintedPokemon.length)];
const slotIndex = user.scene.getEnemyParty().findIndex(p => pokemon.id === p.id);
pokemon.resetStatus();
- pokemon.heal(Math.min(Utils.toDmgValue(0.5 * pokemon.getMaxHp()), pokemon.getMaxHp()));
+ pokemon.heal(Math.min(toDmgValue(0.5 * pokemon.getMaxHp()), pokemon.getMaxHp()));
user.scene.queueMessage(i18next.t("moveTriggers:revivalBlessing", { pokemonName: getPokemonNameWithAffix(pokemon) }), 0, true);
if (user.scene.currentBattle.double && user.scene.getEnemyParty().length > 1) {
@@ -5702,8 +5772,8 @@ export class ForceSwitchOutAttr extends MoveEffectAttr {
return (user, target, move) => (move.category !== MoveCategory.STATUS || this.getSwitchOutCondition()(user, target, move));
}
- getFailedText(user: Pokemon, target: Pokemon, move: Move, cancelled: Utils.BooleanHolder): string | null {
- const blockedByAbility = new Utils.BooleanHolder(false);
+ getFailedText(user: Pokemon, target: Pokemon, move: Move, cancelled: BooleanHolder): string | null {
+ const blockedByAbility = new BooleanHolder(false);
applyAbAttrs(ForceSwitchOutImmunityAbAttr, target, blockedByAbility);
return blockedByAbility.value ? i18next.t("moveTriggers:cannotBeSwitchedOut", { pokemonName: getPokemonNameWithAffix(target) }) : null;
}
@@ -5723,7 +5793,7 @@ export class ForceSwitchOutAttr extends MoveEffectAttr {
return false;
}
- const blockedByAbility = new Utils.BooleanHolder(false);
+ const blockedByAbility = new BooleanHolder(false);
applyAbAttrs(ForceSwitchOutImmunityAbAttr, target, blockedByAbility);
return !blockedByAbility.value;
}
@@ -5965,7 +6035,7 @@ export class RandomMovesetMoveAttr extends OverrideMoveEffectAttr {
export class RandomMoveAttr extends OverrideMoveEffectAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): Promise<boolean> {
return new Promise(resolve => {
- const moveIds = Utils.getEnumValues(Moves).filter(m => !allMoves[m].hasFlag(MoveFlags.IGNORE_VIRTUAL) && !allMoves[m].name.endsWith(" (N)"));
+ const moveIds = getEnumValues(Moves).filter(m => !allMoves[m].hasFlag(MoveFlags.IGNORE_VIRTUAL) && !allMoves[m].name.endsWith(" (N)"));
const moveId = moveIds[user.randSeedInt(moveIds.length)];
const moveTargets = getMoveTargets(user, moveId);
@@ -6913,7 +6983,7 @@ export class VariableTargetAttr extends MoveAttr {
}
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
- const targetVal = args[0] as Utils.NumberHolder;
+ const targetVal = args[0] as NumberHolder;
targetVal.value = this.targetChangeFunc(user, target, move);
return true;
}
@@ -6954,7 +7024,7 @@ const failOnBossCondition: MoveConditionFunc = (user, target, move) => !target.i
const failIfSingleBattle: MoveConditionFunc = (user, target, move) => user.scene.currentBattle.double;
const failIfDampCondition: MoveConditionFunc = (user, target, move) => {
- const cancelled = new Utils.BooleanHolder(false);
+ const cancelled = new BooleanHolder(false);
user.scene.getField(true).map(p=>applyAbAttrs(FieldPreventExplosiveMovesAbAttr, p, cancelled));
// Queue a message if an ability prevented usage of the move
if (cancelled.value) {
@@ -7021,7 +7091,7 @@ export class FirstMoveCondition extends MoveCondition {
export class hitsSameTypeAttr extends VariableMoveTypeMultiplierAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
- const multiplier = args[0] as Utils.NumberHolder;
+ const multiplier = args[0] as NumberHolder;
if (!user.getTypes().some(type => target.getTypes().includes(type))) {
multiplier.value = 0;
return true;
@@ -7072,7 +7142,7 @@ export class ResistLastMoveTypeAttr extends MoveEffectAttr {
}
const type = validTypes[user.randSeedInt(validTypes.length)];
user.summonData.types = [ type ];
- user.scene.queueMessage(i18next.t("battle:transformedIntoType", { pokemonName: getPokemonNameWithAffix(user), type: Utils.toReadableString(Type[type]) }));
+ user.scene.queueMessage(i18next.t("battle:transformedIntoType", { pokemonName: getPokemonNameWithAffix(user), type: toReadableString(Type[type]) }));
user.updateInfo();
return true;
@@ -7146,7 +7216,7 @@ export type MoveTargetSet = {
};
export function getMoveTargets(user: Pokemon, move: Moves): MoveTargetSet {
- const variableTarget = new Utils.NumberHolder(0);
+ const variableTarget = new NumberHolder(0);
user.getOpponents().forEach(p => applyMoveAttrs(VariableTargetAttr, user, p, allMoves[move], variableTarget));
const moveTarget = allMoves[move].hasAttr(VariableTargetAttr) ? variableTarget.value : move ? allMoves[move].moveTarget : move === undefined ? MoveTarget.NEAR_ENEMY : [];
@@ -8583,7 +8653,7 @@ export function initMoves() {
.condition(failOnGravityCondition)
.condition((_user, target, _move) => ![ Species.DIGLETT, Species.DUGTRIO, Species.ALOLA_DIGLETT, Species.ALOLA_DUGTRIO, Species.SANDYGAST, Species.PALOSSAND, Species.WIGLETT, Species.WUGTRIO ].includes(target.species.speciesId))
.condition((_user, target, _move) => !(target.species.speciesId === Species.GENGAR && target.getFormKey() === "mega"))
- .condition((_user, target, _move) => Utils.isNullOrUndefined(target.getTag(BattlerTagType.INGRAIN)) && Utils.isNullOrUndefined(target.getTag(BattlerTagType.IGNORE_FLYING)))
+ .condition((_user, target, _move) => isNullOrUndefined(target.getTag(BattlerTagType.INGRAIN)) && isNullOrUndefined(target.getTag(BattlerTagType.IGNORE_FLYING)))
.attr(AddBattlerTagAttr, BattlerTagType.TELEKINESIS, false, true, 3)
.attr(AddBattlerTagAttr, BattlerTagType.FLOATING, false, true, 3),
new StatusMove(Moves.MAGIC_ROOM, Type.PSYCHIC, -1, 10, -1, 0, 5)
diff --git a/src/data/mystery-encounters/encounters/a-trainers-test-encounter.ts b/src/data/mystery-encounters/encounters/a-trainers-test-encounter.ts
index f0155b4f2a44..96824f5097d9 100644
--- a/src/data/mystery-encounters/encounters/a-trainers-test-encounter.ts
+++ b/src/data/mystery-encounters/encounters/a-trainers-test-encounter.ts
@@ -1,18 +1,18 @@
-import { EnemyPartyConfig, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, setEncounterRewards, transitionMysteryEncounterIntroVisuals, } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import { EnemyPartyConfig, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, setEncounterRewards, transitionMysteryEncounterIntroVisuals, } from "#mystery-encounters/utils/encounter-phase-utils";
import { trainerConfigs, } from "#app/data/trainer-config";
import { MysteryEncounterType } from "#enums/mystery-encounter-type";
import BattleScene from "#app/battle-scene";
-import MysteryEncounter, { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";
+import MysteryEncounter, { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { TrainerType } from "#enums/trainer-type";
import { Species } from "#enums/species";
-import { getSpriteKeysFromSpecies } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
+import { getSpriteKeysFromSpecies } from "#mystery-encounters/utils/encounter-pokemon-utils";
import { randSeedInt } from "#app/utils";
import i18next from "i18next";
import { IEggOptions } from "#app/data/egg";
import { EggSourceType } from "#enums/egg-source-types";
import { EggTier } from "#enums/egg-type";
-import { PartyHealPhase } from "#app/phases/party-heal-phase";
+import { PartyHealPhase } from "#phases/party-heal-phase";
import { ModifierTier } from "#app/modifier/modifier-tier";
import { modifierTypes } from "#app/modifier/modifier-type";
import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
diff --git a/src/data/mystery-encounters/encounters/absolute-avarice-encounter.ts b/src/data/mystery-encounters/encounters/absolute-avarice-encounter.ts
index c53b802bb22f..714f4a25e221 100644
--- a/src/data/mystery-encounters/encounters/absolute-avarice-encounter.ts
+++ b/src/data/mystery-encounters/encounters/absolute-avarice-encounter.ts
@@ -1,13 +1,13 @@
-import { EnemyPartyConfig, generateModifierType, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, setEncounterRewards, transitionMysteryEncounterIntroVisuals, } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import { EnemyPartyConfig, generateModifierType, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, setEncounterRewards, transitionMysteryEncounterIntroVisuals, } from "#mystery-encounters/utils/encounter-phase-utils";
import Pokemon, { EnemyPokemon, PokemonMove } from "#app/field/pokemon";
import { BerryModifierType, modifierTypes, PokemonHeldItemModifierType } from "#app/modifier/modifier-type";
import { MysteryEncounterType } from "#enums/mystery-encounter-type";
import { Species } from "#enums/species";
import BattleScene from "#app/battle-scene";
-import MysteryEncounter, { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";
-import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
-import { PersistentModifierRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements";
-import { queueEncounterMessage } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
+import MysteryEncounter, { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter";
+import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option";
+import { PersistentModifierRequirement } from "#mystery-encounters/mystery-encounter-requirements";
+import { queueEncounterMessage } from "#mystery-encounters/utils/encounter-dialogue-utils";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
import { BerryModifier, PokemonInstantReviveModifier } from "#app/modifier/modifier";
@@ -16,12 +16,12 @@ import { Moves } from "#enums/moves";
import { BattlerTagType } from "#enums/battler-tag-type";
import { randInt } from "#app/utils";
import { BattlerIndex } from "#app/battle";
-import { applyModifierTypeToPlayerPokemon, catchPokemon, getHighestLevelPlayerPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
+import { applyModifierTypeToPlayerPokemon, catchPokemon, getHighestLevelPlayerPokemon } from "#mystery-encounters/utils/encounter-pokemon-utils";
import { TrainerSlot } from "#app/data/trainer-config";
import { PokeballType } from "#app/data/pokeball";
import HeldModifierConfig from "#app/interfaces/held-modifier-config";
import { BerryType } from "#enums/berry-type";
-import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
+import { StatStageChangePhase } from "#phases/stat-stage-change-phase";
import { Stat } from "#enums/stat";
import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
import i18next from "i18next";
diff --git a/src/data/mystery-encounters/encounters/an-offer-you-cant-refuse-encounter.ts b/src/data/mystery-encounters/encounters/an-offer-you-cant-refuse-encounter.ts
index 8dc4eca25bf6..9e23db912577 100644
--- a/src/data/mystery-encounters/encounters/an-offer-you-cant-refuse-encounter.ts
+++ b/src/data/mystery-encounters/encounters/an-offer-you-cant-refuse-encounter.ts
@@ -1,18 +1,18 @@
-import { leaveEncounterWithoutBattle, setEncounterExp, updatePlayerMoney, } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import { leaveEncounterWithoutBattle, setEncounterExp, updatePlayerMoney, } from "#mystery-encounters/utils/encounter-phase-utils";
import { modifierTypes } from "#app/modifier/modifier-type";
import { MysteryEncounterType } from "#enums/mystery-encounter-type";
import { Species } from "#enums/species";
import BattleScene from "#app/battle-scene";
-import MysteryEncounter, { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";
-import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
-import { AbilityRequirement, CombinationPokemonRequirement, MoveRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements";
-import { getHighestStatTotalPlayerPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
-import { EXTORTION_ABILITIES, EXTORTION_MOVES } from "#app/data/mystery-encounters/requirements/requirement-groups";
+import MysteryEncounter, { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter";
+import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option";
+import { AbilityRequirement, CombinationPokemonRequirement, MoveRequirement } from "#mystery-encounters/mystery-encounter-requirements";
+import { getHighestStatTotalPlayerPokemon } from "#mystery-encounters/utils/encounter-pokemon-utils";
+import { EXTORTION_ABILITIES, EXTORTION_MOVES } from "#mystery-encounters/requirements/requirement-groups";
import { getPokemonSpecies } from "#app/data/pokemon-species";
-import { speciesStarterCosts } from "#app/data/balance/starters";
+import { speciesStarterCosts } from "#balance/starters";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
-import { ModifierRewardPhase } from "#app/phases/modifier-reward-phase";
+import { ModifierRewardPhase } from "#phases/modifier-reward-phase";
import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
/** the i18n namespace for this encounter */
diff --git a/src/data/mystery-encounters/encounters/berries-abound-encounter.ts b/src/data/mystery-encounters/encounters/berries-abound-encounter.ts
index 095f8a8473b9..0ef02e8b5d18 100644
--- a/src/data/mystery-encounters/encounters/berries-abound-encounter.ts
+++ b/src/data/mystery-encounters/encounters/berries-abound-encounter.ts
@@ -1,10 +1,10 @@
-import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
+import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option";
import {
EnemyPartyConfig, generateModifierType, generateModifierTypeOption,
initBattleWithEnemyConfig,
leaveEncounterWithoutBattle, setEncounterExp,
setEncounterRewards
-} from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+} from "#mystery-encounters/utils/encounter-phase-utils";
import Pokemon, { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon";
import {
BerryModifierType,
@@ -17,19 +17,19 @@ import { randSeedInt } from "#app/utils";
import { BattlerTagType } from "#enums/battler-tag-type";
import { MysteryEncounterType } from "#enums/mystery-encounter-type";
import BattleScene from "#app/battle-scene";
-import MysteryEncounter, { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";
-import { queueEncounterMessage, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
+import MysteryEncounter, { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter";
+import { queueEncounterMessage, showEncounterText } from "#mystery-encounters/utils/encounter-dialogue-utils";
import { getPokemonNameWithAffix } from "#app/messages";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
import { TrainerSlot } from "#app/data/trainer-config";
-import { applyModifierTypeToPlayerPokemon, getEncounterPokemonLevelForWave, getHighestStatPlayerPokemon, getSpriteKeysFromPokemon, STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
+import { applyModifierTypeToPlayerPokemon, getEncounterPokemonLevelForWave, getHighestStatPlayerPokemon, getSpriteKeysFromPokemon, STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER } from "#mystery-encounters/utils/encounter-pokemon-utils";
import PokemonData from "#app/system/pokemon-data";
import { BerryModifier } from "#app/modifier/modifier";
import i18next from "#app/plugins/i18n";
import { BerryType } from "#enums/berry-type";
import { PERMANENT_STATS, Stat } from "#enums/stat";
-import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
+import { StatStageChangePhase } from "#phases/stat-stage-change-phase";
import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
/** the i18n namespace for the encounter */
diff --git a/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts b/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts
index d316ab14cde4..8908a82c69dc 100644
--- a/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts
+++ b/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts
@@ -7,7 +7,7 @@ import {
selectPokemonForOption,
setEncounterRewards,
transitionMysteryEncounterIntroVisuals,
-} from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+} from "#mystery-encounters/utils/encounter-phase-utils";
import {
getRandomPartyMemberFunc,
trainerConfigs,
@@ -19,23 +19,23 @@ import { MysteryEncounterType } from "#enums/mystery-encounter-type";
import { PartyMemberStrength } from "#enums/party-member-strength";
import BattleScene from "#app/battle-scene";
import { isNullOrUndefined, randSeedInt, randSeedShuffle } from "#app/utils";
-import MysteryEncounter, { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";
+import MysteryEncounter, { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { TrainerType } from "#enums/trainer-type";
import { Species } from "#enums/species";
import Pokemon, { PlayerPokemon, PokemonMove } from "#app/field/pokemon";
-import { getEncounterText, showEncounterDialogue } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
-import { LearnMovePhase } from "#app/phases/learn-move-phase";
+import { getEncounterText, showEncounterDialogue } from "#mystery-encounters/utils/encounter-dialogue-utils";
+import { LearnMovePhase } from "#phases/learn-move-phase";
import { Moves } from "#enums/moves";
import { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler";
-import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
+import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
import {
AttackTypeBoosterHeldItemTypeRequirement,
CombinationPokemonRequirement,
HeldItemRequirement,
TypeRequirement
-} from "#app/data/mystery-encounters/mystery-encounter-requirements";
+} from "#mystery-encounters/mystery-encounter-requirements";
import { Type } from "#app/data/type";
import { AttackTypeBoosterModifierType, ModifierTypeOption, modifierTypes } from "#app/modifier/modifier-type";
import {
@@ -51,7 +51,7 @@ import MoveInfoOverlay from "#app/ui/move-info-overlay";
import { allMoves } from "#app/data/move";
import { ModifierTier } from "#app/modifier/modifier-tier";
import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
-import { getSpriteKeysFromSpecies } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
+import { getSpriteKeysFromSpecies } from "#mystery-encounters/utils/encounter-pokemon-utils";
/** the i18n namespace for the encounter */
const namespace = "mysteryEncounters/bugTypeSuperfan";
diff --git a/src/data/mystery-encounters/encounters/clowning-around-encounter.ts b/src/data/mystery-encounters/encounters/clowning-around-encounter.ts
index 57c8aa7a561e..45546f7b50f5 100644
--- a/src/data/mystery-encounters/encounters/clowning-around-encounter.ts
+++ b/src/data/mystery-encounters/encounters/clowning-around-encounter.ts
@@ -1,22 +1,22 @@
-import { EnemyPartyConfig, generateModifierType, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, loadCustomMovesForEncounter, selectPokemonForOption, setEncounterRewards, transitionMysteryEncounterIntroVisuals } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import { EnemyPartyConfig, generateModifierType, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, loadCustomMovesForEncounter, selectPokemonForOption, setEncounterRewards, transitionMysteryEncounterIntroVisuals } from "#mystery-encounters/utils/encounter-phase-utils";
import { trainerConfigs, TrainerPartyCompoundTemplate, TrainerPartyTemplate, } from "#app/data/trainer-config";
import { ModifierTier } from "#app/modifier/modifier-tier";
import { modifierTypes, PokemonHeldItemModifierType } from "#app/modifier/modifier-type";
import { MysteryEncounterType } from "#enums/mystery-encounter-type";
import { PartyMemberStrength } from "#enums/party-member-strength";
import BattleScene from "#app/battle-scene";
-import MysteryEncounter, { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";
+import MysteryEncounter, { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { Species } from "#enums/species";
import { TrainerType } from "#enums/trainer-type";
import { getPokemonSpecies } from "#app/data/pokemon-species";
import { Abilities } from "#enums/abilities";
-import { applyModifierTypeToPlayerPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
+import { applyModifierTypeToPlayerPokemon } from "#mystery-encounters/utils/encounter-pokemon-utils";
import { Type } from "#app/data/type";
-import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
+import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
import { randSeedInt, randSeedShuffle } from "#app/utils";
-import { showEncounterDialogue, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
+import { showEncounterDialogue, showEncounterText } from "#mystery-encounters/utils/encounter-dialogue-utils";
import { Mode } from "#app/ui/ui";
import i18next from "i18next";
import { OptionSelectConfig } from "#app/ui/abstact-option-select-ui-handler";
diff --git a/src/data/mystery-encounters/encounters/dancing-lessons-encounter.ts b/src/data/mystery-encounters/encounters/dancing-lessons-encounter.ts
index 55d7ce0e92d8..06ae2bc44ed8 100644
--- a/src/data/mystery-encounters/encounters/dancing-lessons-encounter.ts
+++ b/src/data/mystery-encounters/encounters/dancing-lessons-encounter.ts
@@ -1,10 +1,10 @@
-import { EnemyPartyConfig, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, selectPokemonForOption, setEncounterRewards } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import { EnemyPartyConfig, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, selectPokemonForOption, setEncounterRewards } from "#mystery-encounters/utils/encounter-phase-utils";
import Pokemon, { EnemyPokemon, PlayerPokemon, PokemonMove } from "#app/field/pokemon";
import { MysteryEncounterType } from "#enums/mystery-encounter-type";
import { Species } from "#enums/species";
import BattleScene from "#app/battle-scene";
-import MysteryEncounter, { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";
-import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
+import MysteryEncounter, { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter";
+import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
import { getPokemonSpecies } from "#app/data/pokemon-species";
@@ -14,16 +14,16 @@ import PokemonData from "#app/system/pokemon-data";
import { Biome } from "#enums/biome";
import { EncounterBattleAnim } from "#app/data/battle-anims";
import { BattlerTagType } from "#enums/battler-tag-type";
-import { getEncounterText, queueEncounterMessage } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
-import { MoveRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements";
-import { DANCING_MOVES } from "#app/data/mystery-encounters/requirements/requirement-groups";
+import { getEncounterText, queueEncounterMessage } from "#mystery-encounters/utils/encounter-dialogue-utils";
+import { MoveRequirement } from "#mystery-encounters/mystery-encounter-requirements";
+import { DANCING_MOVES } from "#mystery-encounters/requirements/requirement-groups";
import { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler";
import { BattlerIndex } from "#app/battle";
-import { catchPokemon, getEncounterPokemonLevelForWave, STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
+import { catchPokemon, getEncounterPokemonLevelForWave, STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER } from "#mystery-encounters/utils/encounter-pokemon-utils";
import { PokeballType } from "#enums/pokeball";
import { modifierTypes } from "#app/modifier/modifier-type";
-import { LearnMovePhase } from "#app/phases/learn-move-phase";
-import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
+import { LearnMovePhase } from "#phases/learn-move-phase";
+import { StatStageChangePhase } from "#phases/stat-stage-change-phase";
import { Stat } from "#enums/stat";
import { EncounterAnim } from "#enums/encounter-anims";
import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
diff --git a/src/data/mystery-encounters/encounters/dark-deal-encounter.ts b/src/data/mystery-encounters/encounters/dark-deal-encounter.ts
index 7f199b5487c7..ab6ad89d6307 100644
--- a/src/data/mystery-encounters/encounters/dark-deal-encounter.ts
+++ b/src/data/mystery-encounters/encounters/dark-deal-encounter.ts
@@ -5,13 +5,13 @@ import { Species } from "#enums/species";
import BattleScene from "#app/battle-scene";
import { modifierTypes } from "#app/modifier/modifier-type";
import { getPokemonSpecies } from "#app/data/pokemon-species";
-import MysteryEncounter, { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";
-import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
+import MysteryEncounter, { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter";
+import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option";
import { EnemyPartyConfig, EnemyPokemonConfig, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, } from "../utils/encounter-phase-utils";
-import { getRandomPlayerPokemon, getRandomSpeciesByStarterTier } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
+import { getRandomPlayerPokemon, getRandomSpeciesByStarterTier } from "#mystery-encounters/utils/encounter-pokemon-utils";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
-import { ModifierRewardPhase } from "#app/phases/modifier-reward-phase";
+import { ModifierRewardPhase } from "#phases/modifier-reward-phase";
import { PokemonFormChangeItemModifier, PokemonHeldItemModifier } from "#app/modifier/modifier";
import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
diff --git a/src/data/mystery-encounters/encounters/delibirdy-encounter.ts b/src/data/mystery-encounters/encounters/delibirdy-encounter.ts
index 5686d0f6ce58..06ef8b806534 100644
--- a/src/data/mystery-encounters/encounters/delibirdy-encounter.ts
+++ b/src/data/mystery-encounters/encounters/delibirdy-encounter.ts
@@ -1,20 +1,20 @@
-import { generateModifierType, leaveEncounterWithoutBattle, selectPokemonForOption, updatePlayerMoney, } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import { generateModifierType, leaveEncounterWithoutBattle, selectPokemonForOption, updatePlayerMoney, } from "#mystery-encounters/utils/encounter-phase-utils";
import Pokemon, { PlayerPokemon } from "#app/field/pokemon";
import { modifierTypes, PokemonHeldItemModifierType } from "#app/modifier/modifier-type";
import { MysteryEncounterType } from "#enums/mystery-encounter-type";
import { Species } from "#enums/species";
import BattleScene from "#app/battle-scene";
-import MysteryEncounter, { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";
-import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
-import { CombinationPokemonRequirement, HeldItemRequirement, MoneyRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements";
-import { getEncounterText, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
+import MysteryEncounter, { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter";
+import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option";
+import { CombinationPokemonRequirement, HeldItemRequirement, MoneyRequirement } from "#mystery-encounters/mystery-encounter-requirements";
+import { getEncounterText, showEncounterText } from "#mystery-encounters/utils/encounter-dialogue-utils";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
import { BerryModifier, HealingBoosterModifier, LevelIncrementBoosterModifier, MoneyMultiplierModifier, PokemonHeldItemModifier, PreserveBerryModifier } from "#app/modifier/modifier";
import { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler";
-import { applyModifierTypeToPlayerPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
+import { applyModifierTypeToPlayerPokemon } from "#mystery-encounters/utils/encounter-pokemon-utils";
import i18next from "#app/plugins/i18n";
-import { ModifierRewardPhase } from "#app/phases/modifier-reward-phase";
+import { ModifierRewardPhase } from "#phases/modifier-reward-phase";
import { getPokemonSpecies } from "#app/data/pokemon-species";
import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
diff --git a/src/data/mystery-encounters/encounters/department-store-sale-encounter.ts b/src/data/mystery-encounters/encounters/department-store-sale-encounter.ts
index 10034d192638..22a8a129b336 100644
--- a/src/data/mystery-encounters/encounters/department-store-sale-encounter.ts
+++ b/src/data/mystery-encounters/encounters/department-store-sale-encounter.ts
@@ -1,7 +1,7 @@
import {
leaveEncounterWithoutBattle,
setEncounterRewards,
-} from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+} from "#mystery-encounters/utils/encounter-phase-utils";
import { ModifierTypeFunc, modifierTypes } from "#app/modifier/modifier-type";
import { randSeedInt } from "#app/utils";
import { MysteryEncounterType } from "#enums/mystery-encounter-type";
@@ -9,7 +9,7 @@ import { Species } from "#enums/species";
import BattleScene from "#app/battle-scene";
import MysteryEncounter, {
MysteryEncounterBuilder,
-} from "#app/data/mystery-encounters/mystery-encounter";
+} from "#mystery-encounters/mystery-encounter";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
diff --git a/src/data/mystery-encounters/encounters/field-trip-encounter.ts b/src/data/mystery-encounters/encounters/field-trip-encounter.ts
index bf5fb28163b5..5285c4317581 100644
--- a/src/data/mystery-encounters/encounters/field-trip-encounter.ts
+++ b/src/data/mystery-encounters/encounters/field-trip-encounter.ts
@@ -1,12 +1,12 @@
import { MoveCategory } from "#app/data/move";
-import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
-import { generateModifierTypeOption, leaveEncounterWithoutBattle, selectPokemonForOption, setEncounterExp, setEncounterRewards } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option";
+import { generateModifierTypeOption, leaveEncounterWithoutBattle, selectPokemonForOption, setEncounterExp, setEncounterRewards } from "#mystery-encounters/utils/encounter-phase-utils";
import { PlayerPokemon, PokemonMove } from "#app/field/pokemon";
import { modifierTypes } from "#app/modifier/modifier-type";
import { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler";
import { MysteryEncounterType } from "#enums/mystery-encounter-type";
import BattleScene from "#app/battle-scene";
-import MysteryEncounter, { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";
+import MysteryEncounter, { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
import { Stat } from "#enums/stat";
diff --git a/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts b/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts
index d306206159a5..32b9ccf854dd 100644
--- a/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts
+++ b/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts
@@ -1,10 +1,10 @@
-import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
-import { EnemyPartyConfig, initBattleWithEnemyConfig, loadCustomMovesForEncounter, leaveEncounterWithoutBattle, setEncounterExp, setEncounterRewards, transitionMysteryEncounterIntroVisuals, generateModifierType } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option";
+import { EnemyPartyConfig, initBattleWithEnemyConfig, loadCustomMovesForEncounter, leaveEncounterWithoutBattle, setEncounterExp, setEncounterRewards, transitionMysteryEncounterIntroVisuals, generateModifierType } from "#mystery-encounters/utils/encounter-phase-utils";
import { AttackTypeBoosterModifierType, modifierTypes, } from "#app/modifier/modifier-type";
import { MysteryEncounterType } from "#enums/mystery-encounter-type";
import BattleScene from "#app/battle-scene";
-import MysteryEncounter, { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";
-import { TypeRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements";
+import MysteryEncounter, { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter";
+import { TypeRequirement } from "#mystery-encounters/mystery-encounter-requirements";
import { Species } from "#enums/species";
import { getPokemonSpecies } from "#app/data/pokemon-species";
import { Gender } from "#app/data/gender";
@@ -16,8 +16,8 @@ import { EncounterBattleAnim } from "#app/data/battle-anims";
import { WeatherType } from "#app/data/weather";
import { isNullOrUndefined, randSeedInt } from "#app/utils";
import { StatusEffect } from "#app/data/status-effect";
-import { queueEncounterMessage } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
-import { applyDamageToPokemon, applyModifierTypeToPlayerPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
+import { queueEncounterMessage } from "#mystery-encounters/utils/encounter-dialogue-utils";
+import { applyDamageToPokemon, applyModifierTypeToPlayerPokemon } from "#mystery-encounters/utils/encounter-pokemon-utils";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
import { EncounterAnim } from "#enums/encounter-anims";
diff --git a/src/data/mystery-encounters/encounters/fight-or-flight-encounter.ts b/src/data/mystery-encounters/encounters/fight-or-flight-encounter.ts
index 889868519d29..f4e60bc0bc25 100644
--- a/src/data/mystery-encounters/encounters/fight-or-flight-encounter.ts
+++ b/src/data/mystery-encounters/encounters/fight-or-flight-encounter.ts
@@ -1,11 +1,11 @@
-import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
+import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option";
import {
EnemyPartyConfig,
initBattleWithEnemyConfig,
leaveEncounterWithoutBattle, setEncounterExp,
setEncounterRewards
-} from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import { STEALING_MOVES } from "#app/data/mystery-encounters/requirements/requirement-groups";
+} from "#mystery-encounters/utils/encounter-phase-utils";
+import { STEALING_MOVES } from "#mystery-encounters/requirements/requirement-groups";
import Pokemon, { EnemyPokemon } from "#app/field/pokemon";
import { ModifierTier } from "#app/modifier/modifier-tier";
import {
@@ -17,17 +17,17 @@ import {
} from "#app/modifier/modifier-type";
import { MysteryEncounterType } from "#enums/mystery-encounter-type";
import BattleScene from "#app/battle-scene";
-import MysteryEncounter, { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";
-import { MoveRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements";
+import MysteryEncounter, { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter";
+import { MoveRequirement } from "#mystery-encounters/mystery-encounter-requirements";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
import { TrainerSlot } from "#app/data/trainer-config";
-import { getEncounterPokemonLevelForWave, getSpriteKeysFromPokemon, STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
+import { getEncounterPokemonLevelForWave, getSpriteKeysFromPokemon, STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER } from "#mystery-encounters/utils/encounter-pokemon-utils";
import PokemonData from "#app/system/pokemon-data";
import { BattlerTagType } from "#enums/battler-tag-type";
-import { queueEncounterMessage } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
+import { queueEncounterMessage } from "#mystery-encounters/utils/encounter-dialogue-utils";
import { randSeedInt } from "#app/utils";
-import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
+import { StatStageChangePhase } from "#phases/stat-stage-change-phase";
import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
/** the i18n namespace for the encounter */
diff --git a/src/data/mystery-encounters/encounters/fun-and-games-encounter.ts b/src/data/mystery-encounters/encounters/fun-and-games-encounter.ts
index b843a929c085..ddc72297f1dd 100644
--- a/src/data/mystery-encounters/encounters/fun-and-games-encounter.ts
+++ b/src/data/mystery-encounters/encounters/fun-and-games-encounter.ts
@@ -1,13 +1,13 @@
-import { leaveEncounterWithoutBattle, selectPokemonForOption, setEncounterRewards, transitionMysteryEncounterIntroVisuals, updatePlayerMoney, } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import { leaveEncounterWithoutBattle, selectPokemonForOption, setEncounterRewards, transitionMysteryEncounterIntroVisuals, updatePlayerMoney, } from "#mystery-encounters/utils/encounter-phase-utils";
import { MysteryEncounterType } from "#enums/mystery-encounter-type";
import BattleScene from "#app/battle-scene";
-import MysteryEncounter, { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";
-import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
+import MysteryEncounter, { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter";
+import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option";
import { TrainerSlot } from "#app/data/trainer-config";
import Pokemon, { FieldPosition, PlayerPokemon } from "#app/field/pokemon";
import { getPokemonSpecies } from "#app/data/pokemon-species";
-import { MoneyRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements";
-import { queueEncounterMessage, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
+import { MoneyRequirement } from "#mystery-encounters/mystery-encounter-requirements";
+import { queueEncounterMessage, showEncounterText } from "#mystery-encounters/utils/encounter-dialogue-utils";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
import { Species } from "#enums/species";
@@ -16,13 +16,13 @@ import { getPokemonNameWithAffix } from "#app/messages";
import { PlayerGender } from "#enums/player-gender";
import { getPokeballAtlasKey, getPokeballTintColor } from "#app/data/pokeball";
import { addPokeballOpenParticles } from "#app/field/anims";
-import { ShinySparklePhase } from "#app/phases/shiny-sparkle-phase";
+import { ShinySparklePhase } from "#phases/shiny-sparkle-phase";
import { SpeciesFormChangeActiveTrigger } from "#app/data/pokemon-forms";
-import { PostSummonPhase } from "#app/phases/post-summon-phase";
+import { PostSummonPhase } from "#phases/post-summon-phase";
import { modifierTypes } from "#app/modifier/modifier-type";
import { Nature } from "#enums/nature";
import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
-import { isPokemonValidForEncounterOptionSelection } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
+import { isPokemonValidForEncounterOptionSelection } from "#mystery-encounters/utils/encounter-pokemon-utils";
/** the i18n namespace for the encounter */
const namespace = "mysteryEncounters/funAndGames";
diff --git a/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts b/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts
index 376bdf0c95d0..5582fe8c3fb1 100644
--- a/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts
+++ b/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts
@@ -1,30 +1,44 @@
-import { leaveEncounterWithoutBattle, selectPokemonForOption, setEncounterRewards } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import {
+ leaveEncounterWithoutBattle,
+ selectPokemonForOption,
+ setEncounterRewards,
+} from "#mystery-encounters/utils/encounter-phase-utils";
import { TrainerSlot, } from "#app/data/trainer-config";
import { ModifierTier } from "#app/modifier/modifier-tier";
-import { getPlayerModifierTypeOptions, ModifierPoolType, ModifierTypeOption, regenerateModifierPoolThresholds } from "#app/modifier/modifier-type";
+import {
+ getPlayerModifierTypeOptions,
+ ModifierPoolType,
+ ModifierTypeOption,
+ regenerateModifierPoolThresholds,
+} from "#app/modifier/modifier-type";
import { MysteryEncounterType } from "#enums/mystery-encounter-type";
import BattleScene from "#app/battle-scene";
-import MysteryEncounter, { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";
+import MysteryEncounter, { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { Species } from "#enums/species";
import PokemonSpecies, { allSpecies, getPokemonSpecies } from "#app/data/pokemon-species";
import { getTypeRgb } from "#app/data/type";
-import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
+import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
-import * as Utils from "#app/utils";
-import { IntegerHolder, isNullOrUndefined, randInt, randSeedInt, randSeedShuffle } from "#app/utils";
+import { isNullOrUndefined, NumberHolder, randInt, randSeedInt, randSeedShuffle } from "#app/utils";
import Pokemon, { EnemyPokemon, PlayerPokemon, PokemonMove } from "#app/field/pokemon";
-import { HiddenAbilityRateBoosterModifier, PokemonFormChangeItemModifier, PokemonHeldItemModifier, ShinyRateBoosterModifier, SpeciesStatBoosterModifier } from "#app/modifier/modifier";
+import {
+ HiddenAbilityRateBoosterModifier,
+ PokemonFormChangeItemModifier,
+ PokemonHeldItemModifier,
+ ShinyRateBoosterModifier,
+ SpeciesStatBoosterModifier,
+} from "#app/modifier/modifier";
import { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler";
import PokemonData from "#app/system/pokemon-data";
import i18next from "i18next";
import { Gender, getGenderSymbol } from "#app/data/gender";
import { getNatureName } from "#app/data/nature";
import { getPokeballAtlasKey, getPokeballTintColor, PokeballType } from "#app/data/pokeball";
-import { getEncounterText, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
+import { getEncounterText, showEncounterText } from "#mystery-encounters/utils/encounter-dialogue-utils";
import { trainerNamePools } from "#app/data/trainer-names";
import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
-import { addPokemonDataToDexAndValidateAchievements } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
+import { addPokemonDataToDexAndValidateAchievements } from "#mystery-encounters/utils/encounter-pokemon-utils";
/** the i18n namespace for the encounter */
const namespace = "mysteryEncounters/globalTradeSystem";
@@ -228,7 +242,7 @@ export const GlobalTradeSystemEncounter: MysteryEncounter =
const tradePokemon = new EnemyPokemon(scene, randomTradeOption, pokemon.level, TrainerSlot.NONE, false);
// Extra shiny roll at 1/128 odds (boosted by events and charms)
if (!tradePokemon.shiny) {
- const shinyThreshold = new Utils.IntegerHolder(WONDER_TRADE_SHINY_CHANCE);
+ const shinyThreshold = new NumberHolder(WONDER_TRADE_SHINY_CHANCE);
if (scene.eventManager.isEventActive()) {
shinyThreshold.value *= scene.eventManager.getShinyMultiplier();
}
@@ -245,7 +259,7 @@ export const GlobalTradeSystemEncounter: MysteryEncounter =
const hiddenIndex = tradePokemon.species.ability2 ? 2 : 1;
if (tradePokemon.species.abilityHidden) {
if (tradePokemon.abilityIndex < hiddenIndex) {
- const hiddenAbilityChance = new IntegerHolder(64);
+ const hiddenAbilityChance = new NumberHolder(64);
scene.applyModifiers(HiddenAbilityRateBoosterModifier, true, hiddenAbilityChance);
const hasHiddenAbility = !randSeedInt(hiddenAbilityChance.value);
diff --git a/src/data/mystery-encounters/encounters/lost-at-sea-encounter.ts b/src/data/mystery-encounters/encounters/lost-at-sea-encounter.ts
index 8e7ea52a967e..2bc358438271 100644
--- a/src/data/mystery-encounters/encounters/lost-at-sea-encounter.ts
+++ b/src/data/mystery-encounters/encounters/lost-at-sea-encounter.ts
@@ -1,12 +1,12 @@
import { getPokemonSpecies } from "#app/data/pokemon-species";
-import { Moves } from "#app/enums/moves";
-import { Species } from "#app/enums/species";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
import { MysteryEncounterType } from "#enums/mystery-encounter-type";
import BattleScene from "#app/battle-scene";
-import MysteryEncounter, { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";
-import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
+import MysteryEncounter, { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter";
+import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option";
import { leaveEncounterWithoutBattle, setEncounterExp } from "../utils/encounter-phase-utils";
-import { applyDamageToPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
+import { applyDamageToPokemon } from "#mystery-encounters/utils/encounter-pokemon-utils";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
diff --git a/src/data/mystery-encounters/encounters/mysterious-challengers-encounter.ts b/src/data/mystery-encounters/encounters/mysterious-challengers-encounter.ts
index f282064bb94d..9da3f05ad179 100644
--- a/src/data/mystery-encounters/encounters/mysterious-challengers-encounter.ts
+++ b/src/data/mystery-encounters/encounters/mysterious-challengers-encounter.ts
@@ -2,7 +2,7 @@ import {
EnemyPartyConfig,
initBattleWithEnemyConfig,
setEncounterRewards,
-} from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+} from "#mystery-encounters/utils/encounter-phase-utils";
import {
trainerConfigs,
TrainerPartyCompoundTemplate,
@@ -14,8 +14,8 @@ import { modifierTypes } from "#app/modifier/modifier-type";
import { MysteryEncounterType } from "#enums/mystery-encounter-type";
import { PartyMemberStrength } from "#enums/party-member-strength";
import BattleScene from "#app/battle-scene";
-import * as Utils from "#app/utils";
-import MysteryEncounter, { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";
+import { randSeedInt } from "#app/utils";
+import MysteryEncounter, { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
@@ -46,7 +46,7 @@ export const MysteriousChallengersEncounter: MysteryEncounter =
const normalConfig = trainerConfigs[normalTrainerType].clone();
let female = false;
if (normalConfig.hasGenders) {
- female = !!Utils.randSeedInt(2);
+ female = !!randSeedInt(2);
}
const normalSpriteKey = normalConfig.getSpriteKey(female, normalConfig.doubleOnly);
encounter.enemyPartyConfigs.push({
@@ -70,7 +70,7 @@ export const MysteriousChallengersEncounter: MysteryEncounter =
hardConfig.setPartyTemplates(hardTemplate);
female = false;
if (hardConfig.hasGenders) {
- female = !!Utils.randSeedInt(2);
+ female = !!randSeedInt(2);
}
const hardSpriteKey = hardConfig.getSpriteKey(female, hardConfig.doubleOnly);
encounter.enemyPartyConfigs.push({
@@ -93,7 +93,7 @@ export const MysteriousChallengersEncounter: MysteryEncounter =
brutalConfig.partyTemplateFunc = null; // Overrides gym leader party template func
female = false;
if (brutalConfig.hasGenders) {
- female = !!Utils.randSeedInt(2);
+ female = !!randSeedInt(2);
}
const brutalSpriteKey = brutalConfig.getSpriteKey(female, brutalConfig.doubleOnly);
encounter.enemyPartyConfigs.push({
diff --git a/src/data/mystery-encounters/encounters/mysterious-chest-encounter.ts b/src/data/mystery-encounters/encounters/mysterious-chest-encounter.ts
index 693d935ae17e..2b5aebfd15ed 100644
--- a/src/data/mystery-encounters/encounters/mysterious-chest-encounter.ts
+++ b/src/data/mystery-encounters/encounters/mysterious-chest-encounter.ts
@@ -1,18 +1,18 @@
-import { queueEncounterMessage, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
-import { EnemyPartyConfig, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, setEncounterRewards, transitionMysteryEncounterIntroVisuals } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import { getHighestLevelPlayerPokemon, koPlayerPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
+import { queueEncounterMessage, showEncounterText } from "#mystery-encounters/utils/encounter-dialogue-utils";
+import { EnemyPartyConfig, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, setEncounterRewards, transitionMysteryEncounterIntroVisuals } from "#mystery-encounters/utils/encounter-phase-utils";
+import { getHighestLevelPlayerPokemon, koPlayerPokemon } from "#mystery-encounters/utils/encounter-pokemon-utils";
import { ModifierTier } from "#app/modifier/modifier-tier";
import { randSeedInt } from "#app/utils";
import { MysteryEncounterType } from "#enums/mystery-encounter-type";
import BattleScene from "#app/battle-scene";
-import MysteryEncounter, { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";
-import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
+import MysteryEncounter, { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter";
+import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
import { getPokemonSpecies } from "#app/data/pokemon-species";
import { Species } from "#enums/species";
import { Moves } from "#enums/moves";
-import { GameOverPhase } from "#app/phases/game-over-phase";
+import { GameOverPhase } from "#phases/game-over-phase";
import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
/** i18n namespace for encounter */
diff --git a/src/data/mystery-encounters/encounters/part-timer-encounter.ts b/src/data/mystery-encounters/encounters/part-timer-encounter.ts
index 092d2ab26739..3f235218cb15 100644
--- a/src/data/mystery-encounters/encounters/part-timer-encounter.ts
+++ b/src/data/mystery-encounters/encounters/part-timer-encounter.ts
@@ -1,18 +1,18 @@
-import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
-import { leaveEncounterWithoutBattle, selectPokemonForOption, setEncounterExp, setEncounterRewards, transitionMysteryEncounterIntroVisuals, updatePlayerMoney } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option";
+import { leaveEncounterWithoutBattle, selectPokemonForOption, setEncounterExp, setEncounterRewards, transitionMysteryEncounterIntroVisuals, updatePlayerMoney } from "#mystery-encounters/utils/encounter-phase-utils";
import { MysteryEncounterType } from "#enums/mystery-encounter-type";
import BattleScene from "#app/battle-scene";
-import MysteryEncounter, { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";
-import { MoveRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements";
+import MysteryEncounter, { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter";
+import { MoveRequirement } from "#mystery-encounters/mystery-encounter-requirements";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
import { Stat } from "#enums/stat";
-import { CHARMING_MOVES } from "#app/data/mystery-encounters/requirements/requirement-groups";
-import { showEncounterDialogue, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
+import { CHARMING_MOVES } from "#mystery-encounters/requirements/requirement-groups";
+import { showEncounterDialogue, showEncounterText } from "#mystery-encounters/utils/encounter-dialogue-utils";
import i18next from "i18next";
import Pokemon, { PlayerPokemon } from "#app/field/pokemon";
import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
-import { isPokemonValidForEncounterOptionSelection } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
+import { isPokemonValidForEncounterOptionSelection } from "#mystery-encounters/utils/encounter-pokemon-utils";
/** the i18n namespace for the encounter */
const namespace = "mysteryEncounters/partTimer";
diff --git a/src/data/mystery-encounters/encounters/safari-zone-encounter.ts b/src/data/mystery-encounters/encounters/safari-zone-encounter.ts
index 0ee3c57b0a28..c071cb80aabd 100644
--- a/src/data/mystery-encounters/encounters/safari-zone-encounter.ts
+++ b/src/data/mystery-encounters/encounters/safari-zone-encounter.ts
@@ -1,8 +1,8 @@
-import { initSubsequentOptionSelect, leaveEncounterWithoutBattle, transitionMysteryEncounterIntroVisuals, updatePlayerMoney, } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import { initSubsequentOptionSelect, leaveEncounterWithoutBattle, transitionMysteryEncounterIntroVisuals, updatePlayerMoney, } from "#mystery-encounters/utils/encounter-phase-utils";
import { MysteryEncounterType } from "#enums/mystery-encounter-type";
import BattleScene from "#app/battle-scene";
-import MysteryEncounter, { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";
-import MysteryEncounterOption, { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
+import MysteryEncounter, { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter";
+import MysteryEncounterOption, { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option";
import { TrainerSlot } from "#app/data/trainer-config";
import { HiddenAbilityRateBoosterModifier, IvScannerModifier } from "#app/modifier/modifier";
import { EnemyPokemon } from "#app/field/pokemon";
@@ -10,14 +10,14 @@ import { PokeballType } from "#app/data/pokeball";
import { PlayerGender } from "#enums/player-gender";
import { IntegerHolder, randSeedInt } from "#app/utils";
import { getPokemonSpecies } from "#app/data/pokemon-species";
-import { MoneyRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements";
-import { doPlayerFlee, doPokemonFlee, getRandomSpeciesByStarterTier, trainerThrowPokeball } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
-import { getEncounterText, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
+import { MoneyRequirement } from "#mystery-encounters/mystery-encounter-requirements";
+import { doPlayerFlee, doPokemonFlee, getRandomSpeciesByStarterTier, trainerThrowPokeball } from "#mystery-encounters/utils/encounter-pokemon-utils";
+import { getEncounterText, showEncounterText } from "#mystery-encounters/utils/encounter-dialogue-utils";
import { getPokemonNameWithAffix } from "#app/messages";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
-import { ScanIvsPhase } from "#app/phases/scan-ivs-phase";
-import { SummonPhase } from "#app/phases/summon-phase";
+import { ScanIvsPhase } from "#phases/scan-ivs-phase";
+import { SummonPhase } from "#phases/summon-phase";
import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
/** the i18n namespace for the encounter */
diff --git a/src/data/mystery-encounters/encounters/shady-vitamin-dealer-encounter.ts b/src/data/mystery-encounters/encounters/shady-vitamin-dealer-encounter.ts
index d30c97b27de5..65b26f037fad 100644
--- a/src/data/mystery-encounters/encounters/shady-vitamin-dealer-encounter.ts
+++ b/src/data/mystery-encounters/encounters/shady-vitamin-dealer-encounter.ts
@@ -1,15 +1,15 @@
-import { generateModifierType, leaveEncounterWithoutBattle, selectPokemonForOption, setEncounterExp, updatePlayerMoney, } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import { generateModifierType, leaveEncounterWithoutBattle, selectPokemonForOption, setEncounterExp, updatePlayerMoney, } from "#mystery-encounters/utils/encounter-phase-utils";
import Pokemon, { PlayerPokemon } from "#app/field/pokemon";
import { modifierTypes } from "#app/modifier/modifier-type";
import { randSeedInt } from "#app/utils";
import { MysteryEncounterType } from "#enums/mystery-encounter-type";
import { Species } from "#enums/species";
import BattleScene from "#app/battle-scene";
-import MysteryEncounter, { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";
-import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
-import { MoneyRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements";
-import { getEncounterText, queueEncounterMessage } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
-import { applyDamageToPokemon, applyModifierTypeToPlayerPokemon, isPokemonValidForEncounterOptionSelection } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
+import MysteryEncounter, { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter";
+import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option";
+import { MoneyRequirement } from "#mystery-encounters/mystery-encounter-requirements";
+import { getEncounterText, queueEncounterMessage } from "#mystery-encounters/utils/encounter-dialogue-utils";
+import { applyDamageToPokemon, applyModifierTypeToPlayerPokemon, isPokemonValidForEncounterOptionSelection } from "#mystery-encounters/utils/encounter-pokemon-utils";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
import { Nature } from "#enums/nature";
diff --git a/src/data/mystery-encounters/encounters/slumbering-snorlax-encounter.ts b/src/data/mystery-encounters/encounters/slumbering-snorlax-encounter.ts
index 8ea19e1225ba..9530138b62c5 100644
--- a/src/data/mystery-encounters/encounters/slumbering-snorlax-encounter.ts
+++ b/src/data/mystery-encounters/encounters/slumbering-snorlax-encounter.ts
@@ -1,21 +1,21 @@
-import { STEALING_MOVES } from "#app/data/mystery-encounters/requirements/requirement-groups";
+import { STEALING_MOVES } from "#mystery-encounters/requirements/requirement-groups";
import { modifierTypes, PokemonHeldItemModifierType } from "#app/modifier/modifier-type";
import { MysteryEncounterType } from "#enums/mystery-encounter-type";
import { Species } from "#enums/species";
import BattleScene from "#app/battle-scene";
import { StatusEffect } from "#app/data/status-effect";
-import MysteryEncounter, { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";
-import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
-import { MoveRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements";
+import MysteryEncounter, { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter";
+import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option";
+import { MoveRequirement } from "#mystery-encounters/mystery-encounter-requirements";
import { EnemyPartyConfig, EnemyPokemonConfig, generateModifierType, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, loadCustomMovesForEncounter, setEncounterExp, setEncounterRewards, } from "../utils/encounter-phase-utils";
-import { queueEncounterMessage } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
+import { queueEncounterMessage } from "#mystery-encounters/utils/encounter-dialogue-utils";
import { Moves } from "#enums/moves";
import { BattlerIndex } from "#app/battle";
import { AiType, PokemonMove } from "#app/field/pokemon";
import { getPokemonSpecies } from "#app/data/pokemon-species";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
-import { PartyHealPhase } from "#app/phases/party-heal-phase";
+import { PartyHealPhase } from "#phases/party-heal-phase";
import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
import { BerryType } from "#enums/berry-type";
import { CustomPokemonData } from "#app/data/custom-pokemon-data";
diff --git a/src/data/mystery-encounters/encounters/teleporting-hijinks-encounter.ts b/src/data/mystery-encounters/encounters/teleporting-hijinks-encounter.ts
index e8f11f02e185..4f18c6b835b8 100644
--- a/src/data/mystery-encounters/encounters/teleporting-hijinks-encounter.ts
+++ b/src/data/mystery-encounters/encounters/teleporting-hijinks-encounter.ts
@@ -1,12 +1,12 @@
-import { EnemyPartyConfig, generateModifierTypeOption, initBattleWithEnemyConfig, setEncounterExp, setEncounterRewards, transitionMysteryEncounterIntroVisuals, updatePlayerMoney, } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import { EnemyPartyConfig, generateModifierTypeOption, initBattleWithEnemyConfig, setEncounterExp, setEncounterRewards, transitionMysteryEncounterIntroVisuals, updatePlayerMoney, } from "#mystery-encounters/utils/encounter-phase-utils";
import { randSeedInt } from "#app/utils";
import { MysteryEncounterType } from "#enums/mystery-encounter-type";
import BattleScene from "#app/battle-scene";
-import MysteryEncounter, { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";
-import { MoneyRequirement, WaveModulusRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements";
+import MysteryEncounter, { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter";
+import { MoneyRequirement, WaveModulusRequirement } from "#mystery-encounters/mystery-encounter-requirements";
import Pokemon, { EnemyPokemon } from "#app/field/pokemon";
-import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
-import { queueEncounterMessage, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
+import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option";
+import { queueEncounterMessage, showEncounterText } from "#mystery-encounters/utils/encounter-dialogue-utils";
import PokemonData from "#app/system/pokemon-data";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
@@ -17,10 +17,10 @@ import { getPartyLuckValue, modifierTypes } from "#app/modifier/modifier-type";
import { TrainerSlot } from "#app/data/trainer-config";
import { BattlerTagType } from "#enums/battler-tag-type";
import { getPokemonNameWithAffix } from "#app/messages";
-import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
+import { StatStageChangePhase } from "#phases/stat-stage-change-phase";
import { Stat } from "#enums/stat";
import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
-import { getEncounterPokemonLevelForWave, STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
+import { getEncounterPokemonLevelForWave, STANDARD_ENCOUNTER_BOOSTED_LEVEL_MODIFIER } from "#mystery-encounters/utils/encounter-pokemon-utils";
/** the i18n namespace for this encounter */
const namespace = "mysteryEncounters/teleportingHijinks";
diff --git a/src/data/mystery-encounters/encounters/the-expert-pokemon-breeder-encounter.ts b/src/data/mystery-encounters/encounters/the-expert-pokemon-breeder-encounter.ts
index 9c10d33d0192..5143408f1dc0 100644
--- a/src/data/mystery-encounters/encounters/the-expert-pokemon-breeder-encounter.ts
+++ b/src/data/mystery-encounters/encounters/the-expert-pokemon-breeder-encounter.ts
@@ -1,4 +1,4 @@
-import { EnemyPartyConfig, generateModifierType, handleMysteryEncounterBattleFailed, initBattleWithEnemyConfig, setEncounterRewards, } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import { EnemyPartyConfig, generateModifierType, handleMysteryEncounterBattleFailed, initBattleWithEnemyConfig, setEncounterRewards, } from "#mystery-encounters/utils/encounter-phase-utils";
import { trainerConfigs } from "#app/data/trainer-config";
import { MysteryEncounterType } from "#enums/mystery-encounter-type";
import BattleScene from "#app/battle-scene";
@@ -11,15 +11,15 @@ import { TrainerType } from "#enums/trainer-type";
import i18next from "i18next";
import { Species } from "#enums/species";
import { getPokemonSpecies } from "#app/data/pokemon-species";
-import { speciesStarterCosts } from "#app/data/balance/starters";
+import { speciesStarterCosts } from "#balance/starters";
import { Nature } from "#enums/nature";
import { Moves } from "#enums/moves";
import { PlayerPokemon } from "#app/field/pokemon";
-import { getEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
+import { getEncounterText } from "#mystery-encounters/utils/encounter-dialogue-utils";
import { IEggOptions } from "#app/data/egg";
import { EggSourceType } from "#enums/egg-source-types";
import { EggTier } from "#enums/egg-type";
-import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
+import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
import { achvs } from "#app/system/achv";
import { modifierTypes, PokemonHeldItemModifierType } from "#app/modifier/modifier-type";
diff --git a/src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts b/src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts
index 95f359547e49..b7010a492913 100644
--- a/src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts
+++ b/src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts
@@ -1,17 +1,17 @@
-import { leaveEncounterWithoutBattle, transitionMysteryEncounterIntroVisuals, updatePlayerMoney, } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import { leaveEncounterWithoutBattle, transitionMysteryEncounterIntroVisuals, updatePlayerMoney, } from "#mystery-encounters/utils/encounter-phase-utils";
import { isNullOrUndefined, randSeedInt } from "#app/utils";
import { MysteryEncounterType } from "#enums/mystery-encounter-type";
import BattleScene from "#app/battle-scene";
-import MysteryEncounter, { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";
-import { MoneyRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements";
-import { catchPokemon, getRandomSpeciesByStarterTier, getSpriteKeysFromPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
+import MysteryEncounter, { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter";
+import { MoneyRequirement } from "#mystery-encounters/mystery-encounter-requirements";
+import { catchPokemon, getRandomSpeciesByStarterTier, getSpriteKeysFromPokemon } from "#mystery-encounters/utils/encounter-pokemon-utils";
import { getPokemonSpecies } from "#app/data/pokemon-species";
-import { speciesStarterCosts } from "#app/data/balance/starters";
+import { speciesStarterCosts } from "#balance/starters";
import { Species } from "#enums/species";
import { PokeballType } from "#app/data/pokeball";
import { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon";
-import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
-import { showEncounterDialogue } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
+import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option";
+import { showEncounterDialogue } from "#mystery-encounters/utils/encounter-dialogue-utils";
import PokemonData from "#app/system/pokemon-data";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
diff --git a/src/data/mystery-encounters/encounters/the-strong-stuff-encounter.ts b/src/data/mystery-encounters/encounters/the-strong-stuff-encounter.ts
index 397d2af9522d..2cfc9ed20294 100644
--- a/src/data/mystery-encounters/encounters/the-strong-stuff-encounter.ts
+++ b/src/data/mystery-encounters/encounters/the-strong-stuff-encounter.ts
@@ -1,14 +1,14 @@
-import { EnemyPartyConfig, initBattleWithEnemyConfig, loadCustomMovesForEncounter, leaveEncounterWithoutBattle, setEncounterRewards, transitionMysteryEncounterIntroVisuals, generateModifierType } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import { EnemyPartyConfig, initBattleWithEnemyConfig, loadCustomMovesForEncounter, leaveEncounterWithoutBattle, setEncounterRewards, transitionMysteryEncounterIntroVisuals, generateModifierType } from "#mystery-encounters/utils/encounter-phase-utils";
import { modifierTypes, PokemonHeldItemModifierType, } from "#app/modifier/modifier-type";
import { MysteryEncounterType } from "#enums/mystery-encounter-type";
import BattleScene from "#app/battle-scene";
-import MysteryEncounter, { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";
+import MysteryEncounter, { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter";
import { getPokemonSpecies } from "#app/data/pokemon-species";
import { Species } from "#enums/species";
import { Nature } from "#app/data/nature";
import Pokemon, { PokemonMove } from "#app/field/pokemon";
-import { queueEncounterMessage, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
-import { modifyPlayerPokemonBST } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
+import { queueEncounterMessage, showEncounterText } from "#mystery-encounters/utils/encounter-dialogue-utils";
+import { modifyPlayerPokemonBST } from "#mystery-encounters/utils/encounter-pokemon-utils";
import { Moves } from "#enums/moves";
import { BattlerIndex } from "#app/battle";
import { BattlerTagType } from "#enums/battler-tag-type";
@@ -16,7 +16,7 @@ import { BerryType } from "#enums/berry-type";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { CustomPokemonData } from "#app/data/custom-pokemon-data";
import { Stat } from "#enums/stat";
-import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
+import { StatStageChangePhase } from "#phases/stat-stage-change-phase";
import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
/** the i18n namespace for the encounter */
diff --git a/src/data/mystery-encounters/encounters/the-winstrate-challenge-encounter.ts b/src/data/mystery-encounters/encounters/the-winstrate-challenge-encounter.ts
index bf322802f812..30928b065e5d 100644
--- a/src/data/mystery-encounters/encounters/the-winstrate-challenge-encounter.ts
+++ b/src/data/mystery-encounters/encounters/the-winstrate-challenge-encounter.ts
@@ -1,8 +1,8 @@
-import { EnemyPartyConfig, generateModifierType, generateModifierTypeOption, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, setEncounterRewards, transitionMysteryEncounterIntroVisuals, } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import { EnemyPartyConfig, generateModifierType, generateModifierTypeOption, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, setEncounterRewards, transitionMysteryEncounterIntroVisuals, } from "#mystery-encounters/utils/encounter-phase-utils";
import { modifierTypes, PokemonHeldItemModifierType } from "#app/modifier/modifier-type";
import { MysteryEncounterType } from "#enums/mystery-encounter-type";
import BattleScene from "#app/battle-scene";
-import MysteryEncounter, { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";
+import MysteryEncounter, { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { TrainerType } from "#enums/trainer-type";
import { Species } from "#enums/species";
@@ -15,11 +15,11 @@ import { BerryType } from "#enums/berry-type";
import { Stat } from "#enums/stat";
import { SpeciesFormChangeManualTrigger } from "#app/data/pokemon-forms";
import { applyPostBattleInitAbAttrs, PostBattleInitAbAttr } from "#app/data/ability";
-import { showEncounterDialogue, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
+import { showEncounterDialogue, showEncounterText } from "#mystery-encounters/utils/encounter-dialogue-utils";
import { MysteryEncounterMode } from "#enums/mystery-encounter-mode";
-import { PartyHealPhase } from "#app/phases/party-heal-phase";
-import { ShowTrainerPhase } from "#app/phases/show-trainer-phase";
-import { ReturnPhase } from "#app/phases/return-phase";
+import { PartyHealPhase } from "#phases/party-heal-phase";
+import { ShowTrainerPhase } from "#phases/show-trainer-phase";
+import { ReturnPhase } from "#phases/return-phase";
import i18next from "i18next";
import { ModifierTier } from "#app/modifier/modifier-tier";
import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
diff --git a/src/data/mystery-encounters/encounters/training-session-encounter.ts b/src/data/mystery-encounters/encounters/training-session-encounter.ts
index 9f80bbbffde4..c706a89f498c 100644
--- a/src/data/mystery-encounters/encounters/training-session-encounter.ts
+++ b/src/data/mystery-encounters/encounters/training-session-encounter.ts
@@ -1,7 +1,7 @@
import { Ability, allAbilities } from "#app/data/ability";
-import { EnemyPartyConfig, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, selectPokemonForOption, setEncounterRewards, } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import { EnemyPartyConfig, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, selectPokemonForOption, setEncounterRewards, } from "#mystery-encounters/utils/encounter-phase-utils";
import { getNatureName, Nature } from "#app/data/nature";
-import { speciesStarterCosts } from "#app/data/balance/starters";
+import { speciesStarterCosts } from "#balance/starters";
import Pokemon, { PlayerPokemon } from "#app/field/pokemon";
import { PokemonHeldItemModifier } from "#app/modifier/modifier";
import { AbilityAttr } from "#app/system/game-data";
@@ -11,16 +11,16 @@ import { isNullOrUndefined, randSeedShuffle } from "#app/utils";
import { BattlerTagType } from "#enums/battler-tag-type";
import { MysteryEncounterType } from "#enums/mystery-encounter-type";
import BattleScene from "#app/battle-scene";
-import MysteryEncounter, { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";
-import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
-import { queueEncounterMessage, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
+import MysteryEncounter, { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter";
+import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option";
+import { queueEncounterMessage, showEncounterText } from "#mystery-encounters/utils/encounter-dialogue-utils";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
import HeldModifierConfig from "#app/interfaces/held-modifier-config";
import i18next from "i18next";
import { getStatKey } from "#enums/stat";
import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
-import { isPokemonValidForEncounterOptionSelection } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
+import { isPokemonValidForEncounterOptionSelection } from "#mystery-encounters/utils/encounter-pokemon-utils";
/** The i18n namespace for the encounter */
const namespace = "mysteryEncounters/trainingSession";
diff --git a/src/data/mystery-encounters/encounters/trash-to-treasure-encounter.ts b/src/data/mystery-encounters/encounters/trash-to-treasure-encounter.ts
index 2b3b38b21644..d81d87cdfa57 100644
--- a/src/data/mystery-encounters/encounters/trash-to-treasure-encounter.ts
+++ b/src/data/mystery-encounters/encounters/trash-to-treasure-encounter.ts
@@ -1,15 +1,15 @@
-import { EnemyPartyConfig, EnemyPokemonConfig, generateModifierType, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, loadCustomMovesForEncounter, setEncounterRewards, transitionMysteryEncounterIntroVisuals, } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import { EnemyPartyConfig, EnemyPokemonConfig, generateModifierType, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, loadCustomMovesForEncounter, setEncounterRewards, transitionMysteryEncounterIntroVisuals, } from "#mystery-encounters/utils/encounter-phase-utils";
import { modifierTypes, PokemonHeldItemModifierType } from "#app/modifier/modifier-type";
import { MysteryEncounterType } from "#enums/mystery-encounter-type";
import BattleScene from "#app/battle-scene";
-import MysteryEncounter, { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";
-import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
+import MysteryEncounter, { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter";
+import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
import { Species } from "#enums/species";
import { HitHealModifier, PokemonHeldItemModifier, TurnHealModifier } from "#app/modifier/modifier";
-import { applyModifierTypeToPlayerPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
-import { showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
+import { applyModifierTypeToPlayerPokemon } from "#mystery-encounters/utils/encounter-pokemon-utils";
+import { showEncounterText } from "#mystery-encounters/utils/encounter-dialogue-utils";
import i18next from "#app/plugins/i18n";
import { ModifierTier } from "#app/modifier/modifier-tier";
import { getPokemonSpecies } from "#app/data/pokemon-species";
diff --git a/src/data/mystery-encounters/encounters/uncommon-breed-encounter.ts b/src/data/mystery-encounters/encounters/uncommon-breed-encounter.ts
index b7ce3bab48c0..e18604d5fff4 100644
--- a/src/data/mystery-encounters/encounters/uncommon-breed-encounter.ts
+++ b/src/data/mystery-encounters/encounters/uncommon-breed-encounter.ts
@@ -1,16 +1,16 @@
-import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
-import { EnemyPartyConfig, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, setEncounterExp, setEncounterRewards } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import { CHARMING_MOVES } from "#app/data/mystery-encounters/requirements/requirement-groups";
+import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option";
+import { EnemyPartyConfig, initBattleWithEnemyConfig, leaveEncounterWithoutBattle, setEncounterExp, setEncounterRewards } from "#mystery-encounters/utils/encounter-phase-utils";
+import { CHARMING_MOVES } from "#mystery-encounters/requirements/requirement-groups";
import Pokemon, { EnemyPokemon, PokemonMove } from "#app/field/pokemon";
import { getPartyLuckValue } from "#app/modifier/modifier-type";
import { MysteryEncounterType } from "#enums/mystery-encounter-type";
import BattleScene from "#app/battle-scene";
-import MysteryEncounter, { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";
-import { MoveRequirement, PersistentModifierRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements";
+import MysteryEncounter, { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter";
+import { MoveRequirement, PersistentModifierRequirement } from "#mystery-encounters/mystery-encounter-requirements";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
import { TrainerSlot } from "#app/data/trainer-config";
-import { catchPokemon, getHighestLevelPlayerPokemon, getSpriteKeysFromPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
+import { catchPokemon, getHighestLevelPlayerPokemon, getSpriteKeysFromPokemon } from "#mystery-encounters/utils/encounter-pokemon-utils";
import PokemonData from "#app/system/pokemon-data";
import { isNullOrUndefined, randSeedInt } from "#app/utils";
import { Moves } from "#enums/moves";
@@ -18,9 +18,9 @@ import { BattlerIndex } from "#app/battle";
import { SelfStatusMove } from "#app/data/move";
import { PokeballType } from "#enums/pokeball";
import { BattlerTagType } from "#enums/battler-tag-type";
-import { queueEncounterMessage } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
+import { queueEncounterMessage } from "#mystery-encounters/utils/encounter-dialogue-utils";
import { BerryModifier } from "#app/modifier/modifier";
-import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
+import { StatStageChangePhase } from "#phases/stat-stage-change-phase";
import { Stat } from "#enums/stat";
import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
diff --git a/src/data/mystery-encounters/encounters/weird-dream-encounter.ts b/src/data/mystery-encounters/encounters/weird-dream-encounter.ts
index b97a22dbe515..db347eea1375 100644
--- a/src/data/mystery-encounters/encounters/weird-dream-encounter.ts
+++ b/src/data/mystery-encounters/encounters/weird-dream-encounter.ts
@@ -2,8 +2,8 @@ import { Type } from "#app/data/type";
import { MysteryEncounterType } from "#enums/mystery-encounter-type";
import { Species } from "#enums/species";
import BattleScene from "#app/battle-scene";
-import MysteryEncounter, { MysteryEncounterBuilder } from "#app/data/mystery-encounters/mystery-encounter";
-import { MysteryEncounterOptionBuilder } from "#app/data/mystery-encounters/mystery-encounter-option";
+import MysteryEncounter, { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter";
+import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option";
import { leaveEncounterWithoutBattle, setEncounterRewards, } from "../utils/encounter-phase-utils";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
@@ -13,10 +13,10 @@ import PokemonSpecies, { allSpecies, getPokemonSpecies } from "#app/data/pokemon
import { HiddenAbilityRateBoosterModifier, PokemonFormChangeItemModifier, PokemonHeldItemModifier } from "#app/modifier/modifier";
import { achvs } from "#app/system/achv";
import { CustomPokemonData } from "#app/data/custom-pokemon-data";
-import { showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
+import { showEncounterText } from "#mystery-encounters/utils/encounter-dialogue-utils";
import { modifierTypes } from "#app/modifier/modifier-type";
import i18next from "#app/plugins/i18n";
-import { doPokemonTransformationSequence, TransformationScreenPosition } from "#app/data/mystery-encounters/utils/encounter-transformation-sequence";
+import { doPokemonTransformationSequence, TransformationScreenPosition } from "#mystery-encounters/utils/encounter-transformation-sequence";
import { getLevelTotalExp } from "#app/data/exp";
import { Stat } from "#enums/stat";
import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/game-mode";
diff --git a/src/data/mystery-encounters/mystery-encounter-option.ts b/src/data/mystery-encounters/mystery-encounter-option.ts
index ffae71b9555e..608b8c4e7d7e 100644
--- a/src/data/mystery-encounters/mystery-encounter-option.ts
+++ b/src/data/mystery-encounters/mystery-encounter-option.ts
@@ -1,9 +1,9 @@
-import { OptionTextDisplay } from "#app/data/mystery-encounters/mystery-encounter-dialogue";
-import { Moves } from "#app/enums/moves";
+import { OptionTextDisplay } from "#mystery-encounters/mystery-encounter-dialogue";
+import { Moves } from "#enums/moves";
import Pokemon, { PlayerPokemon } from "#app/field/pokemon";
import BattleScene from "#app/battle-scene";
import { Type } from "../type";
-import { EncounterPokemonRequirement, EncounterSceneRequirement, MoneyRequirement, TypeRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements";
+import { EncounterPokemonRequirement, EncounterSceneRequirement, MoneyRequirement, TypeRequirement } from "#mystery-encounters/mystery-encounter-requirements";
import { CanLearnMoveRequirement, CanLearnMoveRequirementOptions } from "./requirements/can-learn-move-requirement";
import { isNullOrUndefined, randSeedInt } from "#app/utils";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
diff --git a/src/data/mystery-encounters/mystery-encounter-requirements.ts b/src/data/mystery-encounters/mystery-encounter-requirements.ts
index a57cedc8fa35..58b57d5e6052 100644
--- a/src/data/mystery-encounters/mystery-encounter-requirements.ts
+++ b/src/data/mystery-encounters/mystery-encounter-requirements.ts
@@ -6,7 +6,7 @@ import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import { TimeOfDay } from "#enums/time-of-day";
import { Nature } from "#app/data/nature";
-import { EvolutionItem, pokemonEvolutions } from "#app/data/balance/pokemon-evolutions";
+import { EvolutionItem, pokemonEvolutions } from "#balance/pokemon-evolutions";
import { FormChangeItem, pokemonFormChanges, SpeciesFormChangeItemTrigger } from "#app/data/pokemon-forms";
import { StatusEffect } from "#app/data/status-effect";
import { Type } from "#app/data/type";
diff --git a/src/data/mystery-encounters/mystery-encounter-save-data.ts b/src/data/mystery-encounters/mystery-encounter-save-data.ts
index 259fbff7b854..4b2695927082 100644
--- a/src/data/mystery-encounters/mystery-encounter-save-data.ts
+++ b/src/data/mystery-encounters/mystery-encounter-save-data.ts
@@ -1,5 +1,5 @@
import { MysteryEncounterType } from "#enums/mystery-encounter-type";
-import { BASE_MYSTERY_ENCOUNTER_SPAWN_WEIGHT } from "#app/data/mystery-encounters/mystery-encounters";
+import { BASE_MYSTERY_ENCOUNTER_SPAWN_WEIGHT } from "#mystery-encounters/mystery-encounters";
import { isNullOrUndefined } from "#app/utils";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
diff --git a/src/data/mystery-encounters/mystery-encounter.ts b/src/data/mystery-encounters/mystery-encounter.ts
index ee9eb159e10b..608bbe29dcf7 100644
--- a/src/data/mystery-encounters/mystery-encounter.ts
+++ b/src/data/mystery-encounters/mystery-encounter.ts
@@ -1,10 +1,10 @@
-import { EnemyPartyConfig } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import { EnemyPartyConfig } from "#mystery-encounters/utils/encounter-phase-utils";
import Pokemon, { PlayerPokemon, PokemonMove } from "#app/field/pokemon";
import { capitalizeFirstLetter, isNullOrUndefined } from "#app/utils";
import { MysteryEncounterType } from "#enums/mystery-encounter-type";
import BattleScene from "#app/battle-scene";
import MysteryEncounterIntroVisuals, { MysteryEncounterSpriteConfig } from "#app/field/mystery-encounter-intro";
-import * as Utils from "#app/utils";
+import { randSeedInt } from "#app/utils";
import { StatusEffect } from "../status-effect";
import MysteryEncounterDialogue, { OptionTextDisplay } from "./mystery-encounter-dialogue";
import MysteryEncounterOption, { MysteryEncounterOptionBuilder, OptionPhaseCallback } from "./mystery-encounter-option";
@@ -356,13 +356,13 @@ export default class MysteryEncounter implements IMysteryEncounter {
}
if (truePrimaryPool.length > 0) {
// Always choose from the non-overlapping pokemon first
- this.primaryPokemon = truePrimaryPool[Utils.randSeedInt(truePrimaryPool.length, 0)];
+ this.primaryPokemon = truePrimaryPool[randSeedInt(truePrimaryPool.length, 0)];
return true;
} else {
// If there are multiple overlapping pokemon, we're okay - just choose one and take it out of the primary pokemon pool
if (overlap.length > 1 || (this.secondaryPokemon.length - overlap.length >= 1)) {
// is this working?
- this.primaryPokemon = overlap[Utils.randSeedInt(overlap.length, 0)];
+ this.primaryPokemon = overlap[randSeedInt(overlap.length, 0)];
this.secondaryPokemon = this.secondaryPokemon.filter((supp) => supp !== this.primaryPokemon);
return true;
}
@@ -371,7 +371,7 @@ export default class MysteryEncounter implements IMysteryEncounter {
}
} else {
// this means we CAN have the same pokemon be a primary and secondary pokemon, so just choose any qualifying one randomly.
- this.primaryPokemon = qualified[Utils.randSeedInt(qualified.length, 0)];
+ this.primaryPokemon = qualified[randSeedInt(qualified.length, 0)];
return true;
}
}
diff --git a/src/data/mystery-encounters/mystery-encounters.ts b/src/data/mystery-encounters/mystery-encounters.ts
index 8c1c3bf6de41..2ab11fb4842e 100644
--- a/src/data/mystery-encounters/mystery-encounters.ts
+++ b/src/data/mystery-encounters/mystery-encounters.ts
@@ -11,28 +11,28 @@ import { ShadyVitaminDealerEncounter } from "./encounters/shady-vitamin-dealer-e
import { SlumberingSnorlaxEncounter } from "./encounters/slumbering-snorlax-encounter";
import { TrainingSessionEncounter } from "./encounters/training-session-encounter";
import MysteryEncounter from "./mystery-encounter";
-import { SafariZoneEncounter } from "#app/data/mystery-encounters/encounters/safari-zone-encounter";
-import { FieryFalloutEncounter } from "#app/data/mystery-encounters/encounters/fiery-fallout-encounter";
-import { TheStrongStuffEncounter } from "#app/data/mystery-encounters/encounters/the-strong-stuff-encounter";
-import { ThePokemonSalesmanEncounter } from "#app/data/mystery-encounters/encounters/the-pokemon-salesman-encounter";
-import { AnOfferYouCantRefuseEncounter } from "#app/data/mystery-encounters/encounters/an-offer-you-cant-refuse-encounter";
-import { DelibirdyEncounter } from "#app/data/mystery-encounters/encounters/delibirdy-encounter";
-import { AbsoluteAvariceEncounter } from "#app/data/mystery-encounters/encounters/absolute-avarice-encounter";
-import { ATrainersTestEncounter } from "#app/data/mystery-encounters/encounters/a-trainers-test-encounter";
-import { TrashToTreasureEncounter } from "#app/data/mystery-encounters/encounters/trash-to-treasure-encounter";
-import { BerriesAboundEncounter } from "#app/data/mystery-encounters/encounters/berries-abound-encounter";
-import { ClowningAroundEncounter } from "#app/data/mystery-encounters/encounters/clowning-around-encounter";
-import { PartTimerEncounter } from "#app/data/mystery-encounters/encounters/part-timer-encounter";
-import { DancingLessonsEncounter } from "#app/data/mystery-encounters/encounters/dancing-lessons-encounter";
-import { WeirdDreamEncounter } from "#app/data/mystery-encounters/encounters/weird-dream-encounter";
-import { TheWinstrateChallengeEncounter } from "#app/data/mystery-encounters/encounters/the-winstrate-challenge-encounter";
-import { TeleportingHijinksEncounter } from "#app/data/mystery-encounters/encounters/teleporting-hijinks-encounter";
-import { BugTypeSuperfanEncounter } from "#app/data/mystery-encounters/encounters/bug-type-superfan-encounter";
-import { FunAndGamesEncounter } from "#app/data/mystery-encounters/encounters/fun-and-games-encounter";
-import { UncommonBreedEncounter } from "#app/data/mystery-encounters/encounters/uncommon-breed-encounter";
-import { GlobalTradeSystemEncounter } from "#app/data/mystery-encounters/encounters/global-trade-system-encounter";
-import { TheExpertPokemonBreederEncounter } from "#app/data/mystery-encounters/encounters/the-expert-pokemon-breeder-encounter";
-import { getBiomeName } from "#app/data/balance/biomes";
+import { SafariZoneEncounter } from "#mystery-encounters/encounters/safari-zone-encounter";
+import { FieryFalloutEncounter } from "#mystery-encounters/encounters/fiery-fallout-encounter";
+import { TheStrongStuffEncounter } from "#mystery-encounters/encounters/the-strong-stuff-encounter";
+import { ThePokemonSalesmanEncounter } from "#mystery-encounters/encounters/the-pokemon-salesman-encounter";
+import { AnOfferYouCantRefuseEncounter } from "#mystery-encounters/encounters/an-offer-you-cant-refuse-encounter";
+import { DelibirdyEncounter } from "#mystery-encounters/encounters/delibirdy-encounter";
+import { AbsoluteAvariceEncounter } from "#mystery-encounters/encounters/absolute-avarice-encounter";
+import { ATrainersTestEncounter } from "#mystery-encounters/encounters/a-trainers-test-encounter";
+import { TrashToTreasureEncounter } from "#mystery-encounters/encounters/trash-to-treasure-encounter";
+import { BerriesAboundEncounter } from "#mystery-encounters/encounters/berries-abound-encounter";
+import { ClowningAroundEncounter } from "#mystery-encounters/encounters/clowning-around-encounter";
+import { PartTimerEncounter } from "#mystery-encounters/encounters/part-timer-encounter";
+import { DancingLessonsEncounter } from "#mystery-encounters/encounters/dancing-lessons-encounter";
+import { WeirdDreamEncounter } from "#mystery-encounters/encounters/weird-dream-encounter";
+import { TheWinstrateChallengeEncounter } from "#mystery-encounters/encounters/the-winstrate-challenge-encounter";
+import { TeleportingHijinksEncounter } from "#mystery-encounters/encounters/teleporting-hijinks-encounter";
+import { BugTypeSuperfanEncounter } from "#mystery-encounters/encounters/bug-type-superfan-encounter";
+import { FunAndGamesEncounter } from "#mystery-encounters/encounters/fun-and-games-encounter";
+import { UncommonBreedEncounter } from "#mystery-encounters/encounters/uncommon-breed-encounter";
+import { GlobalTradeSystemEncounter } from "#mystery-encounters/encounters/global-trade-system-encounter";
+import { TheExpertPokemonBreederEncounter } from "#mystery-encounters/encounters/the-expert-pokemon-breeder-encounter";
+import { getBiomeName } from "#balance/biomes";
/**
* Spawn chance: (BASE_MYSTERY_ENCOUNTER_SPAWN_WEIGHT + WIGHT_INCREMENT_ON_SPAWN_MISS * <number of missed spawns>) / MYSTERY_ENCOUNTER_SPAWN_MAX_WEIGHT
diff --git a/src/data/mystery-encounters/requirements/can-learn-move-requirement.ts b/src/data/mystery-encounters/requirements/can-learn-move-requirement.ts
index f34d383dbbc2..d14a707d5aea 100644
--- a/src/data/mystery-encounters/requirements/can-learn-move-requirement.ts
+++ b/src/data/mystery-encounters/requirements/can-learn-move-requirement.ts
@@ -1,8 +1,8 @@
import BattleScene from "#app/battle-scene";
-import { Moves } from "#app/enums/moves";
+import { Moves } from "#enums/moves";
import { PlayerPokemon, PokemonMove } from "#app/field/pokemon";
import { isNullOrUndefined } from "#app/utils";
-import { EncounterPokemonRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements";
+import { EncounterPokemonRequirement } from "#mystery-encounters/mystery-encounter-requirements";
/**
* {@linkcode CanLearnMoveRequirement} options
diff --git a/src/data/mystery-encounters/utils/encounter-phase-utils.ts b/src/data/mystery-encounters/utils/encounter-phase-utils.ts
index 5cd2fbffd5f9..86e24b143885 100644
--- a/src/data/mystery-encounters/utils/encounter-phase-utils.ts
+++ b/src/data/mystery-encounters/utils/encounter-phase-utils.ts
@@ -1,17 +1,32 @@
import Battle, { BattlerIndex, BattleType } from "#app/battle";
-import { biomeLinks, BiomePoolTier } from "#app/data/balance/biomes";
-import MysteryEncounterOption from "#app/data/mystery-encounters/mystery-encounter-option";
-import { AVERAGE_ENCOUNTERS_PER_RUN_TARGET, WEIGHT_INCREMENT_ON_SPAWN_MISS } from "#app/data/mystery-encounters/mystery-encounters";
-import { showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
+import { biomeLinks, BiomePoolTier } from "#balance/biomes";
+import MysteryEncounterOption from "#mystery-encounters/mystery-encounter-option";
+import {
+ AVERAGE_ENCOUNTERS_PER_RUN_TARGET,
+ WEIGHT_INCREMENT_ON_SPAWN_MISS,
+} from "#mystery-encounters/mystery-encounters";
+import { showEncounterText } from "#mystery-encounters/utils/encounter-dialogue-utils";
import Pokemon, { AiType, FieldPosition, PlayerPokemon, PokemonMove, PokemonSummonData } from "#app/field/pokemon";
-import { CustomModifierSettings, ModifierPoolType, ModifierType, ModifierTypeGenerator, ModifierTypeOption, modifierTypes, regenerateModifierPoolThresholds } from "#app/modifier/modifier-type";
-import { MysteryEncounterBattlePhase, MysteryEncounterBattleStartCleanupPhase, MysteryEncounterPhase, MysteryEncounterRewardsPhase } from "#app/phases/mystery-encounter-phases";
+import {
+ CustomModifierSettings,
+ ModifierPoolType,
+ ModifierType,
+ ModifierTypeGenerator,
+ ModifierTypeOption,
+ modifierTypes,
+ regenerateModifierPoolThresholds,
+} from "#app/modifier/modifier-type";
+import {
+ MysteryEncounterBattlePhase,
+ MysteryEncounterBattleStartCleanupPhase,
+ MysteryEncounterPhase,
+ MysteryEncounterRewardsPhase,
+} from "#phases/mystery-encounter-phases";
import PokemonData from "#app/system/pokemon-data";
import { OptionSelectConfig, OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler";
import { PartyOption, PartyUiMode, PokemonSelectFilter } from "#app/ui/party-ui-handler";
import { Mode } from "#app/ui/ui";
-import * as Utils from "#app/utils";
-import { isNullOrUndefined } from "#app/utils";
+import { isNullOrUndefined, randSeedInt, randomString } from "#app/utils";
import { BattlerTagType } from "#enums/battler-tag-type";
import { Biome } from "#enums/biome";
import { TrainerType } from "#enums/trainer-type";
@@ -29,13 +44,13 @@ import PokemonSpecies from "#app/data/pokemon-species";
import { Egg, IEggOptions } from "#app/data/egg";
import { CustomPokemonData } from "#app/data/custom-pokemon-data";
import HeldModifierConfig from "#app/interfaces/held-modifier-config";
-import { MovePhase } from "#app/phases/move-phase";
-import { EggLapsePhase } from "#app/phases/egg-lapse-phase";
-import { TrainerVictoryPhase } from "#app/phases/trainer-victory-phase";
-import { BattleEndPhase } from "#app/phases/battle-end-phase";
-import { GameOverPhase } from "#app/phases/game-over-phase";
-import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
-import { PartyExpPhase } from "#app/phases/party-exp-phase";
+import { MovePhase } from "#phases/move-phase";
+import { EggLapsePhase } from "#phases/egg-lapse-phase";
+import { TrainerVictoryPhase } from "#phases/trainer-victory-phase";
+import { BattleEndPhase } from "#phases/battle-end-phase";
+import { GameOverPhase } from "#phases/game-over-phase";
+import { SelectModifierPhase } from "#phases/select-modifier-phase";
+import { PartyExpPhase } from "#phases/party-exp-phase";
import { Variant } from "#app/data/variant";
/**
@@ -139,7 +154,7 @@ export async function initBattleWithEnemyConfig(scene: BattleScene, partyConfig:
const doubleTrainer = trainerConfig.doubleOnly || (trainerConfig.hasDouble && !!partyConfig.doubleBattle);
doubleBattle = doubleTrainer;
- const trainerFemale = isNullOrUndefined(partyConfig.female) ? !!(Utils.randSeedInt(2)) : partyConfig.female;
+ const trainerFemale = isNullOrUndefined(partyConfig.female) ? !!(randSeedInt(2)) : partyConfig.female;
const newTrainer = new Trainer(scene, trainerConfig.trainerType, doubleTrainer ? TrainerVariant.DOUBLE : trainerFemale ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT, undefined, undefined, undefined, trainerConfig);
newTrainer.x += 300;
newTrainer.setVisible(false);
@@ -231,7 +246,7 @@ export async function initBattleWithEnemyConfig(scene: BattleScene, partyConfig:
// Generate new id, reset status and HP in case using data source
if (config.dataSource) {
- enemyPokemon.id = Utils.randSeedInt(4294967296);
+ enemyPokemon.id = randSeedInt(4294967296);
}
// Set form
@@ -898,7 +913,7 @@ export function calculateMEAggregateStats(scene: BattleScene, baseSpawnWeight: n
const validMEfloorsByBiome = new Map<string, number>(biomes.map(b => [ b, 0 ]));
let currentBiome = Biome.TOWN;
let currentArena = scene.newArena(currentBiome);
- scene.setSeed(Utils.randomString(24));
+ scene.setSeed(randomString(24));
scene.resetSeed();
for (let i = 10; i < 180; i++) {
// Boss
@@ -913,16 +928,16 @@ export function calculateMEAggregateStats(scene: BattleScene, baseSpawnWeight: n
scene.executeWithSeedOffset(() => {
biomes = (biomeLinks[currentBiome] as (Biome | [Biome, number])[])
.filter(b => {
- return !Array.isArray(b) || !Utils.randSeedInt(b[1]);
+ return !Array.isArray(b) || !randSeedInt(b[1]);
})
.map(b => !Array.isArray(b) ? b : b[0]);
}, i * 100);
if (biomes! && biomes.length > 0) {
const specialBiomes = biomes.filter(b => alwaysPickTheseBiomes.includes(b));
if (specialBiomes.length > 0) {
- currentBiome = specialBiomes[Utils.randSeedInt(specialBiomes.length)];
+ currentBiome = specialBiomes[randSeedInt(specialBiomes.length)];
} else {
- currentBiome = biomes[Utils.randSeedInt(biomes.length)];
+ currentBiome = biomes[randSeedInt(biomes.length)];
}
}
} else if (biomeLinks.hasOwnProperty(currentBiome)) {
@@ -950,7 +965,7 @@ export function calculateMEAggregateStats(scene: BattleScene, baseSpawnWeight: n
// Otherwise, roll encounter
- const roll = Utils.randSeedInt(256);
+ const roll = randSeedInt(256);
validMEfloorsByBiome.set(Biome[currentBiome], (validMEfloorsByBiome.get(Biome[currentBiome]) ?? 0) + 1);
// If total number of encounters is lower than expected for the run, slightly favor a new encounter
@@ -975,7 +990,7 @@ export function calculateMEAggregateStats(scene: BattleScene, baseSpawnWeight: n
tierWeights[1] = tierWeights[1] - 4 * numEncounters[1];
const totalWeight = tierWeights.reduce((a, b) => a + b);
- const tierValue = Utils.randSeedInt(totalWeight);
+ const tierValue = randSeedInt(totalWeight);
const commonThreshold = totalWeight - tierWeights[0]; // 64 - 32 = 32
const uncommonThreshold = totalWeight - tierWeights[0] - tierWeights[1]; // 64 - 32 - 16 = 16
const rareThreshold = totalWeight - tierWeights[0] - tierWeights[1] - tierWeights[2]; // 64 - 32 - 16 - 10 = 6
@@ -1055,7 +1070,7 @@ export function calculateRareSpawnAggregateStats(scene: BattleScene, luckValue:
const calculateNumRareEncounters = (): any[] => {
const bossEncountersByRarity = [ 0, 0, 0, 0 ];
- scene.setSeed(Utils.randomString(24));
+ scene.setSeed(randomString(24));
scene.resetSeed();
// There are 12 wild boss floors
for (let i = 0; i < 12; i++) {
@@ -1065,7 +1080,7 @@ export function calculateRareSpawnAggregateStats(scene: BattleScene, luckValue:
if (!isNaN(luckValue)) {
luckModifier = luckValue * 0.5;
}
- const tierValue = Utils.randSeedInt(64 - luckModifier);
+ const tierValue = randSeedInt(64 - luckModifier);
const tier = tierValue >= 20 ? BiomePoolTier.BOSS : tierValue >= 6 ? BiomePoolTier.BOSS_RARE : tierValue >= 1 ? BiomePoolTier.BOSS_SUPER_RARE : BiomePoolTier.BOSS_ULTRA_RARE;
switch (tier) {
diff --git a/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts b/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts
index 5fa8af95f4dd..a59f99d0182b 100644
--- a/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts
+++ b/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts
@@ -13,13 +13,13 @@ import { PartyOption, PartyUiMode } from "#app/ui/party-ui-handler";
import { Species } from "#enums/species";
import { Type } from "#app/data/type";
import PokemonSpecies, { getPokemonSpecies } from "#app/data/pokemon-species";
-import { speciesStarterCosts } from "#app/data/balance/starters";
-import { getEncounterText, queueEncounterMessage, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
+import { speciesStarterCosts } from "#balance/starters";
+import { getEncounterText, queueEncounterMessage, showEncounterText } from "#mystery-encounters/utils/encounter-dialogue-utils";
import { getPokemonNameWithAffix } from "#app/messages";
import { modifierTypes, PokemonHeldItemModifierType } from "#app/modifier/modifier-type";
import { Gender } from "#app/data/gender";
import { PermanentStat } from "#enums/stat";
-import { VictoryPhase } from "#app/phases/victory-phase";
+import { VictoryPhase } from "#phases/victory-phase";
import { SummaryUiMode } from "#app/ui/summary-ui-handler";
/** Will give +1 level every 10 waves */
diff --git a/src/data/nature.ts b/src/data/nature.ts
index edac06f1a4fc..fcd929cf8e3e 100644
--- a/src/data/nature.ts
+++ b/src/data/nature.ts
@@ -1,14 +1,14 @@
-import * as Utils from "../utils";
-import { TextStyle, getBBCodeFrag } from "../ui/text";
+import { toReadableString } from "#app/utils";
+import { TextStyle, getBBCodeFrag } from "#app/ui/text";
import { Nature } from "#enums/nature";
import { UiTheme } from "#enums/ui-theme";
import i18next from "i18next";
-import { Stat, EFFECTIVE_STATS, getShortenedStatKey } from "#app/enums/stat";
+import { Stat, EFFECTIVE_STATS, getShortenedStatKey } from "#enums/stat";
export { Nature };
export function getNatureName(nature: Nature, includeStatEffects: boolean = false, forStarterSelect: boolean = false, ignoreBBCode: boolean = false, uiTheme: UiTheme = UiTheme.DEFAULT): string {
- let ret = Utils.toReadableString(Nature[nature]);
+ let ret = toReadableString(Nature[nature]);
//Translating nature
if (i18next.exists("nature:" + ret)) {
ret = i18next.t("nature:" + ret as any);
diff --git a/src/data/pokemon-forms.ts b/src/data/pokemon-forms.ts
index 7cc20d50fb97..2dc2a4a2d116 100644
--- a/src/data/pokemon-forms.ts
+++ b/src/data/pokemon-forms.ts
@@ -11,7 +11,7 @@ import { TimeOfDay } from "#enums/time-of-day";
import { getPokemonNameWithAffix } from "#app/messages";
import i18next from "i18next";
import { WeatherType } from "./weather";
-import { Challenges } from "#app/enums/challenges";
+import { Challenges } from "#enums/challenges";
import { SpeciesFormKey } from "#enums/species-form-key";
export enum FormChangeItem {
diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts
index 947ac9399893..393b62d9fb6d 100644
--- a/src/data/pokemon-species.ts
+++ b/src/data/pokemon-species.ts
@@ -7,16 +7,16 @@ import i18next from "i18next";
import BattleScene, { AnySound } from "#app/battle-scene";
import { GameMode } from "#app/game-mode";
import { StarterMoveset } from "#app/system/game-data";
-import * as Utils from "#app/utils";
-import { uncatchableSpecies } from "#app/data/balance/biomes";
-import { speciesEggMoves } from "#app/data/balance/egg-moves";
+import { randSeedInt, randSeedGauss, randSeedItem } from "#app/utils";
+import { uncatchableSpecies } from "#balance/biomes";
+import { speciesEggMoves } from "#balance/egg-moves";
import { GrowthRate } from "#app/data/exp";
-import { EvolutionLevel, SpeciesWildEvolutionDelay, pokemonEvolutions, pokemonPrevolutions } from "#app/data/balance/pokemon-evolutions";
+import { EvolutionLevel, SpeciesWildEvolutionDelay, pokemonEvolutions, pokemonPrevolutions } from "#balance/pokemon-evolutions";
import { Type } from "#app/data/type";
-import { LevelMoves, pokemonFormLevelMoves, pokemonFormLevelMoves as pokemonSpeciesFormLevelMoves, pokemonSpeciesLevelMoves } from "#app/data/balance/pokemon-level-moves";
+import { LevelMoves, pokemonFormLevelMoves, pokemonFormLevelMoves as pokemonSpeciesFormLevelMoves, pokemonSpeciesLevelMoves } from "#balance/pokemon-level-moves";
import { Stat } from "#enums/stat";
import { Variant, VariantSet, variantColorCache, variantData } from "#app/data/variant";
-import { speciesStarterCosts, POKERUS_STARTER_COUNT } from "#app/data/balance/starters";
+import { speciesStarterCosts, POKERUS_STARTER_COUNT } from "#balance/starters";
import { SpeciesFormKey } from "#enums/species-form-key";
export enum Region {
@@ -793,7 +793,7 @@ export default class PokemonSpecies extends PokemonSpeciesForm implements Locali
return this.speciesId;
}
- const randValue = evolutionPool.size === 1 ? 0 : Utils.randSeedInt(totalWeight);
+ const randValue = evolutionPool.size === 1 ? 0 : randSeedInt(totalWeight);
for (const weight of evolutionPool.keys()) {
if (randValue < weight) {
@@ -855,11 +855,11 @@ export default class PokemonSpecies extends PokemonSpeciesForm implements Locali
ret.push([ prevolutionLevels[0][0], 1 ]);
for (let l = 1; l < prevolutionLevels.length; l++) {
const evolution = pokemonEvolutions[prevolutionLevels[l - 1][0]].find(e => e.speciesId === prevolutionLevels[l][0]);
- ret.push([ prevolutionLevels[l][0], Math.min(Math.max((evolution?.level!) + Math.round(Utils.randSeedGauss(0.5, 1 + levelDiff * 0.2) * Math.max((evolution?.wildDelay!), 0.5) * 5) - 1, 2, (evolution?.level!)), currentLevel - 1) ]); // TODO: are those bangs correct?
+ ret.push([ prevolutionLevels[l][0], Math.min(Math.max((evolution?.level!) + Math.round(randSeedGauss(0.5, 1 + levelDiff * 0.2) * Math.max((evolution?.wildDelay!), 0.5) * 5) - 1, 2, (evolution?.level!)), currentLevel - 1) ]); // TODO: are those bangs correct?
}
const lastPrevolutionLevel = ret[prevolutionLevels.length - 1][1];
const evolution = pokemonEvolutions[prevolutionLevels[prevolutionLevels.length - 1][0]].find(e => e.speciesId === this.speciesId);
- ret.push([ this.speciesId, Math.min(Math.max(lastPrevolutionLevel + Math.round(Utils.randSeedGauss(0.5, 1 + levelDiff * 0.2) * Math.max((evolution?.wildDelay!), 0.5) * 5), lastPrevolutionLevel + 1, (evolution?.level!)), currentLevel) ]); // TODO: are those bangs correct?
+ ret.push([ this.speciesId, Math.min(Math.max(lastPrevolutionLevel + Math.round(randSeedGauss(0.5, 1 + levelDiff * 0.2) * Math.max((evolution?.wildDelay!), 0.5) * 5), lastPrevolutionLevel + 1, (evolution?.level!)), currentLevel) ]); // TODO: are those bangs correct?
} else {
ret.push([ this.speciesId, 1 ]);
}
@@ -957,7 +957,7 @@ export function getPokerusStarters(scene: BattleScene): PokemonSpecies[] {
date.setUTCHours(0, 0, 0, 0);
scene.executeWithSeedOffset(() => {
while (pokerusStarters.length < POKERUS_STARTER_COUNT) {
- const randomSpeciesId = parseInt(Utils.randSeedItem(Object.keys(speciesStarterCosts)), 10);
+ const randomSpeciesId = parseInt(randSeedItem(Object.keys(speciesStarterCosts)), 10);
const species = getPokemonSpecies(randomSpeciesId);
if (!pokerusStarters.includes(species)) {
pokerusStarters.push(species);
diff --git a/src/data/status-effect.ts b/src/data/status-effect.ts
index 4319985f43ad..2e4129ce2dff 100644
--- a/src/data/status-effect.ts
+++ b/src/data/status-effect.ts
@@ -1,4 +1,4 @@
-import * as Utils from "../utils";
+import { randIntRange } from "#app/utils";
import { StatusEffect } from "#enums/status-effect";
import i18next, { ParseKeys } from "i18next";
@@ -107,7 +107,7 @@ export function getStatusEffectCatchRateMultiplier(statusEffect: StatusEffect):
* Returns a random non-volatile StatusEffect
*/
export function generateRandomStatusEffect(): StatusEffect {
- return Utils.randIntRange(1, 6);
+ return randIntRange(1, 6);
}
/**
@@ -123,7 +123,7 @@ export function getRandomStatusEffect(statusEffectA: StatusEffect, statusEffectB
return statusEffectA;
}
- return Utils.randIntRange(0, 2) ? statusEffectA : statusEffectB;
+ return randIntRange(0, 2) ? statusEffectA : statusEffectB;
}
/**
@@ -140,7 +140,7 @@ export function getRandomStatus(statusA: Status | null, statusB: Status | null):
}
- return Utils.randIntRange(0, 2) ? statusA : statusB;
+ return randIntRange(0, 2) ? statusA : statusB;
}
/**
diff --git a/src/data/terrain.ts b/src/data/terrain.ts
index d8ee8d679258..3e9d9f320ffa 100644
--- a/src/data/terrain.ts
+++ b/src/data/terrain.ts
@@ -1,7 +1,7 @@
-import Pokemon from "../field/pokemon";
+import Pokemon from "#app/field/pokemon";
import Move from "./move";
import { Type } from "./type";
-import * as Utils from "../utils";
+import { NumberHolder } from "#app/utils";
import { ChangeMovePriorityAbAttr, applyAbAttrs } from "./ability";
import { ProtectAttr } from "./move";
import { BattlerIndex } from "#app/battle";
@@ -58,7 +58,7 @@ export class Terrain {
switch (this.terrainType) {
case TerrainType.PSYCHIC:
if (!move.hasAttr(ProtectAttr)) {
- const priority = new Utils.IntegerHolder(move.priority);
+ const priority = new NumberHolder(move.priority);
applyAbAttrs(ChangeMovePriorityAbAttr, user, null, false, move, priority);
// Cancels move if the move has positive priority and targets a Pokemon grounded on the Psychic Terrain
return priority.value > 0 && user.getOpponents().some(o => targets.includes(o.getBattlerIndex()) && o.isGrounded());
diff --git a/src/data/trainer-config.ts b/src/data/trainer-config.ts
index fcc13975270c..d0e33dae9606 100644
--- a/src/data/trainer-config.ts
+++ b/src/data/trainer-config.ts
@@ -1,11 +1,11 @@
import BattleScene, { startingWave } from "#app/battle-scene";
import { ModifierTypeFunc, modifierTypes } from "#app/modifier/modifier-type";
import { EnemyPokemon, PokemonMove } from "#app/field/pokemon";
-import * as Utils from "#app/utils";
+import { toReadableString, randSeedItem, randSeedInt } from "#app/utils";
import { PokeballType } from "#app/data/pokeball";
-import { pokemonEvolutions, pokemonPrevolutions } from "#app/data/balance/pokemon-evolutions";
+import { pokemonEvolutions, pokemonPrevolutions } from "#balance/pokemon-evolutions";
import PokemonSpecies, { getPokemonSpecies, PokemonSpeciesFilter } from "#app/data/pokemon-species";
-import { tmSpecies } from "#app/data/balance/tms";
+import { tmSpecies } from "#balance/tms";
import { Type } from "#app/data/type";
import { doubleBattleDialogue } from "#app/data/dialogue";
import { PersistentModifier } from "#app/modifier/modifier";
@@ -223,7 +223,7 @@ export class TrainerConfig {
constructor(trainerType: TrainerType, allowLegendaries?: boolean) {
this.trainerType = trainerType;
- this.name = Utils.toReadableString(TrainerType[this.getDerivedType()]);
+ this.name = toReadableString(TrainerType[this.getDerivedType()]);
this.battleBgm = "battle_trainer";
this.mixedBattleBgm = "battle_trainer";
this.victoryBgm = "victory_trainer";
@@ -1157,7 +1157,7 @@ function getGymLeaderPartyTemplate(scene: BattleScene) {
*/
export function getRandomPartyMemberFunc(speciesPool: Species[], trainerSlot: TrainerSlot = TrainerSlot.TRAINER, ignoreEvolution: boolean = false, postProcess?: (enemyPokemon: EnemyPokemon) => void) {
return (scene: BattleScene, level: number, strength: PartyMemberStrength) => {
- let species = Utils.randSeedItem(speciesPool);
+ let species = randSeedItem(speciesPool);
if (!ignoreEvolution) {
species = getPokemonSpecies(species).getTrainerSpeciesForLevel(level, true, strength, scene.currentBattle.waveIndex);
}
@@ -1178,9 +1178,9 @@ function getRandomTeraModifiers(party: EnemyPokemon[], count: integer, types?: T
const ret: PersistentModifier[] = [];
const partyMemberIndexes = new Array(party.length).fill(null).map((_, i) => i);
for (let t = 0; t < Math.min(count, party.length); t++) {
- const randomIndex = Utils.randSeedItem(partyMemberIndexes);
+ const randomIndex = randSeedItem(partyMemberIndexes);
partyMemberIndexes.splice(partyMemberIndexes.indexOf(randomIndex), 1);
- ret.push(modifierTypes.TERA_SHARD().generateType([], [ Utils.randSeedItem(types ? types : party[randomIndex].getTypes()) ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(party[randomIndex]) as PersistentModifier); // TODO: is the bang correct?
+ ret.push(modifierTypes.TERA_SHARD().generateType([], [ randSeedItem(types ? types : party[randomIndex].getTypes()) ])!.withIdFromFunc(modifierTypes.TERA_SHARD).newModifier(party[randomIndex]) as PersistentModifier); // TODO: is the bang correct?
}
return ret;
}
@@ -2081,7 +2081,7 @@ export const trainerConfigs: TrainerConfigs = {
p.setBoss(true, 2);
p.generateAndPopulateMoveset();
p.pokeball = PokeballType.ULTRA_BALL;
- p.formIndex = Utils.randSeedInt(4, 1); // Shock, Burn, Chill, or Douse Drive
+ p.formIndex = randSeedInt(4, 1); // Shock, Burn, Chill, or Douse Drive
}))
.setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.BASCULEGION, Species.JELLICENT ], TrainerSlot.TRAINER, true, p => {
p.generateAndPopulateMoveset();
@@ -2299,7 +2299,7 @@ export const trainerConfigs: TrainerConfigs = {
.setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.LEAFEON, Species.GLACEON ]))
.setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.ROTOM ], TrainerSlot.TRAINER, true, p => {
p.generateAndPopulateMoveset();
- p.formIndex = Utils.randSeedInt(5, 1); // Heat, Wash, Frost, Fan, or Mow
+ p.formIndex = randSeedInt(5, 1); // Heat, Wash, Frost, Fan, or Mow
}))
.setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.SYLVEON ], TrainerSlot.TRAINER, true, p => {
p.abilityIndex = 2; // Pixilate
@@ -2330,7 +2330,7 @@ export const trainerConfigs: TrainerConfigs = {
}))
.setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.WALKING_WAKE, Species.GOUGING_FIRE, Species.RAGING_BOLT ]))
.setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.REVAVROOM ], TrainerSlot.TRAINER, true, p => {
- p.formIndex = Utils.randSeedInt(5, 1); //Random Starmobile form
+ p.formIndex = randSeedInt(5, 1); //Random Starmobile form
p.generateAndPopulateMoveset();
p.pokeball = PokeballType.ROGUE_BALL;
}))
diff --git a/src/data/trainer-names.ts b/src/data/trainer-names.ts
index d075b7121f2f..0d18d345efb6 100644
--- a/src/data/trainer-names.ts
+++ b/src/data/trainer-names.ts
@@ -1,12 +1,12 @@
import { TrainerType } from "#enums/trainer-type";
-import * as Utils from "../utils";
+import { toReadableString } from "#app/utils";
class TrainerNameConfig {
public urls: string[];
public femaleUrls: string[] | null;
constructor(type: TrainerType, ...urls: string[]) {
- this.urls = urls.length ? urls : [ Utils.toReadableString(TrainerType[type]).replace(/ /g, "_") ];
+ this.urls = urls.length ? urls : [ toReadableString(TrainerType[type]).replace(/ /g, "_") ];
}
hasGenderVariant(...femaleUrls: string[]): TrainerNameConfig {
diff --git a/src/data/variant.ts b/src/data/variant.ts
index 13869635f1e9..d84284db65f7 100644
--- a/src/data/variant.ts
+++ b/src/data/variant.ts
@@ -1,4 +1,4 @@
-import { VariantTier } from "#app/enums/variant-tier";
+import { VariantTier } from "#enums/variant-tier";
export type Variant = 0 | 1 | 2;
diff --git a/src/data/weather.ts b/src/data/weather.ts
index 20c03af77c83..1952dcfefab9 100644
--- a/src/data/weather.ts
+++ b/src/data/weather.ts
@@ -1,11 +1,11 @@
import { Biome } from "#enums/biome";
import { WeatherType } from "#enums/weather-type";
-import { getPokemonNameWithAffix } from "../messages";
-import Pokemon from "../field/pokemon";
+import { getPokemonNameWithAffix } from "#app/messages";
+import Pokemon from "#app/field/pokemon";
import { Type } from "./type";
import Move, { AttackMove } from "./move";
-import * as Utils from "../utils";
-import BattleScene from "../battle-scene";
+import { randSeedInt } from "#app/utils";
+import BattleScene from "#app/battle-scene";
import { SuppressWeatherEffectAbAttr } from "./ability";
import { TerrainType, getTerrainName } from "./terrain";
import i18next from "i18next";
@@ -378,7 +378,7 @@ export function getRandomWeatherType(arena: any /* Importing from arena causes a
let totalWeight = 0;
weatherPool.forEach(w => totalWeight += w.weight);
- const rand = Utils.randSeedInt(totalWeight);
+ const rand = randSeedInt(totalWeight);
let w = 0;
for (const weather of weatherPool) {
w += weather.weight;
diff --git a/src/field/anims.ts b/src/field/anims.ts
index c73c52027c52..373fc9ee8ed0 100644
--- a/src/field/anims.ts
+++ b/src/field/anims.ts
@@ -1,6 +1,6 @@
-import BattleScene from "../battle-scene";
-import { PokeballType } from "../data/pokeball";
-import * as Utils from "../utils";
+import BattleScene from "#app/battle-scene";
+import { PokeballType } from "#app/data/pokeball";
+import { getFrameMs, randGauss } from "#app/utils";
export function addPokeballOpenParticles(scene: BattleScene, x: number, y: number, pokeballType: PokeballType): void {
switch (pokeballType) {
@@ -127,7 +127,7 @@ function doFanOutParticle(scene: BattleScene, trigIndex: integer, x: integer, y:
const particleTimer = scene.tweens.addCounter({
repeat: -1,
- duration: Utils.getFrameMs(1),
+ duration: getFrameMs(1),
onRepeat: () => {
updateParticle();
}
@@ -159,7 +159,7 @@ export function addPokeballCaptureStars(scene: BattleScene, pokeball: Phaser.Gam
}
});
- const dist = Utils.randGauss(25);
+ const dist = randGauss(25);
scene.tweens.add({
targets: particle,
x: pokeball.x + dist,
diff --git a/src/field/arena.ts b/src/field/arena.ts
index 7bfdf9a0000a..3838ec26133f 100644
--- a/src/field/arena.ts
+++ b/src/field/arena.ts
@@ -1,16 +1,33 @@
import BattleScene from "#app/battle-scene";
-import { biomePokemonPools, BiomePoolTier, BiomeTierTrainerPools, biomeTrainerPools, PokemonPools } from "#app/data/balance/biomes";
-import { Constructor } from "#app/utils";
-import * as Utils from "#app/utils";
+import {
+ biomePokemonPools,
+ BiomePoolTier,
+ BiomeTierTrainerPools,
+ biomeTrainerPools,
+ PokemonPools,
+} from "#balance/biomes";
+import { Constructor, randSeedInt } from "#app/utils";
import PokemonSpecies, { getPokemonSpecies } from "#app/data/pokemon-species";
-import { getTerrainClearMessage, getTerrainStartMessage, getWeatherClearMessage, getWeatherStartMessage, Weather, WeatherType } from "#app/data/weather";
+import {
+ getTerrainClearMessage,
+ getTerrainStartMessage,
+ getWeatherClearMessage,
+ getWeatherStartMessage,
+ Weather,
+ WeatherType,
+} from "#app/data/weather";
import { CommonAnim } from "#app/data/battle-anims";
import { Type } from "#app/data/type";
import Move from "#app/data/move";
import { ArenaTag, ArenaTagSide, ArenaTrapTag, getArenaTag } from "#app/data/arena-tag";
import { BattlerIndex } from "#app/battle";
import { Terrain, TerrainType } from "#app/data/terrain";
-import { applyPostTerrainChangeAbAttrs, applyPostWeatherChangeAbAttrs, PostTerrainChangeAbAttr, PostWeatherChangeAbAttr } from "#app/data/ability";
+import {
+ applyPostTerrainChangeAbAttrs,
+ applyPostWeatherChangeAbAttrs,
+ PostTerrainChangeAbAttr,
+ PostWeatherChangeAbAttr,
+} from "#app/data/ability";
import Pokemon from "#app/field/pokemon";
import Overrides from "#app/overrides";
import { TagAddedEvent, TagRemovedEvent, TerrainChangedEvent, WeatherChangedEvent } from "#app/events/arena";
@@ -22,8 +39,8 @@ import { TimeOfDay } from "#enums/time-of-day";
import { TrainerType } from "#enums/trainer-type";
import { Abilities } from "#enums/abilities";
import { SpeciesFormChangeRevertWeatherFormTrigger, SpeciesFormChangeWeatherTrigger } from "#app/data/pokemon-forms";
-import { CommonAnimPhase } from "#app/phases/common-anim-phase";
-import { ShowAbilityPhase } from "#app/phases/show-ability-phase";
+import { CommonAnimPhase } from "#phases/common-anim-phase";
+import { ShowAbilityPhase } from "#phases/show-ability-phase";
export class Arena {
public scene: BattleScene;
@@ -90,7 +107,7 @@ export class Arena {
if (typeof luckValue !== "undefined") {
luckModifier = luckValue * (isBossSpecies ? 0.5 : 2);
}
- const tierValue = Utils.randSeedInt(randVal - luckModifier);
+ const tierValue = randSeedInt(randVal - luckModifier);
let tier = !isBossSpecies
? tierValue >= 156 ? BiomePoolTier.COMMON : tierValue >= 32 ? BiomePoolTier.UNCOMMON : tierValue >= 6 ? BiomePoolTier.RARE : tierValue >= 1 ? BiomePoolTier.SUPER_RARE : BiomePoolTier.ULTRA_RARE
: tierValue >= 20 ? BiomePoolTier.BOSS : tierValue >= 6 ? BiomePoolTier.BOSS_RARE : tierValue >= 1 ? BiomePoolTier.BOSS_SUPER_RARE : BiomePoolTier.BOSS_ULTRA_RARE;
@@ -105,7 +122,7 @@ export class Arena {
if (!tierPool.length) {
ret = this.scene.randomSpecies(waveIndex, level);
} else {
- const entry = tierPool[Utils.randSeedInt(tierPool.length)];
+ const entry = tierPool[randSeedInt(tierPool.length)];
let species: Species;
if (typeof entry === "number") {
species = entry as Species;
@@ -116,7 +133,7 @@ export class Arena {
if (level >= levelThreshold) {
const speciesIds = entry[levelThreshold];
if (speciesIds.length > 1) {
- species = speciesIds[Utils.randSeedInt(speciesIds.length)];
+ species = speciesIds[randSeedInt(speciesIds.length)];
} else {
species = speciesIds[0];
}
@@ -162,7 +179,7 @@ export class Arena {
const isTrainerBoss = !!this.trainerPool[BiomePoolTier.BOSS].length
&& (this.scene.gameMode.isTrainerBoss(waveIndex, this.biomeType, this.scene.offsetGym) || isBoss);
console.log(isBoss, this.trainerPool);
- const tierValue = Utils.randSeedInt(!isTrainerBoss ? 512 : 64);
+ const tierValue = randSeedInt(!isTrainerBoss ? 512 : 64);
let tier = !isTrainerBoss
? tierValue >= 156 ? BiomePoolTier.COMMON : tierValue >= 32 ? BiomePoolTier.UNCOMMON : tierValue >= 6 ? BiomePoolTier.RARE : tierValue >= 1 ? BiomePoolTier.SUPER_RARE : BiomePoolTier.ULTRA_RARE
: tierValue >= 20 ? BiomePoolTier.BOSS : tierValue >= 6 ? BiomePoolTier.BOSS_RARE : tierValue >= 1 ? BiomePoolTier.BOSS_SUPER_RARE : BiomePoolTier.BOSS_ULTRA_RARE;
@@ -172,7 +189,7 @@ export class Arena {
tier--;
}
const tierPool = this.trainerPool[tier] || [];
- return !tierPool.length ? TrainerType.BREEDER : tierPool[Utils.randSeedInt(tierPool.length)];
+ return !tierPool.length ? TrainerType.BREEDER : tierPool[randSeedInt(tierPool.length)];
}
getSpeciesFormIndex(species: PokemonSpecies): integer {
@@ -912,7 +929,7 @@ export class ArenaBase extends Phaser.GameObjects.Container {
if (!this.player) {
(this.scene as BattleScene).executeWithSeedOffset(() => {
this.propValue = propValue === undefined
- ? hasProps ? Utils.randSeedInt(8) : 0
+ ? hasProps ? randSeedInt(8) : 0
: propValue;
this.props.forEach((prop, p) => {
const propKey = `${biomeKey}_b${hasProps ? `_${p + 1}` : ""}`;
diff --git a/src/field/damage-number-handler.ts b/src/field/damage-number-handler.ts
index 4ddcd2d3ee77..10e6f6678b48 100644
--- a/src/field/damage-number-handler.ts
+++ b/src/field/damage-number-handler.ts
@@ -1,7 +1,7 @@
-import { TextStyle, addTextObject } from "../ui/text";
+import { TextStyle, addTextObject } from "#app/ui/text";
import Pokemon, { DamageResult, HitResult } from "./pokemon";
-import * as Utils from "../utils";
-import { BattlerIndex } from "../battle";
+import { formatStat, fixedInt } from "#app/utils";
+import { BattlerIndex } from "#app/battle";
type TextAndShadowArr = [ string | null, string | null ];
@@ -21,7 +21,7 @@ export default class DamageNumberHandler {
const battlerIndex = target.getBattlerIndex();
const baseScale = target.getSpriteScale() / 6;
- const damageNumber = addTextObject(scene, target.x, -(scene.game.canvas.height / 6) + target.y - target.getSprite().height / 2, Utils.formatStat(amount, true), TextStyle.SUMMARY);
+ const damageNumber = addTextObject(scene, target.x, -(scene.game.canvas.height / 6) + target.y - target.getSprite().height / 2, formatStat(amount, true), TextStyle.SUMMARY);
damageNumber.setName("text-damage-number");
damageNumber.setOrigin(0.5, 1);
damageNumber.setScale(baseScale);
@@ -74,14 +74,14 @@ export default class DamageNumberHandler {
if (scene.damageNumbersMode === 1) {
scene.tweens.add({
targets: damageNumber,
- duration: Utils.fixedInt(750),
+ duration: fixedInt(750),
alpha: 1,
y: "-=32"
});
scene.tweens.add({
delay: 375,
targets: damageNumber,
- duration: Utils.fixedInt(625),
+ duration: fixedInt(625),
alpha: 0,
ease: "Sine.easeIn",
onComplete: () => {
@@ -98,7 +98,7 @@ export default class DamageNumberHandler {
targets: damageNumber,
tweens: [
{
- duration: Utils.fixedInt(250),
+ duration: fixedInt(250),
alpha: 1,
scaleX: 0.75 * baseScale,
scaleY: 1.25 * baseScale,
@@ -106,7 +106,7 @@ export default class DamageNumberHandler {
ease: "Cubic.easeOut"
},
{
- duration: Utils.fixedInt(175),
+ duration: fixedInt(175),
alpha: 1,
scaleX: 0.875 * baseScale,
scaleY: 1.125 * baseScale,
@@ -114,59 +114,59 @@ export default class DamageNumberHandler {
ease: "Cubic.easeIn"
},
{
- duration: Utils.fixedInt(100),
+ duration: fixedInt(100),
scaleX: 1.25 * baseScale,
scaleY: 0.75 * baseScale,
ease: "Cubic.easeOut"
},
{
- duration: Utils.fixedInt(175),
+ duration: fixedInt(175),
scaleX: 0.875 * baseScale,
scaleY: 1.125 * baseScale,
y: "-=8",
ease: "Cubic.easeOut"
},
{
- duration: Utils.fixedInt(50),
+ duration: fixedInt(50),
scaleX: 0.925 * baseScale,
scaleY: 1.075 * baseScale,
y: "+=8",
ease: "Cubic.easeIn"
},
{
- duration: Utils.fixedInt(100),
+ duration: fixedInt(100),
scaleX: 1.125 * baseScale,
scaleY: 0.875 * baseScale,
ease: "Cubic.easeOut"
},
{
- duration: Utils.fixedInt(175),
+ duration: fixedInt(175),
scaleX: 0.925 * baseScale,
scaleY: 1.075 * baseScale,
y: "-=4",
ease: "Cubic.easeOut"
},
{
- duration: Utils.fixedInt(50),
+ duration: fixedInt(50),
scaleX: 0.975 * baseScale,
scaleY: 1.025 * baseScale,
y: "+=4",
ease: "Cubic.easeIn"
},
{
- duration: Utils.fixedInt(100),
+ duration: fixedInt(100),
scaleX: 1.075 * baseScale,
scaleY: 0.925 * baseScale,
ease: "Cubic.easeOut"
},
{
- duration: Utils.fixedInt(25),
+ duration: fixedInt(25),
scaleX: baseScale,
scaleY: baseScale,
ease: "Cubic.easeOut"
},
{
- delay: Utils.fixedInt(500),
+ delay: fixedInt(500),
alpha: 0,
onComplete: () => {
this.damageNumbers.get(battlerIndex)!.splice(this.damageNumbers.get(battlerIndex)!.indexOf(damageNumber), 1);
diff --git a/src/field/mystery-encounter-intro.ts b/src/field/mystery-encounter-intro.ts
index 12bcace500c1..9d3e0e78bd66 100644
--- a/src/field/mystery-encounter-intro.ts
+++ b/src/field/mystery-encounter-intro.ts
@@ -3,7 +3,7 @@ import BattleScene from "../battle-scene";
import MysteryEncounter from "../data/mystery-encounters/mystery-encounter";
import { Species } from "#enums/species";
import { isNullOrUndefined } from "#app/utils";
-import { getSpriteKeysFromSpecies } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
+import { getSpriteKeysFromSpecies } from "#mystery-encounters/utils/encounter-pokemon-utils";
import PlayAnimationConfig = Phaser.Types.Animations.PlayAnimationConfig;
type KnownFileRoot =
diff --git a/src/field/pokemon-sprite-sparkle-handler.ts b/src/field/pokemon-sprite-sparkle-handler.ts
index 2c4c295eaa4c..de674987f5da 100644
--- a/src/field/pokemon-sprite-sparkle-handler.ts
+++ b/src/field/pokemon-sprite-sparkle-handler.ts
@@ -1,6 +1,6 @@
-import BattleScene from "../battle-scene";
+import BattleScene from "#app/battle-scene";
import Pokemon from "./pokemon";
-import * as Utils from "../utils";
+import { fixedInt, randInt } from "#app/utils";
export default class PokemonSpriteSparkleHandler {
private sprites: Set<Phaser.GameObjects.Sprite>;
@@ -9,7 +9,7 @@ export default class PokemonSpriteSparkleHandler {
this.sprites = new Set();
scene.tweens.addCounter({
- duration: Utils.fixedInt(200),
+ duration: fixedInt(200),
from: 0,
to: 1,
yoyo: true,
@@ -31,7 +31,7 @@ export default class PokemonSpriteSparkleHandler {
const parent = (pokemon || s).parentContainer;
const texture = s.texture;
const [ width, height ] = [ texture.source[0].width, texture.source[0].height ];
- const [ pixelX, pixelY ] = [ Utils.randInt(width), Utils.randInt(height) ];
+ const [ pixelX, pixelY ] = [ randInt(width), randInt(height) ];
const ratioX = s.width / width;
const ratioY = s.height / height;
const pixel = texture.manager.getPixel(pixelX, pixelY, texture.key, "__BASE");
@@ -42,7 +42,7 @@ export default class PokemonSpriteSparkleHandler {
sparkle.setName("sprite-tera-sparkle");
sparkle.play("tera_sparkle");
parent.add(sparkle);
- s.scene.time.delayedCall(Utils.fixedInt(Math.floor((1000 / 12) * 13)), () => sparkle.destroy());
+ s.scene.time.delayedCall(fixedInt(Math.floor((1000 / 12) * 13)), () => sparkle.destroy());
}
}
}
diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index 94b9fd12540a..efc5ed378f8c 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -3,42 +3,203 @@ import BattleScene, { AnySound } from "#app/battle-scene";
import { Variant, VariantSet, variantColorCache } from "#app/data/variant";
import { variantData } from "#app/data/variant";
import BattleInfo, { PlayerBattleInfo, EnemyBattleInfo } from "#app/ui/battle-info";
-import Move, { HighCritAttr, HitsTagAttr, applyMoveAttrs, FixedDamageAttr, VariableAtkAttr, allMoves, MoveCategory, TypelessAttr, CritOnlyAttr, getMoveTargets, OneHitKOAttr, VariableMoveTypeAttr, VariableDefAttr, AttackMove, ModifiedDamageAttr, VariableMoveTypeMultiplierAttr, IgnoreOpponentStatStagesAttr, SacrificialAttr, VariableMoveCategoryAttr, CounterDamageAttr, StatStageChangeAttr, RechargeAttr, ChargeAttr, IgnoreWeatherTypeDebuffAttr, BypassBurnDamageReductionAttr, SacrificialAttrOnHit, OneHitKOAccuracyAttr, RespectAttackTypeImmunityAttr, MoveTarget, CombinedPledgeStabBoostAttr } from "#app/data/move";
-import { default as PokemonSpecies, PokemonSpeciesForm, getFusedSpeciesName, getPokemonSpecies, getPokemonSpeciesForm } from "#app/data/pokemon-species";
-import { CLASSIC_CANDY_FRIENDSHIP_MULTIPLIER, getStarterValueFriendshipCap, speciesStarterCosts } from "#app/data/balance/starters";
-import { starterPassiveAbilities } from "#app/data/balance/passives";
-import { Constructor, isNullOrUndefined, randSeedInt } from "#app/utils";
-import * as Utils from "#app/utils";
+import Move, {
+ HighCritAttr,
+ HitsTagAttr,
+ applyMoveAttrs,
+ FixedDamageAttr,
+ VariableAtkAttr,
+ allMoves,
+ MoveCategory,
+ TypelessAttr,
+ CritOnlyAttr,
+ getMoveTargets,
+ OneHitKOAttr,
+ VariableMoveTypeAttr,
+ VariableDefAttr,
+ AttackMove,
+ ModifiedDamageAttr,
+ VariableMoveTypeMultiplierAttr,
+ IgnoreOpponentStatStagesAttr,
+ SacrificialAttr,
+ VariableMoveCategoryAttr,
+ CounterDamageAttr,
+ StatStageChangeAttr,
+ RechargeAttr,
+ ChargeAttr,
+ IgnoreWeatherTypeDebuffAttr,
+ BypassBurnDamageReductionAttr,
+ SacrificialAttrOnHit,
+ OneHitKOAccuracyAttr,
+ RespectAttackTypeImmunityAttr,
+ MoveTarget,
+ CombinedPledgeStabBoostAttr,
+} from "#app/data/move";
+import {
+ default as PokemonSpecies,
+ PokemonSpeciesForm,
+ getFusedSpeciesName,
+ getPokemonSpecies,
+ getPokemonSpeciesForm,
+} from "#app/data/pokemon-species";
+import {
+ CLASSIC_CANDY_FRIENDSHIP_MULTIPLIER,
+ getStarterValueFriendshipCap,
+ speciesStarterCosts,
+} from "#balance/starters";
+import { starterPassiveAbilities } from "#balance/passives";
+import {
+ randSeedInt,
+ getIvsFromId,
+ BooleanHolder,
+ NumberHolder,
+ getEnumValues,
+ isNullOrUndefined,
+ toDmgValue,
+ fixedInt,
+ rgbaToInt,
+ rgbHexToRgba,
+ rgbToHsv,
+ deltaRgb,
+ isBetween,
+ Constructor,
+} from "#app/utils";
import { Type, TypeDamageMultiplier, getTypeDamageMultiplier, getTypeRgb } from "#app/data/type";
import { getLevelTotalExp } from "#app/data/exp";
-import { Stat, type PermanentStat, type BattleStat, type EffectiveStat, PERMANENT_STATS, BATTLE_STATS, EFFECTIVE_STATS } from "#enums/stat";
-import { DamageMoneyRewardModifier, EnemyDamageBoosterModifier, EnemyDamageReducerModifier, EnemyEndureChanceModifier, EnemyFusionChanceModifier, HiddenAbilityRateBoosterModifier, BaseStatModifier, PokemonFriendshipBoosterModifier, PokemonHeldItemModifier, PokemonNatureWeightModifier, ShinyRateBoosterModifier, SurviveDamageModifier, TempStatStageBoosterModifier, TempCritBoosterModifier, StatBoosterModifier, CritBoosterModifier, TerastallizeModifier, PokemonBaseStatFlatModifier, PokemonBaseStatTotalModifier, PokemonIncrementingStatModifier, EvoTrackerModifier } from "#app/modifier/modifier";
+import {
+ Stat,
+ type PermanentStat,
+ type BattleStat,
+ type EffectiveStat,
+ PERMANENT_STATS,
+ BATTLE_STATS,
+ EFFECTIVE_STATS,
+} from "#enums/stat";
+import {
+ DamageMoneyRewardModifier,
+ EnemyDamageBoosterModifier,
+ EnemyDamageReducerModifier,
+ EnemyEndureChanceModifier,
+ EnemyFusionChanceModifier,
+ HiddenAbilityRateBoosterModifier,
+ BaseStatModifier,
+ PokemonFriendshipBoosterModifier,
+ PokemonHeldItemModifier,
+ PokemonNatureWeightModifier,
+ ShinyRateBoosterModifier,
+ SurviveDamageModifier,
+ TempStatStageBoosterModifier,
+ TempCritBoosterModifier,
+ StatBoosterModifier,
+ CritBoosterModifier,
+ TerastallizeModifier,
+ PokemonBaseStatFlatModifier,
+ PokemonBaseStatTotalModifier,
+ PokemonIncrementingStatModifier,
+ EvoTrackerModifier,
+} from "#app/modifier/modifier";
import { PokeballType } from "#app/data/pokeball";
import { Gender } from "#app/data/gender";
import { initMoveAnim, loadMoveAnimAssets } from "#app/data/battle-anims";
import { Status, StatusEffect, getRandomStatus } from "#app/data/status-effect";
-import { pokemonEvolutions, pokemonPrevolutions, SpeciesFormEvolution, SpeciesEvolutionCondition, FusionSpeciesFormEvolution } from "#app/data/balance/pokemon-evolutions";
-import { reverseCompatibleTms, tmSpecies, tmPoolTiers } from "#app/data/balance/tms";
-import { BattlerTag, BattlerTagLapseType, EncoreTag, GroundedTag, HighestStatBoostTag, SubstituteTag, TypeImmuneTag, getBattlerTag, SemiInvulnerableTag, TypeBoostTag, MoveRestrictionBattlerTag, ExposedTag, DragonCheerTag, CritBoostTag, TrappedTag, TarShotTag, AutotomizedTag, PowerTrickTag } from "../data/battler-tags";
+import {
+ pokemonEvolutions,
+ pokemonPrevolutions,
+ SpeciesFormEvolution,
+ SpeciesEvolutionCondition,
+ FusionSpeciesFormEvolution,
+} from "#balance/pokemon-evolutions";
+import { reverseCompatibleTms, tmSpecies, tmPoolTiers } from "#balance/tms";
+import {
+ BattlerTag,
+ BattlerTagLapseType,
+ EncoreTag,
+ GroundedTag,
+ HighestStatBoostTag,
+ SubstituteTag,
+ TypeImmuneTag,
+ getBattlerTag,
+ SemiInvulnerableTag,
+ TypeBoostTag,
+ MoveRestrictionBattlerTag,
+ ExposedTag,
+ DragonCheerTag,
+ CritBoostTag,
+ TrappedTag,
+ TarShotTag,
+ AutotomizedTag,
+ PowerTrickTag,
+} from "#app/data/battler-tags";
import { WeatherType } from "#app/data/weather";
import { ArenaTagSide, NoCritTag, WeakenMoveScreenTag } from "#app/data/arena-tag";
-import { Ability, AbAttr, StatMultiplierAbAttr, BlockCritAbAttr, BonusCritAbAttr, BypassBurnDamageReductionAbAttr, FieldPriorityMoveImmunityAbAttr, IgnoreOpponentStatStagesAbAttr, MoveImmunityAbAttr, PreDefendFullHpEndureAbAttr, ReceivedMoveDamageMultiplierAbAttr, ReduceStatusEffectDurationAbAttr, StabBoostAbAttr, StatusEffectImmunityAbAttr, TypeImmunityAbAttr, WeightMultiplierAbAttr, allAbilities, applyAbAttrs, applyStatMultiplierAbAttrs, applyPreApplyBattlerTagAbAttrs, applyPreAttackAbAttrs, applyPreDefendAbAttrs, applyPreSetStatusAbAttrs, UnsuppressableAbilityAbAttr, SuppressFieldAbilitiesAbAttr, NoFusionAbilityAbAttr, MultCritAbAttr, IgnoreTypeImmunityAbAttr, DamageBoostAbAttr, IgnoreTypeStatusEffectImmunityAbAttr, ConditionalCritAbAttr, applyFieldStatMultiplierAbAttrs, FieldMultiplyStatAbAttr, AddSecondStrikeAbAttr, UserFieldStatusEffectImmunityAbAttr, UserFieldBattlerTagImmunityAbAttr, BattlerTagImmunityAbAttr, MoveTypeChangeAbAttr, FullHpResistTypeAbAttr, applyCheckTrappedAbAttrs, CheckTrappedAbAttr, PostSetStatusAbAttr, applyPostSetStatusAbAttrs, InfiltratorAbAttr } from "#app/data/ability";
+import {
+ Ability,
+ AbAttr,
+ StatMultiplierAbAttr,
+ BlockCritAbAttr,
+ BonusCritAbAttr,
+ BypassBurnDamageReductionAbAttr,
+ FieldPriorityMoveImmunityAbAttr,
+ IgnoreOpponentStatStagesAbAttr,
+ MoveImmunityAbAttr,
+ PreDefendFullHpEndureAbAttr,
+ ReceivedMoveDamageMultiplierAbAttr,
+ ReduceStatusEffectDurationAbAttr,
+ StabBoostAbAttr,
+ StatusEffectImmunityAbAttr,
+ TypeImmunityAbAttr,
+ WeightMultiplierAbAttr,
+ allAbilities,
+ applyAbAttrs,
+ applyStatMultiplierAbAttrs,
+ applyPreApplyBattlerTagAbAttrs,
+ applyPreAttackAbAttrs,
+ applyPreDefendAbAttrs,
+ applyPreSetStatusAbAttrs,
+ UnsuppressableAbilityAbAttr,
+ SuppressFieldAbilitiesAbAttr,
+ NoFusionAbilityAbAttr,
+ MultCritAbAttr,
+ IgnoreTypeImmunityAbAttr,
+ DamageBoostAbAttr,
+ IgnoreTypeStatusEffectImmunityAbAttr,
+ ConditionalCritAbAttr,
+ applyFieldStatMultiplierAbAttrs,
+ FieldMultiplyStatAbAttr,
+ AddSecondStrikeAbAttr,
+ UserFieldStatusEffectImmunityAbAttr,
+ UserFieldBattlerTagImmunityAbAttr,
+ BattlerTagImmunityAbAttr,
+ MoveTypeChangeAbAttr,
+ FullHpResistTypeAbAttr,
+ applyCheckTrappedAbAttrs,
+ CheckTrappedAbAttr,
+ PostSetStatusAbAttr,
+ applyPostSetStatusAbAttrs,
+ InfiltratorAbAttr,
+} from "#app/data/ability";
import PokemonData from "#app/system/pokemon-data";
import { BattlerIndex } from "#app/battle";
import { Mode } from "#app/ui/ui";
import PartyUiHandler, { PartyOption, PartyUiMode } from "#app/ui/party-ui-handler";
import SoundFade from "phaser3-rex-plugins/plugins/soundfade";
-import { LevelMoves } from "#app/data/balance/pokemon-level-moves";
+import { LevelMoves } from "#balance/pokemon-level-moves";
import { DamageAchv, achvs } from "#app/system/achv";
import { DexAttr, StarterDataEntry, StarterMoveset } from "#app/system/game-data";
import { QuantizerCelebi, argbFromRgba, rgbaFromArgb } from "@material/material-color-utilities";
import { Nature, getNatureStatMultiplier } from "#app/data/nature";
-import { SpeciesFormChange, SpeciesFormChangeActiveTrigger, SpeciesFormChangeMoveLearnedTrigger, SpeciesFormChangePostMoveTrigger, SpeciesFormChangeStatusEffectTrigger } from "#app/data/pokemon-forms";
+import {
+ SpeciesFormChange,
+ SpeciesFormChangeActiveTrigger,
+ SpeciesFormChangeMoveLearnedTrigger,
+ SpeciesFormChangePostMoveTrigger,
+ SpeciesFormChangeStatusEffectTrigger,
+} from "#app/data/pokemon-forms";
import { TerrainType } from "#app/data/terrain";
import { TrainerSlot } from "#app/data/trainer-config";
import Overrides from "#app/overrides";
import i18next from "i18next";
-import { speciesEggMoves } from "#app/data/balance/egg-moves";
+import { speciesEggMoves } from "#balance/egg-moves";
import { ModifierTier } from "#app/modifier/modifier-tier";
import { applyChallenges, ChallengeType } from "#app/data/challenge";
import { Abilities } from "#enums/abilities";
@@ -50,22 +211,27 @@ import { Biome } from "#enums/biome";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import { getPokemonNameWithAffix } from "#app/messages";
-import { DamagePhase } from "#app/phases/damage-phase";
-import { FaintPhase } from "#app/phases/faint-phase";
-import { LearnMovePhase } from "#app/phases/learn-move-phase";
-import { MoveEffectPhase } from "#app/phases/move-effect-phase";
-import { MoveEndPhase } from "#app/phases/move-end-phase";
-import { ObtainStatusEffectPhase } from "#app/phases/obtain-status-effect-phase";
-import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
-import { SwitchSummonPhase } from "#app/phases/switch-summon-phase";
-import { ToggleDoublePositionPhase } from "#app/phases/toggle-double-position-phase";
+import { DamagePhase } from "#phases/damage-phase";
+import { FaintPhase } from "#phases/faint-phase";
+import { LearnMovePhase } from "#phases/learn-move-phase";
+import { MoveEffectPhase } from "#phases/move-effect-phase";
+import { MoveEndPhase } from "#phases/move-end-phase";
+import { ObtainStatusEffectPhase } from "#phases/obtain-status-effect-phase";
+import { StatStageChangePhase } from "#phases/stat-stage-change-phase";
+import { SwitchSummonPhase } from "#phases/switch-summon-phase";
+import { ToggleDoublePositionPhase } from "#phases/toggle-double-position-phase";
import { Challenges } from "#enums/challenges";
import { PokemonAnimType } from "#enums/pokemon-anim-type";
import { PLAYER_PARTY_MAX_SIZE } from "#app/constants";
import { CustomPokemonData } from "#app/data/custom-pokemon-data";
import { SwitchType } from "#enums/switch-type";
import { SpeciesFormKey } from "#enums/species-form-key";
-import { BASE_HIDDEN_ABILITY_CHANCE, BASE_SHINY_CHANCE, SHINY_EPIC_CHANCE, SHINY_VARIANT_CHANCE } from "#app/data/balance/rates";
+import {
+ BASE_HIDDEN_ABILITY_CHANCE,
+ BASE_SHINY_CHANCE,
+ SHINY_EPIC_CHANCE,
+ SHINY_VARIANT_CHANCE,
+} from "#balance/rates";
export enum FieldPosition {
CENTER,
@@ -143,7 +309,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
throw `Cannot create a player Pokemon for species '${species.getName(formIndex)}'`;
}
- const hiddenAbilityChance = new Utils.IntegerHolder(BASE_HIDDEN_ABILITY_CHANCE);
+ const hiddenAbilityChance = new NumberHolder(BASE_HIDDEN_ABILITY_CHANCE);
if (!this.hasTrainer()) {
this.scene.applyModifiers(HiddenAbilityRateBoosterModifier, true, hiddenAbilityChance);
}
@@ -158,8 +324,8 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
this.abilityIndex = abilityIndex; // Use the provided ability index if it is defined
} else {
// If abilityIndex is not provided, determine it based on species and hidden ability
- const hasHiddenAbility = !Utils.randSeedInt(hiddenAbilityChance.value);
- const randAbilityIndex = Utils.randSeedInt(2);
+ const hasHiddenAbility = !randSeedInt(hiddenAbilityChance.value);
+ const randAbilityIndex = randSeedInt(2);
if (species.abilityHidden && hasHiddenAbility) {
// If the species has a hidden ability and the hidden ability is present
this.abilityIndex = 2;
@@ -215,8 +381,8 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
this.usedTMs = dataSource.usedTMs ?? [];
this.customPokemonData = new CustomPokemonData(dataSource.customPokemonData);
} else {
- this.id = Utils.randSeedInt(4294967296);
- this.ivs = ivs || Utils.getIvsFromId(this.id);
+ this.id = randSeedInt(4294967296);
+ this.ivs = ivs || getIvsFromId(this.id);
if (this.gender === undefined) {
this.generateGender();
@@ -250,7 +416,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
this.pokerus = false;
if (level > 1) {
- const fused = new Utils.BooleanHolder(scene.gameMode.isSplicedOnly);
+ const fused = new BooleanHolder(scene.gameMode.isSplicedOnly);
if (!fused.value && !this.isPlayer() && !this.hasTrainer()) {
this.scene.applyModifier(EnemyFusionChanceModifier, false, fused);
}
@@ -345,7 +511,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
* @returns {boolean} True if pokemon is allowed in battle
*/
isAllowed(): boolean {
- const challengeAllowed = new Utils.BooleanHolder(true);
+ const challengeAllowed = new BooleanHolder(true);
applyChallenges(this.scene.gameMode, ChallengeType.POKEMON_IN_BATTLE, this, challengeAllowed);
return challengeAllowed.value;
}
@@ -858,11 +1024,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
* @returns the final critical-hit stage value
*/
getCritStage(source: Pokemon, move: Move): number {
- const critStage = new Utils.IntegerHolder(0);
+ const critStage = new NumberHolder(0);
applyMoveAttrs(HighCritAttr, source, this, move, critStage);
this.scene.applyModifiers(CritBoosterModifier, source.isPlayer(), source, critStage);
this.scene.applyModifiers(TempCritBoosterModifier, source.isPlayer(), critStage);
- const bonusCrit = new Utils.BooleanHolder(false);
+ const bonusCrit = new BooleanHolder(false);
//@ts-ignore
if (applyAbAttrs(BonusCritAbAttr, source, null, false, bonusCrit)) { // TODO: resolve ts-ignore. This is a promise. Checking a promise is bogus.
if (bonusCrit.value) {
@@ -896,11 +1062,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
* @returns the final in-battle value of a stat
*/
getEffectiveStat(stat: EffectiveStat, opponent?: Pokemon, move?: Move, ignoreAbility: boolean = false, ignoreOppAbility: boolean = false, isCritical: boolean = false, simulated: boolean = true): integer {
- const statValue = new Utils.NumberHolder(this.getStat(stat, false));
+ const statValue = new NumberHolder(this.getStat(stat, false));
this.scene.applyModifiers(StatBoosterModifier, this.isPlayer(), this, stat, statValue);
// The Ruin abilities here are never ignored, but they reveal themselves on summon anyway
- const fieldApplied = new Utils.BooleanHolder(false);
+ const fieldApplied = new BooleanHolder(false);
for (const pokemon of this.scene.getField(true)) {
applyFieldStatMultiplierAbAttrs(FieldMultiplyStatAbAttr, pokemon, stat, statValue, this, fieldApplied, simulated);
if (fieldApplied.value) {
@@ -966,7 +1132,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
const baseStats = this.calculateBaseStats();
// Using base stats, calculate and store stats one by one
for (const s of PERMANENT_STATS) {
- const statHolder = new Utils.IntegerHolder(Math.floor(((2 * baseStats[s] + this.ivs[s]) * this.level) * 0.01));
+ const statHolder = new NumberHolder(Math.floor(((2 * baseStats[s] + this.ivs[s]) * this.level) * 0.01));
if (s === Stat.HP) {
statHolder.value = statHolder.value + this.level + 10;
this.scene.applyModifier(PokemonIncrementingStatModifier, this.isPlayer(), this, s, statHolder);
@@ -983,7 +1149,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
}
} else {
statHolder.value += 5;
- const natureStatMultiplier = new Utils.NumberHolder(getNatureStatMultiplier(this.getNature(), s));
+ const natureStatMultiplier = new NumberHolder(getNatureStatMultiplier(this.getNature(), s));
this.scene.applyModifier(PokemonNatureWeightModifier, this.isPlayer(), this, natureStatMultiplier);
if (natureStatMultiplier.value !== 1) {
statHolder.value = Math.max(Math[natureStatMultiplier.value > 1 ? "ceil" : "floor"](statHolder.value * natureStatMultiplier.value), 1);
@@ -1030,9 +1196,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
generateNature(naturePool?: Nature[]): void {
if (naturePool === undefined) {
- naturePool = Utils.getEnumValues(Nature);
+ naturePool = getEnumValues(Nature);
}
- const nature = naturePool[Utils.randSeedInt(naturePool.length)];
+ const nature = naturePool[randSeedInt(naturePool.length)];
this.setNature(nature);
}
@@ -1404,7 +1570,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
return false;
}
if (this.isOnField() && !ability.hasAttr(SuppressFieldAbilitiesAbAttr)) {
- const suppressed = new Utils.BooleanHolder(false);
+ const suppressed = new BooleanHolder(false);
this.scene.getField(true).filter(p => p !== this).map(p => {
if (p.getAbility().hasAttr(SuppressFieldAbilitiesAbAttr) && p.canApplyAbility()) {
p.getAbility().getAttrs(SuppressFieldAbilitiesAbAttr).map(a => a.apply(this, false, false, suppressed, [ ability ]));
@@ -1467,11 +1633,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
getWeight(): number {
const autotomizedTag = this.getTag(AutotomizedTag);
let weightRemoved = 0;
- if (!Utils.isNullOrUndefined(autotomizedTag)) {
+ if (!isNullOrUndefined(autotomizedTag)) {
weightRemoved = 100 * autotomizedTag!.autotomizeCount;
}
const minWeight = 0.1;
- const weight = new Utils.NumberHolder(this.species.weight - weightRemoved);
+ const weight = new NumberHolder(this.species.weight - weightRemoved);
// This will trigger the ability overlay so only call this function when necessary
applyAbAttrs(WeightMultiplierAbAttr, this, null, false, weight);
@@ -1517,7 +1683,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
return false;
}
- const trappedByAbility = new Utils.BooleanHolder(false);
+ const trappedByAbility = new BooleanHolder(false);
const opposingField = this.isPlayer() ? this.scene.getEnemyField() : this.scene.getPlayerField();
opposingField.forEach(opponent =>
@@ -1535,7 +1701,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
* @returns the {@linkcode Type} of the move after attributes are applied
*/
getMoveType(move: Move, simulated: boolean = true): Type {
- const moveTypeHolder = new Utils.NumberHolder(move.type);
+ const moveTypeHolder = new NumberHolder(move.type);
applyMoveAttrs(VariableMoveTypeAttr, this, null, move, moveTypeHolder);
applyPreAttackAbAttrs(MoveTypeChangeAbAttr, this, null, move, simulated, moveTypeHolder);
@@ -1556,12 +1722,12 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
* @param move {@linkcode Move} The move being used by the attacking Pokémon.
* @param ignoreAbility Whether to ignore abilities that might affect type effectiveness or immunity (defaults to `false`).
* @param simulated Whether to apply abilities via simulated calls (defaults to `true`)
- * @param cancelled {@linkcode Utils.BooleanHolder} Stores whether the move was cancelled by a non-type-based immunity.
+ * @param cancelled {@linkcode BooleanHolder} Stores whether the move was cancelled by a non-type-based immunity.
* Currently only used by {@linkcode Pokemon.apply} to determine whether a "No effect" message should be shown.
* @returns The type damage multiplier, indicating the effectiveness of the move
*/
- getMoveEffectiveness(source: Pokemon, move: Move, ignoreAbility: boolean = false, simulated: boolean = true, cancelled?: Utils.BooleanHolder): TypeDamageMultiplier {
- if (!Utils.isNullOrUndefined(this.turnData?.moveEffectiveness)) {
+ getMoveEffectiveness(source: Pokemon, move: Move, ignoreAbility: boolean = false, simulated: boolean = true, cancelled?: BooleanHolder): TypeDamageMultiplier {
+ if (!isNullOrUndefined(this.turnData?.moveEffectiveness)) {
return this.turnData?.moveEffectiveness;
}
@@ -1570,7 +1736,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
}
const moveType = source.getMoveType(move);
- const typeMultiplier = new Utils.NumberHolder((move.category !== MoveCategory.STATUS || move.hasAttr(RespectAttackTypeImmunityAttr))
+ const typeMultiplier = new NumberHolder((move.category !== MoveCategory.STATUS || move.hasAttr(RespectAttackTypeImmunityAttr))
? this.getAttackTypeEffectiveness(moveType, source, false, simulated)
: 1);
@@ -1583,7 +1749,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
typeMultiplier.value *= 2;
}
- const cancelledHolder = cancelled ?? new Utils.BooleanHolder(false);
+ const cancelledHolder = cancelled ?? new BooleanHolder(false);
if (!ignoreAbility) {
applyPreDefendAbAttrs(TypeImmunityAbAttr, this, source, move, cancelledHolder, simulated, typeMultiplier);
@@ -1642,10 +1808,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
}
let multiplier = types.map(defType => {
- const multiplier = new Utils.NumberHolder(getTypeDamageMultiplier(moveType, defType));
+ const multiplier = new NumberHolder(getTypeDamageMultiplier(moveType, defType));
applyChallenges(this.scene.gameMode, ChallengeType.TYPE_EFFECTIVENESS, multiplier);
if (source) {
- const ignoreImmunity = new Utils.BooleanHolder(false);
+ const ignoreImmunity = new BooleanHolder(false);
if (source.isActive(true) && source.hasAbilityWithAttr(IgnoreTypeImmunityAbAttr)) {
applyAbAttrs(IgnoreTypeImmunityAbAttr, source, ignoreImmunity, simulated, moveType, defType);
}
@@ -1665,7 +1831,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
return multiplier.value;
}).reduce((acc, cur) => acc * cur, 1) as TypeDamageMultiplier;
- const typeMultiplierAgainstFlying = new Utils.NumberHolder(getTypeDamageMultiplier(moveType, Type.FLYING));
+ const typeMultiplierAgainstFlying = new NumberHolder(getTypeDamageMultiplier(moveType, Type.FLYING));
applyChallenges(this.scene.gameMode, ChallengeType.TYPE_EFFECTIVENESS, typeMultiplierAgainstFlying);
// Handle strong winds lowering effectiveness of types super effective against pure flying
if (!ignoreStrongWinds && arena.weather?.weatherType === WeatherType.STRONG_WINDS && !arena.weather.isEffectSuppressed(this.scene) && this.isOfType(Type.FLYING) && typeMultiplierAgainstFlying.value === 2) {
@@ -1874,7 +2040,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
const E = this.scene.gameData.trainerId ^ this.scene.gameData.secretId;
const F = rand1 ^ rand2;
- const shinyThreshold = new Utils.IntegerHolder(BASE_SHINY_CHANCE);
+ const shinyThreshold = new NumberHolder(BASE_SHINY_CHANCE);
if (thresholdOverride === undefined) {
if (this.scene.eventManager.isEventActive()) {
shinyThreshold.value *= this.scene.eventManager.getShinyMultiplier();
@@ -1905,7 +2071,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
* @returns true if the Pokemon has been set as a shiny, false otherwise
*/
trySetShinySeed(thresholdOverride?: integer, applyModifiersToOverride?: boolean): boolean {
- const shinyThreshold = new Utils.IntegerHolder(BASE_SHINY_CHANCE);
+ const shinyThreshold = new NumberHolder(BASE_SHINY_CHANCE);
if (thresholdOverride === undefined || applyModifiersToOverride) {
if (thresholdOverride !== undefined && applyModifiersToOverride) {
shinyThreshold.value = thresholdOverride;
@@ -1949,9 +2115,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
if (!this.shiny || (!variantData.hasOwnProperty(variantDataIndex) && !variantData.hasOwnProperty(this.species.speciesId))) {
return 0;
}
- const rand = new Utils.NumberHolder(0);
+ const rand = new NumberHolder(0);
this.scene.executeWithSeedOffset(() => {
- rand.value = Utils.randSeedInt(10);
+ rand.value = randSeedInt(10);
}, this.id, this.scene.waveSeed);
if (rand.value >= SHINY_VARIANT_CHANCE) {
return 0; // 6/10
@@ -1963,13 +2129,13 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
}
generateFusionSpecies(forStarter?: boolean): void {
- const hiddenAbilityChance = new Utils.IntegerHolder(BASE_HIDDEN_ABILITY_CHANCE);
+ const hiddenAbilityChance = new NumberHolder(BASE_HIDDEN_ABILITY_CHANCE);
if (!this.hasTrainer()) {
this.scene.applyModifiers(HiddenAbilityRateBoosterModifier, true, hiddenAbilityChance);
}
- const hasHiddenAbility = !Utils.randSeedInt(hiddenAbilityChance.value);
- const randAbilityIndex = Utils.randSeedInt(2);
+ const hasHiddenAbility = !randSeedInt(hiddenAbilityChance.value);
+ const randAbilityIndex = randSeedInt(2);
const filter = !forStarter ? this.species.getCompatibleFusionSpeciesFilter()
: species => {
@@ -2151,7 +2317,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
if (stabMovePool.length) {
const totalWeight = stabMovePool.reduce((v, m) => v + m[1], 0);
- let rand = Utils.randSeedInt(totalWeight);
+ let rand = randSeedInt(totalWeight);
let index = 0;
while (rand > stabMovePool[index][1]) {
rand -= stabMovePool[index++][1];
@@ -2162,7 +2328,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
const attackMovePool = baseWeights.filter(m => allMoves[m[0]].category !== MoveCategory.STATUS);
if (attackMovePool.length) {
const totalWeight = attackMovePool.reduce((v, m) => v + m[1], 0);
- let rand = Utils.randSeedInt(totalWeight);
+ let rand = randSeedInt(totalWeight);
let index = 0;
while (rand > attackMovePool[index][1]) {
rand -= attackMovePool[index++][1];
@@ -2181,7 +2347,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
movePool = baseWeights.filter(m => !this.moveset.some(mo => m[0] === mo?.moveId));
}
const totalWeight = movePool.reduce((v, m) => v + m[1], 0);
- let rand = Utils.randSeedInt(totalWeight);
+ let rand = randSeedInt(totalWeight);
let index = 0;
while (rand > movePool[index][1]) {
rand -= movePool[index++][1];
@@ -2337,8 +2503,8 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
* @return the stat stage multiplier to be used for effective stat calculation
*/
getStatStageMultiplier(stat: EffectiveStat, opponent?: Pokemon, move?: Move, ignoreOppAbility: boolean = false, isCritical: boolean = false, simulated: boolean = true): number {
- const statStage = new Utils.IntegerHolder(this.getStatStage(stat));
- const ignoreStatStage = new Utils.BooleanHolder(false);
+ const statStage = new NumberHolder(this.getStatStage(stat));
+ const ignoreStatStage = new BooleanHolder(false);
if (opponent) {
if (isCritical) {
@@ -2362,7 +2528,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
}
if (!ignoreStatStage.value) {
- const statStageMultiplier = new Utils.NumberHolder(Math.max(2, 2 + statStage.value) / Math.max(2, 2 - statStage.value));
+ const statStageMultiplier = new NumberHolder(Math.max(2, 2 + statStage.value) / Math.max(2, 2 - statStage.value));
this.scene.applyModifiers(TempStatStageBoosterModifier, this.isPlayer(), stat, statStageMultiplier);
return Math.min(statStageMultiplier.value, 4);
}
@@ -2385,11 +2551,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
return 1;
}
- const userAccStage = new Utils.IntegerHolder(this.getStatStage(Stat.ACC));
- const targetEvaStage = new Utils.IntegerHolder(target.getStatStage(Stat.EVA));
+ const userAccStage = new NumberHolder(this.getStatStage(Stat.ACC));
+ const targetEvaStage = new NumberHolder(target.getStatStage(Stat.EVA));
- const ignoreAccStatStage = new Utils.BooleanHolder(false);
- const ignoreEvaStatStage = new Utils.BooleanHolder(false);
+ const ignoreAccStatStage = new BooleanHolder(false);
+ const ignoreEvaStatStage = new BooleanHolder(false);
applyAbAttrs(IgnoreOpponentStatStagesAbAttr, target, null, false, Stat.ACC, ignoreAccStatStage);
applyAbAttrs(IgnoreOpponentStatStagesAbAttr, this, null, false, Stat.EVA, ignoreEvaStatStage);
@@ -2404,7 +2570,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
targetEvaStage.value = Math.min(0, targetEvaStage.value);
}
- const accuracyMultiplier = new Utils.NumberHolder(1);
+ const accuracyMultiplier = new NumberHolder(1);
if (userAccStage.value !== targetEvaStage.value) {
accuracyMultiplier.value = userAccStage.value > targetEvaStage.value
? (3 + Math.min(userAccStage.value - targetEvaStage.value, 6)) / 3
@@ -2413,7 +2579,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
applyStatMultiplierAbAttrs(StatMultiplierAbAttr, this, Stat.ACC, accuracyMultiplier, false, sourceMove);
- const evasionMultiplier = new Utils.NumberHolder(1);
+ const evasionMultiplier = new NumberHolder(1);
applyStatMultiplierAbAttrs(StatMultiplierAbAttr, target, Stat.EVA, evasionMultiplier);
return accuracyMultiplier.value / evasionMultiplier.value;
@@ -2444,14 +2610,14 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
* The attacker's offensive stat for the given move's category.
* Critical hits cause negative stat stages to be ignored.
*/
- const sourceAtk = new Utils.NumberHolder(source.getEffectiveStat(isPhysical ? Stat.ATK : Stat.SPATK, this, undefined, ignoreSourceAbility, ignoreAbility, isCritical, simulated));
+ const sourceAtk = new NumberHolder(source.getEffectiveStat(isPhysical ? Stat.ATK : Stat.SPATK, this, undefined, ignoreSourceAbility, ignoreAbility, isCritical, simulated));
applyMoveAttrs(VariableAtkAttr, source, this, move, sourceAtk);
/**
* This Pokemon's defensive stat for the given move's category.
* Critical hits cause positive stat stages to be ignored.
*/
- const targetDef = new Utils.NumberHolder(this.getEffectiveStat(isPhysical ? Stat.DEF : Stat.SPDEF, source, move, ignoreAbility, ignoreSourceAbility, isCritical, simulated));
+ const targetDef = new NumberHolder(this.getEffectiveStat(isPhysical ? Stat.DEF : Stat.SPDEF, source, move, ignoreAbility, ignoreSourceAbility, isCritical, simulated));
applyMoveAttrs(VariableDefAttr, source, this, move, targetDef);
/**
@@ -2482,10 +2648,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
* - `damage`: `number` the attack's final damage output.
*/
getAttackDamage(source: Pokemon, move: Move, ignoreAbility: boolean = false, ignoreSourceAbility: boolean = false, isCritical: boolean = false, simulated: boolean = true): DamageCalculationResult {
- const damage = new Utils.NumberHolder(0);
+ const damage = new NumberHolder(0);
const defendingSide = this.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY;
- const variableCategory = new Utils.NumberHolder(move.category);
+ const variableCategory = new NumberHolder(move.category);
applyMoveAttrs(VariableMoveCategoryAttr, source, this, move, variableCategory);
const moveCategory = variableCategory.value as MoveCategory;
@@ -2493,7 +2659,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
const moveType = source.getMoveType(move);
/** If `value` is `true`, cancels the move and suppresses "No Effect" messages */
- const cancelled = new Utils.BooleanHolder(false);
+ const cancelled = new BooleanHolder(false);
/**
* The effectiveness of the move being used. Along with type matchups, this
@@ -2507,7 +2673,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
const isPhysical = moveCategory === MoveCategory.PHYSICAL;
/** Combined damage multiplier from field effects such as weather, terrain, etc. */
- const arenaAttackTypeMultiplier = new Utils.NumberHolder(this.scene.arena.getAttackTypeMultiplier(moveType, source.isGrounded()));
+ const arenaAttackTypeMultiplier = new NumberHolder(this.scene.arena.getAttackTypeMultiplier(moveType, source.isGrounded()));
applyMoveAttrs(IgnoreWeatherTypeDebuffAttr, source, this, move, arenaAttackTypeMultiplier);
const isTypeImmune = (typeMultiplier * arenaAttackTypeMultiplier.value) === 0;
@@ -2521,7 +2687,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
}
// If the attack deals fixed damaged, return a result with that much damage
- const fixedDamage = new Utils.IntegerHolder(0);
+ const fixedDamage = new NumberHolder(0);
applyMoveAttrs(FixedDamageAttr, source, this, move, fixedDamage);
if (fixedDamage.value) {
return {
@@ -2532,7 +2698,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
}
// If the attack is a one-hit KO move, return a result with damage equal to this Pokemon's HP
- const isOneHitKo = new Utils.BooleanHolder(false);
+ const isOneHitKo = new BooleanHolder(false);
applyMoveAttrs(OneHitKOAttr, source, this, move, isOneHitKo);
if (isOneHitKo.value) {
return {
@@ -2554,19 +2720,19 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
const targetMultiplier = (numTargets > 1) ? 0.75 : 1;
/** 0.25x multiplier if this is an added strike from the attacker's Parental Bond */
- const parentalBondMultiplier = new Utils.NumberHolder(1);
+ const parentalBondMultiplier = new NumberHolder(1);
if (!ignoreSourceAbility) {
- applyPreAttackAbAttrs(AddSecondStrikeAbAttr, source, this, move, simulated, numTargets, new Utils.IntegerHolder(0), parentalBondMultiplier);
+ applyPreAttackAbAttrs(AddSecondStrikeAbAttr, source, this, move, simulated, numTargets, new NumberHolder(0), parentalBondMultiplier);
}
/** Doubles damage if this Pokemon's last move was Glaive Rush */
- const glaiveRushMultiplier = new Utils.IntegerHolder(1);
+ const glaiveRushMultiplier = new NumberHolder(1);
if (this.getTag(BattlerTagType.RECEIVE_DOUBLE_DAMAGE)) {
glaiveRushMultiplier.value = 2;
}
/** The damage multiplier when the given move critically hits */
- const criticalMultiplier = new Utils.NumberHolder(isCritical ? 1.5 : 1);
+ const criticalMultiplier = new NumberHolder(isCritical ? 1.5 : 1);
applyAbAttrs(MultCritAbAttr, source, null, simulated, criticalMultiplier);
/**
@@ -2579,7 +2745,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
const sourceTeraType = source.getTeraType();
const matchesSourceType = sourceTypes.includes(moveType);
/** A damage multiplier for when the attack is of the attacker's type and/or Tera type. */
- const stabMultiplier = new Utils.NumberHolder(1);
+ const stabMultiplier = new NumberHolder(1);
if (matchesSourceType) {
stabMultiplier.value += 0.5;
}
@@ -2595,10 +2761,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
stabMultiplier.value = Math.min(stabMultiplier.value, 2.25);
/** Halves damage if the attacker is using a physical attack while burned */
- const burnMultiplier = new Utils.NumberHolder(1);
+ const burnMultiplier = new NumberHolder(1);
if (isPhysical && source.status && source.status.effect === StatusEffect.BURN) {
if (!move.hasAttr(BypassBurnDamageReductionAttr)) {
- const burnDamageReductionCancelled = new Utils.BooleanHolder(false);
+ const burnDamageReductionCancelled = new BooleanHolder(false);
if (!ignoreSourceAbility) {
applyAbAttrs(BypassBurnDamageReductionAbAttr, source, burnDamageReductionCancelled, simulated);
}
@@ -2609,7 +2775,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
}
/** Reduces damage if this Pokemon has a relevant screen (e.g. Light Screen for special attacks) */
- const screenMultiplier = new Utils.NumberHolder(1);
+ const screenMultiplier = new NumberHolder(1);
this.scene.arena.applyTagsForSide(WeakenMoveScreenTag, defendingSide, simulated, source, moveCategory, screenMultiplier);
/**
@@ -2618,7 +2784,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
* AND
* The move doubles damage when used against that tag
*/
- const hitsTagMultiplier = new Utils.NumberHolder(1);
+ const hitsTagMultiplier = new NumberHolder(1);
move.getAttrs(HitsTagAttr).filter(hta => hta.doubleDamage).forEach(hta => {
if (this.getTag(hta.tagType)) {
hitsTagMultiplier.value *= 2;
@@ -2630,7 +2796,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
? 0.5
: 1;
- damage.value = Utils.toDmgValue(
+ damage.value = toDmgValue(
baseDamage
* targetMultiplier
* parentalBondMultiplier.value
@@ -2700,10 +2866,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
*/
apply(source: Pokemon, move: Move): HitResult {
const defendingSide = this.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY;
- const moveCategory = new Utils.NumberHolder(move.category);
+ const moveCategory = new NumberHolder(move.category);
applyMoveAttrs(VariableMoveCategoryAttr, source, this, move, moveCategory);
if (moveCategory.value === MoveCategory.STATUS) {
- const cancelled = new Utils.BooleanHolder(false);
+ const cancelled = new BooleanHolder(false);
const typeMultiplier = this.getMoveEffectiveness(source, move, false, false, cancelled);
if (!cancelled.value && typeMultiplier === 0) {
@@ -2713,7 +2879,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
} else {
/** Determines whether the attack critically hits */
let isCritical: boolean;
- const critOnly = new Utils.BooleanHolder(false);
+ const critOnly = new BooleanHolder(false);
const critAlways = source.getTag(BattlerTagType.ALWAYS_CRIT);
applyMoveAttrs(CritOnlyAttr, source, this, move, critOnly);
applyAbAttrs(ConditionalCritAbAttr, source, null, false, critOnly, this, move);
@@ -2725,7 +2891,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
}
const noCritTag = this.scene.arena.getTagOnSide(NoCritTag, defendingSide);
- const blockCrit = new Utils.BooleanHolder(false);
+ const blockCrit = new BooleanHolder(false);
applyAbAttrs(BlockCritAbAttr, this, null, false, blockCrit);
if (noCritTag || blockCrit.value || Overrides.NEVER_CRIT_OVERRIDE) {
isCritical = false;
@@ -2776,7 +2942,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
if (damage > 0) {
if (source.isPlayer()) {
- this.scene.validateAchvs(DamageAchv, new Utils.NumberHolder(damage));
+ this.scene.validateAchvs(DamageAchv, new NumberHolder(damage));
if (damage > this.scene.gameData.gameStats.highestDamage) {
this.scene.gameData.gameStats.highestDamage = damage;
}
@@ -2788,7 +2954,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
const attackResult = { move: move.id, result: result as DamageResult, damage: damage, critical: isCritical, sourceId: source.id, sourceBattlerIndex: source.getBattlerIndex() };
this.turnData.attacksReceived.unshift(attackResult);
if (source.isPlayer() && !this.isPlayer()) {
- this.scene.applyModifiers(DamageMoneyRewardModifier, true, source, new Utils.NumberHolder(damage));
+ this.scene.applyModifiers(DamageMoneyRewardModifier, true, source, new NumberHolder(damage));
}
}
}
@@ -2841,7 +3007,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
if (this.isFainted()) {
return 0;
}
- const surviveDamage = new Utils.BooleanHolder(false);
+ const surviveDamage = new BooleanHolder(false);
if (!preventEndure && this.hp - damage <= 0) {
if (this.hp >= 1 && this.getTag(BattlerTagType.ENDURING)) {
@@ -2917,7 +3083,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
const stubTag = new BattlerTag(tagType, 0, 0);
- const cancelled = new Utils.BooleanHolder(false);
+ const cancelled = new BooleanHolder(false);
applyPreApplyBattlerTagAbAttrs(BattlerTagImmunityAbAttr, this, stubTag, cancelled, true);
const userField = this.getAlliedField();
@@ -2935,7 +3101,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
const newTag = getBattlerTag(tagType, turnCount, sourceMove!, sourceId!); // TODO: are the bangs correct?
- const cancelled = new Utils.BooleanHolder(false);
+ const cancelled = new BooleanHolder(false);
applyPreApplyBattlerTagAbAttrs(BattlerTagImmunityAbAttr, this, newTag, cancelled);
const userField = this.getAlliedField();
@@ -3170,11 +3336,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
let fusionCry = this.getFusionSpeciesForm().cry(scene, soundConfig, true);
duration = Math.min(duration, fusionCry.totalDuration * 1000);
fusionCry.destroy();
- scene.time.delayedCall(Utils.fixedInt(Math.ceil(duration * 0.4)), () => {
+ scene.time.delayedCall(fixedInt(Math.ceil(duration * 0.4)), () => {
try {
- SoundFade.fadeOut(scene, cry, Utils.fixedInt(Math.ceil(duration * 0.2)));
+ SoundFade.fadeOut(scene, cry, fixedInt(Math.ceil(duration * 0.2)));
fusionCry = this.getFusionSpeciesForm().cry(scene, Object.assign({ seek: Math.max(fusionCry.totalDuration * 0.4, 0) }, soundConfig));
- SoundFade.fadeIn(scene, fusionCry, Utils.fixedInt(Math.ceil(duration * 0.2)), scene.masterVolume * scene.seVolume, 0);
+ SoundFade.fadeIn(scene, fusionCry, fixedInt(Math.ceil(duration * 0.2)), scene.masterVolume * scene.seVolume, 0);
} catch (err) {
console.error(err);
}
@@ -3205,7 +3371,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
tintSprite?.anims.pause();
let faintCryTimer : Phaser.Time.TimerEvent | null = this.scene.time.addEvent({
- delay: Utils.fixedInt(delay),
+ delay: fixedInt(delay),
repeat: -1,
callback: () => {
++i;
@@ -3232,7 +3398,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
});
// Failsafe
- this.scene.time.delayedCall(Utils.fixedInt(3000), () => {
+ this.scene.time.delayedCall(fixedInt(3000), () => {
if (!faintCryTimer || !this.scene) {
return;
}
@@ -3285,7 +3451,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
tintSprite?.anims.pause();
let faintCryTimer: Phaser.Time.TimerEvent | null = this.scene.time.addEvent({
- delay: Utils.fixedInt(delay),
+ delay: fixedInt(delay),
repeat: -1,
callback: () => {
++i;
@@ -3299,9 +3465,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
frameProgress -= frameThreshold;
}
if (i === transitionIndex) {
- SoundFade.fadeOut(this.scene, cry, Utils.fixedInt(Math.ceil((duration / rate) * 0.2)));
+ SoundFade.fadeOut(this.scene, cry, fixedInt(Math.ceil((duration / rate) * 0.2)));
fusionCry = this.scene.playSound(fusionCryKey, Object.assign({ seek: Math.max(fusionCry.totalDuration * 0.4, 0), rate: rate }));
- SoundFade.fadeIn(this.scene, fusionCry, Utils.fixedInt(Math.ceil((duration / rate) * 0.2)), this.scene.masterVolume * this.scene.seVolume, 0);
+ SoundFade.fadeIn(this.scene, fusionCry, fixedInt(Math.ceil((duration / rate) * 0.2)), this.scene.masterVolume * this.scene.seVolume, 0);
}
rate *= 0.99;
if (cry && !cry.pendingRemove) {
@@ -3321,7 +3487,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
});
// Failsafe
- this.scene.time.delayedCall(Utils.fixedInt(3000), () => {
+ this.scene.time.delayedCall(fixedInt(3000), () => {
if (!faintCryTimer || !this.scene) {
return;
}
@@ -3369,7 +3535,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
}
// Check if the source Pokemon has an ability that cancels the Poison/Toxic immunity
- const cancelImmunity = new Utils.BooleanHolder(false);
+ const cancelImmunity = new BooleanHolder(false);
if (sourcePokemon) {
applyAbAttrs(IgnoreTypeStatusEffectImmunityAbAttr, sourcePokemon, cancelImmunity, false, effect, defType);
if (cancelImmunity.value) {
@@ -3408,7 +3574,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
break;
}
- const cancelled = new Utils.BooleanHolder(false);
+ const cancelled = new BooleanHolder(false);
applyPreSetStatusAbAttrs(StatusEffectImmunityAbAttr, this, effect, cancelled, quiet);
const userField = this.getAlliedField();
@@ -3439,10 +3605,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
return true;
}
- let statusCureTurn: Utils.IntegerHolder;
+ let statusCureTurn: NumberHolder;
if (effect === StatusEffect.SLEEP) {
- statusCureTurn = new Utils.IntegerHolder(this.randSeedIntRange(2, 4));
+ statusCureTurn = new NumberHolder(this.randSeedIntRange(2, 4));
applyAbAttrs(ReduceStatusEffectDurationAbAttr, this, null, false, effect, statusCureTurn);
this.setFrameRate(4);
@@ -3511,7 +3677,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
isSafeguarded(attacker: Pokemon): boolean {
const defendingSide = this.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY;
if (this.scene.arena.getTagOnSide(ArenaTagType.SAFEGUARD, defendingSide)) {
- const bypassed = new Utils.BooleanHolder(false);
+ const bypassed = new BooleanHolder(false);
if (attacker) {
applyAbAttrs(InfiltratorAbAttr, attacker, null, false, bypassed);
}
@@ -3698,7 +3864,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
const variantColorSet = new Map<integer, integer[]>();
if (this.shiny && variantColors && variantColors[this.variant]) {
Object.keys(variantColors[this.variant]).forEach(k => {
- variantColorSet.set(Utils.rgbaToInt(Array.from(Object.values(Utils.rgbHexToRgba(k)))), Array.from(Object.values(Utils.rgbHexToRgba(variantColors[this.variant][k]))));
+ variantColorSet.set(rgbaToInt(Array.from(Object.values(rgbHexToRgba(k)))), Array.from(Object.values(rgbHexToRgba(variantColors[this.variant][k]))));
});
}
@@ -3707,7 +3873,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
const pixel = pixelData[f].slice(i, i + 4);
let [ r, g, b, a ] = pixel;
if (variantColors) {
- const color = Utils.rgbaToInt([ r, g, b, a ]);
+ const color = rgbaToInt([ r, g, b, a ]);
if (variantColorSet.has(color)) {
const mappedPixel = variantColorSet.get(color);
if (mappedPixel) {
@@ -3741,7 +3907,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
const variantColorSet = new Map<integer, integer[]>();
if (this.fusionShiny && variantColors && variantColors[this.fusionVariant]) {
Object.keys(variantColors[this.fusionVariant]).forEach(k => {
- variantColorSet.set(Utils.rgbaToInt(Array.from(Object.values(Utils.rgbHexToRgba(k)))), Array.from(Object.values(Utils.rgbHexToRgba(variantColors[this.fusionVariant][k]))));
+ variantColorSet.set(rgbaToInt(Array.from(Object.values(rgbHexToRgba(k)))), Array.from(Object.values(rgbHexToRgba(variantColors[this.fusionVariant][k]))));
});
}
for (let i = 0; i < pixelData[2 + f].length; i += 4) {
@@ -3751,7 +3917,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
}
let [ r, g, b, a ] = [ pixelData[2 + f][i], pixelData[2 + f][i + 1], pixelData[2 + f][i + 2], pixelData[2 + f][i + 3] ];
if (variantColors) {
- const color = Utils.rgbaToInt([ r, g, b, a ]);
+ const color = rgbaToInt([ r, g, b, a ]);
if (variantColorSet.has(color)) {
const mappedPixel = variantColorSet.get(color);
if (mappedPixel) {
@@ -3794,7 +3960,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
}, new Map<number, integer[]>());
hsvColors = Array.from(rgbaColors.keys()).reduce((map: Map<number, number[]>, k: number) => {
const rgb = rgbaColors.get(k)!.slice(0, 3);
- map.set(k, Utils.rgbToHsv(rgb[0], rgb[1], rgb[2]));
+ map.set(k, rgbToHsv(rgb[0], rgb[1], rgb[2]));
return map;
}, new Map<number, number[]>());
@@ -3861,7 +4027,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
spriteColors.forEach((sc: integer[], i: integer) => {
paletteDeltas.push([]);
for (let p = 0; p < palette.length; p++) {
- paletteDeltas[i].push(Utils.deltaRgb(sc, palette[p]));
+ paletteDeltas[i].push(deltaRgb(sc, palette[p]));
}
});
@@ -3894,8 +4060,8 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
* <!-- @import "../battle".Battle -->
* This calls either {@linkcode BattleScene.randBattleSeedInt}({@linkcode range}, {@linkcode min}) in `src/battle-scene.ts`
* which calls {@linkcode Battle.randSeedInt}(`scene`, {@linkcode range}, {@linkcode min}) in `src/battle.ts`
- * which calls {@linkcode Utils.randSeedInt randSeedInt}({@linkcode range}, {@linkcode min}) in `src/utils.ts`,
- * or it directly calls {@linkcode Utils.randSeedInt randSeedInt}({@linkcode range}, {@linkcode min}) in `src/utils.ts` if there is no current battle
+ * which calls {@linkcode randSeedInt randSeedInt}({@linkcode range}, {@linkcode min}) in `src/utils.ts`,
+ * or it directly calls {@linkcode randSeedInt randSeedInt}({@linkcode range}, {@linkcode min}) in `src/utils.ts` if there is no current battle
*
* @param range How large of a range of random numbers to choose from. If {@linkcode range} <= 1, returns {@linkcode min}
* @param min The minimum integer to pick, default `0`
@@ -3904,7 +4070,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
randSeedInt(range: integer, min: integer = 0): integer {
return this.scene.currentBattle
? this.scene.randBattleSeedInt(range, min)
- : Utils.randSeedInt(range, min);
+ : randSeedInt(range, min);
}
/**
@@ -4106,8 +4272,8 @@ export class PlayerPokemon extends Pokemon {
this.scene.gameData.starterData[starterSpeciesId],
fusionStarterSpeciesId ? this.scene.gameData.starterData[fusionStarterSpeciesId] : null
].filter(d => !!d);
- const amount = new Utils.IntegerHolder(friendship);
- const starterAmount = new Utils.IntegerHolder(Math.floor(friendship * (this.scene.gameMode.isClassic && friendship > 0 ? CLASSIC_CANDY_FRIENDSHIP_MULTIPLIER : 1) / (fusionStarterSpeciesId ? 2 : 1)));
+ const amount = new NumberHolder(friendship);
+ const starterAmount = new NumberHolder(Math.floor(friendship * (this.scene.gameMode.isClassic && friendship > 0 ? CLASSIC_CANDY_FRIENDSHIP_MULTIPLIER : 1) / (fusionStarterSpeciesId ? 2 : 1)));
if (amount.value > 0) {
this.scene.applyModifier(PokemonFriendshipBoosterModifier, true, this, amount);
this.scene.applyModifier(PokemonFriendshipBoosterModifier, true, this, starterAmount);
@@ -4147,7 +4313,7 @@ export class PlayerPokemon extends Pokemon {
pokemon.resetTurnData();
pokemon.resetStatus();
- pokemon.heal(Math.min(Utils.toDmgValue(0.5 * pokemon.getMaxHp()), pokemon.getMaxHp()));
+ pokemon.heal(Math.min(toDmgValue(0.5 * pokemon.getMaxHp()), pokemon.getMaxHp()));
this.scene.queueMessage(i18next.t("moveTriggers:revivalBlessing", { pokemonName: pokemon.name }), 0, true);
if (this.scene.currentBattle.double && this.scene.getParty().length > 1) {
@@ -4885,7 +5051,7 @@ export class EnemyPokemon extends Pokemon {
//console.log('damage', damage, 'segment', segmentsBypassed + 1, 'segment size', segmentSize, 'damage needed', Math.round(segmentSize * Math.pow(2, segmentsBypassed + 1)));
}
- damage = Utils.toDmgValue(this.hp - hpThreshold + segmentSize * segmentsBypassed);
+ damage = toDmgValue(this.hp - hpThreshold + segmentSize * segmentsBypassed);
clearedBossSegmentIndex = s - segmentsBypassed;
}
break;
@@ -4949,7 +5115,7 @@ export class EnemyPokemon extends Pokemon {
}
// Pick a random stat from the leftover stats to increase its stages
- const randInt = Utils.randSeedInt(totalWeight);
+ const randInt = randSeedInt(totalWeight);
for (const i in statThresholds) {
if (randInt < statThresholds[i]) {
boostedStat = leftoverStats[i];
@@ -5020,7 +5186,7 @@ export class EnemyPokemon extends Pokemon {
this.metSpecies = this.species.speciesId;
const newPokemon = this.scene.addPlayerPokemon(this.species, this.level, this.abilityIndex, this.formIndex, this.gender, this.shiny, this.variant, this.ivs, this.nature, this);
- if (Utils.isBetween(slotIndex, 0, PLAYER_PARTY_MAX_SIZE - 1)) {
+ if (isBetween(slotIndex, 0, PLAYER_PARTY_MAX_SIZE - 1)) {
if (slotIndex === 0) {
newPokemon.setVisible(false); // Hide if replaced with first pokemon
}
@@ -5217,7 +5383,7 @@ export class PokemonMove {
}
getMovePp(): integer {
- return this.getMove().pp + this.ppUp * Utils.toDmgValue(this.getMove().pp / 5);
+ return this.getMove().pp + this.ppUp * toDmgValue(this.getMove().pp / 5);
}
getPpRatio(): number {
diff --git a/src/field/trainer.ts b/src/field/trainer.ts
index b77a156f4012..1cdf7ba41e2b 100644
--- a/src/field/trainer.ts
+++ b/src/field/trainer.ts
@@ -1,5 +1,5 @@
import BattleScene from "#app/battle-scene";
-import { pokemonPrevolutions } from "#app/data/balance/pokemon-evolutions";
+import { pokemonPrevolutions } from "#balance/pokemon-evolutions";
import PokemonSpecies, { getPokemonSpecies } from "#app/data/pokemon-species";
import {
TrainerConfig,
@@ -12,7 +12,7 @@ import {
signatureSpecies
} from "#app/data/trainer-config";
import { EnemyPokemon } from "#app/field/pokemon";
-import * as Utils from "#app/utils";
+import { randSeedWeightedItem, randSeedItem, randSeedInt } from "#app/utils";
import { PersistentModifier } from "#app/modifier/modifier";
import { trainerNamePools } from "#app/data/trainer-names";
import { ArenaTagSide, ArenaTrapTag } from "#app/data/arena-tag";
@@ -46,11 +46,11 @@ export default class Trainer extends Phaser.GameObjects.Container {
}
this.variant = variant;
- this.partyTemplateIndex = Math.min(partyTemplateIndex !== undefined ? partyTemplateIndex : Utils.randSeedWeightedItem(this.config.partyTemplates.map((_, i) => i)),
+ this.partyTemplateIndex = Math.min(partyTemplateIndex !== undefined ? partyTemplateIndex : randSeedWeightedItem(this.config.partyTemplates.map((_, i) => i)),
this.config.partyTemplates.length - 1);
if (trainerNamePools.hasOwnProperty(trainerType)) {
const namePool = trainerNamePools[trainerType];
- this.name = name || Utils.randSeedItem(Array.isArray(namePool[0]) ? namePool[variant === TrainerVariant.FEMALE ? 1 : 0] : namePool);
+ this.name = name || randSeedItem(Array.isArray(namePool[0]) ? namePool[variant === TrainerVariant.FEMALE ? 1 : 0] : namePool);
if (variant === TrainerVariant.DOUBLE) {
if (this.config.doubleOnly) {
if (partnerName) {
@@ -59,7 +59,7 @@ export default class Trainer extends Phaser.GameObjects.Container {
[ this.name, this.partnerName ] = this.name.split(" & ");
}
} else {
- this.partnerName = partnerName || Utils.randSeedItem(Array.isArray(namePool[0]) ? namePool[1] : namePool);
+ this.partnerName = partnerName || randSeedItem(Array.isArray(namePool[0]) ? namePool[1] : namePool);
}
}
}
@@ -362,7 +362,7 @@ export default class Trainer extends Phaser.GameObjects.Container {
// If useNewSpeciesPool is true, we need to generate a new species from the new species pool, otherwise we generate a random species
let species = useNewSpeciesPool
- ? getPokemonSpecies(newSpeciesPool[Math.floor(Utils.randSeedInt(newSpeciesPool.length))])
+ ? getPokemonSpecies(newSpeciesPool[Math.floor(randSeedInt(newSpeciesPool.length))])
: template.isSameSpecies(index) && index > offset
? getPokemonSpecies(battle.enemyParty[offset].species.getTrainerSpeciesForLevel(level, false, template.getStrength(offset), this.scene.currentBattle.waveIndex))
: this.genNewPartyMemberSpecies(level, strength);
@@ -385,7 +385,7 @@ export default class Trainer extends Phaser.GameObjects.Container {
let baseSpecies: PokemonSpecies;
if (this.config.speciesPools) {
- const tierValue = Utils.randSeedInt(512);
+ const tierValue = randSeedInt(512);
let tier = tierValue >= 156 ? TrainerPoolTier.COMMON : tierValue >= 32 ? TrainerPoolTier.UNCOMMON : tierValue >= 6 ? TrainerPoolTier.RARE : tierValue >= 1 ? TrainerPoolTier.SUPER_RARE : TrainerPoolTier.ULTRA_RARE;
console.log(TrainerPoolTier[tier]);
while (!this.config.speciesPools.hasOwnProperty(tier) || !this.config.speciesPools[tier].length) {
@@ -393,7 +393,7 @@ export default class Trainer extends Phaser.GameObjects.Container {
tier--;
}
const tierPool = this.config.speciesPools[tier];
- baseSpecies = getPokemonSpecies(Utils.randSeedItem(tierPool));
+ baseSpecies = getPokemonSpecies(randSeedItem(tierPool));
} else {
baseSpecies = this.scene.randomSpecies(battle.waveIndex, level, false, this.config.speciesFilter);
}
@@ -506,7 +506,7 @@ export default class Trainer extends Phaser.GameObjects.Container {
if (maxScorePartyMemberIndexes.length > 1) {
let rand: integer;
- this.scene.executeWithSeedOffset(() => rand = Utils.randSeedInt(maxScorePartyMemberIndexes.length), this.scene.currentBattle.turn << 2);
+ this.scene.executeWithSeedOffset(() => rand = randSeedInt(maxScorePartyMemberIndexes.length), this.scene.currentBattle.turn << 2);
return maxScorePartyMemberIndexes[rand!];
}
diff --git a/src/game-mode.ts b/src/game-mode.ts
index 8f1bb9356e6b..a7249f9c4e60 100644
--- a/src/game-mode.ts
+++ b/src/game-mode.ts
@@ -1,11 +1,11 @@
import i18next from "i18next";
import { classicFixedBattles, FixedBattleConfig, FixedBattleConfigs } from "./battle";
import BattleScene from "./battle-scene";
-import { allChallenges, applyChallenges, Challenge, ChallengeType, copyChallenge } from "./data/challenge";
-import PokemonSpecies, { allSpecies } from "./data/pokemon-species";
+import { allChallenges, applyChallenges, Challenge, ChallengeType, copyChallenge } from "#app/data/challenge";
+import PokemonSpecies, { allSpecies } from "#app/data/pokemon-species";
import { Arena } from "./field/arena";
import Overrides from "#app/overrides";
-import * as Utils from "./utils";
+import { randSeedInt, randSeedItem } from "#app/utils";
import { Biome } from "#enums/biome";
import { Species } from "#enums/species";
import { Challenges } from "./enums/challenges";
@@ -169,7 +169,7 @@ export class GameMode implements GameModeConfig {
} else if (w < waveIndex) {
arena.scene.executeWithSeedOffset(() => {
const waveTrainerChance = arena.getTrainerChance();
- if (!Utils.randSeedInt(waveTrainerChance)) {
+ if (!randSeedInt(waveTrainerChance)) {
allowTrainerBattle = false;
}
}, w);
@@ -179,7 +179,7 @@ export class GameMode implements GameModeConfig {
}
}
}
- return Boolean(allowTrainerBattle && trainerChance && !Utils.randSeedInt(trainerChance));
+ return Boolean(allowTrainerBattle && trainerChance && !randSeedInt(trainerChance));
}
return false;
}
@@ -197,7 +197,7 @@ export class GameMode implements GameModeConfig {
if (this.isDaily && this.isWaveFinal(waveIndex)) {
const allFinalBossSpecies = allSpecies.filter(s => (s.subLegendary || s.legendary || s.mythical)
&& s.baseTotal >= 600 && s.speciesId !== Species.ETERNATUS && s.speciesId !== Species.ARCEUS);
- return Utils.randSeedItem(allFinalBossSpecies);
+ return randSeedItem(allFinalBossSpecies);
}
return null;
diff --git a/src/inputs-controller.ts b/src/inputs-controller.ts
index 537d28702590..12c12d271db1 100644
--- a/src/inputs-controller.ts
+++ b/src/inputs-controller.ts
@@ -1,14 +1,14 @@
import Phaser from "phaser";
-import * as Utils from "./utils";
-import { deepCopy } from "./utils";
+import { getEnumValues } from "#app/utils";
+import { deepCopy } from "#app/utils";
import pad_generic from "./configs/inputs/pad_generic";
import pad_unlicensedSNES from "./configs/inputs/pad_unlicensedSNES";
import pad_xbox360 from "./configs/inputs/pad_xbox360";
import pad_dualshock from "./configs/inputs/pad_dualshock";
import pad_procon from "./configs/inputs/pad_procon";
-import { Mode } from "./ui/ui";
-import SettingsGamepadUiHandler from "./ui/settings/settings-gamepad-ui-handler";
-import SettingsKeyboardUiHandler from "./ui/settings/settings-keyboard-ui-handler";
+import { Mode } from "#app/ui/ui";
+import SettingsGamepadUiHandler from "#app/ui/settings/settings-gamepad-ui-handler";
+import SettingsKeyboardUiHandler from "#app/ui/settings/settings-keyboard-ui-handler";
import cfg_keyboard_qwerty from "./configs/inputs/cfg_keyboard_qwerty";
import {
assign,
@@ -21,7 +21,7 @@ import { SettingKeyboard } from "#app/system/settings/settings-keyboard";
import TouchControl from "#app/touch-controls";
import { Button } from "#enums/buttons";
import { Device } from "#enums/devices";
-import MoveTouchControlsHandler from "./ui/settings/move-touch-controls-handler";
+import MoveTouchControlsHandler from "#app/ui/settings/move-touch-controls-handler";
export interface DeviceMapping {
[key: string]: number;
@@ -112,7 +112,7 @@ export class InputsController {
[Device.KEYBOARD]: "default"
};
- for (const b of Utils.getEnumValues(Button)) {
+ for (const b of getEnumValues(Button)) {
this.interactions[b] = {
pressTime: false,
isPressed: false,
diff --git a/src/loading-scene.ts b/src/loading-scene.ts
index 4f673fd2cfc9..0a893b11cfc0 100644
--- a/src/loading-scene.ts
+++ b/src/loading-scene.ts
@@ -4,10 +4,10 @@ import CacheBustedLoaderPlugin from "#app/plugins/cache-busted-loader-plugin";
import { SceneBase } from "#app/scene-base";
import { WindowVariant, getWindowVariantSuffix } from "#app/ui/ui-theme";
import { isMobile } from "#app/touch-controls";
-import * as Utils from "#app/utils";
-import { initPokemonPrevolutions } from "#app/data/balance/pokemon-evolutions";
-import { initBiomes } from "#app/data/balance/biomes";
-import { initEggMoves } from "#app/data/balance/egg-moves";
+import { localPing, getEnumValues, verifyLang, getEnumKeys } from "#app/utils";
+import { initPokemonPrevolutions } from "#balance/pokemon-evolutions";
+import { initBiomes } from "#balance/biomes";
+import { initEggMoves } from "#balance/egg-moves";
import { initPokemonForms } from "#app/data/pokemon-forms";
import { initSpecies } from "#app/data/pokemon-species";
import { initMoves } from "#app/data/move";
@@ -19,7 +19,7 @@ import i18next from "i18next";
import { initStatsKeys } from "#app/ui/game-stats-ui-handler";
import { initVouchers } from "#app/system/voucher";
import { Biome } from "#enums/biome";
-import { initMysteryEncounters } from "#app/data/mystery-encounters/mystery-encounters";
+import { initMysteryEncounters } from "#mystery-encounters/mystery-encounters";
export class LoadingScene extends SceneBase {
public static readonly KEY = "loading";
@@ -33,7 +33,7 @@ export class LoadingScene extends SceneBase {
}
preload() {
- Utils.localPing();
+ localPing();
this.load["manifest"] = this.game["manifest"];
this.loadImage("loading_bg", "arenas");
@@ -48,7 +48,7 @@ export class LoadingScene extends SceneBase {
this.loadImage("friendship_overlay", "ui");
this.loadImage("cursor", "ui");
this.loadImage("cursor_reverse", "ui");
- for (const wv of Utils.getEnumValues(WindowVariant)) {
+ for (const wv of getEnumValues(WindowVariant)) {
for (let w = 1; w <= 5; w++) {
this.loadImage(`window_${w}${getWindowVariantSuffix(wv)}`, "ui/windows");
}
@@ -168,7 +168,7 @@ export class LoadingScene extends SceneBase {
this.loadImage("default_bg", "arenas");
// Load arena images
- Utils.getEnumValues(Biome).map(bt => {
+ getEnumValues(Biome).map(bt => {
const btKey = Biome[bt].toLowerCase();
const isBaseAnimated = btKey === "end";
const baseAKey = `${btKey}_a`;
@@ -230,7 +230,7 @@ export class LoadingScene extends SceneBase {
// Get current lang and load the types atlas for it. English will only load types while all other languages will load types and types_<lang>
const lang = i18next.resolvedLanguage;
if (lang !== "en") {
- if (Utils.verifyLang(lang)) {
+ if (verifyLang(lang)) {
this.loadAtlas(`statuses_${lang}`, "");
this.loadAtlas(`types_${lang}`, "");
} else {
@@ -257,7 +257,7 @@ export class LoadingScene extends SceneBase {
this.loadAtlas("egg_icons", "egg");
this.loadAtlas("egg_shard", "egg");
this.loadAtlas("egg_lightrays", "egg");
- Utils.getEnumKeys(GachaType).forEach(gt => {
+ getEnumKeys(GachaType).forEach(gt => {
const key = gt.toLowerCase();
this.loadImage(`gacha_${key}`, "egg");
this.loadAtlas(`gacha_underlay_${key}`, "egg");
diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts
index 8e7853a41bb8..d8a46775dcd2 100644
--- a/src/modifier/modifier-type.ts
+++ b/src/modifier/modifier-type.ts
@@ -1,23 +1,115 @@
import BattleScene from "#app/battle-scene";
-import { EvolutionItem, pokemonEvolutions } from "#app/data/balance/pokemon-evolutions";
-import { tmPoolTiers, tmSpecies } from "#app/data/balance/tms";
+import { EvolutionItem, pokemonEvolutions } from "#balance/pokemon-evolutions";
+import { tmPoolTiers, tmSpecies } from "#balance/tms";
import { getBerryEffectDescription, getBerryName } from "#app/data/berry";
import { allMoves, AttackMove, selfStatLowerMoves } from "#app/data/move";
import { getNatureName, getNatureStatMultiplier, Nature } from "#app/data/nature";
import { getPokeballCatchMultiplier, getPokeballName, MAX_PER_TYPE_POKEBALLS, PokeballType } from "#app/data/pokeball";
-import { FormChangeItem, pokemonFormChanges, SpeciesFormChangeCondition, SpeciesFormChangeItemTrigger } from "#app/data/pokemon-forms";
+import {
+ FormChangeItem,
+ pokemonFormChanges,
+ SpeciesFormChangeCondition,
+ SpeciesFormChangeItemTrigger,
+} from "#app/data/pokemon-forms";
import { getStatusEffectDescriptor, StatusEffect } from "#app/data/status-effect";
import { Type } from "#app/data/type";
import Pokemon, { EnemyPokemon, PlayerPokemon, PokemonMove } from "#app/field/pokemon";
import { getPokemonNameWithAffix } from "#app/messages";
-import { AddPokeballModifier, AddVoucherModifier, AttackTypeBoosterModifier, BaseStatModifier, BerryModifier, BoostBugSpawnModifier, BypassSpeedChanceModifier, ContactHeldItemTransferChanceModifier, CritBoosterModifier, DamageMoneyRewardModifier, DoubleBattleChanceBoosterModifier, EnemyAttackStatusEffectChanceModifier, EnemyDamageBoosterModifier, EnemyDamageReducerModifier, EnemyEndureChanceModifier, EnemyFusionChanceModifier, EnemyStatusEffectHealChanceModifier, EnemyTurnHealModifier, EvolutionItemModifier, EvolutionStatBoosterModifier, EvoTrackerModifier, ExpBalanceModifier, ExpBoosterModifier, ExpShareModifier, ExtraModifierModifier, FlinchChanceModifier, FusePokemonModifier, GigantamaxAccessModifier, HealingBoosterModifier, HealShopCostModifier, HiddenAbilityRateBoosterModifier, HitHealModifier, IvScannerModifier, LevelIncrementBoosterModifier, LockModifierTiersModifier, MapModifier, MegaEvolutionAccessModifier, MoneyInterestModifier, MoneyMultiplierModifier, MoneyRewardModifier, MultipleParticipantExpBonusModifier, PokemonAllMovePpRestoreModifier, PokemonBaseStatFlatModifier, PokemonBaseStatTotalModifier, PokemonExpBoosterModifier, PokemonFormChangeItemModifier, PokemonFriendshipBoosterModifier, PokemonHeldItemModifier, PokemonHpRestoreModifier, PokemonIncrementingStatModifier, PokemonInstantReviveModifier, PokemonLevelIncrementModifier, PokemonMoveAccuracyBoosterModifier, PokemonMultiHitModifier, PokemonNatureChangeModifier, PokemonNatureWeightModifier, PokemonPpRestoreModifier, PokemonPpUpModifier, PokemonStatusHealModifier, PreserveBerryModifier, RememberMoveModifier, ResetNegativeStatStageModifier, ShinyRateBoosterModifier, SpeciesCritBoosterModifier, SpeciesStatBoosterModifier, SurviveDamageModifier, SwitchEffectTransferModifier, TempCritBoosterModifier, TempStatStageBoosterModifier, TerastallizeAccessModifier, TerastallizeModifier, TmModifier, TurnHealModifier, TurnHeldItemTransferModifier, TurnStatusEffectModifier, type EnemyPersistentModifier, type Modifier, type PersistentModifier } from "#app/modifier/modifier";
+import {
+ AddPokeballModifier,
+ AddVoucherModifier,
+ AttackTypeBoosterModifier,
+ BaseStatModifier,
+ BerryModifier,
+ BoostBugSpawnModifier,
+ BypassSpeedChanceModifier,
+ ContactHeldItemTransferChanceModifier,
+ CritBoosterModifier,
+ DamageMoneyRewardModifier,
+ DoubleBattleChanceBoosterModifier,
+ EnemyAttackStatusEffectChanceModifier,
+ EnemyDamageBoosterModifier,
+ EnemyDamageReducerModifier,
+ EnemyEndureChanceModifier,
+ EnemyFusionChanceModifier,
+ EnemyStatusEffectHealChanceModifier,
+ EnemyTurnHealModifier,
+ EvolutionItemModifier,
+ EvolutionStatBoosterModifier,
+ EvoTrackerModifier,
+ ExpBalanceModifier,
+ ExpBoosterModifier,
+ ExpShareModifier,
+ ExtraModifierModifier,
+ FlinchChanceModifier,
+ FusePokemonModifier,
+ GigantamaxAccessModifier,
+ HealingBoosterModifier,
+ HealShopCostModifier,
+ HiddenAbilityRateBoosterModifier,
+ HitHealModifier,
+ IvScannerModifier,
+ LevelIncrementBoosterModifier,
+ LockModifierTiersModifier,
+ MapModifier,
+ MegaEvolutionAccessModifier,
+ MoneyInterestModifier,
+ MoneyMultiplierModifier,
+ MoneyRewardModifier,
+ MultipleParticipantExpBonusModifier,
+ PokemonAllMovePpRestoreModifier,
+ PokemonBaseStatFlatModifier,
+ PokemonBaseStatTotalModifier,
+ PokemonExpBoosterModifier,
+ PokemonFormChangeItemModifier,
+ PokemonFriendshipBoosterModifier,
+ PokemonHeldItemModifier,
+ PokemonHpRestoreModifier,
+ PokemonIncrementingStatModifier,
+ PokemonInstantReviveModifier,
+ PokemonLevelIncrementModifier,
+ PokemonMoveAccuracyBoosterModifier,
+ PokemonMultiHitModifier,
+ PokemonNatureChangeModifier,
+ PokemonNatureWeightModifier,
+ PokemonPpRestoreModifier,
+ PokemonPpUpModifier,
+ PokemonStatusHealModifier,
+ PreserveBerryModifier,
+ RememberMoveModifier,
+ ResetNegativeStatStageModifier,
+ ShinyRateBoosterModifier,
+ SpeciesCritBoosterModifier,
+ SpeciesStatBoosterModifier,
+ SurviveDamageModifier,
+ SwitchEffectTransferModifier,
+ TempCritBoosterModifier,
+ TempStatStageBoosterModifier,
+ TerastallizeAccessModifier,
+ TerastallizeModifier,
+ TmModifier,
+ TurnHealModifier,
+ TurnHeldItemTransferModifier,
+ TurnStatusEffectModifier,
+ type EnemyPersistentModifier,
+ type Modifier,
+ type PersistentModifier,
+} from "#app/modifier/modifier";
import { ModifierTier } from "#app/modifier/modifier-tier";
import Overrides from "#app/overrides";
import { Unlockables } from "#app/system/unlockables";
import { getVoucherTypeIcon, getVoucherTypeName, VoucherType } from "#app/system/voucher";
import PartyUiHandler, { PokemonMoveSelectFilter, PokemonSelectFilter } from "#app/ui/party-ui-handler";
import { getModifierTierTextTint } from "#app/ui/text";
-import { formatMoney, getEnumKeys, getEnumValues, IntegerHolder, NumberHolder, padInt, randSeedInt, randSeedItem } from "#app/utils";
+import {
+ formatMoney,
+ getEnumKeys,
+ getEnumValues,
+ NumberHolder,
+ padInt,
+ randSeedInt,
+ randSeedItem,
+} from "#app/utils";
import { Abilities } from "#enums/abilities";
import { BattlerTagType } from "#enums/battler-tag-type";
import { BerryType } from "#enums/berry-type";
@@ -725,7 +817,7 @@ export class MoneyRewardModifierType extends ModifierType {
}
getDescription(scene: BattleScene): string {
- const moneyAmount = new IntegerHolder(scene.getWaveMoneyAmount(this.moneyMultiplier));
+ const moneyAmount = new NumberHolder(scene.getWaveMoneyAmount(this.moneyMultiplier));
scene.applyModifiers(MoneyMultiplierModifier, true, moneyAmount);
const formattedMoney = formatMoney(scene.moneyFormat, moneyAmount.value);
diff --git a/src/modifier/modifier.ts b/src/modifier/modifier.ts
index b699c2483c9f..aa1c33d5353d 100644
--- a/src/modifier/modifier.ts
+++ b/src/modifier/modifier.ts
@@ -1,19 +1,24 @@
import type BattleScene from "#app/battle-scene";
-import { FusionSpeciesFormEvolution, pokemonEvolutions, pokemonPrevolutions } from "#app/data/balance/pokemon-evolutions";
+import { FusionSpeciesFormEvolution, pokemonEvolutions, pokemonPrevolutions } from "#balance/pokemon-evolutions";
import { getBerryEffectFunc, getBerryPredicate } from "#app/data/berry";
import { getLevelTotalExp } from "#app/data/exp";
import { allMoves } from "#app/data/move";
import { MAX_PER_TYPE_POKEBALLS } from "#app/data/pokeball";
-import { type FormChangeItem, SpeciesFormChangeItemTrigger, SpeciesFormChangeLapseTeraTrigger, SpeciesFormChangeTeraTrigger } from "#app/data/pokemon-forms";
+import {
+ type FormChangeItem,
+ SpeciesFormChangeItemTrigger,
+ SpeciesFormChangeLapseTeraTrigger,
+ SpeciesFormChangeTeraTrigger,
+} from "#app/data/pokemon-forms";
import { getStatusEffectHealText } from "#app/data/status-effect";
import { Type } from "#app/data/type";
import Pokemon, { type PlayerPokemon } from "#app/field/pokemon";
import { getPokemonNameWithAffix } from "#app/messages";
import Overrides from "#app/overrides";
-import { EvolutionPhase } from "#app/phases/evolution-phase";
-import { LearnMovePhase, LearnMoveType } from "#app/phases/learn-move-phase";
-import { LevelUpPhase } from "#app/phases/level-up-phase";
-import { PokemonHealPhase } from "#app/phases/pokemon-heal-phase";
+import { EvolutionPhase } from "#phases/evolution-phase";
+import { LearnMovePhase, LearnMoveType } from "#phases/learn-move-phase";
+import { LevelUpPhase } from "#phases/level-up-phase";
+import { PokemonHealPhase } from "#phases/pokemon-heal-phase";
import { achvs } from "#app/system/achv";
import type { VoucherType } from "#app/system/voucher";
import { Command } from "#app/ui/command-ui-handler";
@@ -28,9 +33,27 @@ import { Species } from "#enums/species";
import { type PermanentStat, type TempBattleStat, BATTLE_STATS, Stat, TEMP_BATTLE_STATS } from "#enums/stat";
import { StatusEffect } from "#enums/status-effect";
import i18next from "i18next";
-import { type DoubleBattleChanceBoosterModifierType, type EvolutionItemModifierType, type FormChangeItemModifierType, type ModifierOverride, type ModifierType, type PokemonBaseStatTotalModifierType, type PokemonExpBoosterModifierType, type PokemonFriendshipBoosterModifierType, type PokemonMoveAccuracyBoosterModifierType, type PokemonMultiHitModifierType, type TerastallizeModifierType, type TmModifierType, getModifierType, ModifierPoolType, ModifierTypeGenerator, modifierTypes, PokemonHeldItemModifierType } from "./modifier-type";
+import {
+ type DoubleBattleChanceBoosterModifierType,
+ type EvolutionItemModifierType,
+ type FormChangeItemModifierType,
+ type ModifierOverride,
+ type ModifierType,
+ type PokemonBaseStatTotalModifierType,
+ type PokemonExpBoosterModifierType,
+ type PokemonFriendshipBoosterModifierType,
+ type PokemonMoveAccuracyBoosterModifierType,
+ type PokemonMultiHitModifierType,
+ type TerastallizeModifierType,
+ type TmModifierType,
+ getModifierType,
+ ModifierPoolType,
+ ModifierTypeGenerator,
+ modifierTypes,
+ PokemonHeldItemModifierType,
+} from "#app/modifier/modifier-type";
import { Color, ShadowColor } from "#enums/color";
-import { FRIENDSHIP_GAIN_FROM_RARE_CANDY } from "#app/data/balance/starters";
+import { FRIENDSHIP_GAIN_FROM_RARE_CANDY } from "#balance/starters";
export type ModifierPredicate = (modifier: Modifier) => boolean;
diff --git a/src/overrides.ts b/src/overrides.ts
index e1bfbd240f0e..35e62a7d7c4e 100644
--- a/src/overrides.ts
+++ b/src/overrides.ts
@@ -9,10 +9,10 @@ import { TimeOfDay } from "#enums/time-of-day";
import { VariantTier } from "#enums/variant-tier";
import { WeatherType } from "#enums/weather-type";
import { type PokeballCounts } from "./battle-scene";
-import { Gender } from "./data/gender";
-import { Variant } from "./data/variant";
-import { type ModifierOverride } from "./modifier/modifier-type";
-import { Unlockables } from "./system/unlockables";
+import { Gender } from "#app/data/gender";
+import { Variant } from "#app/data/variant";
+import { type ModifierOverride } from "#app/modifier/modifier-type";
+import { Unlockables } from "#app/system/unlockables";
import { MysteryEncounterType } from "#enums/mystery-encounter-type";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
diff --git a/src/phases/add-enemy-buff-modifier-phase.ts b/src/phases/add-enemy-buff-modifier-phase.ts
index 451e6e2662c9..3594c69ce594 100644
--- a/src/phases/add-enemy-buff-modifier-phase.ts
+++ b/src/phases/add-enemy-buff-modifier-phase.ts
@@ -1,6 +1,10 @@
import BattleScene from "#app/battle-scene";
import { ModifierTier } from "#app/modifier/modifier-tier";
-import { regenerateModifierPoolThresholds, ModifierPoolType, getEnemyBuffModifierForWave } from "#app/modifier/modifier-type";
+import {
+ regenerateModifierPoolThresholds,
+ ModifierPoolType,
+ getEnemyBuffModifierForWave,
+} from "#app/modifier/modifier-type";
import { EnemyPersistentModifier } from "#app/modifier/modifier";
import { Phase } from "#app/phase";
diff --git a/src/phases/attempt-capture-phase.ts b/src/phases/attempt-capture-phase.ts
index 3e46fc792f04..43d527cf7bba 100644
--- a/src/phases/attempt-capture-phase.ts
+++ b/src/phases/attempt-capture-phase.ts
@@ -1,9 +1,14 @@
import BattleScene from "#app/battle-scene";
import { BattlerIndex } from "#app/battle";
-import { getPokeballCatchMultiplier, getPokeballAtlasKey, getPokeballTintColor, doPokeballBounceAnim } from "#app/data/pokeball";
+import {
+ getPokeballCatchMultiplier,
+ getPokeballAtlasKey,
+ getPokeballTintColor,
+ doPokeballBounceAnim,
+} from "#app/data/pokeball";
import { getStatusEffectCatchRateMultiplier } from "#app/data/status-effect";
-import { PokeballType } from "#app/enums/pokeball";
-import { StatusEffect } from "#app/enums/status-effect";
+import { PokeballType } from "#enums/pokeball";
+import { StatusEffect } from "#enums/status-effect";
import { addPokeballOpenParticles, addPokeballCaptureStars } from "#app/field/anims";
import { EnemyPokemon } from "#app/field/pokemon";
import { getPokemonNameWithAffix } from "#app/messages";
@@ -13,8 +18,8 @@ import { PartyUiMode, PartyOption } from "#app/ui/party-ui-handler";
import { SummaryUiMode } from "#app/ui/summary-ui-handler";
import { Mode } from "#app/ui/ui";
import i18next from "i18next";
-import { PokemonPhase } from "./pokemon-phase";
-import { VictoryPhase } from "./victory-phase";
+import { PokemonPhase } from "#phases/pokemon-phase";
+import { VictoryPhase } from "#phases/victory-phase";
import { SubstituteTag } from "#app/data/battler-tags";
export class AttemptCapturePhase extends PokemonPhase {
diff --git a/src/phases/attempt-run-phase.ts b/src/phases/attempt-run-phase.ts
index e0dd7fa72fd7..21929db69ae5 100644
--- a/src/phases/attempt-run-phase.ts
+++ b/src/phases/attempt-run-phase.ts
@@ -1,13 +1,13 @@
import BattleScene from "#app/battle-scene";
import { applyAbAttrs, RunSuccessAbAttr } from "#app/data/ability";
-import { Stat } from "#app/enums/stat";
-import { StatusEffect } from "#app/enums/status-effect";
+import { Stat } from "#enums/stat";
+import { StatusEffect } from "#enums/status-effect";
import Pokemon, { PlayerPokemon, EnemyPokemon } from "#app/field/pokemon";
import i18next from "i18next";
-import * as Utils from "#app/utils";
-import { BattleEndPhase } from "./battle-end-phase";
-import { NewBattlePhase } from "./new-battle-phase";
-import { PokemonPhase } from "./pokemon-phase";
+import { NumberHolder } from "#app/utils";
+import { BattleEndPhase } from "#phases/battle-end-phase";
+import { NewBattlePhase } from "#phases/new-battle-phase";
+import { PokemonPhase } from "#phases/pokemon-phase";
export class AttemptRunPhase extends PokemonPhase {
constructor(scene: BattleScene, fieldIndex: number) {
@@ -22,7 +22,7 @@ export class AttemptRunPhase extends PokemonPhase {
const playerPokemon = this.getPokemon();
- const escapeChance = new Utils.NumberHolder(0);
+ const escapeChance = new NumberHolder(0);
this.attemptRunAway(playerField, enemyField, escapeChance);
@@ -57,7 +57,7 @@ export class AttemptRunPhase extends PokemonPhase {
this.end();
}
- attemptRunAway(playerField: PlayerPokemon[], enemyField: EnemyPokemon[], escapeChance: Utils.NumberHolder) {
+ attemptRunAway(playerField: PlayerPokemon[], enemyField: EnemyPokemon[], escapeChance: NumberHolder) {
/** Sum of the speed of all enemy pokemon on the field */
const enemySpeed = enemyField.reduce((total: number, enemyPokemon: Pokemon) => total + enemyPokemon.getStat(Stat.SPD), 0);
/** Sum of the speed of all player pokemon on the field */
diff --git a/src/phases/battle-end-phase.ts b/src/phases/battle-end-phase.ts
index bae61aa2288a..b87e4b50239a 100644
--- a/src/phases/battle-end-phase.ts
+++ b/src/phases/battle-end-phase.ts
@@ -1,7 +1,7 @@
import { applyPostBattleAbAttrs, PostBattleAbAttr } from "#app/data/ability";
import { LapsingPersistentModifier, LapsingPokemonHeldItemModifier } from "#app/modifier/modifier";
-import { BattlePhase } from "./battle-phase";
-import { GameOverPhase } from "./game-over-phase";
+import { BattlePhase } from "#phases/battle-phase";
+import { GameOverPhase } from "#phases/game-over-phase";
import BattleScene from "#app/battle-scene";
export class BattleEndPhase extends BattlePhase {
diff --git a/src/phases/berry-phase.ts b/src/phases/berry-phase.ts
index e419aa6692d2..c1f370ea5db5 100644
--- a/src/phases/berry-phase.ts
+++ b/src/phases/berry-phase.ts
@@ -4,9 +4,9 @@ import { BerryUsedEvent } from "#app/events/battle-scene";
import { getPokemonNameWithAffix } from "#app/messages";
import { BerryModifier } from "#app/modifier/modifier";
import i18next from "i18next";
-import * as Utils from "#app/utils";
-import { FieldPhase } from "./field-phase";
-import { CommonAnimPhase } from "./common-anim-phase";
+import { BooleanHolder } from "#app/utils";
+import { FieldPhase } from "#phases/field-phase";
+import { CommonAnimPhase } from "#phases/common-anim-phase";
/** The phase after attacks where the pokemon eat berries */
export class BerryPhase extends FieldPhase {
@@ -19,7 +19,7 @@ export class BerryPhase extends FieldPhase {
}, pokemon.isPlayer());
if (hasUsableBerry) {
- const cancelled = new Utils.BooleanHolder(false);
+ const cancelled = new BooleanHolder(false);
pokemon.getOpponents().map((opp) => applyAbAttrs(PreventBerryUseAbAttr, opp, cancelled));
if (cancelled.value) {
@@ -42,7 +42,7 @@ export class BerryPhase extends FieldPhase {
this.scene.updateModifiers(pokemon.isPlayer());
- applyAbAttrs(HealFromBerryUseAbAttr, pokemon, new Utils.BooleanHolder(false));
+ applyAbAttrs(HealFromBerryUseAbAttr, pokemon, new BooleanHolder(false));
}
}
});
diff --git a/src/phases/check-status-effect-phase.ts b/src/phases/check-status-effect-phase.ts
index 44918b549664..3ca1d2b15f9e 100644
--- a/src/phases/check-status-effect-phase.ts
+++ b/src/phases/check-status-effect-phase.ts
@@ -1,4 +1,4 @@
-import { PostTurnStatusEffectPhase } from "#app/phases/post-turn-status-effect-phase";
+import { PostTurnStatusEffectPhase } from "#phases/post-turn-status-effect-phase";
import { Phase } from "#app/phase";
import { BattlerIndex } from "#app/battle";
import BattleScene from "#app/battle-scene";
diff --git a/src/phases/check-switch-phase.ts b/src/phases/check-switch-phase.ts
index 8849d304435c..a1224d75f45b 100644
--- a/src/phases/check-switch-phase.ts
+++ b/src/phases/check-switch-phase.ts
@@ -1,13 +1,13 @@
import BattleScene from "#app/battle-scene";
-import { BattleStyle } from "#app/enums/battle-style";
-import { BattlerTagType } from "#app/enums/battler-tag-type";
+import { BattleStyle } from "#enums/battle-style";
+import { BattlerTagType } from "#enums/battler-tag-type";
import { getPokemonNameWithAffix } from "#app/messages";
import { Mode } from "#app/ui/ui";
import i18next from "i18next";
-import { BattlePhase } from "./battle-phase";
-import { PostSummonPhase } from "./post-summon-phase";
-import { SummonMissingPhase } from "./summon-missing-phase";
-import { SwitchPhase } from "./switch-phase";
+import { BattlePhase } from "#phases/battle-phase";
+import { PostSummonPhase } from "#phases/post-summon-phase";
+import { SummonMissingPhase } from "#phases/summon-missing-phase";
+import { SwitchPhase } from "#phases/switch-phase";
import { SwitchType } from "#enums/switch-type";
export class CheckSwitchPhase extends BattlePhase {
diff --git a/src/phases/command-phase.ts b/src/phases/command-phase.ts
index e6f2eb69ff32..e406bb0c7058 100644
--- a/src/phases/command-phase.ts
+++ b/src/phases/command-phase.ts
@@ -2,19 +2,19 @@ import BattleScene from "#app/battle-scene";
import { TurnCommand, BattleType } from "#app/battle";
import { TrappedTag, EncoreTag } from "#app/data/battler-tags";
import { MoveTargetSet, getMoveTargets } from "#app/data/move";
-import { speciesStarterCosts } from "#app/data/balance/starters";
-import { Abilities } from "#app/enums/abilities";
-import { BattlerTagType } from "#app/enums/battler-tag-type";
-import { Biome } from "#app/enums/biome";
-import { Moves } from "#app/enums/moves";
-import { PokeballType } from "#app/enums/pokeball";
+import { speciesStarterCosts } from "#balance/starters";
+import { Abilities } from "#enums/abilities";
+import { BattlerTagType } from "#enums/battler-tag-type";
+import { Biome } from "#enums/biome";
+import { Moves } from "#enums/moves";
+import { PokeballType } from "#enums/pokeball";
import { FieldPosition, PlayerPokemon } from "#app/field/pokemon";
import { getPokemonNameWithAffix } from "#app/messages";
import { Command } from "#app/ui/command-ui-handler";
import { Mode } from "#app/ui/ui";
import i18next from "i18next";
-import { FieldPhase } from "./field-phase";
-import { SelectTargetPhase } from "./select-target-phase";
+import { FieldPhase } from "#phases/field-phase";
+import { SelectTargetPhase } from "#phases/select-target-phase";
import { MysteryEncounterMode } from "#enums/mystery-encounter-mode";
import { isNullOrUndefined } from "#app/utils";
diff --git a/src/phases/common-anim-phase.ts b/src/phases/common-anim-phase.ts
index c4071488eefb..b6ec640ee84a 100644
--- a/src/phases/common-anim-phase.ts
+++ b/src/phases/common-anim-phase.ts
@@ -1,7 +1,7 @@
import BattleScene from "#app/battle-scene";
import { BattlerIndex } from "#app/battle";
import { CommonAnim, CommonBattleAnim } from "#app/data/battle-anims";
-import { PokemonPhase } from "./pokemon-phase";
+import { PokemonPhase } from "#phases/pokemon-phase";
export class CommonAnimPhase extends PokemonPhase {
private anim: CommonAnim | null;
diff --git a/src/phases/damage-phase.ts b/src/phases/damage-phase.ts
index 44e3dfd4182d..9ead9e843775 100644
--- a/src/phases/damage-phase.ts
+++ b/src/phases/damage-phase.ts
@@ -1,9 +1,9 @@
import BattleScene from "#app/battle-scene";
import { BattlerIndex } from "#app/battle";
-import { BattleSpec } from "#app/enums/battle-spec";
+import { BattleSpec } from "#enums/battle-spec";
import { DamageResult, HitResult } from "#app/field/pokemon";
-import * as Utils from "#app/utils";
-import { PokemonPhase } from "./pokemon-phase";
+import { fixedInt } from "#app/utils";
+import { PokemonPhase } from "#phases/pokemon-phase";
export class DamagePhase extends PokemonPhase {
private amount: integer;
@@ -25,7 +25,7 @@ export class DamagePhase extends PokemonPhase {
if (this.scene.moveAnimations) {
this.scene.toggleInvert(true);
}
- this.scene.time.delayedCall(Utils.fixedInt(1000), () => {
+ this.scene.time.delayedCall(fixedInt(1000), () => {
this.scene.toggleInvert(false);
this.applyDamage();
});
diff --git a/src/phases/egg-hatch-phase.ts b/src/phases/egg-hatch-phase.ts
index 90aceeb46bcd..06d77244445c 100644
--- a/src/phases/egg-hatch-phase.ts
+++ b/src/phases/egg-hatch-phase.ts
@@ -11,8 +11,8 @@ import PokemonInfoContainer from "#app/ui/pokemon-info-container";
import { Mode } from "#app/ui/ui";
import i18next from "i18next";
import SoundFade from "phaser3-rex-plugins/plugins/soundfade";
-import * as Utils from "#app/utils";
-import { EggLapsePhase } from "./egg-lapse-phase";
+import { fixedInt, getFrameMs, randInt } from "#app/utils";
+import { EggLapsePhase } from "#phases/egg-lapse-phase";
import { EggHatchData } from "#app/data/egg-hatch-data";
@@ -285,15 +285,15 @@ export class EggHatchPhase extends Phase {
this.canSkip = false;
this.hatched = true;
if (this.evolutionBgm) {
- SoundFade.fadeOut(this.scene, this.evolutionBgm, Utils.fixedInt(100));
+ SoundFade.fadeOut(this.scene, this.evolutionBgm, fixedInt(100));
}
for (let e = 0; e < 5; e++) {
- this.scene.time.delayedCall(Utils.fixedInt(375 * e), () => this.scene.playSound("se/egg_hatch", { volume: 1 - (e * 0.2) }));
+ this.scene.time.delayedCall(fixedInt(375 * e), () => this.scene.playSound("se/egg_hatch", { volume: 1 - (e * 0.2) }));
}
this.eggLightraysOverlay.setVisible(true);
this.eggLightraysOverlay.play("egg_lightrays");
this.scene.tweens.add({
- duration: Utils.fixedInt(125),
+ duration: fixedInt(125),
targets: this.eggHatchOverlay,
alpha: 1,
ease: "Cubic.easeIn",
@@ -302,7 +302,7 @@ export class EggHatchPhase extends Phase {
this.canSkip = true;
}
});
- this.scene.time.delayedCall(Utils.fixedInt(1500), () => {
+ this.scene.time.delayedCall(fixedInt(1500), () => {
this.canSkip = false;
if (!this.skipped) {
this.doReveal();
@@ -335,17 +335,17 @@ export class EggHatchPhase extends Phase {
this.pokemonSprite.setPipelineData("shiny", this.pokemon.shiny);
this.pokemonSprite.setPipelineData("variant", this.pokemon.variant);
this.pokemonSprite.setVisible(true);
- this.scene.time.delayedCall(Utils.fixedInt(250), () => {
+ this.scene.time.delayedCall(fixedInt(250), () => {
this.eggsToHatchCount--;
this.eggHatchHandler.eventTarget.dispatchEvent(new EggCountChangedEvent(this.eggsToHatchCount));
this.pokemon.cry();
if (isShiny) {
- this.scene.time.delayedCall(Utils.fixedInt(500), () => {
+ this.scene.time.delayedCall(fixedInt(500), () => {
this.pokemonShinySparkle.play(`sparkle${this.pokemon.variant ? `_${this.pokemon.variant + 1}` : ""}`);
this.scene.playSound("se/sparkle");
});
}
- this.scene.time.delayedCall(Utils.fixedInt(!this.skipped ? !isShiny ? 1250 : 1750 : !isShiny ? 250 : 750), () => {
+ this.scene.time.delayedCall(fixedInt(!this.skipped ? !isShiny ? 1250 : 1750 : !isShiny ? 250 : 750), () => {
this.infoContainer.show(this.pokemon, false, this.skipped ? 2 : 1);
this.scene.playSoundWithoutBgm("evolution_fanfare");
@@ -363,7 +363,7 @@ export class EggHatchPhase extends Phase {
});
});
this.scene.tweens.add({
- duration: Utils.fixedInt(this.skipped ? 500 : 3000),
+ duration: fixedInt(this.skipped ? 500 : 3000),
targets: this.eggHatchOverlay,
alpha: 0,
ease: "Cubic.easeOut"
@@ -388,9 +388,9 @@ export class EggHatchPhase extends Phase {
doSpray(intensity: integer, offsetY?: number) {
this.scene.tweens.addCounter({
repeat: intensity,
- duration: Utils.getFrameMs(1),
+ duration: getFrameMs(1),
onRepeat: () => {
- this.doSprayParticle(Utils.randInt(8), offsetY || 0);
+ this.doSprayParticle(randInt(8), offsetY || 0);
}
});
}
@@ -409,12 +409,12 @@ export class EggHatchPhase extends Phase {
let f = 0;
let yOffset = 0;
- const speed = 3 - Utils.randInt(8);
- const amp = 24 + Utils.randInt(32);
+ const speed = 3 - randInt(8);
+ const amp = 24 + randInt(32);
const particleTimer = this.scene.tweens.addCounter({
repeat: -1,
- duration: Utils.getFrameMs(1),
+ duration: getFrameMs(1),
onRepeat: () => {
updateParticle();
}
diff --git a/src/phases/egg-lapse-phase.ts b/src/phases/egg-lapse-phase.ts
index 4c57be09b793..79745073b669 100644
--- a/src/phases/egg-lapse-phase.ts
+++ b/src/phases/egg-lapse-phase.ts
@@ -3,11 +3,11 @@ import { Egg, EGG_SEED } from "#app/data/egg";
import { Phase } from "#app/phase";
import i18next from "i18next";
import Overrides from "#app/overrides";
-import { EggHatchPhase } from "./egg-hatch-phase";
+import { EggHatchPhase } from "#phases/egg-hatch-phase";
import { Mode } from "#app/ui/ui";
import { achvs } from "#app/system/achv";
import { PlayerPokemon } from "#app/field/pokemon";
-import { EggSummaryPhase } from "./egg-summary-phase";
+import { EggSummaryPhase } from "#phases/egg-summary-phase";
import { EggHatchData } from "#app/data/egg-hatch-data";
/**
diff --git a/src/phases/encounter-phase.ts b/src/phases/encounter-phase.ts
index b7071c4cc6fc..a3d272d98568 100644
--- a/src/phases/encounter-phase.ts
+++ b/src/phases/encounter-phase.ts
@@ -4,9 +4,9 @@ import { applyAbAttrs, SyncEncounterNatureAbAttr } from "#app/data/ability";
import { getCharVariantFromDialogue } from "#app/data/dialogue";
import { TrainerSlot } from "#app/data/trainer-config";
import { getRandomWeatherType } from "#app/data/weather";
-import { BattleSpec } from "#app/enums/battle-spec";
-import { PlayerGender } from "#app/enums/player-gender";
-import { Species } from "#app/enums/species";
+import { BattleSpec } from "#enums/battle-spec";
+import { PlayerGender } from "#enums/player-gender";
+import { Species } from "#enums/species";
import { EncounterPhaseEvent } from "#app/events/battle-scene";
import Pokemon, { FieldPosition } from "#app/field/pokemon";
import { getPokemonNameWithAffix } from "#app/messages";
@@ -16,26 +16,25 @@ import { achvs } from "#app/system/achv";
import { handleTutorial, Tutorial } from "#app/tutorial";
import { Mode } from "#app/ui/ui";
import i18next from "i18next";
-import { BattlePhase } from "./battle-phase";
-import * as Utils from "#app/utils";
-import { randSeedInt } from "#app/utils";
-import { CheckSwitchPhase } from "./check-switch-phase";
-import { GameOverPhase } from "./game-over-phase";
-import { PostSummonPhase } from "./post-summon-phase";
-import { ReturnPhase } from "./return-phase";
-import { ScanIvsPhase } from "./scan-ivs-phase";
-import { ShinySparklePhase } from "./shiny-sparkle-phase";
-import { SummonPhase } from "./summon-phase";
-import { ToggleDoublePositionPhase } from "./toggle-double-position-phase";
+import { BattlePhase } from "#phases/battle-phase";
+import { randSeedInt, randSeedItem } from "#app/utils";
+import { CheckSwitchPhase } from "#phases/check-switch-phase";
+import { GameOverPhase } from "#phases/game-over-phase";
+import { PostSummonPhase } from "#phases/post-summon-phase";
+import { ReturnPhase } from "#phases/return-phase";
+import { ScanIvsPhase } from "#phases/scan-ivs-phase";
+import { ShinySparklePhase } from "#phases/shiny-sparkle-phase";
+import { SummonPhase } from "#phases/summon-phase";
+import { ToggleDoublePositionPhase } from "#phases/toggle-double-position-phase";
import Overrides from "#app/overrides";
import { initEncounterAnims, loadEncounterAnimAssets } from "#app/data/battle-anims";
import { MysteryEncounterMode } from "#enums/mystery-encounter-mode";
-import { doTrainerExclamation } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import { getEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
-import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases";
-import { getGoldenBugNetSpecies } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
+import { doTrainerExclamation } from "#mystery-encounters/utils/encounter-phase-utils";
+import { getEncounterText } from "#mystery-encounters/utils/encounter-dialogue-utils";
+import { MysteryEncounterPhase } from "#phases/mystery-encounter-phases";
+import { getGoldenBugNetSpecies } from "#mystery-encounters/utils/encounter-pokemon-utils";
import { Biome } from "#enums/biome";
-import { WEIGHT_INCREMENT_ON_SPAWN_MISS } from "#app/data/mystery-encounters/mystery-encounters";
+import { WEIGHT_INCREMENT_ON_SPAWN_MISS } from "#mystery-encounters/mystery-encounters";
export class EncounterPhase extends BattlePhase {
private loaded: boolean;
@@ -362,7 +361,7 @@ export class EncounterPhase extends BattlePhase {
doSummon();
} else {
let message: string;
- this.scene.executeWithSeedOffset(() => message = Utils.randSeedItem(encounterMessages), this.scene.currentBattle.waveIndex);
+ this.scene.executeWithSeedOffset(() => message = randSeedItem(encounterMessages), this.scene.currentBattle.waveIndex);
message = message!; // tell TS compiler it's defined now
const showDialogueAndSummon = () => {
this.scene.ui.showDialogue(message, trainer?.getName(TrainerSlot.NONE, true), null, () => {
diff --git a/src/phases/end-card-phase.ts b/src/phases/end-card-phase.ts
index 274a745017a2..fa5f32d53685 100644
--- a/src/phases/end-card-phase.ts
+++ b/src/phases/end-card-phase.ts
@@ -1,5 +1,5 @@
import BattleScene from "#app/battle-scene";
-import { PlayerGender } from "#app/enums/player-gender";
+import { PlayerGender } from "#enums/player-gender";
import { Phase } from "#app/phase";
import { addTextObject, TextStyle } from "#app/ui/text";
import i18next from "i18next";
diff --git a/src/phases/enemy-command-phase.ts b/src/phases/enemy-command-phase.ts
index 3647a237ef1f..5a7f9b0eaf51 100644
--- a/src/phases/enemy-command-phase.ts
+++ b/src/phases/enemy-command-phase.ts
@@ -1,7 +1,7 @@
import BattleScene from "#app/battle-scene";
import { BattlerIndex } from "#app/battle";
import { Command } from "#app/ui/command-ui-handler";
-import { FieldPhase } from "./field-phase";
+import { FieldPhase } from "#phases/field-phase";
/**
* Phase for determining an enemy AI's action for the next turn.
diff --git a/src/phases/enemy-party-member-pokemon-phase.ts b/src/phases/enemy-party-member-pokemon-phase.ts
index bb34f53b4755..f187b5872350 100644
--- a/src/phases/enemy-party-member-pokemon-phase.ts
+++ b/src/phases/enemy-party-member-pokemon-phase.ts
@@ -1,6 +1,6 @@
import BattleScene from "#app/battle-scene";
import { EnemyPokemon } from "#app/field/pokemon";
-import { PartyMemberPokemonPhase } from "./party-member-pokemon-phase";
+import { PartyMemberPokemonPhase } from "#phases/party-member-pokemon-phase";
export abstract class EnemyPartyMemberPokemonPhase extends PartyMemberPokemonPhase {
constructor(scene: BattleScene, partyMemberIndex: integer) {
diff --git a/src/phases/evolution-phase.ts b/src/phases/evolution-phase.ts
index 59b73fe9e118..4303dd1cde4d 100644
--- a/src/phases/evolution-phase.ts
+++ b/src/phases/evolution-phase.ts
@@ -1,17 +1,17 @@
import SoundFade from "phaser3-rex-plugins/plugins/soundfade";
import { Phase } from "#app/phase";
import BattleScene from "#app/battle-scene";
-import { SpeciesFormEvolution } from "#app/data/balance/pokemon-evolutions";
+import { SpeciesFormEvolution } from "#balance/pokemon-evolutions";
import EvolutionSceneHandler from "#app/ui/evolution-scene-handler";
-import * as Utils from "#app/utils";
+import { fixedInt, getFrameMs, randInt } from "#app/utils";
import { Mode } from "#app/ui/ui";
import { cos, sin } from "#app/field/anims";
import { PlayerPokemon } from "#app/field/pokemon";
import { getTypeRgb } from "#app/data/type";
import i18next from "i18next";
import { getPokemonNameWithAffix } from "#app/messages";
-import { LearnMovePhase } from "#app/phases/learn-move-phase";
-import { EndEvolutionPhase } from "#app/phases/end-evolution-phase";
+import { LearnMovePhase } from "#phases/learn-move-phase";
+import { EndEvolutionPhase } from "#phases/end-evolution-phase";
export class EvolutionPhase extends Phase {
protected pokemon: PlayerPokemon;
@@ -256,8 +256,8 @@ export class EvolutionPhase extends Phase {
this.scene.playSoundWithoutBgm("evolution_fanfare");
evolvedPokemon.destroy();
- this.scene.ui.showText(i18next.t("menu:evolutionDone", { pokemonName: preName, evolvedPokemonName: this.pokemon.name }), null, () => this.end(), null, true, Utils.fixedInt(4000));
- this.scene.time.delayedCall(Utils.fixedInt(4250), () => this.scene.playBgm());
+ this.scene.ui.showText(i18next.t("menu:evolutionDone", { pokemonName: preName, evolvedPokemonName: this.pokemon.name }), null, () => this.end(), null, true, fixedInt(4000));
+ this.scene.time.delayedCall(fixedInt(4250), () => this.scene.playBgm());
});
});
}
@@ -285,7 +285,7 @@ export class EvolutionPhase extends Phase {
this.scene.tweens.addCounter({
repeat: 64,
- duration: Utils.getFrameMs(1),
+ duration: getFrameMs(1),
onRepeat: () => {
if (f < 64) {
if (!(f & 7)) {
@@ -304,7 +304,7 @@ export class EvolutionPhase extends Phase {
this.scene.tweens.addCounter({
repeat: 96,
- duration: Utils.getFrameMs(1),
+ duration: getFrameMs(1),
onRepeat: () => {
if (f < 96) {
if (f < 6) {
@@ -355,7 +355,7 @@ export class EvolutionPhase extends Phase {
this.scene.tweens.addCounter({
repeat: 48,
- duration: Utils.getFrameMs(1),
+ duration: getFrameMs(1),
onRepeat: () => {
if (!f) {
for (let i = 0; i < 16; i++) {
@@ -376,14 +376,14 @@ export class EvolutionPhase extends Phase {
this.scene.tweens.addCounter({
repeat: 48,
- duration: Utils.getFrameMs(1),
+ duration: getFrameMs(1),
onRepeat: () => {
if (!f) {
for (let i = 0; i < 8; i++) {
this.doSprayParticle(i);
}
} else if (f < 50) {
- this.doSprayParticle(Utils.randInt(8));
+ this.doSprayParticle(randInt(8));
}
f++;
}
@@ -400,7 +400,7 @@ export class EvolutionPhase extends Phase {
const particleTimer = this.scene.tweens.addCounter({
repeat: -1,
- duration: Utils.getFrameMs(1),
+ duration: getFrameMs(1),
onRepeat: () => {
updateParticle();
}
@@ -437,7 +437,7 @@ export class EvolutionPhase extends Phase {
const particleTimer = this.scene.tweens.addCounter({
repeat: -1,
- duration: Utils.getFrameMs(1),
+ duration: getFrameMs(1),
onRepeat: () => {
updateParticle();
}
@@ -469,7 +469,7 @@ export class EvolutionPhase extends Phase {
const particleTimer = this.scene.tweens.addCounter({
repeat: -1,
- duration: Utils.getFrameMs(1),
+ duration: getFrameMs(1),
onRepeat: () => {
updateParticle();
}
@@ -499,12 +499,12 @@ export class EvolutionPhase extends Phase {
let f = 0;
let yOffset = 0;
- const speed = 3 - Utils.randInt(8);
- const amp = 48 + Utils.randInt(64);
+ const speed = 3 - randInt(8);
+ const amp = 48 + randInt(64);
const particleTimer = this.scene.tweens.addCounter({
repeat: -1,
- duration: Utils.getFrameMs(1),
+ duration: getFrameMs(1),
onRepeat: () => {
updateParticle();
}
diff --git a/src/phases/exp-phase.ts b/src/phases/exp-phase.ts
index 81982980d2ae..70bb298d4414 100644
--- a/src/phases/exp-phase.ts
+++ b/src/phases/exp-phase.ts
@@ -2,9 +2,9 @@ import BattleScene from "#app/battle-scene";
import { getPokemonNameWithAffix } from "#app/messages";
import { ExpBoosterModifier } from "#app/modifier/modifier";
import i18next from "i18next";
-import * as Utils from "#app/utils";
-import { PlayerPartyMemberPokemonPhase } from "./player-party-member-pokemon-phase";
-import { LevelUpPhase } from "./level-up-phase";
+import { NumberHolder } from "#app/utils";
+import { PlayerPartyMemberPokemonPhase } from "#phases/player-party-member-pokemon-phase";
+import { LevelUpPhase } from "#phases/level-up-phase";
export class ExpPhase extends PlayerPartyMemberPokemonPhase {
private expValue: number;
@@ -19,7 +19,7 @@ export class ExpPhase extends PlayerPartyMemberPokemonPhase {
super.start();
const pokemon = this.getPokemon();
- const exp = new Utils.NumberHolder(this.expValue);
+ const exp = new NumberHolder(this.expValue);
this.scene.applyModifiers(ExpBoosterModifier, true, exp);
exp.value = Math.floor(exp.value);
this.scene.ui.showText(i18next.t("battle:expGain", { pokemonName: getPokemonNameWithAffix(pokemon), exp: exp.value }), null, () => {
diff --git a/src/phases/faint-phase.ts b/src/phases/faint-phase.ts
index eee1fd52938c..cea462b7e561 100644
--- a/src/phases/faint-phase.ts
+++ b/src/phases/faint-phase.ts
@@ -1,26 +1,33 @@
import BattleScene from "#app/battle-scene";
import { BattlerIndex, BattleType } from "#app/battle";
-import { applyPostFaintAbAttrs, PostFaintAbAttr, applyPostKnockOutAbAttrs, PostKnockOutAbAttr, applyPostVictoryAbAttrs, PostVictoryAbAttr } from "#app/data/ability";
+import {
+ applyPostFaintAbAttrs,
+ PostFaintAbAttr,
+ applyPostKnockOutAbAttrs,
+ PostKnockOutAbAttr,
+ applyPostVictoryAbAttrs,
+ PostVictoryAbAttr,
+} from "#app/data/ability";
import { BattlerTagLapseType, DestinyBondTag } from "#app/data/battler-tags";
import { battleSpecDialogue } from "#app/data/dialogue";
import { allMoves, PostVictoryStatStageChangeAttr } from "#app/data/move";
-import { BattleSpec } from "#app/enums/battle-spec";
-import { StatusEffect } from "#app/enums/status-effect";
+import { BattleSpec } from "#enums/battle-spec";
+import { StatusEffect } from "#enums/status-effect";
import Pokemon, { PokemonMove, EnemyPokemon, PlayerPokemon, HitResult } from "#app/field/pokemon";
import { getPokemonNameWithAffix } from "#app/messages";
import { PokemonInstantReviveModifier } from "#app/modifier/modifier";
import i18next from "i18next";
-import { DamagePhase } from "./damage-phase";
-import { PokemonPhase } from "./pokemon-phase";
-import { SwitchSummonPhase } from "./switch-summon-phase";
-import { ToggleDoublePositionPhase } from "./toggle-double-position-phase";
-import { GameOverPhase } from "./game-over-phase";
-import { SwitchPhase } from "./switch-phase";
-import { VictoryPhase } from "./victory-phase";
+import { DamagePhase } from "#phases/damage-phase";
+import { PokemonPhase } from "#phases/pokemon-phase";
+import { SwitchSummonPhase } from "#phases/switch-summon-phase";
+import { ToggleDoublePositionPhase } from "#phases/toggle-double-position-phase";
+import { GameOverPhase } from "#phases/game-over-phase";
+import { SwitchPhase } from "#phases/switch-phase";
+import { VictoryPhase } from "#phases/victory-phase";
import { SpeciesFormChangeActiveTrigger } from "#app/data/pokemon-forms";
import { SwitchType } from "#enums/switch-type";
import { isNullOrUndefined } from "#app/utils";
-import { FRIENDSHIP_LOSS_FROM_FAINT } from "#app/data/balance/starters";
+import { FRIENDSHIP_LOSS_FROM_FAINT } from "#balance/starters";
export class FaintPhase extends PokemonPhase {
/**
diff --git a/src/phases/field-phase.ts b/src/phases/field-phase.ts
index 46c3c4983b4b..399fe29a7bc0 100644
--- a/src/phases/field-phase.ts
+++ b/src/phases/field-phase.ts
@@ -1,5 +1,5 @@
import Pokemon from "#app/field/pokemon";
-import { BattlePhase } from "./battle-phase";
+import { BattlePhase } from "#phases/battle-phase";
type PokemonFunc = (pokemon: Pokemon) => void;
diff --git a/src/phases/form-change-phase.ts b/src/phases/form-change-phase.ts
index 410163a70e45..d6206f9605ff 100644
--- a/src/phases/form-change-phase.ts
+++ b/src/phases/form-change-phase.ts
@@ -1,14 +1,14 @@
-import BattleScene from "../battle-scene";
-import * as Utils from "../utils";
-import { achvs } from "../system/achv";
-import { SpeciesFormChange, getSpeciesFormChangeMessage } from "../data/pokemon-forms";
-import { PlayerPokemon } from "../field/pokemon";
-import { Mode } from "../ui/ui";
-import PartyUiHandler from "../ui/party-ui-handler";
-import { getPokemonNameWithAffix } from "../messages";
-import { EndEvolutionPhase } from "./end-evolution-phase";
-import { EvolutionPhase } from "./evolution-phase";
-import { BattlerTagType } from "#app/enums/battler-tag-type";
+import BattleScene from "#app/battle-scene";
+import { fixedInt } from "#app/utils";
+import { achvs } from "#app/system/achv";
+import { SpeciesFormChange, getSpeciesFormChangeMessage } from "#app/data/pokemon-forms";
+import { PlayerPokemon } from "#app/field/pokemon";
+import { Mode } from "#app/ui/ui";
+import PartyUiHandler from "#app/ui/party-ui-handler";
+import { getPokemonNameWithAffix } from "#app/messages";
+import { EndEvolutionPhase } from "#phases/end-evolution-phase";
+import { EvolutionPhase } from "#phases/evolution-phase";
+import { BattlerTagType } from "#enums/battler-tag-type";
import { SpeciesFormKey } from "#enums/species-form-key";
export class FormChangePhase extends EvolutionPhase {
@@ -134,8 +134,8 @@ export class FormChangePhase extends EvolutionPhase {
this.scene.playSoundWithoutBgm(playEvolutionFanfare ? "evolution_fanfare" : "minor_fanfare");
transformedPokemon.destroy();
- this.scene.ui.showText(getSpeciesFormChangeMessage(this.pokemon, this.formChange, preName), null, () => this.end(), null, true, Utils.fixedInt(delay));
- this.scene.time.delayedCall(Utils.fixedInt(delay + 250), () => this.scene.playBgm());
+ this.scene.ui.showText(getSpeciesFormChangeMessage(this.pokemon, this.formChange, preName), null, () => this.end(), null, true, fixedInt(delay));
+ this.scene.time.delayedCall(fixedInt(delay + 250), () => this.scene.playBgm());
});
});
}
diff --git a/src/phases/game-over-modifier-reward-phase.ts b/src/phases/game-over-modifier-reward-phase.ts
index a698e62e2e11..a6fce8ae7ed7 100644
--- a/src/phases/game-over-modifier-reward-phase.ts
+++ b/src/phases/game-over-modifier-reward-phase.ts
@@ -2,7 +2,7 @@ import BattleScene from "#app/battle-scene";
import { ModifierTypeFunc } from "#app/modifier/modifier-type";
import { Mode } from "#app/ui/ui";
import i18next from "i18next";
-import { ModifierRewardPhase } from "./modifier-reward-phase";
+import { ModifierRewardPhase } from "#phases/modifier-reward-phase";
export class GameOverModifierRewardPhase extends ModifierRewardPhase {
constructor(scene: BattleScene, modifierTypeFunc: ModifierTypeFunc) {
diff --git a/src/phases/game-over-phase.ts b/src/phases/game-over-phase.ts
index 9c444fc40f07..a1af72c18129 100644
--- a/src/phases/game-over-phase.ts
+++ b/src/phases/game-over-phase.ts
@@ -2,24 +2,24 @@ import { clientSessionId } from "#app/account";
import { BattleType } from "#app/battle";
import BattleScene from "#app/battle-scene";
import { getCharVariantFromDialogue } from "#app/data/dialogue";
-import { pokemonEvolutions } from "#app/data/balance/pokemon-evolutions";
+import { pokemonEvolutions } from "#balance/pokemon-evolutions";
import PokemonSpecies, { getPokemonSpecies } from "#app/data/pokemon-species";
import { trainerConfigs } from "#app/data/trainer-config";
import Pokemon from "#app/field/pokemon";
import { modifierTypes } from "#app/modifier/modifier-type";
-import { BattlePhase } from "#app/phases/battle-phase";
-import { CheckSwitchPhase } from "#app/phases/check-switch-phase";
-import { EncounterPhase } from "#app/phases/encounter-phase";
-import { EndCardPhase } from "#app/phases/end-card-phase";
-import { GameOverModifierRewardPhase } from "#app/phases/game-over-modifier-reward-phase";
-import { PostGameOverPhase } from "#app/phases/post-game-over-phase";
-import { RibbonModifierRewardPhase } from "#app/phases/ribbon-modifier-reward-phase";
-import { SummonPhase } from "#app/phases/summon-phase";
-import { UnlockPhase } from "#app/phases/unlock-phase";
+import { BattlePhase } from "#phases/battle-phase";
+import { CheckSwitchPhase } from "#phases/check-switch-phase";
+import { EncounterPhase } from "#phases/encounter-phase";
+import { EndCardPhase } from "#phases/end-card-phase";
+import { GameOverModifierRewardPhase } from "#phases/game-over-modifier-reward-phase";
+import { PostGameOverPhase } from "#phases/post-game-over-phase";
+import { RibbonModifierRewardPhase } from "#phases/ribbon-modifier-reward-phase";
+import { SummonPhase } from "#phases/summon-phase";
+import { UnlockPhase } from "#phases/unlock-phase";
import { achvs, ChallengeAchv } from "#app/system/achv";
import { Unlockables } from "#app/system/unlockables";
import { Mode } from "#app/ui/ui";
-import * as Utils from "#app/utils";
+import { isLocal, apiFetch } from "#app/utils";
import { PlayerGender } from "#enums/player-gender";
import { TrainerType } from "#enums/trainer-type";
import i18next from "i18next";
@@ -176,8 +176,8 @@ export class GameOverPhase extends BattlePhase {
If Online, execute apiFetch as intended
If Offline, execute offlineNewClear(), a localStorage implementation of newClear daily run checks */
if (this.victory) {
- if (!Utils.isLocal) {
- Utils.apiFetch(`savedata/session/newclear?slot=${this.scene.sessionSlotId}&clientSessionId=${clientSessionId}`, true)
+ if (!isLocal) {
+ apiFetch(`savedata/session/newclear?slot=${this.scene.sessionSlotId}&clientSessionId=${clientSessionId}`, true)
.then(response => response.json())
.then(newClear => doGameOver(newClear));
} else {
diff --git a/src/phases/hide-party-exp-bar-phase.ts b/src/phases/hide-party-exp-bar-phase.ts
index 303650ea1adb..b8c3c0f3bf8d 100644
--- a/src/phases/hide-party-exp-bar-phase.ts
+++ b/src/phases/hide-party-exp-bar-phase.ts
@@ -1,5 +1,5 @@
import BattleScene from "#app/battle-scene";
-import { BattlePhase } from "./battle-phase";
+import { BattlePhase } from "#phases/battle-phase";
export class HidePartyExpBarPhase extends BattlePhase {
constructor(scene: BattleScene) {
diff --git a/src/phases/learn-move-phase.ts b/src/phases/learn-move-phase.ts
index fefda3840924..5b7a5c826b93 100644
--- a/src/phases/learn-move-phase.ts
+++ b/src/phases/learn-move-phase.ts
@@ -9,9 +9,9 @@ import EvolutionSceneHandler from "#app/ui/evolution-scene-handler";
import { SummaryUiMode } from "#app/ui/summary-ui-handler";
import { Mode } from "#app/ui/ui";
import i18next from "i18next";
-import { PlayerPartyMemberPokemonPhase } from "#app/phases/player-party-member-pokemon-phase";
+import { PlayerPartyMemberPokemonPhase } from "#phases/player-party-member-pokemon-phase";
import Pokemon from "#app/field/pokemon";
-import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
+import { SelectModifierPhase } from "#phases/select-modifier-phase";
export enum LearnMoveType {
/** For learning a move via level-up, evolution, or other non-item-based event */
diff --git a/src/phases/level-cap-phase.ts b/src/phases/level-cap-phase.ts
index d1404e450104..38e165d0800a 100644
--- a/src/phases/level-cap-phase.ts
+++ b/src/phases/level-cap-phase.ts
@@ -1,7 +1,7 @@
import BattleScene from "#app/battle-scene";
import { Mode } from "#app/ui/ui";
import i18next from "i18next";
-import { FieldPhase } from "./field-phase";
+import { FieldPhase } from "#phases/field-phase";
export class LevelCapPhase extends FieldPhase {
constructor(scene: BattleScene) {
diff --git a/src/phases/level-up-phase.ts b/src/phases/level-up-phase.ts
index a2fa8a16533a..3934de7e2e37 100644
--- a/src/phases/level-up-phase.ts
+++ b/src/phases/level-up-phase.ts
@@ -1,13 +1,13 @@
import BattleScene from "#app/battle-scene";
-import { ExpNotification } from "#app/enums/exp-notification";
-import { EvolutionPhase } from "#app/phases/evolution-phase";
+import { ExpNotification } from "#enums/exp-notification";
+import { EvolutionPhase } from "#phases/evolution-phase";
import { PlayerPokemon } from "#app/field/pokemon";
import { getPokemonNameWithAffix } from "#app/messages";
import { LevelAchv } from "#app/system/achv";
import i18next from "i18next";
-import * as Utils from "#app/utils";
-import { PlayerPartyMemberPokemonPhase } from "./player-party-member-pokemon-phase";
-import { LearnMovePhase } from "./learn-move-phase";
+import { NumberHolder } from "#app/utils";
+import { PlayerPartyMemberPokemonPhase } from "#phases/player-party-member-pokemon-phase";
+import { LearnMovePhase } from "#phases/learn-move-phase";
export class LevelUpPhase extends PlayerPartyMemberPokemonPhase {
private lastLevel: integer;
@@ -28,7 +28,7 @@ export class LevelUpPhase extends PlayerPartyMemberPokemonPhase {
this.scene.gameData.gameStats.highestLevel = this.level;
}
- this.scene.validateAchvs(LevelAchv, new Utils.NumberHolder(this.level));
+ this.scene.validateAchvs(LevelAchv, new NumberHolder(this.level));
const pokemon = this.getPokemon();
const prevStats = pokemon.stats.slice(0);
diff --git a/src/phases/login-phase.ts b/src/phases/login-phase.ts
index ac1e68d1b0ee..b055217c5685 100644
--- a/src/phases/login-phase.ts
+++ b/src/phases/login-phase.ts
@@ -4,9 +4,9 @@ import { Phase } from "#app/phase";
import { handleTutorial, Tutorial } from "#app/tutorial";
import { Mode } from "#app/ui/ui";
import i18next, { t } from "i18next";
-import * as Utils from "#app/utils";
-import { SelectGenderPhase } from "./select-gender-phase";
-import { UnavailablePhase } from "./unavailable-phase";
+import { getCookie, sessionIdKey, executeIf, removeCookie } from "#app/utils";
+import { SelectGenderPhase } from "#phases/select-gender-phase";
+import { UnavailablePhase } from "#phases/unavailable-phase";
export class LoginPhase extends Phase {
private showText: boolean;
@@ -20,10 +20,10 @@ export class LoginPhase extends Phase {
start(): void {
super.start();
- const hasSession = !!Utils.getCookie(Utils.sessionIdKey);
+ const hasSession = !!getCookie(sessionIdKey);
this.scene.ui.setMode(Mode.LOADING, { buttonActions: []});
- Utils.executeIf(bypassLogin || hasSession, updateUserInfo).then(response => {
+ executeIf(bypassLogin || hasSession, updateUserInfo).then(response => {
const success = response ? response[0] : false;
const statusCode = response ? response[1] : null;
if (!success) {
@@ -37,7 +37,7 @@ export class LoginPhase extends Phase {
const loadData = () => {
updateUserInfo().then(success => {
if (!success[0]) {
- Utils.removeCookie(Utils.sessionIdKey);
+ removeCookie(sessionIdKey);
this.scene.reset(true, true);
return;
}
@@ -58,7 +58,7 @@ export class LoginPhase extends Phase {
this.scene.ui.playSelect();
updateUserInfo().then(success => {
if (!success[0]) {
- Utils.removeCookie(Utils.sessionIdKey);
+ removeCookie(sessionIdKey);
this.scene.reset(true, true);
return;
}
@@ -84,7 +84,7 @@ export class LoginPhase extends Phase {
]
});
} else if (statusCode === 401) {
- Utils.removeCookie(Utils.sessionIdKey);
+ removeCookie(sessionIdKey);
this.scene.reset(true, true);
} else {
this.scene.unshiftPhase(new UnavailablePhase(this.scene));
diff --git a/src/phases/modifier-reward-phase.ts b/src/phases/modifier-reward-phase.ts
index 20a8366d9c67..f333d5290413 100644
--- a/src/phases/modifier-reward-phase.ts
+++ b/src/phases/modifier-reward-phase.ts
@@ -1,7 +1,7 @@
import BattleScene from "#app/battle-scene";
import { ModifierType, ModifierTypeFunc, getModifierType } from "#app/modifier/modifier-type";
import i18next from "i18next";
-import { BattlePhase } from "./battle-phase";
+import { BattlePhase } from "#phases/battle-phase";
export class ModifierRewardPhase extends BattlePhase {
protected modifierType: ModifierType;
diff --git a/src/phases/money-reward-phase.ts b/src/phases/money-reward-phase.ts
index 2f0a4f7b9903..21e939c9c391 100644
--- a/src/phases/money-reward-phase.ts
+++ b/src/phases/money-reward-phase.ts
@@ -1,9 +1,9 @@
import BattleScene from "#app/battle-scene";
-import { ArenaTagType } from "#app/enums/arena-tag-type";
+import { ArenaTagType } from "#enums/arena-tag-type";
import { MoneyMultiplierModifier } from "#app/modifier/modifier";
import i18next from "i18next";
-import * as Utils from "#app/utils";
-import { BattlePhase } from "./battle-phase";
+import { NumberHolder } from "#app/utils";
+import { BattlePhase } from "#phases/battle-phase";
export class MoneyRewardPhase extends BattlePhase {
private moneyMultiplier: number;
@@ -15,7 +15,7 @@ export class MoneyRewardPhase extends BattlePhase {
}
start() {
- const moneyAmount = new Utils.IntegerHolder(this.scene.getWaveMoneyAmount(this.moneyMultiplier));
+ const moneyAmount = new NumberHolder(this.scene.getWaveMoneyAmount(this.moneyMultiplier));
this.scene.applyModifiers(MoneyMultiplierModifier, true, moneyAmount);
diff --git a/src/phases/move-anim-test-phase.ts b/src/phases/move-anim-test-phase.ts
index e4b04ce5de6f..708f609c7830 100644
--- a/src/phases/move-anim-test-phase.ts
+++ b/src/phases/move-anim-test-phase.ts
@@ -1,9 +1,9 @@
import BattleScene from "#app/battle-scene";
import { initMoveAnim, loadMoveAnimAssets, MoveAnim } from "#app/data/battle-anims";
import { allMoves, SelfStatusMove } from "#app/data/move";
-import { Moves } from "#app/enums/moves";
-import * as Utils from "#app/utils";
-import { BattlePhase } from "./battle-phase";
+import { Moves } from "#enums/moves";
+import { getEnumValues } from "#app/utils";
+import { BattlePhase } from "#phases/battle-phase";
export class MoveAnimTestPhase extends BattlePhase {
private moveQueue: Moves[];
@@ -11,7 +11,7 @@ export class MoveAnimTestPhase extends BattlePhase {
constructor(scene: BattleScene, moveQueue?: Moves[]) {
super(scene);
- this.moveQueue = moveQueue || Utils.getEnumValues(Moves).slice(1);
+ this.moveQueue = moveQueue || getEnumValues(Moves).slice(1);
}
start() {
diff --git a/src/phases/move-effect-phase.ts b/src/phases/move-effect-phase.ts
index dc880f85e238..4c9b2e9344da 100644
--- a/src/phases/move-effect-phase.ts
+++ b/src/phases/move-effect-phase.ts
@@ -1,19 +1,62 @@
import BattleScene from "#app/battle-scene";
import { BattlerIndex } from "#app/battle";
-import { applyPreAttackAbAttrs, AddSecondStrikeAbAttr, IgnoreMoveEffectsAbAttr, applyPostDefendAbAttrs, PostDefendAbAttr, applyPostAttackAbAttrs, PostAttackAbAttr, MaxMultiHitAbAttr, AlwaysHitAbAttr, TypeImmunityAbAttr } from "#app/data/ability";
+import {
+ applyPreAttackAbAttrs,
+ AddSecondStrikeAbAttr,
+ IgnoreMoveEffectsAbAttr,
+ applyPostDefendAbAttrs,
+ PostDefendAbAttr,
+ applyPostAttackAbAttrs,
+ PostAttackAbAttr,
+ MaxMultiHitAbAttr,
+ AlwaysHitAbAttr,
+ TypeImmunityAbAttr,
+} from "#app/data/ability";
import { ArenaTagSide, ConditionalProtectTag } from "#app/data/arena-tag";
import { MoveAnim } from "#app/data/battle-anims";
-import { BattlerTagLapseType, DamageProtectedTag, ProtectedTag, SemiInvulnerableTag, SubstituteTag } from "#app/data/battler-tags";
-import { MoveTarget, applyMoveAttrs, OverrideMoveEffectAttr, MultiHitAttr, AttackMove, FixedDamageAttr, VariableTargetAttr, MissEffectAttr, MoveFlags, applyFilteredMoveAttrs, MoveAttr, MoveEffectAttr, OneHitKOAttr, MoveEffectTrigger, ChargeAttr, MoveCategory, NoEffectAttr, HitsTagAttr, ToxicAccuracyAttr } from "#app/data/move";
+import {
+ BattlerTagLapseType,
+ DamageProtectedTag,
+ ProtectedTag,
+ SemiInvulnerableTag,
+ SubstituteTag,
+} from "#app/data/battler-tags";
+import {
+ MoveTarget,
+ applyMoveAttrs,
+ OverrideMoveEffectAttr,
+ MultiHitAttr,
+ AttackMove,
+ FixedDamageAttr,
+ VariableTargetAttr,
+ MissEffectAttr,
+ MoveFlags,
+ applyFilteredMoveAttrs,
+ MoveAttr,
+ MoveEffectAttr,
+ OneHitKOAttr,
+ MoveEffectTrigger,
+ ChargeAttr,
+ MoveCategory,
+ NoEffectAttr,
+ HitsTagAttr,
+ ToxicAccuracyAttr,
+} from "#app/data/move";
import { SpeciesFormChangePostMoveTrigger } from "#app/data/pokemon-forms";
-import { BattlerTagType } from "#app/enums/battler-tag-type";
-import { Moves } from "#app/enums/moves";
+import { BattlerTagType } from "#enums/battler-tag-type";
+import { Moves } from "#enums/moves";
import Pokemon, { PokemonMove, MoveResult, HitResult } from "#app/field/pokemon";
import { getPokemonNameWithAffix } from "#app/messages";
-import { PokemonMultiHitModifier, FlinchChanceModifier, EnemyAttackStatusEffectChanceModifier, ContactHeldItemTransferChanceModifier, HitHealModifier } from "#app/modifier/modifier";
+import {
+ PokemonMultiHitModifier,
+ FlinchChanceModifier,
+ EnemyAttackStatusEffectChanceModifier,
+ ContactHeldItemTransferChanceModifier,
+ HitHealModifier,
+} from "#app/modifier/modifier";
import i18next from "i18next";
-import * as Utils from "#app/utils";
-import { PokemonPhase } from "./pokemon-phase";
+import { BooleanHolder, NumberHolder, executeIf } from "#app/utils";
+import { PokemonPhase } from "#phases/pokemon-phase";
import { Type } from "#app/data/type";
export class MoveEffectPhase extends PokemonPhase {
@@ -52,7 +95,7 @@ export class MoveEffectPhase extends PokemonPhase {
* Does an effect from this move override other effects on this turn?
* e.g. Charging moves (Fly, etc.) on their first turn of use.
*/
- const overridden = new Utils.BooleanHolder(false);
+ const overridden = new BooleanHolder(false);
/** The {@linkcode Move} object from {@linkcode allMoves} invoked by this phase */
const move = this.move.getMove();
@@ -71,14 +114,14 @@ export class MoveEffectPhase extends PokemonPhase {
* effects of the move itself, Parental Bond, and Multi-Lens to do so.
*/
if (user.turnData.hitsLeft === -1) {
- const hitCount = new Utils.IntegerHolder(1);
+ const hitCount = new NumberHolder(1);
// Assume single target for multi hit
applyMoveAttrs(MultiHitAttr, user, this.getTarget() ?? null, move, hitCount);
// If Parental Bond is applicable, double the hit count
- applyPreAttackAbAttrs(AddSecondStrikeAbAttr, user, null, move, false, targets.length, hitCount, new Utils.IntegerHolder(0));
+ applyPreAttackAbAttrs(AddSecondStrikeAbAttr, user, null, move, false, targets.length, hitCount, new NumberHolder(0));
// If Multi-Lens is applicable, multiply the hit count by 1 + the number of Multi-Lenses held by the user
if (move instanceof AttackMove && !move.hasAttr(FixedDamageAttr)) {
- this.scene.applyModifiers(PokemonMultiHitModifier, user.isPlayer(), user, hitCount, new Utils.IntegerHolder(0));
+ this.scene.applyModifiers(PokemonMultiHitModifier, user.isPlayer(), user, hitCount, new NumberHolder(0));
}
// Set the user's relevant turnData fields to reflect the final hit count
user.turnData.hitCount = hitCount.value;
@@ -136,9 +179,9 @@ export class MoveEffectPhase extends PokemonPhase {
/** The {@linkcode ArenaTagSide} to which the target belongs */
const targetSide = target.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY;
/** Has the invoked move been cancelled by conditional protection (e.g Quick Guard)? */
- const hasConditionalProtectApplied = new Utils.BooleanHolder(false);
+ const hasConditionalProtectApplied = new BooleanHolder(false);
/** Does the applied conditional protection bypass Protect-ignoring effects? */
- const bypassIgnoreProtect = new Utils.BooleanHolder(false);
+ const bypassIgnoreProtect = new BooleanHolder(false);
/** If the move is not targeting a Pokemon on the user's side, try to apply conditional protection effects */
if (!this.move.getMove().isAllyTarget()) {
this.scene.arena.applyTagsForSide(ConditionalProtectTag, targetSide, false, hasConditionalProtectApplied, user, target, move.id, bypassIgnoreProtect);
@@ -248,7 +291,7 @@ export class MoveEffectPhase extends PokemonPhase {
* ignore all effects after this point.
* Otherwise, apply all self-targeted POST_APPLY effects.
*/
- Utils.executeIf(!chargeEffect, () => applyFilteredMoveAttrs((attr: MoveAttr) => attr instanceof MoveEffectAttr && attr.trigger === MoveEffectTrigger.POST_APPLY
+ executeIf(!chargeEffect, () => applyFilteredMoveAttrs((attr: MoveAttr) => attr instanceof MoveEffectAttr && attr.trigger === MoveEffectTrigger.POST_APPLY
&& attr.selfTarget && (!attr.firstHitOnly || firstHit) && (!attr.lastHitOnly || lastHit), user, target, move)).then(() => {
// All effects past this point require the move to have hit the target
if (hitResult !== HitResult.NO_EFFECT) {
@@ -260,17 +303,17 @@ export class MoveEffectPhase extends PokemonPhase {
* apply the chance to flinch the target gained from King's Rock
*/
if (dealsDamage && !target.hasAbilityWithAttr(IgnoreMoveEffectsAbAttr) && !move.hitsSubstitute(user, target)) {
- const flinched = new Utils.BooleanHolder(false);
+ const flinched = new BooleanHolder(false);
user.scene.applyModifiers(FlinchChanceModifier, user.isPlayer(), user, flinched);
if (flinched.value) {
target.addTag(BattlerTagType.FLINCHED, undefined, this.move.moveId, user.id);
}
}
// If the move was not protected against, apply all HIT effects
- Utils.executeIf(!isProtected && !chargeEffect, () => applyFilteredMoveAttrs((attr: MoveAttr) => attr instanceof MoveEffectAttr && (attr as MoveEffectAttr).trigger === MoveEffectTrigger.HIT
+ executeIf(!isProtected && !chargeEffect, () => applyFilteredMoveAttrs((attr: MoveAttr) => attr instanceof MoveEffectAttr && (attr as MoveEffectAttr).trigger === MoveEffectTrigger.HIT
&& (!attr.firstHitOnly || firstHit) && (!attr.lastHitOnly || lastHit) && (!attr.firstTargetOnly || firstTarget), user, target, this.move.getMove()).then(() => {
// Apply the target's post-defend ability effects (as long as the target is active or can otherwise apply them)
- return Utils.executeIf(!target.isFainted() || target.canApplyAbility(), () => applyPostDefendAbAttrs(PostDefendAbAttr, target, user, this.move.getMove(), hitResult).then(() => {
+ return executeIf(!target.isFainted() || target.canApplyAbility(), () => applyPostDefendAbAttrs(PostDefendAbAttr, target, user, this.move.getMove(), hitResult).then(() => {
// Only apply the following effects if the move was not deflected by a substitute
if (move.hitsSubstitute(user, target)) {
return resolve();
diff --git a/src/phases/move-end-phase.ts b/src/phases/move-end-phase.ts
index e03f2ec14b09..84495e50415a 100644
--- a/src/phases/move-end-phase.ts
+++ b/src/phases/move-end-phase.ts
@@ -1,7 +1,7 @@
import BattleScene from "#app/battle-scene";
import { BattlerIndex } from "#app/battle";
import { BattlerTagLapseType } from "#app/data/battler-tags";
-import { PokemonPhase } from "./pokemon-phase";
+import { PokemonPhase } from "#phases/pokemon-phase";
export class MoveEndPhase extends PokemonPhase {
constructor(scene: BattleScene, battlerIndex: BattlerIndex) {
diff --git a/src/phases/move-header-phase.ts b/src/phases/move-header-phase.ts
index c307ff0be6e9..46d15b62e869 100644
--- a/src/phases/move-header-phase.ts
+++ b/src/phases/move-header-phase.ts
@@ -1,7 +1,7 @@
import BattleScene from "#app/battle-scene";
import { applyMoveAttrs, MoveHeaderAttr } from "#app/data/move";
import Pokemon, { PokemonMove } from "#app/field/pokemon";
-import { BattlePhase } from "./battle-phase";
+import { BattlePhase } from "#phases/battle-phase";
export class MoveHeaderPhase extends BattlePhase {
public pokemon: Pokemon;
diff --git a/src/phases/move-phase.ts b/src/phases/move-phase.ts
index 0af619186366..19d42e816e3e 100644
--- a/src/phases/move-phase.ts
+++ b/src/phases/move-phase.ts
@@ -1,9 +1,28 @@
import { BattlerIndex } from "#app/battle";
import BattleScene from "#app/battle-scene";
-import { applyAbAttrs, applyPostMoveUsedAbAttrs, applyPreAttackAbAttrs, BlockRedirectAbAttr, IncreasePpAbAttr, PokemonTypeChangeAbAttr, PostMoveUsedAbAttr, RedirectMoveAbAttr } from "#app/data/ability";
+import {
+ applyAbAttrs,
+ applyPostMoveUsedAbAttrs,
+ applyPreAttackAbAttrs,
+ BlockRedirectAbAttr,
+ IncreasePpAbAttr,
+ PokemonTypeChangeAbAttr,
+ PostMoveUsedAbAttr,
+ RedirectMoveAbAttr,
+} from "#app/data/ability";
import { CommonAnim } from "#app/data/battle-anims";
import { BattlerTagLapseType, CenterOfAttentionTag } from "#app/data/battler-tags";
-import { allMoves, applyMoveAttrs, BypassRedirectAttr, BypassSleepAttr, ChargeAttr, CopyMoveAttr, HealStatusEffectAttr, MoveFlags, PreMoveMessageAttr } from "#app/data/move";
+import {
+ allMoves,
+ applyMoveAttrs,
+ BypassRedirectAttr,
+ BypassSleepAttr,
+ ChargeAttr,
+ CopyMoveAttr,
+ HealStatusEffectAttr,
+ MoveFlags,
+ PreMoveMessageAttr,
+} from "#app/data/move";
import { SpeciesFormChangePreMoveTrigger } from "#app/data/pokemon-forms";
import { getStatusEffectActivationText, getStatusEffectHealText } from "#app/data/status-effect";
import { Type } from "#app/data/type";
@@ -11,11 +30,11 @@ import { getTerrainBlockMessage } from "#app/data/weather";
import { MoveUsedEvent } from "#app/events/battle-scene";
import Pokemon, { MoveResult, PokemonMove, TurnMove } from "#app/field/pokemon";
import { getPokemonNameWithAffix } from "#app/messages";
-import { BattlePhase } from "#app/phases/battle-phase";
-import { CommonAnimPhase } from "#app/phases/common-anim-phase";
-import { MoveEffectPhase } from "#app/phases/move-effect-phase";
-import { MoveEndPhase } from "#app/phases/move-end-phase";
-import { ShowAbilityPhase } from "#app/phases/show-ability-phase";
+import { BattlePhase } from "#phases/battle-phase";
+import { CommonAnimPhase } from "#phases/common-anim-phase";
+import { MoveEffectPhase } from "#phases/move-effect-phase";
+import { MoveEndPhase } from "#phases/move-end-phase";
+import { ShowAbilityPhase } from "#phases/show-ability-phase";
import { BooleanHolder, NumberHolder } from "#app/utils";
import { Abilities } from "#enums/abilities";
import { BattlerTagType } from "#enums/battler-tag-type";
diff --git a/src/phases/mystery-encounter-phases.ts b/src/phases/mystery-encounter-phases.ts
index 49e78fa5369a..44317631247b 100644
--- a/src/phases/mystery-encounter-phases.ts
+++ b/src/phases/mystery-encounter-phases.ts
@@ -1,29 +1,28 @@
import i18next from "i18next";
-import BattleScene from "../battle-scene";
-import { Phase } from "../phase";
-import { Mode } from "../ui/ui";
-import { transitionMysteryEncounterIntroVisuals, OptionSelectSettings } from "../data/mystery-encounters/utils/encounter-phase-utils";
-import MysteryEncounterOption, { OptionPhaseCallback } from "#app/data/mystery-encounters/mystery-encounter-option";
-import { getCharVariantFromDialogue } from "../data/dialogue";
-import { TrainerSlot } from "../data/trainer-config";
+import BattleScene from "#app/battle-scene";
+import { Phase } from "#app/phase";
+import { Mode } from "#app/ui/ui";
+import { transitionMysteryEncounterIntroVisuals, OptionSelectSettings } from "#mystery-encounters/utils/encounter-phase-utils";
+import MysteryEncounterOption, { OptionPhaseCallback } from "#mystery-encounters/mystery-encounter-option";
+import { getCharVariantFromDialogue } from "#app/data/dialogue";
+import { TrainerSlot } from "#app/data/trainer-config";
import { BattleSpec } from "#enums/battle-spec";
-import { IvScannerModifier } from "../modifier/modifier";
-import * as Utils from "../utils";
-import { isNullOrUndefined } from "../utils";
-import { getEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
+import { IvScannerModifier } from "#app/modifier/modifier";
+import { isNullOrUndefined, randSeedItem } from "#app/utils";
+import { getEncounterText } from "#mystery-encounters/utils/encounter-dialogue-utils";
import { BattlerTagLapseType } from "#app/data/battler-tags";
import { MysteryEncounterMode } from "#enums/mystery-encounter-mode";
-import { PostTurnStatusEffectPhase } from "#app/phases/post-turn-status-effect-phase";
-import { SummonPhase } from "#app/phases/summon-phase";
-import { ScanIvsPhase } from "#app/phases/scan-ivs-phase";
-import { ToggleDoublePositionPhase } from "#app/phases/toggle-double-position-phase";
-import { ReturnPhase } from "#app/phases/return-phase";
-import { CheckSwitchPhase } from "#app/phases/check-switch-phase";
-import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
-import { NewBattlePhase } from "#app/phases/new-battle-phase";
-import { GameOverPhase } from "#app/phases/game-over-phase";
-import { SwitchPhase } from "#app/phases/switch-phase";
-import { SeenEncounterData } from "#app/data/mystery-encounters/mystery-encounter-save-data";
+import { PostTurnStatusEffectPhase } from "#phases/post-turn-status-effect-phase";
+import { SummonPhase } from "#phases/summon-phase";
+import { ScanIvsPhase } from "#phases/scan-ivs-phase";
+import { ToggleDoublePositionPhase } from "#phases/toggle-double-position-phase";
+import { ReturnPhase } from "#phases/return-phase";
+import { CheckSwitchPhase } from "#phases/check-switch-phase";
+import { SelectModifierPhase } from "#phases/select-modifier-phase";
+import { NewBattlePhase } from "#phases/new-battle-phase";
+import { GameOverPhase } from "#phases/game-over-phase";
+import { SwitchPhase } from "#phases/switch-phase";
+import { SeenEncounterData } from "#mystery-encounters/mystery-encounter-save-data";
import { SwitchType } from "#enums/switch-type";
import { BattlerTagType } from "#enums/battler-tag-type";
@@ -368,7 +367,7 @@ export class MysteryEncounterBattlePhase extends Phase {
} else {
const trainer = this.scene.currentBattle.trainer;
let message: string;
- scene.executeWithSeedOffset(() => message = Utils.randSeedItem(encounterMessages), this.scene.currentBattle.mysteryEncounter?.getSeedOffset());
+ scene.executeWithSeedOffset(() => message = randSeedItem(encounterMessages), this.scene.currentBattle.mysteryEncounter?.getSeedOffset());
message = message!; // tell TS compiler it's defined now
const showDialogueAndSummon = () => {
scene.ui.showDialogue(message, trainer?.getName(TrainerSlot.NONE, true), null, () => {
diff --git a/src/phases/new-battle-phase.ts b/src/phases/new-battle-phase.ts
index 5a422c9e6c74..ea27522533fd 100644
--- a/src/phases/new-battle-phase.ts
+++ b/src/phases/new-battle-phase.ts
@@ -1,4 +1,4 @@
-import { BattlePhase } from "./battle-phase";
+import { BattlePhase } from "#phases/battle-phase";
export class NewBattlePhase extends BattlePhase {
start() {
diff --git a/src/phases/new-biome-encounter-phase.ts b/src/phases/new-biome-encounter-phase.ts
index eea591c3936d..719cf841a6a7 100644
--- a/src/phases/new-biome-encounter-phase.ts
+++ b/src/phases/new-biome-encounter-phase.ts
@@ -1,7 +1,7 @@
import BattleScene from "#app/battle-scene";
import { applyAbAttrs, PostBiomeChangeAbAttr } from "#app/data/ability";
import { getRandomWeatherType } from "#app/data/weather";
-import { NextEncounterPhase } from "./next-encounter-phase";
+import { NextEncounterPhase } from "#phases/next-encounter-phase";
export class NewBiomeEncounterPhase extends NextEncounterPhase {
constructor(scene: BattleScene) {
diff --git a/src/phases/next-encounter-phase.ts b/src/phases/next-encounter-phase.ts
index 407d7c26b5da..932cb691125a 100644
--- a/src/phases/next-encounter-phase.ts
+++ b/src/phases/next-encounter-phase.ts
@@ -1,5 +1,5 @@
import BattleScene from "#app/battle-scene";
-import { EncounterPhase } from "./encounter-phase";
+import { EncounterPhase } from "#phases/encounter-phase";
export class NextEncounterPhase extends EncounterPhase {
constructor(scene: BattleScene) {
diff --git a/src/phases/obtain-status-effect-phase.ts b/src/phases/obtain-status-effect-phase.ts
index c396fa7ba59e..8676fe1892f5 100644
--- a/src/phases/obtain-status-effect-phase.ts
+++ b/src/phases/obtain-status-effect-phase.ts
@@ -2,10 +2,10 @@ import BattleScene from "#app/battle-scene";
import { BattlerIndex } from "#app/battle";
import { CommonBattleAnim, CommonAnim } from "#app/data/battle-anims";
import { getStatusEffectObtainText, getStatusEffectOverlapText } from "#app/data/status-effect";
-import { StatusEffect } from "#app/enums/status-effect";
+import { StatusEffect } from "#enums/status-effect";
import Pokemon from "#app/field/pokemon";
import { getPokemonNameWithAffix } from "#app/messages";
-import { PokemonPhase } from "./pokemon-phase";
+import { PokemonPhase } from "#phases/pokemon-phase";
export class ObtainStatusEffectPhase extends PokemonPhase {
private statusEffect?: StatusEffect | undefined;
diff --git a/src/phases/party-heal-phase.ts b/src/phases/party-heal-phase.ts
index e6ee11202df0..6e56c18d0db2 100644
--- a/src/phases/party-heal-phase.ts
+++ b/src/phases/party-heal-phase.ts
@@ -1,6 +1,6 @@
import BattleScene from "#app/battle-scene";
-import * as Utils from "#app/utils";
-import { BattlePhase } from "./battle-phase";
+import { fixedInt } from "#app/utils";
+import { BattlePhase } from "#phases/battle-phase";
export class PartyHealPhase extends BattlePhase {
private resumeBgm: boolean;
@@ -28,7 +28,7 @@ export class PartyHealPhase extends BattlePhase {
pokemon.updateInfo(true);
}
const healSong = this.scene.playSoundWithoutBgm("heal");
- this.scene.time.delayedCall(Utils.fixedInt(healSong.totalDuration * 1000), () => {
+ this.scene.time.delayedCall(fixedInt(healSong.totalDuration * 1000), () => {
healSong.destroy();
if (this.resumeBgm && bgmPlaying) {
this.scene.playBgm();
diff --git a/src/phases/party-member-pokemon-phase.ts b/src/phases/party-member-pokemon-phase.ts
index 2b6ca01261d5..bc2eb658eeea 100644
--- a/src/phases/party-member-pokemon-phase.ts
+++ b/src/phases/party-member-pokemon-phase.ts
@@ -1,6 +1,6 @@
import BattleScene from "#app/battle-scene";
import Pokemon from "#app/field/pokemon";
-import { FieldPhase } from "./field-phase";
+import { FieldPhase } from "#phases/field-phase";
export abstract class PartyMemberPokemonPhase extends FieldPhase {
protected partyMemberIndex: integer;
diff --git a/src/phases/player-party-member-pokemon-phase.ts b/src/phases/player-party-member-pokemon-phase.ts
index 87855b9334c1..31566f953bc9 100644
--- a/src/phases/player-party-member-pokemon-phase.ts
+++ b/src/phases/player-party-member-pokemon-phase.ts
@@ -1,6 +1,6 @@
import BattleScene from "#app/battle-scene";
import { PlayerPokemon } from "#app/field/pokemon";
-import { PartyMemberPokemonPhase } from "./party-member-pokemon-phase";
+import { PartyMemberPokemonPhase } from "#phases/party-member-pokemon-phase";
export abstract class PlayerPartyMemberPokemonPhase extends PartyMemberPokemonPhase {
constructor(scene: BattleScene, partyMemberIndex: integer) {
diff --git a/src/phases/pokemon-anim-phase.ts b/src/phases/pokemon-anim-phase.ts
index 26ae11d10264..9837aa5bc24b 100644
--- a/src/phases/pokemon-anim-phase.ts
+++ b/src/phases/pokemon-anim-phase.ts
@@ -2,7 +2,7 @@ import BattleScene from "#app/battle-scene";
import { SubstituteTag } from "#app/data/battler-tags";
import { PokemonAnimType } from "#enums/pokemon-anim-type";
import Pokemon from "#app/field/pokemon";
-import { BattlePhase } from "#app/phases/battle-phase";
+import { BattlePhase } from "#phases/battle-phase";
export class PokemonAnimPhase extends BattlePhase {
diff --git a/src/phases/pokemon-heal-phase.ts b/src/phases/pokemon-heal-phase.ts
index dc0bd235bb50..597e5f07e1c0 100644
--- a/src/phases/pokemon-heal-phase.ts
+++ b/src/phases/pokemon-heal-phase.ts
@@ -2,15 +2,15 @@ import BattleScene from "#app/battle-scene";
import { BattlerIndex } from "#app/battle";
import { CommonAnim } from "#app/data/battle-anims";
import { getStatusEffectHealText } from "#app/data/status-effect";
-import { StatusEffect } from "#app/enums/status-effect";
+import { StatusEffect } from "#enums/status-effect";
import { HitResult, DamageResult } from "#app/field/pokemon";
import { getPokemonNameWithAffix } from "#app/messages";
import { HealingBoosterModifier } from "#app/modifier/modifier";
import { HealAchv } from "#app/system/achv";
import i18next from "i18next";
-import * as Utils from "#app/utils";
-import { CommonAnimPhase } from "./common-anim-phase";
-import { BattlerTagType } from "#app/enums/battler-tag-type";
+import { NumberHolder } from "#app/utils";
+import { CommonAnimPhase } from "#phases/common-anim-phase";
+import { BattlerTagType } from "#enums/battler-tag-type";
import { HealBlockTag } from "#app/data/battler-tags";
export class PokemonHealPhase extends CommonAnimPhase {
@@ -59,11 +59,11 @@ export class PokemonHealPhase extends CommonAnimPhase {
this.message = null;
return super.end();
} else if (healOrDamage) {
- const hpRestoreMultiplier = new Utils.IntegerHolder(1);
+ const hpRestoreMultiplier = new NumberHolder(1);
if (!this.revive) {
this.scene.applyModifiers(HealingBoosterModifier, this.player, hpRestoreMultiplier);
}
- const healAmount = new Utils.NumberHolder(Math.floor(this.hpHealed * hpRestoreMultiplier.value));
+ const healAmount = new NumberHolder(Math.floor(this.hpHealed * hpRestoreMultiplier.value));
if (healAmount.value < 0) {
pokemon.damageAndUpdate(healAmount.value * -1, HitResult.HEAL as DamageResult);
healAmount.value = 0;
diff --git a/src/phases/pokemon-phase.ts b/src/phases/pokemon-phase.ts
index b980c1d17190..89213f6a9316 100644
--- a/src/phases/pokemon-phase.ts
+++ b/src/phases/pokemon-phase.ts
@@ -1,7 +1,7 @@
import BattleScene from "#app/battle-scene";
import { BattlerIndex } from "#app/battle";
import Pokemon from "#app/field/pokemon";
-import { FieldPhase } from "./field-phase";
+import { FieldPhase } from "#phases/field-phase";
export abstract class PokemonPhase extends FieldPhase {
protected battlerIndex: BattlerIndex | integer;
diff --git a/src/phases/post-game-over-phase.ts b/src/phases/post-game-over-phase.ts
index beeb30c72602..780be6df36b4 100644
--- a/src/phases/post-game-over-phase.ts
+++ b/src/phases/post-game-over-phase.ts
@@ -1,7 +1,7 @@
import BattleScene from "#app/battle-scene";
import { Phase } from "#app/phase";
-import { EndCardPhase } from "./end-card-phase";
-import { TitlePhase } from "./title-phase";
+import { EndCardPhase } from "#phases/end-card-phase";
+import { TitlePhase } from "#phases/title-phase";
export class PostGameOverPhase extends Phase {
private endCardPhase: EndCardPhase | null;
diff --git a/src/phases/post-summon-phase.ts b/src/phases/post-summon-phase.ts
index 617bb8b1cfeb..9a5784f7adc9 100644
--- a/src/phases/post-summon-phase.ts
+++ b/src/phases/post-summon-phase.ts
@@ -2,8 +2,8 @@ import BattleScene from "#app/battle-scene";
import { BattlerIndex } from "#app/battle";
import { applyPostSummonAbAttrs, PostSummonAbAttr } from "#app/data/ability";
import { ArenaTrapTag } from "#app/data/arena-tag";
-import { StatusEffect } from "#app/enums/status-effect";
-import { PokemonPhase } from "./pokemon-phase";
+import { StatusEffect } from "#enums/status-effect";
+import { PokemonPhase } from "#phases/pokemon-phase";
import { MysteryEncounterPostSummonTag } from "#app/data/battler-tags";
import { BattlerTagType } from "#enums/battler-tag-type";
diff --git a/src/phases/post-turn-status-effect-phase.ts b/src/phases/post-turn-status-effect-phase.ts
index 06681b733f0c..54c39d0790f2 100644
--- a/src/phases/post-turn-status-effect-phase.ts
+++ b/src/phases/post-turn-status-effect-phase.ts
@@ -1,13 +1,18 @@
import BattleScene from "#app/battle-scene";
import { BattlerIndex } from "#app/battle";
-import { applyAbAttrs, BlockNonDirectDamageAbAttr, BlockStatusDamageAbAttr, ReduceBurnDamageAbAttr } from "#app/data/ability";
+import {
+ applyAbAttrs,
+ BlockNonDirectDamageAbAttr,
+ BlockStatusDamageAbAttr,
+ ReduceBurnDamageAbAttr,
+} from "#app/data/ability";
import { CommonBattleAnim, CommonAnim } from "#app/data/battle-anims";
import { getStatusEffectActivationText } from "#app/data/status-effect";
-import { BattleSpec } from "#app/enums/battle-spec";
-import { StatusEffect } from "#app/enums/status-effect";
+import { BattleSpec } from "#enums/battle-spec";
+import { StatusEffect } from "#enums/status-effect";
import { getPokemonNameWithAffix } from "#app/messages";
-import * as Utils from "#app/utils";
-import { PokemonPhase } from "./pokemon-phase";
+import { BooleanHolder, NumberHolder } from "#app/utils";
+import { PokemonPhase } from "#phases/pokemon-phase";
export class PostTurnStatusEffectPhase extends PokemonPhase {
constructor(scene: BattleScene, battlerIndex: BattlerIndex) {
@@ -18,13 +23,13 @@ export class PostTurnStatusEffectPhase extends PokemonPhase {
const pokemon = this.getPokemon();
if (pokemon?.isActive(true) && pokemon.status && pokemon.status.isPostTurn()) {
pokemon.status.incrementTurn();
- const cancelled = new Utils.BooleanHolder(false);
+ const cancelled = new BooleanHolder(false);
applyAbAttrs(BlockNonDirectDamageAbAttr, pokemon, cancelled);
applyAbAttrs(BlockStatusDamageAbAttr, pokemon, cancelled);
if (!cancelled.value) {
this.scene.queueMessage(getStatusEffectActivationText(pokemon.status.effect, getPokemonNameWithAffix(pokemon)));
- const damage = new Utils.NumberHolder(0);
+ const damage = new NumberHolder(0);
switch (pokemon.status.effect) {
case StatusEffect.POISON:
damage.value = Math.max(pokemon.getMaxHp() >> 3, 1);
diff --git a/src/phases/quiet-form-change-phase.ts b/src/phases/quiet-form-change-phase.ts
index c28cc28b5927..8a234b6b8e03 100644
--- a/src/phases/quiet-form-change-phase.ts
+++ b/src/phases/quiet-form-change-phase.ts
@@ -2,13 +2,13 @@ import BattleScene from "#app/battle-scene";
import { SemiInvulnerableTag } from "#app/data/battler-tags";
import { SpeciesFormChange, getSpeciesFormChangeMessage } from "#app/data/pokemon-forms";
import { getTypeRgb } from "#app/data/type";
-import { BattleSpec } from "#app/enums/battle-spec";
-import { BattlerTagType } from "#app/enums/battler-tag-type";
+import { BattleSpec } from "#enums/battle-spec";
+import { BattlerTagType } from "#enums/battler-tag-type";
import Pokemon, { EnemyPokemon } from "#app/field/pokemon";
import { getPokemonNameWithAffix } from "#app/messages";
-import { BattlePhase } from "./battle-phase";
-import { MovePhase } from "./move-phase";
-import { PokemonHealPhase } from "./pokemon-heal-phase";
+import { BattlePhase } from "#phases/battle-phase";
+import { MovePhase } from "#phases/move-phase";
+import { PokemonHealPhase } from "#phases/pokemon-heal-phase";
export class QuietFormChangePhase extends BattlePhase {
protected pokemon: Pokemon;
diff --git a/src/phases/reload-session-phase.ts b/src/phases/reload-session-phase.ts
index f8a38105869c..984fc401cb5f 100644
--- a/src/phases/reload-session-phase.ts
+++ b/src/phases/reload-session-phase.ts
@@ -1,7 +1,7 @@
import BattleScene from "#app/battle-scene";
import { Phase } from "#app/phase";
import { Mode } from "#app/ui/ui";
-import * as Utils from "#app/utils";
+import { fixedInt } from "#app/utils";
export class ReloadSessionPhase extends Phase {
private systemDataStr: string | null;
@@ -18,7 +18,7 @@ export class ReloadSessionPhase extends Phase {
let delayElapsed = false;
let loaded = false;
- this.scene.time.delayedCall(Utils.fixedInt(1500), () => {
+ this.scene.time.delayedCall(fixedInt(1500), () => {
if (loaded) {
this.end();
} else {
diff --git a/src/phases/return-phase.ts b/src/phases/return-phase.ts
index eb5872015858..60198c9bda48 100644
--- a/src/phases/return-phase.ts
+++ b/src/phases/return-phase.ts
@@ -1,7 +1,7 @@
import BattleScene from "#app/battle-scene";
import { SpeciesFormChangeActiveTrigger } from "#app/data/pokemon-forms";
import { SwitchType } from "#enums/switch-type";
-import { SwitchSummonPhase } from "./switch-summon-phase";
+import { SwitchSummonPhase } from "#phases/switch-summon-phase";
export class ReturnPhase extends SwitchSummonPhase {
constructor(scene: BattleScene, fieldIndex: integer) {
diff --git a/src/phases/ribbon-modifier-reward-phase.ts b/src/phases/ribbon-modifier-reward-phase.ts
index fabb3bfa1b13..152736b0e8f8 100644
--- a/src/phases/ribbon-modifier-reward-phase.ts
+++ b/src/phases/ribbon-modifier-reward-phase.ts
@@ -3,7 +3,7 @@ import PokemonSpecies from "#app/data/pokemon-species";
import { ModifierTypeFunc } from "#app/modifier/modifier-type";
import { Mode } from "#app/ui/ui";
import i18next from "i18next";
-import { ModifierRewardPhase } from "./modifier-reward-phase";
+import { ModifierRewardPhase } from "#phases/modifier-reward-phase";
export class RibbonModifierRewardPhase extends ModifierRewardPhase {
private species: PokemonSpecies;
diff --git a/src/phases/scan-ivs-phase.ts b/src/phases/scan-ivs-phase.ts
index 5ec61d5eec6f..bf2491f890ac 100644
--- a/src/phases/scan-ivs-phase.ts
+++ b/src/phases/scan-ivs-phase.ts
@@ -1,12 +1,12 @@
import BattleScene from "#app/battle-scene";
import { BattlerIndex } from "#app/battle";
import { CommonBattleAnim, CommonAnim } from "#app/data/battle-anims";
-import { Stat } from "#app/enums/stat";
+import { Stat } from "#enums/stat";
import { getPokemonNameWithAffix } from "#app/messages";
import { getTextColor, TextStyle } from "#app/ui/text";
import { Mode } from "#app/ui/ui";
import i18next from "i18next";
-import { PokemonPhase } from "./pokemon-phase";
+import { PokemonPhase } from "#phases/pokemon-phase";
export class ScanIvsPhase extends PokemonPhase {
private shownIvs: integer;
diff --git a/src/phases/select-biome-phase.ts b/src/phases/select-biome-phase.ts
index 817cd7bcd3d1..cfa38529fb35 100644
--- a/src/phases/select-biome-phase.ts
+++ b/src/phases/select-biome-phase.ts
@@ -1,13 +1,13 @@
import BattleScene from "#app/battle-scene";
-import { biomeLinks, getBiomeName } from "#app/data/balance/biomes";
-import { Biome } from "#app/enums/biome";
+import { biomeLinks, getBiomeName } from "#balance/biomes";
+import { Biome } from "#enums/biome";
import { MoneyInterestModifier, MapModifier } from "#app/modifier/modifier";
import { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler";
import { Mode } from "#app/ui/ui";
-import { BattlePhase } from "./battle-phase";
-import * as Utils from "#app/utils";
-import { PartyHealPhase } from "./party-heal-phase";
-import { SwitchBiomePhase } from "./switch-biome-phase";
+import { BattlePhase } from "#phases/battle-phase";
+import { randSeedInt } from "#app/utils";
+import { PartyHealPhase } from "#phases/party-heal-phase";
+import { SwitchBiomePhase } from "#phases/switch-biome-phase";
export class SelectBiomePhase extends BattlePhase {
constructor(scene: BattleScene) {
@@ -38,7 +38,7 @@ export class SelectBiomePhase extends BattlePhase {
let biomes: Biome[] = [];
this.scene.executeWithSeedOffset(() => {
biomes = (biomeLinks[currentBiome] as (Biome | [Biome, integer])[])
- .filter(b => !Array.isArray(b) || !Utils.randSeedInt(b[1]))
+ .filter(b => !Array.isArray(b) || !randSeedInt(b[1]))
.map(b => !Array.isArray(b) ? b : b[0]);
}, this.scene.currentBattle.waveIndex);
if (biomes.length > 1 && this.scene.findModifier(m => m instanceof MapModifier)) {
@@ -47,7 +47,7 @@ export class SelectBiomePhase extends BattlePhase {
biomeChoices = (!Array.isArray(biomeLinks[currentBiome])
? [ biomeLinks[currentBiome] as Biome ]
: biomeLinks[currentBiome] as (Biome | [Biome, integer])[])
- .filter((b, i) => !Array.isArray(b) || !Utils.randSeedInt(b[1]))
+ .filter((b, i) => !Array.isArray(b) || !randSeedInt(b[1]))
.map(b => Array.isArray(b) ? b[0] : b);
}, this.scene.currentBattle.waveIndex);
const biomeSelectItems = biomeChoices.map(b => {
@@ -66,7 +66,7 @@ export class SelectBiomePhase extends BattlePhase {
delay: 1000
});
} else {
- setNextBiome(biomes[Utils.randSeedInt(biomes.length)]);
+ setNextBiome(biomes[randSeedInt(biomes.length)]);
}
} else if (biomeLinks.hasOwnProperty(currentBiome)) {
setNextBiome(biomeLinks[currentBiome] as Biome);
diff --git a/src/phases/select-gender-phase.ts b/src/phases/select-gender-phase.ts
index 7f2c965f1d1f..afedea81acb1 100644
--- a/src/phases/select-gender-phase.ts
+++ b/src/phases/select-gender-phase.ts
@@ -1,5 +1,5 @@
import BattleScene from "#app/battle-scene";
-import { PlayerGender } from "#app/enums/player-gender";
+import { PlayerGender } from "#enums/player-gender";
import { Phase } from "#app/phase";
import { SettingKeys } from "#app/system/settings/settings";
import { Mode } from "#app/ui/ui";
diff --git a/src/phases/select-modifier-phase.ts b/src/phases/select-modifier-phase.ts
index 38d5cfb4a103..15d9df447860 100644
--- a/src/phases/select-modifier-phase.ts
+++ b/src/phases/select-modifier-phase.ts
@@ -1,13 +1,26 @@
import BattleScene from "#app/battle-scene";
import { ModifierTier } from "#app/modifier/modifier-tier";
-import { regenerateModifierPoolThresholds, ModifierTypeOption, ModifierType, getPlayerShopModifierTypeOptionsForWave, PokemonModifierType, FusePokemonModifierType, PokemonMoveModifierType, TmModifierType, RememberMoveModifierType, PokemonPpRestoreModifierType, PokemonPpUpModifierType, ModifierPoolType, getPlayerModifierTypeOptions } from "#app/modifier/modifier-type";
+import {
+ regenerateModifierPoolThresholds,
+ ModifierTypeOption,
+ ModifierType,
+ getPlayerShopModifierTypeOptionsForWave,
+ PokemonModifierType,
+ FusePokemonModifierType,
+ PokemonMoveModifierType,
+ TmModifierType,
+ RememberMoveModifierType,
+ PokemonPpRestoreModifierType,
+ PokemonPpUpModifierType,
+ ModifierPoolType,
+ getPlayerModifierTypeOptions,
+} from "#app/modifier/modifier-type";
import { ExtraModifierModifier, HealShopCostModifier, Modifier, PokemonHeldItemModifier } from "#app/modifier/modifier";
import ModifierSelectUiHandler, { SHOP_OPTIONS_ROW_LIMIT } from "#app/ui/modifier-select-ui-handler";
import PartyUiHandler, { PartyUiMode, PartyOption } from "#app/ui/party-ui-handler";
import { Mode } from "#app/ui/ui";
import i18next from "i18next";
-import * as Utils from "#app/utils";
-import { BattlePhase } from "./battle-phase";
+import { BattlePhase } from "#phases/battle-phase";
import Overrides from "#app/overrides";
import { CustomModifierSettings } from "#app/modifier/modifier-type";
import { isNullOrUndefined, NumberHolder } from "#app/utils";
@@ -42,7 +55,7 @@ export class SelectModifierPhase extends BattlePhase {
if (!this.isCopy) {
regenerateModifierPoolThresholds(party, this.getPoolType(), this.rerollCount);
}
- const modifierCount = new Utils.IntegerHolder(3);
+ const modifierCount = new NumberHolder(3);
if (this.isPlayer()) {
this.scene.applyModifiers(ExtraModifierModifier, true, modifierCount);
}
diff --git a/src/phases/select-starter-phase.ts b/src/phases/select-starter-phase.ts
index 1692b5f2234e..a1e28ff5be92 100644
--- a/src/phases/select-starter-phase.ts
+++ b/src/phases/select-starter-phase.ts
@@ -3,7 +3,7 @@ import { applyChallenges, ChallengeType } from "#app/data/challenge";
import { Gender } from "#app/data/gender";
import { SpeciesFormChangeMoveLearnedTrigger } from "#app/data/pokemon-forms";
import { getPokemonSpecies } from "#app/data/pokemon-species";
-import { Species } from "#app/enums/species";
+import { Species } from "#enums/species";
import { PlayerPokemon } from "#app/field/pokemon";
import { overrideModifiers, overrideHeldItems } from "#app/modifier/modifier";
import { Phase } from "#app/phase";
@@ -11,7 +11,7 @@ import { SaveSlotUiMode } from "#app/ui/save-slot-select-ui-handler";
import { Starter } from "#app/ui/starter-select-ui-handler";
import { Mode } from "#app/ui/ui";
import SoundFade from "phaser3-rex-plugins/plugins/soundfade";
-import { TitlePhase } from "./title-phase";
+import { TitlePhase } from "#phases/title-phase";
import Overrides from "#app/overrides";
export class SelectStarterPhase extends Phase {
diff --git a/src/phases/select-target-phase.ts b/src/phases/select-target-phase.ts
index 6f11f984c4b8..36476c701c01 100644
--- a/src/phases/select-target-phase.ts
+++ b/src/phases/select-target-phase.ts
@@ -2,8 +2,8 @@ import BattleScene from "#app/battle-scene";
import { BattlerIndex } from "#app/battle";
import { Command } from "#app/ui/command-ui-handler";
import { Mode } from "#app/ui/ui";
-import { CommandPhase } from "./command-phase";
-import { PokemonPhase } from "./pokemon-phase";
+import { CommandPhase } from "#phases/command-phase";
+import { PokemonPhase } from "#phases/pokemon-phase";
import i18next from "#app/plugins/i18n";
import { allMoves } from "#app/data/move";
diff --git a/src/phases/shiny-sparkle-phase.ts b/src/phases/shiny-sparkle-phase.ts
index 49c60a82dd56..f6c9be16b99d 100644
--- a/src/phases/shiny-sparkle-phase.ts
+++ b/src/phases/shiny-sparkle-phase.ts
@@ -1,6 +1,6 @@
import BattleScene from "#app/battle-scene";
import { BattlerIndex } from "#app/battle";
-import { PokemonPhase } from "./pokemon-phase";
+import { PokemonPhase } from "#phases/pokemon-phase";
export class ShinySparklePhase extends PokemonPhase {
constructor(scene: BattleScene, battlerIndex: BattlerIndex) {
diff --git a/src/phases/show-ability-phase.ts b/src/phases/show-ability-phase.ts
index cf34e327b4fb..34ba5ed8c8db 100644
--- a/src/phases/show-ability-phase.ts
+++ b/src/phases/show-ability-phase.ts
@@ -1,6 +1,6 @@
import BattleScene from "#app/battle-scene";
import { BattlerIndex } from "#app/battle";
-import { PokemonPhase } from "./pokemon-phase";
+import { PokemonPhase } from "#phases/pokemon-phase";
export class ShowAbilityPhase extends PokemonPhase {
private passive: boolean;
diff --git a/src/phases/show-party-exp-bar-phase.ts b/src/phases/show-party-exp-bar-phase.ts
index f1783e7715f6..809c10db9715 100644
--- a/src/phases/show-party-exp-bar-phase.ts
+++ b/src/phases/show-party-exp-bar-phase.ts
@@ -1,11 +1,11 @@
import BattleScene from "#app/battle-scene";
-import { ExpGainsSpeed } from "#app/enums/exp-gains-speed";
-import { ExpNotification } from "#app/enums/exp-notification";
+import { ExpGainsSpeed } from "#enums/exp-gains-speed";
+import { ExpNotification } from "#enums/exp-notification";
import { ExpBoosterModifier } from "#app/modifier/modifier";
-import * as Utils from "#app/utils";
-import { HidePartyExpBarPhase } from "./hide-party-exp-bar-phase";
-import { LevelUpPhase } from "./level-up-phase";
-import { PlayerPartyMemberPokemonPhase } from "./player-party-member-pokemon-phase";
+import { NumberHolder } from "#app/utils";
+import { HidePartyExpBarPhase } from "#phases/hide-party-exp-bar-phase";
+import { LevelUpPhase } from "#phases/level-up-phase";
+import { PlayerPartyMemberPokemonPhase } from "#phases/player-party-member-pokemon-phase";
export class ShowPartyExpBarPhase extends PlayerPartyMemberPokemonPhase {
private expValue: number;
@@ -20,7 +20,7 @@ export class ShowPartyExpBarPhase extends PlayerPartyMemberPokemonPhase {
super.start();
const pokemon = this.getPokemon();
- const exp = new Utils.NumberHolder(this.expValue);
+ const exp = new NumberHolder(this.expValue);
this.scene.applyModifiers(ExpBoosterModifier, true, exp);
exp.value = Math.floor(exp.value);
diff --git a/src/phases/show-trainer-phase.ts b/src/phases/show-trainer-phase.ts
index 26ccddd53fc0..4d8c69b28409 100644
--- a/src/phases/show-trainer-phase.ts
+++ b/src/phases/show-trainer-phase.ts
@@ -1,6 +1,6 @@
import BattleScene from "#app/battle-scene";
-import { PlayerGender } from "#app/enums/player-gender";
-import { BattlePhase } from "./battle-phase";
+import { PlayerGender } from "#enums/player-gender";
+import { BattlePhase } from "#phases/battle-phase";
export class ShowTrainerPhase extends BattlePhase {
constructor(scene: BattleScene) {
diff --git a/src/phases/stat-stage-change-phase.ts b/src/phases/stat-stage-change-phase.ts
index 2d4b3ce6c6f2..b9bf032637ab 100644
--- a/src/phases/stat-stage-change-phase.ts
+++ b/src/phases/stat-stage-change-phase.ts
@@ -1,6 +1,14 @@
import { BattlerIndex } from "#app/battle";
import BattleScene from "#app/battle-scene";
-import { applyAbAttrs, applyPostStatStageChangeAbAttrs, applyPreStatStageChangeAbAttrs, PostStatStageChangeAbAttr, ProtectStatAbAttr, StatStageChangeCopyAbAttr, StatStageChangeMultiplierAbAttr } from "#app/data/ability";
+import {
+ applyAbAttrs,
+ applyPostStatStageChangeAbAttrs,
+ applyPreStatStageChangeAbAttrs,
+ PostStatStageChangeAbAttr,
+ ProtectStatAbAttr,
+ StatStageChangeCopyAbAttr,
+ StatStageChangeMultiplierAbAttr,
+} from "#app/data/ability";
import { ArenaTagSide, MistTag } from "#app/data/arena-tag";
import Pokemon from "#app/field/pokemon";
import { getPokemonNameWithAffix } from "#app/messages";
@@ -8,7 +16,7 @@ import { ResetNegativeStatStageModifier } from "#app/modifier/modifier";
import { handleTutorial, Tutorial } from "#app/tutorial";
import { NumberHolder, BooleanHolder } from "#app/utils";
import i18next from "i18next";
-import { PokemonPhase } from "./pokemon-phase";
+import { PokemonPhase } from "#phases/pokemon-phase";
import { Stat, type BattleStat, getStatKey, getStatStageChangeDescriptionKey } from "#enums/stat";
export type StatStageChangeCallback = (target: Pokemon | null, changed: BattleStat[], relativeChanges: number[]) => void;
diff --git a/src/phases/summon-missing-phase.ts b/src/phases/summon-missing-phase.ts
index 83ac8779dd8d..cff15c353ff7 100644
--- a/src/phases/summon-missing-phase.ts
+++ b/src/phases/summon-missing-phase.ts
@@ -1,7 +1,7 @@
import BattleScene from "#app/battle-scene";
import { getPokemonNameWithAffix } from "#app/messages";
import i18next from "i18next";
-import { SummonPhase } from "./summon-phase";
+import { SummonPhase } from "#phases/summon-phase";
export class SummonMissingPhase extends SummonPhase {
constructor(scene: BattleScene, fieldIndex: integer) {
diff --git a/src/phases/summon-phase.ts b/src/phases/summon-phase.ts
index 119e550293cd..6f41b2fe6a54 100644
--- a/src/phases/summon-phase.ts
+++ b/src/phases/summon-phase.ts
@@ -3,15 +3,15 @@ import { BattleType } from "#app/battle";
import { getPokeballAtlasKey, getPokeballTintColor } from "#app/data/pokeball";
import { SpeciesFormChangeActiveTrigger } from "#app/data/pokemon-forms";
import { TrainerSlot } from "#app/data/trainer-config";
-import { PlayerGender } from "#app/enums/player-gender";
+import { PlayerGender } from "#enums/player-gender";
import { addPokeballOpenParticles } from "#app/field/anims";
import Pokemon, { FieldPosition } from "#app/field/pokemon";
import { getPokemonNameWithAffix } from "#app/messages";
import i18next from "i18next";
-import { PartyMemberPokemonPhase } from "./party-member-pokemon-phase";
-import { PostSummonPhase } from "./post-summon-phase";
-import { GameOverPhase } from "./game-over-phase";
-import { ShinySparklePhase } from "./shiny-sparkle-phase";
+import { PartyMemberPokemonPhase } from "#phases/party-member-pokemon-phase";
+import { PostSummonPhase } from "#phases/post-summon-phase";
+import { GameOverPhase } from "#phases/game-over-phase";
+import { ShinySparklePhase } from "#phases/shiny-sparkle-phase";
import { MysteryEncounterMode } from "#enums/mystery-encounter-mode";
export class SummonPhase extends PartyMemberPokemonPhase {
diff --git a/src/phases/switch-biome-phase.ts b/src/phases/switch-biome-phase.ts
index 80a31794209e..1e776dadc8d7 100644
--- a/src/phases/switch-biome-phase.ts
+++ b/src/phases/switch-biome-phase.ts
@@ -1,7 +1,7 @@
import BattleScene from "#app/battle-scene";
-import { Biome } from "#app/enums/biome";
+import { Biome } from "#enums/biome";
import { getBiomeKey } from "#app/field/arena";
-import { BattlePhase } from "./battle-phase";
+import { BattlePhase } from "#phases/battle-phase";
export class SwitchBiomePhase extends BattlePhase {
private nextBiome: Biome;
diff --git a/src/phases/switch-phase.ts b/src/phases/switch-phase.ts
index f5ce2179715d..c74b8d581c67 100644
--- a/src/phases/switch-phase.ts
+++ b/src/phases/switch-phase.ts
@@ -2,8 +2,8 @@ import BattleScene from "#app/battle-scene";
import { SwitchType } from "#enums/switch-type";
import PartyUiHandler, { PartyUiMode, PartyOption } from "#app/ui/party-ui-handler";
import { Mode } from "#app/ui/ui";
-import { BattlePhase } from "./battle-phase";
-import { SwitchSummonPhase } from "./switch-summon-phase";
+import { BattlePhase } from "#phases/battle-phase";
+import { SwitchSummonPhase } from "#phases/switch-summon-phase";
/**
* Opens the party selector UI and transitions into a {@linkcode SwitchSummonPhase}
diff --git a/src/phases/switch-summon-phase.ts b/src/phases/switch-summon-phase.ts
index 07761b10d6e8..ad111d9b99b9 100644
--- a/src/phases/switch-summon-phase.ts
+++ b/src/phases/switch-summon-phase.ts
@@ -9,8 +9,8 @@ import { getPokemonNameWithAffix } from "#app/messages";
import { SwitchEffectTransferModifier } from "#app/modifier/modifier";
import { Command } from "#app/ui/command-ui-handler";
import i18next from "i18next";
-import { PostSummonPhase } from "./post-summon-phase";
-import { SummonPhase } from "./summon-phase";
+import { PostSummonPhase } from "#phases/post-summon-phase";
+import { SummonPhase } from "#phases/summon-phase";
import { SubstituteTag } from "#app/data/battler-tags";
import { SwitchType } from "#enums/switch-type";
diff --git a/src/phases/test-message-phase.ts b/src/phases/test-message-phase.ts
index 464a5ed1f946..e5bd60e7d98b 100644
--- a/src/phases/test-message-phase.ts
+++ b/src/phases/test-message-phase.ts
@@ -1,5 +1,5 @@
import BattleScene from "#app/battle-scene";
-import { MessagePhase } from "./message-phase";
+import { MessagePhase } from "#phases/message-phase";
export class TestMessagePhase extends MessagePhase {
constructor(scene: BattleScene, message: string) {
diff --git a/src/phases/title-phase.ts b/src/phases/title-phase.ts
index 58683cf8ec83..d035e22afd02 100644
--- a/src/phases/title-phase.ts
+++ b/src/phases/title-phase.ts
@@ -5,7 +5,12 @@ import { getDailyRunStarters, fetchDailyRunSeed } from "#app/data/daily-run";
import { Gender } from "#app/data/gender";
import { getBiomeKey } from "#app/field/arena";
import { GameModes, GameMode, getGameMode } from "#app/game-mode";
-import { regenerateModifierPoolThresholds, ModifierPoolType, modifierTypes, getDailyRunStarterModifiers } from "#app/modifier/modifier-type";
+import {
+ regenerateModifierPoolThresholds,
+ ModifierPoolType,
+ modifierTypes,
+ getDailyRunStarterModifiers,
+} from "#app/modifier/modifier-type";
import { Phase } from "#app/phase";
import { SessionSaveData } from "#app/system/game-data";
import { Unlockables } from "#app/system/unlockables";
@@ -14,13 +19,13 @@ import { OptionSelectItem, OptionSelectConfig } from "#app/ui/abstact-option-sel
import { SaveSlotUiMode } from "#app/ui/save-slot-select-ui-handler";
import { Mode } from "#app/ui/ui";
import i18next from "i18next";
-import * as Utils from "#app/utils";
+import { isLocal } from "#app/utils";
import { Modifier } from "#app/modifier/modifier";
-import { CheckSwitchPhase } from "./check-switch-phase";
-import { EncounterPhase } from "./encounter-phase";
-import { SelectChallengePhase } from "./select-challenge-phase";
-import { SelectStarterPhase } from "./select-starter-phase";
-import { SummonPhase } from "./summon-phase";
+import { CheckSwitchPhase } from "#phases/check-switch-phase";
+import { EncounterPhase } from "#phases/encounter-phase";
+import { SelectChallengePhase } from "#phases/select-challenge-phase";
+import { SelectStarterPhase } from "#phases/select-starter-phase";
+import { SummonPhase } from "#phases/summon-phase";
export class TitlePhase extends Phase {
@@ -243,7 +248,7 @@ export class TitlePhase extends Phase {
};
// If Online, calls seed fetch from db to generate daily run. If Offline, generates a daily run based on current date.
- if (!Utils.isLocal) {
+ if (!isLocal) {
fetchDailyRunSeed().then(seed => {
if (seed) {
generateDaily(seed);
diff --git a/src/phases/toggle-double-position-phase.ts b/src/phases/toggle-double-position-phase.ts
index 563af8575d7a..1fc75b2c49c6 100644
--- a/src/phases/toggle-double-position-phase.ts
+++ b/src/phases/toggle-double-position-phase.ts
@@ -1,6 +1,6 @@
import BattleScene from "#app/battle-scene";
import { FieldPosition } from "#app/field/pokemon";
-import { BattlePhase } from "./battle-phase";
+import { BattlePhase } from "#phases/battle-phase";
export class ToggleDoublePositionPhase extends BattlePhase {
private double: boolean;
diff --git a/src/phases/trainer-message-test-phase.ts b/src/phases/trainer-message-test-phase.ts
index d9e58473bd51..8c7b7a81e18d 100644
--- a/src/phases/trainer-message-test-phase.ts
+++ b/src/phases/trainer-message-test-phase.ts
@@ -1,8 +1,8 @@
import BattleScene from "#app/battle-scene";
import { trainerConfigs } from "#app/data/trainer-config";
-import { TrainerType } from "#app/enums/trainer-type";
-import { BattlePhase } from "./battle-phase";
-import { TestMessagePhase } from "./test-message-phase";
+import { TrainerType } from "#enums/trainer-type";
+import { BattlePhase } from "#phases/battle-phase";
+import { TestMessagePhase } from "#phases/test-message-phase";
export class TrainerMessageTestPhase extends BattlePhase {
private trainerTypes: TrainerType[];
diff --git a/src/phases/trainer-victory-phase.ts b/src/phases/trainer-victory-phase.ts
index fd48b91b1a1f..7862b9ba4a79 100644
--- a/src/phases/trainer-victory-phase.ts
+++ b/src/phases/trainer-victory-phase.ts
@@ -1,13 +1,13 @@
import BattleScene from "#app/battle-scene";
import { getCharVariantFromDialogue } from "#app/data/dialogue";
-import { TrainerType } from "#app/enums/trainer-type";
+import { TrainerType } from "#enums/trainer-type";
import { modifierTypes } from "#app/modifier/modifier-type";
import { vouchers } from "#app/system/voucher";
import i18next from "i18next";
-import * as Utils from "#app/utils";
-import { BattlePhase } from "./battle-phase";
-import { ModifierRewardPhase } from "./modifier-reward-phase";
-import { MoneyRewardPhase } from "./money-reward-phase";
+import { randSeedItem } from "#app/utils";
+import { BattlePhase } from "#phases/battle-phase";
+import { ModifierRewardPhase } from "#phases/modifier-reward-phase";
+import { MoneyRewardPhase } from "#phases/money-reward-phase";
import { TrainerSlot } from "#app/data/trainer-config";
export class TrainerVictoryPhase extends BattlePhase {
@@ -37,7 +37,7 @@ export class TrainerVictoryPhase extends BattlePhase {
this.scene.ui.showText(i18next.t("battle:trainerDefeated", { trainerName: this.scene.currentBattle.trainer?.getName(TrainerSlot.NONE, true) }), null, () => {
const victoryMessages = this.scene.currentBattle.trainer?.getVictoryMessages()!; // TODO: is this bang correct?
let message: string;
- this.scene.executeWithSeedOffset(() => message = Utils.randSeedItem(victoryMessages), this.scene.currentBattle.waveIndex);
+ this.scene.executeWithSeedOffset(() => message = randSeedItem(victoryMessages), this.scene.currentBattle.waveIndex);
message = message!; // tell TS compiler it's defined now
const showMessage = () => {
diff --git a/src/phases/turn-end-phase.ts b/src/phases/turn-end-phase.ts
index 60a2e6600db8..afa428e78a2a 100644
--- a/src/phases/turn-end-phase.ts
+++ b/src/phases/turn-end-phase.ts
@@ -2,14 +2,20 @@ import BattleScene from "#app/battle-scene";
import { applyPostTurnAbAttrs, PostTurnAbAttr } from "#app/data/ability";
import { BattlerTagLapseType } from "#app/data/battler-tags";
import { TerrainType } from "#app/data/terrain";
-import { WeatherType } from "#app/enums/weather-type";
+import { WeatherType } from "#enums/weather-type";
import { TurnEndEvent } from "#app/events/battle-scene";
import Pokemon from "#app/field/pokemon";
import { getPokemonNameWithAffix } from "#app/messages";
-import { TurnHealModifier, EnemyTurnHealModifier, EnemyStatusEffectHealChanceModifier, TurnStatusEffectModifier, TurnHeldItemTransferModifier } from "#app/modifier/modifier";
+import {
+ TurnHealModifier,
+ EnemyTurnHealModifier,
+ EnemyStatusEffectHealChanceModifier,
+ TurnStatusEffectModifier,
+ TurnHeldItemTransferModifier,
+} from "#app/modifier/modifier";
import i18next from "i18next";
-import { FieldPhase } from "./field-phase";
-import { PokemonHealPhase } from "./pokemon-heal-phase";
+import { FieldPhase } from "#phases/field-phase";
+import { PokemonHealPhase } from "#phases/pokemon-heal-phase";
export class TurnEndPhase extends FieldPhase {
constructor(scene: BattleScene) {
diff --git a/src/phases/turn-init-phase.ts b/src/phases/turn-init-phase.ts
index 2f1b539cdcf3..89ee81ddd622 100644
--- a/src/phases/turn-init-phase.ts
+++ b/src/phases/turn-init-phase.ts
@@ -3,13 +3,13 @@ import { BattlerIndex } from "#app/battle";
import { TurnInitEvent } from "#app/events/battle-scene";
import { PlayerPokemon } from "#app/field/pokemon";
import i18next from "i18next";
-import { FieldPhase } from "./field-phase";
-import { ToggleDoublePositionPhase } from "./toggle-double-position-phase";
-import { CommandPhase } from "./command-phase";
-import { EnemyCommandPhase } from "./enemy-command-phase";
-import { GameOverPhase } from "./game-over-phase";
-import { TurnStartPhase } from "./turn-start-phase";
-import { handleMysteryEncounterBattleStartEffects, handleMysteryEncounterTurnStartEffects } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import { FieldPhase } from "#phases/field-phase";
+import { ToggleDoublePositionPhase } from "#phases/toggle-double-position-phase";
+import { CommandPhase } from "#phases/command-phase";
+import { EnemyCommandPhase } from "#phases/enemy-command-phase";
+import { GameOverPhase } from "#phases/game-over-phase";
+import { TurnStartPhase } from "#phases/turn-start-phase";
+import { handleMysteryEncounterBattleStartEffects, handleMysteryEncounterTurnStartEffects } from "#mystery-encounters/utils/encounter-phase-utils";
export class TurnInitPhase extends FieldPhase {
constructor(scene: BattleScene) {
diff --git a/src/phases/turn-start-phase.ts b/src/phases/turn-start-phase.ts
index 497d449912ff..e7acc7b6d0e4 100644
--- a/src/phases/turn-start-phase.ts
+++ b/src/phases/turn-start-phase.ts
@@ -1,22 +1,27 @@
import BattleScene from "#app/battle-scene";
-import { applyAbAttrs, BypassSpeedChanceAbAttr, PreventBypassSpeedChanceAbAttr, ChangeMovePriorityAbAttr } from "#app/data/ability";
+import {
+ applyAbAttrs,
+ BypassSpeedChanceAbAttr,
+ PreventBypassSpeedChanceAbAttr,
+ ChangeMovePriorityAbAttr,
+} from "#app/data/ability";
import { allMoves, applyMoveAttrs, IncrementMovePriorityAttr, MoveHeaderAttr } from "#app/data/move";
-import { Abilities } from "#app/enums/abilities";
-import { Stat } from "#app/enums/stat";
+import { Abilities } from "#enums/abilities";
+import { Stat } from "#enums/stat";
import Pokemon, { PokemonMove } from "#app/field/pokemon";
import { BypassSpeedChanceModifier } from "#app/modifier/modifier";
import { Command } from "#app/ui/command-ui-handler";
-import * as Utils from "#app/utils";
-import { AttemptCapturePhase } from "./attempt-capture-phase";
-import { AttemptRunPhase } from "./attempt-run-phase";
-import { BerryPhase } from "./berry-phase";
-import { FieldPhase } from "./field-phase";
-import { MoveHeaderPhase } from "./move-header-phase";
-import { MovePhase } from "./move-phase";
-import { SwitchSummonPhase } from "./switch-summon-phase";
-import { TurnEndPhase } from "./turn-end-phase";
-import { WeatherEffectPhase } from "./weather-effect-phase";
-import { CheckStatusEffectPhase } from "#app/phases/check-status-effect-phase";
+import { randSeedShuffle, BooleanHolder, NumberHolder } from "#app/utils";
+import { AttemptCapturePhase } from "#phases/attempt-capture-phase";
+import { AttemptRunPhase } from "#phases/attempt-run-phase";
+import { BerryPhase } from "#phases/berry-phase";
+import { FieldPhase } from "#phases/field-phase";
+import { MoveHeaderPhase } from "#phases/move-header-phase";
+import { MovePhase } from "#phases/move-phase";
+import { SwitchSummonPhase } from "#phases/switch-summon-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
+import { WeatherEffectPhase } from "#phases/weather-effect-phase";
+import { CheckStatusEffectPhase } from "#phases/check-status-effect-phase";
import { BattlerIndex } from "#app/battle";
import { TrickRoomTag } from "#app/data/arena-tag";
import { SwitchType } from "#enums/switch-type";
@@ -40,11 +45,11 @@ export class TurnStartPhase extends FieldPhase {
// We seed it with the current turn to prevent an inconsistency where it
// was varying based on how long since you last reloaded
this.scene.executeWithSeedOffset(() => {
- orderedTargets = Utils.randSeedShuffle(orderedTargets);
+ orderedTargets = randSeedShuffle(orderedTargets);
}, this.scene.currentBattle.turn, this.scene.waveSeed);
// Next, a check for Trick Room is applied to determine sort order.
- const speedReversed = new Utils.BooleanHolder(false);
+ const speedReversed = new BooleanHolder(false);
this.scene.arena.applyTags(TrickRoomTag, false, speedReversed);
// Adjust the sort function based on whether Trick Room is active.
@@ -71,8 +76,8 @@ export class TurnStartPhase extends FieldPhase {
const battlerBypassSpeed = {};
this.scene.getField(true).filter(p => p.summonData).map(p => {
- const bypassSpeed = new Utils.BooleanHolder(false);
- const canCheckHeldItems = new Utils.BooleanHolder(true);
+ const bypassSpeed = new BooleanHolder(false);
+ const canCheckHeldItems = new BooleanHolder(true);
applyAbAttrs(BypassSpeedChanceAbAttr, p, null, false, bypassSpeed);
applyAbAttrs(PreventBypassSpeedChanceAbAttr, p, null, false, bypassSpeed, canCheckHeldItems);
if (canCheckHeldItems.value) {
@@ -99,8 +104,8 @@ export class TurnStartPhase extends FieldPhase {
const bMove = allMoves[bCommand!.move!.move];
// The game now considers priority and applies the relevant move and ability attributes
- const aPriority = new Utils.IntegerHolder(aMove.priority);
- const bPriority = new Utils.IntegerHolder(bMove.priority);
+ const aPriority = new NumberHolder(aMove.priority);
+ const bPriority = new NumberHolder(bMove.priority);
applyMoveAttrs(IncrementMovePriorityAttr, this.scene.getField().find(p => p?.isActive() && p.getBattlerIndex() === a)!, null, aMove, aPriority);
applyMoveAttrs(IncrementMovePriorityAttr, this.scene.getField().find(p => p?.isActive() && p.getBattlerIndex() === b)!, null, bMove, bPriority);
diff --git a/src/phases/unavailable-phase.ts b/src/phases/unavailable-phase.ts
index 59bfca7875e0..77048357eaaf 100644
--- a/src/phases/unavailable-phase.ts
+++ b/src/phases/unavailable-phase.ts
@@ -1,7 +1,7 @@
import BattleScene from "#app/battle-scene";
import { Phase } from "#app/phase";
import { Mode } from "#app/ui/ui";
-import { LoginPhase } from "./login-phase";
+import { LoginPhase } from "#phases/login-phase";
export class UnavailablePhase extends Phase {
constructor(scene: BattleScene) {
diff --git a/src/phases/victory-phase.ts b/src/phases/victory-phase.ts
index e900ff97fc6e..7a508f0df8ad 100644
--- a/src/phases/victory-phase.ts
+++ b/src/phases/victory-phase.ts
@@ -1,16 +1,16 @@
import BattleScene from "#app/battle-scene";
import { BattlerIndex, BattleType, ClassicFixedBossWaves } from "#app/battle";
import { CustomModifierSettings, modifierTypes } from "#app/modifier/modifier-type";
-import { BattleEndPhase } from "./battle-end-phase";
-import { NewBattlePhase } from "./new-battle-phase";
-import { PokemonPhase } from "./pokemon-phase";
-import { AddEnemyBuffModifierPhase } from "./add-enemy-buff-modifier-phase";
-import { EggLapsePhase } from "./egg-lapse-phase";
-import { GameOverPhase } from "./game-over-phase";
-import { ModifierRewardPhase } from "./modifier-reward-phase";
-import { SelectModifierPhase } from "./select-modifier-phase";
-import { TrainerVictoryPhase } from "./trainer-victory-phase";
-import { handleMysteryEncounterVictory } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import { BattleEndPhase } from "#phases/battle-end-phase";
+import { NewBattlePhase } from "#phases/new-battle-phase";
+import { PokemonPhase } from "#phases/pokemon-phase";
+import { AddEnemyBuffModifierPhase } from "#phases/add-enemy-buff-modifier-phase";
+import { EggLapsePhase } from "#phases/egg-lapse-phase";
+import { GameOverPhase } from "#phases/game-over-phase";
+import { ModifierRewardPhase } from "#phases/modifier-reward-phase";
+import { SelectModifierPhase } from "#phases/select-modifier-phase";
+import { TrainerVictoryPhase } from "#phases/trainer-victory-phase";
+import { handleMysteryEncounterVictory } from "#mystery-encounters/utils/encounter-phase-utils";
export class VictoryPhase extends PokemonPhase {
/** If true, indicates that the phase is intended for EXP purposes only, and not to continue a battle to next phase */
diff --git a/src/phases/weather-effect-phase.ts b/src/phases/weather-effect-phase.ts
index b48ee3427804..eda399400930 100644
--- a/src/phases/weather-effect-phase.ts
+++ b/src/phases/weather-effect-phase.ts
@@ -1,12 +1,20 @@
import BattleScene from "#app/battle-scene";
-import { applyPreWeatherEffectAbAttrs, SuppressWeatherEffectAbAttr, PreWeatherDamageAbAttr, applyAbAttrs, BlockNonDirectDamageAbAttr, applyPostWeatherLapseAbAttrs, PostWeatherLapseAbAttr } from "#app/data/ability";
+import {
+ applyPreWeatherEffectAbAttrs,
+ SuppressWeatherEffectAbAttr,
+ PreWeatherDamageAbAttr,
+ applyAbAttrs,
+ BlockNonDirectDamageAbAttr,
+ applyPostWeatherLapseAbAttrs,
+ PostWeatherLapseAbAttr,
+} from "#app/data/ability";
import { CommonAnim } from "#app/data/battle-anims";
import { Weather, getWeatherDamageMessage, getWeatherLapseMessage } from "#app/data/weather";
-import { BattlerTagType } from "#app/enums/battler-tag-type";
-import { WeatherType } from "#app/enums/weather-type";
+import { BattlerTagType } from "#enums/battler-tag-type";
+import { WeatherType } from "#enums/weather-type";
import Pokemon, { HitResult } from "#app/field/pokemon";
-import * as Utils from "#app/utils";
-import { CommonAnimPhase } from "./common-anim-phase";
+import { BooleanHolder, toDmgValue } from "#app/utils";
+import { CommonAnimPhase } from "#phases/common-anim-phase";
export class WeatherEffectPhase extends CommonAnimPhase {
public weather: Weather | null;
@@ -29,13 +37,13 @@ export class WeatherEffectPhase extends CommonAnimPhase {
if (this.weather.isDamaging()) {
- const cancelled = new Utils.BooleanHolder(false);
+ const cancelled = new BooleanHolder(false);
this.executeForAll((pokemon: Pokemon) => applyPreWeatherEffectAbAttrs(SuppressWeatherEffectAbAttr, pokemon, this.weather, cancelled));
if (!cancelled.value) {
const inflictDamage = (pokemon: Pokemon) => {
- const cancelled = new Utils.BooleanHolder(false);
+ const cancelled = new BooleanHolder(false);
applyPreWeatherEffectAbAttrs(PreWeatherDamageAbAttr, pokemon, this.weather, cancelled);
applyAbAttrs(BlockNonDirectDamageAbAttr, pokemon, cancelled);
@@ -44,7 +52,7 @@ export class WeatherEffectPhase extends CommonAnimPhase {
return;
}
- const damage = Utils.toDmgValue(pokemon.getMaxHp() / 16);
+ const damage = toDmgValue(pokemon.getMaxHp() / 16);
this.scene.queueMessage(getWeatherDamageMessage(this.weather?.weatherType!, pokemon)!); // TODO: are those bangs correct?
pokemon.damageAndUpdate(damage, HitResult.EFFECTIVE, false, false, true);
diff --git a/src/pipelines/field-sprite.ts b/src/pipelines/field-sprite.ts
index c370f5586e56..da1338f3b542 100644
--- a/src/pipelines/field-sprite.ts
+++ b/src/pipelines/field-sprite.ts
@@ -1,6 +1,6 @@
-import BattleScene from "../battle-scene";
-import { TerrainType, getTerrainColor } from "../data/terrain";
-import * as Utils from "../utils";
+import BattleScene from "#app/battle-scene";
+import { TerrainType, getTerrainColor } from "#app/data/terrain";
+import { getCurrentTime } from "#app/utils";
const spriteFragShader = `
#ifdef GL_FRAGMENT_PRECISION_HIGH
@@ -235,7 +235,7 @@ export default class FieldSpritePipeline extends Phaser.Renderer.WebGL.Pipelines
const time = scene.currentBattle?.waveIndex
? ((scene.currentBattle.waveIndex + scene.waveCycleOffset) % 40) / 40 // ((new Date().getSeconds() * 1000 + new Date().getMilliseconds()) % 10000) / 10000
- : Utils.getCurrentTime();
+ : getCurrentTime();
this.set1f("time", time);
this.set1i("ignoreTimeTint", ignoreTimeTint ? 1 : 0);
this.set1i("isOutside", scene.arena.isOutside() ? 1 : 0);
diff --git a/src/pipelines/sprite.ts b/src/pipelines/sprite.ts
index 88d6ce2d3871..3f255397d4d3 100644
--- a/src/pipelines/sprite.ts
+++ b/src/pipelines/sprite.ts
@@ -1,10 +1,10 @@
-import BattleScene from "../battle-scene";
+import BattleScene from "#app/battle-scene";
import { variantColorCache } from "#app/data/variant";
-import Pokemon from "../field/pokemon";
-import Trainer from "../field/trainer";
+import Pokemon from "#app/field/pokemon";
+import Trainer from "#app/field/trainer";
import FieldSpritePipeline from "./field-sprite";
-import * as Utils from "../utils";
-import MysteryEncounterIntroVisuals from "../field/mystery-encounter-intro";
+import { rgbHexToRgba } from "#app/utils";
+import MysteryEncounterIntroVisuals from "#app/field/mystery-encounter-intro";
const spriteFragShader = `
#ifdef GL_FRAGMENT_PRECISION_HIGH
@@ -421,8 +421,8 @@ export default class SpritePipeline extends FieldSpritePipeline {
const baseColors = Object.keys(variantColors[variant]);
for (let c = 0; c < 32; c++) {
if (c < baseColors.length) {
- const baseColor = Array.from(Object.values(Utils.rgbHexToRgba(baseColors[c])));
- const variantColor = Array.from(Object.values(Utils.rgbHexToRgba(variantColors[variant][baseColors[c]])));
+ const baseColor = Array.from(Object.values(rgbHexToRgba(baseColors[c])));
+ const variantColor = Array.from(Object.values(rgbHexToRgba(variantColors[variant][baseColors[c]])));
flatBaseColors.splice(flatBaseColors.length, 0, ...baseColor);
flatVariantColors.splice(flatVariantColors.length, 0, ...variantColor.map(c => c / 255.0));
} else {
diff --git a/src/system/achv.ts b/src/system/achv.ts
index 366813328e23..e4d39c829de0 100644
--- a/src/system/achv.ts
+++ b/src/system/achv.ts
@@ -1,14 +1,20 @@
import { Modifier } from "typescript";
-import BattleScene from "../battle-scene";
-import { TurnHeldItemTransferModifier } from "../modifier/modifier";
-import { pokemonEvolutions } from "#app/data/balance/pokemon-evolutions";
+import BattleScene from "#app/battle-scene";
+import { TurnHeldItemTransferModifier } from "#app/modifier/modifier";
+import { pokemonEvolutions } from "#balance/pokemon-evolutions";
import i18next from "i18next";
-import * as Utils from "../utils";
+import { NumberHolder } from "#app/utils";
import { PlayerGender } from "#enums/player-gender";
-import { Challenge, FreshStartChallenge, SingleGenerationChallenge, SingleTypeChallenge, InverseBattleChallenge } from "#app/data/challenge";
+import {
+ Challenge,
+ FreshStartChallenge,
+ SingleGenerationChallenge,
+ SingleTypeChallenge,
+ InverseBattleChallenge,
+} from "#app/data/challenge";
import { ConditionFn } from "#app/@types/common";
-import { Stat, getShortenedStatKey } from "#app/enums/stat";
-import { Challenges } from "#app/enums/challenges";
+import { Stat, getShortenedStatKey } from "#enums/stat";
+import { Challenges } from "#enums/challenges";
export enum AchvTier {
COMMON,
@@ -109,7 +115,7 @@ export class DamageAchv extends Achv {
damageAmount: integer;
constructor(localizationKey: string, name: string, damageAmount: integer, iconImage: string, score: integer) {
- super(localizationKey, name, "", iconImage, score, (_scene: BattleScene, args: any[]) => (args[0] instanceof Utils.NumberHolder ? args[0].value : args[0]) >= this.damageAmount);
+ super(localizationKey, name, "", iconImage, score, (_scene: BattleScene, args: any[]) => (args[0] instanceof NumberHolder ? args[0].value : args[0]) >= this.damageAmount);
this.damageAmount = damageAmount;
}
}
@@ -118,7 +124,7 @@ export class HealAchv extends Achv {
healAmount: integer;
constructor(localizationKey: string, name: string, healAmount: integer, iconImage: string, score: integer) {
- super(localizationKey, name, "", iconImage, score, (_scene: BattleScene, args: any[]) => (args[0] instanceof Utils.NumberHolder ? args[0].value : args[0]) >= this.healAmount);
+ super(localizationKey, name, "", iconImage, score, (_scene: BattleScene, args: any[]) => (args[0] instanceof NumberHolder ? args[0].value : args[0]) >= this.healAmount);
this.healAmount = healAmount;
}
}
@@ -127,7 +133,7 @@ export class LevelAchv extends Achv {
level: integer;
constructor(localizationKey: string, name: string, level: integer, iconImage: string, score: integer) {
- super(localizationKey, name, "", iconImage, score, (scene: BattleScene, args: any[]) => (args[0] instanceof Utils.NumberHolder ? args[0].value : args[0]) >= this.level);
+ super(localizationKey, name, "", iconImage, score, (scene: BattleScene, args: any[]) => (args[0] instanceof NumberHolder ? args[0].value : args[0]) >= this.level);
this.level = level;
}
}
diff --git a/src/system/egg-data.ts b/src/system/egg-data.ts
index aa06316a61fb..97b96d39b718 100644
--- a/src/system/egg-data.ts
+++ b/src/system/egg-data.ts
@@ -2,7 +2,7 @@ import { EggTier } from "#enums/egg-type";
import { Species } from "#enums/species";
import { VariantTier } from "#enums/variant-tier";
import { EGG_SEED, Egg } from "../data/egg";
-import { EggSourceType } from "#app/enums/egg-source-types";
+import { EggSourceType } from "#enums/egg-source-types";
export default class EggData {
public id: integer;
diff --git a/src/system/game-data.ts b/src/system/game-data.ts
index 5f9aad634088..a17f41a167e2 100644
--- a/src/system/game-data.ts
+++ b/src/system/game-data.ts
@@ -1,10 +1,20 @@
import i18next from "i18next";
import BattleScene, { bypassLogin, PokeballCounts } from "#app/battle-scene";
import Pokemon, { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon";
-import { pokemonPrevolutions } from "#app/data/balance/pokemon-evolutions";
+import { pokemonPrevolutions } from "#balance/pokemon-evolutions";
import PokemonSpecies, { allSpecies, getPokemonSpecies, noStarterFormKeys } from "#app/data/pokemon-species";
-import { speciesStarterCosts } from "#app/data/balance/starters";
-import * as Utils from "#app/utils";
+import { speciesStarterCosts } from "#balance/starters";
+import {
+ randInt,
+ apiPost,
+ apiFetch,
+ getEnumKeys,
+ isLocal,
+ executeIf,
+ fixedInt,
+ randSeedItem,
+ NumberHolder,
+} from "#app/utils";
import Overrides from "#app/overrides";
import PokemonData from "#app/system/pokemon-data";
import PersistentModifierData from "#app/system/modifier-data";
@@ -25,7 +35,7 @@ import { clientSessionId, loggedInUser, updateUserInfo } from "#app/account";
import { Nature } from "#app/data/nature";
import { GameStats } from "#app/system/game-stats";
import { Tutorial } from "#app/tutorial";
-import { speciesEggMoves } from "#app/data/balance/egg-moves";
+import { speciesEggMoves } from "#balance/egg-moves";
import { allMoves } from "#app/data/move";
import { TrainerVariant } from "#app/field/trainer";
import { Variant } from "#app/data/variant";
@@ -43,10 +53,14 @@ import { Species } from "#enums/species";
import { applyChallenges, ChallengeType } from "#app/data/challenge";
import { WeatherType } from "#enums/weather-type";
import { TerrainType } from "#app/data/terrain";
-import { ReloadSessionPhase } from "#app/phases/reload-session-phase";
+import { ReloadSessionPhase } from "#phases/reload-session-phase";
import { RUN_HISTORY_LIMIT } from "#app/ui/run-history-ui-handler";
-import { applySessionVersionMigration, applySystemVersionMigration, applySettingsVersionMigration } from "./version_migration/version_converter";
-import { MysteryEncounterSaveData } from "#app/data/mystery-encounters/mystery-encounter-save-data";
+import {
+ applySessionVersionMigration,
+ applySystemVersionMigration,
+ applySettingsVersionMigration,
+} from "./version_migration/version_converter";
+import { MysteryEncounterSaveData } from "#mystery-encounters/mystery-encounter-save-data";
import { MysteryEncounterType } from "#enums/mystery-encounter-type";
import { PokerogueApiClearSessionData } from "#app/@types/pokerogue-api";
import { ArenaTrapTag } from "#app/data/arena-tag";
@@ -328,8 +342,8 @@ export class GameData {
this.loadSettings();
this.loadGamepadSettings();
this.loadMappingConfigs();
- this.trainerId = Utils.randInt(65536);
- this.secretId = Utils.randInt(65536);
+ this.trainerId = randInt(65536);
+ this.secretId = randInt(65536);
this.starterData = {};
this.gameStats = new GameStats();
this.runHistory = {};
@@ -397,7 +411,7 @@ export class GameData {
localStorage.setItem(`data_${loggedInUser?.username}`, encrypt(systemData, bypassLogin));
if (!bypassLogin) {
- Utils.apiPost(`savedata/system/update?clientSessionId=${clientSessionId}`, systemData, undefined, true)
+ apiPost(`savedata/system/update?clientSessionId=${clientSessionId}`, systemData, undefined, true)
.then(response => response.text())
.then(error => {
this.scene.ui.savingIcon.hide();
@@ -428,7 +442,7 @@ export class GameData {
}
if (!bypassLogin) {
- Utils.apiFetch(`savedata/system/get?clientSessionId=${clientSessionId}`, true)
+ apiFetch(`savedata/system/get?clientSessionId=${clientSessionId}`, true)
.then(response => response.text())
.then(response => {
if (!response.length || response[0] !== "{") {
@@ -547,7 +561,7 @@ export class GameData {
}
if (systemData.voucherCounts) {
- Utils.getEnumKeys(VoucherType).forEach(key => {
+ getEnumKeys(VoucherType).forEach(key => {
const index = VoucherType[key];
this.voucherCounts[index] = systemData.voucherCounts[index] || 0;
});
@@ -577,7 +591,7 @@ export class GameData {
* At the moment, only retrievable from locale cache
*/
async getRunHistoryData(scene: BattleScene): Promise<RunHistoryData> {
- if (!Utils.isLocal) {
+ if (!isLocal) {
/**
* Networking Code DO NOT DELETE!
*
@@ -704,7 +718,7 @@ export class GameData {
return true;
}
- const response = await Utils.apiFetch(`savedata/system/verify?clientSessionId=${clientSessionId}`, true)
+ const response = await apiFetch(`savedata/system/verify?clientSessionId=${clientSessionId}`, true)
.then(response => response.json());
if (!response.valid) {
@@ -984,7 +998,7 @@ export class GameData {
};
if (!bypassLogin && !localStorage.getItem(`sessionData${slotId ? slotId : ""}_${loggedInUser?.username}`)) {
- Utils.apiFetch(`savedata/session/get?slot=${slotId}&clientSessionId=${clientSessionId}`, true)
+ apiFetch(`savedata/session/get?slot=${slotId}&clientSessionId=${clientSessionId}`, true)
.then(response => response.text())
.then(async response => {
if (!response.length || response[0] !== "{") {
@@ -1149,7 +1163,7 @@ export class GameData {
if (success !== null && !success) {
return resolve(false);
}
- Utils.apiFetch(`savedata/session/delete?slot=${slotId}&clientSessionId=${clientSessionId}`, true).then(response => {
+ apiFetch(`savedata/session/delete?slot=${slotId}&clientSessionId=${clientSessionId}`, true).then(response => {
if (response.ok) {
loggedInUser!.lastSessionSlot = -1; // TODO: is the bang correct?
localStorage.removeItem(`sessionData${slotId ? slotId : ""}_${loggedInUser?.username}`);
@@ -1215,7 +1229,7 @@ export class GameData {
result = [ true, true ];
} else {
const sessionData = this.getSessionSaveData(scene);
- const response = await Utils.apiPost(`savedata/session/clear?slot=${slotId}&trainerId=${this.trainerId}&secretId=${this.secretId}&clientSessionId=${clientSessionId}`, JSON.stringify(sessionData), undefined, true);
+ const response = await apiPost(`savedata/session/clear?slot=${slotId}&trainerId=${this.trainerId}&secretId=${this.secretId}&clientSessionId=${clientSessionId}`, JSON.stringify(sessionData), undefined, true);
if (response.ok) {
loggedInUser!.lastSessionSlot = -1; // TODO: is the bang correct?
@@ -1316,7 +1330,7 @@ export class GameData {
saveAll(scene: BattleScene, skipVerification: boolean = false, sync: boolean = false, useCachedSession: boolean = false, useCachedSystem: boolean = false): Promise<boolean> {
return new Promise<boolean>(resolve => {
- Utils.executeIf(!skipVerification, updateUserInfo).then(success => {
+ executeIf(!skipVerification, updateUserInfo).then(success => {
if (success !== null && !success) {
return resolve(false);
}
@@ -1342,7 +1356,7 @@ export class GameData {
console.debug("Session data saved");
if (!bypassLogin && sync) {
- Utils.apiPost("savedata/updateall", JSON.stringify(request, (k: any, v: any) => typeof v === "bigint" ? v <= maxIntAttrValue ? Number(v) : v.toString() : v), undefined, true)
+ apiPost("savedata/updateall", JSON.stringify(request, (k: any, v: any) => typeof v === "bigint" ? v <= maxIntAttrValue ? Number(v) : v.toString() : v), undefined, true)
.then(response => response.text())
.then(error => {
if (sync) {
@@ -1387,7 +1401,7 @@ export class GameData {
link.remove();
};
if (!bypassLogin && dataType < GameDataType.SETTINGS) {
- Utils.apiFetch(`savedata/${dataType === GameDataType.SYSTEM ? "system" : "session"}/get?clientSessionId=${clientSessionId}${dataType === GameDataType.SESSION ? `&slot=${slotId}` : ""}`, true)
+ apiFetch(`savedata/${dataType === GameDataType.SYSTEM ? "system" : "session"}/get?clientSessionId=${clientSessionId}${dataType === GameDataType.SESSION ? `&slot=${slotId}` : ""}`, true)
.then(response => response.text())
.then(response => {
if (!response.length || response[0] !== "{") {
@@ -1461,11 +1475,11 @@ export class GameData {
console.error(ex);
}
- const displayError = (error: string) => this.scene.ui.showText(error, null, () => this.scene.ui.showText("", 0), Utils.fixedInt(1500));
+ const displayError = (error: string) => this.scene.ui.showText(error, null, () => this.scene.ui.showText("", 0), fixedInt(1500));
dataName = dataName!; // tell TS compiler that dataName is defined!
if (!valid) {
- return this.scene.ui.showText(`Your ${dataName} data could not be loaded. It may be corrupted.`, null, () => this.scene.ui.showText("", 0), Utils.fixedInt(1500));
+ return this.scene.ui.showText(`Your ${dataName} data could not be loaded. It may be corrupted.`, null, () => this.scene.ui.showText("", 0), fixedInt(1500));
}
this.scene.ui.showText(`Your ${dataName} data will be overridden and the page will reload. Proceed?`, null, () => {
@@ -1483,7 +1497,7 @@ export class GameData {
} else {
url = `savedata/system/update?trainerId=${this.trainerId}&secretId=${this.secretId}&clientSessionId=${clientSessionId}`;
}
- Utils.apiPost(url, dataStr, undefined, true)
+ apiPost(url, dataStr, undefined, true)
.then(response => response.text())
.then(error => {
if (error) {
@@ -1529,7 +1543,7 @@ export class GameData {
this.scene.executeWithSeedOffset(() => {
const neutralNatures = [ Nature.HARDY, Nature.DOCILE, Nature.SERIOUS, Nature.BASHFUL, Nature.QUIRKY ];
for (let s = 0; s < defaultStarterSpecies.length; s++) {
- defaultStarterNatures.push(Utils.randSeedItem(neutralNatures));
+ defaultStarterNatures.push(randSeedItem(neutralNatures));
}
}, 0, "default");
@@ -1904,7 +1918,7 @@ export class GameData {
value = decrementValue(value);
}
- const cost = new Utils.NumberHolder(value);
+ const cost = new NumberHolder(value);
applyChallenges(this.scene.gameMode, ChallengeType.STARTER_COST, speciesId, cost);
return cost.value;
@@ -1932,7 +1946,7 @@ export class GameData {
entry.hatchedCount = 0;
}
if (!entry.hasOwnProperty("natureAttr") || (entry.caughtAttr && !entry.natureAttr)) {
- entry.natureAttr = this.defaultDexData?.[k].natureAttr || (1 << Utils.randInt(25, 1));
+ entry.natureAttr = this.defaultDexData?.[k].natureAttr || (1 << randInt(25, 1));
}
}
}
diff --git a/src/system/game-speed.ts b/src/system/game-speed.ts
index 861c3d4705d0..3642b9f49d1a 100644
--- a/src/system/game-speed.ts
+++ b/src/system/game-speed.ts
@@ -1,8 +1,8 @@
import SoundFade from "phaser3-rex-plugins/plugins/soundfade";
import FadeIn from "phaser3-rex-plugins/plugins/audio/fade/FadeIn";
import FadeOut from "phaser3-rex-plugins/plugins/audio/fade/FadeOut";
-import BattleScene from "../battle-scene";
-import * as Utils from "../utils";
+import BattleScene from "#app/battle-scene";
+import { FixedInt } from "#app/utils";
type FadeIn = typeof FadeIn;
type FadeOut = typeof FadeOut;
@@ -10,9 +10,9 @@ type FadeOut = typeof FadeOut;
export function initGameSpeed() {
const thisArg = this as BattleScene;
- const transformValue = (value: number | Utils.FixedInt): number => {
- if (value instanceof Utils.FixedInt) {
- return (value as Utils.FixedInt).value;
+ const transformValue = (value: number | FixedInt): number => {
+ if (value instanceof FixedInt) {
+ return (value as FixedInt).value;
}
return thisArg.gameSpeed === 1 ? value : Math.ceil(value /= thisArg.gameSpeed);
};
diff --git a/src/system/session-history.ts b/src/system/session-history.ts
index 85a300110d9f..114eeb6a374a 100644
--- a/src/system/session-history.ts
+++ b/src/system/session-history.ts
@@ -1,4 +1,4 @@
-import { GameModes } from "../game-mode";
+import { GameModes } from "#app/game-mode";
import PokemonData from "./pokemon-data";
import PersistentModifierData from "./modifier-data";
diff --git a/src/system/settings/settings.ts b/src/system/settings/settings.ts
index be440d5d93e9..f08b1d3d7d09 100644
--- a/src/system/settings/settings.ts
+++ b/src/system/settings/settings.ts
@@ -9,7 +9,7 @@ import { EaseType } from "#enums/ease-type";
import { MoneyFormat } from "#enums/money-format";
import { PlayerGender } from "#enums/player-gender";
import { getIsInitialized, initI18n } from "#app/plugins/i18n";
-import { ShopCursorTarget } from "#app/enums/shop-cursor-target";
+import { ShopCursorTarget } from "#enums/shop-cursor-target";
function getTranslation(key: string): string {
if (!getIsInitialized()) {
diff --git a/src/test/abilities/ability_duplication.test.ts b/src/test/abilities/ability_duplication.test.ts
index f9122b3259ce..3d614ff74451 100644
--- a/src/test/abilities/ability_duplication.test.ts
+++ b/src/test/abilities/ability_duplication.test.ts
@@ -1,4 +1,4 @@
-import { Stat } from "#app/enums/stat";
+import { Stat } from "#enums/stat";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/abilities/ability_timing.test.ts b/src/test/abilities/ability_timing.test.ts
index e3264c2c1a8c..1051e330a091 100644
--- a/src/test/abilities/ability_timing.test.ts
+++ b/src/test/abilities/ability_timing.test.ts
@@ -1,6 +1,6 @@
-import { BattleStyle } from "#app/enums/battle-style";
-import { CommandPhase } from "#app/phases/command-phase";
-import { TurnInitPhase } from "#app/phases/turn-init-phase";
+import { BattleStyle } from "#enums/battle-style";
+import { CommandPhase } from "#phases/command-phase";
+import { TurnInitPhase } from "#phases/turn-init-phase";
import i18next from "#app/plugins/i18n";
import { Mode } from "#app/ui/ui";
import { Abilities } from "#enums/abilities";
diff --git a/src/test/abilities/battery.test.ts b/src/test/abilities/battery.test.ts
index 8abeca287f7b..9eb5de4f4c32 100644
--- a/src/test/abilities/battery.test.ts
+++ b/src/test/abilities/battery.test.ts
@@ -1,7 +1,7 @@
import { allMoves } from "#app/data/move";
-import { Abilities } from "#app/enums/abilities";
-import { MoveEffectPhase } from "#app/phases/move-effect-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { Abilities } from "#enums/abilities";
+import { MoveEffectPhase } from "#phases/move-effect-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
diff --git a/src/test/abilities/competitive.test.ts b/src/test/abilities/competitive.test.ts
index ecb276a1b8d8..b4fe676c21de 100644
--- a/src/test/abilities/competitive.test.ts
+++ b/src/test/abilities/competitive.test.ts
@@ -1,5 +1,5 @@
import { Stat } from "#enums/stat";
-import { TurnInitPhase } from "#app/phases/turn-init-phase";
+import { TurnInitPhase } from "#phases/turn-init-phase";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/abilities/contrary.test.ts b/src/test/abilities/contrary.test.ts
index c838a5a098e1..f916e2a1230f 100644
--- a/src/test/abilities/contrary.test.ts
+++ b/src/test/abilities/contrary.test.ts
@@ -1,4 +1,4 @@
-import { Moves } from "#app/enums/moves";
+import { Moves } from "#enums/moves";
import { Abilities } from "#enums/abilities";
import { Species } from "#enums/species";
import { Stat } from "#enums/stat";
diff --git a/src/test/abilities/costar.test.ts b/src/test/abilities/costar.test.ts
index 3be29ea2dcfe..064cefb82346 100644
--- a/src/test/abilities/costar.test.ts
+++ b/src/test/abilities/costar.test.ts
@@ -1,9 +1,9 @@
import { Stat } from "#enums/stat";
-import { Abilities } from "#app/enums/abilities";
-import { Moves } from "#app/enums/moves";
-import { Species } from "#app/enums/species";
-import { CommandPhase } from "#app/phases/command-phase";
-import { MessagePhase } from "#app/phases/message-phase";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { CommandPhase } from "#phases/command-phase";
+import { MessagePhase } from "#phases/message-phase";
import GameManager from "#test/utils/gameManager";
import Phaser from "phaser";
import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
diff --git a/src/test/abilities/dancer.test.ts b/src/test/abilities/dancer.test.ts
index 8fa3d444f37d..24ff7ad25f2d 100644
--- a/src/test/abilities/dancer.test.ts
+++ b/src/test/abilities/dancer.test.ts
@@ -1,5 +1,5 @@
import { BattlerIndex } from "#app/battle";
-import { MovePhase } from "#app/phases/move-phase";
+import { MovePhase } from "#phases/move-phase";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/abilities/defiant.test.ts b/src/test/abilities/defiant.test.ts
index aa8d250dad7a..3a2763eb62e1 100644
--- a/src/test/abilities/defiant.test.ts
+++ b/src/test/abilities/defiant.test.ts
@@ -1,5 +1,5 @@
import { Stat } from "#enums/stat";
-import { TurnInitPhase } from "#app/phases/turn-init-phase";
+import { TurnInitPhase } from "#phases/turn-init-phase";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/abilities/dry_skin.test.ts b/src/test/abilities/dry_skin.test.ts
index 314564df15cc..65e9e4623162 100644
--- a/src/test/abilities/dry_skin.test.ts
+++ b/src/test/abilities/dry_skin.test.ts
@@ -1,4 +1,4 @@
-import { Species } from "#app/enums/species";
+import { Species } from "#enums/species";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import GameManager from "#test/utils/gameManager";
diff --git a/src/test/abilities/flash_fire.test.ts b/src/test/abilities/flash_fire.test.ts
index f03e1689649c..f1cc3f71d775 100644
--- a/src/test/abilities/flash_fire.test.ts
+++ b/src/test/abilities/flash_fire.test.ts
@@ -1,9 +1,9 @@
import { BattlerIndex } from "#app/battle";
import { StatusEffect } from "#app/data/status-effect";
-import { BattlerTagType } from "#app/enums/battler-tag-type";
-import { Species } from "#app/enums/species";
-import { MovePhase } from "#app/phases/move-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { BattlerTagType } from "#enums/battler-tag-type";
+import { Species } from "#enums/species";
+import { MovePhase } from "#phases/move-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import GameManager from "#test/utils/gameManager";
diff --git a/src/test/abilities/flower_gift.test.ts b/src/test/abilities/flower_gift.test.ts
index 04ada598f222..16d985ace811 100644
--- a/src/test/abilities/flower_gift.test.ts
+++ b/src/test/abilities/flower_gift.test.ts
@@ -1,7 +1,7 @@
import { BattlerIndex } from "#app/battle";
-import { Abilities } from "#app/enums/abilities";
-import { Stat } from "#app/enums/stat";
-import { WeatherType } from "#app/enums/weather-type";
+import { Abilities } from "#enums/abilities";
+import { Stat } from "#enums/stat";
+import { WeatherType } from "#enums/weather-type";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
diff --git a/src/test/abilities/forecast.test.ts b/src/test/abilities/forecast.test.ts
index 6da313077893..02885929d702 100644
--- a/src/test/abilities/forecast.test.ts
+++ b/src/test/abilities/forecast.test.ts
@@ -1,12 +1,12 @@
import { BattlerIndex } from "#app/battle";
import { allAbilities } from "#app/data/ability";
-import { Abilities } from "#app/enums/abilities";
-import { WeatherType } from "#app/enums/weather-type";
-import { DamagePhase } from "#app/phases/damage-phase";
-import { MovePhase } from "#app/phases/move-phase";
-import { PostSummonPhase } from "#app/phases/post-summon-phase";
-import { QuietFormChangePhase } from "#app/phases/quiet-form-change-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { Abilities } from "#enums/abilities";
+import { WeatherType } from "#enums/weather-type";
+import { DamagePhase } from "#phases/damage-phase";
+import { MovePhase } from "#phases/move-phase";
+import { PostSummonPhase } from "#phases/post-summon-phase";
+import { QuietFormChangePhase } from "#phases/quiet-form-change-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
diff --git a/src/test/abilities/galvanize.test.ts b/src/test/abilities/galvanize.test.ts
index 438f166174d8..6cbdad4e569a 100644
--- a/src/test/abilities/galvanize.test.ts
+++ b/src/test/abilities/galvanize.test.ts
@@ -1,9 +1,9 @@
import { BattlerIndex } from "#app/battle";
import { allMoves } from "#app/data/move";
import { Type } from "#app/data/type";
-import { Abilities } from "#app/enums/abilities";
-import { Moves } from "#app/enums/moves";
-import { Species } from "#app/enums/species";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
import { HitResult } from "#app/field/pokemon";
import GameManager from "#test/utils/gameManager";
import Phaser from "phaser";
diff --git a/src/test/abilities/gorilla_tactics.test.ts b/src/test/abilities/gorilla_tactics.test.ts
index 8aee365eb8ff..000b93457f43 100644
--- a/src/test/abilities/gorilla_tactics.test.ts
+++ b/src/test/abilities/gorilla_tactics.test.ts
@@ -1,7 +1,7 @@
import { BattlerIndex } from "#app/battle";
-import { Moves } from "#app/enums/moves";
-import { Species } from "#app/enums/species";
-import { Stat } from "#app/enums/stat";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { Stat } from "#enums/stat";
import { Abilities } from "#enums/abilities";
import GameManager from "#test/utils/gameManager";
import Phaser from "phaser";
diff --git a/src/test/abilities/heatproof.test.ts b/src/test/abilities/heatproof.test.ts
index bf4e99ce4679..d85974419854 100644
--- a/src/test/abilities/heatproof.test.ts
+++ b/src/test/abilities/heatproof.test.ts
@@ -1,6 +1,6 @@
-import { Species } from "#app/enums/species";
-import { StatusEffect } from "#app/enums/status-effect";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { Species } from "#enums/species";
+import { StatusEffect } from "#enums/status-effect";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { toDmgValue } from "#app/utils";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
diff --git a/src/test/abilities/hustle.test.ts b/src/test/abilities/hustle.test.ts
index c4c4818040d1..53ebd1f8acee 100644
--- a/src/test/abilities/hustle.test.ts
+++ b/src/test/abilities/hustle.test.ts
@@ -1,6 +1,6 @@
import { allMoves } from "#app/data/move";
-import { Abilities } from "#app/enums/abilities";
-import { Stat } from "#app/enums/stat";
+import { Abilities } from "#enums/abilities";
+import { Stat } from "#enums/stat";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
diff --git a/src/test/abilities/ice_face.test.ts b/src/test/abilities/ice_face.test.ts
index 1c7f7bd6093b..ef53388d0573 100644
--- a/src/test/abilities/ice_face.test.ts
+++ b/src/test/abilities/ice_face.test.ts
@@ -1,9 +1,9 @@
import { BattlerIndex } from "#app/battle";
-import { MoveEffectPhase } from "#app/phases/move-effect-phase";
-import { MoveEndPhase } from "#app/phases/move-end-phase";
-import { QuietFormChangePhase } from "#app/phases/quiet-form-change-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
-import { TurnInitPhase } from "#app/phases/turn-init-phase";
+import { MoveEffectPhase } from "#phases/move-effect-phase";
+import { MoveEndPhase } from "#phases/move-end-phase";
+import { QuietFormChangePhase } from "#phases/quiet-form-change-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
+import { TurnInitPhase } from "#phases/turn-init-phase";
import { Abilities } from "#enums/abilities";
import { BattlerTagType } from "#enums/battler-tag-type";
import { Moves } from "#enums/moves";
diff --git a/src/test/abilities/illuminate.test.ts b/src/test/abilities/illuminate.test.ts
index 4f7d3d83b51e..e533e9b4296f 100644
--- a/src/test/abilities/illuminate.test.ts
+++ b/src/test/abilities/illuminate.test.ts
@@ -1,4 +1,4 @@
-import { Stat } from "#app/enums/stat";
+import { Stat } from "#enums/stat";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import GameManager from "#test/utils/gameManager";
diff --git a/src/test/abilities/imposter.test.ts b/src/test/abilities/imposter.test.ts
index b7b8e0c5ccab..999b7080932f 100644
--- a/src/test/abilities/imposter.test.ts
+++ b/src/test/abilities/imposter.test.ts
@@ -2,7 +2,7 @@ import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
import Phaser from "phaser";
import GameManager from "#app/test/utils/gameManager";
import { Species } from "#enums/species";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Moves } from "#enums/moves";
import { Stat, BATTLE_STATS, EFFECTIVE_STATS } from "#enums/stat";
import { Abilities } from "#enums/abilities";
diff --git a/src/test/abilities/intrepid_sword.test.ts b/src/test/abilities/intrepid_sword.test.ts
index 7bf0654276cc..f4c3c1d702a1 100644
--- a/src/test/abilities/intrepid_sword.test.ts
+++ b/src/test/abilities/intrepid_sword.test.ts
@@ -1,6 +1,6 @@
import { Stat } from "#enums/stat";
import GameManager from "#test/utils/gameManager";
-import { CommandPhase } from "#app/phases/command-phase";
+import { CommandPhase } from "#phases/command-phase";
import { Abilities } from "#enums/abilities";
import { Species } from "#enums/species";
import Phaser from "phaser";
diff --git a/src/test/abilities/libero.test.ts b/src/test/abilities/libero.test.ts
index aac1cb16d975..1ab573a93b7d 100644
--- a/src/test/abilities/libero.test.ts
+++ b/src/test/abilities/libero.test.ts
@@ -2,7 +2,7 @@ import { allMoves } from "#app/data/move";
import { Type } from "#app/data/type";
import { Weather, WeatherType } from "#app/data/weather";
import { PlayerPokemon } from "#app/field/pokemon";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Abilities } from "#enums/abilities";
import { BattlerTagType } from "#enums/battler-tag-type";
import { Biome } from "#enums/biome";
diff --git a/src/test/abilities/magic_guard.test.ts b/src/test/abilities/magic_guard.test.ts
index 614f983e76ed..295fc13e3222 100644
--- a/src/test/abilities/magic_guard.test.ts
+++ b/src/test/abilities/magic_guard.test.ts
@@ -1,7 +1,7 @@
import { ArenaTagSide, getArenaTag } from "#app/data/arena-tag";
import { StatusEffect, getStatusEffectCatchRateMultiplier } from "#app/data/status-effect";
import { WeatherType } from "#app/data/weather";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Abilities } from "#enums/abilities";
import { ArenaTagType } from "#enums/arena-tag-type";
import { BattlerTagType } from "#enums/battler-tag-type";
diff --git a/src/test/abilities/moxie.test.ts b/src/test/abilities/moxie.test.ts
index 5f337fedabb2..c3fec0699805 100644
--- a/src/test/abilities/moxie.test.ts
+++ b/src/test/abilities/moxie.test.ts
@@ -6,9 +6,9 @@ import { Species } from "#enums/species";
import Phaser from "phaser";
import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
import { BattlerIndex } from "#app/battle";
-import { EnemyCommandPhase } from "#app/phases/enemy-command-phase";
-import { VictoryPhase } from "#app/phases/victory-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { EnemyCommandPhase } from "#phases/enemy-command-phase";
+import { VictoryPhase } from "#phases/victory-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
describe("Abilities - Moxie", () => {
let phaserGame: Phaser.Game;
diff --git a/src/test/abilities/mycelium_might.test.ts b/src/test/abilities/mycelium_might.test.ts
index 0c8e7b5a7034..bfc3d6c35756 100644
--- a/src/test/abilities/mycelium_might.test.ts
+++ b/src/test/abilities/mycelium_might.test.ts
@@ -1,5 +1,5 @@
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
-import { TurnStartPhase } from "#app/phases/turn-start-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
+import { TurnStartPhase } from "#phases/turn-start-phase";
import GameManager from "#test/utils/gameManager";
import { Abilities } from "#enums/abilities";
import { Stat } from "#enums/stat";
diff --git a/src/test/abilities/no_guard.test.ts b/src/test/abilities/no_guard.test.ts
index b0b454dd5608..3868502bfcbe 100644
--- a/src/test/abilities/no_guard.test.ts
+++ b/src/test/abilities/no_guard.test.ts
@@ -1,6 +1,6 @@
import { BattlerIndex } from "#app/battle";
-import { MoveEffectPhase } from "#app/phases/move-effect-phase";
-import { MoveEndPhase } from "#app/phases/move-end-phase";
+import { MoveEffectPhase } from "#phases/move-effect-phase";
+import { MoveEndPhase } from "#phases/move-end-phase";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/abilities/parental_bond.test.ts b/src/test/abilities/parental_bond.test.ts
index 993a5eb83447..f19326a8fde2 100644
--- a/src/test/abilities/parental_bond.test.ts
+++ b/src/test/abilities/parental_bond.test.ts
@@ -1,7 +1,7 @@
import { Stat } from "#enums/stat";
import { StatusEffect } from "#app/data/status-effect";
import { Type } from "#app/data/type";
-import { BattlerTagType } from "#app/enums/battler-tag-type";
+import { BattlerTagType } from "#enums/battler-tag-type";
import { toDmgValue } from "#app/utils";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
diff --git a/src/test/abilities/pastel_veil.test.ts b/src/test/abilities/pastel_veil.test.ts
index 660ff2616e97..084609dce955 100644
--- a/src/test/abilities/pastel_veil.test.ts
+++ b/src/test/abilities/pastel_veil.test.ts
@@ -1,8 +1,8 @@
import { BattlerIndex } from "#app/battle";
import { StatusEffect } from "#app/data/status-effect";
-import { Abilities } from "#app/enums/abilities";
-import { CommandPhase } from "#app/phases/command-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { Abilities } from "#enums/abilities";
+import { CommandPhase } from "#phases/command-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
diff --git a/src/test/abilities/power_construct.test.ts b/src/test/abilities/power_construct.test.ts
index 1a9e7d4818a6..244f0ed9c1f4 100644
--- a/src/test/abilities/power_construct.test.ts
+++ b/src/test/abilities/power_construct.test.ts
@@ -1,6 +1,6 @@
import { Status, StatusEffect } from "#app/data/status-effect";
-import { QuietFormChangePhase } from "#app/phases/quiet-form-change-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { QuietFormChangePhase } from "#phases/quiet-form-change-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/abilities/power_spot.test.ts b/src/test/abilities/power_spot.test.ts
index a566c2277c34..ad705e1ff060 100644
--- a/src/test/abilities/power_spot.test.ts
+++ b/src/test/abilities/power_spot.test.ts
@@ -1,7 +1,7 @@
import { allMoves } from "#app/data/move";
-import { Abilities } from "#app/enums/abilities";
-import { MoveEffectPhase } from "#app/phases/move-effect-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { Abilities } from "#enums/abilities";
+import { MoveEffectPhase } from "#phases/move-effect-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
diff --git a/src/test/abilities/protean.test.ts b/src/test/abilities/protean.test.ts
index 5f86ec4c6e61..fbc7b80789d5 100644
--- a/src/test/abilities/protean.test.ts
+++ b/src/test/abilities/protean.test.ts
@@ -2,7 +2,7 @@ import { allMoves } from "#app/data/move";
import { Type } from "#app/data/type";
import { Weather, WeatherType } from "#app/data/weather";
import { PlayerPokemon } from "#app/field/pokemon";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Abilities } from "#enums/abilities";
import { BattlerTagType } from "#enums/battler-tag-type";
import { Biome } from "#enums/biome";
diff --git a/src/test/abilities/quick_draw.test.ts b/src/test/abilities/quick_draw.test.ts
index 4979152f4d61..8662c2f126c5 100644
--- a/src/test/abilities/quick_draw.test.ts
+++ b/src/test/abilities/quick_draw.test.ts
@@ -1,5 +1,5 @@
import { allAbilities, BypassSpeedChanceAbAttr } from "#app/data/ability";
-import { FaintPhase } from "#app/phases/faint-phase";
+import { FaintPhase } from "#phases/faint-phase";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/abilities/sand_spit.test.ts b/src/test/abilities/sand_spit.test.ts
index 1c21cff3c148..5d815a5888c5 100644
--- a/src/test/abilities/sand_spit.test.ts
+++ b/src/test/abilities/sand_spit.test.ts
@@ -1,4 +1,4 @@
-import { WeatherType } from "#app/enums/weather-type";
+import { WeatherType } from "#enums/weather-type";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/abilities/sand_veil.test.ts b/src/test/abilities/sand_veil.test.ts
index c62357f17af7..273c6e16e6ba 100644
--- a/src/test/abilities/sand_veil.test.ts
+++ b/src/test/abilities/sand_veil.test.ts
@@ -1,9 +1,9 @@
import { StatMultiplierAbAttr, allAbilities } from "#app/data/ability";
import { Stat } from "#enums/stat";
import { WeatherType } from "#app/data/weather";
-import { CommandPhase } from "#app/phases/command-phase";
-import { MoveEffectPhase } from "#app/phases/move-effect-phase";
-import { MoveEndPhase } from "#app/phases/move-end-phase";
+import { CommandPhase } from "#phases/command-phase";
+import { MoveEffectPhase } from "#phases/move-effect-phase";
+import { MoveEndPhase } from "#phases/move-end-phase";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/abilities/sap_sipper.test.ts b/src/test/abilities/sap_sipper.test.ts
index a4ce0c1b8f66..af48da971324 100644
--- a/src/test/abilities/sap_sipper.test.ts
+++ b/src/test/abilities/sap_sipper.test.ts
@@ -1,7 +1,7 @@
import { Stat } from "#enums/stat";
import { TerrainType } from "#app/data/terrain";
-import { MoveEndPhase } from "#app/phases/move-end-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { MoveEndPhase } from "#phases/move-end-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Abilities } from "#enums/abilities";
import { BattlerTagType } from "#enums/battler-tag-type";
import { Moves } from "#enums/moves";
diff --git a/src/test/abilities/schooling.test.ts b/src/test/abilities/schooling.test.ts
index aacc7bbd4c20..4f5e67909521 100644
--- a/src/test/abilities/schooling.test.ts
+++ b/src/test/abilities/schooling.test.ts
@@ -1,6 +1,6 @@
import { Status, StatusEffect } from "#app/data/status-effect";
-import { QuietFormChangePhase } from "#app/phases/quiet-form-change-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { QuietFormChangePhase } from "#phases/quiet-form-change-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/abilities/screen_cleaner.test.ts b/src/test/abilities/screen_cleaner.test.ts
index c036aa90a774..9310c9c14d38 100644
--- a/src/test/abilities/screen_cleaner.test.ts
+++ b/src/test/abilities/screen_cleaner.test.ts
@@ -1,6 +1,6 @@
-import { ArenaTagType } from "#app/enums/arena-tag-type";
-import { PostSummonPhase } from "#app/phases/post-summon-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { ArenaTagType } from "#enums/arena-tag-type";
+import { PostSummonPhase } from "#phases/post-summon-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/abilities/serene_grace.test.ts b/src/test/abilities/serene_grace.test.ts
index 3155594c81db..9d7e10963326 100644
--- a/src/test/abilities/serene_grace.test.ts
+++ b/src/test/abilities/serene_grace.test.ts
@@ -1,8 +1,8 @@
import { BattlerIndex } from "#app/battle";
import { applyAbAttrs, MoveEffectChanceMultiplierAbAttr } from "#app/data/ability";
import { Stat } from "#enums/stat";
-import { MoveEffectPhase } from "#app/phases/move-effect-phase";
-import * as Utils from "#app/utils";
+import { MoveEffectPhase } from "#phases/move-effect-phase";
+import { NumberHolder } from "#app/utils";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
@@ -55,7 +55,7 @@ describe("Abilities - Serene Grace", () => {
const move = phase.move.getMove();
expect(move.id).toBe(Moves.AIR_SLASH);
- const chance = new Utils.IntegerHolder(move.chance);
+ const chance = new NumberHolder(move.chance);
console.log(move.chance + " Their ability is " + phase.getUserPokemon()!.getAbility().name);
applyAbAttrs(MoveEffectChanceMultiplierAbAttr, phase.getUserPokemon()!, null, false, chance, move, phase.getTarget(), false);
expect(chance.value).toBe(30);
@@ -82,7 +82,7 @@ describe("Abilities - Serene Grace", () => {
const move = phase.move.getMove();
expect(move.id).toBe(Moves.AIR_SLASH);
- const chance = new Utils.IntegerHolder(move.chance);
+ const chance = new NumberHolder(move.chance);
applyAbAttrs(MoveEffectChanceMultiplierAbAttr, phase.getUserPokemon()!, null, false, chance, move, phase.getTarget(), false);
expect(chance.value).toBe(60);
diff --git a/src/test/abilities/sheer_force.test.ts b/src/test/abilities/sheer_force.test.ts
index a2600476d6dc..34a42e66a255 100644
--- a/src/test/abilities/sheer_force.test.ts
+++ b/src/test/abilities/sheer_force.test.ts
@@ -1,8 +1,8 @@
import { BattlerIndex } from "#app/battle";
import { applyAbAttrs, applyPostDefendAbAttrs, applyPreAttackAbAttrs, MoveEffectChanceMultiplierAbAttr, MovePowerBoostAbAttr, PostDefendTypeChangeAbAttr } from "#app/data/ability";
import { Stat } from "#enums/stat";
-import { MoveEffectPhase } from "#app/phases/move-effect-phase";
-import * as Utils from "#app/utils";
+import { MoveEffectPhase } from "#phases/move-effect-phase";
+import { NumberHolder } from "#app/utils";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
@@ -57,8 +57,8 @@ describe("Abilities - Sheer Force", () => {
expect(move.id).toBe(Moves.AIR_SLASH);
//Verify the move is boosted and has no chance of secondary effects
- const power = new Utils.IntegerHolder(move.power);
- const chance = new Utils.IntegerHolder(move.chance);
+ const power = new NumberHolder(move.power);
+ const chance = new NumberHolder(move.chance);
applyAbAttrs(MoveEffectChanceMultiplierAbAttr, phase.getUserPokemon()!, null, false, chance, move, phase.getTarget(), false);
applyPreAttackAbAttrs(MovePowerBoostAbAttr, phase.getUserPokemon()!, phase.getTarget()!, move, false, power);
@@ -90,8 +90,8 @@ describe("Abilities - Sheer Force", () => {
expect(move.id).toBe(Moves.BIND);
//Binding moves and other exceptions are not affected by Sheer Force and have a chance.value of -1
- const power = new Utils.IntegerHolder(move.power);
- const chance = new Utils.IntegerHolder(move.chance);
+ const power = new NumberHolder(move.power);
+ const chance = new NumberHolder(move.chance);
applyAbAttrs(MoveEffectChanceMultiplierAbAttr, phase.getUserPokemon()!, null, false, chance, move, phase.getTarget(), false);
applyPreAttackAbAttrs(MovePowerBoostAbAttr, phase.getUserPokemon()!, phase.getTarget()!, move, false, power);
@@ -123,8 +123,8 @@ describe("Abilities - Sheer Force", () => {
expect(move.id).toBe(Moves.TACKLE);
//Binding moves and other exceptions are not affected by Sheer Force and have a chance.value of -1
- const power = new Utils.IntegerHolder(move.power);
- const chance = new Utils.IntegerHolder(move.chance);
+ const power = new NumberHolder(move.power);
+ const chance = new NumberHolder(move.chance);
applyAbAttrs(MoveEffectChanceMultiplierAbAttr, phase.getUserPokemon()!, null, false, chance, move, phase.getTarget(), false);
applyPreAttackAbAttrs(MovePowerBoostAbAttr, phase.getUserPokemon()!, phase.getTarget()!, move, false, power);
@@ -158,8 +158,8 @@ describe("Abilities - Sheer Force", () => {
expect(move.id).toBe(Moves.CRUSH_CLAW);
//Disable color change due to being hit by Sheer Force
- const power = new Utils.IntegerHolder(move.power);
- const chance = new Utils.IntegerHolder(move.chance);
+ const power = new NumberHolder(move.power);
+ const chance = new NumberHolder(move.chance);
const user = phase.getUserPokemon()!;
const target = phase.getTarget()!;
const opponentType = target.getTypes()[0];
diff --git a/src/test/abilities/shield_dust.test.ts b/src/test/abilities/shield_dust.test.ts
index 0f831fcf3fa6..3616b9c36e8d 100644
--- a/src/test/abilities/shield_dust.test.ts
+++ b/src/test/abilities/shield_dust.test.ts
@@ -1,8 +1,8 @@
import { BattlerIndex } from "#app/battle";
import { applyAbAttrs, applyPreDefendAbAttrs, IgnoreMoveEffectsAbAttr, MoveEffectChanceMultiplierAbAttr } from "#app/data/ability";
import { Stat } from "#enums/stat";
-import { MoveEffectPhase } from "#app/phases/move-effect-phase";
-import * as Utils from "#app/utils";
+import { MoveEffectPhase } from "#phases/move-effect-phase";
+import { NumberHolder } from "#app/utils";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
@@ -56,7 +56,7 @@ describe("Abilities - Shield Dust", () => {
const move = phase.move.getMove();
expect(move.id).toBe(Moves.AIR_SLASH);
- const chance = new Utils.IntegerHolder(move.chance);
+ const chance = new NumberHolder(move.chance);
applyAbAttrs(MoveEffectChanceMultiplierAbAttr, phase.getUserPokemon()!, null, false, chance, move, phase.getTarget(), false);
applyPreDefendAbAttrs(IgnoreMoveEffectsAbAttr, phase.getTarget()!, phase.getUserPokemon()!, null, null, false, chance);
expect(chance.value).toBe(0);
diff --git a/src/test/abilities/shields_down.test.ts b/src/test/abilities/shields_down.test.ts
index d3d72ac80a57..e21cdf95b28d 100644
--- a/src/test/abilities/shields_down.test.ts
+++ b/src/test/abilities/shields_down.test.ts
@@ -1,6 +1,6 @@
import { Status, StatusEffect } from "#app/data/status-effect";
-import { QuietFormChangePhase } from "#app/phases/quiet-form-change-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { QuietFormChangePhase } from "#phases/quiet-form-change-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/abilities/simple.test.ts b/src/test/abilities/simple.test.ts
index e5ca474d7c34..866b6751d6a2 100644
--- a/src/test/abilities/simple.test.ts
+++ b/src/test/abilities/simple.test.ts
@@ -1,4 +1,4 @@
-import { Moves } from "#app/enums/moves";
+import { Moves } from "#enums/moves";
import { Abilities } from "#enums/abilities";
import { Species } from "#enums/species";
import { Stat } from "#enums/stat";
diff --git a/src/test/abilities/stall.test.ts b/src/test/abilities/stall.test.ts
index b51c56dbe1f8..956c014cf8dd 100644
--- a/src/test/abilities/stall.test.ts
+++ b/src/test/abilities/stall.test.ts
@@ -4,7 +4,7 @@ import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
import Phaser from "phaser";
import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-import { TurnStartPhase } from "#app/phases/turn-start-phase";
+import { TurnStartPhase } from "#phases/turn-start-phase";
describe("Abilities - Stall", () => {
let phaserGame: Phaser.Game;
diff --git a/src/test/abilities/steely_spirit.test.ts b/src/test/abilities/steely_spirit.test.ts
index 61e76989060e..82f54da128ee 100644
--- a/src/test/abilities/steely_spirit.test.ts
+++ b/src/test/abilities/steely_spirit.test.ts
@@ -1,6 +1,6 @@
import { allAbilities } from "#app/data/ability";
import { allMoves } from "#app/data/move";
-import { Abilities } from "#app/enums/abilities";
+import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
diff --git a/src/test/abilities/sturdy.test.ts b/src/test/abilities/sturdy.test.ts
index 49384e69f83e..d6c4039e24e1 100644
--- a/src/test/abilities/sturdy.test.ts
+++ b/src/test/abilities/sturdy.test.ts
@@ -1,6 +1,6 @@
import { EnemyPokemon } from "#app/field/pokemon";
-import { DamagePhase } from "#app/phases/damage-phase";
-import { MoveEndPhase } from "#app/phases/move-end-phase";
+import { DamagePhase } from "#phases/damage-phase";
+import { MoveEndPhase } from "#phases/move-end-phase";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/abilities/sweet_veil.test.ts b/src/test/abilities/sweet_veil.test.ts
index ef66cb1c68ad..2abbbc791cb1 100644
--- a/src/test/abilities/sweet_veil.test.ts
+++ b/src/test/abilities/sweet_veil.test.ts
@@ -1,8 +1,8 @@
import { BattlerIndex } from "#app/battle";
-import { Abilities } from "#app/enums/abilities";
-import { BattlerTagType } from "#app/enums/battler-tag-type";
-import { CommandPhase } from "#app/phases/command-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { Abilities } from "#enums/abilities";
+import { BattlerTagType } from "#enums/battler-tag-type";
+import { CommandPhase } from "#phases/command-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
diff --git a/src/test/abilities/tera_shell.test.ts b/src/test/abilities/tera_shell.test.ts
index 01382d0fd9a1..34f8f8b64d90 100644
--- a/src/test/abilities/tera_shell.test.ts
+++ b/src/test/abilities/tera_shell.test.ts
@@ -1,7 +1,7 @@
import { BattlerIndex } from "#app/battle";
-import { Abilities } from "#app/enums/abilities";
-import { Moves } from "#app/enums/moves";
-import { Species } from "#app/enums/species";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
import { HitResult } from "#app/field/pokemon";
import GameManager from "#test/utils/gameManager";
import Phaser from "phaser";
diff --git a/src/test/abilities/unseen_fist.test.ts b/src/test/abilities/unseen_fist.test.ts
index f8fa8a723fe2..2a2a021aa117 100644
--- a/src/test/abilities/unseen_fist.test.ts
+++ b/src/test/abilities/unseen_fist.test.ts
@@ -1,12 +1,12 @@
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
import Phaser from "phaser";
import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-import { BattlerTagType } from "#app/enums/battler-tag-type";
-import { BerryPhase } from "#app/phases/berry-phase";
+import { BattlerTagType } from "#enums/battler-tag-type";
+import { BerryPhase } from "#phases/berry-phase";
describe("Abilities - Unseen Fist", () => {
diff --git a/src/test/abilities/volt_absorb.test.ts b/src/test/abilities/volt_absorb.test.ts
index ec82b00ec5ac..b4bc44ada90e 100644
--- a/src/test/abilities/volt_absorb.test.ts
+++ b/src/test/abilities/volt_absorb.test.ts
@@ -1,5 +1,5 @@
import { Stat } from "#enums/stat";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Abilities } from "#enums/abilities";
import { BattlerTagType } from "#enums/battler-tag-type";
import { Moves } from "#enums/moves";
diff --git a/src/test/abilities/wind_power.test.ts b/src/test/abilities/wind_power.test.ts
index 538b65f898b9..b98267842719 100644
--- a/src/test/abilities/wind_power.test.ts
+++ b/src/test/abilities/wind_power.test.ts
@@ -1,5 +1,5 @@
-import { BattlerTagType } from "#app/enums/battler-tag-type";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { BattlerTagType } from "#enums/battler-tag-type";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/abilities/wonder_skin.test.ts b/src/test/abilities/wonder_skin.test.ts
index 6b25701e36ae..5f63dee95747 100644
--- a/src/test/abilities/wonder_skin.test.ts
+++ b/src/test/abilities/wonder_skin.test.ts
@@ -1,6 +1,6 @@
import { allAbilities } from "#app/data/ability";
import { allMoves } from "#app/data/move";
-import { MoveEffectPhase } from "#app/phases/move-effect-phase";
+import { MoveEffectPhase } from "#phases/move-effect-phase";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/abilities/zen_mode.test.ts b/src/test/abilities/zen_mode.test.ts
index 2601954a9a49..aedcc1160847 100644
--- a/src/test/abilities/zen_mode.test.ts
+++ b/src/test/abilities/zen_mode.test.ts
@@ -1,15 +1,15 @@
import { Stat } from "#enums/stat";
import { BattlerIndex } from "#app/battle";
-import { DamagePhase } from "#app/phases/damage-phase";
-import { EnemyCommandPhase } from "#app/phases/enemy-command-phase";
-import { MessagePhase } from "#app/phases/message-phase";
-import { PostSummonPhase } from "#app/phases/post-summon-phase";
-import { QuietFormChangePhase } from "#app/phases/quiet-form-change-phase";
-import { SwitchPhase } from "#app/phases/switch-phase";
-import { SwitchSummonPhase } from "#app/phases/switch-summon-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
-import { TurnInitPhase } from "#app/phases/turn-init-phase";
-import { TurnStartPhase } from "#app/phases/turn-start-phase";
+import { DamagePhase } from "#phases/damage-phase";
+import { EnemyCommandPhase } from "#phases/enemy-command-phase";
+import { MessagePhase } from "#phases/message-phase";
+import { PostSummonPhase } from "#phases/post-summon-phase";
+import { QuietFormChangePhase } from "#phases/quiet-form-change-phase";
+import { SwitchPhase } from "#phases/switch-phase";
+import { SwitchSummonPhase } from "#phases/switch-summon-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
+import { TurnInitPhase } from "#phases/turn-init-phase";
+import { TurnStartPhase } from "#phases/turn-start-phase";
import { Mode } from "#app/ui/ui";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
diff --git a/src/test/abilities/zero_to_hero.test.ts b/src/test/abilities/zero_to_hero.test.ts
index 48a451e99a20..b85b9b8731b6 100644
--- a/src/test/abilities/zero_to_hero.test.ts
+++ b/src/test/abilities/zero_to_hero.test.ts
@@ -1,6 +1,6 @@
import { Status, StatusEffect } from "#app/data/status-effect";
-import { QuietFormChangePhase } from "#app/phases/quiet-form-change-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { QuietFormChangePhase } from "#phases/quiet-form-change-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/account.test.ts b/src/test/account.test.ts
index 8c36f2cd9536..5cdd4a5e1b76 100644
--- a/src/test/account.test.ts
+++ b/src/test/account.test.ts
@@ -1,7 +1,7 @@
import * as battleScene from "#app/battle-scene";
import { describe, expect, it, vi } from "vitest";
-import { initLoggedInUser, loggedInUser, updateUserInfo } from "../account";
-import * as utils from "../utils";
+import { initLoggedInUser, loggedInUser, updateUserInfo } from "#app/account";
+import * as utils from "#app/utils";
describe("account", () => {
describe("initLoggedInUser", () => {
diff --git a/src/test/arena/arena_gravity.test.ts b/src/test/arena/arena_gravity.test.ts
index b69828965718..85183bcf1c8c 100644
--- a/src/test/arena/arena_gravity.test.ts
+++ b/src/test/arena/arena_gravity.test.ts
@@ -1,8 +1,8 @@
import { allMoves } from "#app/data/move";
-import { Abilities } from "#app/enums/abilities";
-import { ArenaTagType } from "#app/enums/arena-tag-type";
-import { MoveEffectPhase } from "#app/phases/move-effect-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { Abilities } from "#enums/abilities";
+import { ArenaTagType } from "#enums/arena-tag-type";
+import { MoveEffectPhase } from "#phases/move-effect-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
diff --git a/src/test/arena/weather_fog.test.ts b/src/test/arena/weather_fog.test.ts
index db591dda2b82..87f4ce963d6a 100644
--- a/src/test/arena/weather_fog.test.ts
+++ b/src/test/arena/weather_fog.test.ts
@@ -1,7 +1,7 @@
import { allMoves } from "#app/data/move";
import { WeatherType } from "#app/data/weather";
-import { Abilities } from "#app/enums/abilities";
-import { MoveEffectPhase } from "#app/phases/move-effect-phase";
+import { Abilities } from "#enums/abilities";
+import { MoveEffectPhase } from "#phases/move-effect-phase";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
diff --git a/src/test/arena/weather_sandstorm.test.ts b/src/test/arena/weather_sandstorm.test.ts
index 09d0c1d2b772..cc9a5f68cef1 100644
--- a/src/test/arena/weather_sandstorm.test.ts
+++ b/src/test/arena/weather_sandstorm.test.ts
@@ -1,6 +1,6 @@
import { WeatherType } from "#app/data/weather";
-import { Abilities } from "#app/enums/abilities";
-import { Stat } from "#app/enums/stat";
+import { Abilities } from "#enums/abilities";
+import { Stat } from "#enums/stat";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
diff --git a/src/test/arena/weather_strong_winds.test.ts b/src/test/arena/weather_strong_winds.test.ts
index 557de93d644c..8c36bb04711d 100644
--- a/src/test/arena/weather_strong_winds.test.ts
+++ b/src/test/arena/weather_strong_winds.test.ts
@@ -1,6 +1,6 @@
import { allMoves } from "#app/data/move";
-import { StatusEffect } from "#app/enums/status-effect";
-import { TurnStartPhase } from "#app/phases/turn-start-phase";
+import { StatusEffect } from "#enums/status-effect";
+import { TurnStartPhase } from "#phases/turn-start-phase";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/battle/battle-order.test.ts b/src/test/battle/battle-order.test.ts
index d4e9950dec9a..f59828016925 100644
--- a/src/test/battle/battle-order.test.ts
+++ b/src/test/battle/battle-order.test.ts
@@ -1,6 +1,6 @@
-import { EnemyCommandPhase } from "#app/phases/enemy-command-phase";
-import { SelectTargetPhase } from "#app/phases/select-target-phase";
-import { TurnStartPhase } from "#app/phases/turn-start-phase";
+import { EnemyCommandPhase } from "#phases/enemy-command-phase";
+import { SelectTargetPhase } from "#phases/select-target-phase";
+import { TurnStartPhase } from "#phases/turn-start-phase";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/battle/battle.test.ts b/src/test/battle/battle.test.ts
index eed76397f85a..f369874754dd 100644
--- a/src/test/battle/battle.test.ts
+++ b/src/test/battle/battle.test.ts
@@ -1,21 +1,21 @@
import { allSpecies } from "#app/data/pokemon-species";
import { Stat } from "#enums/stat";
import { GameModes, getGameMode } from "#app/game-mode";
-import { BattleEndPhase } from "#app/phases/battle-end-phase";
-import { CommandPhase } from "#app/phases/command-phase";
-import { DamagePhase } from "#app/phases/damage-phase";
-import { EncounterPhase } from "#app/phases/encounter-phase";
-import { EnemyCommandPhase } from "#app/phases/enemy-command-phase";
-import { LoginPhase } from "#app/phases/login-phase";
-import { NextEncounterPhase } from "#app/phases/next-encounter-phase";
-import { SelectGenderPhase } from "#app/phases/select-gender-phase";
-import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
-import { SelectStarterPhase } from "#app/phases/select-starter-phase";
-import { SummonPhase } from "#app/phases/summon-phase";
-import { SwitchPhase } from "#app/phases/switch-phase";
-import { TitlePhase } from "#app/phases/title-phase";
-import { TurnInitPhase } from "#app/phases/turn-init-phase";
-import { VictoryPhase } from "#app/phases/victory-phase";
+import { BattleEndPhase } from "#phases/battle-end-phase";
+import { CommandPhase } from "#phases/command-phase";
+import { DamagePhase } from "#phases/damage-phase";
+import { EncounterPhase } from "#phases/encounter-phase";
+import { EnemyCommandPhase } from "#phases/enemy-command-phase";
+import { LoginPhase } from "#phases/login-phase";
+import { NextEncounterPhase } from "#phases/next-encounter-phase";
+import { SelectGenderPhase } from "#phases/select-gender-phase";
+import { SelectModifierPhase } from "#phases/select-modifier-phase";
+import { SelectStarterPhase } from "#phases/select-starter-phase";
+import { SummonPhase } from "#phases/summon-phase";
+import { SwitchPhase } from "#phases/switch-phase";
+import { TitlePhase } from "#phases/title-phase";
+import { TurnInitPhase } from "#phases/turn-init-phase";
+import { VictoryPhase } from "#phases/victory-phase";
import GameManager from "#app/test/utils/gameManager";
import { generateStarter } from "#app/test/utils/gameManagerUtils";
import { Mode } from "#app/ui/ui";
@@ -25,7 +25,7 @@ import { PlayerGender } from "#enums/player-gender";
import { Species } from "#enums/species";
import Phaser from "phaser";
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import { Biome } from "#app/enums/biome";
+import { Biome } from "#enums/biome";
describe("Test Battle Phase", () => {
let phaserGame: Phaser.Game;
diff --git a/src/test/battle/double_battle.test.ts b/src/test/battle/double_battle.test.ts
index b7a5616d642e..f3531b5e919d 100644
--- a/src/test/battle/double_battle.test.ts
+++ b/src/test/battle/double_battle.test.ts
@@ -1,6 +1,6 @@
import { Status, StatusEffect } from "#app/data/status-effect";
-import { BattleEndPhase } from "#app/phases/battle-end-phase";
-import { TurnInitPhase } from "#app/phases/turn-init-phase";
+import { BattleEndPhase } from "#phases/battle-end-phase";
+import { TurnInitPhase } from "#phases/turn-init-phase";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
diff --git a/src/test/battle/special_battle.test.ts b/src/test/battle/special_battle.test.ts
index af9e3dddbec8..0be0a0682a7f 100644
--- a/src/test/battle/special_battle.test.ts
+++ b/src/test/battle/special_battle.test.ts
@@ -1,4 +1,4 @@
-import { CommandPhase } from "#app/phases/command-phase";
+import { CommandPhase } from "#phases/command-phase";
import { Mode } from "#app/ui/ui";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
diff --git a/src/test/battlerTags/octolock.test.ts b/src/test/battlerTags/octolock.test.ts
index ebd92dc64016..ad2ead14966e 100644
--- a/src/test/battlerTags/octolock.test.ts
+++ b/src/test/battlerTags/octolock.test.ts
@@ -2,8 +2,8 @@ import BattleScene from "#app/battle-scene";
import { describe, expect, it, vi } from "vitest";
import Pokemon from "#app/field/pokemon";
import { BattlerTag, BattlerTagLapseType, OctolockTag, TrappedTag } from "#app/data/battler-tags";
-import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
-import { BattlerTagType } from "#app/enums/battler-tag-type";
+import { StatStageChangePhase } from "#phases/stat-stage-change-phase";
+import { BattlerTagType } from "#enums/battler-tag-type";
import { Stat } from "#enums/stat";
vi.mock("#app/battle-scene.js");
diff --git a/src/test/battlerTags/stockpiling.test.ts b/src/test/battlerTags/stockpiling.test.ts
index dab189853c57..af7937111b4d 100644
--- a/src/test/battlerTags/stockpiling.test.ts
+++ b/src/test/battlerTags/stockpiling.test.ts
@@ -4,7 +4,7 @@ import Pokemon, { PokemonSummonData } from "#app/field/pokemon";
import { StockpilingTag } from "#app/data/battler-tags";
import { Stat } from "#enums/stat";
import * as messages from "#app/messages";
-import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
+import { StatStageChangePhase } from "#phases/stat-stage-change-phase";
beforeEach(() => {
vi.spyOn(messages, "getPokemonNameWithAffix").mockImplementation(() => "");
diff --git a/src/test/battlerTags/substitute.test.ts b/src/test/battlerTags/substitute.test.ts
index af0aa63af89b..bb0525e252a2 100644
--- a/src/test/battlerTags/substitute.test.ts
+++ b/src/test/battlerTags/substitute.test.ts
@@ -2,11 +2,11 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
import Pokemon, { MoveResult, PokemonTurnData, TurnMove, PokemonMove } from "#app/field/pokemon";
import BattleScene from "#app/battle-scene";
import { BattlerTagLapseType, BindTag, SubstituteTag } from "#app/data/battler-tags";
-import { Moves } from "#app/enums/moves";
-import { PokemonAnimType } from "#app/enums/pokemon-anim-type";
+import { Moves } from "#enums/moves";
+import { PokemonAnimType } from "#enums/pokemon-anim-type";
import * as messages from "#app/messages";
import { allMoves } from "#app/data/move";
-import { MoveEffectPhase } from "#app/phases/move-effect-phase";
+import { MoveEffectPhase } from "#phases/move-effect-phase";
vi.mock("#app/battle-scene.js");
diff --git a/src/test/boss-pokemon.test.ts b/src/test/boss-pokemon.test.ts
index 840b65f3cc67..81df4b4c2723 100644
--- a/src/test/boss-pokemon.test.ts
+++ b/src/test/boss-pokemon.test.ts
@@ -1,10 +1,10 @@
import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
import GameManager from "./utils/gameManager";
-import { Species } from "#app/enums/species";
+import { Species } from "#enums/species";
import { getPokemonSpecies } from "#app/data/pokemon-species";
-import { Abilities } from "#app/enums/abilities";
-import { Moves } from "#app/enums/moves";
-import { EFFECTIVE_STATS } from "#app/enums/stat";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { EFFECTIVE_STATS } from "#enums/stat";
import { EnemyPokemon } from "#app/field/pokemon";
import { toDmgValue } from "#app/utils";
diff --git a/src/test/daily_mode.test.ts b/src/test/daily_mode.test.ts
index 100cf07f9c0b..81633a256ef2 100644
--- a/src/test/daily_mode.test.ts
+++ b/src/test/daily_mode.test.ts
@@ -1,8 +1,8 @@
import { MapModifier } from "#app/modifier/modifier";
import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
import GameManager from "./utils/gameManager";
-import { Moves } from "#app/enums/moves";
-import { Biome } from "#app/enums/biome";
+import { Moves } from "#enums/moves";
+import { Biome } from "#enums/biome";
import { Mode } from "#app/ui/ui";
import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
import { Species } from "#enums/species";
diff --git a/src/test/eggs/egg.test.ts b/src/test/eggs/egg.test.ts
index 6f57af63e6bc..69aed6033cf8 100644
--- a/src/test/eggs/egg.test.ts
+++ b/src/test/eggs/egg.test.ts
@@ -1,7 +1,7 @@
import { Egg, getLegendaryGachaSpeciesForTimestamp } from "#app/data/egg";
-import { EggSourceType } from "#app/enums/egg-source-types";
-import { EggTier } from "#app/enums/egg-type";
-import { VariantTier } from "#app/enums/variant-tier";
+import { EggSourceType } from "#enums/egg-source-types";
+import { EggTier } from "#enums/egg-type";
+import { VariantTier } from "#enums/variant-tier";
import EggData from "#app/system/egg-data";
import * as Utils from "#app/utils";
import { Species } from "#enums/species";
diff --git a/src/test/eggs/manaphy-egg.test.ts b/src/test/eggs/manaphy-egg.test.ts
index 3b2c40ae84a9..158bfe502f3e 100644
--- a/src/test/eggs/manaphy-egg.test.ts
+++ b/src/test/eggs/manaphy-egg.test.ts
@@ -1,6 +1,6 @@
import { Egg } from "#app/data/egg";
-import { EggSourceType } from "#app/enums/egg-source-types";
-import { EggTier } from "#app/enums/egg-type";
+import { EggSourceType } from "#enums/egg-source-types";
+import { EggTier } from "#enums/egg-type";
import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
import Phaser from "phaser";
diff --git a/src/test/endless_boss.test.ts b/src/test/endless_boss.test.ts
index c9f3afc3936d..9cf483d3ba75 100644
--- a/src/test/endless_boss.test.ts
+++ b/src/test/endless_boss.test.ts
@@ -1,5 +1,5 @@
-import { Biome } from "#app/enums/biome";
-import { Species } from "#app/enums/species";
+import { Biome } from "#enums/biome";
+import { Species } from "#enums/species";
import { GameModes } from "#app/game-mode";
import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
import GameManager from "./utils/gameManager";
diff --git a/src/test/enemy_command.test.ts b/src/test/enemy_command.test.ts
index 49419f5b34d6..b4b4a4170224 100644
--- a/src/test/enemy_command.test.ts
+++ b/src/test/enemy_command.test.ts
@@ -1,7 +1,7 @@
import { allMoves, MoveCategory } from "#app/data/move";
-import { Abilities } from "#app/enums/abilities";
-import { Moves } from "#app/enums/moves";
-import { Species } from "#app/enums/species";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
import { AiType, EnemyPokemon } from "#app/field/pokemon";
import { randSeedInt } from "#app/utils";
import GameManager from "#test/utils/gameManager";
diff --git a/src/test/escape-calculations.test.ts b/src/test/escape-calculations.test.ts
index cc18fd780660..7990b8a63801 100644
--- a/src/test/escape-calculations.test.ts
+++ b/src/test/escape-calculations.test.ts
@@ -1,7 +1,7 @@
-import { AttemptRunPhase } from "#app/phases/attempt-run-phase";
-import { CommandPhase } from "#app/phases/command-phase";
+import { AttemptRunPhase } from "#phases/attempt-run-phase";
+import { CommandPhase } from "#phases/command-phase";
import { Command } from "#app/ui/command-ui-handler";
-import * as Utils from "#app/utils";
+import { NumberHolder } from "#app/utils";
import { Abilities } from "#enums/abilities";
import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
@@ -45,7 +45,7 @@ describe("Escape chance calculations", () => {
await game.phaseInterceptor.to(AttemptRunPhase, false);
const phase = game.scene.getCurrentPhase() as AttemptRunPhase;
- const escapePercentage = new Utils.NumberHolder(0);
+ const escapePercentage = new NumberHolder(0);
// this sets up an object for multiple attempts. The pokemonSpeedRatio is your speed divided by the enemy speed, the escapeAttempts are the number of escape attempts and the expectedEscapeChance is the chance it should be escaping
const escapeChances: { pokemonSpeedRatio: number, escapeAttempts: number, expectedEscapeChance: number }[] = [
@@ -107,7 +107,7 @@ describe("Escape chance calculations", () => {
await game.phaseInterceptor.to(AttemptRunPhase, false);
const phase = game.scene.getCurrentPhase() as AttemptRunPhase;
- const escapePercentage = new Utils.NumberHolder(0);
+ const escapePercentage = new NumberHolder(0);
// this sets up an object for multiple attempts. The pokemonSpeedRatio is your speed divided by the enemy speed, the escapeAttempts are the number of escape attempts and the expectedEscapeChance is the chance it should be escaping
const escapeChances: { pokemonSpeedRatio: number, escapeAttempts: number, expectedEscapeChance: number }[] = [
@@ -167,7 +167,7 @@ describe("Escape chance calculations", () => {
await game.phaseInterceptor.to(AttemptRunPhase, false);
const phase = game.scene.getCurrentPhase() as AttemptRunPhase;
- const escapePercentage = new Utils.NumberHolder(0);
+ const escapePercentage = new NumberHolder(0);
// this sets up an object for multiple attempts. The pokemonSpeedRatio is your speed divided by the enemy speed, the escapeAttempts are the number of escape attempts and the expectedEscapeChance is the chance it should be escaping
const escapeChances: { pokemonSpeedRatio: number, escapeAttempts: number, expectedEscapeChance: number }[] = [
@@ -244,7 +244,7 @@ describe("Escape chance calculations", () => {
await game.phaseInterceptor.to(AttemptRunPhase, false);
const phase = game.scene.getCurrentPhase() as AttemptRunPhase;
- const escapePercentage = new Utils.NumberHolder(0);
+ const escapePercentage = new NumberHolder(0);
// this sets up an object for multiple attempts. The pokemonSpeedRatio is your speed divided by the enemy speed, the escapeAttempts are the number of escape attempts and the expectedEscapeChance is the chance it should be escaping
const escapeChances: { pokemonSpeedRatio: number, escapeAttempts: number, expectedEscapeChance: number }[] = [
diff --git a/src/test/evolution.test.ts b/src/test/evolution.test.ts
index b94d45d65372..6c77c6e3aca0 100644
--- a/src/test/evolution.test.ts
+++ b/src/test/evolution.test.ts
@@ -1,7 +1,7 @@
-import { pokemonEvolutions, SpeciesFormEvolution, SpeciesWildEvolutionDelay } from "#app/data/balance/pokemon-evolutions";
-import { Abilities } from "#app/enums/abilities";
-import { Moves } from "#app/enums/moves";
-import { Species } from "#app/enums/species";
+import { pokemonEvolutions, SpeciesFormEvolution, SpeciesWildEvolutionDelay } from "#balance/pokemon-evolutions";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
import * as Utils from "#app/utils";
import GameManager from "#test/utils/gameManager";
import Phaser from "phaser";
diff --git a/src/test/field/pokemon.test.ts b/src/test/field/pokemon.test.ts
index aeaecab5874a..ce10395a6156 100644
--- a/src/test/field/pokemon.test.ts
+++ b/src/test/field/pokemon.test.ts
@@ -1,9 +1,9 @@
-import { Species } from "#app/enums/species";
+import { Species } from "#enums/species";
import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
import GameManager from "../utils/gameManager";
-import { PokeballType } from "#app/enums/pokeball";
+import { PokeballType } from "#enums/pokeball";
import BattleScene from "#app/battle-scene";
-import { Moves } from "#app/enums/moves";
+import { Moves } from "#enums/moves";
describe("Spec - Pokemon", () => {
let phaserGame: Phaser.Game;
diff --git a/src/test/final_boss.test.ts b/src/test/final_boss.test.ts
index de2cddff9447..43f48f587ae1 100644
--- a/src/test/final_boss.test.ts
+++ b/src/test/final_boss.test.ts
@@ -1,8 +1,8 @@
import { StatusEffect } from "#app/data/status-effect";
-import { Abilities } from "#app/enums/abilities";
-import { Biome } from "#app/enums/biome";
-import { Moves } from "#app/enums/moves";
-import { Species } from "#app/enums/species";
+import { Abilities } from "#enums/abilities";
+import { Biome } from "#enums/biome";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
import { GameModes } from "#app/game-mode";
import { TurnHeldItemTransferModifier } from "#app/modifier/modifier";
import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
diff --git a/src/test/game-mode.test.ts b/src/test/game-mode.test.ts
index 11994a102af3..cf2b05479742 100644
--- a/src/test/game-mode.test.ts
+++ b/src/test/game-mode.test.ts
@@ -1,6 +1,6 @@
import { GameMode, GameModes, getGameMode } from "#app/game-mode";
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import * as Utils from "../utils";
+import * as Utils from "#app/utils";
import GameManager from "./utils/gameManager";
describe("game-mode", () => {
diff --git a/src/test/internals.test.ts b/src/test/internals.test.ts
index ce2cd55dbc6e..8230ec69fd63 100644
--- a/src/test/internals.test.ts
+++ b/src/test/internals.test.ts
@@ -1,5 +1,5 @@
-import { Abilities } from "#app/enums/abilities";
-import { Species } from "#app/enums/species";
+import { Abilities } from "#enums/abilities";
+import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
import Phaser from "phaser";
import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
diff --git a/src/test/items/dire_hit.test.ts b/src/test/items/dire_hit.test.ts
index 601552de7f1b..86e955f7c408 100644
--- a/src/test/items/dire_hit.test.ts
+++ b/src/test/items/dire_hit.test.ts
@@ -1,18 +1,18 @@
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
import Phase from "phaser";
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import { BattleEndPhase } from "#app/phases/battle-end-phase";
+import { BattleEndPhase } from "#phases/battle-end-phase";
import { TempCritBoosterModifier } from "#app/modifier/modifier";
import { Mode } from "#app/ui/ui";
import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
-import { Button } from "#app/enums/buttons";
-import { CommandPhase } from "#app/phases/command-phase";
-import { NewBattlePhase } from "#app/phases/new-battle-phase";
-import { TurnInitPhase } from "#app/phases/turn-init-phase";
-import { ShopCursorTarget } from "#app/enums/shop-cursor-target";
+import { Button } from "#enums/buttons";
+import { CommandPhase } from "#phases/command-phase";
+import { NewBattlePhase } from "#phases/new-battle-phase";
+import { TurnInitPhase } from "#phases/turn-init-phase";
+import { ShopCursorTarget } from "#enums/shop-cursor-target";
describe("Items - Dire Hit", () => {
let phaserGame: Phaser.Game;
diff --git a/src/test/items/double_battle_chance_booster.test.ts b/src/test/items/double_battle_chance_booster.test.ts
index 8d2bd7c9179a..85600f3d3ad4 100644
--- a/src/test/items/double_battle_chance_booster.test.ts
+++ b/src/test/items/double_battle_chance_booster.test.ts
@@ -1,13 +1,13 @@
-import { Moves } from "#app/enums/moves";
-import { Species } from "#app/enums/species";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
import { DoubleBattleChanceBoosterModifier } from "#app/modifier/modifier";
import GameManager from "#test/utils/gameManager";
import Phaser from "phaser";
import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-import { ShopCursorTarget } from "#app/enums/shop-cursor-target";
+import { ShopCursorTarget } from "#enums/shop-cursor-target";
import { Mode } from "#app/ui/ui";
import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
-import { Button } from "#app/enums/buttons";
+import { Button } from "#enums/buttons";
describe("Items - Double Battle Chance Boosters", () => {
let phaserGame: Phaser.Game;
diff --git a/src/test/items/eviolite.test.ts b/src/test/items/eviolite.test.ts
index 7b2f9a15fce6..9db0a0b55c4d 100644
--- a/src/test/items/eviolite.test.ts
+++ b/src/test/items/eviolite.test.ts
@@ -2,7 +2,7 @@ import { Stat } from "#enums/stat";
import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
import Phase from "phaser";
-import * as Utils from "#app/utils";
+import { NumberHolder, randItem } from "#app/utils";
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
import { StatBoosterModifier } from "#app/modifier/modifier";
@@ -35,7 +35,7 @@ describe("Items - Eviolite", () => {
const partyMember = game.scene.getPlayerPokemon()!;
vi.spyOn(partyMember, "getEffectiveStat").mockImplementation((stat, _opponent?, _move?, _isCritical?) => {
- const statValue = new Utils.NumberHolder(partyMember.getStat(stat, false));
+ const statValue = new NumberHolder(partyMember.getStat(stat, false));
game.scene.applyModifiers(StatBoosterModifier, partyMember.isPlayer(), partyMember, stat, statValue);
// Ignore other calculations for simplicity
@@ -58,7 +58,7 @@ describe("Items - Eviolite", () => {
const partyMember = game.scene.getParty()[0];
vi.spyOn(partyMember, "getEffectiveStat").mockImplementation((stat, _opponent?, _move?, _isCritical?) => {
- const statValue = new Utils.NumberHolder(partyMember.getStat(stat, false));
+ const statValue = new NumberHolder(partyMember.getStat(stat, false));
game.scene.applyModifiers(StatBoosterModifier, partyMember.isPlayer(), partyMember, stat, statValue);
// Ignore other calculations for simplicity
@@ -92,7 +92,7 @@ describe("Items - Eviolite", () => {
partyMember.fusionLuck = ally.luck;
vi.spyOn(partyMember, "getEffectiveStat").mockImplementation((stat, _opponent?, _move?, _isCritical?) => {
- const statValue = new Utils.NumberHolder(partyMember.getStat(stat, false));
+ const statValue = new NumberHolder(partyMember.getStat(stat, false));
game.scene.applyModifiers(StatBoosterModifier, partyMember.isPlayer(), partyMember, stat, statValue);
// Ignore other calculations for simplicity
@@ -125,7 +125,7 @@ describe("Items - Eviolite", () => {
partyMember.fusionLuck = ally.luck;
vi.spyOn(partyMember, "getEffectiveStat").mockImplementation((stat, _opponent?, _move?, _isCritical?) => {
- const statValue = new Utils.NumberHolder(partyMember.getStat(stat, false));
+ const statValue = new NumberHolder(partyMember.getStat(stat, false));
game.scene.applyModifiers(StatBoosterModifier, partyMember.isPlayer(), partyMember, stat, statValue);
// Ignore other calculations for simplicity
@@ -158,7 +158,7 @@ describe("Items - Eviolite", () => {
partyMember.fusionLuck = ally.luck;
vi.spyOn(partyMember, "getEffectiveStat").mockImplementation((stat, _opponent?, _move?, _isCritical?) => {
- const statValue = new Utils.NumberHolder(partyMember.getStat(stat, false));
+ const statValue = new NumberHolder(partyMember.getStat(stat, false));
game.scene.applyModifiers(StatBoosterModifier, partyMember.isPlayer(), partyMember, stat, statValue);
// Ignore other calculations for simplicity
@@ -191,7 +191,7 @@ describe("Items - Eviolite", () => {
partyMember.fusionLuck = ally.luck;
vi.spyOn(partyMember, "getEffectiveStat").mockImplementation((stat, _opponent?, _move?, _isCritical?) => {
- const statValue = new Utils.NumberHolder(partyMember.getStat(stat, false));
+ const statValue = new NumberHolder(partyMember.getStat(stat, false));
game.scene.applyModifiers(StatBoosterModifier, partyMember.isPlayer(), partyMember, stat, statValue);
// Ignore other calculations for simplicity
@@ -217,13 +217,13 @@ describe("Items - Eviolite", () => {
const gMaxablePokemon = [ Species.PIKACHU, Species.EEVEE, Species.DURALUDON, Species.MEOWTH ];
await game.classicMode.startBattle([
- Utils.randItem(gMaxablePokemon)
+ randItem(gMaxablePokemon)
]);
const partyMember = game.scene.getPlayerPokemon()!;
vi.spyOn(partyMember, "getEffectiveStat").mockImplementation((stat, _opponent?, _move?, _isCritical?) => {
- const statValue = new Utils.NumberHolder(partyMember.getStat(stat, false));
+ const statValue = new NumberHolder(partyMember.getStat(stat, false));
game.scene.applyModifiers(StatBoosterModifier, partyMember.isPlayer(), partyMember, stat, statValue);
// Ignore other calculations for simplicity
diff --git a/src/test/items/exp_booster.test.ts b/src/test/items/exp_booster.test.ts
index 36107329706f..171815ed7f9d 100644
--- a/src/test/items/exp_booster.test.ts
+++ b/src/test/items/exp_booster.test.ts
@@ -1,6 +1,6 @@
-import { Abilities } from "#app/enums/abilities";
+import { Abilities } from "#enums/abilities";
import { PokemonExpBoosterModifier } from "#app/modifier/modifier";
-import * as Utils from "#app/utils";
+import { NumberHolder } from "#app/utils";
import GameManager from "#test/utils/gameManager";
import Phase from "phaser";
import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
@@ -33,7 +33,7 @@ describe("EXP Modifier Items", () => {
const partyMember = game.scene.getPlayerPokemon()!;
partyMember.exp = 100;
- const expHolder = new Utils.NumberHolder(partyMember.exp);
+ const expHolder = new NumberHolder(partyMember.exp);
partyMember.scene.applyModifiers(PokemonExpBoosterModifier, true, partyMember, expHolder);
expect(expHolder.value).toBe(440);
}, 20000);
diff --git a/src/test/items/leek.test.ts b/src/test/items/leek.test.ts
index e27462a92657..9fa33b189fef 100644
--- a/src/test/items/leek.test.ts
+++ b/src/test/items/leek.test.ts
@@ -1,5 +1,5 @@
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
-import * as Utils from "#app/utils";
+import { TurnEndPhase } from "#phases/turn-end-phase";
+import { randInt } from "#app/utils";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
@@ -85,7 +85,7 @@ describe("Items - Leek", () => {
const species = [ Species.FARFETCHD, Species.GALAR_FARFETCHD, Species.SIRFETCHD ];
await game.startBattle([
- species[Utils.randInt(species.length)],
+ species[randInt(species.length)],
Species.PIKACHU,
]);
@@ -117,7 +117,7 @@ describe("Items - Leek", () => {
await game.startBattle([
Species.PIKACHU,
- species[Utils.randInt(species.length)]
+ species[randInt(species.length)]
]);
const [ partyMember, ally ] = game.scene.getParty();
diff --git a/src/test/items/leftovers.test.ts b/src/test/items/leftovers.test.ts
index cfbf7c2f7343..5cb58ef07caa 100644
--- a/src/test/items/leftovers.test.ts
+++ b/src/test/items/leftovers.test.ts
@@ -1,5 +1,5 @@
-import { DamagePhase } from "#app/phases/damage-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { DamagePhase } from "#phases/damage-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/items/light_ball.test.ts b/src/test/items/light_ball.test.ts
index 78375487f3bc..e193f576590e 100644
--- a/src/test/items/light_ball.test.ts
+++ b/src/test/items/light_ball.test.ts
@@ -2,7 +2,7 @@ import { Stat } from "#enums/stat";
import { SpeciesStatBoosterModifier } from "#app/modifier/modifier";
import { modifierTypes } from "#app/modifier/modifier-type";
import i18next from "#app/plugins/i18n";
-import * as Utils from "#app/utils";
+import { NumberHolder } from "#app/utils";
import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
import Phase from "phaser";
@@ -74,9 +74,9 @@ describe("Items - Light Ball", () => {
const spAtkStat = partyMember.getStat(Stat.SPATK);
// Making sure modifier is not applied without holding item
- const atkValue = new Utils.NumberHolder(atkStat);
+ const atkValue = new NumberHolder(atkStat);
partyMember.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.DEF, atkValue);
- const spAtkValue = new Utils.NumberHolder(spAtkStat);
+ const spAtkValue = new NumberHolder(spAtkStat);
partyMember.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.SPDEF, spAtkValue);
expect(atkValue.value / atkStat).toBe(1);
@@ -113,9 +113,9 @@ describe("Items - Light Ball", () => {
const spAtkStat = partyMember.getStat(Stat.SPATK);
// Making sure modifier is not applied without holding item
- const atkValue = new Utils.NumberHolder(atkStat);
+ const atkValue = new NumberHolder(atkStat);
partyMember.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.DEF, atkValue);
- const spAtkValue = new Utils.NumberHolder(spAtkStat);
+ const spAtkValue = new NumberHolder(spAtkStat);
partyMember.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.SPDEF, spAtkValue);
expect(atkValue.value / atkStat).toBe(1);
@@ -152,9 +152,9 @@ describe("Items - Light Ball", () => {
const spAtkStat = partyMember.getStat(Stat.SPATK);
// Making sure modifier is not applied without holding item
- const atkValue = new Utils.NumberHolder(atkStat);
+ const atkValue = new NumberHolder(atkStat);
partyMember.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.DEF, atkValue);
- const spAtkValue = new Utils.NumberHolder(spAtkStat);
+ const spAtkValue = new NumberHolder(spAtkStat);
partyMember.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.SPDEF, spAtkValue);
expect(atkValue.value / atkStat).toBe(1);
@@ -180,9 +180,9 @@ describe("Items - Light Ball", () => {
const spAtkStat = partyMember.getStat(Stat.SPATK);
// Making sure modifier is not applied without holding item
- const atkValue = new Utils.NumberHolder(atkStat);
+ const atkValue = new NumberHolder(atkStat);
partyMember.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.DEF, atkValue);
- const spAtkValue = new Utils.NumberHolder(spAtkStat);
+ const spAtkValue = new NumberHolder(spAtkStat);
partyMember.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.SPDEF, spAtkValue);
expect(atkValue.value / atkStat).toBe(1);
diff --git a/src/test/items/lock_capsule.test.ts b/src/test/items/lock_capsule.test.ts
index 0b6534b5eafa..43eb5d1f13fa 100644
--- a/src/test/items/lock_capsule.test.ts
+++ b/src/test/items/lock_capsule.test.ts
@@ -1,7 +1,7 @@
-import { Abilities } from "#app/enums/abilities";
-import { Moves } from "#app/enums/moves";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
import { ModifierTier } from "#app/modifier/modifier-tier";
-import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
+import { SelectModifierPhase } from "#phases/select-modifier-phase";
import { Mode } from "#app/ui/ui";
import GameManager from "#test/utils/gameManager";
import Phase from "phaser";
diff --git a/src/test/items/metal_powder.test.ts b/src/test/items/metal_powder.test.ts
index c577182f3508..861221209900 100644
--- a/src/test/items/metal_powder.test.ts
+++ b/src/test/items/metal_powder.test.ts
@@ -2,7 +2,7 @@ import { Stat } from "#enums/stat";
import { SpeciesStatBoosterModifier } from "#app/modifier/modifier";
import { modifierTypes } from "#app/modifier/modifier-type";
import i18next from "#app/plugins/i18n";
-import * as Utils from "#app/utils";
+import { NumberHolder } from "#app/utils";
import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
import Phase from "phaser";
@@ -73,7 +73,7 @@ describe("Items - Metal Powder", () => {
const defStat = partyMember.getStat(Stat.DEF);
// Making sure modifier is not applied without holding item
- const defValue = new Utils.NumberHolder(defStat);
+ const defValue = new NumberHolder(defStat);
partyMember.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.DEF, defValue);
expect(defValue.value / defStat).toBe(1);
@@ -106,7 +106,7 @@ describe("Items - Metal Powder", () => {
const defStat = partyMember.getStat(Stat.DEF);
// Making sure modifier is not applied without holding item
- const defValue = new Utils.NumberHolder(defStat);
+ const defValue = new NumberHolder(defStat);
partyMember.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.DEF, defValue);
expect(defValue.value / defStat).toBe(1);
@@ -139,7 +139,7 @@ describe("Items - Metal Powder", () => {
const defStat = partyMember.getStat(Stat.DEF);
// Making sure modifier is not applied without holding item
- const defValue = new Utils.NumberHolder(defStat);
+ const defValue = new NumberHolder(defStat);
partyMember.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.DEF, defValue);
expect(defValue.value / defStat).toBe(1);
@@ -161,7 +161,7 @@ describe("Items - Metal Powder", () => {
const defStat = partyMember.getStat(Stat.DEF);
// Making sure modifier is not applied without holding item
- const defValue = new Utils.NumberHolder(defStat);
+ const defValue = new NumberHolder(defStat);
partyMember.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.DEF, defValue);
expect(defValue.value / defStat).toBe(1);
diff --git a/src/test/items/quick_powder.test.ts b/src/test/items/quick_powder.test.ts
index 4eb6f6fb164e..d9a5acbb985f 100644
--- a/src/test/items/quick_powder.test.ts
+++ b/src/test/items/quick_powder.test.ts
@@ -2,7 +2,7 @@ import { Stat } from "#enums/stat";
import { SpeciesStatBoosterModifier } from "#app/modifier/modifier";
import { modifierTypes } from "#app/modifier/modifier-type";
import i18next from "#app/plugins/i18n";
-import * as Utils from "#app/utils";
+import { NumberHolder } from "#app/utils";
import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
import Phase from "phaser";
@@ -73,7 +73,7 @@ describe("Items - Quick Powder", () => {
const spdStat = partyMember.getStat(Stat.SPD);
// Making sure modifier is not applied without holding item
- const spdValue = new Utils.NumberHolder(spdStat);
+ const spdValue = new NumberHolder(spdStat);
partyMember.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.SPD, spdValue);
expect(spdValue.value / spdStat).toBe(1);
@@ -106,7 +106,7 @@ describe("Items - Quick Powder", () => {
const spdStat = partyMember.getStat(Stat.SPD);
// Making sure modifier is not applied without holding item
- const spdValue = new Utils.NumberHolder(spdStat);
+ const spdValue = new NumberHolder(spdStat);
partyMember.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.SPD, spdValue);
expect(spdValue.value / spdStat).toBe(1);
@@ -139,7 +139,7 @@ describe("Items - Quick Powder", () => {
const spdStat = partyMember.getStat(Stat.SPD);
// Making sure modifier is not applied without holding item
- const spdValue = new Utils.NumberHolder(spdStat);
+ const spdValue = new NumberHolder(spdStat);
partyMember.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.SPD, spdValue);
expect(spdValue.value / spdStat).toBe(1);
@@ -161,7 +161,7 @@ describe("Items - Quick Powder", () => {
const spdStat = partyMember.getStat(Stat.SPD);
// Making sure modifier is not applied without holding item
- const spdValue = new Utils.NumberHolder(spdStat);
+ const spdValue = new NumberHolder(spdStat);
partyMember.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.SPD, spdValue);
expect(spdValue.value / spdStat).toBe(1);
diff --git a/src/test/items/scope_lens.test.ts b/src/test/items/scope_lens.test.ts
index e39517ceae9a..8b441b9f7182 100644
--- a/src/test/items/scope_lens.test.ts
+++ b/src/test/items/scope_lens.test.ts
@@ -1,4 +1,4 @@
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
diff --git a/src/test/items/temp_stat_stage_booster.test.ts b/src/test/items/temp_stat_stage_booster.test.ts
index 6186799623aa..506a3d8723df 100644
--- a/src/test/items/temp_stat_stage_booster.test.ts
+++ b/src/test/items/temp_stat_stage_booster.test.ts
@@ -3,14 +3,14 @@ import GameManager from "#test/utils/gameManager";
import { Species } from "#enums/species";
import Phase from "phaser";
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import { Moves } from "#app/enums/moves";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
-import { Abilities } from "#app/enums/abilities";
+import { Moves } from "#enums/moves";
+import { TurnEndPhase } from "#phases/turn-end-phase";
+import { Abilities } from "#enums/abilities";
import { TempStatStageBoosterModifier } from "#app/modifier/modifier";
import { Mode } from "#app/ui/ui";
-import { Button } from "#app/enums/buttons";
+import { Button } from "#enums/buttons";
import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
-import { ShopCursorTarget } from "#app/enums/shop-cursor-target";
+import { ShopCursorTarget } from "#enums/shop-cursor-target";
describe("Items - Temporary Stat Stage Boosters", () => {
diff --git a/src/test/items/thick_club.test.ts b/src/test/items/thick_club.test.ts
index 74158089c773..02ae0863519d 100644
--- a/src/test/items/thick_club.test.ts
+++ b/src/test/items/thick_club.test.ts
@@ -2,7 +2,7 @@ import { Stat } from "#enums/stat";
import { SpeciesStatBoosterModifier } from "#app/modifier/modifier";
import { modifierTypes } from "#app/modifier/modifier-type";
import i18next from "#app/plugins/i18n";
-import * as Utils from "#app/utils";
+import { NumberHolder, randInt } from "#app/utils";
import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
import Phase from "phaser";
@@ -73,7 +73,7 @@ describe("Items - Thick Club", () => {
const atkStat = partyMember.getStat(Stat.ATK);
// Making sure modifier is not applied without holding item
- const atkValue = new Utils.NumberHolder(atkStat);
+ const atkValue = new NumberHolder(atkStat);
partyMember.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.ATK, atkValue);
expect(atkValue.value / atkStat).toBe(1);
@@ -95,7 +95,7 @@ describe("Items - Thick Club", () => {
const atkStat = partyMember.getStat(Stat.ATK);
// Making sure modifier is not applied without holding item
- const atkValue = new Utils.NumberHolder(atkStat);
+ const atkValue = new NumberHolder(atkStat);
partyMember.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.ATK, atkValue);
expect(atkValue.value / atkStat).toBe(1);
@@ -117,7 +117,7 @@ describe("Items - Thick Club", () => {
const atkStat = partyMember.getStat(Stat.ATK);
// Making sure modifier is not applied without holding item
- const atkValue = new Utils.NumberHolder(atkStat);
+ const atkValue = new NumberHolder(atkStat);
partyMember.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.ATK, atkValue);
expect(atkValue.value / atkStat).toBe(1);
@@ -132,7 +132,7 @@ describe("Items - Thick Club", () => {
it("THICK_CLUB held by fused CUBONE line (base)", async() => {
// Randomly choose from the Cubone line
const species = [ Species.CUBONE, Species.MAROWAK, Species.ALOLA_MAROWAK ];
- const randSpecies = Utils.randInt(species.length);
+ const randSpecies = randInt(species.length);
await game.startBattle([
species[randSpecies],
@@ -154,7 +154,7 @@ describe("Items - Thick Club", () => {
const atkStat = partyMember.getStat(Stat.ATK);
// Making sure modifier is not applied without holding item
- const atkValue = new Utils.NumberHolder(atkStat);
+ const atkValue = new NumberHolder(atkStat);
partyMember.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.ATK, atkValue);
expect(atkValue.value / atkStat).toBe(1);
@@ -169,7 +169,7 @@ describe("Items - Thick Club", () => {
it("THICK_CLUB held by fused CUBONE line (part)", async() => {
// Randomly choose from the Cubone line
const species = [ Species.CUBONE, Species.MAROWAK, Species.ALOLA_MAROWAK ];
- const randSpecies = Utils.randInt(species.length);
+ const randSpecies = randInt(species.length);
await game.startBattle([
Species.PIKACHU,
@@ -191,7 +191,7 @@ describe("Items - Thick Club", () => {
const atkStat = partyMember.getStat(Stat.ATK);
// Making sure modifier is not applied without holding item
- const atkValue = new Utils.NumberHolder(atkStat);
+ const atkValue = new NumberHolder(atkStat);
partyMember.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.ATK, atkValue);
expect(atkValue.value / atkStat).toBe(1);
@@ -213,7 +213,7 @@ describe("Items - Thick Club", () => {
const atkStat = partyMember.getStat(Stat.ATK);
// Making sure modifier is not applied without holding item
- const atkValue = new Utils.NumberHolder(atkStat);
+ const atkValue = new NumberHolder(atkStat);
partyMember.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.ATK, atkValue);
expect(atkValue.value / atkStat).toBe(1);
diff --git a/src/test/moves/after_you.test.ts b/src/test/moves/after_you.test.ts
index 99f383194aa4..f8db3cb60df1 100644
--- a/src/test/moves/after_you.test.ts
+++ b/src/test/moves/after_you.test.ts
@@ -1,7 +1,7 @@
import { BattlerIndex } from "#app/battle";
-import { Abilities } from "#app/enums/abilities";
+import { Abilities } from "#enums/abilities";
import { MoveResult } from "#app/field/pokemon";
-import { MovePhase } from "#app/phases/move-phase";
+import { MovePhase } from "#phases/move-phase";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
diff --git a/src/test/moves/alluring_voice.test.ts b/src/test/moves/alluring_voice.test.ts
index 2980f102735e..cedd56f0a819 100644
--- a/src/test/moves/alluring_voice.test.ts
+++ b/src/test/moves/alluring_voice.test.ts
@@ -1,7 +1,7 @@
import { BattlerIndex } from "#app/battle";
-import { Abilities } from "#app/enums/abilities";
-import { BattlerTagType } from "#app/enums/battler-tag-type";
-import { BerryPhase } from "#app/phases/berry-phase";
+import { Abilities } from "#enums/abilities";
+import { BattlerTagType } from "#enums/battler-tag-type";
+import { BerryPhase } from "#phases/berry-phase";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
diff --git a/src/test/moves/aromatherapy.test.ts b/src/test/moves/aromatherapy.test.ts
index f547ed0e54c5..f27b406f4288 100644
--- a/src/test/moves/aromatherapy.test.ts
+++ b/src/test/moves/aromatherapy.test.ts
@@ -1,5 +1,5 @@
-import { StatusEffect } from "#app/enums/status-effect";
-import { CommandPhase } from "#app/phases/command-phase";
+import { StatusEffect } from "#enums/status-effect";
+import { CommandPhase } from "#phases/command-phase";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/moves/astonish.test.ts b/src/test/moves/astonish.test.ts
index d94e50fc9f93..7a0ce8143007 100644
--- a/src/test/moves/astonish.test.ts
+++ b/src/test/moves/astonish.test.ts
@@ -1,9 +1,9 @@
import { allMoves } from "#app/data/move";
-import { BattlerTagType } from "#app/enums/battler-tag-type";
-import { BerryPhase } from "#app/phases/berry-phase";
-import { CommandPhase } from "#app/phases/command-phase";
-import { MoveEndPhase } from "#app/phases/move-end-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { BattlerTagType } from "#enums/battler-tag-type";
+import { BerryPhase } from "#phases/berry-phase";
+import { CommandPhase } from "#phases/command-phase";
+import { MoveEndPhase } from "#phases/move-end-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/moves/aurora_veil.test.ts b/src/test/moves/aurora_veil.test.ts
index e68117a2f596..6b2c567be7fa 100644
--- a/src/test/moves/aurora_veil.test.ts
+++ b/src/test/moves/aurora_veil.test.ts
@@ -1,10 +1,10 @@
import { ArenaTagSide } from "#app/data/arena-tag";
import Move, { allMoves } from "#app/data/move";
import { WeatherType } from "#app/data/weather";
-import { Abilities } from "#app/enums/abilities";
-import { ArenaTagType } from "#app/enums/arena-tag-type";
+import { Abilities } from "#enums/abilities";
+import { ArenaTagType } from "#enums/arena-tag-type";
import Pokemon from "#app/field/pokemon";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { NumberHolder } from "#app/utils";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/moves/baneful_bunker.test.ts b/src/test/moves/baneful_bunker.test.ts
index a0fc0f21ee28..3e264c11e5a8 100644
--- a/src/test/moves/baneful_bunker.test.ts
+++ b/src/test/moves/baneful_bunker.test.ts
@@ -5,7 +5,7 @@ import { Species } from "#enums/species";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { BattlerIndex } from "#app/battle";
-import { StatusEffect } from "#app/enums/status-effect";
+import { StatusEffect } from "#enums/status-effect";
describe("Moves - Baneful Bunker", () => {
diff --git a/src/test/moves/beak_blast.test.ts b/src/test/moves/beak_blast.test.ts
index 0c1e7bbeed97..df245e74a410 100644
--- a/src/test/moves/beak_blast.test.ts
+++ b/src/test/moves/beak_blast.test.ts
@@ -1,8 +1,8 @@
-import { BattlerTagType } from "#app/enums/battler-tag-type";
-import { StatusEffect } from "#app/enums/status-effect";
-import { BerryPhase } from "#app/phases/berry-phase";
-import { MovePhase } from "#app/phases/move-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { BattlerTagType } from "#enums/battler-tag-type";
+import { StatusEffect } from "#enums/status-effect";
+import { BerryPhase } from "#phases/berry-phase";
+import { MovePhase } from "#phases/move-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/moves/beat_up.test.ts b/src/test/moves/beat_up.test.ts
index e51ac6ea4520..59b794797f90 100644
--- a/src/test/moves/beat_up.test.ts
+++ b/src/test/moves/beat_up.test.ts
@@ -1,8 +1,8 @@
-import { Abilities } from "#app/enums/abilities";
-import { Moves } from "#app/enums/moves";
-import { Species } from "#app/enums/species";
-import { StatusEffect } from "#app/enums/status-effect";
-import { MoveEffectPhase } from "#app/phases/move-effect-phase";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { StatusEffect } from "#enums/status-effect";
+import { MoveEffectPhase } from "#phases/move-effect-phase";
import GameManager from "#test/utils/gameManager";
import Phaser from "phaser";
import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
diff --git a/src/test/moves/belly_drum.test.ts b/src/test/moves/belly_drum.test.ts
index 0bed1248e7e7..22f34728baf8 100644
--- a/src/test/moves/belly_drum.test.ts
+++ b/src/test/moves/belly_drum.test.ts
@@ -1,4 +1,4 @@
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { toDmgValue } from "#app/utils";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
@@ -6,7 +6,7 @@ import { Stat } from "#enums/stat";
import GameManager from "#test/utils/gameManager";
import Phaser from "phaser";
import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
-import { Abilities } from "#app/enums/abilities";
+import { Abilities } from "#enums/abilities";
// RATIO : HP Cost of Move
diff --git a/src/test/moves/burning_jealousy.test.ts b/src/test/moves/burning_jealousy.test.ts
index fe2735cfa964..3c837b02cd96 100644
--- a/src/test/moves/burning_jealousy.test.ts
+++ b/src/test/moves/burning_jealousy.test.ts
@@ -1,7 +1,7 @@
import { BattlerIndex } from "#app/battle";
import { allMoves } from "#app/data/move";
-import { Abilities } from "#app/enums/abilities";
-import { StatusEffect } from "#app/enums/status-effect";
+import { Abilities } from "#enums/abilities";
+import { StatusEffect } from "#enums/status-effect";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
diff --git a/src/test/moves/ceaseless_edge.test.ts b/src/test/moves/ceaseless_edge.test.ts
index 88c8c8cf0115..1b4299b41515 100644
--- a/src/test/moves/ceaseless_edge.test.ts
+++ b/src/test/moves/ceaseless_edge.test.ts
@@ -1,9 +1,9 @@
import { ArenaTagSide, ArenaTrapTag } from "#app/data/arena-tag";
import { allMoves } from "#app/data/move";
-import { Abilities } from "#app/enums/abilities";
-import { ArenaTagType } from "#app/enums/arena-tag-type";
-import { MoveEffectPhase } from "#app/phases/move-effect-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { Abilities } from "#enums/abilities";
+import { ArenaTagType } from "#enums/arena-tag-type";
+import { MoveEffectPhase } from "#phases/move-effect-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
diff --git a/src/test/moves/chilly_reception.test.ts b/src/test/moves/chilly_reception.test.ts
index 664ca242b203..3de299be07aa 100644
--- a/src/test/moves/chilly_reception.test.ts
+++ b/src/test/moves/chilly_reception.test.ts
@@ -1,10 +1,10 @@
-import { Abilities } from "#app/enums/abilities";
+import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import { WeatherType } from "#enums/weather-type";
import GameManager from "#test/utils/gameManager";
import Phaser from "phaser";
-//import { TurnInitPhase } from "#app/phases/turn-init-phase";
+//import { TurnInitPhase } from "#phases/turn-init-phase";
import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
describe("Moves - Chilly Reception", () => {
diff --git a/src/test/moves/clangorous_soul.test.ts b/src/test/moves/clangorous_soul.test.ts
index 52e980cc4faf..88732ccc8ec4 100644
--- a/src/test/moves/clangorous_soul.test.ts
+++ b/src/test/moves/clangorous_soul.test.ts
@@ -1,7 +1,7 @@
import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
import Phaser from "phaser";
import GameManager from "#test/utils/gameManager";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import { Stat } from "#enums/stat";
diff --git a/src/test/moves/crafty_shield.test.ts b/src/test/moves/crafty_shield.test.ts
index 93dd4a025387..2f2be9623760 100644
--- a/src/test/moves/crafty_shield.test.ts
+++ b/src/test/moves/crafty_shield.test.ts
@@ -5,9 +5,9 @@ import { Species } from "#enums/species";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Stat } from "#enums/stat";
-import { BattlerTagType } from "#app/enums/battler-tag-type";
-import { BerryPhase } from "#app/phases/berry-phase";
-import { CommandPhase } from "#app/phases/command-phase";
+import { BattlerTagType } from "#enums/battler-tag-type";
+import { BerryPhase } from "#phases/berry-phase";
+import { CommandPhase } from "#phases/command-phase";
describe("Moves - Crafty Shield", () => {
diff --git a/src/test/moves/double_team.test.ts b/src/test/moves/double_team.test.ts
index 62848553e06c..65deceb54570 100644
--- a/src/test/moves/double_team.test.ts
+++ b/src/test/moves/double_team.test.ts
@@ -1,6 +1,6 @@
import { Stat } from "#enums/stat";
-import { Abilities } from "#app/enums/abilities";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { Abilities } from "#enums/abilities";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
diff --git a/src/test/moves/dragon_cheer.test.ts b/src/test/moves/dragon_cheer.test.ts
index 37b74d443606..36d1a6143b1b 100644
--- a/src/test/moves/dragon_cheer.test.ts
+++ b/src/test/moves/dragon_cheer.test.ts
@@ -1,7 +1,7 @@
import { BattlerIndex } from "#app/battle";
import { Type } from "#app/data/type";
-import { Moves } from "#app/enums/moves";
-import { Species } from "#app/enums/species";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
import { Abilities } from "#enums/abilities";
import GameManager from "#test/utils/gameManager";
import Phaser from "phaser";
diff --git a/src/test/moves/dragon_rage.test.ts b/src/test/moves/dragon_rage.test.ts
index dcbed7107e69..dd15a012575d 100644
--- a/src/test/moves/dragon_rage.test.ts
+++ b/src/test/moves/dragon_rage.test.ts
@@ -1,9 +1,9 @@
import { Stat } from "#enums/stat";
import { Type } from "#app/data/type";
-import { Species } from "#app/enums/species";
+import { Species } from "#enums/species";
import { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon";
import { modifierTypes } from "#app/modifier/modifier-type";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Abilities } from "#enums/abilities";
import { BattlerTagType } from "#enums/battler-tag-type";
import { Moves } from "#enums/moves";
diff --git a/src/test/moves/dynamax_cannon.test.ts b/src/test/moves/dynamax_cannon.test.ts
index 9dd48d3c94c0..a762a0d136a6 100644
--- a/src/test/moves/dynamax_cannon.test.ts
+++ b/src/test/moves/dynamax_cannon.test.ts
@@ -1,7 +1,7 @@
import { BattlerIndex } from "#app/battle";
import { allMoves } from "#app/data/move";
-import { DamagePhase } from "#app/phases/damage-phase";
-import { MoveEffectPhase } from "#app/phases/move-effect-phase";
+import { DamagePhase } from "#phases/damage-phase";
+import { MoveEffectPhase } from "#phases/move-effect-phase";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
diff --git a/src/test/moves/effectiveness.test.ts b/src/test/moves/effectiveness.test.ts
index d1903c79844b..33364ba7bdb3 100644
--- a/src/test/moves/effectiveness.test.ts
+++ b/src/test/moves/effectiveness.test.ts
@@ -2,9 +2,9 @@ import { allMoves } from "#app/data/move";
import { getPokemonSpecies } from "#app/data/pokemon-species";
import { TrainerSlot } from "#app/data/trainer-config";
import { Type } from "#app/data/type";
-import { Abilities } from "#app/enums/abilities";
-import { Moves } from "#app/enums/moves";
-import { Species } from "#app/enums/species";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
import * as Messages from "#app/messages";
import { TerastallizeModifier } from "#app/modifier/modifier";
import GameManager from "#test/utils/gameManager";
diff --git a/src/test/moves/fillet_away.test.ts b/src/test/moves/fillet_away.test.ts
index aa3243270cb4..77b72cfe7e7d 100644
--- a/src/test/moves/fillet_away.test.ts
+++ b/src/test/moves/fillet_away.test.ts
@@ -1,4 +1,4 @@
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { toDmgValue } from "#app/utils";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/moves/fissure.test.ts b/src/test/moves/fissure.test.ts
index 16c3faa6827f..e16225478eed 100644
--- a/src/test/moves/fissure.test.ts
+++ b/src/test/moves/fissure.test.ts
@@ -1,8 +1,8 @@
import { Stat } from "#enums/stat";
-import { Species } from "#app/enums/species";
+import { Species } from "#enums/species";
import { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon";
-import { DamagePhase } from "#app/phases/damage-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { DamagePhase } from "#phases/damage-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import GameManager from "#test/utils/gameManager";
diff --git a/src/test/moves/flame_burst.test.ts b/src/test/moves/flame_burst.test.ts
index feedee3b7bca..e479103eb714 100644
--- a/src/test/moves/flame_burst.test.ts
+++ b/src/test/moves/flame_burst.test.ts
@@ -1,7 +1,7 @@
import { allAbilities } from "#app/data/ability";
-import { Abilities } from "#app/enums/abilities";
+import { Abilities } from "#enums/abilities";
import Pokemon from "#app/field/pokemon";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
diff --git a/src/test/moves/flower_shield.test.ts b/src/test/moves/flower_shield.test.ts
index 1a5cd326fd84..73005badf168 100644
--- a/src/test/moves/flower_shield.test.ts
+++ b/src/test/moves/flower_shield.test.ts
@@ -1,8 +1,8 @@
import { Stat } from "#enums/stat";
import { SemiInvulnerableTag } from "#app/data/battler-tags";
import { Type } from "#app/data/type";
-import { Biome } from "#app/enums/biome";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { Biome } from "#enums/biome";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/moves/focus_punch.test.ts b/src/test/moves/focus_punch.test.ts
index 386eb2537eed..926c7da2d01c 100644
--- a/src/test/moves/focus_punch.test.ts
+++ b/src/test/moves/focus_punch.test.ts
@@ -1,8 +1,8 @@
-import { BerryPhase } from "#app/phases/berry-phase";
-import { MessagePhase } from "#app/phases/message-phase";
-import { MoveHeaderPhase } from "#app/phases/move-header-phase";
-import { SwitchSummonPhase } from "#app/phases/switch-summon-phase";
-import { TurnStartPhase } from "#app/phases/turn-start-phase";
+import { BerryPhase } from "#phases/berry-phase";
+import { MessagePhase } from "#phases/message-phase";
+import { MoveHeaderPhase } from "#phases/move-header-phase";
+import { SwitchSummonPhase } from "#phases/switch-summon-phase";
+import { TurnStartPhase } from "#phases/turn-start-phase";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/moves/follow_me.test.ts b/src/test/moves/follow_me.test.ts
index fba7937f812d..9e1c633f9135 100644
--- a/src/test/moves/follow_me.test.ts
+++ b/src/test/moves/follow_me.test.ts
@@ -1,7 +1,7 @@
import { Stat } from "#enums/stat";
import { BattlerIndex } from "#app/battle";
-import { Abilities } from "#app/enums/abilities";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { Abilities } from "#enums/abilities";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
diff --git a/src/test/moves/foresight.test.ts b/src/test/moves/foresight.test.ts
index 1195cd0b71bc..c101ef10c5b7 100644
--- a/src/test/moves/foresight.test.ts
+++ b/src/test/moves/foresight.test.ts
@@ -1,6 +1,6 @@
-import { Moves } from "#app/enums/moves";
-import { Species } from "#app/enums/species";
-import { MoveEffectPhase } from "#app/phases/move-effect-phase";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { MoveEffectPhase } from "#phases/move-effect-phase";
import GameManager from "#test/utils/gameManager";
import Phaser from "phaser";
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
diff --git a/src/test/moves/freeze_dry.test.ts b/src/test/moves/freeze_dry.test.ts
index c09d12fa5979..c08f1098df8a 100644
--- a/src/test/moves/freeze_dry.test.ts
+++ b/src/test/moves/freeze_dry.test.ts
@@ -1,7 +1,7 @@
import { BattlerIndex } from "#app/battle";
-import { Abilities } from "#app/enums/abilities";
-import { Moves } from "#app/enums/moves";
-import { Species } from "#app/enums/species";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
import Phaser from "phaser";
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
diff --git a/src/test/moves/freezy_frost.test.ts b/src/test/moves/freezy_frost.test.ts
index 09d7779474f0..0beed5c920b6 100644
--- a/src/test/moves/freezy_frost.test.ts
+++ b/src/test/moves/freezy_frost.test.ts
@@ -6,7 +6,7 @@ import GameManager from "#test/utils/gameManager";
import Phaser from "phaser";
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
import { allMoves } from "#app/data/move";
-import { CommandPhase } from "#app/phases/command-phase";
+import { CommandPhase } from "#phases/command-phase";
describe("Moves - Freezy Frost", () => {
let phaserGame: Phaser.Game;
diff --git a/src/test/moves/fusion_flare.test.ts b/src/test/moves/fusion_flare.test.ts
index 162cefcfb1e4..8d41948e1a01 100644
--- a/src/test/moves/fusion_flare.test.ts
+++ b/src/test/moves/fusion_flare.test.ts
@@ -1,5 +1,5 @@
import { StatusEffect } from "#app/data/status-effect";
-import { TurnStartPhase } from "#app/phases/turn-start-phase";
+import { TurnStartPhase } from "#phases/turn-start-phase";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
diff --git a/src/test/moves/fusion_flare_bolt.test.ts b/src/test/moves/fusion_flare_bolt.test.ts
index 0d9b98982761..050b053a471a 100644
--- a/src/test/moves/fusion_flare_bolt.test.ts
+++ b/src/test/moves/fusion_flare_bolt.test.ts
@@ -1,10 +1,10 @@
import { Stat } from "#enums/stat";
import { BattlerIndex } from "#app/battle";
import { allMoves } from "#app/data/move";
-import { DamagePhase } from "#app/phases/damage-phase";
-import { MoveEffectPhase } from "#app/phases/move-effect-phase";
-import { MoveEndPhase } from "#app/phases/move-end-phase";
-import { MovePhase } from "#app/phases/move-phase";
+import { DamagePhase } from "#phases/damage-phase";
+import { MoveEffectPhase } from "#phases/move-effect-phase";
+import { MoveEndPhase } from "#phases/move-end-phase";
+import { MovePhase } from "#phases/move-phase";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
diff --git a/src/test/moves/gastro_acid.test.ts b/src/test/moves/gastro_acid.test.ts
index fdd75b90b136..ba0f7de73e3f 100644
--- a/src/test/moves/gastro_acid.test.ts
+++ b/src/test/moves/gastro_acid.test.ts
@@ -1,7 +1,7 @@
import { BattlerIndex } from "#app/battle";
-import { Abilities } from "#app/enums/abilities";
-import { Moves } from "#app/enums/moves";
-import { Species } from "#app/enums/species";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
import { MoveResult } from "#app/field/pokemon";
import GameManager from "#test/utils/gameManager";
import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
diff --git a/src/test/moves/glaive_rush.test.ts b/src/test/moves/glaive_rush.test.ts
index b36c3e20c7a7..f2794e1c543e 100644
--- a/src/test/moves/glaive_rush.test.ts
+++ b/src/test/moves/glaive_rush.test.ts
@@ -1,7 +1,7 @@
import { allMoves } from "#app/data/move";
-import { Abilities } from "#app/enums/abilities";
-import { Moves } from "#app/enums/moves";
-import { Species } from "#app/enums/species";
+import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
import Phaser from "phaser";
import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
diff --git a/src/test/moves/growth.test.ts b/src/test/moves/growth.test.ts
index a66e4ec6719e..b4d5233a1d86 100644
--- a/src/test/moves/growth.test.ts
+++ b/src/test/moves/growth.test.ts
@@ -5,8 +5,8 @@ import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import Phaser from "phaser";
import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-import { EnemyCommandPhase } from "#app/phases/enemy-command-phase";
-import { TurnInitPhase } from "#app/phases/turn-init-phase";
+import { EnemyCommandPhase } from "#phases/enemy-command-phase";
+import { TurnInitPhase } from "#phases/turn-init-phase";
describe("Moves - Growth", () => {
let phaserGame: Phaser.Game;
diff --git a/src/test/moves/guard_split.test.ts b/src/test/moves/guard_split.test.ts
index 519f347b920e..3f35a2fe2297 100644
--- a/src/test/moves/guard_split.test.ts
+++ b/src/test/moves/guard_split.test.ts
@@ -2,7 +2,7 @@ import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
import Phaser from "phaser";
import GameManager from "#app/test/utils/gameManager";
import { Species } from "#enums/species";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Moves } from "#enums/moves";
import { Stat } from "#enums/stat";
import { Abilities } from "#enums/abilities";
diff --git a/src/test/moves/guard_swap.test.ts b/src/test/moves/guard_swap.test.ts
index 99769b328995..c734c5b3ed9b 100644
--- a/src/test/moves/guard_swap.test.ts
+++ b/src/test/moves/guard_swap.test.ts
@@ -2,11 +2,11 @@ import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vite
import Phaser from "phaser";
import GameManager from "#app/test/utils/gameManager";
import { Species } from "#enums/species";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Moves } from "#enums/moves";
import { Stat, BATTLE_STATS } from "#enums/stat";
import { Abilities } from "#enums/abilities";
-import { MoveEndPhase } from "#app/phases/move-end-phase";
+import { MoveEndPhase } from "#phases/move-end-phase";
describe("Moves - Guard Swap", () => {
let phaserGame: Phaser.Game;
diff --git a/src/test/moves/hard_press.test.ts b/src/test/moves/hard_press.test.ts
index 0fa4181491c6..478f85d8df86 100644
--- a/src/test/moves/hard_press.test.ts
+++ b/src/test/moves/hard_press.test.ts
@@ -1,5 +1,5 @@
import { allMoves } from "#app/data/move";
-import { MoveEffectPhase } from "#app/phases/move-effect-phase";
+import { MoveEffectPhase } from "#phases/move-effect-phase";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/moves/haze.test.ts b/src/test/moves/haze.test.ts
index 30aab8bd98c4..9fdbe58bf8a8 100644
--- a/src/test/moves/haze.test.ts
+++ b/src/test/moves/haze.test.ts
@@ -5,7 +5,7 @@ import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import Phaser from "phaser";
import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-import { TurnInitPhase } from "#app/phases/turn-init-phase";
+import { TurnInitPhase } from "#phases/turn-init-phase";
describe("Moves - Haze", () => {
describe("integration tests", () => {
diff --git a/src/test/moves/heal_bell.test.ts b/src/test/moves/heal_bell.test.ts
index e4a019d9c0e7..0d1a3bf20441 100644
--- a/src/test/moves/heal_bell.test.ts
+++ b/src/test/moves/heal_bell.test.ts
@@ -1,5 +1,5 @@
-import { StatusEffect } from "#app/enums/status-effect";
-import { CommandPhase } from "#app/phases/command-phase";
+import { StatusEffect } from "#enums/status-effect";
+import { CommandPhase } from "#phases/command-phase";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/moves/heart_swap.test.ts b/src/test/moves/heart_swap.test.ts
index a128549c4593..9b9bca3a021e 100644
--- a/src/test/moves/heart_swap.test.ts
+++ b/src/test/moves/heart_swap.test.ts
@@ -2,11 +2,11 @@ import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vite
import Phaser from "phaser";
import GameManager from "#app/test/utils/gameManager";
import { Species } from "#enums/species";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Moves } from "#enums/moves";
import { BATTLE_STATS } from "#enums/stat";
import { Abilities } from "#enums/abilities";
-import { MoveEndPhase } from "#app/phases/move-end-phase";
+import { MoveEndPhase } from "#phases/move-end-phase";
describe("Moves - Heart Swap", () => {
let phaserGame: Phaser.Game;
diff --git a/src/test/moves/hyper_beam.test.ts b/src/test/moves/hyper_beam.test.ts
index af8440a09116..198c1b62e4be 100644
--- a/src/test/moves/hyper_beam.test.ts
+++ b/src/test/moves/hyper_beam.test.ts
@@ -1,10 +1,10 @@
import { allMoves } from "#app/data/move";
-import { Abilities } from "#app/enums/abilities";
-import { BattlerTagType } from "#app/enums/battler-tag-type";
-import { Moves } from "#app/enums/moves";
-import { Species } from "#app/enums/species";
-import { BerryPhase } from "#app/phases/berry-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { Abilities } from "#enums/abilities";
+import { BattlerTagType } from "#enums/battler-tag-type";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { BerryPhase } from "#phases/berry-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import GameManager from "#test/utils/gameManager";
import Phaser from "phaser";
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
diff --git a/src/test/moves/jaw_lock.test.ts b/src/test/moves/jaw_lock.test.ts
index 30dbcac64a81..7534287aa7cd 100644
--- a/src/test/moves/jaw_lock.test.ts
+++ b/src/test/moves/jaw_lock.test.ts
@@ -1,10 +1,10 @@
import { BattlerIndex } from "#app/battle";
-import { Abilities } from "#app/enums/abilities";
-import { BattlerTagType } from "#app/enums/battler-tag-type";
-import { BerryPhase } from "#app/phases/berry-phase";
-import { FaintPhase } from "#app/phases/faint-phase";
-import { MoveEffectPhase } from "#app/phases/move-effect-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { Abilities } from "#enums/abilities";
+import { BattlerTagType } from "#enums/battler-tag-type";
+import { BerryPhase } from "#phases/berry-phase";
+import { FaintPhase } from "#phases/faint-phase";
+import { MoveEffectPhase } from "#phases/move-effect-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import GameManager from "#app/test/utils/gameManager";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/moves/lash_out.test.ts b/src/test/moves/lash_out.test.ts
index 014c0ae8fe5d..b75434b66067 100644
--- a/src/test/moves/lash_out.test.ts
+++ b/src/test/moves/lash_out.test.ts
@@ -1,6 +1,6 @@
import { BattlerIndex } from "#app/battle";
import { allMoves } from "#app/data/move";
-import { Abilities } from "#app/enums/abilities";
+import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
diff --git a/src/test/moves/light_screen.test.ts b/src/test/moves/light_screen.test.ts
index af14d9273e67..ce2f3c3e7135 100644
--- a/src/test/moves/light_screen.test.ts
+++ b/src/test/moves/light_screen.test.ts
@@ -1,9 +1,9 @@
import { ArenaTagSide } from "#app/data/arena-tag";
import Move, { allMoves } from "#app/data/move";
-import { Abilities } from "#app/enums/abilities";
-import { ArenaTagType } from "#app/enums/arena-tag-type";
+import { Abilities } from "#enums/abilities";
+import { ArenaTagType } from "#enums/arena-tag-type";
import Pokemon from "#app/field/pokemon";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { NumberHolder } from "#app/utils";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/moves/lucky_chant.test.ts b/src/test/moves/lucky_chant.test.ts
index 02e9dd24465a..c6ca09bd7462 100644
--- a/src/test/moves/lucky_chant.test.ts
+++ b/src/test/moves/lucky_chant.test.ts
@@ -1,9 +1,9 @@
-import { Abilities } from "#app/enums/abilities";
-import { BattlerTagType } from "#app/enums/battler-tag-type";
-import { Moves } from "#app/enums/moves";
-import { Species } from "#app/enums/species";
-import { BerryPhase } from "#app/phases/berry-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { Abilities } from "#enums/abilities";
+import { BattlerTagType } from "#enums/battler-tag-type";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { BerryPhase } from "#phases/berry-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
import GameManager from "../utils/gameManager";
diff --git a/src/test/moves/lunar_blessing.test.ts b/src/test/moves/lunar_blessing.test.ts
index 52c41a30e112..4610df50af2a 100644
--- a/src/test/moves/lunar_blessing.test.ts
+++ b/src/test/moves/lunar_blessing.test.ts
@@ -1,5 +1,5 @@
-import { StatusEffect } from "#app/enums/status-effect";
-import { CommandPhase } from "#app/phases/command-phase";
+import { StatusEffect } from "#enums/status-effect";
+import { CommandPhase } from "#phases/command-phase";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/moves/magnet_rise.test.ts b/src/test/moves/magnet_rise.test.ts
index 0afcad67ea33..5b9708268986 100644
--- a/src/test/moves/magnet_rise.test.ts
+++ b/src/test/moves/magnet_rise.test.ts
@@ -1,5 +1,5 @@
-import { CommandPhase } from "#app/phases/command-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { CommandPhase } from "#phases/command-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
diff --git a/src/test/moves/make_it_rain.test.ts b/src/test/moves/make_it_rain.test.ts
index 08021227e9cc..2dd760085af6 100644
--- a/src/test/moves/make_it_rain.test.ts
+++ b/src/test/moves/make_it_rain.test.ts
@@ -5,8 +5,8 @@ import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
import Phaser from "phaser";
import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-import { MoveEndPhase } from "#app/phases/move-end-phase";
-import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
+import { MoveEndPhase } from "#phases/move-end-phase";
+import { StatStageChangePhase } from "#phases/stat-stage-change-phase";
describe("Moves - Make It Rain", () => {
diff --git a/src/test/moves/mat_block.test.ts b/src/test/moves/mat_block.test.ts
index a4d9177cbdc5..533abdca7c0c 100644
--- a/src/test/moves/mat_block.test.ts
+++ b/src/test/moves/mat_block.test.ts
@@ -5,9 +5,9 @@ import { Species } from "#enums/species";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Stat } from "#enums/stat";
-import { BerryPhase } from "#app/phases/berry-phase";
-import { CommandPhase } from "#app/phases/command-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { BerryPhase } from "#phases/berry-phase";
+import { CommandPhase } from "#phases/command-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
describe("Moves - Mat Block", () => {
diff --git a/src/test/moves/miracle_eye.test.ts b/src/test/moves/miracle_eye.test.ts
index 70f487de9426..80feb14bdafc 100644
--- a/src/test/moves/miracle_eye.test.ts
+++ b/src/test/moves/miracle_eye.test.ts
@@ -1,7 +1,7 @@
import { BattlerIndex } from "#app/battle";
-import { Moves } from "#app/enums/moves";
-import { Species } from "#app/enums/species";
-import { MoveEffectPhase } from "#app/phases/move-effect-phase";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { MoveEffectPhase } from "#phases/move-effect-phase";
import GameManager from "#test/utils/gameManager";
import Phaser from "phaser";
import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
diff --git a/src/test/moves/multi_target.test.ts b/src/test/moves/multi_target.test.ts
index b6836b1dcb9a..dd6d4d158645 100644
--- a/src/test/moves/multi_target.test.ts
+++ b/src/test/moves/multi_target.test.ts
@@ -1,7 +1,7 @@
import { BattlerIndex } from "#app/battle";
-import { Abilities } from "#app/enums/abilities";
-import { Species } from "#app/enums/species";
-import * as Utils from "#app/utils";
+import { Abilities } from "#enums/abilities";
+import { Species } from "#enums/species";
+import { toDmgValue } from "#app/utils";
import { Moves } from "#enums/moves";
import GameManager from "#test/utils/gameManager";
import Phaser from "phaser";
@@ -72,8 +72,8 @@ describe("Multi-target damage reduction", () => {
// Single target moves don't get reduced
expect(tackle1).toBe(tackle2);
// Moves that target all enemies get reduced if there's more than one enemy
- expect(gleam1).toBeLessThanOrEqual(Utils.toDmgValue(gleam2 * 0.75) + 1);
- expect(gleam1).toBeGreaterThanOrEqual(Utils.toDmgValue(gleam2 * 0.75) - 1);
+ expect(gleam1).toBeLessThanOrEqual(toDmgValue(gleam2 * 0.75) + 1);
+ expect(gleam1).toBeGreaterThanOrEqual(toDmgValue(gleam2 * 0.75) - 1);
});
it("should reduce earthquake when more than one pokemon other than user is not fainted", async () => {
@@ -123,7 +123,7 @@ describe("Multi-target damage reduction", () => {
const damageEnemy1Turn3 = enemy1.getMaxHp() - enemy1.hp;
// Turn 3: 1 target, should be no damage reduction
- expect(damageEnemy1Turn1).toBeLessThanOrEqual(Utils.toDmgValue(damageEnemy1Turn3 * 0.75) + 1);
- expect(damageEnemy1Turn1).toBeGreaterThanOrEqual(Utils.toDmgValue(damageEnemy1Turn3 * 0.75) - 1);
+ expect(damageEnemy1Turn1).toBeLessThanOrEqual(toDmgValue(damageEnemy1Turn3 * 0.75) + 1);
+ expect(damageEnemy1Turn1).toBeGreaterThanOrEqual(toDmgValue(damageEnemy1Turn3 * 0.75) - 1);
});
});
diff --git a/src/test/moves/nightmare.test.ts b/src/test/moves/nightmare.test.ts
index 61b133a32800..9c4e11c04bfc 100644
--- a/src/test/moves/nightmare.test.ts
+++ b/src/test/moves/nightmare.test.ts
@@ -1,5 +1,5 @@
-import { CommandPhase } from "#app/phases/command-phase";
-import { TurnInitPhase } from "#app/phases/turn-init-phase";
+import { CommandPhase } from "#phases/command-phase";
+import { TurnInitPhase } from "#phases/turn-init-phase";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/moves/octolock.test.ts b/src/test/moves/octolock.test.ts
index d80b71a51e16..33c54feb9e80 100644
--- a/src/test/moves/octolock.test.ts
+++ b/src/test/moves/octolock.test.ts
@@ -1,8 +1,8 @@
import { Stat } from "#enums/stat";
import { TrappedTag } from "#app/data/battler-tags";
-import { CommandPhase } from "#app/phases/command-phase";
-import { MoveEndPhase } from "#app/phases/move-end-phase";
-import { TurnInitPhase } from "#app/phases/turn-init-phase";
+import { CommandPhase } from "#phases/command-phase";
+import { MoveEndPhase } from "#phases/move-end-phase";
+import { TurnInitPhase } from "#phases/turn-init-phase";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/moves/parting_shot.test.ts b/src/test/moves/parting_shot.test.ts
index e5a2fc38b941..e7e26701f387 100644
--- a/src/test/moves/parting_shot.test.ts
+++ b/src/test/moves/parting_shot.test.ts
@@ -5,10 +5,10 @@ import Phaser from "phaser";
import { afterEach, beforeAll, beforeEach, describe, expect, it, test } from "vitest";
import GameManager from "../utils/gameManager";
import { Stat } from "#enums/stat";
-import { BerryPhase } from "#app/phases/berry-phase";
-import { FaintPhase } from "#app/phases/faint-phase";
-import { MessagePhase } from "#app/phases/message-phase";
-import { TurnInitPhase } from "#app/phases/turn-init-phase";
+import { BerryPhase } from "#phases/berry-phase";
+import { FaintPhase } from "#phases/faint-phase";
+import { MessagePhase } from "#phases/message-phase";
+import { TurnInitPhase } from "#phases/turn-init-phase";
describe("Moves - Parting Shot", () => {
diff --git a/src/test/moves/power_shift.test.ts b/src/test/moves/power_shift.test.ts
index e389f77bedfe..daaa4b512e2b 100644
--- a/src/test/moves/power_shift.test.ts
+++ b/src/test/moves/power_shift.test.ts
@@ -1,6 +1,6 @@
-import { Moves } from "#app/enums/moves";
-import { Species } from "#app/enums/species";
-import { Stat } from "#app/enums/stat";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { Stat } from "#enums/stat";
import { Abilities } from "#enums/abilities";
import GameManager from "#test/utils/gameManager";
import Phaser from "phaser";
diff --git a/src/test/moves/power_split.test.ts b/src/test/moves/power_split.test.ts
index 914fa86e4910..49dfa02d47dd 100644
--- a/src/test/moves/power_split.test.ts
+++ b/src/test/moves/power_split.test.ts
@@ -2,7 +2,7 @@ import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
import Phaser from "phaser";
import GameManager from "#app/test/utils/gameManager";
import { Species } from "#enums/species";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Moves } from "#enums/moves";
import { Stat } from "#enums/stat";
import { Abilities } from "#enums/abilities";
diff --git a/src/test/moves/power_swap.test.ts b/src/test/moves/power_swap.test.ts
index e9a4b569c92f..596d26c35de5 100644
--- a/src/test/moves/power_swap.test.ts
+++ b/src/test/moves/power_swap.test.ts
@@ -2,11 +2,11 @@ import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vite
import Phaser from "phaser";
import GameManager from "#app/test/utils/gameManager";
import { Species } from "#enums/species";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Moves } from "#enums/moves";
import { Stat, BATTLE_STATS } from "#enums/stat";
import { Abilities } from "#enums/abilities";
-import { MoveEndPhase } from "#app/phases/move-end-phase";
+import { MoveEndPhase } from "#phases/move-end-phase";
describe("Moves - Power Swap", () => {
let phaserGame: Phaser.Game;
diff --git a/src/test/moves/power_trick.test.ts b/src/test/moves/power_trick.test.ts
index a064a43dec49..9695a4a9a46c 100644
--- a/src/test/moves/power_trick.test.ts
+++ b/src/test/moves/power_trick.test.ts
@@ -4,7 +4,7 @@ import GameManager from "#app/test/utils/gameManager";
import { Moves } from "#enums/moves";
import { Stat } from "#enums/stat";
import { Species } from "#enums/species";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Abilities } from "#enums/abilities";
import { BattlerTagType } from "#enums/battler-tag-type";
diff --git a/src/test/moves/purify.test.ts b/src/test/moves/purify.test.ts
index 3b07eafd75ac..c216d3334e71 100644
--- a/src/test/moves/purify.test.ts
+++ b/src/test/moves/purify.test.ts
@@ -1,7 +1,7 @@
import { BattlerIndex } from "#app/battle";
import { Status, StatusEffect } from "#app/data/status-effect";
import { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon";
-import { MoveEndPhase } from "#app/phases/move-end-phase";
+import { MoveEndPhase } from "#phases/move-end-phase";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
diff --git a/src/test/moves/reflect.test.ts b/src/test/moves/reflect.test.ts
index 3bf415ea75c3..376cbacb87e8 100644
--- a/src/test/moves/reflect.test.ts
+++ b/src/test/moves/reflect.test.ts
@@ -1,9 +1,9 @@
import { ArenaTagSide } from "#app/data/arena-tag";
import Move, { allMoves } from "#app/data/move";
-import { Abilities } from "#app/enums/abilities";
-import { ArenaTagType } from "#app/enums/arena-tag-type";
+import { Abilities } from "#enums/abilities";
+import { ArenaTagType } from "#enums/arena-tag-type";
import Pokemon from "#app/field/pokemon";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { NumberHolder } from "#app/utils";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/moves/relic_song.test.ts b/src/test/moves/relic_song.test.ts
index eb877b6054db..407371ee1717 100644
--- a/src/test/moves/relic_song.test.ts
+++ b/src/test/moves/relic_song.test.ts
@@ -1,5 +1,5 @@
import { Type } from "#app/data/type";
-import { Challenges } from "#app/enums/challenges";
+import { Challenges } from "#enums/challenges";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/moves/rollout.test.ts b/src/test/moves/rollout.test.ts
index 4a14b100f6d6..97c52a7f0e33 100644
--- a/src/test/moves/rollout.test.ts
+++ b/src/test/moves/rollout.test.ts
@@ -1,5 +1,5 @@
import { allMoves } from "#app/data/move";
-import { CommandPhase } from "#app/phases/command-phase";
+import { CommandPhase } from "#phases/command-phase";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/moves/roost.test.ts b/src/test/moves/roost.test.ts
index e595f8798444..d027f3f014ff 100644
--- a/src/test/moves/roost.test.ts
+++ b/src/test/moves/roost.test.ts
@@ -1,10 +1,10 @@
import { BattlerIndex } from "#app/battle";
import { Type } from "#app/data/type";
-import { BattlerTagType } from "#app/enums/battler-tag-type";
-import { Moves } from "#app/enums/moves";
-import { Species } from "#app/enums/species";
-import { MoveEffectPhase } from "#app/phases/move-effect-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { BattlerTagType } from "#enums/battler-tag-type";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { MoveEffectPhase } from "#phases/move-effect-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import GameManager from "#test/utils/gameManager";
import Phaser from "phaser";
import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest";
diff --git a/src/test/moves/safeguard.test.ts b/src/test/moves/safeguard.test.ts
index 6505162fd048..1ead5c9e3f6f 100644
--- a/src/test/moves/safeguard.test.ts
+++ b/src/test/moves/safeguard.test.ts
@@ -1,7 +1,7 @@
import { BattlerIndex } from "#app/battle";
import { allAbilities, PostDefendContactApplyStatusEffectAbAttr } from "#app/data/ability";
-import { Abilities } from "#app/enums/abilities";
-import { StatusEffect } from "#app/enums/status-effect";
+import { Abilities } from "#enums/abilities";
+import { StatusEffect } from "#enums/status-effect";
import GameManager from "#app/test/utils/gameManager";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/moves/scale_shot.test.ts b/src/test/moves/scale_shot.test.ts
index e4d768fa13a2..29ac11aa6ae1 100644
--- a/src/test/moves/scale_shot.test.ts
+++ b/src/test/moves/scale_shot.test.ts
@@ -1,9 +1,9 @@
import { BattlerIndex } from "#app/battle";
import { allMoves } from "#app/data/move";
-import { DamagePhase } from "#app/phases/damage-phase";
-import { MoveEffectPhase } from "#app/phases/move-effect-phase";
-import { MoveEndPhase } from "#app/phases/move-end-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { DamagePhase } from "#phases/damage-phase";
+import { MoveEffectPhase } from "#phases/move-effect-phase";
+import { MoveEndPhase } from "#phases/move-end-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/moves/shell_trap.test.ts b/src/test/moves/shell_trap.test.ts
index 04d3cf998b16..5137b73fc9e4 100644
--- a/src/test/moves/shell_trap.test.ts
+++ b/src/test/moves/shell_trap.test.ts
@@ -1,11 +1,11 @@
import { BattlerIndex } from "#app/battle";
import { allMoves } from "#app/data/move";
-import { Moves } from "#app/enums/moves";
-import { Species } from "#app/enums/species";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
import { MoveResult } from "#app/field/pokemon";
-import { BerryPhase } from "#app/phases/berry-phase";
-import { MoveEndPhase } from "#app/phases/move-end-phase";
-import { MovePhase } from "#app/phases/move-phase";
+import { BerryPhase } from "#phases/berry-phase";
+import { MoveEndPhase } from "#phases/move-end-phase";
+import { MovePhase } from "#phases/move-phase";
import GameManager from "#test/utils/gameManager";
import Phaser from "phaser";
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
diff --git a/src/test/moves/sparkly_swirl.test.ts b/src/test/moves/sparkly_swirl.test.ts
index 8449f2785f80..53195139fa35 100644
--- a/src/test/moves/sparkly_swirl.test.ts
+++ b/src/test/moves/sparkly_swirl.test.ts
@@ -1,6 +1,6 @@
import { allMoves } from "#app/data/move";
-import { StatusEffect } from "#app/enums/status-effect";
-import { CommandPhase } from "#app/phases/command-phase";
+import { StatusEffect } from "#enums/status-effect";
+import { CommandPhase } from "#phases/command-phase";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/moves/speed_swap.test.ts b/src/test/moves/speed_swap.test.ts
index 179f12123943..de1f518fc76b 100644
--- a/src/test/moves/speed_swap.test.ts
+++ b/src/test/moves/speed_swap.test.ts
@@ -2,7 +2,7 @@ import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
import Phaser from "phaser";
import GameManager from "#app/test/utils/gameManager";
import { Species } from "#enums/species";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Moves } from "#enums/moves";
import { Stat } from "#enums/stat";
import { Abilities } from "#enums/abilities";
diff --git a/src/test/moves/spit_up.test.ts b/src/test/moves/spit_up.test.ts
index 8e418858e8d0..352956e4cc02 100644
--- a/src/test/moves/spit_up.test.ts
+++ b/src/test/moves/spit_up.test.ts
@@ -1,7 +1,7 @@
import { Stat } from "#enums/stat";
import { StockpilingTag } from "#app/data/battler-tags";
import { allMoves } from "#app/data/move";
-import { BattlerTagType } from "#app/enums/battler-tag-type";
+import { BattlerTagType } from "#enums/battler-tag-type";
import { MoveResult, TurnMove } from "#app/field/pokemon";
import GameManager from "#test/utils/gameManager";
import { Abilities } from "#enums/abilities";
@@ -9,8 +9,8 @@ import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import Phaser from "phaser";
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import { MovePhase } from "#app/phases/move-phase";
-import { TurnInitPhase } from "#app/phases/turn-init-phase";
+import { MovePhase } from "#phases/move-phase";
+import { TurnInitPhase } from "#phases/turn-init-phase";
describe("Moves - Spit Up", () => {
let phaserGame: Phaser.Game;
diff --git a/src/test/moves/spotlight.test.ts b/src/test/moves/spotlight.test.ts
index 095f7d80bfe1..33e0c75d5403 100644
--- a/src/test/moves/spotlight.test.ts
+++ b/src/test/moves/spotlight.test.ts
@@ -1,5 +1,5 @@
import { BattlerIndex } from "#app/battle";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
diff --git a/src/test/moves/steamroller.test.ts b/src/test/moves/steamroller.test.ts
index 9d16643ec5d9..3ec99f4635e1 100644
--- a/src/test/moves/steamroller.test.ts
+++ b/src/test/moves/steamroller.test.ts
@@ -1,6 +1,6 @@
import { BattlerIndex } from "#app/battle";
import { allMoves } from "#app/data/move";
-import { BattlerTagType } from "#app/enums/battler-tag-type";
+import { BattlerTagType } from "#enums/battler-tag-type";
import { DamageCalculationResult } from "#app/field/pokemon";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
diff --git a/src/test/moves/stockpile.test.ts b/src/test/moves/stockpile.test.ts
index d3239856ed71..8a33d5518f94 100644
--- a/src/test/moves/stockpile.test.ts
+++ b/src/test/moves/stockpile.test.ts
@@ -1,8 +1,8 @@
import { Stat } from "#enums/stat";
import { StockpilingTag } from "#app/data/battler-tags";
import { MoveResult, TurnMove } from "#app/field/pokemon";
-import { CommandPhase } from "#app/phases/command-phase";
-import { TurnInitPhase } from "#app/phases/turn-init-phase";
+import { CommandPhase } from "#phases/command-phase";
+import { TurnInitPhase } from "#phases/turn-init-phase";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/moves/substitute.test.ts b/src/test/moves/substitute.test.ts
index 92f66c967c43..abbcba49e5a3 100644
--- a/src/test/moves/substitute.test.ts
+++ b/src/test/moves/substitute.test.ts
@@ -11,7 +11,7 @@ import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import { Stat } from "#enums/stat";
import { MoveResult } from "#app/field/pokemon";
-import { CommandPhase } from "#app/phases/command-phase";
+import { CommandPhase } from "#phases/command-phase";
import GameManager from "#app/test/utils/gameManager";
import { Command } from "#app/ui/command-ui-handler";
import { Mode } from "#app/ui/ui";
diff --git a/src/test/moves/swallow.test.ts b/src/test/moves/swallow.test.ts
index 2aee4d2604aa..e97c4655747a 100644
--- a/src/test/moves/swallow.test.ts
+++ b/src/test/moves/swallow.test.ts
@@ -1,9 +1,9 @@
import { Stat } from "#enums/stat";
import { StockpilingTag } from "#app/data/battler-tags";
-import { BattlerTagType } from "#app/enums/battler-tag-type";
+import { BattlerTagType } from "#enums/battler-tag-type";
import { MoveResult, TurnMove } from "#app/field/pokemon";
-import { MovePhase } from "#app/phases/move-phase";
-import { TurnInitPhase } from "#app/phases/turn-init-phase";
+import { MovePhase } from "#phases/move-phase";
+import { TurnInitPhase } from "#phases/turn-init-phase";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/moves/tackle.test.ts b/src/test/moves/tackle.test.ts
index 5d5ff1a366db..19f6621c51ac 100644
--- a/src/test/moves/tackle.test.ts
+++ b/src/test/moves/tackle.test.ts
@@ -1,6 +1,6 @@
import { Stat } from "#enums/stat";
-import { EnemyCommandPhase } from "#app/phases/enemy-command-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { EnemyCommandPhase } from "#phases/enemy-command-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
diff --git a/src/test/moves/tail_whip.test.ts b/src/test/moves/tail_whip.test.ts
index 5c83feb8a4e0..f56692114943 100644
--- a/src/test/moves/tail_whip.test.ts
+++ b/src/test/moves/tail_whip.test.ts
@@ -5,8 +5,8 @@ import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import Phaser from "phaser";
import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-import { EnemyCommandPhase } from "#app/phases/enemy-command-phase";
-import { TurnInitPhase } from "#app/phases/turn-init-phase";
+import { EnemyCommandPhase } from "#phases/enemy-command-phase";
+import { TurnInitPhase } from "#phases/turn-init-phase";
describe("Moves - Tail whip", () => {
diff --git a/src/test/moves/tailwind.test.ts b/src/test/moves/tailwind.test.ts
index a26dde828240..7879badb98ae 100644
--- a/src/test/moves/tailwind.test.ts
+++ b/src/test/moves/tailwind.test.ts
@@ -1,7 +1,7 @@
import { Stat } from "#enums/stat";
import { ArenaTagSide } from "#app/data/arena-tag";
-import { ArenaTagType } from "#app/enums/arena-tag-type";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { ArenaTagType } from "#enums/arena-tag-type";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
diff --git a/src/test/moves/tar_shot.test.ts b/src/test/moves/tar_shot.test.ts
index 4734da366e46..03a1759deb18 100644
--- a/src/test/moves/tar_shot.test.ts
+++ b/src/test/moves/tar_shot.test.ts
@@ -1,8 +1,8 @@
import { BattlerIndex } from "#app/battle";
import { Type } from "#app/data/type";
-import { Moves } from "#app/enums/moves";
-import { Species } from "#app/enums/species";
-import { Stat } from "#app/enums/stat";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { Stat } from "#enums/stat";
import { Abilities } from "#enums/abilities";
import GameManager from "#test/utils/gameManager";
import Phaser from "phaser";
diff --git a/src/test/moves/tera_blast.test.ts b/src/test/moves/tera_blast.test.ts
index 0ce8a552105b..d016d3246663 100644
--- a/src/test/moves/tera_blast.test.ts
+++ b/src/test/moves/tera_blast.test.ts
@@ -2,7 +2,7 @@ import { BattlerIndex } from "#app/battle";
import { Stat } from "#enums/stat";
import { allMoves } from "#app/data/move";
import { Type } from "#app/data/type";
-import { Abilities } from "#app/enums/abilities";
+import { Abilities } from "#enums/abilities";
import { HitResult } from "#app/field/pokemon";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/moves/thousand_arrows.test.ts b/src/test/moves/thousand_arrows.test.ts
index 976b4352ee45..48d8ec6d9fbf 100644
--- a/src/test/moves/thousand_arrows.test.ts
+++ b/src/test/moves/thousand_arrows.test.ts
@@ -1,7 +1,7 @@
-import { Abilities } from "#app/enums/abilities";
-import { BattlerTagType } from "#app/enums/battler-tag-type";
-import { BerryPhase } from "#app/phases/berry-phase";
-import { MoveEffectPhase } from "#app/phases/move-effect-phase";
+import { Abilities } from "#enums/abilities";
+import { BattlerTagType } from "#enums/battler-tag-type";
+import { BerryPhase } from "#phases/berry-phase";
+import { MoveEffectPhase } from "#phases/move-effect-phase";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
diff --git a/src/test/moves/throat_chop.test.ts b/src/test/moves/throat_chop.test.ts
index 24293f8d0868..8d7c6d14b330 100644
--- a/src/test/moves/throat_chop.test.ts
+++ b/src/test/moves/throat_chop.test.ts
@@ -1,7 +1,7 @@
import { BattlerIndex } from "#app/battle";
-import { Moves } from "#app/enums/moves";
-import { Species } from "#app/enums/species";
-import { Stat } from "#app/enums/stat";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { Stat } from "#enums/stat";
import { Abilities } from "#enums/abilities";
import GameManager from "#test/utils/gameManager";
import Phaser from "phaser";
diff --git a/src/test/moves/thunder_wave.test.ts b/src/test/moves/thunder_wave.test.ts
index 03e9ebb94f37..e0faefe45f4c 100644
--- a/src/test/moves/thunder_wave.test.ts
+++ b/src/test/moves/thunder_wave.test.ts
@@ -1,5 +1,5 @@
import { StatusEffect } from "#app/data/status-effect";
-import { Abilities } from "#app/enums/abilities";
+import { Abilities } from "#enums/abilities";
import { EnemyPokemon } from "#app/field/pokemon";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/moves/tidy_up.test.ts b/src/test/moves/tidy_up.test.ts
index 255967b40acc..3948847db1da 100644
--- a/src/test/moves/tidy_up.test.ts
+++ b/src/test/moves/tidy_up.test.ts
@@ -1,7 +1,7 @@
import { Stat } from "#enums/stat";
-import { ArenaTagType } from "#app/enums/arena-tag-type";
-import { MoveEndPhase } from "#app/phases/move-end-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { ArenaTagType } from "#enums/arena-tag-type";
+import { MoveEndPhase } from "#phases/move-end-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/moves/torment.test.ts b/src/test/moves/torment.test.ts
index b4c9a059db15..87af8baaecc1 100644
--- a/src/test/moves/torment.test.ts
+++ b/src/test/moves/torment.test.ts
@@ -6,7 +6,7 @@ import Phaser from "phaser";
import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
import { MoveResult } from "#app/field/pokemon";
import { BattlerTagType } from "#enums/battler-tag-type";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
describe("Moves - Torment", () => {
let phaserGame: Phaser.Game;
diff --git a/src/test/moves/transform.test.ts b/src/test/moves/transform.test.ts
index 079fdfa5685c..295e50285afe 100644
--- a/src/test/moves/transform.test.ts
+++ b/src/test/moves/transform.test.ts
@@ -2,7 +2,7 @@ import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
import Phaser from "phaser";
import GameManager from "#app/test/utils/gameManager";
import { Species } from "#enums/species";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import { Moves } from "#enums/moves";
import { Stat, BATTLE_STATS, EFFECTIVE_STATS } from "#enums/stat";
import { Abilities } from "#enums/abilities";
diff --git a/src/test/moves/u_turn.test.ts b/src/test/moves/u_turn.test.ts
index b995c20f5039..e132ada95e75 100644
--- a/src/test/moves/u_turn.test.ts
+++ b/src/test/moves/u_turn.test.ts
@@ -1,7 +1,7 @@
-import { Abilities } from "#app/enums/abilities";
-import { StatusEffect } from "#app/enums/status-effect";
-import { SwitchPhase } from "#app/phases/switch-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
+import { Abilities } from "#enums/abilities";
+import { StatusEffect } from "#enums/status-effect";
+import { SwitchPhase } from "#phases/switch-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
import GameManager from "#app/test/utils/gameManager";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
diff --git a/src/test/moves/whirlwind.test.ts b/src/test/moves/whirlwind.test.ts
index cc31b2591a23..fc175156f4a3 100644
--- a/src/test/moves/whirlwind.test.ts
+++ b/src/test/moves/whirlwind.test.ts
@@ -1,4 +1,4 @@
-import { BattlerTagType } from "#app/enums/battler-tag-type";
+import { BattlerTagType } from "#enums/battler-tag-type";
import { MoveResult } from "#app/field/pokemon";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
diff --git a/src/test/moves/wide_guard.test.ts b/src/test/moves/wide_guard.test.ts
index c25a700c981c..0266d9ccedb1 100644
--- a/src/test/moves/wide_guard.test.ts
+++ b/src/test/moves/wide_guard.test.ts
@@ -5,8 +5,8 @@ import { Species } from "#enums/species";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Stat } from "#enums/stat";
-import { BerryPhase } from "#app/phases/berry-phase";
-import { CommandPhase } from "#app/phases/command-phase";
+import { BerryPhase } from "#phases/berry-phase";
+import { CommandPhase } from "#phases/command-phase";
describe("Moves - Wide Guard", () => {
diff --git a/src/test/mystery-encounter/encounter-test-utils.ts b/src/test/mystery-encounter/encounter-test-utils.ts
index f95a442d4c2f..aaafacd2086b 100644
--- a/src/test/mystery-encounter/encounter-test-utils.ts
+++ b/src/test/mystery-encounter/encounter-test-utils.ts
@@ -1,18 +1,18 @@
-import { Button } from "#app/enums/buttons";
-import { MysteryEncounterBattlePhase, MysteryEncounterOptionSelectedPhase, MysteryEncounterPhase, MysteryEncounterRewardsPhase } from "#app/phases/mystery-encounter-phases";
+import { Button } from "#enums/buttons";
+import { MysteryEncounterBattlePhase, MysteryEncounterOptionSelectedPhase, MysteryEncounterPhase, MysteryEncounterRewardsPhase } from "#phases/mystery-encounter-phases";
import MysteryEncounterUiHandler from "#app/ui/mystery-encounter-ui-handler";
import { Mode } from "#app/ui/ui";
import GameManager from "../utils/gameManager";
import MessageUiHandler from "#app/ui/message-ui-handler";
import { Status, StatusEffect } from "#app/data/status-effect";
import { expect, vi } from "vitest";
-import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import * as EncounterPhaseUtils from "#mystery-encounters/utils/encounter-phase-utils";
import PartyUiHandler from "#app/ui/party-ui-handler";
import OptionSelectUiHandler from "#app/ui/settings/option-select-ui-handler";
import { isNullOrUndefined } from "#app/utils";
-import { CommandPhase } from "#app/phases/command-phase";
-import { VictoryPhase } from "#app/phases/victory-phase";
-import { MessagePhase } from "#app/phases/message-phase";
+import { CommandPhase } from "#phases/command-phase";
+import { VictoryPhase } from "#phases/victory-phase";
+import { MessagePhase } from "#phases/message-phase";
/**
* Runs a {@linkcode MysteryEncounter} to either the start of a battle, or to the {@linkcode MysteryEncounterRewardsPhase}, depending on the option selected
diff --git a/src/test/mystery-encounter/encounters/a-trainers-test-encounter.test.ts b/src/test/mystery-encounter/encounters/a-trainers-test-encounter.test.ts
index 7d7839584227..1fffc9a39a0d 100644
--- a/src/test/mystery-encounter/encounters/a-trainers-test-encounter.test.ts
+++ b/src/test/mystery-encounter/encounters/a-trainers-test-encounter.test.ts
@@ -1,21 +1,21 @@
-import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters";
-import { HUMAN_TRANSITABLE_BIOMES } from "#app/data/mystery-encounters/mystery-encounters";
-import { Biome } from "#app/enums/biome";
-import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
-import { Species } from "#app/enums/species";
+import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
+import { HUMAN_TRANSITABLE_BIOMES } from "#mystery-encounters/mystery-encounters";
+import { Biome } from "#enums/biome";
+import { MysteryEncounterType } from "#enums/mystery-encounter-type";
+import { Species } from "#enums/species";
import GameManager from "#app/test/utils/gameManager";
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import * as EncounterPhaseUtils from "#mystery-encounters/utils/encounter-phase-utils";
import { runMysteryEncounterToEnd, skipBattleRunMysteryEncounterRewardsPhase } from "#test/mystery-encounter/encounter-test-utils";
import BattleScene from "#app/battle-scene";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
-import { ATrainersTestEncounter } from "#app/data/mystery-encounters/encounters/a-trainers-test-encounter";
+import { ATrainersTestEncounter } from "#mystery-encounters/encounters/a-trainers-test-encounter";
import { EggTier } from "#enums/egg-type";
-import { CommandPhase } from "#app/phases/command-phase";
-import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
-import { PartyHealPhase } from "#app/phases/party-heal-phase";
+import { CommandPhase } from "#phases/command-phase";
+import { SelectModifierPhase } from "#phases/select-modifier-phase";
+import { PartyHealPhase } from "#phases/party-heal-phase";
import i18next from "i18next";
const namespace = "mysteryEncounters/aTrainersTest";
diff --git a/src/test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts b/src/test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts
index a72a9fbb5a37..284584d1d35f 100644
--- a/src/test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts
+++ b/src/test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts
@@ -1,21 +1,21 @@
-import { Biome } from "#app/enums/biome";
-import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
-import { Species } from "#app/enums/species";
+import { Biome } from "#enums/biome";
+import { MysteryEncounterType } from "#enums/mystery-encounter-type";
+import { Species } from "#enums/species";
import GameManager from "#app/test/utils/gameManager";
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import * as EncounterPhaseUtils from "#mystery-encounters/utils/encounter-phase-utils";
import { runMysteryEncounterToEnd, skipBattleRunMysteryEncounterRewardsPhase } from "#test/mystery-encounter/encounter-test-utils";
import BattleScene from "#app/battle-scene";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters";
+import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
import { BerryModifier, PokemonHeldItemModifier } from "#app/modifier/modifier";
import { BerryType } from "#enums/berry-type";
-import { AbsoluteAvariceEncounter } from "#app/data/mystery-encounters/encounters/absolute-avarice-encounter";
+import { AbsoluteAvariceEncounter } from "#mystery-encounters/encounters/absolute-avarice-encounter";
import { Moves } from "#enums/moves";
-import { CommandPhase } from "#app/phases/command-phase";
-import { MovePhase } from "#app/phases/move-phase";
-import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
+import { CommandPhase } from "#phases/command-phase";
+import { MovePhase } from "#phases/move-phase";
+import { SelectModifierPhase } from "#phases/select-modifier-phase";
import i18next from "i18next";
const namespace = "mysteryEncounters/absoluteAvarice";
diff --git a/src/test/mystery-encounter/encounters/an-offer-you-cant-refuse-encounter.test.ts b/src/test/mystery-encounter/encounters/an-offer-you-cant-refuse-encounter.test.ts
index 0585b4ce72b3..766db8a4c279 100644
--- a/src/test/mystery-encounter/encounters/an-offer-you-cant-refuse-encounter.test.ts
+++ b/src/test/mystery-encounter/encounters/an-offer-you-cant-refuse-encounter.test.ts
@@ -1,22 +1,22 @@
-import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters";
-import { HUMAN_TRANSITABLE_BIOMES } from "#app/data/mystery-encounters/mystery-encounters";
-import { Biome } from "#app/enums/biome";
-import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
-import { Species } from "#app/enums/species";
+import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
+import { HUMAN_TRANSITABLE_BIOMES } from "#mystery-encounters/mystery-encounters";
+import { Biome } from "#enums/biome";
+import { MysteryEncounterType } from "#enums/mystery-encounter-type";
+import { Species } from "#enums/species";
import GameManager from "#app/test/utils/gameManager";
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import * as EncounterPhaseUtils from "#mystery-encounters/utils/encounter-phase-utils";
import { runMysteryEncounterToEnd } from "#test/mystery-encounter/encounter-test-utils";
import BattleScene from "#app/battle-scene";
import { PlayerPokemon, PokemonMove } from "#app/field/pokemon";
-import { AnOfferYouCantRefuseEncounter } from "#app/data/mystery-encounters/encounters/an-offer-you-cant-refuse-encounter";
+import { AnOfferYouCantRefuseEncounter } from "#mystery-encounters/encounters/an-offer-you-cant-refuse-encounter";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
import { getPokemonSpecies } from "#app/data/pokemon-species";
import { Moves } from "#enums/moves";
import { ShinyRateBoosterModifier } from "#app/modifier/modifier";
-import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
+import { SelectModifierPhase } from "#phases/select-modifier-phase";
import i18next from "i18next";
import { Abilities } from "#enums/abilities";
diff --git a/src/test/mystery-encounter/encounters/berries-abound-encounter.test.ts b/src/test/mystery-encounter/encounters/berries-abound-encounter.test.ts
index bfa3d428bc05..413676eb67fa 100644
--- a/src/test/mystery-encounter/encounters/berries-abound-encounter.test.ts
+++ b/src/test/mystery-encounter/encounters/berries-abound-encounter.test.ts
@@ -1,7 +1,7 @@
-import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters";
-import { Biome } from "#app/enums/biome";
-import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
-import { Species } from "#app/enums/species";
+import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
+import { Biome } from "#enums/biome";
+import { MysteryEncounterType } from "#enums/mystery-encounter-type";
+import { Species } from "#enums/species";
import GameManager from "#app/test/utils/gameManager";
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
import { runMysteryEncounterToEnd, skipBattleRunMysteryEncounterRewardsPhase } from "#test/mystery-encounter/encounter-test-utils";
@@ -12,11 +12,11 @@ import { BerryModifier } from "#app/modifier/modifier";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
-import { BerriesAboundEncounter } from "#app/data/mystery-encounters/encounters/berries-abound-encounter";
-import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import * as EncounterDialogueUtils from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
-import { CommandPhase } from "#app/phases/command-phase";
-import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
+import { BerriesAboundEncounter } from "#mystery-encounters/encounters/berries-abound-encounter";
+import * as EncounterPhaseUtils from "#mystery-encounters/utils/encounter-phase-utils";
+import * as EncounterDialogueUtils from "#mystery-encounters/utils/encounter-dialogue-utils";
+import { CommandPhase } from "#phases/command-phase";
+import { SelectModifierPhase } from "#phases/select-modifier-phase";
import { Abilities } from "#enums/abilities";
const namespace = "mysteryEncounters/berriesAbound";
diff --git a/src/test/mystery-encounter/encounters/bug-type-superfan-encounter.test.ts b/src/test/mystery-encounter/encounters/bug-type-superfan-encounter.test.ts
index e0f37c7e0458..a8ad7857bce2 100644
--- a/src/test/mystery-encounter/encounters/bug-type-superfan-encounter.test.ts
+++ b/src/test/mystery-encounter/encounters/bug-type-superfan-encounter.test.ts
@@ -1,7 +1,7 @@
-import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters";
-import { Biome } from "#app/enums/biome";
-import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
-import { Species } from "#app/enums/species";
+import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
+import { Biome } from "#enums/biome";
+import { MysteryEncounterType } from "#enums/mystery-encounter-type";
+import { Species } from "#enums/species";
import GameManager from "#app/test/utils/gameManager";
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption, skipBattleRunMysteryEncounterRewardsPhase } from "#test/mystery-encounter/encounter-test-utils";
@@ -13,12 +13,12 @@ import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
import { TrainerType } from "#enums/trainer-type";
-import { MysteryEncounterPhase, MysteryEncounterRewardsPhase } from "#app/phases/mystery-encounter-phases";
+import { MysteryEncounterPhase, MysteryEncounterRewardsPhase } from "#phases/mystery-encounter-phases";
import { ContactHeldItemTransferChanceModifier } from "#app/modifier/modifier";
-import { CommandPhase } from "#app/phases/command-phase";
-import { BugTypeSuperfanEncounter } from "#app/data/mystery-encounters/encounters/bug-type-superfan-encounter";
-import * as encounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
+import { CommandPhase } from "#phases/command-phase";
+import { BugTypeSuperfanEncounter } from "#mystery-encounters/encounters/bug-type-superfan-encounter";
+import * as encounterPhaseUtils from "#mystery-encounters/utils/encounter-phase-utils";
+import { SelectModifierPhase } from "#phases/select-modifier-phase";
import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
const namespace = "mysteryEncounters/bugTypeSuperfan";
diff --git a/src/test/mystery-encounter/encounters/clowning-around-encounter.test.ts b/src/test/mystery-encounter/encounters/clowning-around-encounter.test.ts
index 82ed558e6dbb..60401852faa8 100644
--- a/src/test/mystery-encounter/encounters/clowning-around-encounter.test.ts
+++ b/src/test/mystery-encounter/encounters/clowning-around-encounter.test.ts
@@ -1,13 +1,13 @@
-import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters";
-import { Biome } from "#app/enums/biome";
-import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
-import { Species } from "#app/enums/species";
+import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
+import { Biome } from "#enums/biome";
+import { MysteryEncounterType } from "#enums/mystery-encounter-type";
+import { Species } from "#enums/species";
import GameManager from "#app/test/utils/gameManager";
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
import { getPokemonSpecies } from "#app/data/pokemon-species";
import * as BattleAnims from "#app/data/battle-anims";
-import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import { generateModifierType } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import * as EncounterPhaseUtils from "#mystery-encounters/utils/encounter-phase-utils";
+import { generateModifierType } from "#mystery-encounters/utils/encounter-phase-utils";
import { runMysteryEncounterToEnd, skipBattleRunMysteryEncounterRewardsPhase } from "#test/mystery-encounter/encounter-test-utils";
import { Moves } from "#enums/moves";
import BattleScene from "#app/battle-scene";
@@ -17,10 +17,10 @@ import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
import { ModifierTier } from "#app/modifier/modifier-tier";
-import { ClowningAroundEncounter } from "#app/data/mystery-encounters/encounters/clowning-around-encounter";
+import { ClowningAroundEncounter } from "#mystery-encounters/encounters/clowning-around-encounter";
import { TrainerType } from "#enums/trainer-type";
import { Abilities } from "#enums/abilities";
-import { PostMysteryEncounterPhase } from "#app/phases/mystery-encounter-phases";
+import { PostMysteryEncounterPhase } from "#phases/mystery-encounter-phases";
import { Button } from "#enums/buttons";
import PartyUiHandler from "#app/ui/party-ui-handler";
import OptionSelectUiHandler from "#app/ui/settings/option-select-ui-handler";
@@ -28,10 +28,10 @@ import { modifierTypes, PokemonHeldItemModifierType } from "#app/modifier/modifi
import { BerryType } from "#enums/berry-type";
import { PokemonHeldItemModifier } from "#app/modifier/modifier";
import { Type } from "#app/data/type";
-import { CommandPhase } from "#app/phases/command-phase";
-import { MovePhase } from "#app/phases/move-phase";
-import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
-import { NewBattlePhase } from "#app/phases/new-battle-phase";
+import { CommandPhase } from "#phases/command-phase";
+import { MovePhase } from "#phases/move-phase";
+import { SelectModifierPhase } from "#phases/select-modifier-phase";
+import { NewBattlePhase } from "#phases/new-battle-phase";
const namespace = "mysteryEncounters/clowningAround";
const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ];
diff --git a/src/test/mystery-encounter/encounters/dancing-lessons-encounter.test.ts b/src/test/mystery-encounter/encounters/dancing-lessons-encounter.test.ts
index 476255411608..28e0a872e3c6 100644
--- a/src/test/mystery-encounter/encounters/dancing-lessons-encounter.test.ts
+++ b/src/test/mystery-encounter/encounters/dancing-lessons-encounter.test.ts
@@ -1,24 +1,24 @@
-import { Biome } from "#app/enums/biome";
-import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
-import { Species } from "#app/enums/species";
+import { Biome } from "#enums/biome";
+import { MysteryEncounterType } from "#enums/mystery-encounter-type";
+import { Species } from "#enums/species";
import GameManager from "#app/test/utils/gameManager";
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import * as EncounterPhaseUtils from "#mystery-encounters/utils/encounter-phase-utils";
import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption, skipBattleRunMysteryEncounterRewardsPhase } from "#test/mystery-encounter/encounter-test-utils";
import BattleScene from "#app/battle-scene";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters";
+import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
import { Moves } from "#enums/moves";
-import { DancingLessonsEncounter } from "#app/data/mystery-encounters/encounters/dancing-lessons-encounter";
+import { DancingLessonsEncounter } from "#mystery-encounters/encounters/dancing-lessons-encounter";
import { Mode } from "#app/ui/ui";
import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
import { PokemonMove } from "#app/field/pokemon";
-import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases";
-import { CommandPhase } from "#app/phases/command-phase";
-import { MovePhase } from "#app/phases/move-phase";
-import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
-import { LearnMovePhase } from "#app/phases/learn-move-phase";
+import { MysteryEncounterPhase } from "#phases/mystery-encounter-phases";
+import { CommandPhase } from "#phases/command-phase";
+import { MovePhase } from "#phases/move-phase";
+import { SelectModifierPhase } from "#phases/select-modifier-phase";
+import { LearnMovePhase } from "#phases/learn-move-phase";
const namespace = "mysteryEncounters/dancingLessons";
const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ];
diff --git a/src/test/mystery-encounter/encounters/delibirdy-encounter.test.ts b/src/test/mystery-encounter/encounters/delibirdy-encounter.test.ts
index 69c0a114645b..de520c5bb54d 100644
--- a/src/test/mystery-encounter/encounters/delibirdy-encounter.test.ts
+++ b/src/test/mystery-encounter/encounters/delibirdy-encounter.test.ts
@@ -1,19 +1,19 @@
-import { Biome } from "#app/enums/biome";
-import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
-import { Species } from "#app/enums/species";
+import { Biome } from "#enums/biome";
+import { MysteryEncounterType } from "#enums/mystery-encounter-type";
+import { Species } from "#enums/species";
import GameManager from "#app/test/utils/gameManager";
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import * as EncounterPhaseUtils from "#mystery-encounters/utils/encounter-phase-utils";
import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption } from "#test/mystery-encounter/encounter-test-utils";
import BattleScene from "#app/battle-scene";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import { DelibirdyEncounter } from "#app/data/mystery-encounters/encounters/delibirdy-encounter";
-import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters";
-import { MoneyRequirement } from "#app/data/mystery-encounters/mystery-encounter-requirements";
+import { DelibirdyEncounter } from "#mystery-encounters/encounters/delibirdy-encounter";
+import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
+import { MoneyRequirement } from "#mystery-encounters/mystery-encounter-requirements";
import { BerryModifier, HealingBoosterModifier, HitHealModifier, LevelIncrementBoosterModifier, MoneyMultiplierModifier, PokemonInstantReviveModifier, PokemonNatureWeightModifier, PreserveBerryModifier } from "#app/modifier/modifier";
-import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases";
-import { generateModifierType } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import { MysteryEncounterPhase } from "#phases/mystery-encounter-phases";
+import { generateModifierType } from "#mystery-encounters/utils/encounter-phase-utils";
import { modifierTypes } from "#app/modifier/modifier-type";
import { BerryType } from "#enums/berry-type";
diff --git a/src/test/mystery-encounter/encounters/department-store-sale-encounter.test.ts b/src/test/mystery-encounter/encounters/department-store-sale-encounter.test.ts
index 1869a4d3c3cd..126491614286 100644
--- a/src/test/mystery-encounter/encounters/department-store-sale-encounter.test.ts
+++ b/src/test/mystery-encounter/encounters/department-store-sale-encounter.test.ts
@@ -1,19 +1,19 @@
-import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters";
-import { Biome } from "#app/enums/biome";
-import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
-import { Species } from "#app/enums/species";
+import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
+import { Biome } from "#enums/biome";
+import { MysteryEncounterType } from "#enums/mystery-encounter-type";
+import { Species } from "#enums/species";
import GameManager from "#app/test/utils/gameManager";
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import * as EncounterPhaseUtils from "#mystery-encounters/utils/encounter-phase-utils";
import { runMysteryEncounterToEnd } from "#test/mystery-encounter/encounter-test-utils";
import BattleScene from "#app/battle-scene";
import { Mode } from "#app/ui/ui";
import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
-import { DepartmentStoreSaleEncounter } from "#app/data/mystery-encounters/encounters/department-store-sale-encounter";
-import { CIVILIZATION_ENCOUNTER_BIOMES } from "#app/data/mystery-encounters/mystery-encounters";
+import { DepartmentStoreSaleEncounter } from "#mystery-encounters/encounters/department-store-sale-encounter";
+import { CIVILIZATION_ENCOUNTER_BIOMES } from "#mystery-encounters/mystery-encounters";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
+import { SelectModifierPhase } from "#phases/select-modifier-phase";
const namespace = "mysteryEncounters/departmentStoreSale";
const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ];
diff --git a/src/test/mystery-encounter/encounters/field-trip-encounter.test.ts b/src/test/mystery-encounter/encounters/field-trip-encounter.test.ts
index a6f925274c3c..1076d28169bf 100644
--- a/src/test/mystery-encounter/encounters/field-trip-encounter.test.ts
+++ b/src/test/mystery-encounter/encounters/field-trip-encounter.test.ts
@@ -1,17 +1,17 @@
-import { Biome } from "#app/enums/biome";
-import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
-import { Species } from "#app/enums/species";
+import { Biome } from "#enums/biome";
+import { MysteryEncounterType } from "#enums/mystery-encounter-type";
+import { Species } from "#enums/species";
import GameManager from "#app/test/utils/gameManager";
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import * as EncounterPhaseUtils from "#mystery-encounters/utils/encounter-phase-utils";
import { runMysteryEncounterToEnd } from "#test/mystery-encounter/encounter-test-utils";
import BattleScene from "#app/battle-scene";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters";
-import { FieldTripEncounter } from "#app/data/mystery-encounters/encounters/field-trip-encounter";
+import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
+import { FieldTripEncounter } from "#mystery-encounters/encounters/field-trip-encounter";
import { Moves } from "#enums/moves";
-import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
+import { SelectModifierPhase } from "#phases/select-modifier-phase";
import { Mode } from "#app/ui/ui";
import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
import i18next from "i18next";
diff --git a/src/test/mystery-encounter/encounters/fiery-fallout-encounter.test.ts b/src/test/mystery-encounter/encounters/fiery-fallout-encounter.test.ts
index a4f303d121f7..e0f5f4d496c5 100644
--- a/src/test/mystery-encounter/encounters/fiery-fallout-encounter.test.ts
+++ b/src/test/mystery-encounter/encounters/fiery-fallout-encounter.test.ts
@@ -1,27 +1,27 @@
-import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters";
-import { Biome } from "#app/enums/biome";
-import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
-import { Species } from "#app/enums/species";
+import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
+import { Biome } from "#enums/biome";
+import { MysteryEncounterType } from "#enums/mystery-encounter-type";
+import { Species } from "#enums/species";
import GameManager from "#app/test/utils/gameManager";
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import { FieryFalloutEncounter } from "#app/data/mystery-encounters/encounters/fiery-fallout-encounter";
+import { FieryFalloutEncounter } from "#mystery-encounters/encounters/fiery-fallout-encounter";
import { Gender } from "#app/data/gender";
import { getPokemonSpecies } from "#app/data/pokemon-species";
import * as BattleAnims from "#app/data/battle-anims";
-import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import * as EncounterPhaseUtils from "#mystery-encounters/utils/encounter-phase-utils";
import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption, skipBattleRunMysteryEncounterRewardsPhase } from "#test/mystery-encounter/encounter-test-utils";
import { Moves } from "#enums/moves";
import BattleScene from "#app/battle-scene";
import { PokemonHeldItemModifier } from "#app/modifier/modifier";
import { Type } from "#app/data/type";
import { Status, StatusEffect } from "#app/data/status-effect";
-import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases";
+import { MysteryEncounterPhase } from "#phases/mystery-encounter-phases";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
-import { CommandPhase } from "#app/phases/command-phase";
-import { MovePhase } from "#app/phases/move-phase";
-import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
+import { CommandPhase } from "#phases/command-phase";
+import { MovePhase } from "#phases/move-phase";
+import { SelectModifierPhase } from "#phases/select-modifier-phase";
import i18next from "i18next";
const namespace = "mysteryEncounters/fieryFallout";
diff --git a/src/test/mystery-encounter/encounters/fight-or-flight-encounter.test.ts b/src/test/mystery-encounter/encounters/fight-or-flight-encounter.test.ts
index d23e79192677..50e54ae28f78 100644
--- a/src/test/mystery-encounter/encounters/fight-or-flight-encounter.test.ts
+++ b/src/test/mystery-encounter/encounters/fight-or-flight-encounter.test.ts
@@ -1,7 +1,7 @@
-import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters";
-import { Biome } from "#app/enums/biome";
-import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
-import { Species } from "#app/enums/species";
+import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
+import { Biome } from "#enums/biome";
+import { MysteryEncounterType } from "#enums/mystery-encounter-type";
+import { Species } from "#enums/species";
import GameManager from "#app/test/utils/gameManager";
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption, skipBattleRunMysteryEncounterRewardsPhase } from "#test/mystery-encounter/encounter-test-utils";
@@ -13,11 +13,11 @@ import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
-import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import { FightOrFlightEncounter } from "#app/data/mystery-encounters/encounters/fight-or-flight-encounter";
-import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases";
-import { CommandPhase } from "#app/phases/command-phase";
-import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
+import * as EncounterPhaseUtils from "#mystery-encounters/utils/encounter-phase-utils";
+import { FightOrFlightEncounter } from "#mystery-encounters/encounters/fight-or-flight-encounter";
+import { MysteryEncounterPhase } from "#phases/mystery-encounter-phases";
+import { CommandPhase } from "#phases/command-phase";
+import { SelectModifierPhase } from "#phases/select-modifier-phase";
const namespace = "mysteryEncounters/fightOrFlight";
const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ];
diff --git a/src/test/mystery-encounter/encounters/fun-and-games-encounter.test.ts b/src/test/mystery-encounter/encounters/fun-and-games-encounter.test.ts
index 2f4f6bed2881..0361f9437ceb 100644
--- a/src/test/mystery-encounter/encounters/fun-and-games-encounter.test.ts
+++ b/src/test/mystery-encounter/encounters/fun-and-games-encounter.test.ts
@@ -1,8 +1,8 @@
-import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters";
-import { HUMAN_TRANSITABLE_BIOMES } from "#app/data/mystery-encounters/mystery-encounters";
-import { Biome } from "#app/enums/biome";
-import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
-import { Species } from "#app/enums/species";
+import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
+import { HUMAN_TRANSITABLE_BIOMES } from "#mystery-encounters/mystery-encounters";
+import { Biome } from "#enums/biome";
+import { MysteryEncounterType } from "#enums/mystery-encounter-type";
+import { Species } from "#enums/species";
import GameManager from "#app/test/utils/gameManager";
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption } from "#test/mystery-encounter/encounter-test-utils";
@@ -12,15 +12,15 @@ import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
-import MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter";
+import MysteryEncounter from "#mystery-encounters/mystery-encounter";
import { Nature } from "#enums/nature";
-import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases";
-import { CommandPhase } from "#app/phases/command-phase";
-import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
-import { FunAndGamesEncounter } from "#app/data/mystery-encounters/encounters/fun-and-games-encounter";
+import { MysteryEncounterPhase } from "#phases/mystery-encounter-phases";
+import { CommandPhase } from "#phases/command-phase";
+import { SelectModifierPhase } from "#phases/select-modifier-phase";
+import { FunAndGamesEncounter } from "#mystery-encounters/encounters/fun-and-games-encounter";
import { Moves } from "#enums/moves";
import { Command } from "#app/ui/command-ui-handler";
-import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import * as EncounterPhaseUtils from "#mystery-encounters/utils/encounter-phase-utils";
const namespace = "mysteryEncounters/funAndGames";
const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ];
diff --git a/src/test/mystery-encounter/encounters/global-trade-system-encounter.test.ts b/src/test/mystery-encounter/encounters/global-trade-system-encounter.test.ts
index b08f8008b682..46b248dd6a05 100644
--- a/src/test/mystery-encounter/encounters/global-trade-system-encounter.test.ts
+++ b/src/test/mystery-encounter/encounters/global-trade-system-encounter.test.ts
@@ -1,20 +1,20 @@
-import { Biome } from "#app/enums/biome";
-import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
-import { Species } from "#app/enums/species";
+import { Biome } from "#enums/biome";
+import { MysteryEncounterType } from "#enums/mystery-encounter-type";
+import { Species } from "#enums/species";
import GameManager from "#app/test/utils/gameManager";
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import * as EncounterPhaseUtils from "#mystery-encounters/utils/encounter-phase-utils";
import { runMysteryEncounterToEnd } from "#test/mystery-encounter/encounter-test-utils";
import BattleScene from "#app/battle-scene";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters";
+import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
import { PokemonNatureWeightModifier } from "#app/modifier/modifier";
-import { generateModifierType } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import { generateModifierType } from "#mystery-encounters/utils/encounter-phase-utils";
import { modifierTypes } from "#app/modifier/modifier-type";
-import { GlobalTradeSystemEncounter } from "#app/data/mystery-encounters/encounters/global-trade-system-encounter";
-import { CIVILIZATION_ENCOUNTER_BIOMES } from "#app/data/mystery-encounters/mystery-encounters";
-import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
+import { GlobalTradeSystemEncounter } from "#mystery-encounters/encounters/global-trade-system-encounter";
+import { CIVILIZATION_ENCOUNTER_BIOMES } from "#mystery-encounters/mystery-encounters";
+import { SelectModifierPhase } from "#phases/select-modifier-phase";
import { Mode } from "#app/ui/ui";
import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
import { ModifierTier } from "#app/modifier/modifier-tier";
diff --git a/src/test/mystery-encounter/encounters/lost-at-sea-encounter.test.ts b/src/test/mystery-encounter/encounters/lost-at-sea-encounter.test.ts
index dec14d46cc8c..4c1edbb1ed61 100644
--- a/src/test/mystery-encounter/encounters/lost-at-sea-encounter.test.ts
+++ b/src/test/mystery-encounter/encounters/lost-at-sea-encounter.test.ts
@@ -1,10 +1,10 @@
-import { LostAtSeaEncounter } from "#app/data/mystery-encounters/encounters/lost-at-sea-encounter";
-import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters";
-import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import { LostAtSeaEncounter } from "#mystery-encounters/encounters/lost-at-sea-encounter";
+import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
+import * as EncounterPhaseUtils from "#mystery-encounters/utils/encounter-phase-utils";
import { getPokemonSpecies } from "#app/data/pokemon-species";
-import { Biome } from "#app/enums/biome";
-import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
-import { Species } from "#app/enums/species";
+import { Biome } from "#enums/biome";
+import { MysteryEncounterType } from "#enums/mystery-encounter-type";
+import { Species } from "#enums/species";
import GameManager from "#app/test/utils/gameManager";
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption } from "../encounter-test-utils";
@@ -12,8 +12,8 @@ import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
import BattleScene from "#app/battle-scene";
-import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases";
-import { PartyExpPhase } from "#app/phases/party-exp-phase";
+import { MysteryEncounterPhase } from "#phases/mystery-encounter-phases";
+import { PartyExpPhase } from "#phases/party-exp-phase";
import i18next from "i18next";
diff --git a/src/test/mystery-encounter/encounters/mysterious-challengers-encounter.test.ts b/src/test/mystery-encounter/encounters/mysterious-challengers-encounter.test.ts
index 7bbc505dd8eb..c194e08ac6f1 100644
--- a/src/test/mystery-encounter/encounters/mysterious-challengers-encounter.test.ts
+++ b/src/test/mystery-encounter/encounters/mysterious-challengers-encounter.test.ts
@@ -1,8 +1,8 @@
-import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters";
-import { HUMAN_TRANSITABLE_BIOMES } from "#app/data/mystery-encounters/mystery-encounters";
-import { Biome } from "#app/enums/biome";
-import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
-import { Species } from "#app/enums/species";
+import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
+import { HUMAN_TRANSITABLE_BIOMES } from "#mystery-encounters/mystery-encounters";
+import { Biome } from "#enums/biome";
+import { MysteryEncounterType } from "#enums/mystery-encounter-type";
+import { Species } from "#enums/species";
import GameManager from "#app/test/utils/gameManager";
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
import { runMysteryEncounterToEnd, skipBattleRunMysteryEncounterRewardsPhase } from "#test/mystery-encounter/encounter-test-utils";
@@ -12,14 +12,14 @@ import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
import { ModifierTier } from "#app/modifier/modifier-tier";
-import { MysteriousChallengersEncounter } from "#app/data/mystery-encounters/encounters/mysterious-challengers-encounter";
+import { MysteriousChallengersEncounter } from "#mystery-encounters/encounters/mysterious-challengers-encounter";
import { TrainerConfig, TrainerPartyCompoundTemplate, TrainerPartyTemplate } from "#app/data/trainer-config";
import { PartyMemberStrength } from "#enums/party-member-strength";
import { MysteryEncounterMode } from "#enums/mystery-encounter-mode";
import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
-import MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter";
-import { CommandPhase } from "#app/phases/command-phase";
-import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
+import MysteryEncounter from "#mystery-encounters/mystery-encounter";
+import { CommandPhase } from "#phases/command-phase";
+import { SelectModifierPhase } from "#phases/select-modifier-phase";
const namespace = "mysteryEncounters/mysteriousChallengers";
const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ];
diff --git a/src/test/mystery-encounter/encounters/part-timer-encounter.test.ts b/src/test/mystery-encounter/encounters/part-timer-encounter.test.ts
index ba8ce648a3f5..428ba0f80f18 100644
--- a/src/test/mystery-encounter/encounters/part-timer-encounter.test.ts
+++ b/src/test/mystery-encounter/encounters/part-timer-encounter.test.ts
@@ -1,19 +1,19 @@
-import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters";
-import { Biome } from "#app/enums/biome";
-import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
-import { Species } from "#app/enums/species";
+import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
+import { Biome } from "#enums/biome";
+import { MysteryEncounterType } from "#enums/mystery-encounter-type";
+import { Species } from "#enums/species";
import GameManager from "#app/test/utils/gameManager";
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import * as EncounterPhaseUtils from "#mystery-encounters/utils/encounter-phase-utils";
import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption } from "#test/mystery-encounter/encounter-test-utils";
import BattleScene from "#app/battle-scene";
-import { CIVILIZATION_ENCOUNTER_BIOMES } from "#app/data/mystery-encounters/mystery-encounters";
+import { CIVILIZATION_ENCOUNTER_BIOMES } from "#mystery-encounters/mystery-encounters";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
-import { PartTimerEncounter } from "#app/data/mystery-encounters/encounters/part-timer-encounter";
+import { PartTimerEncounter } from "#mystery-encounters/encounters/part-timer-encounter";
import { PokemonMove } from "#app/field/pokemon";
import { Moves } from "#enums/moves";
-import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases";
+import { MysteryEncounterPhase } from "#phases/mystery-encounter-phases";
const namespace = "mysteryEncounters/partTimer";
// Pyukumuku for lowest speed, Regieleki for highest speed, Feebas for lowest "bulk", Melmetal for highest "bulk"
diff --git a/src/test/mystery-encounter/encounters/teleporting-hijinks-encounter.test.ts b/src/test/mystery-encounter/encounters/teleporting-hijinks-encounter.test.ts
index 02375d83b98c..e01ab7474b42 100644
--- a/src/test/mystery-encounter/encounters/teleporting-hijinks-encounter.test.ts
+++ b/src/test/mystery-encounter/encounters/teleporting-hijinks-encounter.test.ts
@@ -1,13 +1,13 @@
import BattleScene from "#app/battle-scene";
-import { TeleportingHijinksEncounter } from "#app/data/mystery-encounters/encounters/teleporting-hijinks-encounter";
-import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters";
+import { TeleportingHijinksEncounter } from "#mystery-encounters/encounters/teleporting-hijinks-encounter";
+import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
import { Abilities } from "#enums/abilities";
import { Biome } from "#enums/biome";
import { MysteryEncounterType } from "#enums/mystery-encounter-type";
import { Species } from "#enums/species";
-import { CommandPhase } from "#app/phases/command-phase";
-import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases";
-import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
+import { CommandPhase } from "#phases/command-phase";
+import { MysteryEncounterPhase } from "#phases/mystery-encounter-phases";
+import { SelectModifierPhase } from "#phases/select-modifier-phase";
import GameManager from "#test/utils/gameManager";
import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
import { Mode } from "#app/ui/ui";
diff --git a/src/test/mystery-encounter/encounters/the-expert-breeder-encounter.test.ts b/src/test/mystery-encounter/encounters/the-expert-breeder-encounter.test.ts
index a3a43815ec65..eeaff9ef7f76 100644
--- a/src/test/mystery-encounter/encounters/the-expert-breeder-encounter.test.ts
+++ b/src/test/mystery-encounter/encounters/the-expert-breeder-encounter.test.ts
@@ -1,8 +1,8 @@
-import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters";
-import { HUMAN_TRANSITABLE_BIOMES } from "#app/data/mystery-encounters/mystery-encounters";
-import { Biome } from "#app/enums/biome";
-import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
-import { Species } from "#app/enums/species";
+import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
+import { HUMAN_TRANSITABLE_BIOMES } from "#mystery-encounters/mystery-encounters";
+import { Biome } from "#enums/biome";
+import { MysteryEncounterType } from "#enums/mystery-encounter-type";
+import { Species } from "#enums/species";
import GameManager from "#app/test/utils/gameManager";
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
import { runMysteryEncounterToEnd, skipBattleRunMysteryEncounterRewardsPhase } from "#test/mystery-encounter/encounter-test-utils";
@@ -11,13 +11,13 @@ import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
import { MysteryEncounterMode } from "#enums/mystery-encounter-mode";
-import MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter";
-import { CommandPhase } from "#app/phases/command-phase";
-import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
-import { TheExpertPokemonBreederEncounter } from "#app/data/mystery-encounters/encounters/the-expert-pokemon-breeder-encounter";
+import MysteryEncounter from "#mystery-encounters/mystery-encounter";
+import { CommandPhase } from "#phases/command-phase";
+import { SelectModifierPhase } from "#phases/select-modifier-phase";
+import { TheExpertPokemonBreederEncounter } from "#mystery-encounters/encounters/the-expert-pokemon-breeder-encounter";
import { TrainerType } from "#enums/trainer-type";
import { EggTier } from "#enums/egg-type";
-import { PostMysteryEncounterPhase } from "#app/phases/mystery-encounter-phases";
+import { PostMysteryEncounterPhase } from "#phases/mystery-encounter-phases";
const namespace = "mysteryEncounters/theExpertPokemonBreeder";
const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ];
diff --git a/src/test/mystery-encounter/encounters/the-pokemon-salesman-encounter.test.ts b/src/test/mystery-encounter/encounters/the-pokemon-salesman-encounter.test.ts
index 040381c4ac3b..bc6c392d3ccd 100644
--- a/src/test/mystery-encounter/encounters/the-pokemon-salesman-encounter.test.ts
+++ b/src/test/mystery-encounter/encounters/the-pokemon-salesman-encounter.test.ts
@@ -1,19 +1,19 @@
-import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters";
-import { Biome } from "#app/enums/biome";
-import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
-import { Species } from "#app/enums/species";
+import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
+import { Biome } from "#enums/biome";
+import { MysteryEncounterType } from "#enums/mystery-encounter-type";
+import { Species } from "#enums/species";
import GameManager from "#app/test/utils/gameManager";
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import * as EncounterPhaseUtils from "#mystery-encounters/utils/encounter-phase-utils";
import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption } from "#test/mystery-encounter/encounter-test-utils";
import BattleScene from "#app/battle-scene";
import { PlayerPokemon } from "#app/field/pokemon";
-import { HUMAN_TRANSITABLE_BIOMES } from "#app/data/mystery-encounters/mystery-encounters";
-import { ThePokemonSalesmanEncounter } from "#app/data/mystery-encounters/encounters/the-pokemon-salesman-encounter";
+import { HUMAN_TRANSITABLE_BIOMES } from "#mystery-encounters/mystery-encounters";
+import { ThePokemonSalesmanEncounter } from "#mystery-encounters/encounters/the-pokemon-salesman-encounter";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
-import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases";
+import { MysteryEncounterPhase } from "#phases/mystery-encounter-phases";
const namespace = "mysteryEncounters/thePokemonSalesman";
const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ];
diff --git a/src/test/mystery-encounter/encounters/the-strong-stuff-encounter.test.ts b/src/test/mystery-encounter/encounters/the-strong-stuff-encounter.test.ts
index 4d95ff31d362..4f6af7ded6f4 100644
--- a/src/test/mystery-encounter/encounters/the-strong-stuff-encounter.test.ts
+++ b/src/test/mystery-encounter/encounters/the-strong-stuff-encounter.test.ts
@@ -1,16 +1,16 @@
-import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters";
-import { Biome } from "#app/enums/biome";
-import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
-import { Species } from "#app/enums/species";
+import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
+import { Biome } from "#enums/biome";
+import { MysteryEncounterType } from "#enums/mystery-encounter-type";
+import { Species } from "#enums/species";
import GameManager from "#app/test/utils/gameManager";
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
import { getPokemonSpecies } from "#app/data/pokemon-species";
import * as BattleAnims from "#app/data/battle-anims";
-import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import * as EncounterPhaseUtils from "#mystery-encounters/utils/encounter-phase-utils";
import { runMysteryEncounterToEnd, skipBattleRunMysteryEncounterRewardsPhase } from "#test/mystery-encounter/encounter-test-utils";
import { Moves } from "#enums/moves";
import BattleScene from "#app/battle-scene";
-import { TheStrongStuffEncounter } from "#app/data/mystery-encounters/encounters/the-strong-stuff-encounter";
+import { TheStrongStuffEncounter } from "#mystery-encounters/encounters/the-strong-stuff-encounter";
import { Nature } from "#app/data/nature";
import { BerryType } from "#enums/berry-type";
import { BattlerTagType } from "#enums/battler-tag-type";
@@ -22,10 +22,10 @@ import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
import { CustomPokemonData } from "#app/data/custom-pokemon-data";
-import { CommandPhase } from "#app/phases/command-phase";
-import { MovePhase } from "#app/phases/move-phase";
-import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
-import { Abilities } from "#app/enums/abilities";
+import { CommandPhase } from "#phases/command-phase";
+import { MovePhase } from "#phases/move-phase";
+import { SelectModifierPhase } from "#phases/select-modifier-phase";
+import { Abilities } from "#enums/abilities";
const namespace = "mysteryEncounters/theStrongStuff";
const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ];
diff --git a/src/test/mystery-encounter/encounters/the-winstrate-challenge-encounter.test.ts b/src/test/mystery-encounter/encounters/the-winstrate-challenge-encounter.test.ts
index 2653b76ab7c0..03afbaa883ed 100644
--- a/src/test/mystery-encounter/encounters/the-winstrate-challenge-encounter.test.ts
+++ b/src/test/mystery-encounter/encounters/the-winstrate-challenge-encounter.test.ts
@@ -1,8 +1,8 @@
-import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters";
-import { HUMAN_TRANSITABLE_BIOMES } from "#app/data/mystery-encounters/mystery-encounters";
-import { Biome } from "#app/enums/biome";
-import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
-import { Species } from "#app/enums/species";
+import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
+import { HUMAN_TRANSITABLE_BIOMES } from "#mystery-encounters/mystery-encounters";
+import { Biome } from "#enums/biome";
+import { MysteryEncounterType } from "#enums/mystery-encounter-type";
+import { Species } from "#enums/species";
import GameManager from "#app/test/utils/gameManager";
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
import { runMysteryEncounterToEnd } from "#test/mystery-encounter/encounter-test-utils";
@@ -13,18 +13,18 @@ import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
import { MysteryEncounterMode } from "#enums/mystery-encounter-mode";
import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
-import MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter";
+import MysteryEncounter from "#mystery-encounters/mystery-encounter";
import { TrainerType } from "#enums/trainer-type";
import { Nature } from "#enums/nature";
import { Moves } from "#enums/moves";
import { getPokemonSpecies } from "#app/data/pokemon-species";
-import { TheWinstrateChallengeEncounter } from "#app/data/mystery-encounters/encounters/the-winstrate-challenge-encounter";
+import { TheWinstrateChallengeEncounter } from "#mystery-encounters/encounters/the-winstrate-challenge-encounter";
import { Status, StatusEffect } from "#app/data/status-effect";
-import { MysteryEncounterRewardsPhase } from "#app/phases/mystery-encounter-phases";
-import { CommandPhase } from "#app/phases/command-phase";
-import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
-import { PartyHealPhase } from "#app/phases/party-heal-phase";
-import { VictoryPhase } from "#app/phases/victory-phase";
+import { MysteryEncounterRewardsPhase } from "#phases/mystery-encounter-phases";
+import { CommandPhase } from "#phases/command-phase";
+import { SelectModifierPhase } from "#phases/select-modifier-phase";
+import { PartyHealPhase } from "#phases/party-heal-phase";
+import { VictoryPhase } from "#phases/victory-phase";
const namespace = "mysteryEncounters/theWinstrateChallenge";
const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ];
diff --git a/src/test/mystery-encounter/encounters/trash-to-treasure-encounter.test.ts b/src/test/mystery-encounter/encounters/trash-to-treasure-encounter.test.ts
index d761f2d1b211..9a0ad11b5961 100644
--- a/src/test/mystery-encounter/encounters/trash-to-treasure-encounter.test.ts
+++ b/src/test/mystery-encounter/encounters/trash-to-treasure-encounter.test.ts
@@ -1,12 +1,12 @@
-import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters";
-import { Biome } from "#app/enums/biome";
-import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
-import { Species } from "#app/enums/species";
+import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
+import { Biome } from "#enums/biome";
+import { MysteryEncounterType } from "#enums/mystery-encounter-type";
+import { Species } from "#enums/species";
import GameManager from "#app/test/utils/gameManager";
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
import { getPokemonSpecies } from "#app/data/pokemon-species";
import * as BattleAnims from "#app/data/battle-anims";
-import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import * as EncounterPhaseUtils from "#mystery-encounters/utils/encounter-phase-utils";
import { runMysteryEncounterToEnd, skipBattleRunMysteryEncounterRewardsPhase } from "#test/mystery-encounter/encounter-test-utils";
import { Moves } from "#enums/moves";
import BattleScene from "#app/battle-scene";
@@ -17,11 +17,11 @@ import { HitHealModifier, HealShopCostModifier, TurnHealModifier } from "#app/mo
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
-import { TrashToTreasureEncounter } from "#app/data/mystery-encounters/encounters/trash-to-treasure-encounter";
+import { TrashToTreasureEncounter } from "#mystery-encounters/encounters/trash-to-treasure-encounter";
import { ModifierTier } from "#app/modifier/modifier-tier";
-import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
-import { CommandPhase } from "#app/phases/command-phase";
-import { MovePhase } from "#app/phases/move-phase";
+import { SelectModifierPhase } from "#phases/select-modifier-phase";
+import { CommandPhase } from "#phases/command-phase";
+import { MovePhase } from "#phases/move-phase";
const namespace = "mysteryEncounters/trashToTreasure";
const defaultParty = [ Species.LAPRAS, Species.GENGAR, Species.ABRA ];
diff --git a/src/test/mystery-encounter/encounters/uncommon-breed-encounter.test.ts b/src/test/mystery-encounter/encounters/uncommon-breed-encounter.test.ts
index fa1b5ecdeb78..324d816fed4e 100644
--- a/src/test/mystery-encounter/encounters/uncommon-breed-encounter.test.ts
+++ b/src/test/mystery-encounter/encounters/uncommon-breed-encounter.test.ts
@@ -1,7 +1,7 @@
-import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters";
-import { Biome } from "#app/enums/biome";
-import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
-import { Species } from "#app/enums/species";
+import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
+import { Biome } from "#enums/biome";
+import { MysteryEncounterType } from "#enums/mystery-encounter-type";
+import { Species } from "#enums/species";
import GameManager from "#app/test/utils/gameManager";
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
import { runMysteryEncounterToEnd, runSelectMysteryEncounterOption } from "#test/mystery-encounter/encounter-test-utils";
@@ -11,16 +11,16 @@ import { PokemonMove } from "#app/field/pokemon";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
-import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import { generateModifierType } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases";
-import { CommandPhase } from "#app/phases/command-phase";
-import { UncommonBreedEncounter } from "#app/data/mystery-encounters/encounters/uncommon-breed-encounter";
-import { MovePhase } from "#app/phases/move-phase";
-import { speciesEggMoves } from "#app/data/balance/egg-moves";
+import * as EncounterPhaseUtils from "#mystery-encounters/utils/encounter-phase-utils";
+import { generateModifierType } from "#mystery-encounters/utils/encounter-phase-utils";
+import { MysteryEncounterPhase } from "#phases/mystery-encounter-phases";
+import { CommandPhase } from "#phases/command-phase";
+import { UncommonBreedEncounter } from "#mystery-encounters/encounters/uncommon-breed-encounter";
+import { MovePhase } from "#phases/move-phase";
+import { speciesEggMoves } from "#balance/egg-moves";
import { getPokemonSpecies } from "#app/data/pokemon-species";
import { BerryType } from "#enums/berry-type";
-import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
+import { StatStageChangePhase } from "#phases/stat-stage-change-phase";
import { Stat } from "#enums/stat";
import { BerryModifier } from "#app/modifier/modifier";
import { modifierTypes } from "#app/modifier/modifier-type";
diff --git a/src/test/mystery-encounter/encounters/weird-dream-encounter.test.ts b/src/test/mystery-encounter/encounters/weird-dream-encounter.test.ts
index 0d463655a526..3dc4e661105e 100644
--- a/src/test/mystery-encounter/encounters/weird-dream-encounter.test.ts
+++ b/src/test/mystery-encounter/encounters/weird-dream-encounter.test.ts
@@ -1,10 +1,10 @@
-import * as MysteryEncounters from "#app/data/mystery-encounters/mystery-encounters";
-import { Biome } from "#app/enums/biome";
-import { MysteryEncounterType } from "#app/enums/mystery-encounter-type";
-import { Species } from "#app/enums/species";
+import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
+import { Biome } from "#enums/biome";
+import { MysteryEncounterType } from "#enums/mystery-encounter-type";
+import { Species } from "#enums/species";
import GameManager from "#app/test/utils/gameManager";
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import * as EncounterPhaseUtils from "#app/data/mystery-encounters/utils/encounter-phase-utils";
+import * as EncounterPhaseUtils from "#mystery-encounters/utils/encounter-phase-utils";
import { runMysteryEncounterToEnd } from "#test/mystery-encounter/encounter-test-utils";
import BattleScene from "#app/battle-scene";
import { Mode } from "#app/ui/ui";
@@ -12,9 +12,9 @@ import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
-import { WeirdDreamEncounter } from "#app/data/mystery-encounters/encounters/weird-dream-encounter";
-import * as EncounterTransformationSequence from "#app/data/mystery-encounters/utils/encounter-transformation-sequence";
-import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
+import { WeirdDreamEncounter } from "#mystery-encounters/encounters/weird-dream-encounter";
+import * as EncounterTransformationSequence from "#mystery-encounters/utils/encounter-transformation-sequence";
+import { SelectModifierPhase } from "#phases/select-modifier-phase";
const namespace = "mysteryEncounters/weirdDream";
const defaultParty = [ Species.MAGBY, Species.HAUNTER, Species.ABRA ];
diff --git a/src/test/mystery-encounter/mystery-encounter-utils.test.ts b/src/test/mystery-encounter/mystery-encounter-utils.test.ts
index 134966a188d7..654836d4d016 100644
--- a/src/test/mystery-encounter/mystery-encounter-utils.test.ts
+++ b/src/test/mystery-encounter/mystery-encounter-utils.test.ts
@@ -5,13 +5,13 @@ import { initSceneWithoutEncounterPhase } from "#test/utils/gameManagerUtils";
import { Species } from "#enums/species";
import BattleScene from "#app/battle-scene";
import { StatusEffect } from "#app/data/status-effect";
-import MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter";
+import MysteryEncounter from "#mystery-encounters/mystery-encounter";
import { getPokemonSpecies } from "#app/data/pokemon-species";
-import { speciesStarterCosts } from "#app/data/balance/starters";
+import { speciesStarterCosts } from "#balance/starters";
import { Type } from "#app/data/type";
-import { getHighestLevelPlayerPokemon, getLowestLevelPlayerPokemon, getRandomPlayerPokemon, getRandomSpeciesByStarterTier, koPlayerPokemon } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
-import { getEncounterText, queueEncounterMessage, showEncounterDialogue, showEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
-import { MessagePhase } from "#app/phases/message-phase";
+import { getHighestLevelPlayerPokemon, getLowestLevelPlayerPokemon, getRandomPlayerPokemon, getRandomSpeciesByStarterTier, koPlayerPokemon } from "#mystery-encounters/utils/encounter-pokemon-utils";
+import { getEncounterText, queueEncounterMessage, showEncounterDialogue, showEncounterText } from "#mystery-encounters/utils/encounter-dialogue-utils";
+import { MessagePhase } from "#phases/message-phase";
describe("Mystery Encounter Utils", () => {
let phaserGame: Phaser.Game;
diff --git a/src/test/mystery-encounter/mystery-encounter.test.ts b/src/test/mystery-encounter/mystery-encounter.test.ts
index eaf6e04a639c..65922a1fd628 100644
--- a/src/test/mystery-encounter/mystery-encounter.test.ts
+++ b/src/test/mystery-encounter/mystery-encounter.test.ts
@@ -2,7 +2,7 @@ import { afterEach, beforeAll, beforeEach, expect, describe, it } from "vitest";
import GameManager from "#app/test/utils/gameManager";
import Phaser from "phaser";
import { Species } from "#enums/species";
-import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases";
+import { MysteryEncounterPhase } from "#phases/mystery-encounter-phases";
import { MysteryEncounterType } from "#enums/mystery-encounter-type";
import BattleScene from "#app/battle-scene";
diff --git a/src/test/phases/learn-move-phase.test.ts b/src/test/phases/learn-move-phase.test.ts
index c4fa0e8bf459..66771280111d 100644
--- a/src/test/phases/learn-move-phase.test.ts
+++ b/src/test/phases/learn-move-phase.test.ts
@@ -3,7 +3,7 @@ import Phaser from "phaser";
import GameManager from "#test/utils/gameManager";
import { Species } from "#enums/species";
import { Moves } from "#enums/moves";
-import { LearnMovePhase } from "#app/phases/learn-move-phase";
+import { LearnMovePhase } from "#phases/learn-move-phase";
describe("Learn Move Phase", () => {
let phaserGame: Phaser.Game;
diff --git a/src/test/phases/mystery-encounter-phase.test.ts b/src/test/phases/mystery-encounter-phase.test.ts
index 32e31ce1c94c..5785562808ff 100644
--- a/src/test/phases/mystery-encounter-phase.test.ts
+++ b/src/test/phases/mystery-encounter-phase.test.ts
@@ -2,7 +2,7 @@ import { afterEach, beforeAll, beforeEach, expect, describe, it, vi } from "vite
import GameManager from "#app/test/utils/gameManager";
import Phaser from "phaser";
import { Species } from "#enums/species";
-import { MysteryEncounterOptionSelectedPhase, MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases";
+import { MysteryEncounterOptionSelectedPhase, MysteryEncounterPhase } from "#phases/mystery-encounter-phases";
import { Mode } from "#app/ui/ui";
import { Button } from "#enums/buttons";
import MysteryEncounterUiHandler from "#app/ui/mystery-encounter-ui-handler";
diff --git a/src/test/phases/phases.test.ts b/src/test/phases/phases.test.ts
index 5ef25361a3f1..80698a3c4cf6 100644
--- a/src/test/phases/phases.test.ts
+++ b/src/test/phases/phases.test.ts
@@ -1,7 +1,7 @@
import BattleScene from "#app/battle-scene";
-import { LoginPhase } from "#app/phases/login-phase";
-import { TitlePhase } from "#app/phases/title-phase";
-import { UnavailablePhase } from "#app/phases/unavailable-phase";
+import { LoginPhase } from "#phases/login-phase";
+import { TitlePhase } from "#phases/title-phase";
+import { UnavailablePhase } from "#phases/unavailable-phase";
import { Mode } from "#app/ui/ui";
import GameManager from "#test/utils/gameManager";
import Phaser from "phaser";
diff --git a/src/test/phases/select-modifier-phase.test.ts b/src/test/phases/select-modifier-phase.test.ts
index a945aff055bd..cc20ea0be022 100644
--- a/src/test/phases/select-modifier-phase.test.ts
+++ b/src/test/phases/select-modifier-phase.test.ts
@@ -4,14 +4,14 @@ import GameManager from "#app/test/utils/gameManager";
import { initSceneWithoutEncounterPhase } from "#app/test/utils/gameManagerUtils";
import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
import { ModifierTier } from "#app/modifier/modifier-tier";
-import * as Utils from "#app/utils";
+import { shiftCharCodes } from "#app/utils";
import { CustomModifierSettings, ModifierTypeOption, modifierTypes } from "#app/modifier/modifier-type";
import BattleScene from "#app/battle-scene";
import { Species } from "#enums/species";
import { Mode } from "#app/ui/ui";
import { PlayerPokemon } from "#app/field/pokemon";
import { getPokemonSpecies } from "#app/data/pokemon-species";
-import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
+import { SelectModifierPhase } from "#phases/select-modifier-phase";
describe("SelectModifierPhase", () => {
let phaserGame: Phaser.Game;
@@ -93,7 +93,7 @@ describe("SelectModifierPhase", () => {
it("should generate random modifiers of same tier for reroll with reroll lock", async () => {
// Just use fully random seed for this test
vi.spyOn(scene, "resetSeed").mockImplementation(() => {
- scene.waveSeed = Utils.shiftCharCodes(scene.seed, 5);
+ scene.waveSeed = shiftCharCodes(scene.seed, 5);
Phaser.Math.RND.sow([ scene.waveSeed ]);
console.log("Wave Seed:", scene.waveSeed, 5);
scene.rngCounter = 0;
diff --git a/src/test/ui/battle_info.test.ts b/src/test/ui/battle_info.test.ts
index 3100372f0918..2ce7f2736515 100644
--- a/src/test/ui/battle_info.test.ts
+++ b/src/test/ui/battle_info.test.ts
@@ -1,6 +1,6 @@
-import { ExpGainsSpeed } from "#app/enums/exp-gains-speed";
-import { Species } from "#app/enums/species";
-import { ExpPhase } from "#app/phases/exp-phase";
+import { ExpGainsSpeed } from "#enums/exp-gains-speed";
+import { Species } from "#enums/species";
+import { ExpPhase } from "#phases/exp-phase";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import GameManager from "#test/utils/gameManager";
diff --git a/src/test/ui/starter-select.test.ts b/src/test/ui/starter-select.test.ts
index 94370ca1b748..989e9affee58 100644
--- a/src/test/ui/starter-select.test.ts
+++ b/src/test/ui/starter-select.test.ts
@@ -2,9 +2,9 @@ import { Gender } from "#app/data/gender";
import { Nature } from "#app/data/nature";
import { allSpecies } from "#app/data/pokemon-species";
import { GameModes } from "#app/game-mode";
-import { EncounterPhase } from "#app/phases/encounter-phase";
-import { SelectStarterPhase } from "#app/phases/select-starter-phase";
-import { TitlePhase } from "#app/phases/title-phase";
+import { EncounterPhase } from "#phases/encounter-phase";
+import { SelectStarterPhase } from "#phases/select-starter-phase";
+import { TitlePhase } from "#phases/title-phase";
import { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler";
import SaveSlotSelectUiHandler from "#app/ui/save-slot-select-ui-handler";
import OptionSelectUiHandler from "#app/ui/settings/option-select-ui-handler";
diff --git a/src/test/ui/transfer-item.test.ts b/src/test/ui/transfer-item.test.ts
index 0fbd4a52c619..366ea9f3cc4e 100644
--- a/src/test/ui/transfer-item.test.ts
+++ b/src/test/ui/transfer-item.test.ts
@@ -1,9 +1,9 @@
-import { BerryType } from "#app/enums/berry-type";
-import { Button } from "#app/enums/buttons";
-import { Moves } from "#app/enums/moves";
-import { Species } from "#app/enums/species";
-import { BattleEndPhase } from "#app/phases/battle-end-phase";
-import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
+import { BerryType } from "#enums/berry-type";
+import { Button } from "#enums/buttons";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { BattleEndPhase } from "#phases/battle-end-phase";
+import { SelectModifierPhase } from "#phases/select-modifier-phase";
import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler";
import PartyUiHandler, { PartyUiMode } from "#app/ui/party-ui-handler";
import { Mode } from "#app/ui/ui";
diff --git a/src/test/ui/type-hints.test.ts b/src/test/ui/type-hints.test.ts
index 2977262dda7f..b96236b18249 100644
--- a/src/test/ui/type-hints.test.ts
+++ b/src/test/ui/type-hints.test.ts
@@ -1,7 +1,7 @@
-import { Button } from "#app/enums/buttons";
-import { Moves } from "#app/enums/moves";
-import { Species } from "#app/enums/species";
-import { CommandPhase } from "#app/phases/command-phase";
+import { Button } from "#enums/buttons";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
+import { CommandPhase } from "#phases/command-phase";
import FightUiHandler from "#app/ui/fight-ui-handler";
import { Mode } from "#app/ui/ui";
import GameManager from "#test/utils/gameManager";
diff --git a/src/test/utils/gameManager.ts b/src/test/utils/gameManager.ts
index 86c51972c8bc..96b55fecd9b6 100644
--- a/src/test/utils/gameManager.ts
+++ b/src/test/utils/gameManager.ts
@@ -1,27 +1,27 @@
import { updateUserInfo } from "#app/account";
import { BattlerIndex } from "#app/battle";
import BattleScene from "#app/battle-scene";
-import { BattleStyle } from "#app/enums/battle-style";
-import { Moves } from "#app/enums/moves";
+import { BattleStyle } from "#enums/battle-style";
+import { Moves } from "#enums/moves";
import { getMoveTargets } from "#app/data/move";
import { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon";
import Trainer from "#app/field/trainer";
import { GameModes, getGameMode } from "#app/game-mode";
import { ModifierTypeOption, modifierTypes } from "#app/modifier/modifier-type";
import overrides from "#app/overrides";
-import { CommandPhase } from "#app/phases/command-phase";
-import { EncounterPhase } from "#app/phases/encounter-phase";
-import { EnemyCommandPhase } from "#app/phases/enemy-command-phase";
-import { FaintPhase } from "#app/phases/faint-phase";
-import { LoginPhase } from "#app/phases/login-phase";
-import { MovePhase } from "#app/phases/move-phase";
-import { NewBattlePhase } from "#app/phases/new-battle-phase";
-import { SelectStarterPhase } from "#app/phases/select-starter-phase";
-import { SelectTargetPhase } from "#app/phases/select-target-phase";
-import { TitlePhase } from "#app/phases/title-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
-import { TurnInitPhase } from "#app/phases/turn-init-phase";
-import { TurnStartPhase } from "#app/phases/turn-start-phase";
+import { CommandPhase } from "#phases/command-phase";
+import { EncounterPhase } from "#phases/encounter-phase";
+import { EnemyCommandPhase } from "#phases/enemy-command-phase";
+import { FaintPhase } from "#phases/faint-phase";
+import { LoginPhase } from "#phases/login-phase";
+import { MovePhase } from "#phases/move-phase";
+import { NewBattlePhase } from "#phases/new-battle-phase";
+import { SelectStarterPhase } from "#phases/select-starter-phase";
+import { SelectTargetPhase } from "#phases/select-target-phase";
+import { TitlePhase } from "#phases/title-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
+import { TurnInitPhase } from "#phases/turn-init-phase";
+import { TurnStartPhase } from "#phases/turn-start-phase";
import ErrorInterceptor from "#app/test/utils/errorInterceptor";
import InputsHandler from "#app/test/utils/inputsHandler";
import CommandUiHandler from "#app/ui/command-ui-handler";
@@ -48,13 +48,13 @@ import { OverridesHelper } from "./helpers/overridesHelper";
import { SettingsHelper } from "./helpers/settingsHelper";
import { ReloadHelper } from "./helpers/reloadHelper";
import { ModifierHelper } from "./helpers/modifiersHelper";
-import { CheckSwitchPhase } from "#app/phases/check-switch-phase";
+import { CheckSwitchPhase } from "#phases/check-switch-phase";
import BattleMessageUiHandler from "#app/ui/battle-message-ui-handler";
-import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases";
+import { MysteryEncounterPhase } from "#phases/mystery-encounter-phases";
import { expect } from "vitest";
import { MysteryEncounterType } from "#enums/mystery-encounter-type";
import { isNullOrUndefined } from "#app/utils";
-import { ExpGainsSpeed } from "#app/enums/exp-gains-speed";
+import { ExpGainsSpeed } from "#enums/exp-gains-speed";
/**
* Class to manage the game state and transitions between phases.
diff --git a/src/test/utils/gameManagerUtils.ts b/src/test/utils/gameManagerUtils.ts
index 543ee9627fea..03fd7172e395 100644
--- a/src/test/utils/gameManagerUtils.ts
+++ b/src/test/utils/gameManagerUtils.ts
@@ -2,7 +2,7 @@ import BattleScene from "#app/battle-scene";
import { getDailyRunStarters } from "#app/data/daily-run";
import { Gender } from "#app/data/gender";
import { getPokemonSpecies, getPokemonSpeciesForm } from "#app/data/pokemon-species";
-import { Moves } from "#app/enums/moves";
+import { Moves } from "#enums/moves";
import { PlayerPokemon } from "#app/field/pokemon";
import { GameModes, getGameMode } from "#app/game-mode";
import { Starter } from "#app/ui/starter-select-ui-handler";
diff --git a/src/test/utils/helpers/challengeModeHelper.ts b/src/test/utils/helpers/challengeModeHelper.ts
index 5210d942d5a7..39932bfd5349 100644
--- a/src/test/utils/helpers/challengeModeHelper.ts
+++ b/src/test/utils/helpers/challengeModeHelper.ts
@@ -1,14 +1,14 @@
-import { BattleStyle } from "#app/enums/battle-style";
-import { Species } from "#app/enums/species";
+import { BattleStyle } from "#enums/battle-style";
+import { Species } from "#enums/species";
import overrides from "#app/overrides";
-import { EncounterPhase } from "#app/phases/encounter-phase";
-import { SelectStarterPhase } from "#app/phases/select-starter-phase";
+import { EncounterPhase } from "#phases/encounter-phase";
+import { SelectStarterPhase } from "#phases/select-starter-phase";
import { Mode } from "#app/ui/ui";
import { generateStarter } from "../gameManagerUtils";
import { GameManagerHelper } from "./gameManagerHelper";
import { Challenge } from "#app/data/challenge";
-import { CommandPhase } from "#app/phases/command-phase";
-import { TurnInitPhase } from "#app/phases/turn-init-phase";
+import { CommandPhase } from "#phases/command-phase";
+import { TurnInitPhase } from "#phases/turn-init-phase";
import { Challenges } from "#enums/challenges";
import { copyChallenge } from "data/challenge";
diff --git a/src/test/utils/helpers/classicModeHelper.ts b/src/test/utils/helpers/classicModeHelper.ts
index 80d0b86de7b3..ceee5e787324 100644
--- a/src/test/utils/helpers/classicModeHelper.ts
+++ b/src/test/utils/helpers/classicModeHelper.ts
@@ -1,11 +1,11 @@
-import { BattleStyle } from "#app/enums/battle-style";
-import { Species } from "#app/enums/species";
+import { BattleStyle } from "#enums/battle-style";
+import { Species } from "#enums/species";
import { GameModes, getGameMode } from "#app/game-mode";
import overrides from "#app/overrides";
-import { CommandPhase } from "#app/phases/command-phase";
-import { EncounterPhase } from "#app/phases/encounter-phase";
-import { SelectStarterPhase } from "#app/phases/select-starter-phase";
-import { TurnInitPhase } from "#app/phases/turn-init-phase";
+import { CommandPhase } from "#phases/command-phase";
+import { EncounterPhase } from "#phases/encounter-phase";
+import { SelectStarterPhase } from "#phases/select-starter-phase";
+import { TurnInitPhase } from "#phases/turn-init-phase";
import { Mode } from "#app/ui/ui";
import { generateStarter } from "../gameManagerUtils";
import { GameManagerHelper } from "./gameManagerHelper";
diff --git a/src/test/utils/helpers/dailyModeHelper.ts b/src/test/utils/helpers/dailyModeHelper.ts
index 813544f85dfb..f1db38868d1c 100644
--- a/src/test/utils/helpers/dailyModeHelper.ts
+++ b/src/test/utils/helpers/dailyModeHelper.ts
@@ -1,10 +1,10 @@
-import { BattleStyle } from "#app/enums/battle-style";
-import { Button } from "#app/enums/buttons";
+import { BattleStyle } from "#enums/battle-style";
+import { Button } from "#enums/buttons";
import overrides from "#app/overrides";
-import { CommandPhase } from "#app/phases/command-phase";
-import { EncounterPhase } from "#app/phases/encounter-phase";
-import { TitlePhase } from "#app/phases/title-phase";
-import { TurnInitPhase } from "#app/phases/turn-init-phase";
+import { CommandPhase } from "#phases/command-phase";
+import { EncounterPhase } from "#phases/encounter-phase";
+import { TitlePhase } from "#phases/title-phase";
+import { TurnInitPhase } from "#phases/turn-init-phase";
import SaveSlotSelectUiHandler from "#app/ui/save-slot-select-ui-handler";
import { Mode } from "#app/ui/ui";
import { GameManagerHelper } from "./gameManagerHelper";
diff --git a/src/test/utils/helpers/moveHelper.ts b/src/test/utils/helpers/moveHelper.ts
index a0667d91f4c6..5ecd90945cd4 100644
--- a/src/test/utils/helpers/moveHelper.ts
+++ b/src/test/utils/helpers/moveHelper.ts
@@ -1,7 +1,7 @@
import { BattlerIndex } from "#app/battle";
-import { Moves } from "#app/enums/moves";
-import { CommandPhase } from "#app/phases/command-phase";
-import { MoveEffectPhase } from "#app/phases/move-effect-phase";
+import { Moves } from "#enums/moves";
+import { CommandPhase } from "#phases/command-phase";
+import { MoveEffectPhase } from "#phases/move-effect-phase";
import { Command } from "#app/ui/command-ui-handler";
import { Mode } from "#app/ui/ui";
import { vi } from "vitest";
diff --git a/src/test/utils/helpers/overridesHelper.ts b/src/test/utils/helpers/overridesHelper.ts
index ec4d8dbbe4c1..eac5c8509ba1 100644
--- a/src/test/utils/helpers/overridesHelper.ts
+++ b/src/test/utils/helpers/overridesHelper.ts
@@ -1,9 +1,9 @@
import { StatusEffect } from "#app/data/status-effect";
import { Weather, WeatherType } from "#app/data/weather";
-import { Abilities } from "#app/enums/abilities";
-import { Biome } from "#app/enums/biome";
-import { Moves } from "#app/enums/moves";
-import { Species } from "#app/enums/species";
+import { Abilities } from "#enums/abilities";
+import { Biome } from "#enums/biome";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
import * as GameMode from "#app/game-mode";
import { GameModes, getGameMode } from "#app/game-mode";
import { ModifierOverride } from "#app/modifier/modifier-type";
diff --git a/src/test/utils/helpers/reloadHelper.ts b/src/test/utils/helpers/reloadHelper.ts
index e0e538120cce..21dbcdc8b986 100644
--- a/src/test/utils/helpers/reloadHelper.ts
+++ b/src/test/utils/helpers/reloadHelper.ts
@@ -1,10 +1,10 @@
import { GameManagerHelper } from "./gameManagerHelper";
-import { TitlePhase } from "#app/phases/title-phase";
+import { TitlePhase } from "#phases/title-phase";
import { Mode } from "#app/ui/ui";
import { vi } from "vitest";
-import { BattleStyle } from "#app/enums/battle-style";
-import { CommandPhase } from "#app/phases/command-phase";
-import { TurnInitPhase } from "#app/phases/turn-init-phase";
+import { BattleStyle } from "#enums/battle-style";
+import { CommandPhase } from "#phases/command-phase";
+import { TurnInitPhase } from "#phases/turn-init-phase";
import { SessionSaveData } from "#app/system/game-data";
import GameManager from "../gameManager";
diff --git a/src/test/utils/helpers/settingsHelper.ts b/src/test/utils/helpers/settingsHelper.ts
index 83baa329cecc..73ecb05d0bd3 100644
--- a/src/test/utils/helpers/settingsHelper.ts
+++ b/src/test/utils/helpers/settingsHelper.ts
@@ -1,7 +1,7 @@
-import { PlayerGender } from "#app/enums/player-gender";
-import { BattleStyle } from "#app/enums/battle-style";
+import { PlayerGender } from "#enums/player-gender";
+import { BattleStyle } from "#enums/battle-style";
import { GameManagerHelper } from "./gameManagerHelper";
-import { ExpGainsSpeed } from "#app/enums/exp-gains-speed";
+import { ExpGainsSpeed } from "#enums/exp-gains-speed";
/**
* Helper to handle settings for tests
diff --git a/src/test/utils/phaseInterceptor.ts b/src/test/utils/phaseInterceptor.ts
index ec9309e2405a..d20837d25e33 100644
--- a/src/test/utils/phaseInterceptor.ts
+++ b/src/test/utils/phaseInterceptor.ts
@@ -1,59 +1,59 @@
import { Phase } from "#app/phase";
import ErrorInterceptor from "#app/test/utils/errorInterceptor";
-import { AttemptRunPhase } from "#app/phases/attempt-run-phase";
-import { BattleEndPhase } from "#app/phases/battle-end-phase";
-import { BerryPhase } from "#app/phases/berry-phase";
-import { CheckSwitchPhase } from "#app/phases/check-switch-phase";
-import { CommandPhase } from "#app/phases/command-phase";
-import { DamagePhase } from "#app/phases/damage-phase";
-import { EggLapsePhase } from "#app/phases/egg-lapse-phase";
-import { EncounterPhase } from "#app/phases/encounter-phase";
-import { EndEvolutionPhase } from "#app/phases/end-evolution-phase";
-import { EnemyCommandPhase } from "#app/phases/enemy-command-phase";
-import { EvolutionPhase } from "#app/phases/evolution-phase";
-import { FaintPhase } from "#app/phases/faint-phase";
-import { LearnMovePhase } from "#app/phases/learn-move-phase";
-import { LevelCapPhase } from "#app/phases/level-cap-phase";
-import { LoginPhase } from "#app/phases/login-phase";
-import { MessagePhase } from "#app/phases/message-phase";
-import { MoveEffectPhase } from "#app/phases/move-effect-phase";
-import { MoveEndPhase } from "#app/phases/move-end-phase";
-import { MovePhase } from "#app/phases/move-phase";
-import { NewBattlePhase } from "#app/phases/new-battle-phase";
-import { NewBiomeEncounterPhase } from "#app/phases/new-biome-encounter-phase";
-import { NextEncounterPhase } from "#app/phases/next-encounter-phase";
-import { PostSummonPhase } from "#app/phases/post-summon-phase";
-import { QuietFormChangePhase } from "#app/phases/quiet-form-change-phase";
-import { SelectGenderPhase } from "#app/phases/select-gender-phase";
-import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
-import { SelectStarterPhase } from "#app/phases/select-starter-phase";
-import { SelectTargetPhase } from "#app/phases/select-target-phase";
-import { ShinySparklePhase } from "#app/phases/shiny-sparkle-phase";
-import { ShowAbilityPhase } from "#app/phases/show-ability-phase";
-import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase";
-import { SummonPhase } from "#app/phases/summon-phase";
-import { SwitchPhase } from "#app/phases/switch-phase";
-import { SwitchSummonPhase } from "#app/phases/switch-summon-phase";
-import { TitlePhase } from "#app/phases/title-phase";
-import { ToggleDoublePositionPhase } from "#app/phases/toggle-double-position-phase";
-import { TurnEndPhase } from "#app/phases/turn-end-phase";
-import { TurnInitPhase } from "#app/phases/turn-init-phase";
-import { TurnStartPhase } from "#app/phases/turn-start-phase";
-import { UnavailablePhase } from "#app/phases/unavailable-phase";
-import { VictoryPhase } from "#app/phases/victory-phase";
-import { PartyHealPhase } from "#app/phases/party-heal-phase";
+import { AttemptRunPhase } from "#phases/attempt-run-phase";
+import { BattleEndPhase } from "#phases/battle-end-phase";
+import { BerryPhase } from "#phases/berry-phase";
+import { CheckSwitchPhase } from "#phases/check-switch-phase";
+import { CommandPhase } from "#phases/command-phase";
+import { DamagePhase } from "#phases/damage-phase";
+import { EggLapsePhase } from "#phases/egg-lapse-phase";
+import { EncounterPhase } from "#phases/encounter-phase";
+import { EndEvolutionPhase } from "#phases/end-evolution-phase";
+import { EnemyCommandPhase } from "#phases/enemy-command-phase";
+import { EvolutionPhase } from "#phases/evolution-phase";
+import { FaintPhase } from "#phases/faint-phase";
+import { LearnMovePhase } from "#phases/learn-move-phase";
+import { LevelCapPhase } from "#phases/level-cap-phase";
+import { LoginPhase } from "#phases/login-phase";
+import { MessagePhase } from "#phases/message-phase";
+import { MoveEffectPhase } from "#phases/move-effect-phase";
+import { MoveEndPhase } from "#phases/move-end-phase";
+import { MovePhase } from "#phases/move-phase";
+import { NewBattlePhase } from "#phases/new-battle-phase";
+import { NewBiomeEncounterPhase } from "#phases/new-biome-encounter-phase";
+import { NextEncounterPhase } from "#phases/next-encounter-phase";
+import { PostSummonPhase } from "#phases/post-summon-phase";
+import { QuietFormChangePhase } from "#phases/quiet-form-change-phase";
+import { SelectGenderPhase } from "#phases/select-gender-phase";
+import { SelectModifierPhase } from "#phases/select-modifier-phase";
+import { SelectStarterPhase } from "#phases/select-starter-phase";
+import { SelectTargetPhase } from "#phases/select-target-phase";
+import { ShinySparklePhase } from "#phases/shiny-sparkle-phase";
+import { ShowAbilityPhase } from "#phases/show-ability-phase";
+import { StatStageChangePhase } from "#phases/stat-stage-change-phase";
+import { SummonPhase } from "#phases/summon-phase";
+import { SwitchPhase } from "#phases/switch-phase";
+import { SwitchSummonPhase } from "#phases/switch-summon-phase";
+import { TitlePhase } from "#phases/title-phase";
+import { ToggleDoublePositionPhase } from "#phases/toggle-double-position-phase";
+import { TurnEndPhase } from "#phases/turn-end-phase";
+import { TurnInitPhase } from "#phases/turn-init-phase";
+import { TurnStartPhase } from "#phases/turn-start-phase";
+import { UnavailablePhase } from "#phases/unavailable-phase";
+import { VictoryPhase } from "#phases/victory-phase";
+import { PartyHealPhase } from "#phases/party-heal-phase";
import UI, { Mode } from "#app/ui/ui";
-import { SelectBiomePhase } from "#app/phases/select-biome-phase";
+import { SelectBiomePhase } from "#phases/select-biome-phase";
import {
MysteryEncounterBattlePhase,
MysteryEncounterOptionSelectedPhase,
MysteryEncounterPhase,
MysteryEncounterRewardsPhase,
PostMysteryEncounterPhase
-} from "#app/phases/mystery-encounter-phases";
-import { ModifierRewardPhase } from "#app/phases/modifier-reward-phase";
-import { PartyExpPhase } from "#app/phases/party-exp-phase";
-import { ExpPhase } from "#app/phases/exp-phase";
+} from "#phases/mystery-encounter-phases";
+import { ModifierRewardPhase } from "#phases/modifier-reward-phase";
+import { PartyExpPhase } from "#phases/party-exp-phase";
+import { ExpPhase } from "#phases/exp-phase";
export interface PromptHandler {
phaseTarget?: string;
diff --git a/src/test/vitest.setup.ts b/src/test/vitest.setup.ts
index 8438f607db2b..8b3d84ff523d 100644
--- a/src/test/vitest.setup.ts
+++ b/src/test/vitest.setup.ts
@@ -2,11 +2,11 @@ import "vitest-canvas-mock";
import { initLoggedInUser } from "#app/account";
import { initAbilities } from "#app/data/ability";
-import { initBiomes } from "#app/data/balance/biomes";
-import { initEggMoves } from "#app/data/balance/egg-moves";
-import { initPokemonPrevolutions } from "#app/data/balance/pokemon-evolutions";
+import { initBiomes } from "#balance/biomes";
+import { initEggMoves } from "#balance/egg-moves";
+import { initPokemonPrevolutions } from "#balance/pokemon-evolutions";
import { initMoves } from "#app/data/move";
-import { initMysteryEncounters } from "#app/data/mystery-encounters/mystery-encounters";
+import { initMysteryEncounters } from "#mystery-encounters/mystery-encounters";
import { initPokemonForms } from "#app/data/pokemon-forms";
import { initSpecies } from "#app/data/pokemon-species";
import { initAchievements } from "#app/system/achv";
diff --git a/src/tutorial.ts b/src/tutorial.ts
index 3934ffee57f9..0b885f792a41 100644
--- a/src/tutorial.ts
+++ b/src/tutorial.ts
@@ -1,7 +1,7 @@
import BattleScene from "./battle-scene";
-import AwaitableUiHandler from "./ui/awaitable-ui-handler";
-import UiHandler from "./ui/ui-handler";
-import { Mode } from "./ui/ui";
+import AwaitableUiHandler from "#app/ui/awaitable-ui-handler";
+import UiHandler from "#app/ui/ui-handler";
+import { Mode } from "#app/ui/ui";
import i18next from "i18next";
import Overrides from "#app/overrides";
diff --git a/src/ui-inputs.ts b/src/ui-inputs.ts
index 92b1653df3de..42f4d91b8014 100644
--- a/src/ui-inputs.ts
+++ b/src/ui-inputs.ts
@@ -1,17 +1,17 @@
import Phaser from "phaser";
-import { Mode } from "./ui/ui";
+import { Mode } from "#app/ui/ui";
import { InputsController } from "./inputs-controller";
-import MessageUiHandler from "./ui/message-ui-handler";
-import StarterSelectUiHandler from "./ui/starter-select-ui-handler";
-import { Setting, SettingKeys, settingIndex } from "./system/settings/settings";
-import SettingsUiHandler from "./ui/settings/settings-ui-handler";
+import MessageUiHandler from "#app/ui/message-ui-handler";
+import StarterSelectUiHandler from "#app/ui/starter-select-ui-handler";
+import { Setting, SettingKeys, settingIndex } from "#app/system/settings/settings";
+import SettingsUiHandler from "#app/ui/settings/settings-ui-handler";
import { Button } from "#enums/buttons";
-import SettingsGamepadUiHandler from "./ui/settings/settings-gamepad-ui-handler";
+import SettingsGamepadUiHandler from "#app/ui/settings/settings-gamepad-ui-handler";
import SettingsKeyboardUiHandler from "#app/ui/settings/settings-keyboard-ui-handler";
import BattleScene from "./battle-scene";
-import SettingsDisplayUiHandler from "./ui/settings/settings-display-ui-handler";
-import SettingsAudioUiHandler from "./ui/settings/settings-audio-ui-handler";
-import RunInfoUiHandler from "./ui/run-info-ui-handler";
+import SettingsDisplayUiHandler from "#app/ui/settings/settings-display-ui-handler";
+import SettingsAudioUiHandler from "#app/ui/settings/settings-audio-ui-handler";
+import RunInfoUiHandler from "#app/ui/run-info-ui-handler";
type ActionKeys = Record<Button, () => void>;
diff --git a/src/ui/abstact-option-select-ui-handler.ts b/src/ui/abstact-option-select-ui-handler.ts
index 01fc5b000143..0c9d76925c4f 100644
--- a/src/ui/abstact-option-select-ui-handler.ts
+++ b/src/ui/abstact-option-select-ui-handler.ts
@@ -1,9 +1,9 @@
-import BattleScene from "../battle-scene";
+import BattleScene from "#app/battle-scene";
import { TextStyle, addTextObject, getTextStyleOptions } from "./text";
import { Mode } from "./ui";
import UiHandler from "./ui-handler";
import { addWindow } from "./ui-theme";
-import * as Utils from "../utils";
+import { rgbHexToRgba, fixedInt } from "#app/utils";
import { argbFromRgba } from "@material/material-color-utilities";
import { Button } from "#enums/buttons";
@@ -138,8 +138,8 @@ export default abstract class AbstractOptionSelectUiHandler extends UiHandler {
itemOverlayIcon.setPositionRelative(this.optionSelectText, 36 * this.scale, 7 + i * (114 * this.scale - 3));
if (option.itemArgs) {
- itemIcon.setTint(argbFromRgba(Utils.rgbHexToRgba(option.itemArgs[0])));
- itemOverlayIcon.setTint(argbFromRgba(Utils.rgbHexToRgba(option.itemArgs[1])));
+ itemIcon.setTint(argbFromRgba(rgbHexToRgba(option.itemArgs[0])));
+ itemOverlayIcon.setTint(argbFromRgba(rgbHexToRgba(option.itemArgs[1])));
}
}
}
@@ -166,7 +166,7 @@ export default abstract class AbstractOptionSelectUiHandler extends UiHandler {
this.blockInput = true;
this.optionSelectText.setAlpha(0.5);
this.cursorObj?.setAlpha(0.8);
- this.scene.time.delayedCall(Utils.fixedInt(this.config.delay), () => this.unblockInput());
+ this.scene.time.delayedCall(fixedInt(this.config.delay), () => this.unblockInput());
}
return true;
diff --git a/src/ui/admin-ui-handler.ts b/src/ui/admin-ui-handler.ts
index c73c02e66c28..52c8b68140b4 100644
--- a/src/ui/admin-ui-handler.ts
+++ b/src/ui/admin-ui-handler.ts
@@ -1,9 +1,9 @@
import BattleScene from "#app/battle-scene";
import { ModalConfig } from "./modal-ui-handler";
import { Mode } from "./ui";
-import * as Utils from "../utils";
+import { apiPost } from "#app/utils";
import { FormModalUiHandler } from "./form-modal-ui-handler";
-import { Button } from "#app/enums/buttons";
+import { Button } from "#enums/buttons";
export default class AdminUiHandler extends FormModalUiHandler {
@@ -61,7 +61,7 @@ export default class AdminUiHandler extends FormModalUiHandler {
if (!this.inputs[1].text) {
return onFail("Discord Id is required");
}
- Utils.apiPost("admin/account/discord-link", `username=${encodeURIComponent(this.inputs[0].text)}&discordId=${encodeURIComponent(this.inputs[1].text)}`, "application/x-www-form-urlencoded", true)
+ apiPost("admin/account/discord-link", `username=${encodeURIComponent(this.inputs[0].text)}&discordId=${encodeURIComponent(this.inputs[1].text)}`, "application/x-www-form-urlencoded", true)
.then(response => {
if (!response.ok) {
console.error(response);
diff --git a/src/ui/arena-flyout.ts b/src/ui/arena-flyout.ts
index a82f97244cde..25794389b9ff 100644
--- a/src/ui/arena-flyout.ts
+++ b/src/ui/arena-flyout.ts
@@ -4,11 +4,18 @@ import { ArenaTagSide, ArenaTrapTag } from "#app/data/arena-tag";
import { WeatherType } from "#app/data/weather";
import { TerrainType } from "#app/data/terrain";
import { addWindow, WindowVariant } from "./ui-theme";
-import { ArenaEvent, ArenaEventType, TagAddedEvent, TagRemovedEvent, TerrainChangedEvent, WeatherChangedEvent } from "#app/events/arena";
-import { BattleSceneEventType, TurnEndEvent } from "../events/battle-scene";
+import {
+ ArenaEvent,
+ ArenaEventType,
+ TagAddedEvent,
+ TagRemovedEvent,
+ TerrainChangedEvent,
+ WeatherChangedEvent,
+} from "#app/events/arena";
+import { BattleSceneEventType, TurnEndEvent } from "#app/events/battle-scene";
import { ArenaTagType } from "#enums/arena-tag-type";
import TimeOfDayWidget from "./time-of-day-widget";
-import * as Utils from "../utils";
+import { toCamelCaseString, formatText, fixedInt } from "#app/utils";
import i18next, { ParseKeys } from "i18next";
/** Enum used to differentiate {@linkcode Arena} effects */
@@ -38,10 +45,10 @@ export function getFieldEffectText(arenaTagType: string): string {
if (!arenaTagType || arenaTagType === ArenaTagType.NONE) {
return arenaTagType;
}
- const effectName = Utils.toCamelCaseString(arenaTagType);
+ const effectName = toCamelCaseString(arenaTagType);
const i18nKey = `arenaFlyout:${effectName}` as ParseKeys;
const resultName = i18next.t(i18nKey);
- return (!resultName || resultName === i18nKey) ? Utils.formatText(arenaTagType) : resultName;
+ return (!resultName || resultName === i18nKey) ? formatText(arenaTagType) : resultName;
}
export class ArenaFlyout extends Phaser.GameObjects.Container {
@@ -370,7 +377,7 @@ export class ArenaFlyout extends Phaser.GameObjects.Container {
this.scene.tweens.add({
targets: this.flyoutParent,
x: visible ? this.anchorX : this.anchorX - this.translationX,
- duration: Utils.fixedInt(125),
+ duration: fixedInt(125),
ease: "Sine.easeInOut",
alpha: visible ? 1 : 0,
onComplete: () => this.timeOfDayWidget.parentVisible = visible,
diff --git a/src/ui/ball-ui-handler.ts b/src/ui/ball-ui-handler.ts
index 9df6da36055a..b49986004532 100644
--- a/src/ui/ball-ui-handler.ts
+++ b/src/ui/ball-ui-handler.ts
@@ -6,7 +6,7 @@ import { Mode } from "./ui";
import UiHandler from "./ui-handler";
import { addWindow } from "./ui-theme";
import { Button } from "#enums/buttons";
-import { CommandPhase } from "#app/phases/command-phase";
+import { CommandPhase } from "#phases/command-phase";
export default class BallUiHandler extends UiHandler {
private pokeballSelectContainer: Phaser.GameObjects.Container;
diff --git a/src/ui/battle-flyout.ts b/src/ui/battle-flyout.ts
index 4541a2bfefae..7b5fa70829f7 100644
--- a/src/ui/battle-flyout.ts
+++ b/src/ui/battle-flyout.ts
@@ -1,9 +1,9 @@
-import { default as Pokemon } from "../field/pokemon";
+import { default as Pokemon } from "#app/field/pokemon";
import { addTextObject, TextStyle } from "./text";
-import * as Utils from "../utils";
+import { fixedInt } from "#app/utils";
import BattleScene from "#app/battle-scene";
import Move from "#app/data/move";
-import { BattleSceneEventType, BerryUsedEvent, MoveUsedEvent } from "../events/battle-scene";
+import { BattleSceneEventType, BerryUsedEvent, MoveUsedEvent } from "#app/events/battle-scene";
import { BerryType } from "#enums/berry-type";
import { Moves } from "#enums/moves";
import { UiTheme } from "#enums/ui-theme";
@@ -179,7 +179,7 @@ export default class BattleFlyout extends Phaser.GameObjects.Container {
this.scene.tweens.add({
targets: this.flyoutParent,
x: visible ? this.anchorX : this.anchorX - this.translationX,
- duration: Utils.fixedInt(125),
+ duration: fixedInt(125),
ease: "Sine.easeInOut",
alpha: visible ? 1 : 0,
});
diff --git a/src/ui/battle-info.ts b/src/ui/battle-info.ts
index 1d97998f4914..1d067338ee4f 100644
--- a/src/ui/battle-info.ts
+++ b/src/ui/battle-info.ts
@@ -1,17 +1,17 @@
-import { EnemyPokemon, default as Pokemon } from "../field/pokemon";
-import { getLevelTotalExp, getLevelRelExp } from "../data/exp";
-import * as Utils from "../utils";
+import { EnemyPokemon, default as Pokemon } from "#app/field/pokemon";
+import { getLevelTotalExp, getLevelRelExp } from "#app/data/exp";
+import { getLocalizedSpriteKey, fixedInt } from "#app/utils";
import { addTextObject, TextStyle } from "./text";
-import { getGenderSymbol, getGenderColor, Gender } from "../data/gender";
-import { StatusEffect } from "../data/status-effect";
-import BattleScene from "../battle-scene";
-import { Type, getTypeRgb } from "../data/type";
+import { getGenderSymbol, getGenderColor, Gender } from "#app/data/gender";
+import { StatusEffect } from "#app/data/status-effect";
+import BattleScene from "#app/battle-scene";
+import { Type, getTypeRgb } from "#app/data/type";
import { getVariantTint } from "#app/data/variant";
import { Stat } from "#enums/stat";
import BattleFlyout from "./battle-flyout";
import { WindowVariant, addWindow } from "./ui-theme";
import i18next from "i18next";
-import { ExpGainsSpeed } from "#app/enums/exp-gains-speed";
+import { ExpGainsSpeed } from "#enums/exp-gains-speed";
export default class BattleInfo extends Phaser.GameObjects.Container {
public static readonly EXP_GAINS_DURATION_BASE = 1650;
@@ -162,7 +162,7 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
this.splicedIcon.setInteractive(new Phaser.Geom.Rectangle(0, 0, 12, 15), Phaser.Geom.Rectangle.Contains);
this.add(this.splicedIcon);
- this.statusIndicator = this.scene.add.sprite(0, 0, Utils.getLocalizedSpriteKey("statuses"));
+ this.statusIndicator = this.scene.add.sprite(0, 0, getLocalizedSpriteKey("statuses"));
this.statusIndicator.setName("icon_status");
this.statusIndicator.setVisible(false);
this.statusIndicator.setOrigin(0, 0);
@@ -470,7 +470,7 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
toggleStats(visible: boolean): void {
this.scene.tweens.add({
targets: this.statsContainer,
- duration: Utils.fixedInt(125),
+ duration: fixedInt(125),
ease: "Sine.easeInOut",
alpha: visible ? 1 : 0
});
diff --git a/src/ui/battle-message-ui-handler.ts b/src/ui/battle-message-ui-handler.ts
index 832d665b2907..77f59bc7ac56 100644
--- a/src/ui/battle-message-ui-handler.ts
+++ b/src/ui/battle-message-ui-handler.ts
@@ -6,7 +6,7 @@ import { addWindow } from "./ui-theme";
import BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext";
import { Button } from "#enums/buttons";
import i18next from "i18next";
-import { Stat, PERMANENT_STATS, getStatKey } from "#app/enums/stat";
+import { Stat, PERMANENT_STATS, getStatKey } from "#enums/stat";
export default class BattleMessageUiHandler extends MessageUiHandler {
private levelUpStatsContainer: Phaser.GameObjects.Container;
diff --git a/src/ui/bgm-bar.ts b/src/ui/bgm-bar.ts
index 616b3ff87cf8..9c5eead5c10c 100644
--- a/src/ui/bgm-bar.ts
+++ b/src/ui/bgm-bar.ts
@@ -1,7 +1,7 @@
-import BattleScene from "../battle-scene";
+import BattleScene from "#app/battle-scene";
import { addTextObject, TextStyle } from "./text";
import i18next from "i18next";
-import * as Utils from "#app/utils";
+import { formatText } from "#app/utils";
const hiddenX = -150;
const shownX = 0;
@@ -88,6 +88,6 @@ export default class BgmBar extends Phaser.GameObjects.Container {
}
getRealBgmName(bgmName: string): string {
- return i18next.t([ `bgmName:${bgmName}`, "bgmName:missing_entries" ], { name: Utils.formatText(bgmName) });
+ return i18next.t([ `bgmName:${bgmName}`, "bgmName:missing_entries" ], { name: formatText(bgmName) });
}
}
diff --git a/src/ui/candy-bar.ts b/src/ui/candy-bar.ts
index 14015f022596..5c2362eca843 100644
--- a/src/ui/candy-bar.ts
+++ b/src/ui/candy-bar.ts
@@ -1,7 +1,7 @@
-import BattleScene, { starterColors } from "../battle-scene";
+import BattleScene, { starterColors } from "#app/battle-scene";
import { TextStyle, addTextObject } from "./text";
import { argbFromRgba } from "@material/material-color-utilities";
-import * as Utils from "../utils";
+import { rgbHexToRgba } from "#app/utils";
import { Species } from "#enums/species";
export default class CandyBar extends Phaser.GameObjects.Container {
@@ -58,8 +58,8 @@ export default class CandyBar extends Phaser.GameObjects.Container {
const colorScheme = starterColors[starterSpeciesId];
- this.candyIcon.setTint(argbFromRgba(Utils.rgbHexToRgba(colorScheme[0])));
- this.candyOverlayIcon.setTint(argbFromRgba(Utils.rgbHexToRgba(colorScheme[1])));
+ this.candyIcon.setTint(argbFromRgba(rgbHexToRgba(colorScheme[0])));
+ this.candyOverlayIcon.setTint(argbFromRgba(rgbHexToRgba(colorScheme[1])));
this.countText.setText(`${(this.scene as BattleScene).gameData.starterData[starterSpeciesId].candyCount + count} (+${count.toString()})`);
diff --git a/src/ui/challenges-select-ui-handler.ts b/src/ui/challenges-select-ui-handler.ts
index e2547a626def..43a5eef3721b 100644
--- a/src/ui/challenges-select-ui-handler.ts
+++ b/src/ui/challenges-select-ui-handler.ts
@@ -1,4 +1,4 @@
-import BattleScene from "../battle-scene";
+import BattleScene from "#app/battle-scene";
import { TextStyle, addTextObject } from "./text";
import { Mode } from "./ui";
import UiHandler from "./ui-handler";
@@ -6,12 +6,12 @@ import { addWindow } from "./ui-theme";
import { Button } from "#enums/buttons";
import i18next from "i18next";
import { Challenge } from "#app/data/challenge";
-import * as Utils from "../utils";
-import { Challenges } from "#app/enums/challenges";
+import { getLocalizedSpriteKey } from "#app/utils";
+import { Challenges } from "#enums/challenges";
import BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext";
-import { Color, ShadowColor } from "#app/enums/color";
-import { SelectStarterPhase } from "#app/phases/select-starter-phase";
-import { TitlePhase } from "#app/phases/title-phase";
+import { Color, ShadowColor } from "#enums/color";
+import { SelectStarterPhase } from "#phases/select-starter-phase";
+import { TitlePhase } from "#phases/title-phase";
/**
* Handles all the UI for choosing optional challenges.
@@ -169,7 +169,7 @@ export default class GameChallengesUiHandler extends UiHandler {
};
}
- this.monoTypeValue = this.scene.add.sprite(8, 98, Utils.getLocalizedSpriteKey("types"));
+ this.monoTypeValue = this.scene.add.sprite(8, 98, getLocalizedSpriteKey("types"));
this.monoTypeValue.setName("challenge-value-monotype-sprite");
this.monoTypeValue.setScale(0.86);
this.monoTypeValue.setVisible(false);
diff --git a/src/ui/char-sprite.ts b/src/ui/char-sprite.ts
index d76c7ec59d04..489ad39fa91e 100644
--- a/src/ui/char-sprite.ts
+++ b/src/ui/char-sprite.ts
@@ -1,5 +1,5 @@
-import BattleScene from "../battle-scene";
-import * as Utils from "../utils";
+import BattleScene from "#app/battle-scene";
+import { MissingTextureKey } from "#app/utils";
export default class CharSprite extends Phaser.GameObjects.Container {
private sprite: Phaser.GameObjects.Sprite;
@@ -57,7 +57,7 @@ export default class CharSprite extends Phaser.GameObjects.Container {
}
});
- this.setVisible(this.scene.textures.get(key).key !== Utils.MissingTextureKey);
+ this.setVisible(this.scene.textures.get(key).key !== MissingTextureKey);
this.shown = true;
this.key = key;
diff --git a/src/ui/command-ui-handler.ts b/src/ui/command-ui-handler.ts
index 0f5edc28675e..b0a355b7367c 100644
--- a/src/ui/command-ui-handler.ts
+++ b/src/ui/command-ui-handler.ts
@@ -6,7 +6,7 @@ import UiHandler from "./ui-handler";
import i18next from "i18next";
import { Button } from "#enums/buttons";
import { getPokemonNameWithAffix } from "#app/messages";
-import { CommandPhase } from "#app/phases/command-phase";
+import { CommandPhase } from "#phases/command-phase";
export enum Command {
FIGHT = 0,
diff --git a/src/ui/daily-run-scoreboard.ts b/src/ui/daily-run-scoreboard.ts
index b9c1c6ea49a8..f3569d16ab6b 100644
--- a/src/ui/daily-run-scoreboard.ts
+++ b/src/ui/daily-run-scoreboard.ts
@@ -1,6 +1,6 @@
import i18next from "i18next";
-import BattleScene from "../battle-scene";
-import * as Utils from "../utils";
+import BattleScene from "#app/battle-scene";
+import { getEnumKeys, executeIf, apiFetch } from "#app/utils";
import { TextStyle, addTextObject } from "./text";
import { WindowVariant, addWindow } from "./ui-theme";
@@ -82,7 +82,7 @@ export class DailyRunScoreboard extends Phaser.GameObjects.Container {
this.prevCategoryButton.setInteractive(new Phaser.Geom.Rectangle(0, 0, 6, 10), Phaser.Geom.Rectangle.Contains);
this.prevCategoryButton.on("pointerup", () => {
- this.update(this.category ? this.category - 1 : Utils.getEnumKeys(ScoreboardCategory).length - 1);
+ this.update(this.category ? this.category - 1 : getEnumKeys(ScoreboardCategory).length - 1);
});
this.nextCategoryButton = this.scene.add.sprite(window.displayWidth - 4, 4, "cursor");
@@ -91,7 +91,7 @@ export class DailyRunScoreboard extends Phaser.GameObjects.Container {
this.nextCategoryButton.setInteractive(new Phaser.Geom.Rectangle(0, 0, 6, 10), Phaser.Geom.Rectangle.Contains);
this.nextCategoryButton.on("pointerup", () => {
- this.update(this.category < Utils.getEnumKeys(ScoreboardCategory).length - 1 ? this.category + 1 : 0);
+ this.update(this.category < getEnumKeys(ScoreboardCategory).length - 1 ? this.category + 1 : 0);
});
this.prevPageButton = this.scene.add.sprite(window.displayWidth / 2 - 16, titleWindow.displayHeight + window.displayHeight - 15, "cursor_reverse");
@@ -190,10 +190,10 @@ export class DailyRunScoreboard extends Phaser.GameObjects.Container {
this.page = page = 1;
}
- Utils.executeIf(category !== this.category || this.pageCount === undefined,
- () => Utils.apiFetch(`daily/rankingpagecount?category=${category}`).then(response => response.json()).then(count => this.pageCount = count)
+ executeIf(category !== this.category || this.pageCount === undefined,
+ () => apiFetch(`daily/rankingpagecount?category=${category}`).then(response => response.json()).then(count => this.pageCount = count)
).then(() => {
- Utils.apiFetch(`daily/rankings?category=${category}&page=${page}`)
+ apiFetch(`daily/rankings?category=${category}&page=${page}`)
.then(response => response.json())
.then(jsonResponse => {
this.page = page;
diff --git a/src/ui/egg-gacha-ui-handler.ts b/src/ui/egg-gacha-ui-handler.ts
index 8f977ba2ac0e..770960412fb7 100644
--- a/src/ui/egg-gacha-ui-handler.ts
+++ b/src/ui/egg-gacha-ui-handler.ts
@@ -1,16 +1,16 @@
-import BattleScene from "../battle-scene";
+import BattleScene from "#app/battle-scene";
import { Mode } from "./ui";
import { TextStyle, addTextObject, getEggTierTextTint, getTextStyleOptions } from "./text";
import MessageUiHandler from "./message-ui-handler";
-import * as Utils from "../utils";
-import { Egg, getLegendaryGachaSpeciesForTimestamp, IEggOptions } from "../data/egg";
-import { VoucherType, getVoucherTypeIcon } from "../system/voucher";
-import { getPokemonSpecies } from "../data/pokemon-species";
+import { getEnumValues, getEnumKeys, fixedInt, randSeedShuffle } from "#app/utils";
+import { Egg, getLegendaryGachaSpeciesForTimestamp, IEggOptions } from "#app/data/egg";
+import { VoucherType, getVoucherTypeIcon } from "#app/system/voucher";
+import { getPokemonSpecies } from "#app/data/pokemon-species";
import { addWindow } from "./ui-theme";
-import { Tutorial, handleTutorial } from "../tutorial";
+import { Tutorial, handleTutorial } from "#app/tutorial";
import { Button } from "#enums/buttons";
import Overrides from "#app/overrides";
-import { GachaType } from "#app/enums/gacha-types";
+import { GachaType } from "#enums/gacha-types";
import i18next from "i18next";
import { EggTier } from "#enums/egg-type";
@@ -82,7 +82,7 @@ export default class EggGachaUiHandler extends MessageUiHandler {
});
}
- Utils.getEnumValues(GachaType).forEach((gachaType, g) => {
+ getEnumValues(GachaType).forEach((gachaType, g) => {
const gachaTypeKey = GachaType[gachaType].toString().toLowerCase();
const gachaContainer = this.scene.add.container(180 * g, 18);
@@ -254,7 +254,7 @@ export default class EggGachaUiHandler extends MessageUiHandler {
this.eggGachaContainer.add(this.eggGachaOptionsContainer);
- new Array(Utils.getEnumKeys(VoucherType).length).fill(null).map((_, i) => {
+ new Array(getEnumKeys(VoucherType).length).fill(null).map((_, i) => {
const container = this.scene.add.container((this.scene.game.canvas.width / 6) - 56 * i, 0);
const bg = addWindow(this.scene, 0, 0, 56, 22);
@@ -335,7 +335,7 @@ export default class EggGachaUiHandler extends MessageUiHandler {
if (this.transitioning && this.transitionCancelled) {
delay = Math.ceil(delay / 5);
}
- return Utils.fixedInt(delay);
+ return fixedInt(delay);
}
pull(pullCount: integer = 0, count: integer = 0, eggs?: Egg[]): void {
@@ -453,7 +453,7 @@ export default class EggGachaUiHandler extends MessageUiHandler {
eggs.push(egg);
}
// Shuffle the eggs in case the guaranteed one got added as last egg
- eggs = Utils.randSeedShuffle<Egg>(eggs);
+ eggs = randSeedShuffle<Egg>(eggs);
(this.scene.currentBattle ? this.scene.gameData.saveAll(this.scene, true, true, true) : this.scene.gameData.saveSystem()).then(success => {
@@ -605,7 +605,7 @@ export default class EggGachaUiHandler extends MessageUiHandler {
}
showError(text: string): void {
- this.showText(text, undefined, () => this.showText(this.defaultText), Utils.fixedInt(1500));
+ this.showText(text, undefined, () => this.showText(this.defaultText), fixedInt(1500));
}
setTransitioning(transitioning: boolean): void {
@@ -734,7 +734,7 @@ export default class EggGachaUiHandler extends MessageUiHandler {
}
break;
case Button.RIGHT:
- if (this.gachaCursor < Utils.getEnumKeys(GachaType).length - 1) {
+ if (this.gachaCursor < getEnumKeys(GachaType).length - 1) {
success = this.setGachaCursor(this.gachaCursor + 1);
}
break;
diff --git a/src/ui/egg-hatch-scene-handler.ts b/src/ui/egg-hatch-scene-handler.ts
index 1bf58a786e12..49823f1096bd 100644
--- a/src/ui/egg-hatch-scene-handler.ts
+++ b/src/ui/egg-hatch-scene-handler.ts
@@ -2,7 +2,7 @@ import BattleScene from "../battle-scene";
import { Mode } from "./ui";
import UiHandler from "./ui-handler";
import { Button } from "#enums/buttons";
-import { EggHatchPhase } from "#app/phases/egg-hatch-phase";
+import { EggHatchPhase } from "#phases/egg-hatch-phase";
export default class EggHatchSceneHandler extends UiHandler {
public eggHatchContainer: Phaser.GameObjects.Container;
diff --git a/src/ui/egg-summary-ui-handler.ts b/src/ui/egg-summary-ui-handler.ts
index da93168926ed..d7b6506e1a45 100644
--- a/src/ui/egg-summary-ui-handler.ts
+++ b/src/ui/egg-summary-ui-handler.ts
@@ -5,7 +5,7 @@ import MessageUiHandler from "./message-ui-handler";
import { getEggTierForSpecies } from "../data/egg";
import { Button } from "#enums/buttons";
import PokemonHatchInfoContainer from "./pokemon-hatch-info-container";
-import { EggSummaryPhase } from "#app/phases/egg-summary-phase";
+import { EggSummaryPhase } from "#phases/egg-summary-phase";
import { EggHatchData } from "#app/data/egg-hatch-data";
import ScrollableGridUiHandler from "./scrollable-grid-handler";
import { HatchedPokemonContainer } from "./hatched-pokemon-container";
diff --git a/src/ui/fight-ui-handler.ts b/src/ui/fight-ui-handler.ts
index ee6641a1a274..371373aa49f0 100644
--- a/src/ui/fight-ui-handler.ts
+++ b/src/ui/fight-ui-handler.ts
@@ -1,15 +1,15 @@
-import BattleScene, { InfoToggle } from "../battle-scene";
+import BattleScene, { InfoToggle } from "#app/battle-scene";
import { addTextObject, TextStyle } from "./text";
-import { getTypeDamageMultiplierColor, Type } from "../data/type";
+import { getTypeDamageMultiplierColor, Type } from "#app/data/type";
import { Command } from "./command-ui-handler";
import { Mode } from "./ui";
import UiHandler from "./ui-handler";
-import * as Utils from "../utils";
+import { getLocalizedSpriteKey, fixedInt, padInt } from "#app/utils";
import { MoveCategory } from "#app/data/move";
import i18next from "i18next";
import { Button } from "#enums/buttons";
import Pokemon, { PokemonMove } from "#app/field/pokemon";
-import { CommandPhase } from "#app/phases/command-phase";
+import { CommandPhase } from "#phases/command-phase";
import MoveInfoOverlay from "./move-info-overlay";
import { BattleType } from "#app/battle";
@@ -47,7 +47,7 @@ export default class FightUiHandler extends UiHandler implements InfoToggle {
this.moveInfoContainer.setName("move-info");
ui.add(this.moveInfoContainer);
- this.typeIcon = this.scene.add.sprite(this.scene.scaledCanvas.width - 57, -36, Utils.getLocalizedSpriteKey("types"), "unknown");
+ this.typeIcon = this.scene.add.sprite(this.scene.scaledCanvas.width - 57, -36, getLocalizedSpriteKey("types"), "unknown");
this.typeIcon.setVisible(false);
this.moveInfoContainer.add(this.typeIcon);
@@ -189,7 +189,7 @@ export default class FightUiHandler extends UiHandler implements InfoToggle {
}
this.scene.tweens.add({
targets: [ this.movesContainer, this.cursorObj ],
- duration: Utils.fixedInt(125),
+ duration: fixedInt(125),
ease: "Sine.easeInOut",
alpha: visible ? 0 : 1
});
@@ -233,7 +233,7 @@ export default class FightUiHandler extends UiHandler implements InfoToggle {
if (hasMove) {
const pokemonMove = moveset[cursor]!; // TODO: is the bang correct?
const moveType = pokemon.getMoveType(pokemonMove.getMove());
- const textureKey = Utils.getLocalizedSpriteKey("types");
+ const textureKey = getLocalizedSpriteKey("types");
this.typeIcon.setTexture(textureKey, Type[moveType].toLowerCase()).setScale(0.8);
const moveCategory = pokemonMove.getMove().category;
@@ -243,8 +243,8 @@ export default class FightUiHandler extends UiHandler implements InfoToggle {
const maxPP = pokemonMove.getMovePp();
const pp = maxPP - pokemonMove.ppUsed;
- const ppLeftStr = Utils.padInt(pp, 2, " ");
- const ppMaxStr = Utils.padInt(maxPP, 2, " ");
+ const ppLeftStr = padInt(pp, 2, " ");
+ const ppMaxStr = padInt(maxPP, 2, " ");
this.ppText.setText(`${ppLeftStr}/${ppMaxStr}`);
this.powerText.setText(`${power >= 0 ? power : "---"}`);
this.accuracyText.setText(`${accuracy >= 0 ? accuracy : "---"}`);
diff --git a/src/ui/form-modal-ui-handler.ts b/src/ui/form-modal-ui-handler.ts
index 331154263ade..4deac2647dc7 100644
--- a/src/ui/form-modal-ui-handler.ts
+++ b/src/ui/form-modal-ui-handler.ts
@@ -1,10 +1,10 @@
-import BattleScene from "../battle-scene";
+import BattleScene from "#app/battle-scene";
import { ModalConfig, ModalUiHandler } from "./modal-ui-handler";
import { Mode } from "./ui";
import { TextStyle, addTextInputObject, addTextObject } from "./text";
import { WindowVariant, addWindow } from "./ui-theme";
import InputText from "phaser3-rex-plugins/plugins/inputtext";
-import * as Utils from "../utils";
+import { fixedInt } from "#app/utils";
import i18next from "i18next";
import { Button } from "#enums/buttons";
@@ -102,7 +102,7 @@ export abstract class FormModalUiHandler extends ModalUiHandler {
this.tween = this.scene.tweens.add({
targets: this.modalContainer,
- duration: Utils.fixedInt(1000),
+ duration: fixedInt(1000),
ease: "Sine.easeInOut",
y: "-=24",
alpha: 1
diff --git a/src/ui/game-stats-ui-handler.ts b/src/ui/game-stats-ui-handler.ts
index 671bed290368..07d4860522ff 100644
--- a/src/ui/game-stats-ui-handler.ts
+++ b/src/ui/game-stats-ui-handler.ts
@@ -4,9 +4,9 @@ import { TextStyle, addTextObject } from "#app/ui/text";
import { Mode } from "#app/ui/ui";
import UiHandler from "#app/ui/ui-handler";
import { addWindow } from "#app/ui/ui-theme";
-import * as Utils from "#app/utils";
+import { getPlayTimeString, formatFancyLargeNumber, toReadableString } from "#app/utils";
import { DexAttr, GameData } from "#app/system/game-data";
-import { speciesStarterCosts } from "#app/data/balance/starters";
+import { speciesStarterCosts } from "#balance/starters";
import { Button } from "#enums/buttons";
import i18next from "i18next";
import { UiTheme } from "#enums/ui-theme";
@@ -24,7 +24,7 @@ interface DisplayStats {
const displayStats: DisplayStats = {
playTime: {
label_key: "playTime",
- sourceFunc: gameData => Utils.getPlayTimeString(gameData.gameStats.playTime)
+ sourceFunc: gameData => getPlayTimeString(gameData.gameStats.playTime)
},
battles: {
label_key: "totalBattles",
@@ -90,7 +90,7 @@ const displayStats: DisplayStats = {
},
highestMoney: {
label_key: "highestMoney",
- sourceFunc: gameData => Utils.formatFancyLargeNumber(gameData.gameStats.highestMoney),
+ sourceFunc: gameData => formatFancyLargeNumber(gameData.gameStats.highestMoney),
},
highestDamage: {
label_key: "highestDamage",
@@ -411,7 +411,7 @@ export function initStatsKeys() {
}
if (!(displayStats[key] as DisplayStat).label_key) {
const splittableKey = key.replace(/([a-z]{2,})([A-Z]{1}(?:[^A-Z]|$))/g, "$1_$2");
- (displayStats[key] as DisplayStat).label_key = Utils.toReadableString(`${splittableKey[0].toUpperCase()}${splittableKey.slice(1)}`);
+ (displayStats[key] as DisplayStat).label_key = toReadableString(`${splittableKey[0].toUpperCase()}${splittableKey.slice(1)}`);
}
}
}
diff --git a/src/ui/login-form-ui-handler.ts b/src/ui/login-form-ui-handler.ts
index 8be432ad6c1a..7fcd6c6a48d5 100644
--- a/src/ui/login-form-ui-handler.ts
+++ b/src/ui/login-form-ui-handler.ts
@@ -1,6 +1,6 @@
import { FormModalUiHandler } from "./form-modal-ui-handler";
import { ModalConfig } from "./modal-ui-handler";
-import * as Utils from "../utils";
+import { apiPost, setCookie, sessionIdKey, fixedInt } from "#app/utils";
import { Mode } from "./ui";
import i18next from "i18next";
import BattleScene from "#app/battle-scene";
@@ -132,7 +132,7 @@ export default class LoginFormUiHandler extends FormModalUiHandler {
if (!this.inputs[0].text) {
return onFail(i18next.t("menu:emptyUsername"));
}
- Utils.apiPost("account/login", `username=${encodeURIComponent(this.inputs[0].text)}&password=${encodeURIComponent(this.inputs[1].text)}`, "application/x-www-form-urlencoded")
+ apiPost("account/login", `username=${encodeURIComponent(this.inputs[0].text)}&password=${encodeURIComponent(this.inputs[1].text)}`, "application/x-www-form-urlencoded")
.then(response => {
if (!response.ok) {
return response.text();
@@ -141,7 +141,7 @@ export default class LoginFormUiHandler extends FormModalUiHandler {
})
.then(response => {
if (response.hasOwnProperty("token")) {
- Utils.setCookie(Utils.sessionIdKey, response.token);
+ setCookie(sessionIdKey, response.token);
originalLoginAction && originalLoginAction();
} else {
onFail(response);
@@ -233,7 +233,7 @@ export default class LoginFormUiHandler extends FormModalUiHandler {
this.externalPartyContainer.setAlpha(0);
this.scene.tweens.add({
targets: this.externalPartyContainer,
- duration: Utils.fixedInt(1000),
+ duration: fixedInt(1000),
ease: "Sine.easeInOut",
y: "-=24",
alpha: 1
@@ -242,7 +242,7 @@ export default class LoginFormUiHandler extends FormModalUiHandler {
this.infoContainer.setAlpha(0);
this.scene.tweens.add({
targets: this.infoContainer,
- duration: Utils.fixedInt(1000),
+ duration: fixedInt(1000),
ease: "Sine.easeInOut",
y: "-=24",
alpha: 1
diff --git a/src/ui/menu-ui-handler.ts b/src/ui/menu-ui-handler.ts
index 0f4c2d2f53e3..39af885a87cd 100644
--- a/src/ui/menu-ui-handler.ts
+++ b/src/ui/menu-ui-handler.ts
@@ -1,18 +1,28 @@
-import BattleScene, { bypassLogin } from "../battle-scene";
+import BattleScene, { bypassLogin } from "#app/battle-scene";
import { TextStyle, addTextObject, getTextStyleOptions } from "./text";
import { Mode } from "./ui";
-import * as Utils from "../utils";
+import {
+ getEnumKeys,
+ isLocal,
+ isBeta,
+ fixedInt,
+ getCookie,
+ sessionIdKey,
+ apiPost,
+ apiFetch,
+ removeCookie,
+} from "#app/utils";
import { addWindow, WindowVariant } from "./ui-theme";
import MessageUiHandler from "./message-ui-handler";
import { OptionSelectConfig, OptionSelectItem } from "./abstact-option-select-ui-handler";
-import { Tutorial, handleTutorial } from "../tutorial";
-import { loggedInUser, updateUserInfo } from "../account";
+import { Tutorial, handleTutorial } from "#app/tutorial";
+import { loggedInUser, updateUserInfo } from "#app/account";
import i18next from "i18next";
import { Button } from "#enums/buttons";
import { GameDataType } from "#enums/game-data-type";
import BgmBar from "#app/ui/bgm-bar";
import AwaitableUiHandler from "./awaitable-ui-handler";
-import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
+import { SelectModifierPhase } from "#phases/select-modifier-phase";
enum MenuOptions {
GAME_SETTINGS,
@@ -69,7 +79,7 @@ export default class MenuUiHandler extends MessageUiHandler {
{ condition: bypassLogin, options: [ MenuOptions.LOG_OUT ]}
];
- this.menuOptions = Utils.getEnumKeys(MenuOptions)
+ this.menuOptions = getEnumKeys(MenuOptions)
.map(m => parseInt(MenuOptions[m]) as MenuOptions)
.filter(m => {
return !this.excludedMenus().some(exclusion => exclusion.condition && exclusion.options.includes(m));
@@ -112,7 +122,7 @@ export default class MenuUiHandler extends MessageUiHandler {
{ condition: bypassLogin, options: [ MenuOptions.LOG_OUT ]}
];
- this.menuOptions = Utils.getEnumKeys(MenuOptions)
+ this.menuOptions = getEnumKeys(MenuOptions)
.map(m => parseInt(MenuOptions[m]) as MenuOptions)
.filter(m => {
return !this.excludedMenus().some(exclusion => exclusion.condition && exclusion.options.includes(m));
@@ -197,7 +207,7 @@ export default class MenuUiHandler extends MessageUiHandler {
});
};
- if (Utils.isLocal || Utils.isBeta) {
+ if (isLocal || isBeta) {
manageDataOptions.push({
label: i18next.t("menuUiHandler:importSession"),
handler: () => {
@@ -244,7 +254,7 @@ export default class MenuUiHandler extends MessageUiHandler {
},
keepOpen: true
});
- if (Utils.isLocal || Utils.isBeta) {
+ if (isLocal || isBeta) {
manageDataOptions.push({
label: i18next.t("menuUiHandler:importData"),
handler: () => {
@@ -278,7 +288,7 @@ export default class MenuUiHandler extends MessageUiHandler {
},
keepOpen: true
});
- if (Utils.isLocal || Utils.isBeta) { // this should make sure we don't have this option in live
+ if (isLocal || isBeta) { // this should make sure we don't have this option in live
manageDataOptions.push({
label: "Test Dialogue",
handler: () => {
@@ -421,7 +431,7 @@ export default class MenuUiHandler extends MessageUiHandler {
this.render();
super.show(args);
- this.menuOptions = Utils.getEnumKeys(MenuOptions)
+ this.menuOptions = getEnumKeys(MenuOptions)
.map(m => parseInt(MenuOptions[m]) as MenuOptions)
.filter(m => {
return !this.excludedMenus().some(exclusion => exclusion.condition && exclusion.options.includes(m));
@@ -490,7 +500,7 @@ export default class MenuUiHandler extends MessageUiHandler {
ui.setOverlayMode(Mode.EGG_LIST);
success = true;
} else {
- ui.showText(i18next.t("menuUiHandler:noEggs"), null, () => ui.showText(""), Utils.fixedInt(1500));
+ ui.showText(i18next.t("menuUiHandler:noEggs"), null, () => ui.showText(""), fixedInt(1500));
error = true;
}
break;
@@ -506,14 +516,14 @@ export default class MenuUiHandler extends MessageUiHandler {
label: loggedInUser?.discordId === "" ? i18next.t("menuUiHandler:linkDiscord") : i18next.t("menuUiHandler:unlinkDiscord"),
handler: () => {
if (loggedInUser?.discordId === "") {
- const token = Utils.getCookie(Utils.sessionIdKey);
+ const token = getCookie(sessionIdKey);
const redirectUri = encodeURIComponent(`${import.meta.env.VITE_SERVER_URL}/auth/discord/callback`);
const discordId = import.meta.env.VITE_DISCORD_CLIENT_ID;
const discordUrl = `https://discord.com/api/oauth2/authorize?client_id=${discordId}&redirect_uri=${redirectUri}&response_type=code&scope=identify&state=${token}&prompt=none`;
window.open(discordUrl, "_self");
return true;
} else {
- Utils.apiPost("/auth/discord/logout", undefined, undefined, true).then(res => {
+ apiPost("/auth/discord/logout", undefined, undefined, true).then(res => {
if (!res.ok) {
console.error(`Unlink failed (${res.status}: ${res.statusText})`);
}
@@ -527,14 +537,14 @@ export default class MenuUiHandler extends MessageUiHandler {
label: loggedInUser?.googleId === "" ? i18next.t("menuUiHandler:linkGoogle") : i18next.t("menuUiHandler:unlinkGoogle"),
handler: () => {
if (loggedInUser?.googleId === "") {
- const token = Utils.getCookie(Utils.sessionIdKey);
+ const token = getCookie(sessionIdKey);
const redirectUri = encodeURIComponent(`${import.meta.env.VITE_SERVER_URL}/auth/google/callback`);
const googleId = import.meta.env.VITE_GOOGLE_CLIENT_ID;
const googleUrl = `https://accounts.google.com/o/oauth2/auth?client_id=${googleId}&response_type=code&redirect_uri=${redirectUri}&scope=openid&state=${token}`;
window.open(googleUrl, "_self");
return true;
} else {
- Utils.apiPost("/auth/google/logout", undefined, undefined, true).then(res => {
+ apiPost("/auth/google/logout", undefined, undefined, true).then(res => {
if (!res.ok) {
console.error(`Unlink failed (${res.status}: ${res.statusText})`);
}
@@ -586,11 +596,11 @@ export default class MenuUiHandler extends MessageUiHandler {
success = true;
const doLogout = () => {
ui.setMode(Mode.LOADING, {
- buttonActions: [], fadeOut: () => Utils.apiFetch("account/logout", true).then(res => {
+ buttonActions: [], fadeOut: () => apiFetch("account/logout", true).then(res => {
if (!res.ok) {
console.error(`Log out failed (${res.status}: ${res.statusText})`);
}
- Utils.removeCookie(Utils.sessionIdKey);
+ removeCookie(sessionIdKey);
updateUserInfo().then(() => this.scene.reset(true, true));
})
});
diff --git a/src/ui/message-ui-handler.ts b/src/ui/message-ui-handler.ts
index 5ae4707e329b..67db5bccefe3 100644
--- a/src/ui/message-ui-handler.ts
+++ b/src/ui/message-ui-handler.ts
@@ -1,7 +1,7 @@
-import BattleScene from "../battle-scene";
+import BattleScene from "#app/battle-scene";
import AwaitableUiHandler from "./awaitable-ui-handler";
import { Mode } from "./ui";
-import * as Utils from "../utils";
+import { getFrameMs } from "#app/utils";
export default abstract class MessageUiHandler extends AwaitableUiHandler {
protected textTimer: Phaser.Time.TimerEvent | null;
@@ -152,7 +152,7 @@ export default abstract class MessageUiHandler extends AwaitableUiHandler {
if (charDelay) {
this.textTimer!.paused = true; // TODO: is the bang correct?
this.scene.tweens.addCounter({
- duration: Utils.getFrameMs(charDelay),
+ duration: getFrameMs(charDelay),
onComplete: () => {
this.textTimer!.paused = false; // TODO: is the bang correct?
advance();
@@ -162,7 +162,7 @@ export default abstract class MessageUiHandler extends AwaitableUiHandler {
this.textTimer!.paused = true;
this.scene.time.delayedCall(150, () => {
this.scene.ui.fadeOut(750).then(() => {
- const delay = Utils.getFrameMs(charFade);
+ const delay = getFrameMs(charFade);
this.scene.time.delayedCall(delay, () => {
this.scene.ui.fadeIn(500).then(() => {
this.textTimer!.paused = false;
diff --git a/src/ui/modifier-select-ui-handler.ts b/src/ui/modifier-select-ui-handler.ts
index 3f89ebe415f3..2b4ba3d0a6e9 100644
--- a/src/ui/modifier-select-ui-handler.ts
+++ b/src/ui/modifier-select-ui-handler.ts
@@ -1,19 +1,18 @@
-import BattleScene from "../battle-scene";
-import { getPlayerShopModifierTypeOptionsForWave, ModifierTypeOption, TmModifierType } from "../modifier/modifier-type";
-import { getPokeballAtlasKey, PokeballType } from "../data/pokeball";
+import BattleScene from "#app/battle-scene";
+import { getPlayerShopModifierTypeOptionsForWave, ModifierTypeOption, TmModifierType } from "#app/modifier/modifier-type";
+import { getPokeballAtlasKey, PokeballType } from "#app/data/pokeball";
import { addTextObject, getTextStyleOptions, getModifierTierTextTint, getTextColor, TextStyle } from "./text";
import AwaitableUiHandler from "./awaitable-ui-handler";
import { Mode } from "./ui";
-import { LockModifierTiersModifier, PokemonHeldItemModifier, HealShopCostModifier } from "../modifier/modifier";
-import { handleTutorial, Tutorial } from "../tutorial";
+import { LockModifierTiersModifier, PokemonHeldItemModifier, HealShopCostModifier } from "#app/modifier/modifier";
+import { handleTutorial, Tutorial } from "#app/tutorial";
import { Button } from "#enums/buttons";
import MoveInfoOverlay from "./move-info-overlay";
-import { allMoves } from "../data/move";
-import * as Utils from "./../utils";
+import { allMoves } from "#app/data/move";
import Overrides from "#app/overrides";
import i18next from "i18next";
-import { ShopCursorTarget } from "#app/enums/shop-cursor-target";
-import { IntegerHolder } from "./../utils";
+import { ShopCursorTarget } from "#enums/shop-cursor-target";
+import { formatMoney, IntegerHolder } from "#app/utils";
import Phaser from "phaser";
export const SHOP_OPTIONS_ROW_LIMIT = 7;
@@ -559,7 +558,7 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler {
}
const canReroll = this.scene.money >= this.rerollCost;
- const formattedMoney = Utils.formatMoney(this.scene.moneyFormat, this.rerollCost);
+ const formattedMoney = formatMoney(this.scene.moneyFormat, this.rerollCost);
this.rerollCostText.setText(i18next.t("modifierSelectUiHandler:rerollCost", { formattedMoney }));
this.rerollCostText.setColor(this.getTextColor(canReroll ? TextStyle.MONEY : TextStyle.PARTY_RED));
@@ -828,7 +827,7 @@ class ModifierOption extends Phaser.GameObjects.Container {
const cost = Overrides.WAIVE_ROLL_FEE_OVERRIDE ? 0 : this.modifierTypeOption.cost;
const textStyle = cost <= scene.money ? TextStyle.MONEY : TextStyle.PARTY_RED;
- const formattedMoney = Utils.formatMoney(scene.moneyFormat, cost);
+ const formattedMoney = formatMoney(scene.moneyFormat, cost);
this.itemCostText.setText(i18next.t("modifierSelectUiHandler:itemCost", { formattedMoney }));
this.itemCostText.setColor(getTextColor(textStyle, false, scene.uiTheme));
diff --git a/src/ui/move-info-overlay.ts b/src/ui/move-info-overlay.ts
index 6c58d32c5158..95cedf8ce1c5 100644
--- a/src/ui/move-info-overlay.ts
+++ b/src/ui/move-info-overlay.ts
@@ -1,9 +1,9 @@
-import BattleScene, { InfoToggle } from "../battle-scene";
+import BattleScene, { InfoToggle } from "#app/battle-scene";
import { TextStyle, addTextObject } from "./text";
import { addWindow } from "./ui-theme";
-import * as Utils from "../utils";
-import Move, { MoveCategory } from "../data/move";
-import { Type } from "../data/type";
+import { getLocalizedSpriteKey, fixedInt } from "#app/utils";
+import Move, { MoveCategory } from "#app/data/move";
+import { Type } from "#app/data/type";
import i18next from "i18next";
export interface MoveInfoOverlaySettings {
@@ -96,7 +96,7 @@ export default class MoveInfoOverlay extends Phaser.GameObjects.Container implem
valuesBg.setOrigin(0, 0);
this.val.add(valuesBg);
- this.typ = this.scene.add.sprite(25, EFF_HEIGHT - 35, Utils.getLocalizedSpriteKey("types"), "unknown");
+ this.typ = this.scene.add.sprite(25, EFF_HEIGHT - 35, getLocalizedSpriteKey("types"), "unknown");
this.typ.setScale(0.8);
this.val.add(this.typ);
@@ -151,7 +151,7 @@ export default class MoveInfoOverlay extends Phaser.GameObjects.Container implem
this.pow.setText(move.power >= 0 ? move.power.toString() : "---");
this.acc.setText(move.accuracy >= 0 ? move.accuracy.toString() : "---");
this.pp.setText(move.pp >= 0 ? move.pp.toString() : "---");
- this.typ.setTexture(Utils.getLocalizedSpriteKey("types"), Type[move.type].toLowerCase());
+ this.typ.setTexture(getLocalizedSpriteKey("types"), Type[move.type].toLowerCase());
this.cat.setFrame(MoveCategory[move.category].toLowerCase());
this.desc.setText(move?.effect || "");
@@ -169,10 +169,10 @@ export default class MoveInfoOverlay extends Phaser.GameObjects.Container implem
// generate scrolling effects
this.descScroll = this.scene.tweens.add({
targets: this.desc,
- delay: Utils.fixedInt(2000),
+ delay: fixedInt(2000),
loop: -1,
- hold: Utils.fixedInt(2000),
- duration: Utils.fixedInt((moveDescriptionLineCount - 3) * 2000),
+ hold: fixedInt(2000),
+ duration: fixedInt((moveDescriptionLineCount - 3) * 2000),
y: `-=${14.83 * (72 / 96) * (moveDescriptionLineCount - 3)}`
});
}
@@ -195,7 +195,7 @@ export default class MoveInfoOverlay extends Phaser.GameObjects.Container implem
}
this.scene.tweens.add({
targets: this.desc,
- duration: Utils.fixedInt(125),
+ duration: fixedInt(125),
ease: "Sine.easeInOut",
alpha: visible ? 1 : 0
});
diff --git a/src/ui/mystery-encounter-ui-handler.ts b/src/ui/mystery-encounter-ui-handler.ts
index b568f8b71de1..d14fd4c7be70 100644
--- a/src/ui/mystery-encounter-ui-handler.ts
+++ b/src/ui/mystery-encounter-ui-handler.ts
@@ -1,17 +1,16 @@
-import BattleScene from "../battle-scene";
+import BattleScene from "#app/battle-scene";
import { addBBCodeTextObject, getBBCodeFrag, TextStyle } from "./text";
import { Mode } from "./ui";
import UiHandler from "./ui-handler";
import { Button } from "#enums/buttons";
import { addWindow, WindowVariant } from "./ui-theme";
-import { MysteryEncounterPhase } from "../phases/mystery-encounter-phases";
+import { MysteryEncounterPhase } from "#phases/mystery-encounter-phases";
import { PartyUiMode } from "./party-ui-handler";
-import MysteryEncounterOption from "#app/data/mystery-encounters/mystery-encounter-option";
-import * as Utils from "../utils";
-import { isNullOrUndefined } from "../utils";
-import { getPokeballAtlasKey } from "../data/pokeball";
-import { OptionSelectSettings } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
-import { getEncounterText } from "#app/data/mystery-encounters/utils/encounter-dialogue-utils";
+import MysteryEncounterOption from "#mystery-encounters/mystery-encounter-option";
+import { fixedInt, isNullOrUndefined } from "#app/utils";
+import { getPokeballAtlasKey } from "#app/data/pokeball";
+import { OptionSelectSettings } from "#mystery-encounters/utils/encounter-phase-utils";
+import { getEncounterText } from "#mystery-encounters/utils/encounter-dialogue-utils";
import i18next from "i18next";
import { MysteryEncounterOptionMode } from "#enums/mystery-encounter-option-mode";
import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
@@ -408,10 +407,10 @@ export default class MysteryEncounterUiHandler extends UiHandler {
if (optionTextWidth > nonScrollWidth) {
this.optionScrollTweens[i] = this.scene.tweens.add({
targets: optionText,
- delay: Utils.fixedInt(2000),
+ delay: fixedInt(2000),
loop: -1,
- hold: Utils.fixedInt(2000),
- duration: Utils.fixedInt((optionTextWidth - nonScrollWidth) / 15 * 2000),
+ hold: fixedInt(2000),
+ duration: fixedInt((optionTextWidth - nonScrollWidth) / 15 * 2000),
x: `-=${(optionTextWidth - nonScrollWidth)}`
});
}
@@ -462,10 +461,10 @@ export default class MysteryEncounterUiHandler extends UiHandler {
if (descriptionLineCount > 6) {
this.descriptionScrollTween = this.scene.tweens.add({
targets: descriptionTextObject,
- delay: Utils.fixedInt(2000),
+ delay: fixedInt(2000),
loop: -1,
- hold: Utils.fixedInt(2000),
- duration: Utils.fixedInt((descriptionLineCount - 6) * 2000),
+ hold: fixedInt(2000),
+ duration: fixedInt((descriptionLineCount - 6) * 2000),
y: `-=${10 * (descriptionLineCount - 6)}`
});
}
@@ -548,10 +547,10 @@ export default class MysteryEncounterUiHandler extends UiHandler {
if (tooltipLineCount > 3) {
this.tooltipScrollTween = this.scene.tweens.add({
targets: tooltipTextObject,
- delay: Utils.fixedInt(1200),
+ delay: fixedInt(1200),
loop: -1,
- hold: Utils.fixedInt(1200),
- duration: Utils.fixedInt((tooltipLineCount - 3) * 1200),
+ hold: fixedInt(1200),
+ duration: fixedInt((tooltipLineCount - 3) * 1200),
y: `-=${11.2 * (tooltipLineCount - 3)}`
});
}
diff --git a/src/ui/party-ui-handler.ts b/src/ui/party-ui-handler.ts
index e96fde8d54f8..5dd953d81e0e 100644
--- a/src/ui/party-ui-handler.ts
+++ b/src/ui/party-ui-handler.ts
@@ -4,13 +4,13 @@ import { addBBCodeTextObject, addTextObject, getTextColor, TextStyle } from "#ap
import { Command } from "#app/ui/command-ui-handler";
import MessageUiHandler from "#app/ui/message-ui-handler";
import { Mode } from "#app/ui/ui";
-import * as Utils from "#app/utils";
+import { BooleanHolder, toReadableString, randInt, getLocalizedSpriteKey } from "#app/utils";
import { PokemonFormChangeItemModifier, PokemonHeldItemModifier, SwitchEffectTransferModifier } from "#app/modifier/modifier";
import { allMoves, ForceSwitchOutAttr } from "#app/data/move";
import { getGenderColor, getGenderSymbol } from "#app/data/gender";
import { StatusEffect } from "#app/data/status-effect";
import PokemonIconAnimHandler, { PokemonIconAnimMode } from "#app/ui/pokemon-icon-anim-handler";
-import { pokemonEvolutions } from "#app/data/balance/pokemon-evolutions";
+import { pokemonEvolutions } from "#balance/pokemon-evolutions";
import { addWindow } from "#app/ui/ui-theme";
import { SpeciesFormChangeItemTrigger, FormChangeItem } from "#app/data/pokemon-forms";
import { getVariantTint } from "#app/data/variant";
@@ -22,8 +22,8 @@ import BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import { getPokemonNameWithAffix } from "#app/messages";
-import { CommandPhase } from "#app/phases/command-phase";
-import { SelectModifierPhase } from "#app/phases/select-modifier-phase";
+import { CommandPhase } from "#phases/command-phase";
+import { SelectModifierPhase } from "#phases/select-modifier-phase";
const defaultMessage = i18next.t("partyUiHandler:choosePokemon");
@@ -196,7 +196,7 @@ export default class PartyUiHandler extends MessageUiHandler {
* @returns
*/
private FilterChallengeLegal = (pokemon: PlayerPokemon) => {
- const challengeAllowed = new Utils.BooleanHolder(true);
+ const challengeAllowed = new BooleanHolder(true);
applyChallenges(this.scene.gameMode, ChallengeType.POKEMON_IN_BATTLE, pokemon, challengeAllowed);
if (!challengeAllowed.value) {
return i18next.t("partyUiHandler:cantBeUsed", { pokemonName: getPokemonNameWithAffix(pokemon) });
@@ -985,7 +985,7 @@ export default class PartyUiHandler extends MessageUiHandler {
if (this.localizedOptions.includes(option)) {
optionName = i18next.t(`partyUiHandler:${PartyOption[option]}`);
} else {
- optionName = Utils.toReadableString(PartyOption[option]);
+ optionName = toReadableString(PartyOption[option]);
}
}
break;
@@ -1078,7 +1078,7 @@ export default class PartyUiHandler extends MessageUiHandler {
}
getReleaseMessage(pokemonName: string): string {
- const rand = Utils.randInt(128);
+ const rand = randInt(128);
if (rand < 20) {
return i18next.t("partyUiHandler:goodbye", { pokemonName: pokemonName });
} else if (rand < 40) {
@@ -1275,7 +1275,7 @@ class PartySlot extends Phaser.GameObjects.Container {
}
if (this.pokemon.status) {
- const statusIndicator = this.scene.add.sprite(0, 0, Utils.getLocalizedSpriteKey("statuses"));
+ const statusIndicator = this.scene.add.sprite(0, 0, getLocalizedSpriteKey("statuses"));
statusIndicator.setFrame(StatusEffect[this.pokemon.status?.effect].toLowerCase());
statusIndicator.setOrigin(0, 0);
statusIndicator.setPositionRelative(slotLevelLabel, this.slotIndex >= battlerCount ? 43 : 55, 0);
diff --git a/src/ui/pokemon-hatch-info-container.ts b/src/ui/pokemon-hatch-info-container.ts
index 146d70522fd5..4677357b2526 100644
--- a/src/ui/pokemon-hatch-info-container.ts
+++ b/src/ui/pokemon-hatch-info-container.ts
@@ -2,9 +2,9 @@ import PokemonInfoContainer from "#app/ui/pokemon-info-container";
import BattleScene from "#app/battle-scene";
import { Gender } from "#app/data/gender";
import { Type } from "#app/data/type";
-import * as Utils from "#app/utils";
+import { rgbHexToRgba, padInt } from "#app/utils";
import { TextStyle, addTextObject } from "#app/ui/text";
-import { speciesEggMoves } from "#app/data/balance/egg-moves";
+import { speciesEggMoves } from "#balance/egg-moves";
import { allMoves } from "#app/data/move";
import { Species } from "#enums/species";
import { getEggTierForSpecies } from "#app/data/egg";
@@ -152,14 +152,14 @@ export default class PokemonHatchInfoContainer extends PokemonInfoContainer {
super.show(pokemon, false, 1, hatchInfo.getDex(), hatchInfo.getStarterEntry(), true);
const colorScheme = starterColors[species.speciesId];
- this.pokemonCandyIcon.setTint(argbFromRgba(Utils.rgbHexToRgba(colorScheme[0])));
+ this.pokemonCandyIcon.setTint(argbFromRgba(rgbHexToRgba(colorScheme[0])));
this.pokemonCandyIcon.setVisible(true);
- this.pokemonCandyOverlayIcon.setTint(argbFromRgba(Utils.rgbHexToRgba(colorScheme[1])));
+ this.pokemonCandyOverlayIcon.setTint(argbFromRgba(rgbHexToRgba(colorScheme[1])));
this.pokemonCandyOverlayIcon.setVisible(true);
this.pokemonCandyCountText.setText(`x${this.scene.gameData.starterData[species.speciesId].candyCount}`);
this.pokemonCandyCountText.setVisible(true);
- this.pokemonNumberText.setText(Utils.padInt(species.speciesId, 4));
+ this.pokemonNumberText.setText(padInt(species.speciesId, 4));
this.pokemonNameText.setText(species.name);
const hasEggMoves = species && speciesEggMoves.hasOwnProperty(species.speciesId);
diff --git a/src/ui/pokemon-icon-anim-handler.ts b/src/ui/pokemon-icon-anim-handler.ts
index c7a24f69200e..b323efead6ac 100644
--- a/src/ui/pokemon-icon-anim-handler.ts
+++ b/src/ui/pokemon-icon-anim-handler.ts
@@ -1,5 +1,5 @@
-import BattleScene from "../battle-scene";
-import * as Utils from "../utils";
+import BattleScene from "#app/battle-scene";
+import { fixedInt } from "#app/utils";
export enum PokemonIconAnimMode {
NONE,
@@ -27,7 +27,7 @@ export default class PokemonIconAnimHandler {
}
};
scene.tweens.addCounter({
- duration: Utils.fixedInt(200),
+ duration: fixedInt(200),
from: 0,
to: 1,
yoyo: true,
diff --git a/src/ui/pokemon-info-container.ts b/src/ui/pokemon-info-container.ts
index 242e59c599b2..491f0f3dfe3d 100644
--- a/src/ui/pokemon-info-container.ts
+++ b/src/ui/pokemon-info-container.ts
@@ -1,13 +1,13 @@
import { getVariantTint } from "#app/data/variant";
import BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext";
-import BattleScene from "../battle-scene";
-import { Gender, getGenderColor, getGenderSymbol } from "../data/gender";
-import { getNatureName } from "../data/nature";
-import { Type } from "../data/type";
-import Pokemon from "../field/pokemon";
+import BattleScene from "#app/battle-scene";
+import { Gender, getGenderColor, getGenderSymbol } from "#app/data/gender";
+import { getNatureName } from "#app/data/nature";
+import { Type } from "#app/data/type";
+import Pokemon from "#app/field/pokemon";
import i18next from "i18next";
-import { DexAttr, DexEntry, StarterDataEntry } from "../system/game-data";
-import * as Utils from "../utils";
+import { DexAttr, DexEntry, StarterDataEntry } from "#app/system/game-data";
+import { capitalizeString, fixedInt } from "#app/utils";
import ConfirmUiHandler from "./confirm-ui-handler";
import { StatsContainer } from "./stats-container";
import { TextStyle, addBBCodeTextObject, addTextObject, getTextColor } from "./text";
@@ -236,8 +236,8 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container {
}
const formKey = (pokemon.species?.forms?.[pokemon.formIndex!]?.formKey);
- const formText = Utils.capitalizeString(formKey, "-", false, false) || "";
- const speciesName = Utils.capitalizeString(Species[pokemon.species.getRootSpeciesId()], "_", true, false);
+ const formText = capitalizeString(formKey, "-", false, false) || "";
+ const speciesName = capitalizeString(Species[pokemon.species.getRootSpeciesId()], "_", true, false);
let formName = "";
if (pokemon.species.speciesId === Species.ARCEUS) {
@@ -346,7 +346,7 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container {
if (!eggInfo) {
this.scene.tweens.add({
targets: this,
- duration: Utils.fixedInt(Math.floor(750 / speedMultiplier)),
+ duration: fixedInt(Math.floor(750 / speedMultiplier)),
ease: "Cubic.easeInOut",
x: this.initialX - this.infoWindowWidth,
onComplete: () => {
@@ -356,9 +356,9 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container {
if (showMoves) {
this.scene.tweens.add({
- delay: Utils.fixedInt(Math.floor(325 / speedMultiplier)),
+ delay: fixedInt(Math.floor(325 / speedMultiplier)),
targets: this.pokemonMovesContainer,
- duration: Utils.fixedInt(Math.floor(325 / speedMultiplier)),
+ duration: fixedInt(Math.floor(325 / speedMultiplier)),
ease: "Cubic.easeInOut",
x: this.movesContainerInitialX - 57,
onComplete: () => resolve()
@@ -414,7 +414,7 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container {
return new Promise<void>(resolve => {
this.scene.tweens.add({
targets: this,
- duration: Utils.fixedInt(Math.floor(150 / speedMultiplier)),
+ duration: fixedInt(Math.floor(150 / speedMultiplier)),
ease: "Cubic.easeInOut",
x: xPosition,
onComplete: () => {
@@ -433,14 +433,14 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container {
this.scene.tweens.add({
targets: this.pokemonMovesContainer,
- duration: Utils.fixedInt(Math.floor(750 / speedMultiplier)),
+ duration: fixedInt(Math.floor(750 / speedMultiplier)),
ease: "Cubic.easeInOut",
x: this.movesContainerInitialX
});
this.scene.tweens.add({
targets: this,
- duration: Utils.fixedInt(Math.floor(750 / speedMultiplier)),
+ duration: fixedInt(Math.floor(750 / speedMultiplier)),
ease: "Cubic.easeInOut",
x: this.initialX,
onComplete: () => {
diff --git a/src/ui/registration-form-ui-handler.ts b/src/ui/registration-form-ui-handler.ts
index 2f8486bcdb3c..c319fceb4bfc 100644
--- a/src/ui/registration-form-ui-handler.ts
+++ b/src/ui/registration-form-ui-handler.ts
@@ -1,6 +1,6 @@
import { FormModalUiHandler } from "./form-modal-ui-handler";
import { ModalConfig } from "./modal-ui-handler";
-import * as Utils from "../utils";
+import { apiPost, setCookie, sessionIdKey } from "#app/utils";
import { Mode } from "./ui";
import { TextStyle, addTextObject } from "./text";
import i18next from "i18next";
@@ -106,11 +106,11 @@ export default class RegistrationFormUiHandler extends FormModalUiHandler {
if (this.inputs[1].text !== this.inputs[2].text) {
return onFail(i18next.t("menu:passwordNotMatchingConfirmPassword"));
}
- Utils.apiPost("account/register", `username=${encodeURIComponent(this.inputs[0].text)}&password=${encodeURIComponent(this.inputs[1].text)}`, "application/x-www-form-urlencoded")
+ apiPost("account/register", `username=${encodeURIComponent(this.inputs[0].text)}&password=${encodeURIComponent(this.inputs[1].text)}`, "application/x-www-form-urlencoded")
.then(response => response.text())
.then(response => {
if (!response) {
- Utils.apiPost("account/login", `username=${encodeURIComponent(this.inputs[0].text)}&password=${encodeURIComponent(this.inputs[1].text)}`, "application/x-www-form-urlencoded")
+ apiPost("account/login", `username=${encodeURIComponent(this.inputs[0].text)}&password=${encodeURIComponent(this.inputs[1].text)}`, "application/x-www-form-urlencoded")
.then(response => {
if (!response.ok) {
return response.text();
@@ -119,7 +119,7 @@ export default class RegistrationFormUiHandler extends FormModalUiHandler {
})
.then(response => {
if (response.hasOwnProperty("token")) {
- Utils.setCookie(Utils.sessionIdKey, response.token);
+ setCookie(sessionIdKey, response.token);
originalRegistrationAction && originalRegistrationAction();
} else {
onFail(response);
diff --git a/src/ui/run-history-ui-handler.ts b/src/ui/run-history-ui-handler.ts
index 061f15d0956d..a312f38a0fdb 100644
--- a/src/ui/run-history-ui-handler.ts
+++ b/src/ui/run-history-ui-handler.ts
@@ -1,17 +1,17 @@
-import BattleScene from "../battle-scene";
-import { GameModes } from "../game-mode";
+import BattleScene from "#app/battle-scene";
+import { GameModes } from "#app/game-mode";
import { TextStyle, addTextObject } from "./text";
import { Mode } from "./ui";
import { addWindow } from "./ui-theme";
-import * as Utils from "../utils";
-import PokemonData from "../system/pokemon-data";
+import { fixedInt, formatLargeNumber } from "#app/utils";
+import PokemonData from "#app/system/pokemon-data";
import MessageUiHandler from "./message-ui-handler";
import i18next from "i18next";
-import { Button } from "../enums/buttons";
-import { BattleType } from "../battle";
-import { RunEntry } from "../system/game-data";
+import { Button } from "#enums/buttons";
+import { BattleType } from "#app/battle";
+import { RunEntry } from "#app/system/game-data";
import { PlayerGender } from "#enums/player-gender";
-import { TrainerVariant } from "../field/trainer";
+import { TrainerVariant } from "#app/field/trainer";
import { RunDisplayMode } from "#app/ui/run-info-ui-handler";
export type RunSelectCallback = (cursor: number) => void;
@@ -213,7 +213,7 @@ export default class RunHistoryUiHandler extends MessageUiHandler {
this.scene.tweens.add({
targets: this.runsContainer,
y: this.runContainerInitialY - 56 * scrollCursor,
- duration: Utils.fixedInt(325),
+ duration: fixedInt(325),
ease: "Sine.easeInOut"
});
}
@@ -302,7 +302,7 @@ class RunEntryContainer extends Phaser.GameObjects.Container {
enemyData["player"] = true;
const enemy = enemyData.toPokemon(this.scene);
const enemyIcon = this.scene.addPokemonIcon(enemy, 0, 0, 0, 0);
- const enemyLevel = addTextObject(this.scene, 32, 20, `${i18next.t("saveSlotSelectUiHandler:lv")}${Utils.formatLargeNumber(enemy.level, 1000)}`, TextStyle.PARTY, { fontSize: "54px", color: "#f8f8f8" });
+ const enemyLevel = addTextObject(this.scene, 32, 20, `${i18next.t("saveSlotSelectUiHandler:lv")}${formatLargeNumber(enemy.level, 1000)}`, TextStyle.PARTY, { fontSize: "54px", color: "#f8f8f8" });
enemyLevel.setShadow(0, 0, undefined);
enemyLevel.setStroke("#424242", 14);
enemyLevel.setOrigin(1, 0);
@@ -376,7 +376,7 @@ class RunEntryContainer extends Phaser.GameObjects.Container {
const pokemon = p.toPokemon(this.scene);
const icon = this.scene.addPokemonIcon(pokemon, 0, 0, 0, 0);
- const text = addTextObject(this.scene, 32, 20, `${i18next.t("saveSlotSelectUiHandler:lv")}${Utils.formatLargeNumber(pokemon.level, 1000)}`, TextStyle.PARTY, { fontSize: "54px", color: "#f8f8f8" });
+ const text = addTextObject(this.scene, 32, 20, `${i18next.t("saveSlotSelectUiHandler:lv")}${formatLargeNumber(pokemon.level, 1000)}`, TextStyle.PARTY, { fontSize: "54px", color: "#f8f8f8" });
text.setShadow(0, 0, undefined);
text.setStroke("#424242", 14);
text.setOrigin(1, 0);
diff --git a/src/ui/run-info-ui-handler.ts b/src/ui/run-info-ui-handler.ts
index 0ca472411361..59870cace89c 100644
--- a/src/ui/run-info-ui-handler.ts
+++ b/src/ui/run-info-ui-handler.ts
@@ -1,29 +1,29 @@
-import BattleScene from "../battle-scene";
-import { GameModes } from "../game-mode";
+import BattleScene from "#app/battle-scene";
+import { GameModes } from "#app/game-mode";
import UiHandler from "./ui-handler";
-import { SessionSaveData } from "../system/game-data";
+import { SessionSaveData } from "#app/system/game-data";
import { TextStyle, addTextObject, addBBCodeTextObject, getTextColor } from "./text";
import { Mode } from "./ui";
import { addWindow } from "./ui-theme";
import { getPokeballAtlasKey } from "#app/data/pokeball";
-import * as Utils from "../utils";
-import PokemonData from "../system/pokemon-data";
+import { formatLargeNumber, getPlayTimeString, formatMoney, formatFancyLargeNumber } from "#app/utils";
+import PokemonData from "#app/system/pokemon-data";
import i18next from "i18next";
-import { Button } from "../enums/buttons";
-import { BattleType } from "../battle";
-import { TrainerVariant } from "../field/trainer";
+import { Button } from "#enums/buttons";
+import { BattleType } from "#app/battle";
+import { TrainerVariant } from "#app/field/trainer";
import { Challenges } from "#enums/challenges";
-import { getLuckString, getLuckTextTint } from "../modifier/modifier-type";
+import { getLuckString, getLuckTextTint } from "#app/modifier/modifier-type";
import RoundRectangle from "phaser3-rex-plugins/plugins/roundrectangle";
-import { Type, getTypeRgb } from "../data/type";
-import { TypeColor, TypeShadow } from "#app/enums/color";
-import { getNatureStatMultiplier, getNatureName } from "../data/nature";
+import { Type, getTypeRgb } from "#app/data/type";
+import { TypeColor, TypeShadow } from "#enums/color";
+import { getNatureStatMultiplier, getNatureName } from "#app/data/nature";
import { getVariantTint } from "#app/data/variant";
-import * as Modifier from "../modifier/modifier";
+import * as Modifier from "#app/modifier/modifier";
import { Species } from "#enums/species";
import { PlayerGender } from "#enums/player-gender";
import { SettingKeyboard } from "#app/system/settings/settings-keyboard";
-import { getBiomeName } from "#app/data/balance/biomes";
+import { getBiomeName } from "#balance/biomes";
import { MysteryEncounterType } from "#enums/mystery-encounter-type";
/**
@@ -320,7 +320,7 @@ export default class RunInfoUiHandler extends UiHandler {
const enemy = enemyData.toPokemon(this.scene);
const enemyIcon = this.scene.addPokemonIcon(enemy, 0, 0, 0, 0);
const enemyLevelStyle = bossStatus ? TextStyle.PARTY_RED : TextStyle.PARTY;
- const enemyLevel = addTextObject(this.scene, 36, 26, `${i18next.t("saveSlotSelectUiHandler:lv")}${Utils.formatLargeNumber(enemy.level, 1000)}`, enemyLevelStyle, { fontSize: "44px", color: "#f8f8f8" });
+ const enemyLevel = addTextObject(this.scene, 36, 26, `${i18next.t("saveSlotSelectUiHandler:lv")}${formatLargeNumber(enemy.level, 1000)}`, enemyLevelStyle, { fontSize: "44px", color: "#f8f8f8" });
enemyLevel.setShadow(0, 0, undefined);
enemyLevel.setStroke("#424242", 14);
enemyLevel.setOrigin(1, 0);
@@ -344,7 +344,7 @@ export default class RunInfoUiHandler extends UiHandler {
enemyData["player"] = true;
const enemy = enemyData.toPokemon(this.scene);
const enemyIcon = this.scene.addPokemonIcon(enemy, 0, 0, 0, 0);
- const enemyLevel = addTextObject(this.scene, 36, 26, `${i18next.t("saveSlotSelectUiHandler:lv")}${Utils.formatLargeNumber(enemy.level, 1000)}`, bossStatus ? TextStyle.PARTY_RED : TextStyle.PARTY, { fontSize: "44px", color: "#f8f8f8" });
+ const enemyLevel = addTextObject(this.scene, 36, 26, `${i18next.t("saveSlotSelectUiHandler:lv")}${formatLargeNumber(enemy.level, 1000)}`, bossStatus ? TextStyle.PARTY_RED : TextStyle.PARTY, { fontSize: "44px", color: "#f8f8f8" });
enemyLevel.setShadow(0, 0, undefined);
enemyLevel.setStroke("#424242", 14);
enemyLevel.setOrigin(1, 0);
@@ -447,7 +447,7 @@ export default class RunInfoUiHandler extends UiHandler {
}
}
enemyIcon.setPosition(39 * (e % 3) + 5, (35 * pokemonRowHeight));
- const enemyLevel = addTextObject(this.scene, 43 * (e % 3), (27 * (pokemonRowHeight + 1)), `${i18next.t("saveSlotSelectUiHandler:lv")}${Utils.formatLargeNumber(enemy.level, 1000)}`, isBoss ? TextStyle.PARTY_RED : TextStyle.PARTY, { fontSize: "54px" });
+ const enemyLevel = addTextObject(this.scene, 43 * (e % 3), (27 * (pokemonRowHeight + 1)), `${i18next.t("saveSlotSelectUiHandler:lv")}${formatLargeNumber(enemy.level, 1000)}`, isBoss ? TextStyle.PARTY_RED : TextStyle.PARTY, { fontSize: "54px" });
enemyLevel.setShadow(0, 0, undefined);
enemyLevel.setStroke("#424242", 14);
enemyLevel.setOrigin(0, 0);
@@ -514,9 +514,9 @@ export default class RunInfoUiHandler extends UiHandler {
// Japanese is set to a greater line spacing of 35px in addBBCodeTextObject() if lineSpacing < 12.
const lineSpacing = (i18next.resolvedLanguage === "ja") ? 12 : 3;
const runInfoText = addBBCodeTextObject(this.scene, 7, 0, "", TextStyle.WINDOW, { fontSize: "50px", lineSpacing: lineSpacing });
- const runTime = Utils.getPlayTimeString(this.runInfo.playTime);
+ const runTime = getPlayTimeString(this.runInfo.playTime);
runInfoText.appendText(`${i18next.t("runHistory:runLength")}: ${runTime}`, false);
- const runMoney = Utils.formatMoney(this.scene.moneyFormat, this.runInfo.money);
+ const runMoney = formatMoney(this.scene.moneyFormat, this.runInfo.money);
runInfoText.appendText(`[color=${getTextColor(TextStyle.MONEY)}]${i18next.t("battleScene:moneyOwned", { formattedMoney : runMoney })}[/color]`);
runInfoText.setPosition(7, 70);
runInfoTextContainer.add(runInfoText);
@@ -654,7 +654,7 @@ export default class RunInfoUiHandler extends UiHandler {
// Japanese is set to a greater line spacing of 35px in addBBCodeTextObject() if lineSpacing < 12.
const lineSpacing = (i18next.resolvedLanguage === "ja") ? 12 : 3;
const pokeInfoText = addBBCodeTextObject(this.scene, 0, 0, pName, TextStyle.SUMMARY, { fontSize: textContainerFontSize, lineSpacing: lineSpacing });
- pokeInfoText.appendText(`${i18next.t("saveSlotSelectUiHandler:lv")}${Utils.formatFancyLargeNumber(pokemon.level, 1)} - ${pNatureName}`);
+ pokeInfoText.appendText(`${i18next.t("saveSlotSelectUiHandler:lv")}${formatFancyLargeNumber(pokemon.level, 1)} - ${pNatureName}`);
pokeInfoText.appendText(pAbilityInfo);
pokeInfoText.appendText(pPassiveInfo);
pokeInfoTextContainer.add(pokeInfoText);
@@ -663,7 +663,7 @@ export default class RunInfoUiHandler extends UiHandler {
// Colored Arrows (Red/Blue) are placed by stats that are boosted from natures
const pokeStatTextContainer = this.scene.add.container(-35, 6);
const pStats : string[] = [];
- pokemon.stats.forEach((element) => pStats.push(Utils.formatFancyLargeNumber(element, 1)));
+ pokemon.stats.forEach((element) => pStats.push(formatFancyLargeNumber(element, 1)));
for (let i = 0; i < pStats.length; i++) {
const isMult = getNatureStatMultiplier(pNature, i);
pStats[i] = (isMult < 1) ? pStats[i] + "[color=#40c8f8]↓[/color]" : pStats[i];
diff --git a/src/ui/save-slot-select-ui-handler.ts b/src/ui/save-slot-select-ui-handler.ts
index 7bfecb1f99b4..49793912d661 100644
--- a/src/ui/save-slot-select-ui-handler.ts
+++ b/src/ui/save-slot-select-ui-handler.ts
@@ -1,11 +1,11 @@
import i18next from "i18next";
-import BattleScene from "../battle-scene";
+import BattleScene from "#app/battle-scene";
import { Button } from "#enums/buttons";
-import { GameMode } from "../game-mode";
-import * as Modifier from "../modifier/modifier";
-import { SessionSaveData } from "../system/game-data";
-import PokemonData from "../system/pokemon-data";
-import * as Utils from "../utils";
+import { GameMode } from "#app/game-mode";
+import * as Modifier from "#app/modifier/modifier";
+import { SessionSaveData } from "#app/system/game-data";
+import PokemonData from "#app/system/pokemon-data";
+import { isNullOrUndefined, fixedInt, getPlayTimeString, formatLargeNumber } from "#app/utils";
import MessageUiHandler from "./message-ui-handler";
import { TextStyle, addTextObject } from "./text";
import { Mode } from "./ui";
@@ -246,7 +246,7 @@ export default class SaveSlotSelectUiHandler extends MessageUiHandler {
}
this.setArrowVisibility(hasData);
}
- if (!Utils.isNullOrUndefined(prevSlotIndex)) {
+ if (!isNullOrUndefined(prevSlotIndex)) {
this.revertSessionSlot(prevSlotIndex);
}
@@ -289,7 +289,7 @@ export default class SaveSlotSelectUiHandler extends MessageUiHandler {
this.scene.tweens.add({
targets: this.sessionSlotsContainer,
y: this.sessionSlotsContainerInitialY - 56 * scrollCursor,
- duration: Utils.fixedInt(325),
+ duration: fixedInt(325),
ease: "Sine.easeInOut"
});
}
@@ -352,7 +352,7 @@ class SessionSlot extends Phaser.GameObjects.Container {
const timestampLabel = addTextObject(this.scene, 8, 19, new Date(data.timestamp).toLocaleString(), TextStyle.WINDOW);
this.add(timestampLabel);
- const playTimeLabel = addTextObject(this.scene, 8, 33, Utils.getPlayTimeString(data.playTime), TextStyle.WINDOW);
+ const playTimeLabel = addTextObject(this.scene, 8, 33, getPlayTimeString(data.playTime), TextStyle.WINDOW);
this.add(playTimeLabel);
const pokemonIconsContainer = this.scene.add.container(144, 4);
@@ -363,7 +363,7 @@ class SessionSlot extends Phaser.GameObjects.Container {
const pokemon = p.toPokemon(this.scene);
const icon = this.scene.addPokemonIcon(pokemon, 0, 0, 0, 0);
- const text = addTextObject(this.scene, 32, 20, `${i18next.t("saveSlotSelectUiHandler:lv")}${Utils.formatLargeNumber(pokemon.level, 1000)}`, TextStyle.PARTY, { fontSize: "54px", color: "#f8f8f8" });
+ const text = addTextObject(this.scene, 32, 20, `${i18next.t("saveSlotSelectUiHandler:lv")}${formatLargeNumber(pokemon.level, 1000)}`, TextStyle.PARTY, { fontSize: "54px", color: "#f8f8f8" });
text.setShadow(0, 0, undefined);
text.setStroke("#424242", 14);
text.setOrigin(1, 0);
diff --git a/src/ui/saving-icon-handler.ts b/src/ui/saving-icon-handler.ts
index f62b0dc61629..06502c228d42 100644
--- a/src/ui/saving-icon-handler.ts
+++ b/src/ui/saving-icon-handler.ts
@@ -1,5 +1,5 @@
import BattleScene from "#app/battle-scene";
-import * as Utils from "../utils";
+import { fixedInt } from "#app/utils";
export default class SavingIconHandler extends Phaser.GameObjects.Container {
private icon: Phaser.GameObjects.Sprite;
@@ -36,10 +36,10 @@ export default class SavingIconHandler extends Phaser.GameObjects.Container {
this.scene.tweens.add({
targets: this,
alpha: 1,
- duration: Utils.fixedInt(250),
+ duration: fixedInt(250),
ease: "Sine.easeInOut",
onComplete: () => {
- this.scene.time.delayedCall(Utils.fixedInt(500), () => {
+ this.scene.time.delayedCall(fixedInt(500), () => {
this.animActive = false;
if (!this.shown) {
this.hide();
@@ -64,7 +64,7 @@ export default class SavingIconHandler extends Phaser.GameObjects.Container {
this.scene.tweens.add({
targets: this,
alpha: 0,
- duration: Utils.fixedInt(250),
+ duration: fixedInt(250),
ease: "Sine.easeInOut",
onComplete: () => {
this.animActive = false;
diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts
index bb999dc736a8..f9fabce60d42 100644
--- a/src/ui/starter-select-ui-handler.ts
+++ b/src/ui/starter-select-ui-handler.ts
@@ -1,26 +1,45 @@
import { BattleSceneEventType, CandyUpgradeNotificationChangedEvent } from "#app/events/battle-scene";
-import { pokemonPrevolutions } from "#app/data/balance/pokemon-evolutions";
+import { pokemonPrevolutions } from "#balance/pokemon-evolutions";
import { Variant, getVariantTint, getVariantIcon } from "#app/data/variant";
import { argbFromRgba } from "@material/material-color-utilities";
import i18next from "i18next";
import BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext";
import BattleScene, { starterColors } from "#app/battle-scene";
import { allAbilities } from "#app/data/ability";
-import { speciesEggMoves } from "#app/data/balance/egg-moves";
+import { speciesEggMoves } from "#balance/egg-moves";
import { GrowthRate, getGrowthRateColor } from "#app/data/exp";
import { Gender, getGenderColor, getGenderSymbol } from "#app/data/gender";
import { allMoves } from "#app/data/move";
import { Nature, getNatureName } from "#app/data/nature";
import { pokemonFormChanges } from "#app/data/pokemon-forms";
-import { LevelMoves, pokemonFormLevelMoves, pokemonSpeciesLevelMoves } from "#app/data/balance/pokemon-level-moves";
+import { LevelMoves, pokemonFormLevelMoves, pokemonSpeciesLevelMoves } from "#balance/pokemon-level-moves";
import PokemonSpecies, { allSpecies, getPokemonSpeciesForm, getPokerusStarters } from "#app/data/pokemon-species";
-import { getStarterValueFriendshipCap, speciesStarterCosts, POKERUS_STARTER_COUNT } from "#app/data/balance/starters";
-import { starterPassiveAbilities } from "#app/data/balance/passives";
+import { getStarterValueFriendshipCap, speciesStarterCosts, POKERUS_STARTER_COUNT } from "#balance/starters";
+import { starterPassiveAbilities } from "#balance/passives";
import { Type } from "#app/data/type";
import { GameModes } from "#app/game-mode";
-import { AbilityAttr, DexAttr, DexAttrProps, DexEntry, StarterMoveset, StarterAttributes, StarterPreferences, StarterPrefs } from "#app/system/game-data";
+import {
+ AbilityAttr,
+ DexAttr,
+ DexAttrProps,
+ DexEntry,
+ StarterMoveset,
+ StarterAttributes,
+ StarterPreferences,
+ StarterPrefs,
+} from "#app/system/game-data";
import { Tutorial, handleTutorial } from "#app/tutorial";
-import * as Utils from "#app/utils";
+import {
+ BooleanHolder,
+ getLocalizedSpriteKey,
+ randIntRange,
+ fixedInt,
+ NumberHolder,
+ rgbHexToRgba,
+ padInt,
+ toReadableString,
+ capitalizeString,
+} from "#app/utils";
import { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler";
import MessageUiHandler from "#app/ui/message-ui-handler";
import PokemonIconAnimHandler, { PokemonIconAnimMode } from "#app/ui/pokemon-icon-anim-handler";
@@ -45,11 +64,15 @@ import { DropDown, DropDownLabel, DropDownOption, DropDownState, DropDownType, S
import { StarterContainer } from "#app/ui/starter-container";
import { DropDownColumn, FilterBar } from "#app/ui/filter-bar";
import { ScrollBar } from "#app/ui/scroll-bar";
-import { SelectChallengePhase } from "#app/phases/select-challenge-phase";
-import { EncounterPhase } from "#app/phases/encounter-phase";
-import { TitlePhase } from "#app/phases/title-phase";
+import { SelectChallengePhase } from "#phases/select-challenge-phase";
+import { EncounterPhase } from "#phases/encounter-phase";
+import { TitlePhase } from "#phases/title-phase";
import { Abilities } from "#enums/abilities";
-import { getPassiveCandyCount, getValueReductionCandyCounts, getSameSpeciesEggCandyCounts } from "#app/data/balance/starters";
+import {
+ getPassiveCandyCount,
+ getValueReductionCandyCounts,
+ getSameSpeciesEggCandyCounts,
+} from "#balance/starters";
export type StarterSelectCallback = (starters: Starter[]) => void;
@@ -301,7 +324,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
private value: integer = 0;
private canAddParty: boolean;
- private assetLoadCancelled: Utils.BooleanHolder | null;
+ private assetLoadCancelled: BooleanHolder | null;
public cursorObj: Phaser.GameObjects.Image;
private starterCursorObjs: Phaser.GameObjects.Image[];
private pokerusCursorObjs: Phaser.GameObjects.Image[];
@@ -387,7 +410,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
if (index === 0 || index === 19) {
return;
}
- const typeSprite = this.scene.add.sprite(0, 0, Utils.getLocalizedSpriteKey("types"));
+ const typeSprite = this.scene.add.sprite(0, 0, getLocalizedSpriteKey("types"));
typeSprite.setScale(0.5);
typeSprite.setFrame(type.toLowerCase());
typeOptions.push(new DropDownOption(this.scene, index, new DropDownLabel("", typeSprite)));
@@ -661,12 +684,12 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
this.pokemonSprite.setPipeline(this.scene.spritePipeline, { tone: [ 0.0, 0.0, 0.0, 0.0 ], ignoreTimeTint: true });
this.starterSelectContainer.add(this.pokemonSprite);
- this.type1Icon = this.scene.add.sprite(8, 98, Utils.getLocalizedSpriteKey("types"));
+ this.type1Icon = this.scene.add.sprite(8, 98, getLocalizedSpriteKey("types"));
this.type1Icon.setScale(0.5);
this.type1Icon.setOrigin(0, 0);
this.starterSelectContainer.add(this.type1Icon);
- this.type2Icon = this.scene.add.sprite(26, 98, Utils.getLocalizedSpriteKey("types"));
+ this.type2Icon = this.scene.add.sprite(26, 98, getLocalizedSpriteKey("types"));
this.type2Icon.setScale(0.5);
this.type2Icon.setOrigin(0, 0);
this.starterSelectContainer.add(this.type2Icon);
@@ -1133,20 +1156,20 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
targets: icon,
loop: -1,
// Make the initial bounce a little randomly delayed
- delay: Utils.randIntRange(0, 50) * 5,
+ delay: randIntRange(0, 50) * 5,
loopDelay: 1000,
tweens: [
{
targets: icon,
y: 2 - 5,
- duration: Utils.fixedInt(125),
+ duration: fixedInt(125),
ease: "Cubic.easeOut",
yoyo: true
},
{
targets: icon,
y: 2 - 3,
- duration: Utils.fixedInt(150),
+ duration: fixedInt(150),
ease: "Cubic.easeOut",
yoyo: true
}
@@ -1442,7 +1465,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
const [ isDupe, removeIndex ]: [boolean, number] = this.isInParty(this.lastSpecies); // checks to see if the pokemon is a duplicate; if it is, returns the index that will be removed
const isPartyValid = this.isPartyValid();
- const isValidForChallenge = new Utils.BooleanHolder(true);
+ const isValidForChallenge = new BooleanHolder(true);
Challenge.applyChallenges(this.scene.gameMode, Challenge.ChallengeType.STARTER_CHOICE, this.lastSpecies, isValidForChallenge, this.scene.gameData.getSpeciesDexAttrProps(this.lastSpecies, this.getCurrentDexProps(this.lastSpecies.speciesId)), isPartyValid);
@@ -2321,7 +2344,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
}
getValueLimit(): integer {
- const valueLimit = new Utils.IntegerHolder(0);
+ const valueLimit = new NumberHolder(0);
switch (this.scene.gameMode.modeId) {
case GameModes.ENDLESS:
case GameModes.SPLICED_ENDLESS:
@@ -2357,12 +2380,12 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
* Since some pokemon rely on forms to be valid (i.e. blaze tauros for fire challenges), we make a fake form and dex props to use in the challenge
*/
const tempFormProps = BigInt(Math.pow(2, i)) * DexAttr.DEFAULT_FORM;
- const isValidForChallenge = new Utils.BooleanHolder(true);
+ const isValidForChallenge = new BooleanHolder(true);
Challenge.applyChallenges(this.scene.gameMode, Challenge.ChallengeType.STARTER_CHOICE, container.species, isValidForChallenge, this.scene.gameData.getSpeciesDexAttrProps(species, tempFormProps), true);
allFormsValid = allFormsValid || isValidForChallenge.value;
}
} else {
- const isValidForChallenge = new Utils.BooleanHolder(true);
+ const isValidForChallenge = new BooleanHolder(true);
Challenge.applyChallenges(this.scene.gameMode, Challenge.ChallengeType.STARTER_CHOICE, container.species, isValidForChallenge, this.scene.gameData.getSpeciesDexAttrProps(species, this.scene.gameData.getSpeciesDefaultDexAttr(container.species, false, true)), true);
allFormsValid = isValidForChallenge.value;
}
@@ -2624,8 +2647,8 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
}
// Set the candy colors
- container.candyUpgradeIcon.setTint(argbFromRgba(Utils.rgbHexToRgba(starterColors[speciesId][0])));
- container.candyUpgradeOverlayIcon.setTint(argbFromRgba(Utils.rgbHexToRgba(starterColors[speciesId][1])));
+ container.candyUpgradeIcon.setTint(argbFromRgba(rgbHexToRgba(starterColors[speciesId][0])));
+ container.candyUpgradeOverlayIcon.setTint(argbFromRgba(rgbHexToRgba(starterColors[speciesId][1])));
this.setUpgradeIcon(container);
} else if (this.scene.candyUpgradeDisplay === 1) {
@@ -2760,7 +2783,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
this.lastSpecies = species!; // TODO: is this bang correct?
if (species && (this.speciesStarterDexEntry?.seenAttr || this.speciesStarterDexEntry?.caughtAttr)) {
- this.pokemonNumberText.setText(Utils.padInt(species.speciesId, 4));
+ this.pokemonNumberText.setText(padInt(species.speciesId, 4));
if (starterAttributes?.nickname) {
const name = decodeURIComponent(escape(atob(starterAttributes.nickname)));
this.pokemonNameText.setText(name);
@@ -2778,7 +2801,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
this.pokemonLuckLabelText.setVisible(this.pokemonLuckText.visible);
//Growth translate
- let growthReadable = Utils.toReadableString(GrowthRate[species.growthRate]);
+ let growthReadable = toReadableString(GrowthRate[species.growthRate]);
const growthAux = growthReadable.replace(" ", "_");
if (i18next.exists("growth:" + growthAux)) {
growthReadable = i18next.t("growth:" + growthAux as any);
@@ -2826,9 +2849,9 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
} else {
this.pokemonCaughtHatchedContainer.setY(25);
this.pokemonShinyIcon.setY(117);
- this.pokemonCandyIcon.setTint(argbFromRgba(Utils.rgbHexToRgba(colorScheme[0])));
+ this.pokemonCandyIcon.setTint(argbFromRgba(rgbHexToRgba(colorScheme[0])));
this.pokemonCandyIcon.setVisible(true);
- this.pokemonCandyOverlayIcon.setTint(argbFromRgba(Utils.rgbHexToRgba(colorScheme[1])));
+ this.pokemonCandyOverlayIcon.setTint(argbFromRgba(rgbHexToRgba(colorScheme[1])));
this.pokemonCandyOverlayIcon.setVisible(true);
this.pokemonCandyDarknessOverlay.setVisible(true);
this.pokemonCandyCountText.setText(`x${this.scene.gameData.starterData[species.speciesId].candyCount}`);
@@ -2928,7 +2951,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
this.pokemonSprite.setTint(0x808080);
}
} else {
- this.pokemonNumberText.setText(Utils.padInt(0, 4));
+ this.pokemonNumberText.setText(padInt(0, 4));
this.pokemonNameText.setText(species ? "???" : "");
this.pokemonGrowthRateText.setText("");
this.pokemonGrowthRateLabelText.setVisible(false);
@@ -3050,7 +3073,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
this.starterNatures[starterIndex] = this.natureCursor;
}
- const assetLoadCancelled = new Utils.BooleanHolder(false);
+ const assetLoadCancelled = new BooleanHolder(false);
this.assetLoadCancelled = assetLoadCancelled;
species.loadAssets(this.scene, female!, formIndex, shiny, variant, true).then(() => { // TODO: is this bang correct?
@@ -3067,7 +3090,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
});
- const isValidForChallenge = new Utils.BooleanHolder(true);
+ const isValidForChallenge = new BooleanHolder(true);
Challenge.applyChallenges(this.scene.gameMode, Challenge.ChallengeType.STARTER_CHOICE, species, isValidForChallenge, this.scene.gameData.getSpeciesDexAttrProps(species, this.dexAttrCursor), !!this.starterSpecies.length);
const currentFilteredContainer = this.filteredStarterContainers.find(p => p.species.speciesId === species.speciesId);
if (currentFilteredContainer) {
@@ -3224,9 +3247,9 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
}) as StarterMoveset;
const speciesForm = getPokemonSpeciesForm(species.speciesId, formIndex!); // TODO: is the bang correct?
- const formText = Utils.capitalizeString(species?.forms[formIndex!]?.formKey, "-", false, false); // TODO: is the bang correct?
+ const formText = capitalizeString(species?.forms[formIndex!]?.formKey, "-", false, false); // TODO: is the bang correct?
- const speciesName = Utils.capitalizeString(Species[species.speciesId], "_", true, false);
+ const speciesName = capitalizeString(Species[species.speciesId], "_", true, false);
if (species.speciesId === Species.ARCEUS) {
this.pokemonFormText.setText(i18next.t(`pokemonInfo:Type.${formText?.toUpperCase()}`));
@@ -3392,12 +3415,12 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
this.valueLimitLabel.setColor(this.getTextColor(!overLimit ? TextStyle.TOOLTIP_CONTENT : TextStyle.SUMMARY_PINK));
this.valueLimitLabel.setShadowColor(this.getTextColor(!overLimit ? TextStyle.TOOLTIP_CONTENT : TextStyle.SUMMARY_PINK, true));
if (overLimit) {
- this.scene.time.delayedCall(Utils.fixedInt(500), () => this.tryUpdateValue());
+ this.scene.time.delayedCall(fixedInt(500), () => this.tryUpdateValue());
return false;
}
let isPartyValid: boolean = this.isPartyValid(); // this checks to see if the party is valid
if (addingToParty) { // this does a check to see if the pokemon being added is valid; if so, it will update the isPartyValid boolean
- const isNewPokemonValid = new Utils.BooleanHolder(true);
+ const isNewPokemonValid = new BooleanHolder(true);
const species = this.filteredStarterContainers[this.cursor].species;
Challenge.applyChallenges(this.scene.gameMode, Challenge.ChallengeType.STARTER_CHOICE, species, isNewPokemonValid, this.scene.gameData.getSpeciesDexAttrProps(species, this.getCurrentDexProps(species.speciesId)), false);
isPartyValid = isPartyValid || isNewPokemonValid.value;
@@ -3427,7 +3450,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
* If speciesStarterDexEntry?.caughtAttr is true, this species registered in stater.
* we change to can AddParty value to true since the user has enough cost to choose this pokemon and this pokemon registered too.
*/
- const isValidForChallenge = new Utils.BooleanHolder(true);
+ const isValidForChallenge = new BooleanHolder(true);
Challenge.applyChallenges(this.scene.gameMode, Challenge.ChallengeType.STARTER_CHOICE, this.allSpecies[s], isValidForChallenge, this.scene.gameData.getSpeciesDexAttrProps(this.allSpecies[s], this.getCurrentDexProps(this.allSpecies[s].speciesId)), isPartyValid);
const canBeChosen = remainValue >= speciesStarterValue && isValidForChallenge.value;
@@ -3543,7 +3566,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
isPartyValid(): boolean {
let canStart = false;
for (let s = 0; s < this.starterSpecies.length; s++) {
- const isValidForChallenge = new Utils.BooleanHolder(true);
+ const isValidForChallenge = new BooleanHolder(true);
const species = this.starterSpecies[s];
Challenge.applyChallenges(this.scene.gameMode, Challenge.ChallengeType.STARTER_CHOICE, species, isValidForChallenge, this.scene.gameData.getSpeciesDexAttrProps(species, this.getCurrentDexProps(species.speciesId)), false);
canStart = canStart || isValidForChallenge.value;
diff --git a/src/ui/stats-container.ts b/src/ui/stats-container.ts
index 7e026ede83e2..6ffaf129198c 100644
--- a/src/ui/stats-container.ts
+++ b/src/ui/stats-container.ts
@@ -1,7 +1,7 @@
import BBCodeText from "phaser3-rex-plugins/plugins/gameobjects/tagtext/bbcodetext/BBCodeText";
import BattleScene from "../battle-scene";
import { TextStyle, addBBCodeTextObject, addTextObject, getTextColor } from "./text";
-import { PERMANENT_STATS, getStatKey } from "#app/enums/stat";
+import { PERMANENT_STATS, getStatKey } from "#enums/stat";
import i18next from "i18next";
diff --git a/src/ui/summary-ui-handler.ts b/src/ui/summary-ui-handler.ts
index b35c0ca33036..6679c4609956 100644
--- a/src/ui/summary-ui-handler.ts
+++ b/src/ui/summary-ui-handler.ts
@@ -1,9 +1,17 @@
import BattleScene, { starterColors } from "#app/battle-scene";
import { Mode } from "#app/ui/ui";
import UiHandler from "#app/ui/ui-handler";
-import * as Utils from "#app/utils";
+import {
+ getLocalizedSpriteKey,
+ rgbHexToRgba,
+ padInt,
+ getEnumValues,
+ fixedInt,
+ toReadableString,
+ formatStat,
+} from "#app/utils";
import { PlayerPokemon, PokemonMove } from "#app/field/pokemon";
-import { getStarterValueFriendshipCap, speciesStarterCosts } from "#app/data/balance/starters";
+import { getStarterValueFriendshipCap, speciesStarterCosts } from "#balance/starters";
import { argbFromRgba } from "@material/material-color-utilities";
import { Type, getTypeRgb } from "#app/data/type";
import { TextStyle, addBBCodeTextObject, addTextObject, getBBCodeFrag } from "#app/ui/text";
@@ -13,7 +21,7 @@ import { getGenderColor, getGenderSymbol } from "#app/data/gender";
import { getLevelRelExp, getLevelTotalExp } from "#app/data/exp";
import { PokemonHeldItemModifier } from "#app/modifier/modifier";
import { StatusEffect } from "#app/data/status-effect";
-import { getBiomeName } from "#app/data/balance/biomes";
+import { getBiomeName } from "#balance/biomes";
import { Nature, getNatureName, getNatureStatMultiplier } from "#app/data/nature";
import { loggedInUser } from "#app/account";
import { Variant, getVariantTint } from "#app/data/variant";
@@ -237,7 +245,7 @@ export default class SummaryUiHandler extends UiHandler {
this.statusContainer.add(statusLabel);
- this.status = this.scene.add.sprite(91, 4, Utils.getLocalizedSpriteKey("statuses"));
+ this.status = this.scene.add.sprite(91, 4, getLocalizedSpriteKey("statuses"));
this.status.setOrigin(0.5, 0);
this.statusContainer.add(this.status);
@@ -312,11 +320,11 @@ export default class SummaryUiHandler extends UiHandler {
this.shinyOverlay.setVisible(this.pokemon.isShiny());
const colorScheme = starterColors[this.pokemon.species.getRootSpeciesId()];
- this.candyIcon.setTint(argbFromRgba(Utils.rgbHexToRgba(colorScheme[0])));
- this.candyOverlay.setTint(argbFromRgba(Utils.rgbHexToRgba(colorScheme[1])));
+ this.candyIcon.setTint(argbFromRgba(rgbHexToRgba(colorScheme[0])));
+ this.candyOverlay.setTint(argbFromRgba(rgbHexToRgba(colorScheme[1])));
- this.numberText.setText(Utils.padInt(this.pokemon.species.speciesId, 4));
+ this.numberText.setText(padInt(this.pokemon.species.speciesId, 4));
this.numberText.setColor(this.getTextColor(!this.pokemon.isShiny() ? TextStyle.SUMMARY : TextStyle.SUMMARY_GOLD));
this.numberText.setShadowColor(this.getTextColor(!this.pokemon.isShiny() ? TextStyle.SUMMARY : TextStyle.SUMMARY_GOLD, true));
@@ -544,7 +552,7 @@ export default class SummaryUiHandler extends UiHandler {
}
success = true;
} else {
- const pages = Utils.getEnumValues(Page);
+ const pages = getEnumValues(Page);
switch (button) {
case Button.UP:
case Button.DOWN:
@@ -617,10 +625,10 @@ export default class SummaryUiHandler extends UiHandler {
if (moveDescriptionLineCount > 3) {
this.descriptionScrollTween = this.scene.tweens.add({
targets: this.moveDescriptionText,
- delay: Utils.fixedInt(2000),
+ delay: fixedInt(2000),
loop: -1,
- hold: Utils.fixedInt(2000),
- duration: Utils.fixedInt((moveDescriptionLineCount - 3) * 2000),
+ hold: fixedInt(2000),
+ duration: fixedInt((moveDescriptionLineCount - 3) * 2000),
y: `-=${14.83 * (moveDescriptionLineCount - 3)}`
});
}
@@ -639,10 +647,10 @@ export default class SummaryUiHandler extends UiHandler {
this.moveCursorObj.setVisible(true);
this.moveCursorBlinkTimer = this.scene.time.addEvent({
loop: true,
- delay: Utils.fixedInt(600),
+ delay: fixedInt(600),
callback: () => {
this.moveCursorObj?.setVisible(false);
- this.scene.time.delayedCall(Utils.fixedInt(100), () => {
+ this.scene.time.delayedCall(fixedInt(100), () => {
if (!this.moveCursorObj) {
return;
}
@@ -750,7 +758,7 @@ export default class SummaryUiHandler extends UiHandler {
const getTypeIcon = (index: integer, type: Type, tera: boolean = false) => {
const xCoord = typeLabel.width * typeLabel.scale + 9 + 34 * index;
const typeIcon = !tera
- ? this.scene.add.sprite(xCoord, 42, Utils.getLocalizedSpriteKey("types"), Type[type].toLowerCase())
+ ? this.scene.add.sprite(xCoord, 42, getLocalizedSpriteKey("types"), Type[type].toLowerCase())
: this.scene.add.sprite(xCoord, 42, "type_tera");
if (tera) {
typeIcon.setScale(0.5);
@@ -837,10 +845,10 @@ export default class SummaryUiHandler extends UiHandler {
abilityInfo.descriptionText.setY(69);
this.descriptionScrollTween = this.scene.tweens.add({
targets: abilityInfo.descriptionText,
- delay: Utils.fixedInt(2000),
+ delay: fixedInt(2000),
loop: -1,
- hold: Utils.fixedInt(2000),
- duration: Utils.fixedInt((abilityDescriptionLineCount - 2) * 2000),
+ hold: fixedInt(2000),
+ duration: fixedInt((abilityDescriptionLineCount - 2) * 2000),
y: `-=${14.83 * (abilityDescriptionLineCount - 2)}`
});
}
@@ -851,8 +859,8 @@ export default class SummaryUiHandler extends UiHandler {
this.passiveContainer?.descriptionText?.setVisible(false);
const closeFragment = getBBCodeFrag("", TextStyle.WINDOW_ALT);
- const rawNature = Utils.toReadableString(Nature[this.pokemon?.getNature()!]); // TODO: is this bang correct?
- const nature = `${getBBCodeFrag(Utils.toReadableString(getNatureName(this.pokemon?.getNature()!)), TextStyle.SUMMARY_RED)}${closeFragment}`; // TODO: is this bang correct?
+ const rawNature = toReadableString(Nature[this.pokemon?.getNature()!]); // TODO: is this bang correct?
+ const nature = `${getBBCodeFrag(toReadableString(getNatureName(this.pokemon?.getNature()!)), TextStyle.SUMMARY_RED)}${closeFragment}`; // TODO: is this bang correct?
const memoString = i18next.t("pokemonSummary:memoString", {
metFragment: i18next.t(`pokemonSummary:metFragment.${this.pokemon?.metBiome === -1 ? "apparently" : "normal"}`, {
@@ -883,8 +891,8 @@ export default class SummaryUiHandler extends UiHandler {
statsContainer.add(statLabel);
const statValueText = stat !== Stat.HP
- ? Utils.formatStat(this.pokemon?.getStat(stat)!) // TODO: is this bang correct?
- : `${Utils.formatStat(this.pokemon?.hp!, true)}/${Utils.formatStat(this.pokemon?.getMaxHp()!, true)}`; // TODO: are those bangs correct?
+ ? formatStat(this.pokemon?.getStat(stat)!) // TODO: is this bang correct?
+ : `${formatStat(this.pokemon?.hp!, true)}/${formatStat(this.pokemon?.getMaxHp()!, true)}`; // TODO: are those bangs correct?
const statValue = addTextObject(this.scene, 120 + 88 * colIndex, 56 + 16 * rowIndex, statValueText, TextStyle.WINDOW_ALT);
statValue.setOrigin(1, 0);
@@ -967,7 +975,7 @@ export default class SummaryUiHandler extends UiHandler {
this.extraMoveRowContainer.setVisible(true);
if (this.newMove && this.pokemon) {
- const spriteKey = Utils.getLocalizedSpriteKey("types");
+ const spriteKey = getLocalizedSpriteKey("types");
const moveType = this.pokemon.getMoveType(this.newMove);
const newMoveTypeIcon = this.scene.add.sprite(0, 0, spriteKey, Type[moveType].toLowerCase());
newMoveTypeIcon.setOrigin(0, 1);
@@ -977,7 +985,7 @@ export default class SummaryUiHandler extends UiHandler {
ppOverlay.setOrigin(0, 1);
this.extraMoveRowContainer.add(ppOverlay);
- const pp = Utils.padInt(this.newMove?.pp!, 2, " "); // TODO: is this bang correct?
+ const pp = padInt(this.newMove?.pp!, 2, " "); // TODO: is this bang correct?
const ppText = addTextObject(this.scene, 173, 1, `${pp}/${pp}`, TextStyle.WINDOW);
ppText.setOrigin(0, 1);
this.extraMoveRowContainer.add(ppText);
@@ -992,7 +1000,7 @@ export default class SummaryUiHandler extends UiHandler {
this.moveRowsContainer.add(moveRowContainer);
if (move && this.pokemon) {
- const spriteKey = Utils.getLocalizedSpriteKey("types");
+ const spriteKey = getLocalizedSpriteKey("types");
const moveType = this.pokemon.getMoveType(move.getMove());
const typeIcon = this.scene.add.sprite(0, 0, spriteKey, Type[moveType].toLowerCase());
typeIcon.setOrigin(0, 1);
@@ -1013,7 +1021,7 @@ export default class SummaryUiHandler extends UiHandler {
if (move) {
const maxPP = move.getMovePp();
const pp = maxPP - move.ppUsed;
- ppText.setText(`${Utils.padInt(pp, 2, " ")}/${Utils.padInt(maxPP, 2, " ")}`);
+ ppText.setText(`${padInt(pp, 2, " ")}/${padInt(maxPP, 2, " ")}`);
}
moveRowContainer.add(ppText);
diff --git a/src/ui/target-select-ui-handler.ts b/src/ui/target-select-ui-handler.ts
index 4c55a4b960ec..43d4967a1a23 100644
--- a/src/ui/target-select-ui-handler.ts
+++ b/src/ui/target-select-ui-handler.ts
@@ -1,9 +1,9 @@
-import { BattlerIndex } from "../battle";
-import BattleScene from "../battle-scene";
+import { BattlerIndex } from "#app/battle";
+import BattleScene from "#app/battle-scene";
import { Mode } from "./ui";
import UiHandler from "./ui-handler";
-import * as Utils from "../utils";
-import { getMoveTargets } from "../data/move";
+import { fixedInt } from "#app/utils";
+import { getMoveTargets } from "#app/data/move";
import { Button } from "#enums/buttons";
import { Moves } from "#enums/moves";
import Pokemon from "#app/field/pokemon";
@@ -122,7 +122,7 @@ export default class TargetSelectUiHandler extends UiHandler {
key: { start: 1, to: 0.25 },
loop: -1,
loopDelay: 150,
- duration: Utils.fixedInt(450),
+ duration: fixedInt(450),
ease: "Sine.easeInOut",
yoyo: true,
onUpdate: t => {
@@ -147,7 +147,7 @@ export default class TargetSelectUiHandler extends UiHandler {
targets: [ info ],
y: { start: info.getBaseY(), to: info.getBaseY() + 1 },
loop: -1,
- duration: Utils.fixedInt(250),
+ duration: fixedInt(250),
ease: "Linear",
yoyo: true
}));
diff --git a/src/ui/time-of-day-widget.ts b/src/ui/time-of-day-widget.ts
index 66fe5cc9ac32..33bf2b9601bb 100644
--- a/src/ui/time-of-day-widget.ts
+++ b/src/ui/time-of-day-widget.ts
@@ -1,6 +1,6 @@
-import * as Utils from "../utils";
+import { fixedInt } from "#app/utils";
import BattleScene from "#app/battle-scene";
-import { BattleSceneEventType } from "../events/battle-scene";
+import { BattleSceneEventType } from "#app/events/battle-scene";
import { EaseType } from "#enums/ease-type";
import { TimeOfDay } from "#enums/time-of-day";
@@ -80,14 +80,14 @@ export default class TimeOfDayWidget extends Phaser.GameObjects.Container {
const rotate = {
targets: [ this.timeOfDayIconMgs[0], this.timeOfDayIconMgs[1] ],
angle: "+=90",
- duration: Utils.fixedInt(1500),
+ duration: fixedInt(1500),
ease: "Back.easeOut",
paused: !this.parentVisible,
};
const fade = {
targets: [ this.timeOfDayIconBgs[1], this.timeOfDayIconMgs[1], this.timeOfDayIconFgs[1] ],
alpha: 0,
- duration: Utils.fixedInt(500),
+ duration: fixedInt(500),
ease: "Linear",
paused: !this.parentVisible,
};
@@ -103,14 +103,14 @@ export default class TimeOfDayWidget extends Phaser.GameObjects.Container {
const bounce = {
targets: [ this.timeOfDayIconMgs[0], this.timeOfDayIconMgs[1] ],
angle: "+=90",
- duration: Utils.fixedInt(2000),
+ duration: fixedInt(2000),
ease: "Bounce.easeOut",
paused: !this.parentVisible,
};
const fade = {
targets: [ this.timeOfDayIconBgs[1], this.timeOfDayIconMgs[1], this.timeOfDayIconFgs[1] ],
alpha: 0,
- duration: Utils.fixedInt(800),
+ duration: fixedInt(800),
ease: "Linear",
paused: !this.parentVisible,
};
diff --git a/src/ui/title-ui-handler.ts b/src/ui/title-ui-handler.ts
index f7972af2cc23..571e95038b7d 100644
--- a/src/ui/title-ui-handler.ts
+++ b/src/ui/title-ui-handler.ts
@@ -1,9 +1,9 @@
-import BattleScene from "../battle-scene";
+import BattleScene from "#app/battle-scene";
import OptionSelectUiHandler from "./settings/option-select-ui-handler";
import { Mode } from "./ui";
-import * as Utils from "../utils";
+import { fixedInt, apiFetch, randItem } from "#app/utils";
import { TextStyle, addTextObject, getTextStyleOptions } from "./text";
-import { getSplashMessages } from "../data/splash-messages";
+import { getSplashMessages } from "#app/data/splash-messages";
import i18next from "i18next";
import { TimedEventDisplay } from "#app/timed-event-manager";
import { version } from "../../package.json";
@@ -65,7 +65,7 @@ export default class TitleUiHandler extends OptionSelectUiHandler {
this.scene.tweens.add({
targets: this.splashMessageText,
- duration: Utils.fixedInt(350),
+ duration: fixedInt(350),
scale: originalSplashMessageScale * 1.25,
loop: -1,
yoyo: true,
@@ -78,7 +78,7 @@ export default class TitleUiHandler extends OptionSelectUiHandler {
}
updateTitleStats(): void {
- Utils.apiFetch("game/titlestats")
+ apiFetch("game/titlestats")
.then(request => request.json())
.then(stats => {
this.playerCountLabel.setText(`${stats.playerCount} ${i18next.t("menu:playersOnline")}`);
@@ -95,7 +95,7 @@ export default class TitleUiHandler extends OptionSelectUiHandler {
const ret = super.show(args);
if (ret) {
- this.splashMessage = Utils.randItem(getSplashMessages());
+ this.splashMessage = randItem(getSplashMessages());
this.splashMessageText.setText(i18next.t(this.splashMessage, { count: TitleUiHandler.BATTLES_WON_FALLBACK }));
this.appVersionText.setText("v" + version);
@@ -114,7 +114,7 @@ export default class TitleUiHandler extends OptionSelectUiHandler {
this.scene.tweens.add({
targets: [ this.titleContainer, ui.getMessageHandler().bg ],
- duration: Utils.fixedInt(325),
+ duration: fixedInt(325),
alpha: (target: any) => target === this.titleContainer ? 1 : 0,
ease: "Sine.easeInOut"
});
@@ -135,7 +135,7 @@ export default class TitleUiHandler extends OptionSelectUiHandler {
this.scene.tweens.add({
targets: [ this.titleContainer, ui.getMessageHandler().bg ],
- duration: Utils.fixedInt(325),
+ duration: fixedInt(325),
alpha: (target: any) => target === this.titleContainer ? 0 : 1,
ease: "Sine.easeInOut"
});
diff --git a/src/ui/ui.ts b/src/ui/ui.ts
index 63cd48ab1cd4..9b806cf8e496 100644
--- a/src/ui/ui.ts
+++ b/src/ui/ui.ts
@@ -1,4 +1,4 @@
-import { default as BattleScene } from "../battle-scene";
+import { default as BattleScene } from "#app/battle-scene";
import UiHandler from "./ui-handler";
import BattleMessageUiHandler from "./battle-message-ui-handler";
import CommandUiHandler from "./command-ui-handler";
@@ -27,7 +27,7 @@ import { addWindow } from "./ui-theme";
import LoginFormUiHandler from "./login-form-ui-handler";
import RegistrationFormUiHandler from "./registration-form-ui-handler";
import LoadingModalUiHandler from "./loading-modal-ui-handler";
-import * as Utils from "../utils";
+import { executeIf } from "#app/utils";
import GameStatsUiHandler from "./game-stats-ui-handler";
import AwaitableUiHandler from "./awaitable-ui-handler";
import SaveSlotSelectUiHandler from "./save-slot-select-ui-handler";
@@ -573,7 +573,7 @@ export default class UI extends Phaser.GameObjects.Container {
if (!this?.modeChain?.length) {
return resolve();
}
- this.revertMode().then(success => Utils.executeIf(success, this.revertModes).then(() => resolve()));
+ this.revertMode().then(success => executeIf(success, this.revertModes).then(() => resolve()));
});
}
diff --git a/src/ui/unavailable-modal-ui-handler.ts b/src/ui/unavailable-modal-ui-handler.ts
index 92b1c2f1b4ec..b6ded4d43d0c 100644
--- a/src/ui/unavailable-modal-ui-handler.ts
+++ b/src/ui/unavailable-modal-ui-handler.ts
@@ -1,9 +1,9 @@
-import BattleScene from "../battle-scene";
+import BattleScene from "#app/battle-scene";
import { ModalConfig, ModalUiHandler } from "./modal-ui-handler";
import { addTextObject, TextStyle } from "./text";
import { Mode } from "./ui";
import { updateUserInfo } from "#app/account";
-import * as Utils from "#app/utils";
+import { removeCookie, sessionIdKey } from "#app/utils";
import i18next from "i18next";
export default class UnavailableModalUiHandler extends ModalUiHandler {
@@ -58,7 +58,7 @@ export default class UnavailableModalUiHandler extends ModalUiHandler {
this.scene.playSound("se/pb_bounce_1");
this.reconnectCallback();
} else if (response[1] === 401) {
- Utils.removeCookie(Utils.sessionIdKey);
+ removeCookie(sessionIdKey);
this.scene.reset(true, true);
} else {
this.reconnectDuration = Math.min(this.reconnectDuration * 2, this.maxTime); // Set a max delay so it isn't infinite
diff --git a/tsconfig.json b/tsconfig.json
index f8e019a1b8bd..21a5bfaf0f2f 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -11,6 +11,9 @@
"rootDir": "./src",
"baseUrl": "./src",
"paths": {
+ "#mystery-encounters/*": ["./data/mystery-encounters/*.ts"],
+ "#phases/*": ["./phases/*.ts"],
+ "#balance/*": ["./data/balance/*.ts"],
"#enums/*": ["./enums/*.ts"],
"#app/*": ["*.ts"],
"#app": ["."],