From 6462b4df65f3cfd4a8fe2ab7abe28eebd20c66d1 Mon Sep 17 00:00:00 2001 From: fireshoes Date: Wed, 1 Jul 2015 18:17:30 -0500 Subject: [PATCH] [ORI] Added additional 7/1 spoilers. Added a few reprints. Added tooltip text to Send to Sleep. --- .../mage/sets/magicorigins/Auramancer.java | 52 +++++++++++++++++++ .../mage/sets/magicorigins/Blightcaster.java | 52 +++++++++++++++++++ .../sets/magicorigins/FleshbagMarauder.java | 52 +++++++++++++++++++ .../mage/sets/magicorigins/SendToSleep.java | 1 + Utils/mtg-cards-data.txt | 13 ++++- 5 files changed, 168 insertions(+), 2 deletions(-) create mode 100644 Mage.Sets/src/mage/sets/magicorigins/Auramancer.java create mode 100644 Mage.Sets/src/mage/sets/magicorigins/Blightcaster.java create mode 100644 Mage.Sets/src/mage/sets/magicorigins/FleshbagMarauder.java diff --git a/Mage.Sets/src/mage/sets/magicorigins/Auramancer.java b/Mage.Sets/src/mage/sets/magicorigins/Auramancer.java new file mode 100644 index 0000000000..9c745f50a2 --- /dev/null +++ b/Mage.Sets/src/mage/sets/magicorigins/Auramancer.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.magicorigins; + +import java.util.UUID; + +/** + * + * @author fireshoes + */ +public class Auramancer extends mage.sets.magic2012.Auramancer { + + public Auramancer(UUID ownerId) { + super(ownerId); + this.cardNumber = 5; + this.expansionSetCode = "ORI"; + } + + public Auramancer(final Auramancer card) { + super(card); + } + + @Override + public Auramancer copy() { + return new Auramancer(this); + } +} diff --git a/Mage.Sets/src/mage/sets/magicorigins/Blightcaster.java b/Mage.Sets/src/mage/sets/magicorigins/Blightcaster.java new file mode 100644 index 0000000000..9d9e818aef --- /dev/null +++ b/Mage.Sets/src/mage/sets/magicorigins/Blightcaster.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.magicorigins; + +import java.util.UUID; + +/** + * + * @author fireshoes + */ +public class Blightcaster extends mage.sets.magic2014.Blightcaster { + + public Blightcaster(UUID ownerId) { + super(ownerId); + this.cardNumber = 85; + this.expansionSetCode = "ORI"; + } + + public Blightcaster(final Blightcaster card) { + super(card); + } + + @Override + public Blightcaster copy() { + return new Blightcaster(this); + } +} diff --git a/Mage.Sets/src/mage/sets/magicorigins/FleshbagMarauder.java b/Mage.Sets/src/mage/sets/magicorigins/FleshbagMarauder.java new file mode 100644 index 0000000000..09748f16d1 --- /dev/null +++ b/Mage.Sets/src/mage/sets/magicorigins/FleshbagMarauder.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.magicorigins; + +import java.util.UUID; + +/** + * + * @author fireshoes + */ +public class FleshbagMarauder extends mage.sets.shardsofalara.FleshbagMarauder { + + public FleshbagMarauder(UUID ownerId) { + super(ownerId); + this.cardNumber = 98; + this.expansionSetCode = "ORI"; + } + + public FleshbagMarauder(final FleshbagMarauder card) { + super(card); + } + + @Override + public FleshbagMarauder copy() { + return new FleshbagMarauder(this); + } +} diff --git a/Mage.Sets/src/mage/sets/magicorigins/SendToSleep.java b/Mage.Sets/src/mage/sets/magicorigins/SendToSleep.java index 48be466008..f64dffb551 100644 --- a/Mage.Sets/src/mage/sets/magicorigins/SendToSleep.java +++ b/Mage.Sets/src/mage/sets/magicorigins/SendToSleep.java @@ -55,6 +55,7 @@ public class SendToSleep extends CardImpl { // Spell mastery — If there are two or more instant and/or sorcery cards in your graveyard, those creatures don't untap during their controllers' next untap steps. Effect effect = new ConditionalContinuousRuleModifyingEffect(new DontUntapInControllersNextUntapStepTargetEffect(), SpellMasteryCondition.getInstance()); + effect.setText("
Spell mastery — If there are two or more instant and/or sorcery cards in your graveyard, those creatures don't untap during their controllers' next untap steps"); this.getSpellAbility().addEffect(effect); } diff --git a/Utils/mtg-cards-data.txt b/Utils/mtg-cards-data.txt index d47064accf..f2250bf7a7 100644 --- a/Utils/mtg-cards-data.txt +++ b/Utils/mtg-cards-data.txt @@ -1,4 +1,4 @@ -Ardent Plea|Alara Reborn|1|U|{1}{W}{U}|Enchantment|||Exalted (Whenever a creature you control attacks alone, that creature gets +1/+1 until end of turn.)$Cascade (When you cast this spell, exile cards from the top of your library until you exile a nonland card that costs less. You may cast it without paying its mana cost. Put the exiled cards on the bottom in a random order.)| +Ardent Plea|Alara Reborn|1|U|{1}{W}{U}|Enchantment|||Exalted (Whenever a creature you control attacks alone, that creature gets +1/+1 until end of turn.)$Cascade (When you cast this spell, exile cards from the top of your library until you exile a nonland card that costs less. You may cast it without paying its mana cost. Put the exiled cards on the bottom in a random order.)| Aven Mimeomancer|Alara Reborn|2|R|{1}{W}{U}|Creature - Bird Wizard|3|1|Flying$At the beginning of your upkeep, you may put a feather counter on target creature. If you do, that creature is 3/1 and has flying for as long as it has a feather counter on it.| Ethercaste Knight|Alara Reborn|3|C|{W}{U}|Artifact Creature - Human Knight|1|3|Exalted (Whenever a creature you control attacks alone, that creature gets +1/+1 until end of turn.)| Ethersworn Shieldmage|Alara Reborn|4|C|{1}{W}{U}|Artifact Creature - Vedalken Wizard|2|2|Flash$When Ethersworn Shieldmage enters the battlefield, prevent all damage that would be dealt to artifact creatures this turn.| @@ -26088,7 +26088,9 @@ Sign in Blood|Modern Masters 2015 Edition|97|C|{B}{B}|Sorcery|||Target player dr Spread the Sickness|Modern Masters 2015 Edition|98|U|{4}{B}|Sorcery|||Destroy target creature, then proliferate. (You choose any number of permanents and/or players with counters on them, then give each another counter of a kind already there.)| Surgical Extraction|Modern Masters 2015 Edition|99|R|{BP}|Instant|||({BP} can be paid with either {B} or 2 life.)$Choose target card in a graveyard other than a basic land card. Search its owner's graveyard, hand, and library for any number of cards with the same name as that card and exile them. Then that player shuffles his or her library.| Akroan Jailer|Magic Origins|1|C|{W}|Creature - Human Soldier|1|1|{2}{W}, {T}: Tap target creature.| +Anointer of Champions|Magic Origins|3|U|{W}|Creature - Human Cleric|1|1|{T}: Target attacking creature gets +1/+1 until end of turn.| Archangel of Tithes|Magic Origins|4|M|{1}{W}{W}{W}|Creature - Angel|3|5|Flying$As long as Archangel of Tithes is untapped, creatures can't attack you or a planeswalker you control unless their controller pays {1} for each of those creatures.$As long as Archangel of Tithes is attacking, creatures can't block unless their controller pays {1} for each of those creatures.| +Auramancer|Magic Origins|5|C|{2}{W}|Creature - Human Wizard|2|2|When Auramancer enters the battlefield, you may return target enchantment card from your graveyard to your hand.| Blessed Spirits|Magic Origins|7|U|{2}{W}|Creature - Spirit|2|2|Flying$Whenever you cast an enchantment spell, put a +1/+1 counter on Blessed Spirits.| Charging Griffin|Magic Origins|9|C|{3}{W}|Creature - Griffin|2|2|Flying$Whenever Charging Griffin attacks, it gets +1/+1 until end of turn.| Cleric of the Forward Order|Magic Origins|10|C|{1}{W}|Creature - Human Cleric|2|2|When Cleric of the Forward Order enters the battlefield, you gain 2 life for each creature you control named Cleric of the Forward Order.| @@ -26107,6 +26109,7 @@ Mighty Leap|Magic Origins|26|C|{1}{W}|Instant|||Target creature gets +2/+2 and g Patron of the Valiant|Magic Origins|28|U|{3}{W}{W}|Creature - Angel|4|4|Flying$When Patron of the Valiant enters the battlefield, put a +1/+1 counter on each creature you control with a +1/+1 counter on it.| Relic Seeker|Magic Origins|29|R|{1}{W}|Creature - Human Soldier|2|2|Renown 1 (When this creature deals combat damage to a player, if it isn't renowned, put a +1/+1 counter on it and it becomes renowned.)$When Relic Seeker becomes renowned, you may search your library for an Equipment card, reveal it, put it into your hand, then shuffle your library.| Sentinel of the Eternal Watch|Magic Origins|30|U|{5}{W}|Creature - Giant Soldier|4|6|Vigilance (Attacking doesn't cause this creature to tap.)$At the beginning of combat on each opponent's turn, tap target creature that player controls.| +Stalwart Aven|Magic Origins|32|C|{2}{W}|Creature - Bird Soldier|1|3|Flying$Renown 1 (When this creature deals combat damage to a player, if it isn't renowned, put a +1/+1 counter on it and it becomes renowned.| Starfield of Nyx|Magic Origins|33|M|{4}{W}|Enchantment|||At the beginning of your upkeep, you may return target enchantment card from your graveyard to the battlefield.$As long as you control five or more enchantments, each other non-Aura enchantment you control is a creature in addition to its other types and has base power and base toughness each equal to its converted mana cost.| Topan Freeblade|Magic Origins|36|C|{1}{W}|Creature - Human Soldier|2|2|Vigilance$Renown 1 (When this creature deals combat damage to a player, if it isn't renowned, put a +1/+1 counter on it and it becomes renowned.)| Tragic Arrogance|Magic Origins|38|R|{3}{W}{W}|Sorcery|||For each player, you choose from among the permanents that player controls an artifact, a creature, an enchantment, and a planeswalker. Then each player sacrifices all other nonland permanents he or she controls.| @@ -26122,7 +26125,7 @@ Artificer's Epiphany|Magic Origins|45|C|{2}{U}|Instant|||Draw two cards. If cont Aspiring Aeronaut|Magic Origins|46|C|{3}{U}|Creature - Human Artificer|1|2|Flying (This creature can't be blocked except by creatures with flying or reach.)$When Aspiring Aeronaut enters the battlefield, put a 1/1 colorless Thopter artifact creature token with flying onto the battlefield.| Clash of Wills|Magic Origins|49|U|{X}{U}|Instant|||Counter target spell unless its controller pays {X}.| Claustrophobia|Magic Origins|50|C|{1}{U}{U}|Enchantment - Aura|||$Enchant creature$When Claustrophobia enters the battlefield, tap enchanted creature.$Enchanted creature doesn't untap during its controller's untap step.| -Day's Undoing|Magic Origins|51|M|{2}{U}|Sorcery|||Each player shuffles his or her hand and graveyard into his or her library, then draws 7 cards. If it's your turn, end the turn. (Exile all spells and abilities on the stack, including this card. Discard down to your maximum hand size. Damage wears off, and "this turn" and "until end of turn" effects end.)| +Day's Undoing|Magic Origins|51|M|{2}{U}|Sorcery|||Each player shuffles his or her hand and graveyard into his or her library, then draws seven cards. If it's your turn, end the turn. (Exile all spells and abilities on the stack, including this card. Discard down to your maximum hand size. Damage wears off, and "this turn" and "until end of turn" effects end.)| Disciple of the Ring|Magic Origins|53|M|{3}{U}{U}|Creature - Human Wizard|3|4|{1}, Exile an instant or sorcery card from your graveyard: Choose one - Counter target noncreature spell unless its controller pays {2}; or Disciple of the Ring gets +1/+1 until end of turn; or Tap target creature; or Untap target creature.| Disperse|Magic Origins|54|C|{1}{U}|Instant|||Return target nonland permanent to its owner's hand.| Displacement Wave|Magic Origins|55|R|{X}{U}{U}|Sorcery|||Return all nonland permanents with converted mana cost X or less to their owners' hands.| @@ -26148,6 +26151,7 @@ Whirler Rogue|Magic Origins|83|U|{2}{U}{U}|Creature - Human Rogue Artificer|2|2| Into the Void|Magic Origins|277|U|{3}{U}|Sorcery|||Return up to two target creatures to their owners' hands.| Mahamoti Djinn|Magic Origins|278|R|{4}{U}{U}|Creature - Djinn|5|6|Flying| Weave Fate|Magic Origins|279|C|{3}{U}|Instant|||Draw two cards.| +Blightcaster|Magic Origins|85|U|{3}{B}|Creature - Human Wizard|2|3|Whenever you cast an enchantment spell, you may have target creature get -2/-2 until end of turn.| Catacomb Slug|Magic Origins|86|C|{4}{B}|Creature - Slug|2|6|| Cruel Revival|Magic Origins|88|U|{4}{B}|Instant|||Destroy target non-Zombie creature. It can't be regenerated. Return up to one target Zombie card from your graveyard to your hand.| Dark Petition|Magic Origins|90|R|{3}{B}{B}|Sorcery|||Search your library for a card and put that card into your hand. Then shuffle your library.$Spell mastery — If there are two or more instant and/or sorcery cards in your graveyard, add {B}{B}{B} to your mana pool.| @@ -26156,6 +26160,7 @@ Demonic Pact|Magic Origins|92|M|{2}{B}{B}|Enchantment|||At the beginning of your Despoiler of Souls|Magic Origins|93|R|{B}{B}|Creature - Horror|3|1|Despoiler of Souls can't block.${B}{B}, Exile two other creature cards from your graveyard: Return Despoiler of Souls from your graveyard to the battlefield.| Erebos's Titan|Magic Origins|94|M|{1}{B}{B}{B}|Creature - Giant|5|5|Erebos's Titan has indestructible as long as no opponent controls a creature.$Whenever a creature leaves an opponent's graveyard, you may discard a card. If you do, return Erebos's Titan from your graveyard to your hand.| Eyeblight Assassin|Magic Origins|95|C|{2}{B}|Creature - Elf Assassin|2|2|When Eyeblight Assassin enters the battlefield, target creature an opponent controls gets -1/-1 until end of turn.| +Fleshbag Marauder|Magic Origins|98|U|{2}{B}|Creature - Zombie Warrior|3|1|When Fleshbag Marauder enters the battlefield, each player sacrifices a creature.| Gilt-Leaf Winnower|Magic Origins|99|R|{3}{B}{B}|Creature - Elf Warrior|4|3|Menace (This creature can't be blocked except by two or more creatures.)$When Gilt-Leaf Winnower enters the battlefield, you may destroy target non-Elf creature whose power and toughness aren't equal.| Gnarlroot Trapper|Magic Origins|100|U|{B}|Creature - Elf Druid|1|1|{t}, Pay 1 life: Add {G} to your mana pool. Spend this mana only to cast an Elf creature spell.${t}: Target attacking Elf you control gains deathtouch until end of turn. (Any amount of damage it deals to a creature is enough to destroy it.)| Graveblade Marauder|Magic Origins|101|R|{2}{B}|Creature - Human Warrior|1|4|Deathtouch$Whenever Graveblade Marauder deals combat damage to a player, that player loses life equal to the number of creature cards in your graveyard.| @@ -26233,6 +26238,8 @@ Nissa's Pilgrimage|Magic Origins|190|C|{2}{G}|Sorcery|||Search your library for Nissa's Revelation|Magic Origins|191|R|{5}{G}{G}|Sorcery|||Scry 5, then reveal the top card of your library. If it's a creature card, you draw cards equal to its power and gain life equal to its toughness.| Outland Colossus|Magic Origins|193|R|{3}{G}{G}|Creature - Giant|6|6|Renown 6 (When this creature deals combat damage to a player, if it isn't renowned, put six +1/+1 counters on it and it becomes renowned.)$Outland Colossus can't be blocked by more than one creature.| Rhox Maulers|Magic Origins|196|C|{4}{G}|Creature - Rhino Soldier|4|4|Trample (This creature can deal excess combat damage to defending player or planeswalker while attacking.)$Renown 2 (When this creature deals combat damage to a player, if it isn't renowned, put two +1/+1 counters on it and it becomes renowned.)| +Skysnare Spider|Magic Origins|197|U|{4}{G}{G}|Creature - Spider|6|6|Vigilance$Reach| +Somberwald Alpha|Magic Origins|198|U|{3}{G}|Creature - Wolf|3|2|Whenever a creature you control becomes blocked, it gets +1/+1 until end of turn.${1}{G}: Target creature you control gains trample until end of turn.| Sylvan Messenger|Magic Origins|199|U|{3}{G}|Creature - Elf|2|2|Trample$When Sylvan Messenger enters the battlefield, reveal the top four cards of your library. Put all Elf cards revealed this way into your hand and the rest on the bottom of your library in any order.| Timberpack Wolf|Magic Origins|200|C|{1}{G}|Creature - Wolf|2|2|Timberpack Wolf gets +1/+1 for each other creature you control named Timberpack Wolf.| Titanic Growth|Magic Origins|201|C|{1}{G}|Instant|||Target creature gets +4/+4 until end of turn.| @@ -26240,10 +26247,12 @@ Valeron Wardens|Magic Origins|203|U|{2}{G}|Creature - Human Monk|1|3|Renown 2 (You may cast this spell any time you could cast an instant.)$When Bounding Krasis enters the battlefield, you may tap or untap target creature.| Citadel Castellan|Magic Origins|213|U|{1}{G}{W}|Creature - Human Knight|2|3|Vigilance$Renown 2 (When this creature deals combat damage to a player, if it isn't renowned, put two +1/+1 counters on it and it becomes renowned.)| Reclusive Artificer|Magic Origins|216|U|{2}{U}{R}|Creature - Human Artificer|2|3|Haste (This creature can attack and {t} as soon as it comes under your control.)$When Reclusive Artificer enters the battlefield, you may have it deal damage to target creature equal to the number of artifacts you control.|