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

Rename SELF hitresult to CONFUSION

Browse Source
This commit is contained in:
Christopher Schmidt 2025-02-02 18:11:18 -05:00
parent 1ebab2de57
commit 4389f7b6fb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/data/battler-tags.ts
View File

@ -665,7 +665,7 @@ export class ConfusedTag extends BattlerTag {
const def = pokemon.getEffectiveStat(Stat.DEF); const def = pokemon.getEffectiveStat(Stat.DEF);
const damage = toDmgValue(((((2 * pokemon.level / 5 + 2) * 40 * atk / def) / 50) + 2) * (pokemon.randSeedIntRange(85, 100) / 100)); const damage = toDmgValue(((((2 * pokemon.level / 5 + 2) * 40 * atk / def) / 50) + 2) * (pokemon.randSeedIntRange(85, 100) / 100));
globalScene.queueMessage(i18next.t("battlerTags:confusedLapseHurtItself")); globalScene.queueMessage(i18next.t("battlerTags:confusedLapseHurtItself"));
pokemon.damageAndUpdate(damage, HitResult.SELF); pokemon.damageAndUpdate(damage, HitResult.CONFUSION);
pokemon.battleData.hitCount++; pokemon.battleData.hitCount++;
(globalScene.getCurrentPhase() as MovePhase).cancel(); (globalScene.getCurrentPhase() as MovePhase).cancel();
} }

2
src/phases/damage-anim-phase.ts
View File

@ -42,7 +42,7 @@ export class DamageAnimPhase extends PokemonPhase {
applyDamage() { applyDamage() {
switch (this.damageResult) { switch (this.damageResult) {
case HitResult.EFFECTIVE: case HitResult.EFFECTIVE:
case HitResult.SELF: case HitResult.CONFUSION:
globalScene.playSound("se/hit"); globalScene.playSound("se/hit");
break; break;
case HitResult.SUPER_EFFECTIVE: case HitResult.SUPER_EFFECTIVE: