diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/GiveTake.java b/Mage.Sets/src/mage/sets/dragonsmaze/GiveTake.java index a92e5b014e..7d0625265f 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/GiveTake.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/GiveTake.java @@ -35,7 +35,6 @@ import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.abilities.keyword.FuseAbility; -import mage.cards.Card; import mage.cards.SplitCard; import mage.counters.CounterType; import mage.game.Game; @@ -51,24 +50,23 @@ 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}"); this.expansionSetCode = "DGM"; this.color.setGreen(true); this.color.setBlue(true); // Give - Card leftHalfCard = this.createLeftHalfCard("Give", "{2}{G}"); // Put three +1/+1 counters on target creature. - leftHalfCard.getSpellAbility().addEffect(new AddCountersTargetEffect(CounterType.P1P1.createInstance(3))); - leftHalfCard.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + getLeftHalfCard().getSpellAbility().addEffect(new AddCountersTargetEffect(CounterType.P1P1.createInstance(3))); + getLeftHalfCard().getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + getLeftHalfCard().getColor().setGreen(true); // Take - Card rightHalfCard = this.createRightHalfCard("Take", "{2}{U}"); // Remove all +1/+1 counters from target creature you control. Draw that many cards. - rightHalfCard.getSpellAbility().addEffect(new TakeEffect()); - rightHalfCard.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true)); - + 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())); diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/ReadyWilling.java b/Mage.Sets/src/mage/sets/dragonsmaze/ReadyWilling.java index 75e35457cd..80398fbd76 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/ReadyWilling.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/ReadyWilling.java @@ -32,8 +32,6 @@ import mage.Constants; import mage.Constants.CardType; import mage.Constants.Duration; import mage.Constants.Rarity; -import mage.MageInt; -import mage.ObjectColor; import mage.abilities.effects.Effect; import mage.abilities.effects.common.IndestructibleAllEffect; import mage.abilities.effects.common.UntapAllControllerEffect; @@ -41,11 +39,9 @@ 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.Card; import mage.cards.SplitCard; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; -import mage.game.permanent.token.Token; /** * @@ -54,7 +50,7 @@ import mage.game.permanent.token.Token; 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}"); this.expansionSetCode = "DGM"; this.color.setGreen(true); @@ -62,18 +58,20 @@ public class ReadyWilling extends SplitCard { this.color.setBlack(true); // Ready - Card leftHalfCard = this.createLeftHalfCard("Ready", "{1}{G}{W}"); // Creatures you control are indestructible this turn. Untap each creature you control. - leftHalfCard.getSpellAbility().addEffect(new IndestructibleAllEffect(new FilterControlledCreaturePermanent("Creatures you controll"), Constants.Duration.EndOfTurn)); - leftHalfCard.getSpellAbility().addEffect(new UntapAllControllerEffect(new FilterControlledCreaturePermanent(),"Untap each creature you control")); + getLeftHalfCard().getColor().setGreen(true); + getLeftHalfCard().getColor().setWhite(true); + getLeftHalfCard().getSpellAbility().addEffect(new IndestructibleAllEffect(new FilterControlledCreaturePermanent("Creatures you controll"), Constants.Duration.EndOfTurn)); + getLeftHalfCard().getSpellAbility().addEffect(new UntapAllControllerEffect(new FilterControlledCreaturePermanent(),"Untap each creature you control")); // Willing - Card rightHalfCard = this.createRightHalfCard("Willing", "{1}{W}{B}"); // Creatures you control gain deathtouch and lifelink until end of turn. - rightHalfCard.getSpellAbility().addEffect(new GainAbilityControlledEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn, new FilterCreaturePermanent("Creatures")) ); + getRightHalfCard().getColor().setWhite(true); + getRightHalfCard().getColor().setBlack(true); + getRightHalfCard().getSpellAbility().addEffect(new GainAbilityControlledEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn, new FilterCreaturePermanent("Creatures")) ); Effect effect = new GainAbilityControlledEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn, new FilterCreaturePermanent("Creatures")); effect.setText("Creatures you control gain lifelink until end of turn."); - rightHalfCard.getSpellAbility().addEffect(effect); + 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())); @@ -88,17 +86,4 @@ public class ReadyWilling extends SplitCard { return new ReadyWilling(this); } - private class WeirdToken extends Token { - - private WeirdToken() { - super("Weird", "0/1 red Weird"); - cardType.add(Constants.CardType.CREATURE); - color = ObjectColor.RED; - subtype.add("Weird"); - power = new MageInt(0); - toughness = new MageInt(1); - } - - } - } diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/TurnBurn.java b/Mage.Sets/src/mage/sets/dragonsmaze/TurnBurn.java index 53b568f2e5..c5142c46e3 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/TurnBurn.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/TurnBurn.java @@ -39,7 +39,6 @@ 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.Card; import mage.cards.SplitCard; import mage.game.permanent.token.Token; import mage.target.common.TargetCreatureOrPlayer; @@ -52,26 +51,26 @@ 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}"); this.expansionSetCode = "DGM"; this.color.setBlue(true); this.color.setRed(true); // Turn - Card leftHalfCard = this.createLeftHalfCard("Turn", "{2}{U}"); // Target creature loses all abilities and becomes a 0/1 red Weird until end of turn. - leftHalfCard.getSpellAbility().addEffect(new LoseAllAbilitiesTargetEffect(Duration.EndOfTurn)); - leftHalfCard.getSpellAbility().addEffect(new BecomesCreatureTargetEffect(new WeirdToken(),null, Duration.EndOfTurn)); - leftHalfCard.getSpellAbility().addTarget(new TargetCreaturePermanent(true)); + getLeftHalfCard().getColor().setBlue(true); + getLeftHalfCard().getSpellAbility().addEffect(new LoseAllAbilitiesTargetEffect(Duration.EndOfTurn)); + getLeftHalfCard().getSpellAbility().addEffect(new BecomesCreatureTargetEffect(new WeirdToken(),null, Duration.EndOfTurn)); + getLeftHalfCard().getSpellAbility().addTarget(new TargetCreaturePermanent(true)); // Burn - Card rightHalfCard = this.createRightHalfCard("Burn", "{1}{R}"); // Burn deals 2 damage to target creature or player. + getRightHalfCard().getColor().setRed(true); Effect effect = new DamageTargetEffect(2); effect.setText("Burn deals 2 damage to target creature or player."); - rightHalfCard.getSpellAbility().addEffect(effect); - rightHalfCard.getSpellAbility().addTarget(new TargetCreatureOrPlayer(true)); + getRightHalfCard().getSpellAbility().addEffect(effect); + getRightHalfCard().getSpellAbility().addTarget(new TargetCreatureOrPlayer(true)); // Fuse (You may cast one or both halves of this card from your hand.) diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/WearTear.java b/Mage.Sets/src/mage/sets/dragonsmaze/WearTear.java index cbabbe1c69..e139546123 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/WearTear.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/WearTear.java @@ -32,7 +32,6 @@ import mage.Constants.CardType; import mage.Constants.Rarity; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.keyword.FuseAbility; -import mage.cards.Card; import mage.cards.SplitCard; import mage.filter.common.FilterEnchantment; import mage.target.Target; @@ -46,27 +45,27 @@ 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}"); this.expansionSetCode = "DGM"; this.color.setRed(true); this.color.setWhite(true); // Wear - Card leftHalfCard = this.createLeftHalfCard("Wear", "{1}{R}"); // Destroy target artifact. - leftHalfCard.getSpellAbility().addEffect(new DestroyTargetEffect()); + getLeftHalfCard().getColor().setRed(true); + getLeftHalfCard().getSpellAbility().addEffect(new DestroyTargetEffect()); Target target = new TargetArtifactPermanent(); target.setRequired(true); - leftHalfCard.getSpellAbility().addTarget(target); + getLeftHalfCard().getSpellAbility().addTarget(target); // Tear - Card rightHalfCard = this.createRightHalfCard("Tear", "{W}"); // Destroy target enchantment. - rightHalfCard.getSpellAbility().addEffect(new DestroyTargetEffect()); + getRightHalfCard().getColor().setWhite(true); + getRightHalfCard().getSpellAbility().addEffect(new DestroyTargetEffect()); target = new TargetPermanent(new FilterEnchantment()); target.setRequired(true); - rightHalfCard.getSpellAbility().addTarget(target); + getRightHalfCard().getSpellAbility().addTarget(target); // Fuse (You may cast one or both halves of this card from your hand.) diff --git a/Mage.Sets/src/mage/sets/invasion/AssaultBattery.java b/Mage.Sets/src/mage/sets/invasion/AssaultBattery.java index e191cd9d9e..620a2fa4f2 100644 --- a/Mage.Sets/src/mage/sets/invasion/AssaultBattery.java +++ b/Mage.Sets/src/mage/sets/invasion/AssaultBattery.java @@ -34,7 +34,6 @@ import mage.Constants.Rarity; import mage.abilities.effects.Effect; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.DamageTargetEffect; -import mage.cards.Card; import mage.cards.SplitCard; import mage.game.permanent.token.ElephantToken; import mage.target.common.TargetCreatureOrPlayer; @@ -48,24 +47,24 @@ 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}"); this.expansionSetCode = "INV"; this.color.setRed(true); this.color.setGreen(true); // Assault - Card leftHalfCard = this.createLeftHalfCard("Assault", "{R}"); // Assault deals 2 damage to target creature or player. + getLeftHalfCard().getColor().setRed(true); Effect effect = new DamageTargetEffect(2); effect.setText("Assault deals 2 damage to target creature or player"); - leftHalfCard.getSpellAbility().addEffect(effect); - leftHalfCard.getSpellAbility().addTarget(new TargetCreatureOrPlayer(true)); + getLeftHalfCard().getSpellAbility().addEffect(effect); + getLeftHalfCard().getSpellAbility().addTarget(new TargetCreatureOrPlayer(true)); // Battery - Card rightHalfCard = this.createRightHalfCard("Battery", "{3}{G}"); // Put a 3/3 green Elephant creature token onto the battlefield. - rightHalfCard.getSpellAbility().addEffect(new CreateTokenEffect(new ElephantToken())); + getRightHalfCard().getColor().setGreen(true); + getRightHalfCard().getSpellAbility().addEffect(new CreateTokenEffect(new ElephantToken())); }