mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-12 19:32:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'beta' into beta

Browse Source
This commit is contained in:
Inês Simões 2025-03-22 09:25:14 +00:00 committed by GitHub
commit 8bca0bcb32
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
24 changed files with 2117 additions and 1796 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -1,2 +1,3 @@
# Auto detect text files and perform LF normalization # Auto detect text files and perform LF normalization
* text=auto * text=auto
* -crlf

256
public/exp-sprites.json
View File

@ -13,10 +13,10 @@
"1005", "1005",
"1006", "1006",
"1006", "1006",
"1007-apex", "1007-apex-build-Disabled",
"1007-apex", "1007-apex-build-Disabled",
"1008-ultimate", "1008-ultimate-mode-Disabled",
"1008-ultimate", "1008-ultimate-mode-Disabled",
"115-mega", "115-mega",
"115-mega", "115-mega",
"127-mega", "127-mega",
@ -185,9 +185,9 @@
"531-mega", "531-mega",
"569-gigantamax", "569-gigantamax",
"569-gigantamax", "569-gigantamax",
"6-mega",
"6-mega",
"6-mega-x", "6-mega-x",
"6-mega-x",
"6-mega-y",
"6-mega-y", "6-mega-y",
"6058", "6058",
"6058", "6058",
@ -825,8 +825,8 @@
"873", "873",
"874", "874",
"874", "874",
"875-no", "875-no-ice",
"875-no", "875-no-ice",
"875", "875",
"875", "875",
"876-female", "876-female",
@ -963,26 +963,26 @@
"929", "929",
"930", "930",
"930", "930",
"931-blue", "931-blue-plumage-Disabled",
"931-blue", "931-blue-plumage-Disabled",
"931-green", "931-green-plumage-Disabled",
"931-green", "931-green-plumage-Disabled",
"931-white", "931-white-plumage-Disabled",
"931-white", "931-white-plumage-Disabled",
"931-yellow", "931-yellow-plumage-Disabled",
"931-yellow", "931-yellow-plumage-Disabled",
"932", "932",
"932", "932",
"933", "933",
"933", "933",
"934", "934",
"934", "934",
"935", "935-Disabled",
"935", "935-Disabled",
"936", "936-Disabled",
"936", "936-Disabled",
"937", "937-Disabled",
"937", "937-Disabled",
"938", "938",
"938", "938",
"939", "939",
@ -1073,6 +1073,8 @@
"978-droopy", "978-droopy",
"978-stretchy", "978-stretchy",
"978-stretchy", "978-stretchy",
"979-Disabled",
"979-Disabled",
"980", "980",
"980", "980",
"981", "981",
@ -1131,10 +1133,10 @@
"1005b", "1005b",
"1006b", "1006b",
"1006b", "1006b",
"1007b-apex", "1007b-apex-build-Disabled",
"1007b-apex", "1007b-apex-build-Disabled",
"1008b-ultimate", "1008b-ultimate-mode-Disabled",
"1008b-ultimate", "1008b-ultimate-mode-Disabled",
"115b-mega", "115b-mega",
"115b-mega", "115b-mega",
"127b-mega", "127b-mega",
@ -1303,9 +1305,9 @@
"531b-mega", "531b-mega",
"569b-gigantamax", "569b-gigantamax",
"569b-gigantamax", "569b-gigantamax",
"6b-mega",
"6b-mega",
"6b-mega-x", "6b-mega-x",
"6b-mega-x",
"6b-mega-y",
"6b-mega-y", "6b-mega-y",
"6058b", "6058b",
"6058b", "6058b",
@ -1943,8 +1945,8 @@
"873b", "873b",
"874b", "874b",
"874b", "874b",
"875b-no", "875b-no-ice",
"875b-no", "875b-no-ice",
"875b", "875b",
"875b", "875b",
"876b-female", "876b-female",
@ -2083,26 +2085,26 @@
"929b", "929b",
"930b", "930b",
"930b", "930b",
"931b-blue", "931b-blue-plumage-Disabled",
"931b-blue", "931b-blue-plumage-Disabled",
"931b-green", "931b-green-plumage-Disabled",
"931b-green", "931b-green-plumage-Disabled",
"931b-white", "931b-white-plumage-Disabled",
"931b-white", "931b-white-plumage-Disabled",
"931b-yellow", "931b-yellow-plumage-Disabled",
"931b-yellow", "931b-yellow-plumage-Disabled",
"932b", "932b",
"932b", "932b",
"933b", "933b",
"933b", "933b",
"934b", "934b",
"934b", "934b",
"935b", "935b-Disabled",
"935b", "935b-Disabled",
"936b", "936b-Disabled",
"936b", "936b-Disabled",
"937b", "937b-Disabled",
"937b", "937b-Disabled",
"938b", "938b",
"938b", "938b",
"939b", "939b",
@ -2251,10 +2253,10 @@
"1005sb", "1005sb",
"1006sb", "1006sb",
"1006sb", "1006sb",
"1007sb-apex", "1007sb-apex-build-Disabled",
"1007sb-apex", "1007sb-apex-build-Disabled",
"1008sb-ultimate", "1008sb-ultimate-mode-Disabled",
"1008sb-ultimate", "1008sb-ultimate-mode-Disabled",
"115sb-mega", "115sb-mega",
"115sb-mega", "115sb-mega",
"127sb-mega", "127sb-mega",
@ -3063,8 +3065,8 @@
"873sb", "873sb",
"874sb", "874sb",
"874sb", "874sb",
"875sb-no", "875sb-no-ice",
"875sb-no", "875sb-no-ice",
"875sb", "875sb",
"875sb", "875sb",
"876sb-female", "876sb-female",
@ -3203,26 +3205,26 @@
"929sb", "929sb",
"930sb", "930sb",
"930sb", "930sb",
"931sb-blue", "931sb-blue-plumage-Disabled",
"931sb-blue", "931sb-blue-plumage-Disabled",
"931sb-green", "931sb-green-plumage-Disabled",
"931sb-green", "931sb-green-plumage-Disabled",
"931sb-white", "931sb-white-plumage-Disabled",
"931sb-white", "931sb-white-plumage-Disabled",
"931sb-yellow", "931sb-yellow-plumage-Disabled",
"931sb-yellow", "931sb-yellow-plumage-Disabled",
"932sb", "932sb",
"932sb", "932sb",
"933sb", "933sb",
"933sb", "933sb",
"934sb", "934sb",
"934sb", "934sb",
"935sb", "935sb-Disabled",
"935sb", "935sb-Disabled",
"936sb", "936sb-Disabled",
"936sb", "936sb-Disabled",
"937sb", "937sb-Disabled",
"937sb", "937sb-Disabled",
"938sb", "938sb",
"938sb", "938sb",
"939sb", "939sb",
@ -3376,10 +3378,10 @@
"1005s", "1005s",
"1006s", "1006s",
"1006s", "1006s",
"1007s-apex", "1007s-apex-build-Disabled",
"1007s-apex", "1007s-apex-build-Disabled",
"1008s-ultimate", "1008s-ultimate-mode-Disabled",
"1008s-ultimate", "1008s-ultimate-mode-Disabled",
"115s-mega", "115s-mega",
"115s-mega", "115s-mega",
"127s-mega", "127s-mega",
@ -4188,8 +4190,8 @@
"873s", "873s",
"874s", "874s",
"874s", "874s",
"875s-no", "875s-no-ice",
"875s-no", "875s-no-ice",
"875s", "875s",
"875s", "875s",
"876s-female", "876s-female",
@ -4328,26 +4330,26 @@
"929s", "929s",
"930s", "930s",
"930s", "930s",
"931s-blue", "931s-blue-plumage-Disabled",
"931s-blue", "931s-blue-plumage-Disabled",
"931s-green", "931s-green-plumage-Disabled",
"931s-green", "931s-green-plumage-Disabled",
"931s-white", "931s-white-plumage-Disabled",
"931s-white", "931s-white-plumage-Disabled",
"931s-yellow", "931s-yellow-plumage-Disabled",
"931s-yellow", "931s-yellow-plumage-Disabled",
"932s", "932s",
"932s", "932s",
"933s", "933s",
"933s", "933s",
"934s", "934s",
"934s", "934s",
"935s", "935s-Disabled",
"935s", "935s-Disabled",
"936s", "936s-Disabled",
"936s", "936s-Disabled",
"937s", "937s-Disabled",
"937s", "937s-Disabled",
"938s", "938s",
"938s", "938s",
"939s", "939s",
@ -4438,6 +4440,8 @@
"978s-droopy", "978s-droopy",
"978s-stretchy", "978s-stretchy",
"978s-stretchy", "978s-stretchy",
"979s-Disabled",
"979s-Disabled",
"980s", "980s",
"980s", "980s",
"981s", "981s",
@ -4485,11 +4489,10 @@
"1000", "1000",
"1001", "1001",
"1004", "1004",
"1007-apex", "1007-apex-build-Disabled",
"1007-apex", "1007-apex-build-Disabled",
"1007-apex", "1008-ultimate-mode-Disabled",
"1007-apex", "1008-ultimate-mode-Disabled",
"1008-ultimate",
"127-mega", "127-mega",
"142-mega", "142-mega",
"150-mega", "150-mega",
@ -4698,21 +4701,21 @@
"933_3", "933_3",
"933_3", "933_3",
"934", "934",
"935", "935-Disabled",
"935_3", "935_3-Disabled",
"935_3", "935_3-Disabled",
"936_1", "936_1-Disabled",
"936_1", "936_1-Disabled",
"936_2", "936_2-Disabled",
"936_2", "936_2-Disabled",
"936_3", "936_3-Disabled",
"936_3", "936_3-Disabled",
"937_1", "937_1-Disabled",
"937_1", "937_1-Disabled",
"937_2", "937_2-Disabled",
"937_2", "937_2-Disabled",
"937_3", "937_3-Disabled",
"937_3", "937_3-Disabled",
"94-mega_1", "94-mega_1",
"94-mega_1", "94-mega_1",
"94-mega_2", "94-mega_2",
@ -4755,11 +4758,10 @@
"1000b", "1000b",
"1001b", "1001b",
"1004b", "1004b",
"1007b-apex", "1007b-apex-build-Disabled",
"1007b-apex", "1007b-apex-build-Disabled",
"1007b-apex", "1008b-ultimate-mode-Disabled",
"1007b-apex", "1008b-ultimate-mode-Disabled",
"1008b-ultimate",
"127b-mega", "127b-mega",
"142b-mega", "142b-mega",
"150b-mega", "150b-mega",
@ -4920,24 +4922,24 @@
"932b", "932b",
"933b", "933b",
"934b", "934b",
"935_1b", "935_1b-Disabled",
"935_1b", "935_1b-Disabled",
"935_2b", "935_2b-Disabled",
"935_2b", "935_2b-Disabled",
"935_3b", "935_3b-Disabled",
"935_3b", "935_3b-Disabled",
"936_1b", "936_1b-Disabled",
"936_1b", "936_1b-Disabled",
"936_2b", "936_2b-Disabled",
"936_2b", "936_2b-Disabled",
"936_3b", "936_3b-Disabled",
"936_3b", "936_3b-Disabled",
"937_1b", "937_1b-Disabled",
"937_1b", "937_1b-Disabled",
"937_2b", "937_2b-Disabled",
"937_2b", "937_2b-Disabled",
"937_3b", "937_3b-Disabled",
"937_3b", "937_3b-Disabled",
"94b-mega", "94b-mega",
"948b", "948b",
"949b", "949b",

