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

Zero to Hero documentation and form reset on summon

Browse Source
This commit is contained in:
Frederico Santos 2024-05-19 20:12:49 +01:00
parent 61be88e50c
commit 7d0e7f1d55
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/battle-scene.ts
View File

@ -45,7 +45,7 @@ import UIPlugin from 'phaser3-rex-plugins/templates/ui/ui-plugin';
import { addUiThemeOverrides } from './ui/ui-theme'; import { addUiThemeOverrides } from './ui/ui-theme';
import PokemonData from './system/pokemon-data'; import PokemonData from './system/pokemon-data';
import { Nature } from './data/nature'; import { Nature } from './data/nature';
import { SpeciesFormChangeTimeOfDayTrigger, SpeciesFormChangeTrigger, pokemonFormChanges } from './data/pokemon-forms'; import { SpeciesFormChangeManualTrigger, SpeciesFormChangeTimeOfDayTrigger, SpeciesFormChangeTrigger, pokemonFormChanges } from './data/pokemon-forms';
import { FormChangePhase, QuietFormChangePhase } from './form-change-phase'; import { FormChangePhase, QuietFormChangePhase } from './form-change-phase';
import { BattleSpec } from './enums/battle-spec'; import { BattleSpec } from './enums/battle-spec';
import { getTypeRgb } from './data/type'; import { getTypeRgb } from './data/type';
@ -931,7 +931,10 @@ export default class BattleScene extends SceneBase {
for (let pokemon of this.getParty()) { for (let pokemon of this.getParty()) {
if (pokemon) { if (pokemon) {
if (resetArenaState) if (resetArenaState)
{
pokemon.resetBattleData(); pokemon.resetBattleData();
this.triggerPokemonFormChange(pokemon, SpeciesFormChangeManualTrigger);
}
this.triggerPokemonFormChange(pokemon, SpeciesFormChangeTimeOfDayTrigger); this.triggerPokemonFormChange(pokemon, SpeciesFormChangeTimeOfDayTrigger);
} }
} }

12
src/data/ability.ts
View File

@ -1703,7 +1703,9 @@ export class PreSwitchOutHealAbAttr extends PreSwitchOutAbAttr {
} }
/** /**
* * Attribute for form changes that occur on switching out
* @extends PreSwitchOutAbAttr
* @see {@linkcode applyPreSwitchOut}
*/ */
export class PreSwitchOutFormChangeAbAttr extends PreSwitchOutAbAttr { export class PreSwitchOutFormChangeAbAttr extends PreSwitchOutAbAttr {
private formFunc: (p: Pokemon) => integer; private formFunc: (p: Pokemon) => integer;
@ -1716,10 +1718,10 @@ export class PreSwitchOutFormChangeAbAttr extends PreSwitchOutAbAttr {
/** /**
* *
* @param pokemon * @param pokemon The pokemon switching out and changing form {@linkcode Pokemon}
* @param passive * @param passive N/A
* @param args * @param args N/A
* @returns * @returns true if the form change was successful
*/ */
applyPreSwitchOut(pokemon: Pokemon, passive: boolean, args: any[]): boolean | Promise<boolean> { applyPreSwitchOut(pokemon: Pokemon, passive: boolean, args: any[]): boolean | Promise<boolean> {
const formIndex = this.formFunc(pokemon); const formIndex = this.formFunc(pokemon);