From ff3cea49f859d29a4f08ae8bda7dc7f5bf95e1d0 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Tue, 7 May 2013 00:45:23 +0200 Subject: [PATCH] Small change to definition of split cards. --- Mage.Sets/src/mage/sets/dragonsmaze/AliveWell.java | 6 +----- Mage.Sets/src/mage/sets/dragonsmaze/ArmedDangerous.java | 5 +---- Mage.Sets/src/mage/sets/dragonsmaze/BeckCall.java | 6 +----- Mage.Sets/src/mage/sets/dragonsmaze/BreakingEntering.java | 6 +----- Mage.Sets/src/mage/sets/dragonsmaze/GiveTake.java | 6 +----- Mage.Sets/src/mage/sets/dragonsmaze/ReadyWilling.java | 5 +---- Mage.Sets/src/mage/sets/dragonsmaze/TurnBurn.java | 6 +----- Mage.Sets/src/mage/sets/dragonsmaze/WearTear.java | 7 +------ Mage.Sets/src/mage/sets/invasion/AssaultBattery.java | 2 +- 9 files changed, 9 insertions(+), 40 deletions(-) diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/AliveWell.java b/Mage.Sets/src/mage/sets/dragonsmaze/AliveWell.java index 042b8e7f0b..b855477eb8 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/AliveWell.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/AliveWell.java @@ -34,7 +34,6 @@ import mage.Constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.CreateTokenEffect; -import mage.abilities.keyword.FuseAbility; import mage.cards.SplitCard; import mage.filter.common.FilterControlledCreaturePermanent; import mage.game.Game; @@ -48,7 +47,7 @@ import mage.players.Player; public class AliveWell extends SplitCard { public AliveWell(UUID ownerId) { - super(ownerId, 121, "Alive", "Well", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{G}","{W}"); + super(ownerId, 121, "Alive", "Well", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{G}","{W}", true); this.expansionSetCode = "DGM"; this.color.setGreen(true); @@ -65,9 +64,6 @@ public class AliveWell extends SplitCard { getRightHalfCard().getColor().setWhite(true); getRightHalfCard().getSpellAbility().addEffect(new WellEffect()); - - // Fuse (You may cast one or both halves of this card from your hand.) - this.addAbility(new FuseAbility(this, this.getManaCost())); } public AliveWell(final AliveWell card) { diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/ArmedDangerous.java b/Mage.Sets/src/mage/sets/dragonsmaze/ArmedDangerous.java index ab8092fafa..65637794e2 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/ArmedDangerous.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/ArmedDangerous.java @@ -38,7 +38,6 @@ import mage.abilities.effects.common.MustBlockSourceEffect; import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.keyword.DoubleStrikeAbility; -import mage.abilities.keyword.FuseAbility; import mage.cards.SplitCard; import mage.target.common.TargetCreaturePermanent; @@ -51,7 +50,7 @@ import mage.target.common.TargetCreaturePermanent; public class ArmedDangerous extends SplitCard { public ArmedDangerous(UUID ownerId) { - super(ownerId, 122, "Armed", "Dangerous", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{R}", "{3}{G}"); + super(ownerId, 122, "Armed", "Dangerous", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{R}", "{3}{G}", true); this.expansionSetCode = "DGM"; this.color.setRed(true); @@ -70,8 +69,6 @@ public class ArmedDangerous extends SplitCard { getRightHalfCard().getSpellAbility().addEffect(new GainAbilityTargetEffect(new SimpleStaticAbility(Zone.BATTLEFIELD, new MustBlockSourceEffect()), Duration.EndOfTurn)); getRightHalfCard().getSpellAbility().addTarget(new TargetCreaturePermanent(true)); - // Fuse (You may cast one or both halves of this card from your hand.) - this.addAbility(new FuseAbility(this, this.getManaCost())); } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/BeckCall.java b/Mage.Sets/src/mage/sets/dragonsmaze/BeckCall.java index 9ed55f95cc..ed67f11561 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/BeckCall.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/BeckCall.java @@ -36,7 +36,6 @@ import mage.abilities.DelayedTriggeredAbility; import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.DrawCardControllerEffect; -import mage.abilities.keyword.FuseAbility; import mage.cards.SplitCard; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; @@ -52,7 +51,7 @@ import mage.game.permanent.Permanent; public class BeckCall extends SplitCard { public BeckCall(UUID ownerId) { - super(ownerId, 123, "Beck", "Call", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{G}{U}", "{4}{W}{U}"); + super(ownerId, 123, "Beck", "Call", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{G}{U}", "{4}{W}{U}", true); this.expansionSetCode = "DGM"; this.color.setWhite(true); @@ -71,9 +70,6 @@ public class BeckCall extends SplitCard { getRightHalfCard().getColor().setBlue(true); getRightHalfCard().getSpellAbility().addEffect(new CreateTokenEffect(new BirdToken(),4)); - // Fuse (You may cast one or both halves of this card from your hand.) - this.addAbility(new FuseAbility(this, this.getManaCost())); - } public BeckCall(final BeckCall card) { diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/BreakingEntering.java b/Mage.Sets/src/mage/sets/dragonsmaze/BreakingEntering.java index e1ac2c5046..45eab3b734 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/BreakingEntering.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/BreakingEntering.java @@ -39,7 +39,6 @@ import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.PutTopCardOfTargetPlayerLibraryIntoGraveEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; -import mage.abilities.keyword.FuseAbility; import mage.abilities.keyword.HasteAbility; import mage.cards.Card; import mage.cards.SplitCard; @@ -60,7 +59,7 @@ import mage.target.targetpointer.FixedTarget; public class BreakingEntering extends SplitCard { public BreakingEntering(UUID ownerId) { - super(ownerId, 124, "Breaking", "Entering", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{U}{B}", "{4}{U}{B}"); + super(ownerId, 124, "Breaking", "Entering", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{U}{B}", "{4}{U}{B}", true); this.expansionSetCode = "DGM"; this.color.setBlue(true); @@ -79,9 +78,6 @@ public class BreakingEntering extends SplitCard { getRightHalfCard().getColor().setBlack(true); getRightHalfCard().getSpellAbility().addEffect(new EnteringReturnFromGraveyardToBattlefieldEffect()); - // Fuse (You may cast one or both halves of this card from your hand.) - this.addAbility(new FuseAbility(this, this.getManaCost())); - } public BreakingEntering(final BreakingEntering card) { diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/GiveTake.java b/Mage.Sets/src/mage/sets/dragonsmaze/GiveTake.java index 7d0625265f..ba258db398 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/GiveTake.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/GiveTake.java @@ -34,7 +34,6 @@ import mage.Constants.Rarity; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; -import mage.abilities.keyword.FuseAbility; import mage.cards.SplitCard; import mage.counters.CounterType; import mage.game.Game; @@ -50,7 +49,7 @@ import mage.target.common.TargetCreaturePermanent; public class GiveTake extends SplitCard { public GiveTake(UUID ownerId) { - super(ownerId, 129, "Give", "Take", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{G}","{2}{U}"); + super(ownerId, 129, "Give", "Take", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{G}","{2}{U}", true); this.expansionSetCode = "DGM"; this.color.setGreen(true); @@ -67,9 +66,6 @@ public class GiveTake extends SplitCard { getRightHalfCard().getSpellAbility().addEffect(new TakeEffect()); getRightHalfCard().getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); getLeftHalfCard().getColor().setBlue(true); - - // Fuse (You may cast one or both halves of this card from your hand.) - this.addAbility(new FuseAbility(this, this.getManaCost())); } public GiveTake(final GiveTake card) { diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/ReadyWilling.java b/Mage.Sets/src/mage/sets/dragonsmaze/ReadyWilling.java index 80398fbd76..8638bf6d4f 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/ReadyWilling.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/ReadyWilling.java @@ -37,7 +37,6 @@ import mage.abilities.effects.common.IndestructibleAllEffect; import mage.abilities.effects.common.UntapAllControllerEffect; import mage.abilities.effects.common.continious.GainAbilityControlledEffect; import mage.abilities.keyword.DeathtouchAbility; -import mage.abilities.keyword.FuseAbility; import mage.abilities.keyword.LifelinkAbility; import mage.cards.SplitCard; import mage.filter.common.FilterControlledCreaturePermanent; @@ -50,7 +49,7 @@ import mage.filter.common.FilterCreaturePermanent; public class ReadyWilling extends SplitCard { public ReadyWilling(UUID ownerId) { - super(ownerId, 132, "Ready", "Willing", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{1}{G}{W}", "{1}{W}{B}"); + super(ownerId, 132, "Ready", "Willing", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{1}{G}{W}", "{1}{W}{B}", true); this.expansionSetCode = "DGM"; this.color.setGreen(true); @@ -73,8 +72,6 @@ public class ReadyWilling extends SplitCard { effect.setText("Creatures you control gain lifelink until end of turn."); getRightHalfCard().getSpellAbility().addEffect(effect); - // Fuse (You may cast one or both halves of this card from your hand.) - this.addAbility(new FuseAbility(this, this.getManaCost())); } public ReadyWilling(final ReadyWilling card) { diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/TurnBurn.java b/Mage.Sets/src/mage/sets/dragonsmaze/TurnBurn.java index c5142c46e3..21d9ba676c 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/TurnBurn.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/TurnBurn.java @@ -38,7 +38,6 @@ import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.continious.BecomesCreatureTargetEffect; import mage.abilities.effects.common.continious.LoseAllAbilitiesTargetEffect; -import mage.abilities.keyword.FuseAbility; import mage.cards.SplitCard; import mage.game.permanent.token.Token; import mage.target.common.TargetCreatureOrPlayer; @@ -51,7 +50,7 @@ import mage.target.common.TargetCreaturePermanent; public class TurnBurn extends SplitCard { public TurnBurn(UUID ownerId) { - super(ownerId, 134, "Turn", "Burn", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{U}", "{1}{R}"); + super(ownerId, 134, "Turn", "Burn", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{U}", "{1}{R}", true); this.expansionSetCode = "DGM"; this.color.setBlue(true); @@ -72,9 +71,6 @@ public class TurnBurn extends SplitCard { getRightHalfCard().getSpellAbility().addEffect(effect); getRightHalfCard().getSpellAbility().addTarget(new TargetCreatureOrPlayer(true)); - - // Fuse (You may cast one or both halves of this card from your hand.) - this.addAbility(new FuseAbility(this, this.getManaCost())); } public TurnBurn(final TurnBurn card) { diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/WearTear.java b/Mage.Sets/src/mage/sets/dragonsmaze/WearTear.java index e139546123..f1e7edca1a 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/WearTear.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/WearTear.java @@ -31,7 +31,6 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; -import mage.abilities.keyword.FuseAbility; import mage.cards.SplitCard; import mage.filter.common.FilterEnchantment; import mage.target.Target; @@ -45,7 +44,7 @@ import mage.target.common.TargetArtifactPermanent; public class WearTear extends SplitCard { public WearTear(UUID ownerId) { - super(ownerId, 135, "Wear", "Tear", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{R}", "{W}"); + super(ownerId, 135, "Wear", "Tear", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{R}", "{W}", true); this.expansionSetCode = "DGM"; this.color.setRed(true); @@ -66,10 +65,6 @@ public class WearTear extends SplitCard { target = new TargetPermanent(new FilterEnchantment()); target.setRequired(true); getRightHalfCard().getSpellAbility().addTarget(target); - - - // Fuse (You may cast one or both halves of this card from your hand.) - this.addAbility(new FuseAbility(this, this.getManaCost())); } public WearTear(final WearTear card) { diff --git a/Mage.Sets/src/mage/sets/invasion/AssaultBattery.java b/Mage.Sets/src/mage/sets/invasion/AssaultBattery.java index 620a2fa4f2..f7adce193f 100644 --- a/Mage.Sets/src/mage/sets/invasion/AssaultBattery.java +++ b/Mage.Sets/src/mage/sets/invasion/AssaultBattery.java @@ -47,7 +47,7 @@ import mage.target.common.TargetCreatureOrPlayer; public class AssaultBattery extends SplitCard { public AssaultBattery(UUID ownerId) { - super(ownerId, 295, "Assault", "Battery", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{R}", "{3}{G}"); + super(ownerId, 295, "Assault", "Battery", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{R}", "{3}{G}", false); this.expansionSetCode = "INV"; this.color.setRed(true);