solved conflicts

This commit is contained in:
geeil-han 2025-01-24 10:57:00 +01:00
parent 3dff8b0290
commit 887d5c6b97

View File

@ -4412,14 +4412,15 @@ export class SpectralThiefAttr extends StatChangeBeforeDmgCalcAttr {
// Only value of up to 6 can be stolen (stat stages don't exceed 6) // Only value of up to 6 can be stolen (stat stages don't exceed 6)
const availableToSteal = Math.min(statStageValueTarget, 6 - statStageValueUser); const availableToSteal = Math.min(statStageValueTarget, 6 - statStageValueUser);
user.scene.unshiftPhase(new StatStageChangePhase(user.scene, user.getBattlerIndex(), this.selfTarget, [ s ], availableToSteal)); globalScene.unshiftPhase(new StatStageChangePhase(user.getBattlerIndex(), this.selfTarget, [ s ], availableToSteal));
target.setStatStage(s, statStageValueTarget - availableToSteal); target.setStatStage(s, statStageValueTarget - availableToSteal);
} }
} }
target.updateInfo(); target.updateInfo();
user.updateInfo(); user.updateInfo();
target.scene.queueMessage(i18next.t("moveTriggers:stealPositiveStats", { pokemonName: getPokemonNameWithAffix(user), targetName: getPokemonNameWithAffix(target) })); //TODO this needs to be uncommented when locales are updated
//target.scene.queueMessage(i18next.t("moveTriggers:stealPositiveStats", { pokemonName: getPokemonNameWithAffix(user), targetName: getPokemonNameWithAffix(target) }));
return true; return true;
} }