From 5cbee83dc70d2ef98b259b285ffda97e994f635d Mon Sep 17 00:00:00 2001 From: fireshoes Date: Sun, 24 Jan 2016 22:21:08 -0600 Subject: [PATCH] Fixed a couple more FNM promo collector numbers and added Smash to Smithereens FNM promo. --- .../sets/fridaynightmagic/ClashOfWills.java | 2 +- .../fridaynightmagic/NissasPilgrimage.java | 2 +- .../fridaynightmagic/SmashToSmithereens.java | 52 +++++++++++++++++++ Utils/mtg-cards-data.txt | 7 +-- 4 files changed, 58 insertions(+), 5 deletions(-) create mode 100644 Mage.Sets/src/mage/sets/fridaynightmagic/SmashToSmithereens.java diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/ClashOfWills.java b/Mage.Sets/src/mage/sets/fridaynightmagic/ClashOfWills.java index c618d297558..7436107c493 100644 --- a/Mage.Sets/src/mage/sets/fridaynightmagic/ClashOfWills.java +++ b/Mage.Sets/src/mage/sets/fridaynightmagic/ClashOfWills.java @@ -37,7 +37,7 @@ public class ClashOfWills extends mage.sets.magicorigins.ClashOfWills { public ClashOfWills(UUID ownerId) { super(ownerId); - this.cardNumber = 188; + this.cardNumber = 189; this.expansionSetCode = "FNMP"; } diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/NissasPilgrimage.java b/Mage.Sets/src/mage/sets/fridaynightmagic/NissasPilgrimage.java index 5607bc55a65..e5c2c2ac77d 100644 --- a/Mage.Sets/src/mage/sets/fridaynightmagic/NissasPilgrimage.java +++ b/Mage.Sets/src/mage/sets/fridaynightmagic/NissasPilgrimage.java @@ -37,7 +37,7 @@ public class NissasPilgrimage extends mage.sets.magicorigins.NissasPilgrimage { public NissasPilgrimage(UUID ownerId) { super(ownerId); - this.cardNumber = 187; + this.cardNumber = 188; this.expansionSetCode = "FNMP"; } diff --git a/Mage.Sets/src/mage/sets/fridaynightmagic/SmashToSmithereens.java b/Mage.Sets/src/mage/sets/fridaynightmagic/SmashToSmithereens.java new file mode 100644 index 00000000000..f7713432a21 --- /dev/null +++ b/Mage.Sets/src/mage/sets/fridaynightmagic/SmashToSmithereens.java @@ -0,0 +1,52 @@ +/* + * 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.fridaynightmagic; + +import java.util.UUID; + +/** + * + * @author fireshoes + */ +public class SmashToSmithereens extends mage.sets.shadowmoor.SmashToSmithereens { + + public SmashToSmithereens(UUID ownerId) { + super(ownerId); + this.cardNumber = 190; + this.expansionSetCode = "FNMP"; + } + + public SmashToSmithereens(final SmashToSmithereens card) { + super(card); + } + + @Override + public SmashToSmithereens copy() { + return new SmashToSmithereens(this); + } +} diff --git a/Utils/mtg-cards-data.txt b/Utils/mtg-cards-data.txt index 7011a46b6b5..7ccb3ea3638 100644 --- a/Utils/mtg-cards-data.txt +++ b/Utils/mtg-cards-data.txt @@ -5894,9 +5894,10 @@ Serum Visions|Friday Night Magic|183|C|{U}|Sorcery|||Draw a card.$Scry 2. (To Orator of Ojutai|Friday Night Magic|184|U|{1}{W}|Creature - Bird Monk|0|4|Defneder, flying$As an additional cost to cast Orator of Ojutai, you may reveal a Dragon card from your hand.$When Orator of Ojutai enters the battlefield, if you revealed a Dragon card or controlled a Dragon as you cast Orator of Ojutai, draw a card.| Ultimate Price|Friday Night Magic|185|U|{1}{B}|Instant|||Destroy target monocolored creature.| Roast|Friday Night Magic|186|U|{1}{R}|Sorcery|||Roast deals 5 damage to target creature without flying.| -Anticipate|Friday Night Magic|186|C|{1}{U}|Instant|||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.| -Nissa's Pilgrimage|Friday Night Magic|187|C|{2}{G}|Sorcery|||Search your library for up to two basic Forest cards, reveal those cards, and put one onto the battlefield tapped and the rest into your hand. Then shuffle your library.$Spell Mastery — If there are two or more instant and/or sorcery cards in your graveyard, search your library for up to three basic Forest cards instead of two.| -Clash of Wills|Friday Night Magic|188|U|{X}{U}|Instant|||Counter target spell unless its controller pays {X}.| +Anticipate|Friday Night Magic|187|C|{1}{U}|Instant|||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.| +Nissa's Pilgrimage|Friday Night Magic|188|C|{2}{G}|Sorcery|||Search your library for up to two basic Forest cards, reveal those cards, and put one onto the battlefield tapped and the rest into your hand. Then shuffle your library.$Spell Mastery — If there are two or more instant and/or sorcery cards in your graveyard, search your library for up to three basic Forest cards instead of two.| +Clash of Wills|Friday Night Magic|189|U|{X}{U}|Instant|||Counter target spell unless its controller pays {X}.| +Smash to Smithereens|Friday Night Magic|190|C|{1}{R}|Instant|||Destroy target artifact. Smash to Smithereens deals 3 damage to that artifact's controller.| Angel of Salvation|Future Sight|1|R|{6}{W}{W}|Creature - Angel|5|5|Flash; convoke (Each creature you tap while casting this spell reduces its cost by {1} or by one mana of that creature's color.)$Flying$When Angel of Salvation enters the battlefield, prevent the next 5 damage that would be dealt this turn to any number of target creatures and/or players, divided as you choose.| Knight of Sursi|Future Sight|10|C|{3}{W}|Creature - Human Knight|2|2|Flying; flanking (Whenever a creature without flanking blocks this creature, the blocking creature gets -1/-1 until end of turn.)$Suspend 3-{W} (Rather than cast this card from your hand, you may pay {W} and exile it with three time counters on it. At the beginning of your upkeep, remove a time counter. When the last is removed, cast it without paying its mana cost. It has haste.)| Haze of Rage|Future Sight|100|U|{1}{R}|Sorcery|||Buyback {2} (You may pay an additional {2} as you cast this spell. If you do, put this card into your hand as it resolves.)$Creatures you control get +1/+0 until end of turn.$Storm (When you cast this spell, copy it for each spell cast before it this turn.)|