From 8e4d966ff3ae94245f3062eb70488163d01f95de Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Wed, 17 Jun 2020 18:36:34 -0400 Subject: [PATCH] updated M21 and JMP spoiler and reprints --- ...eAssassin.java => TwinbladeAssassins.java} | 10 +++--- Mage.Sets/src/mage/sets/CoreSet2021.java | 2 +- Mage.Sets/src/mage/sets/Jumpstart.java | 20 +++++++++++ Utils/mtg-cards-data.txt | 33 +++++++++++++++++-- 4 files changed, 56 insertions(+), 9 deletions(-) rename Mage.Sets/src/mage/cards/t/{TwinbladeAssassin.java => TwinbladeAssassins.java} (83%) diff --git a/Mage.Sets/src/mage/cards/t/TwinbladeAssassin.java b/Mage.Sets/src/mage/cards/t/TwinbladeAssassins.java similarity index 83% rename from Mage.Sets/src/mage/cards/t/TwinbladeAssassin.java rename to Mage.Sets/src/mage/cards/t/TwinbladeAssassins.java index e96a3c1008..d67fef4433 100644 --- a/Mage.Sets/src/mage/cards/t/TwinbladeAssassin.java +++ b/Mage.Sets/src/mage/cards/t/TwinbladeAssassins.java @@ -17,9 +17,9 @@ import java.util.UUID; /** * @author TheElk801 */ -public final class TwinbladeAssassin extends CardImpl { +public final class TwinbladeAssassins extends CardImpl { - public TwinbladeAssassin(UUID ownerId, CardSetInfo setInfo) { + public TwinbladeAssassins(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}{G}"); this.subtype.add(SubType.ELF); @@ -36,12 +36,12 @@ public final class TwinbladeAssassin extends CardImpl { ), new MorbidWatcher()); } - private TwinbladeAssassin(final TwinbladeAssassin card) { + private TwinbladeAssassins(final TwinbladeAssassins card) { super(card); } @Override - public TwinbladeAssassin copy() { - return new TwinbladeAssassin(this); + public TwinbladeAssassins copy() { + return new TwinbladeAssassins(this); } } diff --git a/Mage.Sets/src/mage/sets/CoreSet2021.java b/Mage.Sets/src/mage/sets/CoreSet2021.java index b507af7427..2e5022c177 100644 --- a/Mage.Sets/src/mage/sets/CoreSet2021.java +++ b/Mage.Sets/src/mage/sets/CoreSet2021.java @@ -269,7 +269,7 @@ public final class CoreSet2021 extends ExpansionSet { cards.add(new SetCardInfo("Trufflesnout", 212, Rarity.COMMON, mage.cards.t.Trufflesnout.class)); cards.add(new SetCardInfo("Turn to Slag", 168, Rarity.COMMON, mage.cards.t.TurnToSlag.class)); cards.add(new SetCardInfo("Turret Ogre", 169, Rarity.COMMON, mage.cards.t.TurretOgre.class)); - cards.add(new SetCardInfo("Twinblade Assassin", 226, Rarity.UNCOMMON, mage.cards.t.TwinbladeAssassin.class)); + cards.add(new SetCardInfo("Twinblade Assassins", 226, Rarity.UNCOMMON, mage.cards.t.TwinbladeAssassins.class)); cards.add(new SetCardInfo("Ugin, the Spirit Dragon", 1, Rarity.MYTHIC, mage.cards.u.UginTheSpiritDragon.class)); cards.add(new SetCardInfo("Unleash Fury", 170, Rarity.UNCOMMON, mage.cards.u.UnleashFury.class)); cards.add(new SetCardInfo("Unsubstantiate", 82, Rarity.UNCOMMON, mage.cards.u.Unsubstantiate.class)); diff --git a/Mage.Sets/src/mage/sets/Jumpstart.java b/Mage.Sets/src/mage/sets/Jumpstart.java index 59f5c905de..4335d60522 100644 --- a/Mage.Sets/src/mage/sets/Jumpstart.java +++ b/Mage.Sets/src/mage/sets/Jumpstart.java @@ -20,25 +20,45 @@ public final class Jumpstart extends ExpansionSet { this.blockName = "Jumpstart"; this.hasBasicLands = true; + cards.add(new SetCardInfo("Affectionate Indrik", 373, Rarity.UNCOMMON, mage.cards.a.AffectionateIndrik.class)); cards.add(new SetCardInfo("Alloy Myr", 457, Rarity.COMMON, mage.cards.a.AlloyMyr.class)); cards.add(new SetCardInfo("Auger Spree", 449, Rarity.COMMON, mage.cards.a.AugerSpree.class)); + cards.add(new SetCardInfo("Bake into a Pie", 201, Rarity.COMMON, mage.cards.b.BakeIntoAPie.class)); + cards.add(new SetCardInfo("Black Cat", 203, Rarity.COMMON, mage.cards.b.BlackCat.class)); + cards.add(new SetCardInfo("Blood Divination", 207, Rarity.UNCOMMON, mage.cards.b.BloodDivination.class)); + cards.add(new SetCardInfo("Bloodhunter Bat", 210, Rarity.COMMON, mage.cards.b.BloodhunterBat.class)); + cards.add(new SetCardInfo("Bogbrew Witch", 211, Rarity.RARE, mage.cards.b.BogbrewWitch.class)); cards.add(new SetCardInfo("Bone Picker", 212, Rarity.UNCOMMON, mage.cards.b.BonePicker.class)); + cards.add(new SetCardInfo("Brushstrider", 381, Rarity.UNCOMMON, mage.cards.b.Brushstrider.class)); + cards.add(new SetCardInfo("Bubbling Cauldron", 460, Rarity.UNCOMMON, mage.cards.b.BubblingCauldron.class)); cards.add(new SetCardInfo("Chamber Sentry", 461, Rarity.RARE, mage.cards.c.ChamberSentry.class)); cards.add(new SetCardInfo("Dinrova Horror", 450, Rarity.UNCOMMON, mage.cards.d.DinrovaHorror.class)); cards.add(new SetCardInfo("Dutiful Attendant", 226, Rarity.COMMON, mage.cards.d.DutifulAttendant.class)); + cards.add(new SetCardInfo("Entomber Exarch", 227, Rarity.UNCOMMON, mage.cards.e.EntomberExarch.class)); + cards.add(new SetCardInfo("Festering Newt", 234, Rarity.COMMON, mage.cards.f.FesteringNewt.class)); + cards.add(new SetCardInfo("Forest", 76, Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Fusion Elemental", 451, Rarity.UNCOMMON, mage.cards.f.FusionElemental.class)); cards.add(new SetCardInfo("Ghoulcaller's Accomplice", 237, Rarity.COMMON, mage.cards.g.GhoulcallersAccomplice.class)); + cards.add(new SetCardInfo("Gravewaker", 241, Rarity.RARE, mage.cards.g.Gravewaker.class)); cards.add(new SetCardInfo("Innocent Blood", 244, Rarity.COMMON, mage.cards.i.InnocentBlood.class)); cards.add(new SetCardInfo("Ironroot Warlord", 452, Rarity.UNCOMMON, mage.cards.i.IronrootWarlord.class)); + cards.add(new SetCardInfo("Isamaru, Hound of Konda", 113, Rarity.RARE, mage.cards.i.IsamaruHoundOfKonda.class)); + cards.add(new SetCardInfo("Knight of the Tusk", 114, Rarity.COMMON, mage.cards.k.KnightOfTheTusk.class)); + cards.add(new SetCardInfo("Last Gasp", 247, Rarity.COMMON, mage.cards.l.LastGasp.class)); cards.add(new SetCardInfo("Lawmage's Binding", 453, Rarity.COMMON, mage.cards.l.LawmagesBinding.class)); cards.add(new SetCardInfo("Maelstrom Archangel", 454, Rarity.MYTHIC, mage.cards.m.MaelstromArchangel.class)); + cards.add(new SetCardInfo("Mire Triton", 257, Rarity.UNCOMMON, mage.cards.m.MireTriton.class)); cards.add(new SetCardInfo("Mirrodin's Core", 492, Rarity.UNCOMMON, mage.cards.m.MirrodinsCore.class)); + cards.add(new SetCardInfo("Nyxathid", 259, Rarity.RARE, mage.cards.n.Nyxathid.class)); cards.add(new SetCardInfo("Prophetic Prism", 478, Rarity.COMMON, mage.cards.p.PropheticPrism.class)); cards.add(new SetCardInfo("Raging Regisaur", 455, Rarity.UNCOMMON, mage.cards.r.RagingRegisaur.class)); + cards.add(new SetCardInfo("Reanimate", 270, Rarity.RARE, mage.cards.r.Reanimate.class)); cards.add(new SetCardInfo("Rupture Spire", 495, Rarity.COMMON, mage.cards.r.RuptureSpire.class)); cards.add(new SetCardInfo("Shambling Goblin", 277, Rarity.COMMON, mage.cards.s.ShamblingGoblin.class)); cards.add(new SetCardInfo("Skittering Surveyor", 486, Rarity.COMMON, mage.cards.s.SkitteringSurveyor.class)); cards.add(new SetCardInfo("Swamp", 54, Rarity.LAND, mage.cards.basiclands.Swamp.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Swarm of Bloodflies", 282, Rarity.UNCOMMON, mage.cards.s.SwarmOfBloodflies.class)); + cards.add(new SetCardInfo("Tempting Witch", 283, Rarity.UNCOMMON, mage.cards.t.TemptingWitch.class)); cards.add(new SetCardInfo("Terramorphic Expanse", 78, Rarity.COMMON, mage.cards.t.TerramorphicExpanse.class)); } } diff --git a/Utils/mtg-cards-data.txt b/Utils/mtg-cards-data.txt index f70c7e2060..10edd00769 100644 --- a/Utils/mtg-cards-data.txt +++ b/Utils/mtg-cards-data.txt @@ -37612,7 +37612,7 @@ Volcanic Geyser|Core Set 2021|171|U|{X}{R}{R}|Instant|||Volcanic Geyser deals X Volcanic Salvo|Core Set 2021|172|R|{10}{R}{R}|Sorcery|||This spell costs {X} less to cast, where X is the total power of creatures you control.$Volcanic Salvo deals 6 damage to each of up to two target creatures and/or planeswalkers.| Azusa, Lost but Seeking|Core Set 2021|173|R|{2}{G}|Legendary Creature - Human Monk|1|2|You may play two additional lands on each of your turns.| Burlfist Oak|Core Set 2021|174|U|{2}{G}{G}|Creature - Treefolk|2|3|Whenever you draw a card, Burlfist Oak gets +2/+2 until end of turn.| -Canopy Stalker|Core Set 2021|175|U|{3}{G}|Creature - Cat|4|2|Canopy Stalker must be blocked if able.$When Canopy Stalker dies you gain 1 life for each creature that died this turn.| +Canopy Stalker|Core Set 2021|175|U|{3}{G}|Creature - Cat|4|2|Canopy Stalker must be blocked if able.$When Canopy Stalker dies, you gain 1 life for each creature that died this turn.| Colossal Dreadmaw|Core Set 2021|176|C|{4}{G}{G}|Creature - Dinosaur|6|6|Trample| Cultivate|Core Set 2021|177|U|{2}{G}|Sorcery|||Search your library for up to two basic land cards, reveal those cards, and put one onto the battlefield tapped and the other into your hand. Then shuffle your library.| Drowsing Tyrannodon|Core Set 2021|178|C|{1}{G}|Creature - Dinosaur|3|3|Defender$As long as you control a creature with power 4 or greater, Drowsing Tyrannodon can attack as though it didn't have defender.| @@ -37663,7 +37663,7 @@ Niambi, Esteemed Speaker|Core Set 2021|222|R|{W}{U}|Legendary Creature - Human C Obsessive Stitcher|Core Set 2021|223|U|{1}{U}{B}|Creature - Human Wizard|0|3|{T}: Draw a card, then discard a card.${2}{U}{B}, {T}, Sacrifice Obsessive Stitcher: Return target creature card from your graveyard to the battlefield.| Radha, Heart of Keld|Core Set 2021|224|R|{1}{R}{G}|Legendary Creature - Elf Warrior|3|3|As long as it's your turn, Radha, Heart of Keld has first strike.$You may look at the top card of your library any time, and you may play lands from the top of your library.${4}{R}{G}: Radha gets +X/+X until end of turn, where X is the number of lands you control.| Sanctum of All|Core Set 2021|225|R|{W}{U}{B}{R}{G}|Legendary Enchantment - Shrine|||At the beginning of your upkeep, you may search your library and/or graveyard for a Shrine card and put it onto the battlefield. If you search your library this way, shuffle it.$If an ability of another Shrine you control triggers while you control six or more Shrines, that ability triggers an additional time.| -Twinblade Assassin|Core Set 2021|226|U|{3}{B}{G}|Creature - Elf Assassin|5|4|At the beginning of your end step, if a creature died this turn, draw a card.| +Twinblade Assassins|Core Set 2021|226|U|{3}{B}{G}|Creature - Elf Assassin|5|4|At the beginning of your end step, if a creature died this turn, draw a card.| Watcher of the Spheres|Core Set 2021|227|U|{W}{U}|Creature - Bird Wizard|2|2|Flying$Creature spells with flying you cast cost {1} less to cast.$Whenever another creature with flying enters the battlefield under your control, Watcher of the Spheres gets +1/+1 until end of turn.| Chromatic Orrery|Core Set 2021|228|M|{7}|Legendary Artifact|||You may spend mana as though it were mana of any color.${T}: Add {C}{C}{C}{C}{C}.${5}, {T}: Draw a card for each color among permanents you control.| Chrome Replicator|Core Set 2021|229|U|{5}|Artifact Creature - Construct|4|4|When Chrome Replicator enters the battlefield, if you control two or more nonland, nontoken permanents with the same name as one another, create a 4/4 colorless Construct artifact creature token.| @@ -37724,15 +37724,41 @@ Garruk's Warsteed|Core Set 2021|337|R|{3}{G}{G}|Creature - Rhino|3|5|Vigilance$W Predatory Wurm|Core Set 2021|338|U|{3}{G}|Creature - Wurm|4|4|Vigilance$Predatory Wurm gets +2/+2 as long as you control a Garruk planeswalker.| Wildwood Patrol|Core Set 2021|339|C|{2}{G}|Creature - Centaur Scout|4|2|Trample| Kels, Fight Fixer|Jumpstart|15|R|{2}{B}{B}|Legendary Creature - Azra Warlock|4|3|Menace$Whenever you sacrifice a creature, you may pay {U/B}. If you do, draw a card.${1}, Sacrifice a creature: Kels, Fight Fixer gains indestructible until end of turn.| -Nocturnal Feeder|Jumpstart|16|C|{2}{B}|Creature - Vampire Rogue|2|1|Fying$When Nocturnal Feeder dies, each opponent loses 2 life and you gain 2 life.| +Nocturnal Feeder|Jumpstart|16|C|{2}{B}|Creature - Vampire Rogue|2|1|Flying$When Nocturnal Feeder dies, each opponent loses 2 life and you gain 2 life.| +Tinybones, Trinket Thief|Jumpstart|17|M|{1}{B}|Legendary Creature - Skeleton Rogue|1|2|At the beginning of each end step, if an opponent discarded a card this turn, you draw a card and you lose 1 life.${4}{B}{B}: Each opponent with no cards in hand loses 10 life.| +Witch of the Moors|Jumpstart|18|R|{3}{B}{B}|Creature - Human Warlock|4|4|Deathtouch$At the beginning of your end step, if you gained life this turn, each opponent sacrifices a creature and you return up to one target creature card from your graveyard to your hand.| +Neyith of the Dire Hunt|Jumpstart|30|R|{2}{G}{G}|Legendary Creature - Human Warrior|3|3|Whenever one or more creatures you control fight or become blocked, draw a card.$At the beginning of combat on your turn, you may pay {2}{R/G}. If you do, double target creature's power until end of turn. That creature must be blocked this combat if able.| +Thriving Bluff|Jumpstart|33|C||Land|||Thriving Bluff enters the battlefield tapped.$As Thriving Bluff enters the battlefield, choose a color other than red.${T}: Add {R} or one mana of the chosen color.| +Thriving Grove|Jumpstart|34|C||Land|||Thriving Grove enters the battlefield tapped.$As Thriving Grove enters the battlefield, choose a color other than green.${T}: Add {G} or one mana of the chosen color.| +Thriving Heath|Jumpstart|35|C||Land|||Thriving Heath enters the battlefield tapped.$As Thriving Heath enters the battlefield, choose a color other than white.${T}: Add {W} or one mana of the chosen color.| +Thriving Isle|Jumpstart|36|C||Land|||Thriving Isle enters the battlefield tapped.$As Thriving Isle enters the battlefield, choose a color other than blue.${T}: Add {U} or one mana of the chosen color.| Thriving Moor|Jumpstart|37|C||Land|||Thriving Moor enters the battlefield tapped.$As Thriving Moor enters the battlefield, choose a color other than black.${T}: Add {B} or one mana of the chosen color.| Swamp|Jumpstart|54|C||Basic Land - Swamp|||({T}: Add {B}.)| +Forest|Jumpstart|76|C||Basic Land - Forest|||({T}: Add {G}.)| Terramorphic Expanse|Jumpstart|78|C||Land|||{T}, Sacrifice Terramorphic Expanse: Search your library for a basic land card, put it onto the battlefield tapped, then shuffle your library.| +Isamaru, Hound of Konda|Jumpstart|113|R|{W}|Legendary Creature - Hound|2|2|| +Knight of the Tusk|Jumpstart|114|C|{4}{W}{W}|Creature - Human Knight|3|7|Vigilance| +Bake into a Pie|Jumpstart|201|C|{2}{B}{B}|Instant|||Destroy target creature. Create a Food token.| +Black Cat|Jumpstart|203|C|{1}{B}|Creature - Zombie Cat|1|1|When Black Cat dies, target opponent discards a card at random.| +Blood Divination|Jumpstart|207|U|{3}{B}|Sorcery|||As an additional cost to cast this spell, sacrifice a creature.$Draw three cards.| +Bloodhunter Bat|Jumpstart|210|C|{3}{B}|Creature - Bat|2|2|Flying$When Bloodhunter Bat enters the battlefield, target player loses 2 life and you gain 2 life.| +Bogbrew Witch|Jumpstart|211|R|{3}{B}|Creature - Human Wizard|1|3|{2}, {T}: Search your library for a card named Festering Newt or Bubbling Cauldron, put it onto the battlefield tapped, then shuffle your library.| Bone Picker|Jumpstart|212|U|{3}{B}|Creature - Bird|3|2|This spell costs {3} less to cast if a creature died this turn.$Flying, deathtouch| Dutiful Attendant|Jumpstart|226|C|{2}{B}|Creature - Human Warrior|1|2|When Dutiful Attendant dies, return another target creature card from your graveyard to your hand.| +Entomber Exarch|Jumpstart|227|U|{2}{B}{B}|Creature - Cleric|2|2|When Entomber Exarch enters the battlefield, choose one —$• Return target creature card from your graveyard to your hand.$• Target opponent reveals their hand. You choose a noncreature card from it. That player discards that card.| +Festering Newt|Jumpstart|234|C|{B}|Creature - Salamander|1|1|When Festering Newt dies, target creature an opponent controls gets -1/-1 until end of turn. That creature gets -4/-4 instead if you control a creature named Bogbrew Witch.| Ghoulcaller's Accomplice|Jumpstart|237|C|{1}{B}|Creature - Human Rogue|2|2|{3}{B}, Exile Ghoulcaller's Accomplice from your graveyard: Create a 2/2 black Zombie creature token. Activate this ability only any time you could cast a sorcery.| +Gravewaker|Jumpstart|241|R|{4}{B}{B}|Creature - Bird Spirit|5|5|Flying${5}{B}{B}: Return target creature card from your graveyard to the battlefield tapped.| Innocent Blood|Jumpstart|244|C|{B}|Sorcery|||Each player sacrifices a creature.| +Last Gasp|Jumpstart|247|C|{1}{B}|Instant|||Target creature gets -3/-3 until end of turn.| +Mire Triton|Jumpstart|257|U|{1}{B}|Creature - Zombie Merfolk|2|1|Deathtouch$When Mire Triton enters the battlefield, put the top two cards of your library into your graveyard and you gain 2 life.| +Nyxathid|Jumpstart|259|R|{1}{B}{B}|Creature - Elemental|7|7|As Nyxathid enters the battlefield, choose an opponent.$Nyxathid gets -1/-1 for each card in the chosen player's hand.| +Reanimate|Jumpstart|270|R|{B}|Sorcery|||Put target creature card from a graveyard onto the battlefield under your control. You lose life equal to its converted mana cost.| Shambling Goblin|Jumpstart|277|C|{B}|Creature - Zombie Goblin|1|1|When Shambling Goblin dies, target creature an opponent controls gets -1/-1 until end of turn.| +Swarm of Bloodflies|Jumpstart|282|U|{4}{B}|Creature - Insect|0|0|Flying$Swarm of Bloodflies enters the battlefield with two +1/+1 counters on it.$Whenever another creature dies, put a +1/+1 counter on Swarm of Bloodflies.| +Tempting Witch|Jumpstart|283|U|{2}{B}|Creature - Human Warlock|1|3|When Tempting Witch enters the battlefield, create a Food token.${2}, {T}, Sacrifice a Food: Target player loses 3 life.| +Affectionate Indrik|Jumpstart|373|U|{5}{G}|Creature - Beast|4|4|When Affectionate Indrik enters the battlefield, you may have it fight target creature you don't control.| +Brushstrider|Jumpstart|381|U|{1}{G}|Creature - Beast|3|1|Vigilance| Auger Spree|Jumpstart|449|C|{1}{B}{R}|Instant|||Target creature gets +4/-4 until end of turn.| Dinrova Horror|Jumpstart|450|U|{4}{U}{B}|Creature - Horror|4|4|When Dinrova Horror enters the battlefield, return target permanent to its owner's hand, then that player discards a card.| Fusion Elemental|Jumpstart|451|U|{W}{U}{B}{R}{G}|Creature - Elemental|8|8|| @@ -37741,6 +37767,7 @@ Lawmage's Binding|Jumpstart|453|C|{1}{W}{U}|Enchantment - Aura|||Flash$Enchant c Maelstrom Archangel|Jumpstart|454|M|{W}{U}{B}{R}{G}|Creature - Angel|5|5|Flying$Whenever Maelstrom Archangel deals combat damage to a player, you may cast a nonland card from your hand without paying its mana cost.| Raging Regisaur|Jumpstart|455|U|{2}{R}{G}|Creature - Dinosaur|4|4|Whenever Raging Regisaur attacks, it deals 1 damage to any target.| Alloy Myr|Jumpstart|457|C|{3}|Artifact Creature - Myr|2|2|{T}: Add one mana of any color.| +Bubbling Cauldron|Jumpstart|460|U|{2}|Artifact|||{1}, {T}, Sacrifice a creature: You gain 4 life.${1}, {T}, Sacrifice a creature named Festering Newt: Each opponent loses 4 life. You gain life equal to the life lost this way.| Chamber Sentry|Jumpstart|461|R|{X}|Artifact Creature - Construct|0|0|Chamber Sentry enters the battlefield with a +1/+1 counter on it for each color of mana spent to cast it.${X}, {T}, Remove X +1/+1 counters from Chamber Sentry: It deals X damage to any target.${W}{U}{B}{R}{G}: Return Chamber Sentry from your graveyard to your hand.| Prophetic Prism|Jumpstart|478|C|{2}|Artifact|||When Prophetic Prism enters the battlefield, draw a card.${1}, {T}: Add one mana of any color.| Skittering Surveyor|Jumpstart|486|C|{3}|Artifact Creature - Construct|1|2|When Skittering Surveyor enters the battlefield, you may search your library for a basic land card, reveal it, put it into your hand, then shuffle your library.|