From e0fc49327cd8bef31e9b6a5a670174e8cf0d07d5 Mon Sep 17 00:00:00 2001 From: fireshoes Date: Mon, 9 Mar 2015 00:22:13 -0500 Subject: [PATCH] [DTK] Added Kolaghan's Command. Updated mtg-cards-data.txt. Added Tivadar of Thorn, Scourge of Kher Ridges, Fire Ants. --- .../dragonsoftarkir/KolaghansCommand.java | 98 +++++++++++++++++++ .../sets/futuresight/ScourgeOfKherRidges.java | 88 +++++++++++++++++ .../mage/sets/timespiral/TivadarOfThorn.java | 92 +++++++++++++++++ .../src/mage/sets/urzassaga/FireAnts.java | 78 +++++++++++++++ Utils/mtg-cards-data.txt | 3 +- 5 files changed, 358 insertions(+), 1 deletion(-) create mode 100644 Mage.Sets/src/mage/sets/dragonsoftarkir/KolaghansCommand.java create mode 100644 Mage.Sets/src/mage/sets/futuresight/ScourgeOfKherRidges.java create mode 100644 Mage.Sets/src/mage/sets/timespiral/TivadarOfThorn.java create mode 100644 Mage.Sets/src/mage/sets/urzassaga/FireAnts.java diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/KolaghansCommand.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/KolaghansCommand.java new file mode 100644 index 00000000000..2bd70c15d61 --- /dev/null +++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/KolaghansCommand.java @@ -0,0 +1,98 @@ +/* + * 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.DamageTargetEffect; +import mage.abilities.effects.common.DestroyTargetEffect; +import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect; +import mage.abilities.effects.common.discard.DiscardTargetEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.filter.FilterPermanent; +import mage.filter.common.FilterCreatureCard; +import mage.filter.predicate.mageobject.CardTypePredicate; +import mage.target.TargetPermanent; +import mage.target.TargetPlayer; +import mage.target.common.TargetCardInYourGraveyard; +import mage.target.common.TargetCreatureOrPlayer; + +/** + * + * @author fireshoes + */ +public class KolaghansCommand extends CardImpl { + + private static final FilterPermanent filter = new FilterPermanent("artifact"); + + static { + filter.add(new CardTypePredicate(CardType.ARTIFACT)); + } + + public KolaghansCommand(UUID ownerId) { + super(ownerId, 224, "Kolaghan's Command", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{1}{B}{R}"); + this.expansionSetCode = "DTK"; + + // Choose two - + this.getSpellAbility().getModes().setMinModes(2); + this.getSpellAbility().getModes().setMaxModes(2); + + // Return target creature card from your graveyard to your hand; + this.getSpellAbility().getEffects().add(new ReturnFromGraveyardToHandTargetEffect()); + this.getSpellAbility().getTargets().add(new TargetCardInYourGraveyard(1, new FilterCreatureCard("creature card from your graveyard"))); + + // or Target player discards a card; + Mode mode = new Mode(); + mode.getEffects().add(new DiscardTargetEffect(1)); + mode.getTargets().add(new TargetPlayer()); + this.getSpellAbility().getModes().addMode(mode); + + // or Destroy target artifact; + mode = new Mode(); + mode.getEffects().add(new DestroyTargetEffect()); + mode.getTargets().add(new TargetPermanent(filter)); + this.getSpellAbility().getModes().addMode(mode); + + // or Kolaghan's Command deals 2 damage to target creature or player. + mode = new Mode(); + mode.getEffects().add(new DamageTargetEffect(2)); + mode.getTargets().add(new TargetCreatureOrPlayer()); + this.getSpellAbility().getModes().addMode(mode); + } + + public KolaghansCommand(final KolaghansCommand card) { + super(card); + } + + @Override + public KolaghansCommand copy() { + return new KolaghansCommand(this); + } +} diff --git a/Mage.Sets/src/mage/sets/futuresight/ScourgeOfKherRidges.java b/Mage.Sets/src/mage/sets/futuresight/ScourgeOfKherRidges.java new file mode 100644 index 00000000000..69e004514b6 --- /dev/null +++ b/Mage.Sets/src/mage/sets/futuresight/ScourgeOfKherRidges.java @@ -0,0 +1,88 @@ +/* + * 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.futuresight; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.Ability; +import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.effects.common.DamageAllEffect; +import mage.abilities.keyword.FlyingAbility; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; +import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.Predicates; +import mage.filter.predicate.mageobject.AbilityPredicate; +import mage.filter.predicate.permanent.AnotherPredicate; + +/** + * + * @author fireshoes + */ +public class ScourgeOfKherRidges extends CardImpl { + + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature without flying"); + private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("other creature with flying"); + + static { + filter.add(Predicates.not(new AbilityPredicate(FlyingAbility.class))); + filter2.add(new AbilityPredicate(FlyingAbility.class)); + filter2.add(new AnotherPredicate()); + } + + public ScourgeOfKherRidges(UUID ownerId) { + super(ownerId, 107, "Scourge of Kher Ridges", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{6}{R}{R}"); + this.expansionSetCode = "FUT"; + this.subtype.add("Dragon"); + this.power = new MageInt(6); + this.toughness = new MageInt(6); + + // Flying + this.addAbility(FlyingAbility.getInstance()); + + // {1}{R}: Scourge of Kher Ridges deals 2 damage to each creature without flying. + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageAllEffect(2, filter), new ManaCostsImpl("{1}{R}")); + this.addAbility(ability); + + // {5}{R}: Scourge of Kher Ridges deals 6 damage to each other creature with flying. + Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageAllEffect(6, filter2), new ManaCostsImpl("{5}{R}")); + this.addAbility(ability2); + } + + public ScourgeOfKherRidges(final ScourgeOfKherRidges card) { + super(card); + } + + @Override + public ScourgeOfKherRidges copy() { + return new ScourgeOfKherRidges(this); + } +} diff --git a/Mage.Sets/src/mage/sets/timespiral/TivadarOfThorn.java b/Mage.Sets/src/mage/sets/timespiral/TivadarOfThorn.java new file mode 100644 index 00000000000..54ac271615d --- /dev/null +++ b/Mage.Sets/src/mage/sets/timespiral/TivadarOfThorn.java @@ -0,0 +1,92 @@ +/* + * 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.timespiral; + +import java.util.UUID; +import mage.MageInt; +import mage.ObjectColor; +import mage.abilities.Ability; +import mage.abilities.common.EntersBattlefieldTriggeredAbility; +import mage.abilities.effects.common.DestroyTargetEffect; +import mage.abilities.keyword.FirstStrikeAbility; +import mage.abilities.keyword.ProtectionAbility; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.filter.FilterCard; +import mage.filter.FilterPermanent; +import mage.filter.predicate.mageobject.ColorPredicate; +import mage.filter.predicate.mageobject.SubtypePredicate; +import mage.target.Target; +import mage.target.TargetPermanent; + +/** + * + * @author fireshoes + */ +public class TivadarOfThorn extends CardImpl { + + private static final FilterCard filter = new FilterCard("Red"); + private static final FilterPermanent filter2 = new FilterPermanent("Goblin"); + + static { + filter.add(new ColorPredicate(ObjectColor.RED)); + filter2.add(new SubtypePredicate("Goblin")); + } + + public TivadarOfThorn(UUID ownerId) { + super(ownerId, 44, "Tivadar of Thorn", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{W}{W}"); + this.expansionSetCode = "TSP"; + this.supertype.add("Legendary"); + this.subtype.add("Human"); + this.subtype.add("Knight"); + this.power = new MageInt(2); + this.toughness = new MageInt(2); + + // First strike + this.addAbility(FirstStrikeAbility.getInstance()); + + // protection from red + this.addAbility(new ProtectionAbility(filter)); + + // When Tivadar of Thorn enters the battlefield, destroy target Goblin. + Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(),false); + Target target = new TargetPermanent(filter2); + ability.addTarget(target); + this.addAbility(ability); + } + + public TivadarOfThorn(final TivadarOfThorn card) { + super(card); + } + + @Override + public TivadarOfThorn copy() { + return new TivadarOfThorn(this); + } +} diff --git a/Mage.Sets/src/mage/sets/urzassaga/FireAnts.java b/Mage.Sets/src/mage/sets/urzassaga/FireAnts.java new file mode 100644 index 00000000000..acbb031f2c7 --- /dev/null +++ b/Mage.Sets/src/mage/sets/urzassaga/FireAnts.java @@ -0,0 +1,78 @@ +/* + * 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.urzassaga; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.Ability; +import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.costs.common.TapSourceCost; +import mage.abilities.effects.common.DamageAllEffect; +import mage.abilities.keyword.FlyingAbility; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; +import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.Predicates; +import mage.filter.predicate.mageobject.AbilityPredicate; +import mage.filter.predicate.permanent.AnotherPredicate; + +/** + * + * @author fireshoes + */ +public class FireAnts extends CardImpl { + + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("each other creature without flying"); + + static { + filter.add(Predicates.not(new AbilityPredicate(FlyingAbility.class))); + filter.add(new AnotherPredicate()); + } + + public FireAnts(UUID ownerId) { + super(ownerId, 187, "Fire Ants", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{R}"); + this.expansionSetCode = "USG"; + this.subtype.add("Insect"); + this.power = new MageInt(2); + this.toughness = new MageInt(1); + + // {tap}: Fire Ants deals 1 damage to each other creature without flying. + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageAllEffect(1, filter), new TapSourceCost())); + } + + public FireAnts(final FireAnts card) { + super(card); + } + + @Override + public FireAnts copy() { + return new FireAnts(this); + } +} diff --git a/Utils/mtg-cards-data.txt b/Utils/mtg-cards-data.txt index a588bbc8c3d..eb4634e26a7 100644 --- a/Utils/mtg-cards-data.txt +++ b/Utils/mtg-cards-data.txt @@ -25724,7 +25724,8 @@ Dragonlord Kolaghan|Dragons of Tarkir|218|{4}{B}{R}|Legendary Creature - Elder D Dragonlord Ojutai|Dragons of Tarkir|219|M|{3}{W}{U}|Legendary Creature - Elder Dragon|5|4|Flying$Dragonlord Ojutai has hexproof as long as it's untapped.$Whenever Dragonlord Ojutai deals combat damage to a player, look at the top three cards of your library. Put one of them into your hand and the rest on the bottom of your library in any order.| 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.| Enduring Scalelord|Dragons of Tarkir|222|U|{4}{G}{W}|Creature - Dragon|4|4|Flying$Whenever one or more +1/+1 counters are place on another creature you control, you may put a +1/+1 counter on Enduring Scaleguard.| -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.| +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.| +Kolaghan's Command|Dragons of Tarkir|224|R|{1}{B}{R}|Instant|||Choose two - Return target creature card from your graveyard to your hand; or Target player discards a card; or Destroy target artifact; or Kolaghan's Command deals 2 damage to target creature or player.| Narset Transcendent|Dragons of Tarkir|225|M|{2}{W}{U}|Planeswalker - Narset|||+1: Look at the top card of your library. If it's a noncreature, nonland card, you may reveal it and put it into your hand.$-2: When you cast your next instant or sorcery spell from your hand this turn, it gains rebound.$-9:You get an emblem with "Your opponents can't cast noncreature spells."| 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|