From 58e4cb45c387f3c354fc1ef4f3085fa355e93f7e Mon Sep 17 00:00:00 2001 From: fireshoes Date: Wed, 16 Mar 2016 10:57:35 -0500 Subject: [PATCH] [SOI] Updated mtg-cards-data.txt with 3/16 spoilers. Added missing color identifiers for DFCs. --- .../shadowsoverinnistrad/ArlinnEmbracedByTheMoon.java | 2 ++ .../src/mage/sets/shadowsoverinnistrad/AwokenHorror.java | 1 + .../mage/sets/shadowsoverinnistrad/HeirToTheNight.java | 1 + .../src/mage/sets/shadowsoverinnistrad/InsidiousMist.java | 1 + .../sets/shadowsoverinnistrad/LunarchInquisitors.java | 1 + .../src/mage/sets/shadowsoverinnistrad/PerfectedForm.java | 1 + .../src/mage/sets/shadowsoverinnistrad/Rattlechains.java | 6 +++--- .../mage/sets/shadowsoverinnistrad/WaywardDisciple.java | 1 + .../shadowsoverinnistrad/WerewolfOfAncientHunger.java | 1 + Utils/mtg-cards-data.txt | 8 ++++++++ 10 files changed, 20 insertions(+), 3 deletions(-) diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/ArlinnEmbracedByTheMoon.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/ArlinnEmbracedByTheMoon.java index 15c80e1909..f3e50ae548 100644 --- a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/ArlinnEmbracedByTheMoon.java +++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/ArlinnEmbracedByTheMoon.java @@ -66,6 +66,8 @@ public class ArlinnEmbracedByTheMoon extends CardImpl { super(ownerId, 243, "Arlinn, Embraced by the Moon", Rarity.MYTHIC, new CardType[]{CardType.PLANESWALKER}, ""); this.expansionSetCode = "SOI"; this.subtype.add("Arlinn"); + this.color.setRed(true); + this.color.setGreen(true); this.nightCard = true; this.canTransform = true; diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/AwokenHorror.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/AwokenHorror.java index 095915bec1..0f864b229c 100644 --- a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/AwokenHorror.java +++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/AwokenHorror.java @@ -51,6 +51,7 @@ public class AwokenHorror extends CardImpl { this.subtype.add("Horror"); this.power = new MageInt(7); this.toughness = new MageInt(8); + this.color.setBlue(true); this.nightCard = true; diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/HeirToTheNight.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/HeirToTheNight.java index a0a5299cf8..c33a8c45a7 100644 --- a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/HeirToTheNight.java +++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/HeirToTheNight.java @@ -47,6 +47,7 @@ public class HeirToTheNight extends CardImpl { this.subtype.add("Berserker"); this.power = new MageInt(3); this.toughness = new MageInt(2); + this.color.setBlack(true); // this card is the second face of double-faced card this.nightCard = true; diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/InsidiousMist.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/InsidiousMist.java index 05d7ed9d92..1d254d9666 100644 --- a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/InsidiousMist.java +++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/InsidiousMist.java @@ -59,6 +59,7 @@ public class InsidiousMist extends CardImpl { this.subtype.add("Elemental"); this.power = new MageInt(0); this.toughness = new MageInt(1); + this.color.setBlue(true); this.nightCard = true; this.canTransform = true; diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/LunarchInquisitors.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/LunarchInquisitors.java index a2b34b986d..1eb0577265 100644 --- a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/LunarchInquisitors.java +++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/LunarchInquisitors.java @@ -51,6 +51,7 @@ public class LunarchInquisitors extends CardImpl { this.subtype.add("Cleric"); this.power = new MageInt(4); this.toughness = new MageInt(4); + this.color.setWhite(true); // this card is the second face of double-faced card this.nightCard = true; diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/PerfectedForm.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/PerfectedForm.java index b40aa079ed..76a62e6f54 100644 --- a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/PerfectedForm.java +++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/PerfectedForm.java @@ -47,6 +47,7 @@ public class PerfectedForm extends CardImpl { this.subtype.add("Horror"); this.power = new MageInt(5); this.toughness = new MageInt(4); + this.color.setBlue(true); // this card is the second face of double-faced card this.nightCard = true; diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/Rattlechains.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/Rattlechains.java index 38096868b1..64fe19de39 100644 --- a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/Rattlechains.java +++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/Rattlechains.java @@ -53,8 +53,8 @@ import mage.target.common.TargetCreaturePermanent; */ public class Rattlechains extends CardImpl { - private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("spirit"); - private static final FilterCard filterCard = new FilterCard("spirit cards"); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Spirit"); + private static final FilterCard filterCard = new FilterCard("Spirit spells"); static { filter.add(new SubtypePredicate("Spirit")); @@ -79,7 +79,7 @@ public class Rattlechains extends CardImpl { ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); - // You may cast spirit cards as though they had flash. + // You may cast Spirit spells as though they had flash. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, filterCard, false))); } diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/WaywardDisciple.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/WaywardDisciple.java index 9ed58f01a7..bcfe39df81 100644 --- a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/WaywardDisciple.java +++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/WaywardDisciple.java @@ -61,6 +61,7 @@ public class WaywardDisciple extends CardImpl { this.subtype.add("Cleric"); this.power = new MageInt(2); this.toughness = new MageInt(4); + this.color.setBlack(true); // this card is the second face of double-faced card this.nightCard = true; diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/WerewolfOfAncientHunger.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/WerewolfOfAncientHunger.java index fe2b043768..2e0df2d4c3 100644 --- a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/WerewolfOfAncientHunger.java +++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/WerewolfOfAncientHunger.java @@ -59,6 +59,7 @@ public class WerewolfOfAncientHunger extends CardImpl { this.subtype.add("Werewolf"); this.power = new MageInt(0); this.toughness = new MageInt(0); + this.color.setGreen(true); this.nightCard = true; this.canTransform = true; diff --git a/Utils/mtg-cards-data.txt b/Utils/mtg-cards-data.txt index b34280cb21..48583a8763 100644 --- a/Utils/mtg-cards-data.txt +++ b/Utils/mtg-cards-data.txt @@ -56957,9 +56957,11 @@ Topplegeist|Shadows over Innistrad|45|U|{W}|Creature - Spirit|1|1|Flying$When To Aberrant Researcher|Shadows over Innistrad|49a|U|{3}{U}|Creature - Human Insect|3|2|Flying$At the beginning of your upkeep, put the top card of your library into your graveyard. If it's an instant or sorcery card, transform Aberrant Researcher.| Perfected Form|Shadows over Innistrad|49b|U||Creature - Insect Horror|5|4|Flying| Compelling Deterrence|Shadows over Innistrad|52|U|{1}{U}|Instant|||Return target nonland permanent to its owner's hand. Then that player discards a card if you control a Zombie.| +Epiphany at the Drownyard|Shadows over Innistrad|59|R|{X}{U}|Instant|||Reveal the top X plus one cards of your library and separate them into two pilse. An opponent chooses one of those piles. Put that pile into your hand and the other into your graveyard.| Furtive Homunculus|Shadows over Innistrad|64|C|{1}{U}|Creature - Homunculus|2|1|Skulk (This creature can't be blocked by creatures with greater power.)| Geralf's Masterpiece|Shadows over Innistrad|65|M|{3}{U}{U}|Creature - Zombie Horror|7|7|Flying$Geralf's Masterpiece gets -1/-1 for each card in your hand.${3}{U}, Discard three cards: Return Geralf's Masterpiece from your graveyard to the battlefield tapped.| Invasive Surgery|Shadows over Innistrad|68|U|{U}|Instant|||Counter target sorcery spell.$Delirium — If there are four or more card types among cards in your graveyard, search the graveyard, hand, and library of that spell's controller for any number of cards with the same name as that spell, exile those cards, then that player shuffles his or her library.| +Jace, Unraveler of Secrets|Shadows over Innistrad|69|M|{3}{U}{U}|Planeswalker - Jace|||+1: Scry 1, then draw a card.$-2: Return target creature to its owner's hand.$-8: You get an emblem with "Whenever an opponent casts his or her first spell each turn, counter that spell."| Just the Wind|Shadows over Innistrad|71|C|{1}{U}|Instant|||Return target creature to its owner's hand.$Madness {U} (If you discard this card, discard it into exile. When you do, cast it for its madness cost or put it into your graveyard.)| Lamplighter of Selhoff|Shadows over Innistrad|72|C|{4}{U}|Creature - Zombie Horror|3|5|When Lamplighter of Selhoff enters the battlefield, if you control another Zombie, you may draw a card. If you do, discard a card.| Nephalia Moondrakes|Shadows over Innistrad|75|R|{5}{U}{U}|Creature - Drake|5|5|Flying$When Nephalia Moondrakes enters the battlefield, target creature gains flying until end of turn.${4}{U}{U}, Exile Nephalia Moondrakes from your graveyard: Creatures you control gain flying until end of turn.| @@ -56967,6 +56969,7 @@ Niblis of Dusk|Shadows over Innistrad|76|C|{2}{U}|Creature - Spirit|2|1|Flying$P Pieces of the Puzzle|Shadows over Innistrad|78|C|{2}{U}|Sorcery|||Reveal the top five cards of your library. Put up to two instant and/or sorcery cards from among them into your hand and the rest into your graveyard.| Pore Over the Pages|Shadows over Innistrad|79|U|{3}{U}{U}|Sorcery|||Draw three cards, untap up to two lands, then discard a card.| Rattlechains|Shadows over Innistrad|81|R|{1}{U}|Creature - Spirit|2|1|Flash$Flying$When Rattlechains enters the battlefield, target spirit gains hexproof until end of turn.$You may cast spirit cards as though they had flash.| +Rise from the Tides|Shadows over Innistrad|83|U|{5}{U}|Sorcery|||For each instant or sorcery card in your graveyard, put a 2/2 black Zombie creature token onto the battlefield.| Startled Awake|Shadows over Innistrad|88a|M|{2}{U}{U}|Sorcery|||Target opponent puts the top thirteen cards of his or her library into his or her graveyard.${3}{U}{U}: Put Startled Awake from your graveyard onto the battlefield transformed. Activate this ability only any time you could cast a sorcery.| Persistent Nightmare|Shadows over Innistrad|88b|M||Creature - Nightmare|1|1|Skulk (This creature can't be blocked by creatures with greater power.)$When Persistent Nightmare deals combat damage to a player, return it to its owner's hand.| Stitched Mangler|Shadows over Innistrad|89|C|{2}{U}|Creature - Zombie Horror|2|3|Stitched Mangler enters the battlefield tapped.$When Stitched Mangler enters the battlefield, tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step.| @@ -56989,6 +56992,8 @@ Shamble Back|Shadows over Innistrad|134|C|{B}|Sorcery|||Exile target creature ca Sinister Concoction|Shadows over Innistrad|135|U|{B}|Enchantment|||{B}, Pay 1 life, Put the top card of your library into your graveyard, Discard a card, Sacrifice Sinister Concoction: Destroy target creature.| To the Slaughter|Shadows over Innistrad|139|R|{2}{B}|Instant|||Target player sacrifices a creature or planeswalker.$Delirium — If there are four or more card types among cards in your graveyard, instead that player sacrifices a creature and a planeswalker.| Tooth Collector|Shadows over Innistrad|140|U|{2}{B}|Creature - Human Rogue|3|2|When Tooth Collector enters the battlefield, target creature an opponent controls gets -1/-1 until end of turn.${Delirium — At the beginning of each opponent's upkeep, if there are four or more card types among cards in your graveyard, target creature that player controls gets -1/-1 until end of turn.| +Breakneck Rider|Shadows over Innistrad|147a|U|{1}{R}{R}|Creature - Human Scout Werewolf|3|3|At the beginning of each upkeep, if no spells were cast last turn, transform Breakneck Rider.| +Neck Breaker|Shadows over Innistrad|147b|U||Creature - Werewolf|4|3|Attacking creatures you control get +1/+0 and have trample.$At the beginning of each upkeep, if a player cast two or more spells last turn, transform Neck Breaker.| Dance with Devils|Shadows over Innistrad|150|U|{3}{R}|Instant|||Put two 1/1 red Devil creature tokens onto the battlefield. They have "When this creature dies, it deals 1 damage to target creature or player."| Devil's Playground|Shadows over Innistrad|151|R|{4}{R}{R}|Sorcery|||Put four 1/1 red Devil creature tokens onto the battlefield. They have "When this creature dies, it deals 1 damage to target creature or player."| Ember-Eye Wolf|Shadows over Innistrad|154|C|{2}{R}|Creature - Wolf|1|2|Haste${1}{R}: Ember-Eye Wolf gets +2/+0 until end of turn.| @@ -57006,6 +57011,7 @@ Wolf of Devil's Breach|Shadows over Innistrad|192|M|{3}{R}{R}|Creature - Element Clip Wings|Shadows over Innistrad|197|C|{1}{G}|Instant|||Each opponent sacrifices a creature with flying.| Duskwatch Recruiter|Shadows over Innistrad|203a|U|{1}{G}|Creature - Human Warrior Werewolf|2|2|{2}{G}: Look at the top three cards of your library. You may reveal a creature card from among them and put it into your hand. Put the rest on the bottom of your library in any order.$At the beginning of each upkeep, if no spells were cast last turn, transform Duskwatch Recruiter.| Krallenhorde Howler|Shadows over Innistrad|203b|U||Creature - Werewolf|3|3|Creature spells you cast cost {1} less to cast.$At the beginning of each upkeep, if a player cast two or more spells last turn, transform Krallenhorde Howler.| +Groundskeeper|Shadows over Innistrad|208|U|{G}|Creature - Human Druid|1|1|{1}{G}: Return target basic land card from your graveyard to your hand.| Hinterland Logger|Shadows over Innistrad|210a|C|{1}{G}|Creature - Human Werewolf|2|1|At the beginning of each upkeep, if no spells were cast last turn, transform Hinterland Logger.| Timber Shredder|Shadows over Innistrad|210b|C||Creature - Werewolf|4|2|Trample$At the beginning of each upkeep, if a player cast two or more spells last turn, transform Timber Shredder.| Pack Guardian|Shadows over Innistrad|221|U|{2}{G}{G}|Creature - Wolf Spirit|4|3|Flash$When Pack Guardian enters the battlefield, you may discard a land card. If you do, put a 2/2 green Wolf creature token onto the battlefield.| @@ -57019,6 +57025,8 @@ Anguished Unmaking|Shadows over Innistrad|242|R|{1}{W}{B}|Instant|||Exile target Arlinn Kord|Shadows over Innistrad|243a|M|{2}{R}{G}|Planeswalker - Arlinn|||+1: Until end of turn, up to one target creature gets +2/+2 and gains vigilance and haste.$0: Put a 2/2 green Wolf creature token onto the battlefield. Transform Arlinn Kord.| Arlinn, Embraced by the Moon|Shadows over Innistrad|243b|M||Planeswalker - Arlinn|||+1: Creatures you control get +1/+1 and gain trample until end of turn.$-1: Arlinn, Embraced by the Moon deals 3 damage to target creature or player. Transform Arlinn, Embraced by the Moon.$-6: You get an emblem with "Creatures you control have haste and '{T}: This creature deals damage equal to its power to target creature or player.'"| Nahiri, the Harbinger|Shadows over Innistrad|247|M|{2}{R}{W}|Planeswalker - Nahiri|||+2: You may discard a card. If you do, draw a card.$-2: Exile target enchantment, tapped artifact, or tapped creature.$-8: Search your library for an artifact or creature card, put it onto the battlefield, then shuffle your library. It gains haste. Return it to your hand at the beginning of the next end step.| +Oliva, Mobilized for War|Shadows over Innistrad|248|M|{1}{B}{R}|Legendary Creature - Vampire Knight|3|3|Flying$Whenever another creature enters the battlefield under your control, you may discard a card. If you do, put a +1/+1 counter on that creature, it gains haste until end of turn, and it becomes a Vampire in addition to its other types.| +Sigarda, Heron's Grace|Shadows over Innistrad|250|M|{3}{G}{W}|Legendary Creature - Angel|4|5|Flying$You and Humans you control have hexproof.${2}, Exile a card from your graveyard: Put a 1/1 white Human Soldier creature token onto the battlefield.| Brain in a Jar|Shadows over Innistrad|252|R|{2}|Artifact|||{1}, {T}: Put a charge counter on Brain in a Jar, then you may cast an instant or sorcery card with converted mana costs equal to the number of charge counters on Brain in a Jar from your hand without paying its mana cost.${3}< {T}, Remove X charge counters from Brain in a Jar: Scry X.| Explosive Apparatus|Shadows over Innistrad|255|C|{1}|Artifact|||{3}, {T}, Sacrifice Explosive Apparatus: Explosive Apparatus deals 2 damage to target creature or player.| Magnifying Glass|Shadows over Innistrad|258|U|{3}|Artifact|||{T}: Add {C} to your mana pool.${4}, {T}: Investigate. (Put a colorless Clue artifact token onto the battlefield with "{2}, Sacrifice this artifact: Draw a card.")|