From b2e4e950d0ec915a84282c76f6bfd042275f4752 Mon Sep 17 00:00:00 2001 From: James Fitzpatrick Date: Mon, 9 Dec 2019 15:26:57 -0500 Subject: [PATCH] 6079 - Fixing conditional damage order, conditions (#6080) * 6079 - Fixing conditional damage order, conditions As of c482fad, a number of spells had their conditional damage reworded in oracle text. As a part of these changes, some of the spells had their order of effects inverted, with the damage after the condition was happening before the condition was met. In addition, Brimstone volley was changed from a Morbid condition to a Hellbent condition. This commit corrects those typos. * Update Mage.Sets/src/mage/cards/f/FirecannonBlast.java Co-Authored-By: Fenhl --- Mage.Sets/src/mage/cards/b/BrimstoneVolley.java | 8 ++++---- Mage.Sets/src/mage/cards/c/CacklingFlames.java | 2 +- Mage.Sets/src/mage/cards/f/FirecannonBlast.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Mage.Sets/src/mage/cards/b/BrimstoneVolley.java b/Mage.Sets/src/mage/cards/b/BrimstoneVolley.java index ad202a0345..dfc42e7bc6 100644 --- a/Mage.Sets/src/mage/cards/b/BrimstoneVolley.java +++ b/Mage.Sets/src/mage/cards/b/BrimstoneVolley.java @@ -1,5 +1,6 @@ package mage.cards.b; +import mage.abilities.condition.common.MorbidCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; @@ -8,7 +9,6 @@ import mage.constants.CardType; import mage.target.common.TargetAnyTarget; import mage.watchers.common.MorbidWatcher; import java.util.UUID; -import mage.abilities.condition.common.MorbidCondition; /** * @author nantuko @@ -21,9 +21,9 @@ public final class BrimstoneVolley extends CardImpl { // Brimstone Volley deals 3 damage to any target. // Morbid — Brimstone Volley deals 5 damage to that creature or player instead if a creature died this turn. this.getSpellAbility().addEffect(new ConditionalOneShotEffect( - new DamageTargetEffect(3), new DamageTargetEffect(5), MorbidCondition.instance, - "{this} deals 3 damage to any target." - + "
Morbid — {this} deals 5 damage instead if a creature died this turn." + new DamageTargetEffect(5), new DamageTargetEffect(3), MorbidCondition.instance, + "{this} deals 3 damage to any target." + + "
Morbid — {this} deals 5 damage instead if a creature died this turn." )); this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addWatcher(new MorbidWatcher()); diff --git a/Mage.Sets/src/mage/cards/c/CacklingFlames.java b/Mage.Sets/src/mage/cards/c/CacklingFlames.java index 194036356c..0bf4c194f6 100644 --- a/Mage.Sets/src/mage/cards/c/CacklingFlames.java +++ b/Mage.Sets/src/mage/cards/c/CacklingFlames.java @@ -21,7 +21,7 @@ public final class CacklingFlames extends CardImpl { // Cackling Flames deals 3 damage to any target. // Hellbent - Cackling Flames deals 5 damage to that creature or player instead if you have no cards in hand. this.getSpellAbility().addEffect(new ConditionalOneShotEffect( - new DamageTargetEffect(3), new DamageTargetEffect(5), HellbentCondition.instance, + new DamageTargetEffect(5), new DamageTargetEffect(3), HellbentCondition.instance, "{this} deals 3 damage to any target
Hellbent " + "— {this} deals 5 damage instead if you have no cards in hand." )); diff --git a/Mage.Sets/src/mage/cards/f/FirecannonBlast.java b/Mage.Sets/src/mage/cards/f/FirecannonBlast.java index 5f387877be..ae1daf3461 100644 --- a/Mage.Sets/src/mage/cards/f/FirecannonBlast.java +++ b/Mage.Sets/src/mage/cards/f/FirecannonBlast.java @@ -24,9 +24,9 @@ public final class FirecannonBlast extends CardImpl { // Firecannon Blast deals 3 damage to target creature. // Raid - Firecannon Blast deals 6 damage to that creature instead if you attacked with a creature this turn. this.getSpellAbility().addEffect(new ConditionalOneShotEffect( - new DamageTargetEffect(3), new DamageTargetEffect(6), - new InvertCondition(RaidCondition.instance), + new DamageTargetEffect(3), + RaidCondition.instance, "{this} deals 3 damage to target creature.
Raid — {this} deals 6 damage instead if you attacked with a creature this turn")); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addWatcher(new PlayerAttackedWatcher());