github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 11:09:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

6079 - Fixing conditional damage order, conditions (#6080)

Browse source 
* 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 <fenhl@fenhl.net>
This commit is contained in:
James Fitzpatrick 2019-12-09 15:26:57 -05:00 committed by Jeff Wadsworth
parent 99c50d041a
commit b2e4e950d0
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Mage.Sets/src/mage/cards/b/BrimstoneVolley.java
View file

@ -1,5 +1,6 @@
package mage.cards.b; package mage.cards.b;
import mage.abilities.condition.common.MorbidCondition;
import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.decorator.ConditionalOneShotEffect;
import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.DamageTargetEffect;
import mage.cards.CardImpl; import mage.cards.CardImpl;
@ -8,7 +9,6 @@ import mage.constants.CardType;
import mage.target.common.TargetAnyTarget; import mage.target.common.TargetAnyTarget;
import mage.watchers.common.MorbidWatcher; import mage.watchers.common.MorbidWatcher;
import java.util.UUID; import java.util.UUID;
import mage.abilities.condition.common.MorbidCondition;
/** /**
* @author nantuko * @author nantuko
@ -21,9 +21,9 @@ public final class BrimstoneVolley extends CardImpl {
// Brimstone Volley deals 3 damage to any target. // Brimstone Volley deals 3 damage to any target.
// <i>Morbid</i> &mdash; Brimstone Volley deals 5 damage to that creature or player instead if a creature died this turn. // <i>Morbid</i> &mdash; Brimstone Volley deals 5 damage to that creature or player instead if a creature died this turn.
this.getSpellAbility().addEffect(new ConditionalOneShotEffect( this.getSpellAbility().addEffect(new ConditionalOneShotEffect(
new DamageTargetEffect(3), new DamageTargetEffect(5), MorbidCondition.instance, new DamageTargetEffect(5), new DamageTargetEffect(3), MorbidCondition.instance,
"{this} deals 3 damage to any target." "{this} deals 3 damage to any target." +
+ "<br><i>Morbid</i> &mdash; {this} deals 5 damage instead if a creature died this turn." "<br><i>Morbid</i> &mdash; {this} deals 5 damage instead if a creature died this turn."
)); ));
this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addTarget(new TargetAnyTarget());
this.getSpellAbility().addWatcher(new MorbidWatcher()); this.getSpellAbility().addWatcher(new MorbidWatcher());

2
Mage.Sets/src/mage/cards/c/CacklingFlames.java
View file

@ -21,7 +21,7 @@ public final class CacklingFlames extends CardImpl {
// Cackling Flames deals 3 damage to any target. // 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. // Hellbent - Cackling Flames deals 5 damage to that creature or player instead if you have no cards in hand.
this.getSpellAbility().addEffect(new ConditionalOneShotEffect( 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<br><i>Hellbent</i> " + "{this} deals 3 damage to any target<br><i>Hellbent</i> " +
"&mdash; {this} deals 5 damage instead if you have no cards in hand." "&mdash; {this} deals 5 damage instead if you have no cards in hand."
)); ));

4
Mage.Sets/src/mage/cards/f/FirecannonBlast.java
View file

@ -24,9 +24,9 @@ public final class FirecannonBlast extends CardImpl {
// Firecannon Blast deals 3 damage to target creature. // 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. // Raid - Firecannon Blast deals 6 damage to that creature instead if you attacked with a creature this turn.
this.getSpellAbility().addEffect(new ConditionalOneShotEffect( this.getSpellAbility().addEffect(new ConditionalOneShotEffect(
new DamageTargetEffect(3),
new DamageTargetEffect(6), new DamageTargetEffect(6),
new InvertCondition(RaidCondition.instance), new DamageTargetEffect(3),
RaidCondition.instance,
"{this} deals 3 damage to target creature.<br><i>Raid</i> &mdash; {this} deals 6 damage instead if you attacked with a creature this turn")); "{this} deals 3 damage to target creature.<br><i>Raid</i> &mdash; {this} deals 6 damage instead if you attacked with a creature this turn"));
this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addTarget(new TargetCreaturePermanent());
this.getSpellAbility().addWatcher(new PlayerAttackedWatcher()); this.getSpellAbility().addWatcher(new PlayerAttackedWatcher());