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

Updated logic to stop burns healing, added extra comments per Ben

Browse Source
This commit is contained in:
EmoUsedHM01 2024-05-06 20:14:07 +01:00 committed by GitHub
parent 6c1e5bd47c
commit 033ab31658
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/phases.ts
View File

@ -2921,32 +2921,27 @@ export class PostTurnStatusEffectPhase extends PokemonPhase {
this.scene.queueMessage(getPokemonMessage(pokemon, getStatusEffectActivationText(pokemon.status.effect))); this.scene.queueMessage(getPokemonMessage(pokemon, getStatusEffectActivationText(pokemon.status.effect)));
let netEffect = 0; // This variable now handles both healing and damage let netEffect = 0; // This variable now handles both healing and damage
const isHealing = pokemon.hasAbility(Abilities.POISON_HEAL); // Added check for both Ability and the new Passives
switch (pokemon.status.effect) { switch (pokemon.status.effect) {
case StatusEffect.POISON: case StatusEffect.POISON:
case StatusEffect.TOXIC: case StatusEffect.TOXIC:
if (isHealing) { if (pokemon.hasAbility(Abilities.POISON_HEAL)) { // Directly check here
netEffect = Math.max(pokemon.getMaxHp() >> 3, 1); // Healing logic netEffect = Math.max(pokemon.getMaxHp() >> 3, 1); // Healing logic
this.scene.damageNumberHandler.add(pokemon, pokemon.heal(netEffect), HitResult.HEAL); // Apply healing
} else { } else {
// Toxic damage increases over time, Poison does not netEffect = (pokemon.status.effect === StatusEffect.TOXIC) ? // Toxic damage increases over time, Poison does not
netEffect = (pokemon.status.effect === StatusEffect.TOXIC) ?
Math.max(Math.floor((pokemon.getMaxHp() / 16) * pokemon.status.turnCount), 1) : // Applies if Toxic Math.max(Math.floor((pokemon.getMaxHp() / 16) * pokemon.status.turnCount), 1) : // Applies if Toxic
Math.max(pokemon.getMaxHp() >> 3, 1); // Damage logic for Poison otherwise Math.max(pokemon.getMaxHp() >> 3, 1); // Damage logic for Poison otherwise
this.scene.damageNumberHandler.add(pokemon, pokemon.damage(netEffect)); // Apply damage, this is built in now so that the Poison Heal ability isn't indiscriminate
} }
break; break;
case StatusEffect.BURN: case StatusEffect.BURN:
netEffect = Math.max(pokemon.getMaxHp() >> 4, 1); // Burn always causes damage netEffect = Math.max(pokemon.getMaxHp() >> 4, 1);
this.scene.damageNumberHandler.add(pokemon, pokemon.damage(netEffect)); // Apply damage, same as above
break; break;
} }
if (netEffect > 0) { if (netEffect > 0) { // Just a check for poison to play the bubbly animation, damage moved to above
if (isHealing) {
this.scene.damageNumberHandler.add(pokemon, pokemon.heal(netEffect), HitResult.HEAL);
} else {
this.scene.damageNumberHandler.add(pokemon, pokemon.damage(netEffect));
}
const animType = CommonAnim.POISON + (pokemon.status.effect - 1); const animType = CommonAnim.POISON + (pokemon.status.effect - 1);
new CommonBattleAnim(animType, pokemon).play(this.scene, () => this.end()); new CommonBattleAnim(animType, pokemon).play(this.scene, () => this.end());
pokemon.updateInfo(); pokemon.updateInfo();