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

Apply suggestions from code review

Browse Source 
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
This commit is contained in:
Dean 2025-03-28 22:28:33 -07:00 committed by GitHub
parent b2062c909e
commit ea1022f799
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/phases/move-end-phase.ts
View File

@ -19,7 +19,7 @@ export class MoveEndPhase extends PokemonPhase {
const pokemon = this.getPokemon(); const pokemon = this.getPokemon();
if (pokemon.isActive(true)) { if (pokemon.isActive(true)) {
pokemon. lapseTags(BattlerTagLapseType.AFTER_MOVE); pokemon.lapseTags(BattlerTagLapseType.AFTER_MOVE);
} }
globalScene.arena.setIgnoreAbilities(false); globalScene.arena.setIgnoreAbilities(false);

2
src/phases/obtain-status-effect-phase.ts
View File

@ -46,7 +46,7 @@ export class ObtainStatusEffectPhase extends PokemonPhase {
this.sourceText ?? undefined, this.sourceText ?? undefined,
), ),
); );
if (this.statusEffect && this.statusEffect !== StatusEffect.FAINT) { if (!isNullOrUndefined(this.statusEffect) && this.statusEffect !== StatusEffect.FAINT) {
globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeStatusEffectTrigger, true); globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeStatusEffectTrigger, true);
// If mold breaker etc was used to set this status, it shouldn't apply to abilities activated afterwards // If mold breaker etc was used to set this status, it shouldn't apply to abilities activated afterwards
globalScene.arena.setIgnoreAbilities(false); globalScene.arena.setIgnoreAbilities(false);

6
src/phases/reset-status-phase.ts
View File

@ -9,9 +9,9 @@ import { StatusEffect } from "#enums/status-effect";
* This is necessary to perform in a phase primarly to ensure that the status icon disappears at the correct time in the battle * This is necessary to perform in a phase primarly to ensure that the status icon disappears at the correct time in the battle
*/ */
export class ResetStatusPhase extends BattlePhase { export class ResetStatusPhase extends BattlePhase {
private pokemon: Pokemon; private readonly pokemon: Pokemon;
private affectConfusion: boolean; private readonly affectConfusion: boolean;
private reloadAssets: boolean; private readonly reloadAssets: boolean;
constructor(pokemon: Pokemon, affectConfusion: boolean, reloadAssets: boolean) { constructor(pokemon: Pokemon, affectConfusion: boolean, reloadAssets: boolean) {
super(); super();