mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-09-24 23:43:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a few typing errors

Browse Source
This commit is contained in:
Bertie690 2025-09-18 17:52:02 -04:00
parent 5da3d4dced
commit b65db645ce
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/field/arena.ts
View File

@ -8,7 +8,7 @@ import Overrides from "#app/overrides";
import type { BiomeTierTrainerPools, PokemonPools } from "#balance/biomes"; import type { BiomeTierTrainerPools, PokemonPools } from "#balance/biomes";
import { BiomePoolTier, biomePokemonPools, biomeTrainerPools } from "#balance/biomes"; import { BiomePoolTier, biomePokemonPools, biomeTrainerPools } from "#balance/biomes";
import type { ArenaTag } from "#data/arena-tag"; import type { ArenaTag } from "#data/arena-tag";
import { EntryHazardTag, getArenaTag } from "#data/arena-tag"; import { getArenaTag } from "#data/arena-tag";
import { SpeciesFormChangeRevertWeatherFormTrigger, SpeciesFormChangeWeatherTrigger } from "#data/form-change-triggers"; import { SpeciesFormChangeRevertWeatherFormTrigger, SpeciesFormChangeWeatherTrigger } from "#data/form-change-triggers";
import type { PokemonSpecies } from "#data/pokemon-species"; import type { PokemonSpecies } from "#data/pokemon-species";
import { PositionalTagManager } from "#data/positional-tags/positional-tag-manager"; import { PositionalTagManager } from "#data/positional-tags/positional-tag-manager";
@ -431,7 +431,7 @@ export class Arena {
globalScene.applyModifier(FieldEffectModifier, user.isPlayer(), user, terrainDuration); globalScene.applyModifier(FieldEffectModifier, user.isPlayer(), user, terrainDuration);
} }
this.terrain = terrain ? new Terrain(terrain, terrainDuration.value, terrainDuration.value) : null; this.terrain = terrain ? new Terrain(terrain, terrainDuration.value) : null;
this.eventTarget.dispatchEvent(new TerrainChangedEvent(this.getTerrainType(), terrainDuration.value)); this.eventTarget.dispatchEvent(new TerrainChangedEvent(this.getTerrainType(), terrainDuration.value));
@ -719,9 +719,7 @@ export class Arena {
newTag.onAdd(this, quiet); newTag.onAdd(this, quiet);
this.tags.push(newTag); this.tags.push(newTag);
this.eventTarget.dispatchEvent( this.eventTarget.dispatchEvent(new ArenaTagAddedEvent(tagType, side, turnCount));
new ArenaTagAddedEvent(tagType, side, turnCount)
);
return true; return true;
} }

11
src/system/game-data.ts
View File

@ -30,7 +30,7 @@ import { StatusEffect } from "#enums/status-effect";
import { TrainerVariant } from "#enums/trainer-variant"; import { TrainerVariant } from "#enums/trainer-variant";
import { UiMode } from "#enums/ui-mode"; import { UiMode } from "#enums/ui-mode";
import { Unlockables } from "#enums/unlockables"; import { Unlockables } from "#enums/unlockables";
import { ArenaTagAddedEvent, WeatherChangedEvent } from "#events/arena"; import { ArenaTagAddedEvent, TerrainChangedEvent, WeatherChangedEvent } from "#events/arena";
import type { EnemyPokemon, PlayerPokemon, Pokemon } from "#field/pokemon"; import type { EnemyPokemon, PlayerPokemon, Pokemon } from "#field/pokemon";
// biome-ignore lint/performance/noNamespaceImport: Something weird is going on here and I don't want to touch it // biome-ignore lint/performance/noNamespaceImport: Something weird is going on here and I don't want to touch it
import * as Modifier from "#modifiers/modifier"; import * as Modifier from "#modifiers/modifier";
@ -1027,7 +1027,7 @@ export class GameData {
globalScene.arena.terrain = fromSession.arena.terrain; globalScene.arena.terrain = fromSession.arena.terrain;
if (fromSession.arena.terrain != null) { if (fromSession.arena.terrain != null) {
globalScene.arena.eventTarget.dispatchEvent( globalScene.arena.eventTarget.dispatchEvent(
new WeatherChangedEvent( new TerrainChangedEvent(
fromSession.arena.terrain.terrainType, fromSession.arena.terrain.terrainType,
fromSession.arena.terrain.turnsLeft, fromSession.arena.terrain.turnsLeft,
fromSession.arena.terrain.maxDuration, fromSession.arena.terrain.maxDuration,
@ -1035,15 +1035,16 @@ export class GameData {
); );
} }
globalScene.arena.playerTerasUsed = fromSession.arena.playerTerasUsed;
globalScene.arena.tags = fromSession.arena.tags; globalScene.arena.tags = fromSession.arena.tags;
for (const tag of globalScene.arena.tags) { for (const tag of globalScene.arena.tags) {
const { tagType, side, turnCount, maxDuration } = tag; const { tagType, side, turnCount, maxDuration } = tag;
const layers: [number, number] | undefined = const layers: [number, number] | undefined =
tag instanceof EntryHazardTag ? [tag.layers, tag.maxLayers] : undefined; tag instanceof EntryHazardTag ? [tag.layers, tag.maxLayers] : undefined;
globalScene.arena.eventTarget.dispatchEvent(new ArenaTagAddedEvent(tagType, side, turnCount, layers, maxDuration)); globalScene.arena.eventTarget.dispatchEvent(
new ArenaTagAddedEvent(tagType, side, turnCount, layers, maxDuration),
);
} }
globalScene.arena.playerTerasUsed = fromSession.arena.playerTerasUsed;
globalScene.arena.positionalTagManager.tags = fromSession.arena.positionalTags.map(tag => globalScene.arena.positionalTagManager.tags = fromSession.arena.positionalTags.map(tag =>
loadPositionalTag(tag), loadPositionalTag(tag),