57
src/battle-scene.ts
View File

@ -168,6 +168,8 @@ import { BattlerTagType } from "#enums/battler-tag-type";
import { FRIENDSHIP_GAIN_FROM_BATTLE } from "#app/data/balance/starters"; import { FRIENDSHIP_GAIN_FROM_BATTLE } from "#app/data/balance/starters";
import { StatusEffect } from "#enums/status-effect"; import { StatusEffect } from "#enums/status-effect";
import { initGlobalScene } from "#app/global-scene"; import { initGlobalScene } from "#app/global-scene";
import { ShowAbilityPhase } from "#app/phases/show-ability-phase";
import { HideAbilityPhase } from "#app/phases/hide-ability-phase";
export const bypassLogin = import.meta.env.VITE_BYPASS_LOGIN === "1"; export const bypassLogin = import.meta.env.VITE_BYPASS_LOGIN === "1";
@ -2904,6 +2906,21 @@ export default class BattleScene extends SceneBase {
} }
} }
/**
* Queues an ability bar flyout phase
* @param pokemon The pokemon who has the ability
* @param passive Whether the ability is a passive
* @param show Whether to show or hide the bar
*/
public queueAbilityDisplay(pokemon: Pokemon, passive: boolean, show: boolean): void {
this.unshiftPhase(
show
? new ShowAbilityPhase(pokemon.getBattlerIndex(), passive)
: new HideAbilityPhase(pokemon.getBattlerIndex(), passive),
);
this.clearPhaseQueueSplice();
}
/** /**
* Moves everything from nextCommandPhaseQueue to phaseQueue (keeping order) * Moves everything from nextCommandPhaseQueue to phaseQueue (keeping order)
*/ */
@ -3133,6 +3150,41 @@ export default class BattleScene extends SceneBase {
return false; return false;
} }
canTransferHeldItemModifier(itemModifier: PokemonHeldItemModifier, target: Pokemon, transferQuantity = 1): boolean {
const mod = itemModifier.clone() as PokemonHeldItemModifier;
const source = mod.pokemonId ? mod.getPokemon() : null;
const cancelled = new Utils.BooleanHolder(false);
if (source && source.isPlayer() !== target.isPlayer()) {
applyAbAttrs(BlockItemTheftAbAttr, source, cancelled);
}
if (cancelled.value) {
return false;
}
const matchingModifier = this.findModifier(
m => m instanceof PokemonHeldItemModifier && m.matchType(mod) && m.pokemonId === target.id,
target.isPlayer(),
) as PokemonHeldItemModifier;
if (matchingModifier) {
const maxStackCount = matchingModifier.getMaxStackCount();
if (matchingModifier.stackCount >= maxStackCount) {
return false;
}
const countTaken = Math.min(transferQuantity, mod.stackCount, maxStackCount - matchingModifier.stackCount);
mod.stackCount -= countTaken;
} else {
const countTaken = Math.min(transferQuantity, mod.stackCount);
mod.stackCount -= countTaken;
}
const removeOld = mod.stackCount === 0;
return !removeOld || !source || this.hasModifier(itemModifier, !source.isPlayer());
}
removePartyMemberModifiers(partyMemberIndex: number): Promise<void> { removePartyMemberModifiers(partyMemberIndex: number): Promise<void> {
return new Promise(resolve => { return new Promise(resolve => {
const pokemonId = this.getPlayerParty()[partyMemberIndex].id; const pokemonId = this.getPlayerParty()[partyMemberIndex].id;
@ -3290,6 +3342,11 @@ export default class BattleScene extends SceneBase {
}); });
} }
hasModifier(modifier: PersistentModifier, enemy = false): boolean {
const modifiers = !enemy ? this.modifiers : this.enemyModifiers;
return modifiers.indexOf(modifier) > -1;
}
/** /**
* Removes a currently owned item. If the item is stacked, the entire item stack * Removes a currently owned item. If the item is stacked, the entire item stack
* gets removed. This function does NOT apply in-battle effects, such as Unburden. * gets removed. This function does NOT apply in-battle effects, such as Unburden.

2520
src/data/ability.ts
View File

File diff suppressed because it is too large Load Diff

23
src/data/arena-tag.ts
View File

@ -64,7 +64,7 @@ export abstract class ArenaTag {
} }
} }
onOverlap(_arena: Arena): void {} onOverlap(_arena: Arena, _source: Pokemon | null): void {}
lapse(_arena: Arena): boolean { lapse(_arena: Arena): boolean {
return this.turnCount < 1 || !!--this.turnCount; return this.turnCount < 1 || !!--this.turnCount;
@ -706,7 +706,7 @@ export class ArenaTrapTag extends ArenaTag {
this.maxLayers = maxLayers; this.maxLayers = maxLayers;
} }
onOverlap(arena: Arena): void { onOverlap(arena: Arena, _source: Pokemon | null): void {
if (this.layers < this.maxLayers) { if (this.layers < this.maxLayers) {
this.layers++; this.layers++;
@ -1427,11 +1427,7 @@ export class SuppressAbilitiesTag extends ArenaTag {
public override onAdd(_arena: Arena): void { public override onAdd(_arena: Arena): void {
const pokemon = this.getSourcePokemon(); const pokemon = this.getSourcePokemon();
if (pokemon) { if (pokemon) {
globalScene.queueMessage( this.playActivationMessage(pokemon);
i18next.t("arenaTag:neutralizingGasOnAdd", {
pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
}),
);
for (const fieldPokemon of globalScene.getField(true)) { for (const fieldPokemon of globalScene.getField(true)) {
if (fieldPokemon && fieldPokemon.id !== pokemon.id) { if (fieldPokemon && fieldPokemon.id !== pokemon.id) {
@ -1441,8 +1437,9 @@ export class SuppressAbilitiesTag extends ArenaTag {
} }
} }
public override onOverlap(_arena: Arena): void { public override onOverlap(_arena: Arena, source: Pokemon | null): void {
this.sourceCount++; this.sourceCount++;
this.playActivationMessage(source);
} }
public onSourceLeave(arena: Arena): void { public onSourceLeave(arena: Arena): void {
@ -1481,6 +1478,16 @@ export class SuppressAbilitiesTag extends ArenaTag {
public isBeingRemoved() { public isBeingRemoved() {
return this.beingRemoved; return this.beingRemoved;
} }
private playActivationMessage(pokemon: Pokemon | null) {
if (pokemon) {
globalScene.queueMessage(
i18next.t("arenaTag:neutralizingGasOnAdd", {
pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
}),
);
}
}
} }
// TODO: swap `sourceMove` and `sourceId` and make `sourceMove` an optional parameter // TODO: swap `sourceMove` and `sourceId` and make `sourceMove` an optional parameter

28
src/data/balance/biomes.ts
View File

@ -1680,7 +1680,7 @@ export const biomeTrainerPools: BiomeTrainerPools = {
[BiomePoolTier.BOSS_ULTRA_RARE]: [] [BiomePoolTier.BOSS_ULTRA_RARE]: []
}, },
[Biome.METROPOLIS]: { [Biome.METROPOLIS]: {
[BiomePoolTier.COMMON]: [ TrainerType.CLERK, TrainerType.CYCLIST, TrainerType.OFFICER, TrainerType.WAITER ], [BiomePoolTier.COMMON]: [ TrainerType.CLERK, TrainerType.CYCLIST, TrainerType.OFFICER, TrainerType.WAITER, TrainerType.BEAUTY ],
[BiomePoolTier.UNCOMMON]: [ TrainerType.BREEDER, TrainerType.DEPOT_AGENT, TrainerType.GUITARIST ], [BiomePoolTier.UNCOMMON]: [ TrainerType.BREEDER, TrainerType.DEPOT_AGENT, TrainerType.GUITARIST ],
[BiomePoolTier.RARE]: [ TrainerType.ARTIST ], [BiomePoolTier.RARE]: [ TrainerType.ARTIST ],
[BiomePoolTier.SUPER_RARE]: [], [BiomePoolTier.SUPER_RARE]: [],
@ -1713,7 +1713,7 @@ export const biomeTrainerPools: BiomeTrainerPools = {
[BiomePoolTier.BOSS_ULTRA_RARE]: [] [BiomePoolTier.BOSS_ULTRA_RARE]: []
}, },
[Biome.SWAMP]: { [Biome.SWAMP]: {
[BiomePoolTier.COMMON]: [], [BiomePoolTier.COMMON]: [ TrainerType.PARASOL_LADY ],
[BiomePoolTier.UNCOMMON]: [ TrainerType.ACE_TRAINER ], [BiomePoolTier.UNCOMMON]: [ TrainerType.ACE_TRAINER ],
[BiomePoolTier.RARE]: [ TrainerType.BLACK_BELT ], [BiomePoolTier.RARE]: [ TrainerType.BLACK_BELT ],
[BiomePoolTier.SUPER_RARE]: [], [BiomePoolTier.SUPER_RARE]: [],
@ -1724,7 +1724,7 @@ export const biomeTrainerPools: BiomeTrainerPools = {
[BiomePoolTier.BOSS_ULTRA_RARE]: [] [BiomePoolTier.BOSS_ULTRA_RARE]: []
}, },
[Biome.BEACH]: { [Biome.BEACH]: {
[BiomePoolTier.COMMON]: [ TrainerType.FISHERMAN, TrainerType.PARASOL_LADY, TrainerType.SAILOR ], [BiomePoolTier.COMMON]: [ TrainerType.FISHERMAN, TrainerType.SAILOR ],
[BiomePoolTier.UNCOMMON]: [ TrainerType.ACE_TRAINER, TrainerType.BREEDER ], [BiomePoolTier.UNCOMMON]: [ TrainerType.ACE_TRAINER, TrainerType.BREEDER ],
[BiomePoolTier.RARE]: [ TrainerType.BLACK_BELT ], [BiomePoolTier.RARE]: [ TrainerType.BLACK_BELT ],
[BiomePoolTier.SUPER_RARE]: [], [BiomePoolTier.SUPER_RARE]: [],
@ -1735,7 +1735,7 @@ export const biomeTrainerPools: BiomeTrainerPools = {
[BiomePoolTier.BOSS_ULTRA_RARE]: [] [BiomePoolTier.BOSS_ULTRA_RARE]: []
}, },
[Biome.LAKE]: { [Biome.LAKE]: {
[BiomePoolTier.COMMON]: [ TrainerType.BREEDER, TrainerType.FISHERMAN ], [BiomePoolTier.COMMON]: [ TrainerType.BREEDER, TrainerType.FISHERMAN, TrainerType.PARASOL_LADY ],
[BiomePoolTier.UNCOMMON]: [ TrainerType.ACE_TRAINER ], [BiomePoolTier.UNCOMMON]: [ TrainerType.ACE_TRAINER ],
[BiomePoolTier.RARE]: [ TrainerType.BLACK_BELT ], [BiomePoolTier.RARE]: [ TrainerType.BLACK_BELT ],
[BiomePoolTier.SUPER_RARE]: [], [BiomePoolTier.SUPER_RARE]: [],
@ -1790,7 +1790,7 @@ export const biomeTrainerPools: BiomeTrainerPools = {
[BiomePoolTier.BOSS_ULTRA_RARE]: [] [BiomePoolTier.BOSS_ULTRA_RARE]: []
}, },
[Biome.DESERT]: { [Biome.DESERT]: {
[BiomePoolTier.COMMON]: [ TrainerType.SCIENTIST ], [BiomePoolTier.COMMON]: [ TrainerType.SCIENTIST, TrainerType.BACKPACKER ],
[BiomePoolTier.UNCOMMON]: [], [BiomePoolTier.UNCOMMON]: [],
[BiomePoolTier.RARE]: [], [BiomePoolTier.RARE]: [],
[BiomePoolTier.SUPER_RARE]: [], [BiomePoolTier.SUPER_RARE]: [],
@ -1812,8 +1812,8 @@ export const biomeTrainerPools: BiomeTrainerPools = {
[BiomePoolTier.BOSS_ULTRA_RARE]: [] [BiomePoolTier.BOSS_ULTRA_RARE]: []
}, },
[Biome.MEADOW]: { [Biome.MEADOW]: {
[BiomePoolTier.COMMON]: [ TrainerType.PARASOL_LADY ], [BiomePoolTier.COMMON]: [ TrainerType.PARASOL_LADY, TrainerType.BEAUTY ],
[BiomePoolTier.UNCOMMON]: [ TrainerType.ACE_TRAINER, TrainerType.BREEDER ], [BiomePoolTier.UNCOMMON]: [ TrainerType.ACE_TRAINER, TrainerType.BREEDER, TrainerType.BAKER ],
[BiomePoolTier.RARE]: [], [BiomePoolTier.RARE]: [],
[BiomePoolTier.SUPER_RARE]: [], [BiomePoolTier.SUPER_RARE]: [],
[BiomePoolTier.ULTRA_RARE]: [], [BiomePoolTier.ULTRA_RARE]: [],
@ -1879,7 +1879,7 @@ export const biomeTrainerPools: BiomeTrainerPools = {
}, },
[Biome.RUINS]: { [Biome.RUINS]: {
[BiomePoolTier.COMMON]: [ TrainerType.PSYCHIC, TrainerType.SCIENTIST ], [BiomePoolTier.COMMON]: [ TrainerType.PSYCHIC, TrainerType.SCIENTIST ],
[BiomePoolTier.UNCOMMON]: [ TrainerType.ACE_TRAINER, TrainerType.BLACK_BELT ], [BiomePoolTier.UNCOMMON]: [ TrainerType.ACE_TRAINER, TrainerType.BLACK_BELT, TrainerType.HEX_MANIAC ],
[BiomePoolTier.RARE]: [], [BiomePoolTier.RARE]: [],
[BiomePoolTier.SUPER_RARE]: [], [BiomePoolTier.SUPER_RARE]: [],
[BiomePoolTier.ULTRA_RARE]: [], [BiomePoolTier.ULTRA_RARE]: [],
@ -7165,14 +7165,18 @@ export function initBiomes() {
[ Biome.MOUNTAIN, BiomePoolTier.COMMON ], [ Biome.MOUNTAIN, BiomePoolTier.COMMON ],
[ Biome.CAVE, BiomePoolTier.COMMON ], [ Biome.CAVE, BiomePoolTier.COMMON ],
[ Biome.BADLANDS, BiomePoolTier.COMMON ], [ Biome.BADLANDS, BiomePoolTier.COMMON ],
[ Biome.JUNGLE, BiomePoolTier.COMMON ] [ Biome.JUNGLE, BiomePoolTier.COMMON ],
[ Biome.DESERT, BiomePoolTier.COMMON ]
] ]
], ],
[ TrainerType.BAKER, [ [ TrainerType.BAKER, [
[ Biome.SLUM, BiomePoolTier.UNCOMMON ] [ Biome.SLUM, BiomePoolTier.UNCOMMON ],
[ Biome.MEADOW, BiomePoolTier.UNCOMMON ]
] ]
], ],
[ TrainerType.BEAUTY, [ [ TrainerType.BEAUTY, [
[ Biome.METROPOLIS, BiomePoolTier.COMMON ],
[ Biome.MEADOW, BiomePoolTier.COMMON ],
[ Biome.FAIRY_CAVE, BiomePoolTier.COMMON ] [ Biome.FAIRY_CAVE, BiomePoolTier.COMMON ]
]], ]],
[ TrainerType.BIKER, [ [ TrainerType.BIKER, [
@ -7247,7 +7251,8 @@ export function initBiomes() {
] ]
], ],
[ TrainerType.PARASOL_LADY, [ [ TrainerType.PARASOL_LADY, [
[ Biome.BEACH, BiomePoolTier.COMMON ], [ Biome.SWAMP, BiomePoolTier.COMMON ],
[ Biome.LAKE, BiomePoolTier.COMMON ],
[ Biome.MEADOW, BiomePoolTier.COMMON ] [ Biome.MEADOW, BiomePoolTier.COMMON ]
] ]
], ],
@ -7313,6 +7318,7 @@ export function initBiomes() {
] ]
], ],
[ TrainerType.HEX_MANIAC, [ [ TrainerType.HEX_MANIAC, [
[ Biome.RUINS, BiomePoolTier.UNCOMMON ],
[ Biome.GRAVEYARD, BiomePoolTier.UNCOMMON ] [ Biome.GRAVEYARD, BiomePoolTier.UNCOMMON ]
] ]
], ],

4
src/data/battler-tags.ts
View File

@ -1922,10 +1922,6 @@ export class SlowStartTag extends AbilityBattlerTag {
i18next.t("battlerTags:slowStartOnAdd", { i18next.t("battlerTags:slowStartOnAdd", {
pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), pokemonNameWithAffix: getPokemonNameWithAffix(pokemon),
}), }),
null,
false,
null,
true,
); );
} }

29
src/data/moves/move.ts
View File

@ -5557,6 +5557,31 @@ export class LeechSeedAttr extends AddBattlerTagAttr {
} }
} }
/**
* Adds the appropriate battler tag for Smack Down and Thousand arrows
* @extends AddBattlerTagAttr
*/
export class FallDownAttr extends AddBattlerTagAttr {
constructor() {
super(BattlerTagType.IGNORE_FLYING, false, false, 1, 1, true);
}
/**
* Adds Grounded Tag to the target and checks if fallDown message should be displayed
* @param user the {@linkcode Pokemon} using the move
* @param target the {@linkcode Pokemon} targeted by the move
* @param move the {@linkcode Move} invoking this effect
* @param args n/a
* @returns `true` if the effect successfully applies; `false` otherwise
*/
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
if (!target.isGrounded()) {
globalScene.queueMessage(i18next.t("moveTriggers:fallDown", { targetPokemonName: getPokemonNameWithAffix(target) }));
}
return super.apply(user, target, move, args);
}
}
/** /**
* Adds the appropriate battler tag for Gulp Missile when Surf or Dive is used. * Adds the appropriate battler tag for Gulp Missile when Surf or Dive is used.
* @extends MoveEffectAttr * @extends MoveEffectAttr
@ -9661,7 +9686,7 @@ export function initMoves() {
.target(MoveTarget.BOTH_SIDES) .target(MoveTarget.BOTH_SIDES)
.unimplemented(), .unimplemented(),
new AttackMove(Moves.SMACK_DOWN, PokemonType.ROCK, MoveCategory.PHYSICAL, 50, 100, 15, 100, 0, 5) new AttackMove(Moves.SMACK_DOWN, PokemonType.ROCK, MoveCategory.PHYSICAL, 50, 100, 15, 100, 0, 5)
.attr(AddBattlerTagAttr, BattlerTagType.IGNORE_FLYING, false, false, 1, 1, true) .attr(FallDownAttr)
.attr(AddBattlerTagAttr, BattlerTagType.INTERRUPTED) .attr(AddBattlerTagAttr, BattlerTagType.INTERRUPTED)
.attr(RemoveBattlerTagAttr, [ BattlerTagType.FLYING, BattlerTagType.FLOATING, BattlerTagType.TELEKINESIS ]) .attr(RemoveBattlerTagAttr, [ BattlerTagType.FLYING, BattlerTagType.FLOATING, BattlerTagType.TELEKINESIS ])
.attr(HitsTagAttr, BattlerTagType.FLYING) .attr(HitsTagAttr, BattlerTagType.FLYING)
@ -10112,7 +10137,7 @@ export function initMoves() {
.triageMove(), .triageMove(),
new AttackMove(Moves.THOUSAND_ARROWS, PokemonType.GROUND, MoveCategory.PHYSICAL, 90, 100, 10, -1, 0, 6) new AttackMove(Moves.THOUSAND_ARROWS, PokemonType.GROUND, MoveCategory.PHYSICAL, 90, 100, 10, -1, 0, 6)
.attr(NeutralDamageAgainstFlyingTypeMultiplierAttr) .attr(NeutralDamageAgainstFlyingTypeMultiplierAttr)
.attr(AddBattlerTagAttr, BattlerTagType.IGNORE_FLYING, false, false, 1, 1, true) .attr(FallDownAttr)
.attr(HitsTagAttr, BattlerTagType.FLYING) .attr(HitsTagAttr, BattlerTagType.FLYING)
.attr(HitsTagAttr, BattlerTagType.FLOATING) .attr(HitsTagAttr, BattlerTagType.FLOATING)
.attr(AddBattlerTagAttr, BattlerTagType.INTERRUPTED) .attr(AddBattlerTagAttr, BattlerTagType.INTERRUPTED)

10
src/data/pokemon-species.ts
View File

@ -2987,11 +2987,11 @@ export function initSpecies() {
new PokemonSpecies(Species.VAROOM, 9, false, false, false, "Single-Cyl Pokémon", PokemonType.STEEL, PokemonType.POISON, 1, 35, Abilities.OVERCOAT, Abilities.NONE, Abilities.SLOW_START, 300, 45, 70, 63, 30, 45, 47, 190, 50, 60, GrowthRate.MEDIUM_FAST, 50, false), new PokemonSpecies(Species.VAROOM, 9, false, false, false, "Single-Cyl Pokémon", PokemonType.STEEL, PokemonType.POISON, 1, 35, Abilities.OVERCOAT, Abilities.NONE, Abilities.SLOW_START, 300, 45, 70, 63, 30, 45, 47, 190, 50, 60, GrowthRate.MEDIUM_FAST, 50, false),
new PokemonSpecies(Species.REVAVROOM, 9, false, false, false, "Multi-Cyl Pokémon", PokemonType.STEEL, PokemonType.POISON, 1.8, 120, Abilities.OVERCOAT, Abilities.NONE, Abilities.FILTER, 500, 80, 119, 90, 54, 67, 90, 75, 50, 175, GrowthRate.MEDIUM_FAST, 50, false, false, new PokemonSpecies(Species.REVAVROOM, 9, false, false, false, "Multi-Cyl Pokémon", PokemonType.STEEL, PokemonType.POISON, 1.8, 120, Abilities.OVERCOAT, Abilities.NONE, Abilities.FILTER, 500, 80, 119, 90, 54, 67, 90, 75, 50, 175, GrowthRate.MEDIUM_FAST, 50, false, false,
new PokemonForm("Normal", "", PokemonType.STEEL, PokemonType.POISON, 1.8, 120, Abilities.OVERCOAT, Abilities.NONE, Abilities.FILTER, 500, 80, 119, 90, 54, 67, 90, 75, 50, 175, false, null, true), new PokemonForm("Normal", "", PokemonType.STEEL, PokemonType.POISON, 1.8, 120, Abilities.OVERCOAT, Abilities.NONE, Abilities.FILTER, 500, 80, 119, 90, 54, 67, 90, 75, 50, 175, false, null, true),
new PokemonForm("Segin Starmobile", "segin-starmobile", PokemonType.STEEL, PokemonType.DARK, 1.8, 240, Abilities.INTIMIDATE, Abilities.NONE, Abilities.INTIMIDATE, 600, 110, 129, 100, 77, 79, 105, 75, 50, 175), new PokemonForm("Segin Starmobile", "segin-starmobile", PokemonType.STEEL, PokemonType.DARK, 1.8, 240, Abilities.INTIMIDATE, Abilities.NONE, Abilities.INTIMIDATE, 600, 110, 129, 100, 77, 79, 105, 75, 50, 175, false, null, false, true),
new PokemonForm("Schedar Starmobile", "schedar-starmobile", PokemonType.STEEL, PokemonType.FIRE, 1.8, 240, Abilities.SPEED_BOOST, Abilities.NONE, Abilities.SPEED_BOOST, 600, 110, 129, 100, 77, 79, 105, 75, 50, 175), new PokemonForm("Schedar Starmobile", "schedar-starmobile", PokemonType.STEEL, PokemonType.FIRE, 1.8, 240, Abilities.SPEED_BOOST, Abilities.NONE, Abilities.SPEED_BOOST, 600, 110, 129, 100, 77, 79, 105, 75, 50, 175, false, null, false, true),
new PokemonForm("Navi Starmobile", "navi-starmobile", PokemonType.STEEL, PokemonType.POISON, 1.8, 240, Abilities.TOXIC_DEBRIS, Abilities.NONE, Abilities.TOXIC_DEBRIS, 600, 110, 129, 100, 77, 79, 105, 75, 50, 175), new PokemonForm("Navi Starmobile", "navi-starmobile", PokemonType.STEEL, PokemonType.POISON, 1.8, 240, Abilities.TOXIC_DEBRIS, Abilities.NONE, Abilities.TOXIC_DEBRIS, 600, 110, 129, 100, 77, 79, 105, 75, 50, 175, false, null, false, true),
new PokemonForm("Ruchbah Starmobile", "ruchbah-starmobile", PokemonType.STEEL, PokemonType.FAIRY, 1.8, 240, Abilities.MISTY_SURGE, Abilities.NONE, Abilities.MISTY_SURGE, 600, 110, 129, 100, 77, 79, 105, 75, 50, 175), new PokemonForm("Ruchbah Starmobile", "ruchbah-starmobile", PokemonType.STEEL, PokemonType.FAIRY, 1.8, 240, Abilities.MISTY_SURGE, Abilities.NONE, Abilities.MISTY_SURGE, 600, 110, 129, 100, 77, 79, 105, 75, 50, 175, false, null, false, true),
new PokemonForm("Caph Starmobile", "caph-starmobile", PokemonType.STEEL, PokemonType.FIGHTING, 1.8, 240, Abilities.STAMINA, Abilities.NONE, Abilities.STAMINA, 600, 110, 129, 100, 77, 79, 105, 75, 50, 175), new PokemonForm("Caph Starmobile", "caph-starmobile", PokemonType.STEEL, PokemonType.FIGHTING, 1.8, 240, Abilities.STAMINA, Abilities.NONE, Abilities.STAMINA, 600, 110, 129, 100, 77, 79, 105, 75, 50, 175, false, null, false, true),
), ),
new PokemonSpecies(Species.CYCLIZAR, 9, false, false, false, "Mount Pokémon", PokemonType.DRAGON, PokemonType.NORMAL, 1.6, 63, Abilities.SHED_SKIN, Abilities.NONE, Abilities.REGENERATOR, 501, 70, 95, 65, 85, 65, 121, 190, 50, 175, GrowthRate.MEDIUM_SLOW, 50, false), new PokemonSpecies(Species.CYCLIZAR, 9, false, false, false, "Mount Pokémon", PokemonType.DRAGON, PokemonType.NORMAL, 1.6, 63, Abilities.SHED_SKIN, Abilities.NONE, Abilities.REGENERATOR, 501, 70, 95, 65, 85, 65, 121, 190, 50, 175, GrowthRate.MEDIUM_SLOW, 50, false),
new PokemonSpecies(Species.ORTHWORM, 9, false, false, false, "Earthworm Pokémon", PokemonType.STEEL, null, 2.5, 310, Abilities.EARTH_EATER, Abilities.NONE, Abilities.SAND_VEIL, 480, 70, 85, 145, 60, 55, 65, 25, 50, 240, GrowthRate.SLOW, 50, false), new PokemonSpecies(Species.ORTHWORM, 9, false, false, false, "Earthworm Pokémon", PokemonType.STEEL, null, 2.5, 310, Abilities.EARTH_EATER, Abilities.NONE, Abilities.SAND_VEIL, 480, 70, 85, 145, 60, 55, 65, 25, 50, 240, GrowthRate.SLOW, 50, false),

126
src/data/trainer-config.ts
View File

@ -23,6 +23,7 @@ import { Species } from "#enums/species";
import { TrainerType } from "#enums/trainer-type"; import { TrainerType } from "#enums/trainer-type";
import { Gender } from "#app/data/gender"; import { Gender } from "#app/data/gender";
import { signatureSpecies } from "./balance/signature-species"; import { signatureSpecies } from "./balance/signature-species";
import { Abilities } from "#enums/abilities";
/** Minimum BST for Pokemon generated onto the Elite Four's teams */ /** Minimum BST for Pokemon generated onto the Elite Four's teams */
const ELITE_FOUR_MINIMUM_BST = 460; const ELITE_FOUR_MINIMUM_BST = 460;
@ -1811,12 +1812,92 @@ export const trainerConfigs: TrainerConfigs = {
[TrainerType.BAKER]: new TrainerConfig(++t) [TrainerType.BAKER]: new TrainerConfig(++t)
.setEncounterBgm(TrainerType.CLERK) .setEncounterBgm(TrainerType.CLERK)
.setMoneyMultiplier(1.35) .setMoneyMultiplier(1.35)
.setSpeciesFilter(s => s.isOfType(PokemonType.GRASS) || s.isOfType(PokemonType.FIRE)), .setSpeciesFilter(
[TrainerType.BEAUTY]: new TrainerConfig(++t).setMoneyMultiplier(1.55).setEncounterBgm(TrainerType.PARASOL_LADY), s =>
[s.ability1, s.ability2, s.abilityHidden].some(
a =>
!!a &&
[
Abilities.WHITE_SMOKE,
Abilities.GLUTTONY,
Abilities.HONEY_GATHER,
Abilities.HARVEST,
Abilities.CHEEK_POUCH,
Abilities.SWEET_VEIL,
Abilities.RIPEN,
Abilities.PURIFYING_SALT,
Abilities.WELL_BAKED_BODY,
Abilities.SUPERSWEET_SYRUP,
Abilities.HOSPITALITY,
].includes(a),
) ||
s
.getLevelMoves()
.some(plm =>
[Moves.SOFT_BOILED, Moves.SPORE, Moves.MILK_DRINK, Moves.OVERHEAT, Moves.TEATIME].includes(plm[1]),
),
), // Mons with baking related abilities or who learn Overheat, Teatime, Milk Drink, Spore, or Soft-Boiled by level
[TrainerType.BEAUTY]: new TrainerConfig(++t)
.setMoneyMultiplier(1.55)
.setEncounterBgm(TrainerType.PARASOL_LADY)
.setPartyTemplates(
trainerPartyTemplates.TWO_AVG_SAME_ONE_AVG,
trainerPartyTemplates.TWO_AVG_SAME_ONE_STRONG,
trainerPartyTemplates.THREE_AVG_SAME,
trainerPartyTemplates.THREE_AVG,
trainerPartyTemplates.FOUR_WEAK,
trainerPartyTemplates.ONE_STRONG,
)
.setSpeciesPools({
[TrainerPoolTier.COMMON]: [
Species.MEOWTH,
Species.GOLDEEN,
Species.MAREEP,
Species.MARILL,
Species.SKITTY,
Species.GLAMEOW,
Species.PURRLOIN,
],
[TrainerPoolTier.UNCOMMON]: [
Species.SMOOCHUM,
Species.ROSELIA,
Species.LUVDISC,
Species.BLITZLE,
Species.SEWADDLE,
Species.PETILIL,
Species.MINCCINO,
Species.GOTHITA,
Species.SPRITZEE,
Species.FLITTLE,
],
[TrainerPoolTier.RARE]: [
Species.FEEBAS,
Species.FURFROU,
Species.SALANDIT,
Species.BRUXISH,
Species.HATENNA,
Species.SNOM,
Species.ALOLA_VULPIX,
],
[TrainerPoolTier.SUPER_RARE]: [Species.CLAMPERL, Species.AMAURA, Species.SYLVEON, Species.GOOMY, Species.POPPLIO],
}),
[TrainerType.BIKER]: new TrainerConfig(++t) [TrainerType.BIKER]: new TrainerConfig(++t)
.setMoneyMultiplier(1.4) .setMoneyMultiplier(1.4)
.setEncounterBgm(TrainerType.ROUGHNECK) .setEncounterBgm(TrainerType.ROUGHNECK)
.setSpeciesFilter(s => s.isOfType(PokemonType.POISON)), .setSpeciesPools({
[TrainerPoolTier.COMMON]: [Species.EKANS, Species.KOFFING, Species.CROAGUNK, Species.VENIPEDE, Species.SCRAGGY],
[TrainerPoolTier.UNCOMMON]: [
Species.GRIMER,
Species.VOLTORB,
Species.TEDDIURSA,
Species.MAGBY,
Species.SKORUPI,
Species.SANDILE,
Species.PAWNIARD,
Species.SHROODLE,
],
[TrainerPoolTier.RARE]: [Species.VAROOM, Species.CYCLIZAR],
}),
[TrainerType.BLACK_BELT]: new TrainerConfig(++t) [TrainerType.BLACK_BELT]: new TrainerConfig(++t)
.setHasGenders("Battle Girl", TrainerType.PSYCHIC) .setHasGenders("Battle Girl", TrainerType.PSYCHIC)
.setHasDouble("Crush Kin") .setHasDouble("Crush Kin")
@ -1918,9 +1999,15 @@ export const trainerConfigs: TrainerConfigs = {
.setEncounterBgm(TrainerType.CYCLIST) .setEncounterBgm(TrainerType.CYCLIST)
.setPartyTemplates(trainerPartyTemplates.TWO_WEAK, trainerPartyTemplates.ONE_AVG) .setPartyTemplates(trainerPartyTemplates.TWO_WEAK, trainerPartyTemplates.ONE_AVG)
.setSpeciesPools({ .setSpeciesPools({
[TrainerPoolTier.COMMON]: [Species.PICHU, Species.STARLY, Species.TAILLOW, Species.BOLTUND], [TrainerPoolTier.COMMON]: [Species.DODUO, Species.PICHU, Species.TAILLOW, Species.STARLY, Species.PONYTA],
[TrainerPoolTier.UNCOMMON]: [Species.DODUO, Species.ELECTRIKE, Species.BLITZLE, Species.WATTREL], [TrainerPoolTier.UNCOMMON]: [
[TrainerPoolTier.RARE]: [Species.YANMA, Species.NINJASK, Species.WHIRLIPEDE, Species.EMOLGA], Species.ELECTRIKE,
Species.SHINX,
Species.BLITZLE,
Species.DUCKLETT,
Species.WATTREL,
],
[TrainerPoolTier.RARE]: [Species.YANMA, Species.NINJASK, Species.WHIRLIPEDE, Species.EMOLGA, Species.SKIDDO],
[TrainerPoolTier.SUPER_RARE]: [Species.ACCELGOR, Species.DREEPY], [TrainerPoolTier.SUPER_RARE]: [Species.ACCELGOR, Species.DREEPY],
}), }),
[TrainerType.DANCER]: new TrainerConfig(++t) [TrainerType.DANCER]: new TrainerConfig(++t)
@ -1936,7 +2023,7 @@ export const trainerConfigs: TrainerConfigs = {
[TrainerPoolTier.COMMON]: [Species.RALTS, Species.SPOINK, Species.LOTAD, Species.BUDEW], [TrainerPoolTier.COMMON]: [Species.RALTS, Species.SPOINK, Species.LOTAD, Species.BUDEW],
[TrainerPoolTier.UNCOMMON]: [Species.SPINDA, Species.SWABLU, Species.MARACTUS], [TrainerPoolTier.UNCOMMON]: [Species.SPINDA, Species.SWABLU, Species.MARACTUS],
[TrainerPoolTier.RARE]: [Species.BELLOSSOM, Species.HITMONTOP, Species.MIME_JR, Species.ORICORIO], [TrainerPoolTier.RARE]: [Species.BELLOSSOM, Species.HITMONTOP, Species.MIME_JR, Species.ORICORIO],
[TrainerPoolTier.SUPER_RARE]: [Species.POPPLIO], [TrainerPoolTier.SUPER_RARE]: [Species.QUAXLY, Species.JANGMO_O],
}), }),
[TrainerType.DEPOT_AGENT]: new TrainerConfig(++t).setMoneyMultiplier(1.45).setEncounterBgm(TrainerType.CLERK), [TrainerType.DEPOT_AGENT]: new TrainerConfig(++t).setMoneyMultiplier(1.45).setEncounterBgm(TrainerType.CLERK),
[TrainerType.DOCTOR]: new TrainerConfig(++t) [TrainerType.DOCTOR]: new TrainerConfig(++t)
@ -2074,7 +2161,7 @@ export const trainerConfigs: TrainerConfigs = {
trainerPartyTemplates.THREE_AVG, trainerPartyTemplates.THREE_AVG,
trainerPartyTemplates.TWO_STRONG, trainerPartyTemplates.TWO_STRONG,
) )
.setSpeciesFilter(s => s.isOfType(PokemonType.GHOST)), .setSpeciesFilter(s => s.isOfType(PokemonType.GHOST) || s.isOfType(PokemonType.PSYCHIC)),
[TrainerType.NURSERY_AIDE]: new TrainerConfig(++t).setMoneyMultiplier(1.3).setEncounterBgm("lass"), [TrainerType.NURSERY_AIDE]: new TrainerConfig(++t).setMoneyMultiplier(1.3).setEncounterBgm("lass"),
[TrainerType.OFFICER]: new TrainerConfig(++t) [TrainerType.OFFICER]: new TrainerConfig(++t)
.setMoneyMultiplier(1.55) .setMoneyMultiplier(1.55)
@ -2104,7 +2191,28 @@ export const trainerConfigs: TrainerConfigs = {
[TrainerType.PARASOL_LADY]: new TrainerConfig(++t) [TrainerType.PARASOL_LADY]: new TrainerConfig(++t)
.setMoneyMultiplier(1.55) .setMoneyMultiplier(1.55)
.setEncounterBgm(TrainerType.PARASOL_LADY) .setEncounterBgm(TrainerType.PARASOL_LADY)
.setSpeciesFilter(s => s.isOfType(PokemonType.WATER)), .setPartyTemplates(
trainerPartyTemplates.TWO_AVG_SAME_ONE_AVG,
trainerPartyTemplates.TWO_AVG_SAME_ONE_STRONG,
trainerPartyTemplates.TWO_AVG,
trainerPartyTemplates.FOUR_WEAK,
trainerPartyTemplates.ONE_STRONG,
)
.setSpeciesFilter(
s =>
[s.ability1, s.ability2, s.abilityHidden].some(
a =>
!!a &&
[
Abilities.DRIZZLE,
Abilities.SWIFT_SWIM,
Abilities.HYDRATION,
Abilities.RAIN_DISH,
Abilities.DRY_SKIN,
Abilities.WIND_POWER,
].includes(a),
) || s.getLevelMoves().some(plm => plm[1] === Moves.RAIN_DANCE),
), // Mons with rain abilities or who learn Rain Dance by level
[TrainerType.PILOT]: new TrainerConfig(++t) [TrainerType.PILOT]: new TrainerConfig(++t)
.setEncounterBgm(TrainerType.CLERK) .setEncounterBgm(TrainerType.CLERK)
.setSpeciesFilter(s => tmSpecies[Moves.FLY].indexOf(s.speciesId) > -1), .setSpeciesFilter(s => tmSpecies[Moves.FLY].indexOf(s.speciesId) > -1),

16
src/field/arena.ts
View File

@ -303,6 +303,11 @@ export class Arena {
return true; return true;
} }
/** Returns weather or not the weather can be changed to {@linkcode weather} */
canSetWeather(weather: WeatherType): boolean {
return !(this.weather?.weatherType === (weather || undefined));
}
/** /**
* Attempts to set a new weather to the battle * Attempts to set a new weather to the battle
* @param weather {@linkcode WeatherType} new {@linkcode WeatherType} to set * @param weather {@linkcode WeatherType} new {@linkcode WeatherType} to set
@ -314,7 +319,7 @@ export class Arena {
return this.trySetWeatherOverride(Overrides.WEATHER_OVERRIDE); return this.trySetWeatherOverride(Overrides.WEATHER_OVERRIDE);
} }
if (this.weather?.weatherType === (weather || undefined)) { if (!this.canSetWeather(weather)) {
return false; return false;
} }
@ -388,8 +393,13 @@ export class Arena {
}); });
} }
/** Returns whether or not the terrain can be set to {@linkcode terrain} */
canSetTerrain(terrain: TerrainType): boolean {
return !(this.terrain?.terrainType === (terrain || undefined));
}
trySetTerrain(terrain: TerrainType, hasPokemonSource: boolean, ignoreAnim = false): boolean { trySetTerrain(terrain: TerrainType, hasPokemonSource: boolean, ignoreAnim = false): boolean {
if (this.terrain?.terrainType === (terrain || undefined)) { if (!this.canSetTerrain(terrain)) {
return false; return false;
} }
@ -663,7 +673,7 @@ export class Arena {
): boolean { ): boolean {
const existingTag = this.getTagOnSide(tagType, side); const existingTag = this.getTagOnSide(tagType, side);
if (existingTag) { if (existingTag) {
existingTag.onOverlap(this); existingTag.onOverlap(this, globalScene.getPokemonById(sourceId));
if (existingTag instanceof ArenaTrapTag) { if (existingTag instanceof ArenaTrapTag) {
const { tagType, side, turnCount, layers, maxLayers } = existingTag as ArenaTrapTag; const { tagType, side, turnCount, layers, maxLayers } = existingTag as ArenaTrapTag;

1
src/loading-scene.ts
View File

@ -79,6 +79,7 @@ export class LoadingScene extends SceneBase {
this.loadImage("icon_owned", "ui"); this.loadImage("icon_owned", "ui");
this.loadImage("icon_egg_move", "ui"); this.loadImage("icon_egg_move", "ui");
this.loadImage("ability_bar_left", "ui"); this.loadImage("ability_bar_left", "ui");
this.loadImage("ability_bar_right", "ui");
this.loadImage("bgm_bar", "ui"); this.loadImage("bgm_bar", "ui");
this.loadImage("party_exp_bar", "ui"); this.loadImage("party_exp_bar", "ui");
this.loadImage("achv_bar", "ui"); this.loadImage("achv_bar", "ui");

6
src/phase.ts
View File

@ -1,11 +1,7 @@
import { globalScene } from "#app/global-scene"; import { globalScene } from "#app/global-scene";
export class Phase { export class Phase {
start() { start() {}
if (globalScene.abilityBar.shown) {
globalScene.abilityBar.resetAutoHideTimer();
}
}
end() { end() {
globalScene.shiftPhase(); globalScene.shiftPhase();

27
src/phases/hide-ability-phase.ts Normal file
View File

@ -0,0 +1,27 @@
import { globalScene } from "#app/global-scene";
import type { BattlerIndex } from "#app/battle";
import { PokemonPhase } from "./pokemon-phase";
export class HideAbilityPhase extends PokemonPhase {
private passive: boolean;
constructor(battlerIndex: BattlerIndex, passive = false) {
super(battlerIndex);
this.passive = passive;
}
start() {
super.start();
const pokemon = this.getPokemon();
if (pokemon) {
globalScene.abilityBar.hide().then(() => {
this.end();
});
} else {
this.end();
}
}
}

19
src/phases/message-phase.ts
View File

@ -28,7 +28,17 @@ export class MessagePhase extends Phase {
super.start(); super.start();
if (this.text.indexOf("$") > -1) { if (this.text.indexOf("$") > -1) {
const pokename: string[] = [];
const repname = [ "#POKEMON1", "#POKEMON2" ];
for (let p = 0; p < globalScene.getPlayerField().length; p++) {
pokename.push(globalScene.getPlayerField()[p].getNameToRender());
this.text = this.text.split(pokename[p]).join(repname[p]);
}
const pageIndex = this.text.indexOf("$"); const pageIndex = this.text.indexOf("$");
for (let p = 0; p < globalScene.getPlayerField().length; p++) {
this.text = this.text.split(repname[p]).join(pokename[p]);
}
if (pageIndex !== -1) {
globalScene.unshiftPhase( globalScene.unshiftPhase(
new MessagePhase( new MessagePhase(
this.text.slice(pageIndex + 1), this.text.slice(pageIndex + 1),
@ -40,6 +50,7 @@ export class MessagePhase extends Phase {
); );
this.text = this.text.slice(0, pageIndex).trim(); this.text = this.text.slice(0, pageIndex).trim();
} }
}
if (this.speaker) { if (this.speaker) {
globalScene.ui.showDialogue( globalScene.ui.showDialogue(
@ -61,12 +72,4 @@ export class MessagePhase extends Phase {
); );
} }
} }
end() {
if (globalScene.abilityBar.shown) {
globalScene.abilityBar.hide();
}
super.end();
}
} }

9
src/phases/pokemon-transform-phase.ts
View File

@ -5,6 +5,8 @@ import { EFFECTIVE_STATS, BATTLE_STATS } from "#enums/stat";
import { PokemonMove } from "#app/field/pokemon"; import { PokemonMove } from "#app/field/pokemon";
import { globalScene } from "#app/global-scene"; import { globalScene } from "#app/global-scene";
import { PokemonPhase } from "./pokemon-phase"; import { PokemonPhase } from "./pokemon-phase";
import { getPokemonNameWithAffix } from "#app/messages";
import i18next from "i18next";
/** /**
* Transforms a Pokemon into another Pokemon on the field. * Transforms a Pokemon into another Pokemon on the field.
@ -62,6 +64,13 @@ export class PokemonTransformPhase extends PokemonPhase {
globalScene.playSound("battle_anims/PRSFX- Transform"); globalScene.playSound("battle_anims/PRSFX- Transform");
} }
globalScene.queueMessage(
i18next.t("abilityTriggers:postSummonTransform", {
pokemonNameWithAffix: getPokemonNameWithAffix(user),
targetName: target.name,
}),
);
promises.push( promises.push(
user.loadAssets(false).then(() => { user.loadAssets(false).then(() => {
user.playAnim(); user.playAnim();

32
src/phases/show-ability-phase.ts
View File

@ -1,22 +1,47 @@
import { globalScene } from "#app/global-scene"; import { globalScene } from "#app/global-scene";
import type { BattlerIndex } from "#app/battle"; import type { BattlerIndex } from "#app/battle";
import { PokemonPhase } from "./pokemon-phase"; import { PokemonPhase } from "./pokemon-phase";
import { getPokemonNameWithAffix } from "#app/messages";
import { HideAbilityPhase } from "#app/phases/hide-ability-phase";
export class ShowAbilityPhase extends PokemonPhase { export class ShowAbilityPhase extends PokemonPhase {
private passive: boolean; private passive: boolean;
private pokemonName: string;
private abilityName: string;
private pokemonOnField: boolean;
constructor(battlerIndex: BattlerIndex, passive = false) { constructor(battlerIndex: BattlerIndex, passive = false) {
super(battlerIndex); super(battlerIndex);
this.passive = passive; this.passive = passive;
const pokemon = this.getPokemon();
if (pokemon) {
// Set these now as the pokemon object may change before the queued phase is run
this.pokemonName = getPokemonNameWithAffix(pokemon);
this.abilityName = (passive ? this.getPokemon().getPassiveAbility() : this.getPokemon().getAbility()).name;
this.pokemonOnField = true;
} else {
this.pokemonOnField = false;
}
} }
start() { start() {
super.start(); super.start();
if (!this.pokemonOnField || !this.getPokemon()) {
return this.end();
}
// If the bar is already out, hide it before showing the new one
if (globalScene.abilityBar.isVisible()) {
globalScene.unshiftPhase(new HideAbilityPhase(this.battlerIndex, this.passive));
globalScene.unshiftPhase(new ShowAbilityPhase(this.battlerIndex, this.passive));
return this.end();
}
const pokemon = this.getPokemon(); const pokemon = this.getPokemon();
if (pokemon) {
if (!pokemon.isPlayer()) { if (!pokemon.isPlayer()) {
/** If its an enemy pokemon, list it as last enemy to use ability or move */ /** If its an enemy pokemon, list it as last enemy to use ability or move */
globalScene.currentBattle.lastEnemyInvolved = pokemon.getBattlerIndex() % 2; globalScene.currentBattle.lastEnemyInvolved = pokemon.getBattlerIndex() % 2;
@ -24,13 +49,12 @@ export class ShowAbilityPhase extends PokemonPhase {
globalScene.currentBattle.lastPlayerInvolved = pokemon.getBattlerIndex() % 2; globalScene.currentBattle.lastPlayerInvolved = pokemon.getBattlerIndex() % 2;
} }
globalScene.abilityBar.showAbility(pokemon, this.passive); globalScene.abilityBar.showAbility(this.pokemonName, this.abilityName, this.passive, this.player).then(() => {
if (pokemon?.battleData) { if (pokemon?.battleData) {
pokemon.battleData.abilityRevealed = true; pokemon.battleData.abilityRevealed = true;
} }
}
this.end(); this.end();
});
} }
} }

130
src/ui/ability-bar.ts
View File

@ -1,31 +1,33 @@
import { getPokemonNameWithAffix } from "#app/messages";
import { globalScene } from "#app/global-scene"; import { globalScene } from "#app/global-scene";
import type Pokemon from "../field/pokemon";
import { TextStyle, addTextObject } from "./text"; import { TextStyle, addTextObject } from "./text";
import i18next from "i18next"; import i18next from "i18next";
const hiddenX = -118; const barWidth = 118;
const shownX = 0; const screenLeft = 0;
const baseY = -116; const baseY = -116;
export default class AbilityBar extends Phaser.GameObjects.Container { export default class AbilityBar extends Phaser.GameObjects.Container {
private bg: Phaser.GameObjects.Image; private abilityBars: Phaser.GameObjects.Image[];
private abilityBarText: Phaser.GameObjects.Text; private abilityBarText: Phaser.GameObjects.Text;
private player: boolean;
private tween: Phaser.Tweens.Tween | null; private screenRight: number; // hold screenRight in case size changes between show and hide
private autoHideTimer: NodeJS.Timeout | null; private shown: boolean;
public shown: boolean;
constructor() { constructor() {
super(globalScene, hiddenX, baseY); super(globalScene, barWidth, baseY);
this.abilityBars = [];
this.player = true;
this.shown = false;
} }
setup(): void { setup(): void {
this.bg = globalScene.add.image(0, 0, "ability_bar_left"); for (const key of ["ability_bar_right", "ability_bar_left"]) {
this.bg.setOrigin(0, 0); const bar = globalScene.add.image(0, 0, key);
bar.setOrigin(0, 0);
this.add(this.bg); bar.setVisible(false);
this.add(bar);
this.abilityBars.push(bar);
}
this.abilityBarText = addTextObject(15, 3, "", TextStyle.MESSAGE, { this.abilityBarText = addTextObject(15, 3, "", TextStyle.MESSAGE, {
fontSize: "72px", fontSize: "72px",
@ -33,72 +35,80 @@ export default class AbilityBar extends Phaser.GameObjects.Container {
this.abilityBarText.setOrigin(0, 0); this.abilityBarText.setOrigin(0, 0);
this.abilityBarText.setWordWrapWidth(600, true); this.abilityBarText.setWordWrapWidth(600, true);
this.add(this.abilityBarText); this.add(this.abilityBarText);
this.bringToTop(this.abilityBarText);
this.setVisible(false); this.setVisible(false);
this.shown = false; this.setX(-barWidth); // start hidden (right edge of bar at x=0)
} }
showAbility(pokemon: Pokemon, passive = false): void { public override setVisible(value: boolean): this {
this.abilityBarText.setText( this.abilityBars[+this.player].setVisible(value);
`${i18next.t("fightUiHandler:abilityFlyInText", { pokemonName: getPokemonNameWithAffix(pokemon), passive: passive ? i18next.t("fightUiHandler:passive") : "", abilityName: !passive ? pokemon.getAbility().name : pokemon.getPassiveAbility().name })}`, this.shown = value;
); return this;
if (this.shown) {
return;
} }
public async startTween(config: any, text?: string): Promise<void> {
this.setVisible(true);
if (text) {
this.abilityBarText.setText(text);
}
return new Promise(resolve => {
globalScene.tweens.add({
...config,
onComplete: () => {
if (config.onComplete) {
config.onComplete();
}
resolve();
},
});
});
}
public async showAbility(pokemonName: string, abilityName: string, passive = false, player = true): Promise<void> {
const text = `${i18next.t("fightUiHandler:abilityFlyInText", { pokemonName: pokemonName, passive: passive ? i18next.t("fightUiHandler:passive") : "", abilityName: abilityName })}`;
this.screenRight = globalScene.scaledCanvas.width;
if (player !== this.player) {
// Move the bar if it has changed from the player to enemy side (or vice versa)
this.setX(player ? -barWidth : this.screenRight);
this.player = player;
}
globalScene.fieldUI.bringToTop(this); globalScene.fieldUI.bringToTop(this);
this.y = baseY + (globalScene.currentBattle.double ? 14 : 0); let y = baseY;
this.tween = globalScene.tweens.add({ if (this.player) {
y += globalScene.currentBattle.double ? 14 : 0;
} else {
y -= globalScene.currentBattle.double ? 28 : 14;
}
this.setY(y);
return this.startTween(
{
targets: this, targets: this,
x: shownX, x: this.player ? screenLeft : this.screenRight - barWidth,
duration: 500, duration: 500,
ease: "Sine.easeOut", ease: "Sine.easeOut",
onComplete: () => { hold: 1000,
this.tween = null;
this.resetAutoHideTimer();
}, },
}); text,
);
this.setVisible(true);
this.shown = true;
} }
hide(): void { public async hide(): Promise<void> {
if (!this.shown) { return this.startTween({
return;
}
if (this.autoHideTimer) {
clearInterval(this.autoHideTimer);
}
if (this.tween) {
this.tween.stop();
}
this.tween = globalScene.tweens.add({
targets: this, targets: this,
x: -91, x: this.player ? -barWidth : this.screenRight,
duration: 500, duration: 200,
ease: "Sine.easeIn", ease: "Sine.easeIn",
onComplete: () => { onComplete: () => {
this.tween = null;
this.setVisible(false); this.setVisible(false);
}, },
}); });
this.shown = false;
} }
resetAutoHideTimer(): void { public isVisible(): boolean {
if (this.autoHideTimer) { return this.shown;
clearInterval(this.autoHideTimer);
}
this.autoHideTimer = setTimeout(() => {
this.hide();
this.autoHideTimer = null;
}, 2500);
} }
} }

9
src/ui/message-ui-handler.ts
View File

@ -76,6 +76,12 @@ export default abstract class MessageUiHandler extends AwaitableUiHandler {
const fadeMap = new Map<number, number>(); const fadeMap = new Map<number, number>();
const actionPattern = /@(c|d|s|f)\{(.*?)\}/; const actionPattern = /@(c|d|s|f)\{(.*?)\}/;
let actionMatch: RegExpExecArray | null; let actionMatch: RegExpExecArray | null;
const pokename: string[] = [];
const repname = [ "#POKEMON1", "#POKEMON2" ];
for (let p = 0; p < globalScene.getPlayerField().length; p++) {
pokename.push(globalScene.getPlayerField()[p].getNameToRender());
text = text.split(pokename[p]).join(repname[p]);
}
while ((actionMatch = actionPattern.exec(text))) { while ((actionMatch = actionPattern.exec(text))) {
switch (actionMatch[1]) { switch (actionMatch[1]) {
case "c": case "c":
@ -94,6 +100,9 @@ export default abstract class MessageUiHandler extends AwaitableUiHandler {
text = text.slice(0, actionMatch.index) + text.slice(actionMatch.index + actionMatch[2].length + 4); text = text.slice(0, actionMatch.index) + text.slice(actionMatch.index + actionMatch[2].length + 4);
} }
for (let p = 0; p < globalScene.getPlayerField().length; p++) {
text = text.split(repname[p]).join(pokename[p]);
}
if (text) { if (text) {
// Predetermine overflow line breaks to avoid words breaking while displaying // Predetermine overflow line breaks to avoid words breaking while displaying
const textWords = text.split(" "); const textWords = text.split(" ");

46
src/ui/pokedex-ui-handler.ts
View File

@ -1742,36 +1742,26 @@ export default class PokedexUiHandler extends MessageUiHandler {
container.icon.setTint(0); container.icon.setTint(0);
} }
if (data.eggMove1) { const pairs: [boolean | undefined, Phaser.GameObjects.Image][] = [
container.eggMove1Icon.setVisible(true); [data.eggMove1, container.eggMove1Icon],
[data.eggMove2, container.eggMove2Icon],
[data.tmMove1, container.tmMove1Icon],
[data.tmMove2, container.tmMove2Icon],
[data.passive1, container.passive1Icon],
[data.passive2, container.passive2Icon],
];
pairs.forEach(([unlocked, icon]) => {
if (unlocked) {
icon.setVisible(true);
icon.clearTint();
} else if (unlocked === false) {
icon.setVisible(true);
icon.setTint(0x808080);
} else { } else {
container.eggMove1Icon.setVisible(false); icon.setVisible(false);
}
if (data.eggMove2) {
container.eggMove2Icon.setVisible(true);
} else {
container.eggMove2Icon.setVisible(false);
}
if (data.tmMove1) {
container.tmMove1Icon.setVisible(true);
} else {
container.tmMove1Icon.setVisible(false);
}
if (data.tmMove2) {
container.tmMove2Icon.setVisible(true);
} else {
container.tmMove2Icon.setVisible(false);
}
if (data.passive1) {
container.passive1Icon.setVisible(true);
} else {
container.passive1Icon.setVisible(false);
}
if (data.passive2) {
container.passive2Icon.setVisible(true);
} else {
container.passive2Icon.setVisible(false);
} }
});
if (this.showDecorations) { if (this.showDecorations) {
if (this.pokerusSpecies.includes(data.species)) { if (this.pokerusSpecies.includes(data.species)) {

11
src/ui/ui.ts
View File

@ -328,17 +328,28 @@ export default class UI extends Phaser.GameObjects.Container {
prompt?: boolean | null, prompt?: boolean | null,
promptDelay?: number | null, promptDelay?: number | null,
): void { ): void {
const pokename: string[] = [];
const repname = [ "#POKEMON1", "#POKEMON2" ];
for (let p = 0; p < globalScene.getPlayerField().length; p++) {
pokename.push(globalScene.getPlayerField()[p].getNameToRender());
text = text.split(pokename[p]).join(repname[p]);
}
if (prompt && text.indexOf("$") > -1) { if (prompt && text.indexOf("$") > -1) {
const messagePages = text.split(/\$/g).map(m => m.trim()); const messagePages = text.split(/\$/g).map(m => m.trim());
// biome-ignore lint/complexity/useOptionalChain: optional chain would change this to be null instead of undefined. // biome-ignore lint/complexity/useOptionalChain: optional chain would change this to be null instead of undefined.
let showMessageAndCallback = () => callback && callback(); let showMessageAndCallback = () => callback && callback();
for (let p = messagePages.length - 1; p >= 0; p--) { for (let p = messagePages.length - 1; p >= 0; p--) {
const originalFunc = showMessageAndCallback; const originalFunc = showMessageAndCallback;
messagePages[p] = messagePages[p].split(repname[0]).join(pokename[0]);
messagePages[p] = messagePages[p].split(repname[1]).join(pokename[1]);
showMessageAndCallback = () => this.showText(messagePages[p], null, originalFunc, null, true); showMessageAndCallback = () => this.showText(messagePages[p], null, originalFunc, null, true);
} }
showMessageAndCallback(); showMessageAndCallback();
} else { } else {
const handler = this.getHandler(); const handler = this.getHandler();
for (let p = 0; p < globalScene.getPlayerField().length; p++) {
text = text.split(repname[p]).join(pokename[p]);
}
if (handler instanceof MessageUiHandler) { if (handler instanceof MessageUiHandler) {
(handler as MessageUiHandler).showText(text, delay, callback, callbackDelay, prompt, promptDelay); (handler as MessageUiHandler).showText(text, delay, callback, callbackDelay, prompt, promptDelay);
} else { } else {

6
test/moves/chilly_reception.test.ts
View File

@ -27,8 +27,8 @@ describe("Moves - Chilly Reception", () => {
.battleType("single") .battleType("single")
.moveset([Moves.CHILLY_RECEPTION, Moves.SNOWSCAPE]) .moveset([Moves.CHILLY_RECEPTION, Moves.SNOWSCAPE])
.enemyMoveset(Array(4).fill(Moves.SPLASH)) .enemyMoveset(Array(4).fill(Moves.SPLASH))
.enemyAbility(Abilities.NONE) .enemyAbility(Abilities.BALL_FETCH)
.ability(Abilities.NONE); .ability(Abilities.BALL_FETCH);
}); });
it("should still change the weather if user can't switch out", async () => { it("should still change the weather if user can't switch out", async () => {
@ -72,7 +72,6 @@ describe("Moves - Chilly Reception", () => {
game.override game.override
.battleType("single") .battleType("single")
.enemyMoveset([Moves.CHILLY_RECEPTION, Moves.TACKLE]) .enemyMoveset([Moves.CHILLY_RECEPTION, Moves.TACKLE])
.enemyAbility(Abilities.NONE)
.moveset(Array(4).fill(Moves.SPLASH)); .moveset(Array(4).fill(Moves.SPLASH));
await game.classicMode.startBattle([Species.SLOWKING, Species.MEOWTH]); await game.classicMode.startBattle([Species.SLOWKING, Species.MEOWTH]);
@ -89,7 +88,6 @@ describe("Moves - Chilly Reception", () => {
.battleType("single") .battleType("single")
.startingWave(8) .startingWave(8)
.enemyMoveset(Array(4).fill(Moves.CHILLY_RECEPTION)) .enemyMoveset(Array(4).fill(Moves.CHILLY_RECEPTION))
.enemyAbility(Abilities.NONE)
.enemySpecies(Species.MAGIKARP) .enemySpecies(Species.MAGIKARP)
.moveset([Moves.SPLASH, Moves.THUNDERBOLT]); .moveset([Moves.SPLASH, Moves.THUNDERBOLT]);

6
test/moves/secret_power.test.ts
View File

@ -68,7 +68,7 @@ describe("Moves - Secret Power", () => {
await game.classicMode.startBattle([Species.BLASTOISE, Species.CHARIZARD]); await game.classicMode.startBattle([Species.BLASTOISE, Species.CHARIZARD]);
const sereneGraceAttr = allAbilities[Abilities.SERENE_GRACE].getAttrs(MoveEffectChanceMultiplierAbAttr)[0]; const sereneGraceAttr = allAbilities[Abilities.SERENE_GRACE].getAttrs(MoveEffectChanceMultiplierAbAttr)[0];
vi.spyOn(sereneGraceAttr, "apply"); vi.spyOn(sereneGraceAttr, "canApply");
game.move.select(Moves.WATER_PLEDGE, 0, BattlerIndex.ENEMY); game.move.select(Moves.WATER_PLEDGE, 0, BattlerIndex.ENEMY);
game.move.select(Moves.FIRE_PLEDGE, 1, BattlerIndex.ENEMY_2); game.move.select(Moves.FIRE_PLEDGE, 1, BattlerIndex.ENEMY_2);
@ -86,8 +86,8 @@ describe("Moves - Secret Power", () => {
await game.phaseInterceptor.to("BerryPhase", false); await game.phaseInterceptor.to("BerryPhase", false);
expect(sereneGraceAttr.apply).toHaveBeenCalledOnce(); expect(sereneGraceAttr.canApply).toHaveBeenCalledOnce();
expect(sereneGraceAttr.apply).toHaveLastReturnedWith(true); expect(sereneGraceAttr.canApply).toHaveLastReturnedWith(true);
expect(rainbowEffect.apply).toHaveBeenCalledTimes(0); expect(rainbowEffect.apply).toHaveBeenCalledTimes(0);
}); });

23
test/moves/tailwind.test.ts
View File

@ -1,9 +1,9 @@
import { Stat } from "#enums/stat";
import { ArenaTagSide } from "#app/data/arena-tag"; import { ArenaTagSide } from "#app/data/arena-tag";
import { ArenaTagType } from "#app/enums/arena-tag-type"; import { ArenaTagType } from "#app/enums/arena-tag-type";
import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves"; import { Moves } from "#enums/moves";
import { Species } from "#enums/species"; import { Species } from "#enums/species";
import { Stat } from "#enums/stat";
import GameManager from "#test/testUtils/gameManager"; import GameManager from "#test/testUtils/gameManager";
import Phaser from "phaser"; import Phaser from "phaser";
import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
@ -24,13 +24,16 @@ describe("Moves - Tailwind", () => {
beforeEach(() => { beforeEach(() => {
game = new GameManager(phaserGame); game = new GameManager(phaserGame);
game.override.battleType("double"); game.override
game.override.moveset([Moves.TAILWIND, Moves.SPLASH, Moves.PETAL_BLIZZARD, Moves.SANDSTORM]); .battleType("double")
game.override.enemyMoveset(Moves.SPLASH); .moveset([Moves.TAILWIND, Moves.SPLASH])
.enemyMoveset(Moves.SPLASH)
.enemyAbility(Abilities.BALL_FETCH)
.ability(Abilities.BALL_FETCH);
}); });
it("doubles the Speed stat of the Pokemons on its side", async () => { it("doubles the Speed stat of the Pokemons on its side", async () => {
await game.startBattle([Species.MAGIKARP, Species.MEOWTH]); await game.classicMode.startBattle([Species.MAGIKARP, Species.MEOWTH]);
const magikarp = game.scene.getPlayerField()[0]; const magikarp = game.scene.getPlayerField()[0];
const meowth = game.scene.getPlayerField()[1]; const meowth = game.scene.getPlayerField()[1];
@ -43,7 +46,7 @@ describe("Moves - Tailwind", () => {
game.move.select(Moves.TAILWIND); game.move.select(Moves.TAILWIND);
game.move.select(Moves.SPLASH, 1); game.move.select(Moves.SPLASH, 1);
await game.phaseInterceptor.to(TurnEndPhase); await game.phaseInterceptor.to("TurnEndPhase");
expect(magikarp.getEffectiveStat(Stat.SPD)).toBe(magikarpSpd * 2); expect(magikarp.getEffectiveStat(Stat.SPD)).toBe(magikarpSpd * 2);
expect(meowth.getEffectiveStat(Stat.SPD)).toBe(meowthSpd * 2); expect(meowth.getEffectiveStat(Stat.SPD)).toBe(meowthSpd * 2);
@ -53,7 +56,7 @@ describe("Moves - Tailwind", () => {
it("lasts for 4 turns", async () => { it("lasts for 4 turns", async () => {
game.override.battleType("single"); game.override.battleType("single");
await game.startBattle([Species.MAGIKARP]); await game.classicMode.startBattle([Species.MAGIKARP]);
game.move.select(Moves.TAILWIND); game.move.select(Moves.TAILWIND);
await game.toNextTurn(); await game.toNextTurn();
@ -76,7 +79,7 @@ describe("Moves - Tailwind", () => {
it("does not affect the opposing side", async () => { it("does not affect the opposing side", async () => {
game.override.battleType("single"); game.override.battleType("single");
await game.startBattle([Species.MAGIKARP]); await game.classicMode.startBattle([Species.MAGIKARP]);
const ally = game.scene.getPlayerPokemon()!; const ally = game.scene.getPlayerPokemon()!;
const enemy = game.scene.getEnemyPokemon()!; const enemy = game.scene.getEnemyPokemon()!;
@ -91,7 +94,7 @@ describe("Moves - Tailwind", () => {
game.move.select(Moves.TAILWIND); game.move.select(Moves.TAILWIND);
await game.phaseInterceptor.to(TurnEndPhase); await game.phaseInterceptor.to("TurnEndPhase");
expect(ally.getEffectiveStat(Stat.SPD)).toBe(allySpd * 2); expect(ally.getEffectiveStat(Stat.SPD)).toBe(allySpd * 2);
expect(enemy.getEffectiveStat(Stat.SPD)).equal(enemySpd); expect(enemy.getEffectiveStat(Stat.SPD)).equal(enemySpd);