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

Adds battler index to attack results in sacrificial moves

Browse Source
This commit is contained in:
Christopher Schmidt 2024-08-07 10:10:45 -04:00
parent 594cc432a2
commit e4599509e3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/data/move.ts
View File

@ -1259,7 +1259,7 @@ export class SacrificialAttr extends MoveEffectAttr {
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
user.damageAndUpdate(user.hp, HitResult.OTHER, false, true, true); user.damageAndUpdate(user.hp, HitResult.OTHER, false, true, true);
user.turnData.damageTaken += user.hp; user.turnData.damageTaken += user.hp;
const attackResult = { move: move.id, result: HitResult.OTHER as DamageResult, damage: user.hp, critical: false, sourceId: user.id }; const attackResult = { move: move.id, result: HitResult.OTHER as DamageResult, damage: user.hp, critical: false, sourceId: user.id, sourceBattlerIndex: user.getBattlerIndex() };
user.turnData.attacksReceived.unshift(attackResult); user.turnData.attacksReceived.unshift(attackResult);
return true; return true;
@ -1299,7 +1299,7 @@ export class SacrificialAttrOnHit extends MoveEffectAttr {
user.damageAndUpdate(user.hp, HitResult.OTHER, false, true, true); user.damageAndUpdate(user.hp, HitResult.OTHER, false, true, true);
user.turnData.damageTaken += user.hp; user.turnData.damageTaken += user.hp;
const attackResult = { move: move.id, result: HitResult.OTHER as DamageResult, damage: user.hp, critical: false, sourceId: user.id }; const attackResult = { move: move.id, result: HitResult.OTHER as DamageResult, damage: user.hp, critical: false, sourceId: user.id, sourceBattlerIndex: user.getBattlerIndex() };
user.turnData.attacksReceived.unshift(attackResult); user.turnData.attacksReceived.unshift(attackResult);
return true; return true;
@ -1343,7 +1343,7 @@ export class HalfSacrificialAttr extends MoveEffectAttr {
if (!cancelled.value) { if (!cancelled.value) {
const damage = Math.ceil(user.getMaxHp()/2); const damage = Math.ceil(user.getMaxHp()/2);
user.damageAndUpdate(damage, HitResult.OTHER, false, true, true); user.damageAndUpdate(damage, HitResult.OTHER, false, true, true);
const attackResult = { move: move.id, result: HitResult.OTHER as DamageResult, damage: damage, critical: false, sourceId: user.id }; const attackResult = { move: move.id, result: HitResult.OTHER as DamageResult, damage: damage, critical: false, sourceId: user.id, sourceBattlerIndex: user.getBattlerIndex() };
user.turnData.attacksReceived.unshift(attackResult); user.turnData.attacksReceived.unshift(attackResult);
user.scene.queueMessage(i18next.t("moveTriggers:cutHpPowerUpMove", {pokemonName: getPokemonNameWithAffix(user)})); // Queue recoil message user.scene.queueMessage(i18next.t("moveTriggers:cutHpPowerUpMove", {pokemonName: getPokemonNameWithAffix(user)})); // Queue recoil message
} }