Manual merge

This commit is contained in:
Frutescens 2024-07-30 10:10:53 -07:00
parent b8f4174d3f
commit f1df00ef58
1 changed files with 31 additions and 3 deletions

View File

@ -1,9 +1,16 @@
import { common } from "./common.js";
import { settings } from "./settings.js";
import { ability } from "./ability"; import { ability } from "./ability";
import { abilityTriggers } from "./ability-trigger"; import { abilityTriggers } from "./ability-trigger";
import { arenaFlyout } from "./arena-flyout";
import { arenaTag } from "./arena-tag";
import { PGFachv, PGMachv } from "./achv"; import { PGFachv, PGMachv } from "./achv";
import { battle } from "./battle"; import { battle } from "./battle";
import { battleInfo } from "./battle-info";
import { battleMessageUiHandler } from "./battle-message-ui-handler"; import { battleMessageUiHandler } from "./battle-message-ui-handler";
import { battlerTags } from "./battler-tags";
import { berry } from "./berry"; import { berry } from "./berry";
import { bgmName } from "./bgm-name";
import { biome } from "./biome"; import { biome } from "./biome";
import { challenges } from "./challenges"; import { challenges } from "./challenges";
import { commandUiHandler } from "./command-ui-handler"; import { commandUiHandler } from "./command-ui-handler";
@ -19,37 +26,49 @@ import {
} from "./dialogue"; } from "./dialogue";
import { egg } from "./egg"; import { egg } from "./egg";
import { fightUiHandler } from "./fight-ui-handler"; import { fightUiHandler } from "./fight-ui-handler";
import { filterBar } from "./filter-bar";
import { gameMode } from "./game-mode"; import { gameMode } from "./game-mode";
import { gameStatsUiHandler } from "./game-stats-ui-handler"; import { gameStatsUiHandler } from "./game-stats-ui-handler";
import { growth } from "./growth"; import { growth } from "./growth";
import { menu } from "./menu"; import { menu } from "./menu";
import { menuUiHandler } from "./menu-ui-handler"; import { menuUiHandler } from "./menu-ui-handler";
import { modifier } from "./modifier";
import { modifierType } from "./modifier-type"; import { modifierType } from "./modifier-type";
import { move } from "./move"; import { move } from "./move";
import { nature } from "./nature"; import { nature } from "./nature";
import { partyUiHandler } from "./party-ui-handler"; import { partyUiHandler } from "./party-ui-handler";
import { pokeball } from "./pokeball"; import { pokeball } from "./pokeball";
import { pokemon } from "./pokemon"; import { pokemon } from "./pokemon";
import { pokemonForm } from "./pokemon-form";
import { pokemonInfo } from "./pokemon-info"; import { pokemonInfo } from "./pokemon-info";
import { pokemonInfoContainer } from "./pokemon-info-container"; import { pokemonInfoContainer } from "./pokemon-info-container";
import { pokemonSummary } from "./pokemon-summary";
import { saveSlotSelectUiHandler } from "./save-slot-select-ui-handler"; import { saveSlotSelectUiHandler } from "./save-slot-select-ui-handler";
import { splashMessages } from "./splash-messages"; import { splashMessages } from "./splash-messages";
import { starterSelectUiHandler } from "./starter-select-ui-handler"; import { starterSelectUiHandler } from "./starter-select-ui-handler";
import { statusEffect } from "./status-effect";
import { titles, trainerClasses, trainerNames } from "./trainers"; import { titles, trainerClasses, trainerNames } from "./trainers";
import { tutorial } from "./tutorial"; import { tutorial } from "./tutorial";
import { voucher } from "./voucher"; import { voucher } from "./voucher";
import { weather } from "./weather"; import { terrain, weather } from "./weather";
import { runHistory } from "./run-history-ui-handler"; import { modifierSelectUiHandler } from "./modifier-select-ui-handler";
import { moveTriggers } from "./move-trigger";
export const enConfig = { export const enConfig = {
ability: ability, ability: ability,
abilityTriggers: abilityTriggers, abilityTriggers: abilityTriggers,
arenaFlyout: arenaFlyout,
arenaTag: arenaTag,
battle: battle, battle: battle,
battleInfo: battleInfo,
battleMessageUiHandler: battleMessageUiHandler, battleMessageUiHandler: battleMessageUiHandler,
battlerTags: battlerTags,
berry: berry, berry: berry,
bgmName: bgmName,
biome: biome, biome: biome,
challenges: challenges, challenges: challenges,
commandUiHandler: commandUiHandler, commandUiHandler: commandUiHandler,
common: common,
PGMachv: PGMachv, PGMachv: PGMachv,
PGFachv: PGFachv, PGFachv: PGFachv,
PGMdialogue: PGMdialogue, PGMdialogue: PGMdialogue,
@ -62,27 +81,36 @@ export const enConfig = {
PGFdoubleBattleDialogue: PGFdoubleBattleDialogue, PGFdoubleBattleDialogue: PGFdoubleBattleDialogue,
egg: egg, egg: egg,
fightUiHandler: fightUiHandler, fightUiHandler: fightUiHandler,
filterBar: filterBar,
gameMode: gameMode, gameMode: gameMode,
gameStatsUiHandler: gameStatsUiHandler, gameStatsUiHandler: gameStatsUiHandler,
growth: growth, growth: growth,
menu: menu, menu: menu,
menuUiHandler: menuUiHandler, menuUiHandler: menuUiHandler,
modifier: modifier,
modifierType: modifierType, modifierType: modifierType,
move: move, move: move,
nature: nature, nature: nature,
partyUiHandler: partyUiHandler,
pokeball: pokeball, pokeball: pokeball,
pokemon: pokemon, pokemon: pokemon,
pokemonForm: pokemonForm,
pokemonInfo: pokemonInfo, pokemonInfo: pokemonInfo,
pokemonInfoContainer: pokemonInfoContainer, pokemonInfoContainer: pokemonInfoContainer,
pokemonSummary: pokemonSummary,
saveSlotSelectUiHandler: saveSlotSelectUiHandler, saveSlotSelectUiHandler: saveSlotSelectUiHandler,
settings: settings,
splashMessages: splashMessages, splashMessages: splashMessages,
starterSelectUiHandler: starterSelectUiHandler, starterSelectUiHandler: starterSelectUiHandler,
statusEffect: statusEffect,
terrain: terrain,
titles: titles, titles: titles,
trainerClasses: trainerClasses, trainerClasses: trainerClasses,
trainerNames: trainerNames, trainerNames: trainerNames,
tutorial: tutorial, tutorial: tutorial,
voucher: voucher, voucher: voucher,
weather: weather, weather: weather,
partyUiHandler: partyUiHandler,
modifierSelectUiHandler: modifierSelectUiHandler,
moveTriggers: moveTriggers,
runHistory: runHistory, runHistory: runHistory,
}; };