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

Struggle shouldn't count for Basc recoil

Browse Source
This commit is contained in:
AJ Fontaine 2025-05-27 15:42:01 -04:00
parent 7365083ca9
commit 66574938a5
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/data/moves/move.ts
View File

@ -1680,7 +1680,7 @@ export class RecoilAttr extends MoveEffectAttr {
user.damageAndUpdate(recoilDamage, { result: HitResult.INDIRECT, ignoreSegments: true });
globalScene.queueMessage(i18next.t("moveTriggers:hitWithRecoil", { pokemonName: getPokemonNameWithAffix(user) }));
user.turnData.damageTaken += recoilDamage;
if (!user.isFainted() && user.hasSpecies(Species.BASCULIN, "white-striped")) {
if (!user.isFainted() && user.hasSpecies(Species.BASCULIN, "white-striped") && move.id !== Moves.STRUGGLE) {
const modifier = modifierTypes.EVOLUTION_TRACKER_BASCULIN()
.withIdFromFunc(modifierTypes.EVOLUTION_TRACKER_BASCULIN)
.newModifier(user, recoilDamage) as EvoTrackerRecoilModifier;