From ffa735366e51946604e873ff28aa925bff3d7190 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sun, 18 Mar 2018 16:03:52 +0100 Subject: [PATCH] Some code cleanup for using DevoidAbility. --- Mage.Sets/src/mage/cards/a/AdverseConditions.java | 5 +---- Mage.Sets/src/mage/cards/b/BrutalExpulsion.java | 8 +++----- Mage.Sets/src/mage/cards/c/CallTheScions.java | 8 +++----- Mage.Sets/src/mage/cards/c/CompleteDisregard.java | 7 ++----- Mage.Sets/src/mage/cards/c/CrumbleToDust.java | 7 ++----- Mage.Sets/src/mage/cards/g/GraveBirthing.java | 7 +++---- Mage.Sets/src/mage/cards/g/GripOfDesolation.java | 8 +++----- Mage.Sets/src/mage/cards/h/HorriblyAwry.java | 10 ++++------ Mage.Sets/src/mage/cards/p/ProcessorAssault.java | 7 ++----- Mage.Sets/src/mage/cards/s/SerpentineSpike.java | 7 +++---- Mage.Sets/src/mage/cards/s/SilentSkimmer.java | 8 +++----- Mage.Sets/src/mage/cards/s/SludgeCrawler.java | 10 ++++------ Mage.Sets/src/mage/cards/s/SpellShrivel.java | 7 +++---- Mage.Sets/src/mage/cards/s/SwarmSurge.java | 7 ++----- Mage.Sets/src/mage/cards/t/TouchOfTheVoid.java | 8 +++----- Mage.Sets/src/mage/cards/t/TransgressTheMind.java | 7 ++----- Mage.Sets/src/mage/cards/t/TurnAgainst.java | 8 +++----- Mage.Sets/src/mage/cards/u/UnnaturalAggression.java | 6 ++---- 18 files changed, 48 insertions(+), 87 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/AdverseConditions.java b/Mage.Sets/src/mage/cards/a/AdverseConditions.java index bbb6f28945f..42706bd045c 100644 --- a/Mage.Sets/src/mage/cards/a/AdverseConditions.java +++ b/Mage.Sets/src/mage/cards/a/AdverseConditions.java @@ -28,7 +28,6 @@ package mage.cards.a; import java.util.UUID; -import mage.abilities.Ability; import mage.abilities.effects.Effect; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.DontUntapInControllersNextUntapStepTargetEffect; @@ -50,9 +49,7 @@ public class AdverseConditions extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{3}{U}"); // Devoid - Ability ability = new DevoidAbility(this.color); - ability.setRuleAtTheTop(true); - this.addAbility(ability); + this.addAbility(new DevoidAbility(this.color)); // Tap up to two target creatures. Those creatures don't untap during their controller's next untap step. this.getSpellAbility().addEffect(new TapTargetEffect()); diff --git a/Mage.Sets/src/mage/cards/b/BrutalExpulsion.java b/Mage.Sets/src/mage/cards/b/BrutalExpulsion.java index bb80f96cab9..dd256d21231 100644 --- a/Mage.Sets/src/mage/cards/b/BrutalExpulsion.java +++ b/Mage.Sets/src/mage/cards/b/BrutalExpulsion.java @@ -28,7 +28,6 @@ package mage.cards.b; import java.util.UUID; -import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; @@ -58,12 +57,11 @@ public class BrutalExpulsion extends CardImpl { } public BrutalExpulsion(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{U}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{U}{R}"); // Devoid - Ability ability = new DevoidAbility(this.color); - ability.setRuleAtTheTop(true); - this.addAbility(ability); + this.addAbility(new DevoidAbility(this.color)); + // Choose one or both this.getSpellAbility().getModes().setMinModes(1); this.getSpellAbility().getModes().setMaxModes(2); diff --git a/Mage.Sets/src/mage/cards/c/CallTheScions.java b/Mage.Sets/src/mage/cards/c/CallTheScions.java index 1801eae114e..f5648fe8d34 100644 --- a/Mage.Sets/src/mage/cards/c/CallTheScions.java +++ b/Mage.Sets/src/mage/cards/c/CallTheScions.java @@ -28,7 +28,6 @@ package mage.cards.c; import java.util.UUID; -import mage.abilities.Ability; import mage.abilities.effects.Effect; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.DevoidAbility; @@ -44,12 +43,11 @@ import mage.game.permanent.token.EldraziScionToken; public class CallTheScions extends CardImpl { public CallTheScions(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{G}"); + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{G}"); // Devoid - Ability ability = new DevoidAbility(this.color); - ability.setRuleAtTheTop(true); - this.addAbility(ability); + this.addAbility(new DevoidAbility(this.color)); + // Create two 1/1 colorless Eldrazi Scion creature tokens. They have "Sacrifice this creature: add {C} to your mana pool." Effect effect = new CreateTokenEffect(new EldraziScionToken(), 2); effect.setText("create two 1/1 colorless Eldrazi Scion creature tokens. They have \"Sacrifice this creature: Add {C} to your mana pool.\""); diff --git a/Mage.Sets/src/mage/cards/c/CompleteDisregard.java b/Mage.Sets/src/mage/cards/c/CompleteDisregard.java index df7f72c6132..ee384dd0658 100644 --- a/Mage.Sets/src/mage/cards/c/CompleteDisregard.java +++ b/Mage.Sets/src/mage/cards/c/CompleteDisregard.java @@ -28,7 +28,6 @@ package mage.cards.c; import java.util.UUID; -import mage.abilities.Ability; import mage.abilities.effects.common.ExileTargetEffect; import mage.abilities.keyword.DevoidAbility; import mage.cards.CardImpl; @@ -52,12 +51,10 @@ public class CompleteDisregard extends CardImpl { } public CompleteDisregard(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{B}"); // Devoid - Ability ability = new DevoidAbility(this.color); - ability.setRuleAtTheTop(true); - this.addAbility(ability); + this.addAbility(new DevoidAbility(this.color)); // Exile target creature with power 3 or less. this.getSpellAbility().addEffect(new ExileTargetEffect()); diff --git a/Mage.Sets/src/mage/cards/c/CrumbleToDust.java b/Mage.Sets/src/mage/cards/c/CrumbleToDust.java index 18ac2ff2329..dbe9cb9b5f8 100644 --- a/Mage.Sets/src/mage/cards/c/CrumbleToDust.java +++ b/Mage.Sets/src/mage/cards/c/CrumbleToDust.java @@ -28,7 +28,6 @@ package mage.cards.c; import java.util.UUID; -import mage.abilities.Ability; import mage.abilities.effects.common.ExileTargetAndSearchGraveyardHandLibraryEffect; import mage.abilities.keyword.DevoidAbility; import mage.cards.CardImpl; @@ -43,12 +42,10 @@ import mage.target.common.TargetNonBasicLandPermanent; public class CrumbleToDust extends CardImpl { public CrumbleToDust(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{R}"); // Devoid - Ability ability = new DevoidAbility(this.color); - ability.setRuleAtTheTop(true); - this.addAbility(ability); + this.addAbility(new DevoidAbility(this.color)); // Exile target nonbasic land. Search its controller's graveyard, hand, and library for any number of cards with the same name as that land and exile them. Then that player shuffles his or her library. this.getSpellAbility().addTarget(new TargetNonBasicLandPermanent()); diff --git a/Mage.Sets/src/mage/cards/g/GraveBirthing.java b/Mage.Sets/src/mage/cards/g/GraveBirthing.java index cd8c0849028..20691bfe40f 100644 --- a/Mage.Sets/src/mage/cards/g/GraveBirthing.java +++ b/Mage.Sets/src/mage/cards/g/GraveBirthing.java @@ -54,12 +54,11 @@ import mage.target.common.TargetOpponent; public class GraveBirthing extends CardImpl { public GraveBirthing(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{B}"); // Devoid - Ability ability = new DevoidAbility(this.color); - ability.setRuleAtTheTop(true); - this.addAbility(ability); + this.addAbility(new DevoidAbility(this.color)); + // Target opponent exiles a card from his or her graveyard. You create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C} to your mana pool." this.getSpellAbility().addEffect(new GraveBirthingEffect()); this.getSpellAbility().addTarget(new TargetOpponent()); diff --git a/Mage.Sets/src/mage/cards/g/GripOfDesolation.java b/Mage.Sets/src/mage/cards/g/GripOfDesolation.java index 74c1ab19377..4c1855923de 100644 --- a/Mage.Sets/src/mage/cards/g/GripOfDesolation.java +++ b/Mage.Sets/src/mage/cards/g/GripOfDesolation.java @@ -28,7 +28,6 @@ package mage.cards.g; import java.util.UUID; -import mage.abilities.Ability; import mage.abilities.effects.Effect; import mage.abilities.effects.common.ExileTargetEffect; import mage.abilities.keyword.DevoidAbility; @@ -46,12 +45,11 @@ import mage.target.targetpointer.SecondTargetPointer; public class GripOfDesolation extends CardImpl { public GripOfDesolation(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{4}{B}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{4}{B}{B}"); // Devoid - Ability ability = new DevoidAbility(this.color); - ability.setRuleAtTheTop(true); - this.addAbility(ability); + this.addAbility(new DevoidAbility(this.color)); + // Exile target creature and target land. this.getSpellAbility().addEffect(new ExileTargetEffect()); this.getSpellAbility().addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/h/HorriblyAwry.java b/Mage.Sets/src/mage/cards/h/HorriblyAwry.java index f600cdfe39e..fa4414bd392 100644 --- a/Mage.Sets/src/mage/cards/h/HorriblyAwry.java +++ b/Mage.Sets/src/mage/cards/h/HorriblyAwry.java @@ -28,7 +28,6 @@ package mage.cards.h; import java.util.UUID; -import mage.abilities.Ability; import mage.abilities.effects.common.CounterTargetWithReplacementEffect; import mage.abilities.keyword.DevoidAbility; import mage.cards.CardImpl; @@ -53,12 +52,11 @@ public class HorriblyAwry extends CardImpl { } public HorriblyAwry(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{U}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{U}"); + + // Devoid (This card has no color.) + this.addAbility(new DevoidAbility(this.color)); - // Devoid - Ability ability = new DevoidAbility(this.color); - ability.setRuleAtTheTop(true); - this.addAbility(ability); // Counter target creature spell with converted mana cost 4 or less. If that spell is countered this way, exile it instead of putting it into its owner's graveyard. this.getSpellAbility().addEffect(new CounterTargetWithReplacementEffect(Zone.EXILED)); this.getSpellAbility().addTarget(new TargetSpell(filter)); diff --git a/Mage.Sets/src/mage/cards/p/ProcessorAssault.java b/Mage.Sets/src/mage/cards/p/ProcessorAssault.java index 0838a611f9b..fc35706b2f7 100644 --- a/Mage.Sets/src/mage/cards/p/ProcessorAssault.java +++ b/Mage.Sets/src/mage/cards/p/ProcessorAssault.java @@ -28,7 +28,6 @@ package mage.cards.p; import java.util.UUID; -import mage.abilities.Ability; import mage.abilities.costs.common.ExileOpponentsCardFromExileToGraveyardCost; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.keyword.DevoidAbility; @@ -44,12 +43,10 @@ import mage.target.common.TargetCreaturePermanent; public class ProcessorAssault extends CardImpl { public ProcessorAssault(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{1}{R}"); // Devoid - Ability ability = new DevoidAbility(this.color); - ability.setRuleAtTheTop(true); - this.addAbility(ability); + this.addAbility(new DevoidAbility(this.color)); // As an additional cost to cast Processor Assault, put a card an opponent owns from exile into its owner's graveyard. this.getSpellAbility().addCost(new ExileOpponentsCardFromExileToGraveyardCost(false)); diff --git a/Mage.Sets/src/mage/cards/s/SerpentineSpike.java b/Mage.Sets/src/mage/cards/s/SerpentineSpike.java index d82ca15dc38..9351038614a 100644 --- a/Mage.Sets/src/mage/cards/s/SerpentineSpike.java +++ b/Mage.Sets/src/mage/cards/s/SerpentineSpike.java @@ -52,12 +52,11 @@ import mage.watchers.common.DamagedByWatcher; public class SerpentineSpike extends CardImpl { public SerpentineSpike(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{5}{R}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{5}{R}{R}"); // Devoid - Ability ability = new DevoidAbility(this.color); - ability.setRuleAtTheTop(true); - this.addAbility(ability); + this.addAbility(new DevoidAbility(this.color)); + // Serpentine Spike deals 2 damage to target creature, 3 damage to another target creature, and 4 damage to a third target creature. If a creature dealt damage this way would die this turn, exile it instead. this.getSpellAbility().addEffect(new SerpentineSpikeEffect()); diff --git a/Mage.Sets/src/mage/cards/s/SilentSkimmer.java b/Mage.Sets/src/mage/cards/s/SilentSkimmer.java index 90530c50773..a50fff2b23c 100644 --- a/Mage.Sets/src/mage/cards/s/SilentSkimmer.java +++ b/Mage.Sets/src/mage/cards/s/SilentSkimmer.java @@ -29,7 +29,6 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; -import mage.abilities.Ability; import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.effects.common.LoseLifeDefendingPlayerEffect; import mage.abilities.keyword.DevoidAbility; @@ -46,16 +45,15 @@ import mage.constants.SubType; public class SilentSkimmer extends CardImpl { public SilentSkimmer(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}"); this.subtype.add(SubType.ELDRAZI); this.subtype.add(SubType.DRONE); this.power = new MageInt(0); this.toughness = new MageInt(4); // Devoid - Ability ability = new DevoidAbility(this.color); - ability.setRuleAtTheTop(true); - this.addAbility(ability); + this.addAbility(new DevoidAbility(this.color)); + // Flying this.addAbility(FlyingAbility.getInstance()); // Whenever Silent Skimmer attacks, defending player loses 2 life. diff --git a/Mage.Sets/src/mage/cards/s/SludgeCrawler.java b/Mage.Sets/src/mage/cards/s/SludgeCrawler.java index b2ee3a43f32..bcd3ee44c78 100644 --- a/Mage.Sets/src/mage/cards/s/SludgeCrawler.java +++ b/Mage.Sets/src/mage/cards/s/SludgeCrawler.java @@ -29,7 +29,6 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; -import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continuous.BoostSourceEffect; @@ -38,8 +37,8 @@ import mage.abilities.keyword.IngestAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.Duration; +import mage.constants.SubType; import mage.constants.Zone; /** @@ -49,16 +48,15 @@ import mage.constants.Zone; public class SludgeCrawler extends CardImpl { public SludgeCrawler(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{B}"); this.subtype.add(SubType.ELDRAZI); this.subtype.add(SubType.DRONE); this.power = new MageInt(1); this.toughness = new MageInt(1); // Devoid - Ability ability = new DevoidAbility(this.color); - ability.setRuleAtTheTop(true); - this.addAbility(ability); + this.addAbility(new DevoidAbility(this.color)); + // Ingest this.addAbility(new IngestAbility()); // {2}: Sludge Crawler gets +1/+1 until end of turn. diff --git a/Mage.Sets/src/mage/cards/s/SpellShrivel.java b/Mage.Sets/src/mage/cards/s/SpellShrivel.java index 257803cca95..67d2cbc9478 100644 --- a/Mage.Sets/src/mage/cards/s/SpellShrivel.java +++ b/Mage.Sets/src/mage/cards/s/SpellShrivel.java @@ -53,12 +53,11 @@ import mage.target.TargetSpell; public class SpellShrivel extends CardImpl { public SpellShrivel(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{U}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{U}"); // Devoid - Ability ability = new DevoidAbility(this.color); - ability.setRuleAtTheTop(true); - this.addAbility(ability); + this.addAbility(new DevoidAbility(this.color)); + // Counter target spell unless its controller pays {4}. If that spell is countered this way, exile it instead of putting it into its owner's graveyard. this.getSpellAbility().addEffect(new SpellShrivelCounterUnlessPaysEffect()); this.getSpellAbility().addTarget(new TargetSpell()); diff --git a/Mage.Sets/src/mage/cards/s/SwarmSurge.java b/Mage.Sets/src/mage/cards/s/SwarmSurge.java index 2680c9e38ad..59c62f87915 100644 --- a/Mage.Sets/src/mage/cards/s/SwarmSurge.java +++ b/Mage.Sets/src/mage/cards/s/SwarmSurge.java @@ -28,7 +28,6 @@ package mage.cards.s; import java.util.UUID; -import mage.abilities.Ability; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; @@ -54,12 +53,10 @@ public class SwarmSurge extends CardImpl { } public SwarmSurge(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{B}"); // Devoid - Ability ability = new DevoidAbility(this.color); - ability.setRuleAtTheTop(true); - this.addAbility(ability); + this.addAbility(new DevoidAbility(this.color)); // Creatures you control get +2/+0 until end of turn. this.getSpellAbility().addEffect(new BoostControlledEffect(2, 0, Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/cards/t/TouchOfTheVoid.java b/Mage.Sets/src/mage/cards/t/TouchOfTheVoid.java index 425814f826a..e8902478111 100644 --- a/Mage.Sets/src/mage/cards/t/TouchOfTheVoid.java +++ b/Mage.Sets/src/mage/cards/t/TouchOfTheVoid.java @@ -28,7 +28,6 @@ package mage.cards.t; import java.util.UUID; -import mage.abilities.Ability; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.replacement.DealtDamageToCreatureBySourceDies; @@ -47,12 +46,11 @@ import mage.watchers.common.DamagedByWatcher; public class TouchOfTheVoid extends CardImpl { public TouchOfTheVoid(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{R}"); // Devoid - Ability ability = new DevoidAbility(this.color); - ability.setRuleAtTheTop(true); - this.addAbility(ability); + this.addAbility(new DevoidAbility(this.color)); + // Touch of the Void deals 3 damage to target creature or player. If a creature dealt damage this way would die this turn, exile it instead. this.getSpellAbility().addEffect(new DamageTargetEffect(3)); this.getSpellAbility().addTarget(new TargetCreatureOrPlayer()); diff --git a/Mage.Sets/src/mage/cards/t/TransgressTheMind.java b/Mage.Sets/src/mage/cards/t/TransgressTheMind.java index f926337c4c8..371a475bef8 100644 --- a/Mage.Sets/src/mage/cards/t/TransgressTheMind.java +++ b/Mage.Sets/src/mage/cards/t/TransgressTheMind.java @@ -28,7 +28,6 @@ package mage.cards.t; import java.util.UUID; -import mage.abilities.Ability; import mage.abilities.effects.Effect; import mage.abilities.effects.common.ExileCardYouChooseTargetOpponentEffect; import mage.abilities.keyword.DevoidAbility; @@ -53,12 +52,10 @@ public class TransgressTheMind extends CardImpl { } public TransgressTheMind(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{1}{B}"); // Devoid - Ability ability = new DevoidAbility(this.color); - ability.setRuleAtTheTop(true); - this.addAbility(ability); + this.addAbility(new DevoidAbility(this.color)); // Target player reveals his or her hand. You may choose a card from it with converted mana cost 3 or greater and exile that card. Effect effect = new ExileCardYouChooseTargetOpponentEffect(filter); diff --git a/Mage.Sets/src/mage/cards/t/TurnAgainst.java b/Mage.Sets/src/mage/cards/t/TurnAgainst.java index 5e4fafba19b..28669249c3c 100644 --- a/Mage.Sets/src/mage/cards/t/TurnAgainst.java +++ b/Mage.Sets/src/mage/cards/t/TurnAgainst.java @@ -28,7 +28,6 @@ package mage.cards.t; import java.util.UUID; -import mage.abilities.Ability; import mage.abilities.effects.common.UntapTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.effects.common.continuous.GainControlTargetEffect; @@ -47,12 +46,11 @@ import mage.target.common.TargetCreaturePermanent; public class TurnAgainst extends CardImpl { public TurnAgainst(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{4}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{4}{R}"); // Devoid - Ability ability = new DevoidAbility(this.color); - ability.setRuleAtTheTop(true); - this.addAbility(ability); + this.addAbility(new DevoidAbility(this.color)); + // Gain control of target creature until end of turn. Untap that creature. It gains haste until end of turn. this.getSpellAbility().addTarget(new TargetCreaturePermanent()); this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn)); diff --git a/Mage.Sets/src/mage/cards/u/UnnaturalAggression.java b/Mage.Sets/src/mage/cards/u/UnnaturalAggression.java index ae1db4572ea..db4508096e2 100644 --- a/Mage.Sets/src/mage/cards/u/UnnaturalAggression.java +++ b/Mage.Sets/src/mage/cards/u/UnnaturalAggression.java @@ -28,7 +28,6 @@ package mage.cards.u; import java.util.UUID; -import mage.abilities.Ability; import mage.abilities.effects.Effect; import mage.abilities.effects.common.ExileTargetIfDiesEffect; import mage.abilities.effects.common.FightTargetsEffect; @@ -59,9 +58,8 @@ public class UnnaturalAggression extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{G}"); // Devoid - Ability ability = new DevoidAbility(this.color); - ability.setRuleAtTheTop(true); - this.addAbility(ability); + this.addAbility(new DevoidAbility(this.color)); + // Target creature you control fights target creature an opponent controls. this.getSpellAbility().addEffect(new FightTargetsEffect()); this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent());