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

Status move effectiveness now accounts for substitute

Browse Source
This commit is contained in:
innerthunder 2024-08-25 21:47:29 -07:00
parent ed4b2c2678
commit ff10e98f74
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/field/pokemon.ts
View File

@ -1332,6 +1332,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
} }
} }
if (move.category === MoveCategory.STATUS && move.hitsSubstitute(source, this)) {
typeMultiplier.value = 0;
}
return (!cancelledHolder.value ? typeMultiplier.value : 0) as TypeDamageMultiplier; return (!cancelledHolder.value ? typeMultiplier.value : 0) as TypeDamageMultiplier;
} }
@ -2335,14 +2339,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
} }
break; break;
case MoveCategory.STATUS: case MoveCategory.STATUS:
if (move.hitsSubstitute(source, this)) {
// TODO: add status move into substitute message
cancelled.value = true;
}
if (!cancelled.value && typeMultiplier === 0) { if (!cancelled.value && typeMultiplier === 0) {
this.scene.queueMessage(i18next.t("battle:hitResultNoEffect", { pokemonName: getPokemonNameWithAffix(this) })); this.scene.queueMessage(i18next.t("battle:hitResultNoEffect", { pokemonName: getPokemonNameWithAffix(this) }));
} }
result = (typeMultiplier === 0) ? HitResult.NO_EFFECT : HitResult.STATUS; result = (cancelled.value || typeMultiplier === 0) ? HitResult.NO_EFFECT : HitResult.STATUS;
break; break;
} }