Leahnaya/pokemon-showdown-client
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown-client.git synced 2026-10-03 08:10:58 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix Transform not copying pre-Terastallized types (#2063)

Browse Source
This commit is contained in:
Karthik
2022-12-22 19:57:28 -05:00
committed by GitHub
parent 795d5aedc8
commit b5fa39bbb9
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/battle-tooltips.ts
View File

@@ -2070,7 +2070,7 @@ class BattleTooltips {
return value;
}
getPokemonTypes(pokemon: Pokemon | ServerPokemon, preterastallized?: boolean): ReadonlyArray<TypeName> {
getPokemonTypes(pokemon: Pokemon | ServerPokemon, preterastallized = false): ReadonlyArray<TypeName> {
if (!(pokemon as Pokemon).getTypes) {
return this.battle.dex.species.get(pokemon.speciesForme).types;
}

10
src/battle.ts
View File

@@ -473,8 +473,8 @@ export class Pokemon implements PokemonDetails, PokemonHealth {
pokemon.side.battle.scene.removeTransform(pokemon);
pokemon.statusStage = 0;
}
copyTypesFrom(pokemon: Pokemon) {
const [types, addedType] = pokemon.getTypes();
copyTypesFrom(pokemon: Pokemon, preterastallized = false) {
const [types, addedType] = pokemon.getTypes(undefined, preterastallized);
this.addVolatile('typechange' as ID, types.join('/'));
if (addedType) {
this.addVolatile('typeadd' as ID, addedType);
@@ -482,7 +482,7 @@ export class Pokemon implements PokemonDetails, PokemonHealth {
this.removeVolatile('typeadd' as ID);
}
}
getTypes(serverPokemon?: ServerPokemon, preterastallized?: boolean): [ReadonlyArray<TypeName>, TypeName | ''] {
getTypes(serverPokemon?: ServerPokemon, preterastallized = false): [ReadonlyArray<TypeName>, TypeName | ''] {
let types: ReadonlyArray<TypeName>;
if (this.terastallized && !preterastallized) {
types = [this.terastallized as TypeName];
@@ -538,7 +538,7 @@ export class Pokemon implements PokemonDetails, PokemonHealth {
}
return ability.name;
}
getTypeList(serverPokemon?: ServerPokemon, preterastallized?: boolean) {
getTypeList(serverPokemon?: ServerPokemon, preterastallized = false) {
const [types, addedType] = this.getTypes(serverPokemon, preterastallized);
return addedType ? types.concat(addedType) : types;
}
@@ -2417,7 +2417,7 @@ export class Battle {
}
poke.boosts = {...tpoke.boosts};
poke.copyTypesFrom(tpoke);
poke.copyTypesFrom(tpoke, true);
poke.ability = tpoke.ability;
poke.timesAttacked = tpoke.timesAttacked;
const targetForme = tpoke.volatiles.formechange;