From 2f641fee90ee66a060ffe90d14567130ea5e16a2 Mon Sep 17 00:00:00 2001 From: PsychedelicSeal <116048497+ThePsychedelicSeal@users.noreply.github.com> Date: Thu, 31 Oct 2024 16:00:42 -0600 Subject: [PATCH] Modifying battle-scene.ts Added code to get Form and Tera Type Typo fixed in pokemon.ts --- src/battle-scene.ts | 2 +- src/field/pokemon.ts | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/battle-scene.ts b/src/battle-scene.ts index 32c88ab1b38..696e3f9cdd4 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -2965,7 +2965,7 @@ export default class BattleScene extends SceneBase { biome: this.currentBattle ? getBiomeName(this.arena.biomeType) : "", wave: this.currentBattle?.waveIndex || 0, party: this.party ? this.party.map(p => { - return { name: p.name, type: p.getTypes(), level: p.level, currentHP: p.hp, maxHP: p.getMaxHp(), status: p.status }; + return { name: p.name, form: p.formIndex, types: p.getTypes(), tera: p.getTeraType(), level: p.level, currentHP: p.hp, maxHP: p.getMaxHp(), status: p.status }; }) : [], modeChain: this.ui?.getModeChain() ?? [], }; diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index cdc98cbc593..5c49e18058b 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -181,7 +181,6 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } this.exp = dataSource?.exp || getLevelTotalExp(this.level, species.growthRate); this.levelExp = dataSource?.levelExp || 0; - if (dataSource) { this.id = dataSource.id; this.hp = dataSource.hp;