mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-08-26 17:29:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Beta Update

Browse Source 
Fix merge conflicts
This commit is contained in:
RedstonewolfX 2024-09-02 00:29:24 -04:00
parent 88d629dcb9
commit 7b75573086
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/phases/field-phase.ts
View File

@ -1,6 +1,4 @@
import { BattlePhase } from "./battle-phase"; import { BattlePhase } from "./battle-phase";
import * as Utils from "#app/utils.js";
import * as LoggerTools from "../logger";
import Pokemon from "#app/field/pokemon"; import Pokemon from "#app/field/pokemon";
type PokemonFunc = (pokemon: Pokemon) => void; type PokemonFunc = (pokemon: Pokemon) => void;

1
src/phases/game-over-phase.ts
View File

@ -23,7 +23,6 @@ import { SummonPhase } from "./summon-phase";
import { EndCardPhase } from "./end-card-phase"; import { EndCardPhase } from "./end-card-phase";
import { PostGameOverPhase } from "./post-game-over-phase"; import { PostGameOverPhase } from "./post-game-over-phase";
import { UnlockPhase } from "./unlock-phase"; import { UnlockPhase } from "./unlock-phase";
import * as LoggerTools from "../logger";
import { SessionSaveData } from "../system/game-data"; import { SessionSaveData } from "../system/game-data";
import TrainerData from "../system/trainer-data"; import TrainerData from "../system/trainer-data";
import PokemonData from "../system/pokemon-data"; import PokemonData from "../system/pokemon-data";