From c921bcfa2b9300b27c243fbd34019374d917b8bb Mon Sep 17 00:00:00 2001 From: fireshoes Date: Tue, 3 Mar 2015 15:14:09 -0600 Subject: [PATCH] [DTK] Added Ojutai's Comman, Boltwing Marauder, Sunscorch Regent, and Necromaster Dragon. Minor fix to mtg-cards-data.txt --- .../dragonsoftarkir/BoltwingMarauder.java | 80 ++++++++++++++ .../dragonsoftarkir/NecromasterDragon.java | 76 +++++++++++++ .../sets/dragonsoftarkir/OjutaisCommand.java | 102 ++++++++++++++++++ .../sets/dragonsoftarkir/SunscorchRegent.java | 71 ++++++++++++ Utils/mtg-cards-data.txt | 2 +- 5 files changed, 330 insertions(+), 1 deletion(-) create mode 100644 Mage.Sets/src/mage/sets/dragonsoftarkir/BoltwingMarauder.java create mode 100644 Mage.Sets/src/mage/sets/dragonsoftarkir/NecromasterDragon.java create mode 100644 Mage.Sets/src/mage/sets/dragonsoftarkir/OjutaisCommand.java create mode 100644 Mage.Sets/src/mage/sets/dragonsoftarkir/SunscorchRegent.java diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/BoltwingMarauder.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/BoltwingMarauder.java new file mode 100644 index 00000000000..444c0eaca1e --- /dev/null +++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/BoltwingMarauder.java @@ -0,0 +1,80 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package mage.sets.dragonsoftarkir; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.Ability; +import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; +import mage.abilities.effects.common.continuous.BoostTargetEffect; +import mage.abilities.keyword.FlyingAbility; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; +import mage.filter.common.FilterControlledCreaturePermanent; +import mage.filter.predicate.permanent.AnotherPredicate; +import mage.target.common.TargetCreaturePermanent; + +/** + * + * @author fireshoes + */ +public class BoltwingMarauder extends CardImpl { + + private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another creature under your control"); + + static { + filter.add(new AnotherPredicate()); + } + + public BoltwingMarauder(UUID ownerId) { + super(ownerId, 214, "Boltwing Marauder", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{B}{R}"); + this.expansionSetCode = "DTK"; + this.subtype.add("Dragon"); + this.power = new MageInt(5); + this.toughness = new MageInt(4); + + // Flying + this.addAbility(FlyingAbility.getInstance()); + // Whenever another creature enters the battlefield under your control, target creature gets +2/+0 until end of turn. + Ability ability = new EntersBattlefieldAllTriggeredAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2,0, Duration.EndOfTurn),filter,false); + ability.addTarget(new TargetCreaturePermanent()); + this.addAbility(ability); + } + + public BoltwingMarauder(final BoltwingMarauder card) { + super(card); + } + + @Override + public BoltwingMarauder copy() { + return new BoltwingMarauder(this); + } +} diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/NecromasterDragon.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/NecromasterDragon.java new file mode 100644 index 00000000000..d3406349a08 --- /dev/null +++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/NecromasterDragon.java @@ -0,0 +1,76 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package mage.sets.dragonsoftarkir; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.Ability; +import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; +import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.effects.common.CreateTokenEffect; +import mage.abilities.effects.common.DoIfCostPaid; +import mage.abilities.effects.common.PutTopCardOfLibraryIntoGraveEachPlayerEffect; +import mage.abilities.keyword.FlyingAbility; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.game.permanent.token.ZombieToken; + +/** + * + * @author fireshoes + */ +public class NecromasterDragon extends CardImpl { + + public NecromasterDragon(UUID ownerId) { + super(ownerId, 226, "Necromaster Dragon", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{U}{B}"); + this.expansionSetCode = "DTK"; + this.subtype.add("Dragon"); + this.power = new MageInt(4); + this.toughness = new MageInt(4); + + // Flying + this.addAbility(FlyingAbility.getInstance()); + + // Whenever Necromaster Dragon deals combat damage to a player, you may pay {2}. If you do, put a 2/2 black Zombie creature token onto the battlefield and each opponent puts the top two cards of his or her library into his or her graveyard + Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility( + new DoIfCostPaid(new CreateTokenEffect(new ZombieToken(), 1), new ManaCostsImpl("{2}")), false); + ability.addEffect(new PutTopCardOfLibraryIntoGraveEachPlayerEffect(2, TargetController.OPPONENT)); + this.addAbility(ability); + } + + public NecromasterDragon(final NecromasterDragon card) { + super(card); + } + + @Override + public NecromasterDragon copy() { + return new NecromasterDragon(this); + } +} diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/OjutaisCommand.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/OjutaisCommand.java new file mode 100644 index 00000000000..ce26c04c59b --- /dev/null +++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/OjutaisCommand.java @@ -0,0 +1,102 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package mage.sets.dragonsoftarkir; + +import java.util.UUID; +import mage.abilities.Mode; +import mage.abilities.effects.common.CounterTargetEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; +import mage.abilities.effects.common.GainLifeEffect; +import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.filter.Filter; +import mage.filter.FilterCard; +import mage.filter.FilterSpell; +import mage.filter.common.FilterCreatureCard; +import mage.filter.predicate.mageobject.CardTypePredicate; +import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; +import mage.target.TargetSpell; +import mage.target.common.TargetCardInYourGraveyard; + +/** + * + * @author fireshoes + */ +public class OjutaisCommand extends CardImpl { + + private static final FilterCard filter = new FilterCreatureCard("creature card with converted mana cost 2 or less from your graveyard"); + static { + filter.add(new ConvertedManaCostPredicate(Filter.ComparisonType.LessThan, 3)); + } + + private static final FilterSpell filter2 = new FilterSpell("creature spell"); + + static { + filter2.add(new CardTypePredicate(CardType.CREATURE)); + } + + public OjutaisCommand(UUID ownerId) { + super(ownerId, 227, "Ojutai's Command", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{2}{W}{U}"); + this.expansionSetCode = "DTK"; + + // Choose two - + this.getSpellAbility().getModes().setMinModes(2); + this.getSpellAbility().getModes().setMaxModes(2); + + // Return target creature card with converted mana cost 2 or less from your graveyard to the battlefield; + this.getSpellAbility().getEffects().add(new ReturnFromGraveyardToBattlefieldTargetEffect()); + this.getSpellAbility().getTargets().add(new TargetCardInYourGraveyard(filter)); + + // or You gain 4 life; + Mode mode = new Mode(); + mode.getEffects().add(new GainLifeEffect(4)); + this.getSpellAbility().getModes().addMode(mode); + + // or Counter target creature spell; + mode = new Mode(); + mode.getTargets().add(new TargetSpell(filter2)); + mode.getEffects().add(new CounterTargetEffect()); + this.getSpellAbility().getModes().addMode(mode); + + // or Draw a card + mode = new Mode(); + mode.getEffects().add(new DrawCardSourceControllerEffect(1)); + this.getSpellAbility().getModes().addMode(mode); + } + + public OjutaisCommand(final OjutaisCommand card) { + super(card); + } + + @Override + public OjutaisCommand copy() { + return new OjutaisCommand(this); + } +} diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/SunscorchRegent.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/SunscorchRegent.java new file mode 100644 index 00000000000..25ea467de04 --- /dev/null +++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/SunscorchRegent.java @@ -0,0 +1,71 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package mage.sets.dragonsoftarkir; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.Ability; +import mage.abilities.common.SpellCastOpponentTriggeredAbility; +import mage.abilities.effects.common.GainLifeEffect; +import mage.abilities.effects.common.counter.AddCountersSourceEffect; +import mage.abilities.keyword.FlyingAbility; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.counters.CounterType; + +/** + * + * @author fireshoes + */ +public class SunscorchRegent extends CardImpl { + + public SunscorchRegent(UUID ownerId) { + super(ownerId, 41, "Sunscorch Regent", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{W}{W}"); + this.expansionSetCode = "DTK"; + this.subtype.add("Dragon"); + this.power = new MageInt(4); + this.toughness = new MageInt(3); + + // Flying + this.addAbility(FlyingAbility.getInstance()); + // Whenever an opponent casts a spell, put a +1/+1 counter on Sunscorch Regent and you gain 1 life. + Ability ability = new SpellCastOpponentTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false); + ability.addEffect(new GainLifeEffect(1)); + this.addAbility(ability); + } + + public SunscorchRegent(final SunscorchRegent card) { + super(card); + } + + @Override + public SunscorchRegent copy() { + return new SunscorchRegent(this); + } +} diff --git a/Utils/mtg-cards-data.txt b/Utils/mtg-cards-data.txt index 5a22dcf2ec2..7afe3bf106d 100644 --- a/Utils/mtg-cards-data.txt +++ b/Utils/mtg-cards-data.txt @@ -25591,6 +25591,6 @@ Arashin Sovereign|Dragons of Tarkir|212|R|{5}{G}{W}|Creature - Dragon|6|6|Flying Boltwing Marauder|Dragons of Tarkir|214|R|{3}{B}{R}|Creature - Dragon|5|4|Flying$Whenever another creature enters the battlefield under your control, target creature gets +2/+0 until end of turn.| Dragonlord Silumgar|Dragons of Tarkir|220|M|{4}{U}{B}|Legendary Creature - Elder Dragon|3|5|Flying$Deathtouch$When Dragonlord Silumgar enters the battlefield, gain control of target creature or planeswalker for as long as you control Dragonlord Silumgar.| Harbinger of the Hunt|Dragons of Tarkir|223|R|{3]{R}{G}|Creature - Dragon|5|3|Flying${2}{R}: Harbinger of the Hunt deals 1 damage to each creature without flying.${2}{G} Harbinger of the Hunt deals 1 damage to each other creature with flying.| -Necromaster Dragon|Dragons of Tarkir|226|R|{3}U}{B}|Creature - Dragon|4|4|Flying$Whenever Necromaster Dragon deals combat damage to a player, you may pay {2}. If you do, put a 2/2 black Zombie creature token onto the battlefield and each opponent puts the top two cards of his or her library into his or her graveyard.| +Necromaster Dragon|Dragons of Tarkir|226|R|{3}{U}{B}|Creature - Dragon|4|4|Flying$Whenever Necromaster Dragon deals combat damage to a player, you may pay {2}. If you do, put a 2/2 black Zombie creature token onto the battlefield and each opponent puts the top two cards of his or her library into his or her graveyard.| Ojutai's Command|Dragons of Tarkir|227|R|{2}{W}{U}|Instant|||Choose two - Return target creature card with converted mana cost 2 or less from your graveyard to the battlefield; or You gain 4 life; or Counter target creature spell; or Draw a card| Pristine Skywise|Dragons of Tarkir|228|R|{4}{W}{U}|Creature - Dragon|6|4|Flying$Whenever you cast a noncreature spell, untap Pristine Skywise. It gains protection from the color of your choice until the end of turn.| \ No newline at end of file