From 6737eb3f3b14c97dd22e5cbe8b02d6792b92948f Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Fri, 13 Apr 2018 07:31:32 +0200 Subject: [PATCH] * Fixed some typos to Dominaria complete spoiler to mtg-cards-data.txt. * Added already implemented cards to Dominaria set. --- Mage.Sets/src/mage/sets/Dominaria.java | 42 +++++++++++++++++++++++++- Utils/mtg-cards-data.txt | 12 ++++---- 2 files changed, 47 insertions(+), 7 deletions(-) diff --git a/Mage.Sets/src/mage/sets/Dominaria.java b/Mage.Sets/src/mage/sets/Dominaria.java index 80dd3049e8..fcbf13baa1 100644 --- a/Mage.Sets/src/mage/sets/Dominaria.java +++ b/Mage.Sets/src/mage/sets/Dominaria.java @@ -91,7 +91,7 @@ public class Dominaria extends ExpansionSet { cards.add(new SetCardInfo("Jaya's Immolating Inferno", 133, Rarity.RARE, mage.cards.j.JayasImmolatingInferno.class)); cards.add(new SetCardInfo("Jhoira, Weatherlight Captain", 200, Rarity.MYTHIC, mage.cards.j.JhoiraWeatherlightCaptain.class)); cards.add(new SetCardInfo("Jodah, Archmage Eternal", 198, Rarity.RARE, mage.cards.j.JodahArchmageEternal.class)); - cards.add(new SetCardInfo("Josu Vess, Lich Knight",95, Rarity.RARE, mage.cards.j.JosuVessLichKnight.class)); + cards.add(new SetCardInfo("Josu Vess, Lich Knight", 95, Rarity.RARE, mage.cards.j.JosuVessLichKnight.class)); cards.add(new SetCardInfo("Juggernaut", 222, Rarity.UNCOMMON, mage.cards.j.Juggernaut.class)); cards.add(new SetCardInfo("Kamahl's Druidic Vow", 166, Rarity.RARE, mage.cards.k.KamahlsDruidicVow.class)); cards.add(new SetCardInfo("Karn, Scion of Urza", 554, Rarity.MYTHIC, mage.cards.k.KarnScionOfUrza.class)); @@ -129,5 +129,45 @@ public class Dominaria extends ExpansionSet { cards.add(new SetCardInfo("Woodland Cemetery", 248, Rarity.RARE, mage.cards.w.WoodlandCemetery.class)); cards.add(new SetCardInfo("Yawgmoth's Vile Offering", 114, Rarity.RARE, mage.cards.y.YawgmothsVileOffering.class)); cards.add(new SetCardInfo("Zhalfirin Void", 249, Rarity.UNCOMMON, mage.cards.z.ZhalfirinVoid.class)); + cards.add(new SetCardInfo("Aesthir Glider", 209, Rarity.COMMON, mage.cards.a.AesthirGlider.class)); + cards.add(new SetCardInfo("Baloth Gorger", 156, Rarity.COMMON, mage.cards.b.BalothGorger.class)); + cards.add(new SetCardInfo("Befuddle", 45, Rarity.COMMON, mage.cards.b.Befuddle.class)); + cards.add(new SetCardInfo("Benalish Marshal", 6, Rarity.RARE, mage.cards.b.BenalishMarshal.class)); + cards.add(new SetCardInfo("Gaea's Blessing", 161, Rarity.UNCOMMON, mage.cards.g.GaeasBlessing.class)); + cards.add(new SetCardInfo("Gideon's Reproach", 29, Rarity.COMMON, mage.cards.g.GideonsReproach.class)); + cards.add(new SetCardInfo("Invoke the Divine", 22, Rarity.COMMON, mage.cards.i.InvokeTheDivine.class)); + cards.add(new SetCardInfo("Jhoira, Weatherlight Captain", 197, Rarity.MYTHIC, mage.cards.j.JhoiraWeatherlightCaptain.class)); + cards.add(new SetCardInfo("Josu Vess, Lich Knight", 95, Rarity.RARE, mage.cards.j.JosuVessLichKnight.class)); + cards.add(new SetCardInfo("Karn, Scion of Urza", 1, Rarity.MYTHIC, mage.cards.k.KarnScionOfUrza.class)); + cards.add(new SetCardInfo("Mox Amber", 224, Rarity.MYTHIC, mage.cards.m.MoxAmber.class)); + cards.add(new SetCardInfo("Nature's Spiral", 175, Rarity.UNCOMMON, mage.cards.n.NaturesSpiral.class)); + cards.add(new SetCardInfo("Rescue", 63, Rarity.COMMON, mage.cards.r.Rescue.class)); + cards.add(new SetCardInfo("Sage of Lat-Nam", 64, Rarity.UNCOMMON, mage.cards.s.SageOfLatNam.class)); + cards.add(new SetCardInfo("Siege-Gang Commander", 143, Rarity.RARE, mage.cards.s.SiegeGangCommander.class)); + cards.add(new SetCardInfo("Skirk Prospector", 144, Rarity.COMMON, mage.cards.s.SkirkProspector.class)); + cards.add(new SetCardInfo("Skizzik", 145, Rarity.UNCOMMON, mage.cards.s.Skizzik.class)); + cards.add(new SetCardInfo("Timber Gorge", 279, Rarity.COMMON, mage.cards.t.TimberGorge.class)); + cards.add(new SetCardInfo("Tragic Poet", 37, Rarity.COMMON, mage.cards.t.TragicPoet.class)); + cards.add(new SetCardInfo("Verdant Force", 187, Rarity.RARE, mage.cards.v.VerdantForce.class)); + cards.add(new SetCardInfo("Forest", 266, Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Forest", 267, Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Forest", 268, Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Forest", 269, Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Island", 254, Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Island", 255, Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Island", 256, Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Island", 257, Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Mountain", 262, Rarity.LAND, mage.cards.basiclands.Mountain.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Mountain", 263, Rarity.LAND, mage.cards.basiclands.Mountain.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Mountain", 264, Rarity.LAND, mage.cards.basiclands.Mountain.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Mountain", 265, Rarity.LAND, mage.cards.basiclands.Mountain.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Plains", 250, Rarity.LAND, mage.cards.basiclands.Plains.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Plains", 251, Rarity.LAND, mage.cards.basiclands.Plains.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Plains", 252, Rarity.LAND, mage.cards.basiclands.Plains.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Plains", 253, Rarity.LAND, mage.cards.basiclands.Plains.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Swamp", 258, Rarity.LAND, mage.cards.basiclands.Swamp.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Swamp", 259, Rarity.LAND, mage.cards.basiclands.Swamp.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Swamp", 260, Rarity.LAND, mage.cards.basiclands.Swamp.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Swamp", 261, Rarity.LAND, mage.cards.basiclands.Swamp.class, NON_FULL_USE_VARIOUS)); } } diff --git a/Utils/mtg-cards-data.txt b/Utils/mtg-cards-data.txt index 637ec155b9..ca1b660237 100644 --- a/Utils/mtg-cards-data.txt +++ b/Utils/mtg-cards-data.txt @@ -33180,7 +33180,7 @@ Lingering Phantom|Dominaria|99|U|{5}{B}|Creature - Spirit|5|4|Whenever you cast Phyrexian Scriptures|Dominaria|100|M|{2}{B}{B}|Enchantment - Saga|||(As this Saga enters and after your draw step, add a lore counter. Sacrifice after III.)$I — Put a +1/+1 counter on up to one target creature. That creature becomes an artifact in addition to its other types.$II — Destroy all nonartifact creatures.$III — Exile all cards from all opponents' graveyards.| Rat Colony|Dominaria|101|C|{1}{B}|Creature - Rat|2|1|Rat Colony gets +1/+0 for each other Rat you control.$A deck can have any number of cards named Rat Colony.| Rite of Belzenlok|Dominaria|102|R|{2}{B}{B}|Enchantment - Saga|||(As this Saga enters and after your draw step, add a lore counter. Sacrifice after III.)$I, II — Create two 0/1 black Cleric creature tokens.$III — Create a 6/6 black Demon creature token with flying, trample, and "At the beginning of your upkeep, sacrifice another creature. If you can't, this creature deals 6 damage to you."| -Settle the Score|Dominaria|103|?mtg-set-icon mtg-set-dominaria-unknown|{2}{B}{B}|Sorcery|||Exile target creature. Put two loyalty counters on a planeswalker you control.| +Settle the Score|Dominaria|103|U|{2}{B}{B}|Sorcery|||Exile target creature. Put two loyalty counters on a planeswalker you control.| Soul Salvage|Dominaria|104|C|{2}{B}|Sorcery|||Return up to two target creature cards from your graveyard to your hand.| Stronghold Confessor|Dominaria|105|C|{B}|Creature - Human Cleric|1|1|Kicker {3} (you may pay an additional {3} as you cast this spell.)$Menace$If Stronghold Confessor was kicked, it enters the battlefield with two +1/+1 counters on it.| Thallid Omnivore|Dominaria|106|C|{3}{B}|Creature - Fungus|3|3|{1}, Sacrifice another creature: Thallid Omnivore gets +2/+2 until end of turn. If a saproling was sacrificed in this way you gain 2 life.| @@ -33211,7 +33211,7 @@ Goblin Warchief|Dominaria|130|U|{1}{R}{R}|Creatur - Goblin Warrior|2|2|Goblin sp Haphazard Bombardment|Dominaria|131|R|{5}{R}|Enchantment|||When Haphazard Bombardment enters the battlefield, choose four nonenchantment permanents you don't control and put an aim counter on each of them.$At the beginning of your end step, if two or more permanents you don't control have an aim counter on them, destroy one of those permanents at random.| Jaya Ballard|Dominaria|132|M|{2}{R}{R}{R}|Legendary Planeswalker - Jaya|5|+1: Add {R}{R}{R}. Spend this mana only to cast instant or sorcery spells.$+1: Discard up to three cards, then draw that many cards.$−8: You get an emblem with "You may cast instant and sorcery cards from your graveyard. If a card cast this way would be put into your graveyard, exile it instead."| Jaya's Immolating Inferno|Dominaria|133|R|{X}{R}{R}|Legendary Sorcery|||(You may cast a legendary sorcery only if you control a legendary creature or planeswalker.)$Jaya's Immolating Inferno deals X damage to each of up to three targets.| -Keldon Overseer|Dominaria|134|?mtg-set-icon mtg-set-dominaria-unknown|{2}{R}|Creature - Human Warrior|3|1|Kicker {3}{R} (You may pay an additional {3}{R} as you cast this spell.)$Haste$When Keldon Overseer enters the battlefield, if it was kicked, gain control of target creature until end of turn. Untap that creature. It gains haste until end of turn.| +Keldon Overseer|Dominaria|134|C|{2}{R}|Creature - Human Warrior|3|1|Kicker {3}{R} (You may pay an additional {3}{R} as you cast this spell.)$Haste$When Keldon Overseer enters the battlefield, if it was kicked, gain control of target creature until end of turn. Untap that creature. It gains haste until end of turn.| Keldon Raider|Dominaria|135|C|{2}{R}{R}|Creature - Human Warrior|4|3|When Keldon Raider enters the battlefield, you may discard a card. If you do, draw a card.| Keldon Warcaller|Dominaria|136|C|{1}{R}|Creature - Human Warrior|2|2|Whenever Keldon Warcaller attacks, put a lore counter on target Saga you control.| Orcish Vandal|Dominaria|137|C|{1}{R}|Creature - Orc Warrior|1|1|{t}, Sacrifice an artifact: Orcish Vandal deals 2 damage to any target.| @@ -33227,11 +33227,11 @@ Squee, the Immortal|Dominaria|146|R|{1}{R}{R}|Legendary Creature - Goblin|2|1|Yo Two-Headed Giant|Dominaria|147|R|{2}{R}{R}|Creature - Giant Warrior|4|4|Whenever Two-Headed Giant attacks, flip two coins. If both coins come up heads, Two-Headed Giant gains double strike until end of turn. If both coins come up tails, Two-Headed Giant gains menace until end of turn.| Valduk, Keeper of the Flame|Dominaria|148|U|{2}{R}|Legendary Creature - Human Shaman|3|2|At the beginning of combat on your turn, for each Aura and Equipment attached to Valduk, Keeper of the Flame, create a 3/1 red Elemental creature token with trample and haste. Exile those tokens at the beginning of the next end step.| Verix Bladewing|Dominaria|149|M|{2}{R}{R}|Legendary Creature - Dragon|4|4|Kicker {3} (You may pay an additional {3} as you cast this spell.)$Flying$When Verix Bladewing enters the battlefield, if it was kicked, create Karox Bladewing, a legendary 4/4 red Dragon creature token with flying.| -Warcry Phoenix|Dominaria|150|?mtg-set-icon mtg-set-dominaria-unknown|{3}{R}|Creature - Phoenix|2|2|Flying, haste$Whenever you attack with three or more creatures, you may pay {2}{R}. If you do, return Warcry Phoenix from your graveyard to the battlefield tapped and attacking.| +Warcry Phoenix|Dominaria|150|U|{3}{R}|Creature - Phoenix|2|2|Flying, haste$Whenever you attack with three or more creatures, you may pay {2}{R}. If you do, return Warcry Phoenix from your graveyard to the battlefield tapped and attacking.| Warlord's Fury|Dominaria|151|C|{R}|Sorcery|||Creatures you control gain first strike until end of turn.$Draw a card.| Wizard's Lightning|Dominaria|152|U|{2}{R}|Instant|||This spell costs {2} less to cast if you control a Wizard.$Wizard's Lightning deals 3 damage to any target.| Adventurous Impulse|Dominaria|153|C|{G}|Sorcery|||Look at the top three cards of your library. You may reveal a creature or land card from among them and put it into your hand. Put the rest on the bottom of your library in any order.| -Ancient Animus|Dominaria|NaN|C|{1}{G}|instant|||Put a +1/+1 counter on target creature you control if it's legendary. Then it fights target creature an opponent controls. (Each deals damage equal to its power to the other.)| +Ancient Animus|Dominaria|154|C|{1}{G}|instant|||Put a +1/+1 counter on target creature you control if it's legendary. Then it fights target creature an opponent controls. (Each deals damage equal to its power to the other.)| Arbor Armament|Dominaria|155|C|{G}|Instant|||Put a +1/+1 counter on target creature. That creature gains reach until end of turn. | Baloth Gorger|Dominaria|156|C|{2}{G}{G}|Creature - Beast|4|4|Kicker {4} (You may pay an additional 4 as you cast this spell.)$If Baloth Gorger was kicked, it enters the battlefield with three +1/+1 counters on it.| Broken Bond|Dominaria|157|C|{1}{G}|Sorcery|||Destroy target artifact or enchantment. You may put a land card from your hand onto the battlefield.| @@ -33313,7 +33313,7 @@ Sparring Construct|Dominaria|232|C|{1}|Artifact Creature - Construct|||When Spar Thran Temporal Gateway|Dominaria|233|R|{4}|Legendary Artifact|||{4}, {t}: You may put a historic permanent card from your hand onto the battlefield. (Artifacts, legendaries, and Sagas are historic.)| Traxos, Scourge of Kroog|Dominaria|234|R|{4}|Legendary Artifact Creature - Construct|7|7|Trample$Traxos, Scourge of Kroog enters the battlefield tapped and doesn't untap during your untap step.$Whenever you cast a historic spell untap Traxos. (Artifacts, legendaries, and Sagas are historic.)| Urza's Tome|Dominaria|235|U|{2}|Artifact|||{3}, {T}: Draw a card. Then discard a card unless you exile a historic card from your graveyard. (Artifacts, legendaries, and Sagas are historic.)| -Voltaic Servant|Dominaria|236|?mtg-set-icon mtg-set-dominaria-unknown|{2}|Artifact Creature - Construct|1|3|At the beginning of your end step, untap target artifact.| +Voltaic Servant|Dominaria|236|C|{2}|Artifact Creature - Construct|1|3|At the beginning of your end step, untap target artifact.| Weatherlight|Dominaria|237|M|{4}|Legendary Artifact - Vehicle|4|5|Flying$Whenever Weatherlight deals combat damage to a player, look at the top five cards of your library. You may reveal a historic card from among them and put it into your hand. Put the rest on the bottom of your library in any order. (Artifacts, legendaries, and Sagas are historic.)$Crew 3| Cabal Stronghold|Dominaria|238|R||Land|||{t}: Add {C}.${3}, {t}: Add {B} for each basic Swamp you control.| Clifftop Retreat|Dominaria|239|R||Land|||Clifftop Retreat enters the battlefield tapped unless you control a Mountain or a Plains.${T}: Add {R} or {W}.| @@ -33333,6 +33333,7 @@ Plains|Dominaria|252|L||Basic Land - Plains|||| Plains|Dominaria|253|L||Basic Land - Plains|||| Island|Dominaria|254|L||Basic Land - Island|||| Island|Dominaria|255|L||Basic Land - Island|||| +Island|Dominaria|256|L|{2}{5}{6}|Basic Land - Island|||| Island|Dominaria|257|L||Basic Land - Island|||| Swamp|Dominaria|258|L||Basic Land - Swamp|||| Swamp|Dominaria|259|L||Basic Land - Swamp|||| @@ -33357,4 +33358,3 @@ Karplusan Hound|Dominaria|277|U|{3}{R}|Creature - Hound|3|3|Whenever Karplusan H Pyromantic Pilgrim|Dominaria|278|C|{2}{R}|Creature - Human Wizard|3|1|Haste| Timber Gorge|Dominaria|279|C||Land|||Timber Gorge enters the battlefield tapped.${t}: Add {R} or {G}.| Firesong and Sunspeaker|Dominaria|280|R|{4}{R}{W}|Legendary Creature - Minotaur Cleric|4|6|Red instant and sorcery spells you control have lifelink.$Whenever a white instant or sorcery spell causes you to gain life, Firesong and Sunspeaker deals 3 damage to target creature or player.| -Island|Dominaria|256|L|{2}{5}{6}|Basic Land - Island|||| \ No newline at end of file