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

move sourceTeraType closer to where it's used

Browse Source
This commit is contained in:
innerthunder 2024-09-11 02:24:20 -07:00
parent 74bd2e6fe1
commit d2a2527e3d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/field/pokemon.ts
View File

@ -2209,7 +2209,6 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
const typeMultiplier = this.getMoveEffectiveness(source, move, ignoreAbility, simulated, cancelled); const typeMultiplier = this.getMoveEffectiveness(source, move, ignoreAbility, simulated, cancelled);
const isPhysical = moveCategory === MoveCategory.PHYSICAL; const isPhysical = moveCategory === MoveCategory.PHYSICAL;
const sourceTeraType = source.getTeraType();
/** Combined damage multiplier from field effects such as weather, terrain, etc. */ /** Combined damage multiplier from field effects such as weather, terrain, etc. */
const arenaAttackTypeMultiplier = new Utils.NumberHolder(this.scene.arena.getAttackTypeMultiplier(moveType, source.isGrounded())); const arenaAttackTypeMultiplier = new Utils.NumberHolder(this.scene.arena.getAttackTypeMultiplier(moveType, source.isGrounded()));
@ -2305,6 +2304,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
const randomMultiplier = simulated ? 1 : ((this.randSeedIntRange(85, 100)) / 100); const randomMultiplier = simulated ? 1 : ((this.randSeedIntRange(85, 100)) / 100);
const sourceTypes = source.getTypes(); const sourceTypes = source.getTypes();
const sourceTeraType = source.getTeraType();
const matchesSourceType = sourceTypes.includes(moveType); const matchesSourceType = sourceTypes.includes(moveType);
/** A damage multiplier for when the attack is of the attacker's type and/or Tera type. */ /** A damage multiplier for when the attack is of the attacker's type and/or Tera type. */
const stabMultiplier = new Utils.NumberHolder(1); const stabMultiplier = new Utils.NumberHolder(1);