mirror of
https://github.com/pagefaultgames/pokerogue.git
synced 2025-07-15 12:52:20 +02:00
Only check ability attribute if move attribute was false
This commit is contained in:
parent
a25e5ccac0
commit
a856e2f5d7
@ -1406,9 +1406,12 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
|
|||||||
if (isPhysical && source.status && source.status.effect === StatusEffect.BURN) {
|
if (isPhysical && source.status && source.status.effect === StatusEffect.BURN) {
|
||||||
const burnDamageReductionCancelled = new Utils.BooleanHolder(false);
|
const burnDamageReductionCancelled = new Utils.BooleanHolder(false);
|
||||||
applyMoveAttrs(BypassBurnDamageReductionAttr, source, this, move, burnDamageReductionCancelled)
|
applyMoveAttrs(BypassBurnDamageReductionAttr, source, this, move, burnDamageReductionCancelled)
|
||||||
applyAbAttrs(BypassBurnDamageReductionAbAttr, source, burnDamageReductionCancelled);
|
|
||||||
if (!burnDamageReductionCancelled.value)
|
if(!burnDamageReductionCancelled.value){
|
||||||
damage.value = Math.floor(damage.value / 2);
|
applyAbAttrs(BypassBurnDamageReductionAbAttr, source, burnDamageReductionCancelled);
|
||||||
|
if (!burnDamageReductionCancelled.value)
|
||||||
|
damage.value = Math.floor(damage.value / 2);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
move.getAttrs(HitsTagAttr).map(hta => hta as HitsTagAttr).filter(hta => hta.doubleDamage).forEach(hta => {
|
move.getAttrs(HitsTagAttr).map(hta => hta as HitsTagAttr).filter(hta => hta.doubleDamage).forEach(hta => {
|
||||||
if (this.getTag(hta.tagType))
|
if (this.getTag(hta.tagType))
|
||||||
|
Loading…
Reference in New Issue
Block a user