mirror of
https://github.com/smogon/pokemon-showdown-client.git
synced 2026-03-21 17:50:29 -05:00
Skip animation during fainted forme regression (#2434)
This commit is contained in:
parent
fc6d963912
commit
0d10f6180a
|
|
@ -2540,9 +2540,9 @@ export class PokemonSprite extends Sprite {
|
|||
if (!this.scene.animating) return;
|
||||
let speciesid = toID(pokemon.getSpeciesForme());
|
||||
let doCry = false;
|
||||
let skipAnim = false;
|
||||
let skipAnim = !pokemon.isActive();
|
||||
const scene = this.scene;
|
||||
if (useSpeciesAnim) {
|
||||
if (useSpeciesAnim && !skipAnim) {
|
||||
if (speciesid === 'kyogreprimal') {
|
||||
BattleOtherAnims.primalalpha.anim(scene, [this]);
|
||||
doCry = true;
|
||||
|
|
|
|||
|
|
@ -2472,11 +2472,9 @@ export class Battle {
|
|||
poke.ability = poke.baseAbility = (species.abilities ? species.abilities['0'] : '');
|
||||
|
||||
poke.details = args[2];
|
||||
poke.searchid = args[1].substr(0, 2) + args[1].substr(3) + '|' + args[2];
|
||||
poke.searchid = args[1].substr(0, 2) + args[1].substr(args[1].indexOf(':')) + '|' + args[2];
|
||||
|
||||
if (!kwArgs.silent) {
|
||||
this.scene.animTransform(poke, true, true);
|
||||
}
|
||||
this.scene.animTransform(poke, true, true);
|
||||
this.log(args, kwArgs);
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user