diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSource.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSource.java index 968eff235e..04d9659d5f 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSource.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSource.java @@ -73,12 +73,17 @@ public enum ScryfallImageSource implements CardImageSource { // CARDS TRY - // direct links to images via hardcoded API path. Used for cards with non-ASCII collector numbers. + // direct links to images via hardcoded API path. Used for cards with non-ASCII collector numbers if (baseUrl == null) { - baseUrl = ScryfallImageSupportCards.findDirectDownloadLink(card.getSet(), card.getName(), card.getCollectorId()); - if (baseUrl != null) { - alternativeUrl = baseUrl + defaultCode + "?format=image"; - baseUrl += localizedCode + "?format=image"; + String apiUrl = ScryfallImageSupportCards.findDirectDownloadLink(card.getSet(), card.getName(), card.getCollectorId()); + if (apiUrl != null) { + baseUrl = apiUrl + localizedCode + "?format=image"; + alternativeUrl = apiUrl + defaultCode + "?format=image"; + + // workaround to use cards without english images (some promos or special cards) + if (Objects.equals(baseUrl, alternativeUrl) && baseUrl.endsWith("/en?format=image")) { + alternativeUrl = alternativeUrl.replace("/en?format=image", "/?format=image"); + } } } diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportCards.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportCards.java index 6d677e817a..1c25e6a4dd 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportCards.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportCards.java @@ -500,39 +500,83 @@ public class ScryfallImageSupportCards { // set/card_name/card_number // set/card_name/card_number - // Cards with non-ASCII collector numbers + // Cards with non-ASCII collector numbers must use direct download (cause xmage uses different card number) + // J14 put("J14/Plains/1*", "https://api.scryfall.com/cards/j14/1★/"); put("J14/Island/2*", "https://api.scryfall.com/cards/j14/2★/"); put("J14/Swamp/3*", "https://api.scryfall.com/cards/j14/3★/"); put("J14/Mountain/4*", "https://api.scryfall.com/cards/j14/4★/"); put("J14/Forest/5*", "https://api.scryfall.com/cards/j14/5★/"); + // PLS put("PLS/Tahngarth, Talruum Hero/74*", "https://api.scryfall.com/cards/pls/74★/"); put("PLS/Ertai, the Corrupted/107*", "https://api.scryfall.com/cards/pls/107★/"); put("PLS/Skyship Weatherlight/133*", "https://api.scryfall.com/cards/pls/133★/"); + // PROE put("PROE/Emrakul, the Aeons Torn/*4", "https://api.scryfall.com/cards/proe/★4/"); put("PROE/Lord of Shatterskull Pass/*156", "https://api.scryfall.com/cards/proe/★156/"); - + // PAL99 put("PAL99/Island/3+", "https://api.scryfall.com/cards/pal99/3†/"); + // PSOI put("PSOI/Tamiyo's Journal/265s+", "https://api.scryfall.com/cards/psoi/265s†/"); + // DKM + put("DKM/Icy Manipulator/36s", "https://api.scryfall.com/cards/dkm/36★/"); + put("DKM/Incinerate/14s", "https://api.scryfall.com/cards/dkm/14★/"); + // PWAR + put("PWAR/Ajani, the Greathearted/184s*", "https://api.scryfall.com/cards/pwar/184s★/"); + put("PWAR/Angrath, Captain of Chaos/227s*", "https://api.scryfall.com/cards/pwar/227s★/"); + put("PWAR/Arlinn, Voice of the Pack/150s*", "https://api.scryfall.com/cards/pwar/150s★/"); + put("PWAR/Ashiok, Dream Render/228s*", "https://api.scryfall.com/cards/pwar/228s★/"); + put("PWAR/Chandra, Fire Artisan/119s*", "https://api.scryfall.com/cards/pwar/119s★/"); + put("PWAR/Davriel, Rogue Shadowmage/83s*", "https://api.scryfall.com/cards/pwar/83s★/"); + put("PWAR/Domri, Anarch of Bolas/191s*", "https://api.scryfall.com/cards/pwar/191s★/"); + put("PWAR/Dovin, Hand of Control/229s*", "https://api.scryfall.com/cards/pwar/229s★/"); + put("PWAR/Gideon Blackblade/13s*", "https://api.scryfall.com/cards/pwar/13s★/"); + put("PWAR/Huatli, the Sun's Heart/230s*", "https://api.scryfall.com/cards/pwar/230s★/"); + put("PWAR/Jace, Wielder of Mysteries/54s*", "https://api.scryfall.com/cards/pwar/54s★/"); + put("PWAR/Jaya, Venerated Firemage/135s*", "https://api.scryfall.com/cards/pwar/135s★/"); + put("PWAR/Jiang Yanggu, Wildcrafter/164s*", "https://api.scryfall.com/cards/pwar/164s★/"); + put("PWAR/Karn, the Great Creator/1s*", "https://api.scryfall.com/cards/pwar/1s★/"); + put("PWAR/Kasmina, Enigmatic Mentor/56s*", "https://api.scryfall.com/cards/pwar/56s★/"); + put("PWAR/Kaya, Bane of the Dead/231s*", "https://api.scryfall.com/cards/pwar/231s★/"); + put("PWAR/Kiora, Behemoth Beckoner/232s*", "https://api.scryfall.com/cards/pwar/232s★/"); + put("PWAR/Liliana, Dreadhorde General/97s*", "https://api.scryfall.com/cards/pwar/97s★/"); + put("PWAR/Nahiri, Storm of Stone/233s*", "https://api.scryfall.com/cards/pwar/233s★/"); + put("PWAR/Narset, Parter of Veils/61s*", "https://api.scryfall.com/cards/pwar/61s★/"); + put("PWAR/Nicol Bolas, Dragon-God/207s*", "https://api.scryfall.com/cards/pwar/207s★/"); + put("PWAR/Nissa, Who Shakes the World/169s*", "https://api.scryfall.com/cards/pwar/169s★/"); + put("PWAR/Ob Nixilis, the Hate-Twisted/100s*", "https://api.scryfall.com/cards/pwar/100s★/"); + put("PWAR/Ral, Storm Conduit/211s*", "https://api.scryfall.com/cards/pwar/211s★/"); + put("PWAR/Saheeli, Sublime Artificer/234s*", "https://api.scryfall.com/cards/pwar/234s★/"); + put("PWAR/Samut, Tyrant Smasher/235s*", "https://api.scryfall.com/cards/pwar/235s★/"); + put("PWAR/Sarkhan the Masterless/143s*", "https://api.scryfall.com/cards/pwar/143s★/"); + put("PWAR/Sorin, Vengeful Bloodlord/217s*", "https://api.scryfall.com/cards/pwar/217s★/"); + put("PWAR/Tamiyo, Collector of Tales/220s*", "https://api.scryfall.com/cards/pwar/220s★/"); + put("PWAR/Teferi, Time Raveler/221s*", "https://api.scryfall.com/cards/pwar/221s★/"); + put("PWAR/Teyo, the Shieldmage/32s*", "https://api.scryfall.com/cards/pwar/32s★/"); + put("PWAR/The Wanderer/37s*", "https://api.scryfall.com/cards/pwar/37s★/"); + put("PWAR/Tibalt, Rakish Instigator/146s*", "https://api.scryfall.com/cards/pwar/146s★/"); + put("PWAR/Ugin, the Ineffable/2s*", "https://api.scryfall.com/cards/pwar/2s★/"); + put("PWAR/Vivien, Champion of the Wilds/180s*", "https://api.scryfall.com/cards/pwar/180s★/"); + put("PWAR/Vraska, Swarm's Eminence/236s*", "https://api.scryfall.com/cards/pwar/236s★/"); // 8th Edition box set and 9th Edition box set // scryfall stores it with one set, by xmage split into two -- 8ED and 8EB, 9ED and 9EB - put("8EB/Eager Cadet", "https://api.scryfall.com/cards/8ed/S1"); - put("8EB/Vengeance", "https://api.scryfall.com/cards/8ed/S2"); - put("8EB/Giant Octopus", "https://api.scryfall.com/cards/8ed/S3"); - put("8EB/Sea Eagle", "https://api.scryfall.com/cards/8ed/S4"); - put("8EB/Vizzerdrix", "https://api.scryfall.com/cards/8ed/S5"); - put("8EB/Enormous Baloth", "https://api.scryfall.com/cards/8ed/S6"); - put("8EB/Silverback Ape", "https://api.scryfall.com/cards/8ed/S7"); - put("9EB/Eager Cadet", "https://api.scryfall.com/cards/9ed/S1"); - put("9EB/Vengeance", "https://api.scryfall.com/cards/9ed/S3"); - put("9EB/Coral Eel", "https://api.scryfall.com/cards/9ed/S3"); - put("9EB/Giant Octopus", "https://api.scryfall.com/cards/9ed/S4"); - put("9EB/Index", "https://api.scryfall.com/cards/9ed/S5"); - put("9EB/Vizzerdrix", "https://api.scryfall.com/cards/9ed/S7"); - put("9EB/Goblin Raider", "https://api.scryfall.com/cards/9ed/S8"); - put("9EB/Enormous Baloth", "https://api.scryfall.com/cards/9ed/S9"); - put("9EB/Spined Wurm", "https://api.scryfall.com/cards/9ed/S10"); + put("8EB/Eager Cadet", "https://api.scryfall.com/cards/8ed/S1/"); + put("8EB/Vengeance", "https://api.scryfall.com/cards/8ed/S2/"); + put("8EB/Giant Octopus", "https://api.scryfall.com/cards/8ed/S3/"); + put("8EB/Sea Eagle", "https://api.scryfall.com/cards/8ed/S4/"); + put("8EB/Vizzerdrix", "https://api.scryfall.com/cards/8ed/S5/"); + put("8EB/Enormous Baloth", "https://api.scryfall.com/cards/8ed/S6/"); + put("8EB/Silverback Ape", "https://api.scryfall.com/cards/8ed/S7/"); + put("9EB/Eager Cadet", "https://api.scryfall.com/cards/9ed/S1/"); + put("9EB/Vengeance", "https://api.scryfall.com/cards/9ed/S3/"); + put("9EB/Coral Eel", "https://api.scryfall.com/cards/9ed/S3/"); + put("9EB/Giant Octopus", "https://api.scryfall.com/cards/9ed/S4/"); + put("9EB/Index", "https://api.scryfall.com/cards/9ed/S5/"); + put("9EB/Vizzerdrix", "https://api.scryfall.com/cards/9ed/S7/"); + put("9EB/Goblin Raider", "https://api.scryfall.com/cards/9ed/S8/"); + put("9EB/Enormous Baloth", "https://api.scryfall.com/cards/9ed/S9/"); + put("9EB/Spined Wurm", "https://api.scryfall.com/cards/9ed/S10/"); } }; diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/images/CardDownloadData.java b/Mage.Client/src/main/java/org/mage/plugins/card/images/CardDownloadData.java index 6913d5223f..5d7c6eaa32 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/images/CardDownloadData.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/images/CardDownloadData.java @@ -134,7 +134,8 @@ public class CardDownloadData { public String getCollectorIdAsFileName() { // return file names compatible card number (e.g. replace special symbols) return collectorId - .replace("*", "star"); + .replace("*", "star") + .replace("★", "star"); } public String getCollectorIdPostfix() { diff --git a/Mage.Sets/src/mage/sets/ArenaNewPlayerExperience.java b/Mage.Sets/src/mage/sets/ArenaNewPlayerExperience.java index aaad1327f9..2a3492ea81 100644 --- a/Mage.Sets/src/mage/sets/ArenaNewPlayerExperience.java +++ b/Mage.Sets/src/mage/sets/ArenaNewPlayerExperience.java @@ -16,48 +16,40 @@ public final class ArenaNewPlayerExperience extends ExpansionSet { } private ArenaNewPlayerExperience() { - super("Arena New Player Experience", "ANA", ExpansionSet.buildDate(2018, 7, 29), SetType.MAGIC_ONLINE); + super("Arena New Player Experience", "ANA", ExpansionSet.buildDate(2018, 7, 14), SetType.MAGIC_ONLINE); this.hasBoosters = false; this.hasBasicLands = false; - cards.add(new SetCardInfo("Altar's Reap", 24, Rarity.COMMON, mage.cards.a.AltarsReap.class)); - cards.add(new SetCardInfo("Ambition's Cost", 25, Rarity.UNCOMMON, mage.cards.a.AmbitionsCost.class)); cards.add(new SetCardInfo("Angelic Reward", 1, Rarity.UNCOMMON, mage.cards.a.AngelicReward.class)); - cards.add(new SetCardInfo("Blinding Radiance", 2, Rarity.UNCOMMON, mage.cards.b.BlindingRadiance.class)); - cards.add(new SetCardInfo("Chaos Maw", 36, Rarity.RARE, mage.cards.c.ChaosMaw.class)); cards.add(new SetCardInfo("Confront the Assault", 3, Rarity.UNCOMMON, mage.cards.c.ConfrontTheAssault.class)); - cards.add(new SetCardInfo("Cruel Cut", 26, Rarity.COMMON, mage.cards.c.CruelCut.class)); - cards.add(new SetCardInfo("Divination", 14, Rarity.COMMON, mage.cards.d.Divination.class)); - cards.add(new SetCardInfo("Doublecast", 37, Rarity.UNCOMMON, mage.cards.d.Doublecast.class)); cards.add(new SetCardInfo("Feral Roar", 46, Rarity.COMMON, mage.cards.f.FeralRoar.class)); - cards.add(new SetCardInfo("Goblin Bruiser", 39, Rarity.UNCOMMON, mage.cards.g.GoblinBruiser.class)); - cards.add(new SetCardInfo("Goblin Gang Leader", 40, Rarity.UNCOMMON, mage.cards.g.GoblinGangLeader.class)); - cards.add(new SetCardInfo("Goblin Grenade", 41, Rarity.UNCOMMON, mage.cards.g.GoblinGrenade.class)); + cards.add(new SetCardInfo("Forest", 55, Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Forest", 60, Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Forest", 65, Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Inspiring Commander", 5, Rarity.RARE, mage.cards.i.InspiringCommander.class)); + cards.add(new SetCardInfo("Island", 52, Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Island", 57, Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Island", 62, Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Knight's Pledge", 6, Rarity.COMMON, mage.cards.k.KnightsPledge.class)); - cards.add(new SetCardInfo("Loxodon Line Breaker", 7, Rarity.COMMON, mage.cards.l.LoxodonLineBreaker.class)); - cards.add(new SetCardInfo("Miasmic Mummy", 29, Rarity.COMMON, mage.cards.m.MiasmicMummy.class)); - cards.add(new SetCardInfo("Nimble Pilferer", 31, Rarity.COMMON, mage.cards.n.NimblePilferer.class)); - cards.add(new SetCardInfo("Ogre Painbringer", 42, Rarity.RARE, mage.cards.o.OgrePainbringer.class)); - cards.add(new SetCardInfo("Overflowing Insight", 16, Rarity.MYTHIC, mage.cards.o.OverflowingInsight.class)); + cards.add(new SetCardInfo("Mountain", 54, Rarity.LAND, mage.cards.basiclands.Mountain.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Mountain", 59, Rarity.LAND, mage.cards.basiclands.Mountain.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Mountain", 64, Rarity.LAND, mage.cards.basiclands.Mountain.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Plains", 51, Rarity.LAND, mage.cards.basiclands.Plains.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Plains", 56, Rarity.LAND, mage.cards.basiclands.Plains.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Plains", 61, Rarity.LAND, mage.cards.basiclands.Plains.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Raging Goblin", 43, Rarity.COMMON, mage.cards.r.RagingGoblin.class)); - cards.add(new SetCardInfo("Renegade Demon", 33, Rarity.COMMON, mage.cards.r.RenegadeDemon.class)); cards.add(new SetCardInfo("Rise from the Grave", 34, Rarity.UNCOMMON, mage.cards.r.RiseFromTheGrave.class)); cards.add(new SetCardInfo("River's Favor", 17, Rarity.COMMON, mage.cards.r.RiversFavor.class)); - cards.add(new SetCardInfo("Rumbling Baloth", 47, Rarity.COMMON, mage.cards.r.RumblingBaloth.class)); cards.add(new SetCardInfo("Sanctuary Cat", 8, Rarity.COMMON, mage.cards.s.SanctuaryCat.class)); - cards.add(new SetCardInfo("Seismic Rupture", 44, Rarity.UNCOMMON, mage.cards.s.SeismicRupture.class)); cards.add(new SetCardInfo("Serra Angel", 9, Rarity.UNCOMMON, mage.cards.s.SerraAngel.class)); cards.add(new SetCardInfo("Shorecomber Crab", 18, Rarity.COMMON, mage.cards.s.ShorecomberCrab.class)); cards.add(new SetCardInfo("Shrine Keeper", 10, Rarity.COMMON, mage.cards.s.ShrineKeeper.class)); - cards.add(new SetCardInfo("Soulhunter Rakshasa", 35, Rarity.RARE, mage.cards.s.SoulhunterRakshasa.class)); cards.add(new SetCardInfo("Spiritual Guardian", 11, Rarity.COMMON, mage.cards.s.SpiritualGuardian.class)); + cards.add(new SetCardInfo("Swamp", 53, Rarity.LAND, mage.cards.basiclands.Swamp.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Swamp", 58, Rarity.LAND, mage.cards.basiclands.Swamp.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Swamp", 63, Rarity.LAND, mage.cards.basiclands.Swamp.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Tactical Advantage", 12, Rarity.COMMON, mage.cards.t.TacticalAdvantage.class)); - cards.add(new SetCardInfo("Take Vengeance", 13, Rarity.COMMON, mage.cards.t.TakeVengeance.class)); - cards.add(new SetCardInfo("Titanic Pelagosaur", 19, Rarity.UNCOMMON, mage.cards.t.TitanicPelagosaur.class)); cards.add(new SetCardInfo("Treetop Warden", 48, Rarity.COMMON, mage.cards.t.TreetopWarden.class)); - cards.add(new SetCardInfo("Volcanic Dragon", 45, Rarity.UNCOMMON, mage.cards.v.VolcanicDragon.class)); - cards.add(new SetCardInfo("Waterknot", 22, Rarity.COMMON, mage.cards.w.Waterknot.class)); cards.add(new SetCardInfo("Zephyr Gull", 23, Rarity.COMMON, mage.cards.z.ZephyrGull.class)); } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/ArenaNewPlayerExperienceExtras.java b/Mage.Sets/src/mage/sets/ArenaNewPlayerExperienceExtras.java new file mode 100644 index 0000000000..c61eaca674 --- /dev/null +++ b/Mage.Sets/src/mage/sets/ArenaNewPlayerExperienceExtras.java @@ -0,0 +1,47 @@ +package mage.sets; + +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; + +/** + * @author JayDi85 + */ +public final class ArenaNewPlayerExperienceExtras extends ExpansionSet { + + private static final ArenaNewPlayerExperienceExtras instance = new ArenaNewPlayerExperienceExtras(); + + public static ArenaNewPlayerExperienceExtras getInstance() { + return instance; + } + + private ArenaNewPlayerExperienceExtras() { + super("Arena New Player Experience Extras", "XANA", ExpansionSet.buildDate(2018, 7, 14), SetType.MAGIC_ONLINE); + this.hasBoosters = false; + this.hasBasicLands = false; + + cards.add(new SetCardInfo("Altar's Reap", 24, Rarity.COMMON, mage.cards.a.AltarsReap.class)); + cards.add(new SetCardInfo("Ambition's Cost", 25, Rarity.UNCOMMON, mage.cards.a.AmbitionsCost.class)); + cards.add(new SetCardInfo("Blinding Radiance", 2, Rarity.UNCOMMON, mage.cards.b.BlindingRadiance.class)); + cards.add(new SetCardInfo("Chaos Maw", 36, Rarity.RARE, mage.cards.c.ChaosMaw.class)); + cards.add(new SetCardInfo("Cruel Cut", 26, Rarity.COMMON, mage.cards.c.CruelCut.class)); + cards.add(new SetCardInfo("Divination", 14, Rarity.COMMON, mage.cards.d.Divination.class)); + cards.add(new SetCardInfo("Doublecast", 37, Rarity.UNCOMMON, mage.cards.d.Doublecast.class)); + cards.add(new SetCardInfo("Goblin Bruiser", 39, Rarity.UNCOMMON, mage.cards.g.GoblinBruiser.class)); + cards.add(new SetCardInfo("Goblin Gang Leader", 40, Rarity.UNCOMMON, mage.cards.g.GoblinGangLeader.class)); + cards.add(new SetCardInfo("Goblin Grenade", 41, Rarity.UNCOMMON, mage.cards.g.GoblinGrenade.class)); + cards.add(new SetCardInfo("Loxodon Line Breaker", 7, Rarity.COMMON, mage.cards.l.LoxodonLineBreaker.class)); + cards.add(new SetCardInfo("Miasmic Mummy", 29, Rarity.COMMON, mage.cards.m.MiasmicMummy.class)); + cards.add(new SetCardInfo("Nimble Pilferer", 31, Rarity.COMMON, mage.cards.n.NimblePilferer.class)); + cards.add(new SetCardInfo("Ogre Painbringer", 42, Rarity.RARE, mage.cards.o.OgrePainbringer.class)); + cards.add(new SetCardInfo("Overflowing Insight", 16, Rarity.MYTHIC, mage.cards.o.OverflowingInsight.class)); + cards.add(new SetCardInfo("Renegade Demon", 33, Rarity.COMMON, mage.cards.r.RenegadeDemon.class)); + cards.add(new SetCardInfo("Rumbling Baloth", 47, Rarity.COMMON, mage.cards.r.RumblingBaloth.class)); + cards.add(new SetCardInfo("Seismic Rupture", 44, Rarity.UNCOMMON, mage.cards.s.SeismicRupture.class)); + cards.add(new SetCardInfo("Soulhunter Rakshasa", 35, Rarity.RARE, mage.cards.s.SoulhunterRakshasa.class)); + cards.add(new SetCardInfo("Take Vengeance", 13, Rarity.COMMON, mage.cards.t.TakeVengeance.class)); + cards.add(new SetCardInfo("Titanic Pelagosaur", 19, Rarity.UNCOMMON, mage.cards.t.TitanicPelagosaur.class)); + cards.add(new SetCardInfo("Volcanic Dragon", 45, Rarity.UNCOMMON, mage.cards.v.VolcanicDragon.class)); + cards.add(new SetCardInfo("Waterknot", 22, Rarity.COMMON, mage.cards.w.Waterknot.class)); + } +} \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/ColdsnapThemeDecks.java b/Mage.Sets/src/mage/sets/ColdsnapThemeDecks.java index d9676c78d5..2878cb519a 100644 --- a/Mage.Sets/src/mage/sets/ColdsnapThemeDecks.java +++ b/Mage.Sets/src/mage/sets/ColdsnapThemeDecks.java @@ -54,7 +54,7 @@ public class ColdsnapThemeDecks extends ExpansionSet { cards.add(new SetCardInfo("Kjeldoran Home Guard", 8, Rarity.UNCOMMON, mage.cards.k.KjeldoranHomeGuard.class)); cards.add(new SetCardInfo("Kjeldoran Pride", "9b", Rarity.COMMON, mage.cards.k.KjeldoranPride.class)); cards.add(new SetCardInfo("Lat-Nam's Legacy", "30b", Rarity.COMMON, mage.cards.l.LatNamsLegacy.class)); - cards.add(new SetCardInfo("Legions of Lim-Dûl", 142, Rarity.COMMON, mage.cards.l.LegionsOfLimDul.class)); + cards.add(new SetCardInfo("Legions of Lim-Dul", 142, Rarity.COMMON, mage.cards.l.LegionsOfLimDul.class)); cards.add(new SetCardInfo("Mistfolk", 84, Rarity.COMMON, mage.cards.m.Mistfolk.class)); cards.add(new SetCardInfo("Mountain", 378, Rarity.LAND, mage.cards.basiclands.Mountain.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Mountain", 379, Rarity.LAND, mage.cards.basiclands.Mountain.class, NON_FULL_USE_VARIOUS)); diff --git a/Mage.Sets/src/mage/sets/Deckmasters.java b/Mage.Sets/src/mage/sets/Deckmasters.java index de39a48faa..aa1193a954 100644 --- a/Mage.Sets/src/mage/sets/Deckmasters.java +++ b/Mage.Sets/src/mage/sets/Deckmasters.java @@ -52,8 +52,8 @@ public class Deckmasters extends ExpansionSet { // Card not implemented // cards.add(new SetCardInfo("Lava Burst", 16, Rarity.COMMON, mage.cards.l.LavaBurst.class)); cards.add(new SetCardInfo("Lhurgoyf", 29, Rarity.RARE, mage.cards.l.Lhurgoyf.class)); - cards.add(new SetCardInfo("Lim-Dûl's High Guard", "6a", Rarity.COMMON, mage.cards.l.LimDulsHighGuard.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Lim-Dûl's High Guard", "6b", Rarity.COMMON, mage.cards.l.LimDulsHighGuard.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Lim-Dul's High Guard", "6a", Rarity.COMMON, mage.cards.l.LimDulsHighGuard.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Lim-Dul's High Guard", "6b", Rarity.COMMON, mage.cards.l.LimDulsHighGuard.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Mountain", 45, Rarity.LAND, mage.cards.basiclands.Mountain.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Mountain", 46, Rarity.LAND, mage.cards.basiclands.Mountain.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Mountain", 47, Rarity.LAND, mage.cards.basiclands.Mountain.class, NON_FULL_USE_VARIOUS)); diff --git a/Mage.Sets/src/mage/sets/DuelsOfThePlaneswalkers2013Promos.java b/Mage.Sets/src/mage/sets/DuelsOfThePlaneswalkers2013Promos.java index 36f01b73e1..e438e8603a 100644 --- a/Mage.Sets/src/mage/sets/DuelsOfThePlaneswalkers2013Promos.java +++ b/Mage.Sets/src/mage/sets/DuelsOfThePlaneswalkers2013Promos.java @@ -22,8 +22,8 @@ public final class DuelsOfThePlaneswalkers2013Promos extends ExpansionSet { this.hasBoosters = false; this.hasBasicLands = false; - cards.add(new SetCardInfo("Bonescythe Sliver", 10, Rarity.RARE, mage.cards.b.BonescytheSliver.class)); - cards.add(new SetCardInfo("Ogre Battledriver", 11, Rarity.RARE, mage.cards.o.OgreBattledriver.class)); - cards.add(new SetCardInfo("Scavenging Ooze", 12, Rarity.RARE, mage.cards.s.ScavengingOoze.class)); + cards.add(new SetCardInfo("Bonescythe Sliver", 1, Rarity.RARE, mage.cards.b.BonescytheSliver.class)); + cards.add(new SetCardInfo("Ogre Battledriver", 2, Rarity.RARE, mage.cards.o.OgreBattledriver.class)); + cards.add(new SetCardInfo("Scavenging Ooze", 3, Rarity.RARE, mage.cards.s.ScavengingOoze.class)); } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/MTGArenaPromos.java b/Mage.Sets/src/mage/sets/MTGArenaPromos.java index 38c19da333..8a3c8f7a1b 100644 --- a/Mage.Sets/src/mage/sets/MTGArenaPromos.java +++ b/Mage.Sets/src/mage/sets/MTGArenaPromos.java @@ -20,40 +20,62 @@ public class MTGArenaPromos extends ExpansionSet { this.hasBoosters = false; this.hasBasicLands = true; - cards.add(new SetCardInfo("Duress", "ALT-4", Rarity.COMMON, mage.cards.d.Duress.class)); - cards.add(new SetCardInfo("Firemind's Research", "ALT-7", Rarity.RARE, mage.cards.f.FiremindsResearch.class)); - cards.add(new SetCardInfo("Forest", "AKH-105", Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Forest", "BFZ-105", Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Forest", "MIR-105", Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Forest", "ROE-105", Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Forest", "RTR-105", Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Ghalta, Primal Hunger", "ALT-5", Rarity.RARE, mage.cards.g.GhaltaPrimalHunger.class)); - cards.add(new SetCardInfo("Island", "AKH-102", Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Island", "BFZ-102", Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Island", "MIR-102", Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Island", "ROE-102", Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Island", "RTR-102", Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Llanowar Elves", "ALT-6", Rarity.COMMON, mage.cards.l.LlanowarElves.class)); - cards.add(new SetCardInfo("Mountain", "AKH-104", Rarity.LAND, mage.cards.basiclands.Mountain.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Mountain", "BFZ-104", Rarity.LAND, mage.cards.basiclands.Mountain.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Mountain", "MIR-104", Rarity.LAND, mage.cards.basiclands.Mountain.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Mountain", "ROE-104", Rarity.LAND, mage.cards.basiclands.Mountain.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Mountain", "RTR-104", Rarity.LAND, mage.cards.basiclands.Mountain.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Plains", "AKH-101", Rarity.LAND, mage.cards.basiclands.Plains.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Plains", "BFZ-101", Rarity.LAND, mage.cards.basiclands.Plains.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Plains", "MIR-101", Rarity.LAND, mage.cards.basiclands.Plains.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Plains", "ROE-101", Rarity.LAND, mage.cards.basiclands.Plains.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Plains", "RTR-101", Rarity.LAND, mage.cards.basiclands.Plains.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Ral, Izzet Viceroy", "ALT-1", Rarity.MYTHIC, mage.cards.r.RalIzzetViceroy.class)); - cards.add(new SetCardInfo("Rhys the Redeemed", "BRAWL-201", Rarity.RARE, mage.cards.r.RhysTheRedeemed.class)); - cards.add(new SetCardInfo("Swamp", "AKH-103", Rarity.LAND, mage.cards.basiclands.Swamp.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Swamp", "BFZ-103", Rarity.LAND, mage.cards.basiclands.Swamp.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Swamp", "MIR-103", Rarity.LAND, mage.cards.basiclands.Swamp.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Swamp", "ROE-103", Rarity.LAND, mage.cards.basiclands.Swamp.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Swamp", "RTR-103", Rarity.LAND, mage.cards.basiclands.Swamp.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Talrand, Sky Summoner", "BRAWL-202", Rarity.RARE, mage.cards.t.TalrandSkySummoner.class)); - cards.add(new SetCardInfo("Teferi, Hero of Dominaria", "ALT-2", Rarity.MYTHIC, mage.cards.t.TeferiHeroOfDominaria.class)); - cards.add(new SetCardInfo("The Gitrog Monster", "BRAWL-203", Rarity.MYTHIC, mage.cards.t.TheGitrogMonster.class)); - cards.add(new SetCardInfo("Vraska, Golgari Queen", "ALT-3", Rarity.MYTHIC, mage.cards.v.VraskaGolgariQueen.class)); - } + cards.add(new SetCardInfo("Bladewing the Risen", 104, Rarity.RARE, mage.cards.b.BladewingTheRisen.class)); + cards.add(new SetCardInfo("Duress", 6, Rarity.COMMON, mage.cards.d.Duress.class)); + cards.add(new SetCardInfo("Firemind's Research", 5, Rarity.RARE, mage.cards.f.FiremindsResearch.class)); + cards.add(new SetCardInfo("Forest", 205, Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Forest", 210, Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Forest", 215, Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Forest", 220, Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Forest", 225, Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Forest", 230, Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Forest", 235, Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Forest", 240, Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Forest", 245, Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Ghalta, Primal Hunger", 7, Rarity.RARE, mage.cards.g.GhaltaPrimalHunger.class)); + cards.add(new SetCardInfo("Hanna, Ship's Navigator", 105, Rarity.RARE, mage.cards.h.HannaShipsNavigator.class)); + cards.add(new SetCardInfo("Island", 202, Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Island", 207, Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Island", 212, Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Island", 217, Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Island", 222, Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Island", 227, Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Island", 232, Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Island", 237, Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Island", 242, Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Llanowar Elves", 4, Rarity.COMMON, mage.cards.l.LlanowarElves.class)); + cards.add(new SetCardInfo("Mountain", 204, Rarity.LAND, mage.cards.basiclands.Mountain.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Mountain", 209, Rarity.LAND, mage.cards.basiclands.Mountain.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Mountain", 214, Rarity.LAND, mage.cards.basiclands.Mountain.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Mountain", 219, Rarity.LAND, mage.cards.basiclands.Mountain.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Mountain", 224, Rarity.LAND, mage.cards.basiclands.Mountain.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Mountain", 229, Rarity.LAND, mage.cards.basiclands.Mountain.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Mountain", 234, Rarity.LAND, mage.cards.basiclands.Mountain.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Mountain", 239, Rarity.LAND, mage.cards.basiclands.Mountain.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Mountain", 244, Rarity.LAND, mage.cards.basiclands.Mountain.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Plains", 201, Rarity.LAND, mage.cards.basiclands.Plains.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Plains", 206, Rarity.LAND, mage.cards.basiclands.Plains.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Plains", 211, Rarity.LAND, mage.cards.basiclands.Plains.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Plains", 216, Rarity.LAND, mage.cards.basiclands.Plains.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Plains", 221, Rarity.LAND, mage.cards.basiclands.Plains.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Plains", 226, Rarity.LAND, mage.cards.basiclands.Plains.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Plains", 231, Rarity.LAND, mage.cards.basiclands.Plains.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Plains", 236, Rarity.LAND, mage.cards.basiclands.Plains.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Plains", 241, Rarity.LAND, mage.cards.basiclands.Plains.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Ral, Izzet Viceroy", 1, Rarity.MYTHIC, mage.cards.r.RalIzzetViceroy.class)); + cards.add(new SetCardInfo("Rhys the Redeemed", 101, Rarity.RARE, mage.cards.r.RhysTheRedeemed.class)); + cards.add(new SetCardInfo("Swamp", 203, Rarity.LAND, mage.cards.basiclands.Swamp.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Swamp", 208, Rarity.LAND, mage.cards.basiclands.Swamp.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Swamp", 213, Rarity.LAND, mage.cards.basiclands.Swamp.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Swamp", 218, Rarity.LAND, mage.cards.basiclands.Swamp.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Swamp", 223, Rarity.LAND, mage.cards.basiclands.Swamp.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Swamp", 228, Rarity.LAND, mage.cards.basiclands.Swamp.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Swamp", 233, Rarity.LAND, mage.cards.basiclands.Swamp.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Swamp", 238, Rarity.LAND, mage.cards.basiclands.Swamp.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Swamp", 243, Rarity.LAND, mage.cards.basiclands.Swamp.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Talrand, Sky Summoner", 102, Rarity.RARE, mage.cards.t.TalrandSkySummoner.class)); + cards.add(new SetCardInfo("Teferi, Hero of Dominaria", 2, Rarity.MYTHIC, mage.cards.t.TeferiHeroOfDominaria.class)); + cards.add(new SetCardInfo("The Gitrog Monster", 103, Rarity.MYTHIC, mage.cards.t.TheGitrogMonster.class)); + cards.add(new SetCardInfo("Vraska, Golgari Queen", 3, Rarity.MYTHIC, mage.cards.v.VraskaGolgariQueen.class)); + } } diff --git a/Mage.Sets/src/mage/sets/MagicOnlinePromos.java b/Mage.Sets/src/mage/sets/MagicOnlinePromos.java index db7e93e757..ff171299cf 100644 --- a/Mage.Sets/src/mage/sets/MagicOnlinePromos.java +++ b/Mage.Sets/src/mage/sets/MagicOnlinePromos.java @@ -544,7 +544,7 @@ public class MagicOnlinePromos extends ExpansionSet { cards.add(new SetCardInfo("Icatian Javelineers", 59639, Rarity.COMMON, mage.cards.i.IcatianJavelineers.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Icy Manipulator", 35042, Rarity.UNCOMMON, mage.cards.i.IcyManipulator.class)); cards.add(new SetCardInfo("Identity Thief", 61559, Rarity.RARE, mage.cards.i.IdentityThief.class)); - cards.add(new SetCardInfo("Ifh-Bíff Efreet", 213, Rarity.RARE, mage.cards.i.IfhBiffEfreet.class)); + cards.add(new SetCardInfo("Ifh-Biff Efreet", 213, Rarity.RARE, mage.cards.i.IfhBiffEfreet.class)); cards.add(new SetCardInfo("Immolating Glare", 59669, Rarity.UNCOMMON, mage.cards.i.ImmolatingGlare.class)); cards.add(new SetCardInfo("Imperious Perfect", 31409, Rarity.UNCOMMON, mage.cards.i.ImperiousPerfect.class)); cards.add(new SetCardInfo("Impulse", 36006, Rarity.COMMON, mage.cards.i.Impulse.class)); @@ -598,7 +598,7 @@ public class MagicOnlinePromos extends ExpansionSet { cards.add(new SetCardInfo("Karakas", 43592, Rarity.UNCOMMON, mage.cards.k.Karakas.class)); cards.add(new SetCardInfo("Karametra's Acolyte", 50118, Rarity.UNCOMMON, mage.cards.k.KarametrasAcolyte.class)); cards.add(new SetCardInfo("Karn, Silver Golem", 36106, Rarity.RARE, mage.cards.k.KarnSilverGolem.class)); - cards.add(new SetCardInfo("Khabál Ghoul", 215, Rarity.UNCOMMON, mage.cards.k.KhabalGhoul.class)); + cards.add(new SetCardInfo("Khabal Ghoul", 215, Rarity.UNCOMMON, mage.cards.k.KhabalGhoul.class)); cards.add(new SetCardInfo("Killing Wave", 44319, Rarity.RARE, mage.cards.k.KillingWave.class)); cards.add(new SetCardInfo("Kiora's Follower", 51926, Rarity.UNCOMMON, mage.cards.k.KiorasFollower.class)); cards.add(new SetCardInfo("Kiora, the Crashing Wave", 59651, Rarity.MYTHIC, mage.cards.k.KioraTheCrashingWave.class)); diff --git a/Mage.Sets/src/mage/sets/MagicOnlineThemeDecks.java b/Mage.Sets/src/mage/sets/MagicOnlineThemeDecks.java index 82a03fbe53..00c4c49229 100644 --- a/Mage.Sets/src/mage/sets/MagicOnlineThemeDecks.java +++ b/Mage.Sets/src/mage/sets/MagicOnlineThemeDecks.java @@ -107,7 +107,7 @@ public class MagicOnlineThemeDecks extends ExpansionSet { cards.add(new SetCardInfo("Jund Panorama", "A131", Rarity.COMMON, mage.cards.j.JundPanorama.class)); cards.add(new SetCardInfo("Jungle Barrier", "A99", Rarity.UNCOMMON, mage.cards.j.JungleBarrier.class)); cards.add(new SetCardInfo("Jungle Lion", "A76", Rarity.COMMON, mage.cards.j.JungleLion.class)); - cards.add(new SetCardInfo("Jötun Grunt", "B5", Rarity.UNCOMMON, mage.cards.j.JotunGrunt.class)); + cards.add(new SetCardInfo("Jotun Grunt", "B5", Rarity.UNCOMMON, mage.cards.j.JotunGrunt.class)); cards.add(new SetCardInfo("Kami of Ancient Law", "A9", Rarity.COMMON, mage.cards.k.KamiOfAncientLaw.class)); cards.add(new SetCardInfo("Karakas", "B32", Rarity.RARE, mage.cards.k.Karakas.class)); cards.add(new SetCardInfo("Keldon Marauders", "B19", Rarity.COMMON, mage.cards.k.KeldonMarauders.class)); diff --git a/Mage.Sets/src/mage/sets/SummerMagic.java b/Mage.Sets/src/mage/sets/SummerMagic.java index 192e50d94c..ec6e0d5699 100644 --- a/Mage.Sets/src/mage/sets/SummerMagic.java +++ b/Mage.Sets/src/mage/sets/SummerMagic.java @@ -102,7 +102,7 @@ public class SummerMagic extends ExpansionSet { cards.add(new SetCardInfo("Earthbind", 147, Rarity.COMMON, mage.cards.e.Earthbind.class)); cards.add(new SetCardInfo("Earthquake", 148, Rarity.RARE, mage.cards.e.Earthquake.class)); cards.add(new SetCardInfo("Ebony Horse", 247, Rarity.RARE, mage.cards.e.EbonyHorse.class)); - cards.add(new SetCardInfo("El-Hajjâj", 108, Rarity.RARE, mage.cards.e.ElHajjaj.class)); + cards.add(new SetCardInfo("El-Hajjaj", 108, Rarity.RARE, mage.cards.e.ElHajjaj.class)); cards.add(new SetCardInfo("Elvish Archers", 193, Rarity.RARE, mage.cards.e.ElvishArchers.class)); cards.add(new SetCardInfo("Energy Flux", 57, Rarity.UNCOMMON, mage.cards.e.EnergyFlux.class)); cards.add(new SetCardInfo("Erg Raiders", 109, Rarity.COMMON, mage.cards.e.ErgRaiders.class)); diff --git a/Mage.Sets/src/mage/sets/WarOfTheSparkPromos.java b/Mage.Sets/src/mage/sets/WarOfTheSparkPromos.java index d776f057c0..4800fe6de4 100644 --- a/Mage.Sets/src/mage/sets/WarOfTheSparkPromos.java +++ b/Mage.Sets/src/mage/sets/WarOfTheSparkPromos.java @@ -20,37 +20,39 @@ public class WarOfTheSparkPromos extends ExpansionSet { this.hasBoosters = false; this.hasBasicLands = false; - // Commented cards are Japanese-only printings with a special artwork. cards.add(new SetCardInfo("Ajani, the Greathearted", "184p", Rarity.RARE, mage.cards.a.AjaniTheGreathearted.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Ajani, the Greathearted", "184s", Rarity.RARE, mage.cards.a.AjaniTheGreathearted.class, NON_FULL_USE_VARIOUS)); - //cards.add(new SetCardInfo("Ajani, the Greathearted", "184s★", Rarity.RARE, mage.cards.a.AjaniTheGreathearted.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Ajani, the Greathearted", "184s*", Rarity.RARE, mage.cards.a.AjaniTheGreathearted.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Angrath, Captain of Chaos", "227s", Rarity.UNCOMMON, mage.cards.a.AngrathCaptainOfChaos.class, NON_FULL_USE_VARIOUS)); - //cards.add(new SetCardInfo("Angrath, Captain of Chaos", "227s★", Rarity.UNCOMMON, mage.cards.a.AngrathCaptainOfChaos.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Angrath, Captain of Chaos", "227s*", Rarity.UNCOMMON, mage.cards.a.AngrathCaptainOfChaos.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Arlinn, Voice of the Pack", "150s", Rarity.UNCOMMON, mage.cards.a.ArlinnVoiceOfThePack.class, NON_FULL_USE_VARIOUS)); - //cards.add(new SetCardInfo("Arlinn, Voice of the Pack", "150s★", Rarity.UNCOMMON, mage.cards.a.ArlinnVoiceOfThePack.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Arlinn, Voice of the Pack", "150s*", Rarity.UNCOMMON, mage.cards.a.ArlinnVoiceOfThePack.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Ashiok, Dream Render", "228s", Rarity.UNCOMMON, mage.cards.a.AshiokDreamRender.class, NON_FULL_USE_VARIOUS)); - //cards.add(new SetCardInfo("Ashiok, Dream Render", "228s★", Rarity.UNCOMMON, mage.cards.a.AshiokDreamRender.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Ashiok, Dream Render", "228s*", Rarity.UNCOMMON, mage.cards.a.AshiokDreamRender.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Augur of Bolas", 41, Rarity.UNCOMMON, mage.cards.a.AugurOfBolas.class)); cards.add(new SetCardInfo("Awakening of Vitu-Ghazi", "152s", Rarity.RARE, mage.cards.a.AwakeningOfVituGhazi.class)); cards.add(new SetCardInfo("Bioessence Hydra", "186s", Rarity.RARE, mage.cards.b.BioessenceHydra.class)); - cards.add(new SetCardInfo("Blast Zone", "244s", Rarity.RARE, mage.cards.b.BlastZone.class)); - cards.add(new SetCardInfo("Bolas's Citadel", 79, Rarity.RARE, mage.cards.b.BolassCitadel.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Blast Zone", "244p", Rarity.RARE, mage.cards.b.BlastZone.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Blast Zone", "244s", Rarity.RARE, mage.cards.b.BlastZone.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Bolas's Citadel", "79p", Rarity.RARE, mage.cards.b.BolassCitadel.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Bolas's Citadel", "79s", Rarity.RARE, mage.cards.b.BolassCitadel.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Bolas's Citadel", 79, Rarity.RARE, mage.cards.b.BolassCitadel.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Casualties of War", "187s", Rarity.RARE, mage.cards.c.CasualtiesOfWar.class)); cards.add(new SetCardInfo("Chandra, Fire Artisan", "119p", Rarity.RARE, mage.cards.c.ChandraFireArtisan.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Chandra, Fire Artisan", "119s", Rarity.RARE, mage.cards.c.ChandraFireArtisan.class, NON_FULL_USE_VARIOUS)); - //cards.add(new SetCardInfo("Chandra, Fire Artisan", "119s★", Rarity.RARE, mage.cards.c.ChandraFireArtisan.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Chandra, Fire Artisan", "119s*", Rarity.RARE, mage.cards.c.ChandraFireArtisan.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Command the Dreadhorde", "82s", Rarity.RARE, mage.cards.c.CommandTheDreadhorde.class)); cards.add(new SetCardInfo("Commence the Endgame", "45p", Rarity.RARE, mage.cards.c.CommenceTheEndgame.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Commence the Endgame", "45s", Rarity.RARE, mage.cards.c.CommenceTheEndgame.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Davriel, Rogue Shadowmage", "83s", Rarity.UNCOMMON, mage.cards.d.DavrielRogueShadowmage.class, NON_FULL_USE_VARIOUS)); - //cards.add(new SetCardInfo("Davriel, Rogue Shadowmage", "83s★", Rarity.UNCOMMON, mage.cards.d.DavrielRogueShadowmage.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Davriel, Rogue Shadowmage", "83s*", Rarity.UNCOMMON, mage.cards.d.DavrielRogueShadowmage.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Deliver Unto Evil", "85s", Rarity.RARE, mage.cards.d.DeliverUntoEvil.class)); + cards.add(new SetCardInfo("Domri, Anarch of Bolas", "191p", Rarity.RARE, mage.cards.d.DomriAnarchOfBolas.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Domri, Anarch of Bolas", "191s", Rarity.RARE, mage.cards.d.DomriAnarchOfBolas.class, NON_FULL_USE_VARIOUS)); - //cards.add(new SetCardInfo("Domri, Anarch of Bolas", "191s★", Rarity.RARE, mage.cards.d.DomriAnarchOfBolas.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Domri, Anarch of Bolas", "191s*", Rarity.RARE, mage.cards.d.DomriAnarchOfBolas.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Dovin's Veto", 193, Rarity.UNCOMMON, mage.cards.d.DovinsVeto.class)); cards.add(new SetCardInfo("Dovin, Hand of Control", "229s", Rarity.UNCOMMON, mage.cards.d.DovinHandOfControl.class, NON_FULL_USE_VARIOUS)); - //cards.add(new SetCardInfo("Dovin, Hand of Control", "229s★", Rarity.UNCOMMON, mage.cards.d.DovinHandOfControl.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Dovin, Hand of Control", "229s*", Rarity.UNCOMMON, mage.cards.d.DovinHandOfControl.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Dreadhorde Arcanist", "125p", Rarity.RARE, mage.cards.d.DreadhordeArcanist.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Dreadhorde Arcanist", "125s", Rarity.RARE, mage.cards.d.DreadhordeArcanist.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Dreadhorde Butcher", "194p", Rarity.RARE, mage.cards.d.DreadhordeButcher.class, NON_FULL_USE_VARIOUS)); @@ -61,7 +63,8 @@ public class WarOfTheSparkPromos extends ExpansionSet { cards.add(new SetCardInfo("Enter the God-Eternals", "196s", Rarity.RARE, mage.cards.e.EnterTheGodEternals.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Fblthp, the Lost", "50p", Rarity.RARE, mage.cards.f.FblthpTheLost.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Fblthp, the Lost", "50s", Rarity.RARE, mage.cards.f.FblthpTheLost.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Feather, the Redeemed", "197s", Rarity.RARE, mage.cards.f.FeatherTheRedeemed.class)); + cards.add(new SetCardInfo("Feather, the Redeemed", "197p", Rarity.RARE, mage.cards.f.FeatherTheRedeemed.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Feather, the Redeemed", "197s", Rarity.RARE, mage.cards.f.FeatherTheRedeemed.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Finale of Devastation", "160p", Rarity.MYTHIC, mage.cards.f.FinaleOfDevastation.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Finale of Devastation", "160s", Rarity.MYTHIC, mage.cards.f.FinaleOfDevastation.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Finale of Eternity", "91p", Rarity.MYTHIC, mage.cards.f.FinaleOfEternity.class, NON_FULL_USE_VARIOUS)); @@ -72,38 +75,40 @@ public class WarOfTheSparkPromos extends ExpansionSet { cards.add(new SetCardInfo("Finale of Revelation", "51s", Rarity.MYTHIC, mage.cards.f.FinaleOfRevelation.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Gideon Blackblade", "13p", Rarity.MYTHIC, mage.cards.g.GideonBlackblade.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Gideon Blackblade", "13s", Rarity.MYTHIC, mage.cards.g.GideonBlackblade.class, NON_FULL_USE_VARIOUS)); - //cards.add(new SetCardInfo("Gideon Blackblade", "13s★", Rarity.MYTHIC, mage.cards.g.GideonBlackblade.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Gideon Blackblade", "13s*", Rarity.MYTHIC, mage.cards.g.GideonBlackblade.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("God-Eternal Bontu", "92s", Rarity.MYTHIC, mage.cards.g.GodEternalBontu.class)); cards.add(new SetCardInfo("God-Eternal Kefnet", "53s", Rarity.MYTHIC, mage.cards.g.GodEternalKefnet.class)); cards.add(new SetCardInfo("God-Eternal Oketra", "16s", Rarity.MYTHIC, mage.cards.g.GodEternalOketra.class)); cards.add(new SetCardInfo("God-Eternal Rhonas", "163s", Rarity.MYTHIC, mage.cards.g.GodEternalRhonas.class)); cards.add(new SetCardInfo("Huatli, the Sun's Heart", "230s", Rarity.UNCOMMON, mage.cards.h.HuatliTheSunsHeart.class, NON_FULL_USE_VARIOUS)); - //cards.add(new SetCardInfo("Huatli, the Sun's Heart", "230s★", Rarity.UNCOMMON, mage.cards.h.HuatliTheSunsHeart.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Huatli, the Sun's Heart", "230s*", Rarity.UNCOMMON, mage.cards.h.HuatliTheSunsHeart.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Ignite the Beacon", "18s", Rarity.RARE, mage.cards.i.IgniteTheBeacon.class)); cards.add(new SetCardInfo("Ilharg, the Raze-Boar", "133s", Rarity.MYTHIC, mage.cards.i.IlhargTheRazeBoar.class)); cards.add(new SetCardInfo("Jace, Wielder of Mysteries", "54p", Rarity.RARE, mage.cards.j.JaceWielderOfMysteries.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Jace, Wielder of Mysteries", "54s", Rarity.RARE, mage.cards.j.JaceWielderOfMysteries.class, NON_FULL_USE_VARIOUS)); - //cards.add(new SetCardInfo("Jace, Wielder of Mysteries", "54s★", Rarity.RARE, mage.cards.j.JaceWielderOfMysteries.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Jace, Wielder of Mysteries", "54s*", Rarity.RARE, mage.cards.j.JaceWielderOfMysteries.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Jaya, Venerated Firemage", "135s", Rarity.UNCOMMON, mage.cards.j.JayaVeneratedFiremage.class, NON_FULL_USE_VARIOUS)); - //cards.add(new SetCardInfo("Jaya, Venerated Firemage", "135s★", Rarity.UNCOMMON, mage.cards.j.JayaVeneratedFiremage.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Jaya, Venerated Firemage", "135s*", Rarity.UNCOMMON, mage.cards.j.JayaVeneratedFiremage.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Jiang Yanggu, Wildcrafter", "164s", Rarity.UNCOMMON, mage.cards.j.JiangYangguWildcrafter.class, NON_FULL_USE_VARIOUS)); - //cards.add(new SetCardInfo("Jiang Yanggu, Wildcrafter", "164s★", Rarity.UNCOMMON, mage.cards.j.JiangYangguWildcrafter.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Karn's Bastion", 248, Rarity.RARE, mage.cards.k.KarnsBastion.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Jiang Yanggu, Wildcrafter", "164s*", Rarity.UNCOMMON, mage.cards.j.JiangYangguWildcrafter.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Karn's Bastion", "248p", Rarity.RARE, mage.cards.k.KarnsBastion.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Karn's Bastion", "248s", Rarity.RARE, mage.cards.k.KarnsBastion.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Karn's Bastion", 248, Rarity.RARE, mage.cards.k.KarnsBastion.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Karn, the Great Creator", "1p", Rarity.RARE, mage.cards.k.KarnTheGreatCreator.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Karn, the Great Creator", "1s", Rarity.RARE, mage.cards.k.KarnTheGreatCreator.class, NON_FULL_USE_VARIOUS)); - //cards.add(new SetCardInfo("Karn, the Great Creator", "1s★", Rarity.RARE, mage.cards.k.KarnTheGreatCreator.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Karn, the Great Creator", "1s*", Rarity.RARE, mage.cards.k.KarnTheGreatCreator.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Kasmina, Enigmatic Mentor", "56s", Rarity.UNCOMMON, mage.cards.k.KasminaEnigmaticMentor.class, NON_FULL_USE_VARIOUS)); - //cards.add(new SetCardInfo("Kasmina, Enigmatic Mentor", "56s★", Rarity.UNCOMMON, mage.cards.k.KasminaEnigmaticMentor.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Kasmina, Enigmatic Mentor", "56s*", Rarity.UNCOMMON, mage.cards.k.KasminaEnigmaticMentor.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Kaya, Bane of the Dead", "231s", Rarity.UNCOMMON, mage.cards.k.KayaBaneOfTheDead.class, NON_FULL_USE_VARIOUS)); - //cards.add(new SetCardInfo("Kaya, Bane of the Dead", "231s★", Rarity.UNCOMMON, mage.cards.k.KayaBaneOfTheDead.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Kaya, Bane of the Dead", "231s*", Rarity.UNCOMMON, mage.cards.k.KayaBaneOfTheDead.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Kiora, Behemoth Beckoner", "232s", Rarity.UNCOMMON, mage.cards.k.KioraBehemothBeckoner.class, NON_FULL_USE_VARIOUS)); - //cards.add(new SetCardInfo("Kiora, Behemoth Beckoner", "232s★", Rarity.UNCOMMON, mage.cards.k.KioraBehemothBeckoner.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Kiora, Behemoth Beckoner", "232s*", Rarity.UNCOMMON, mage.cards.k.KioraBehemothBeckoner.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Krenko, Tin Street Kingpin", "137p", Rarity.RARE, mage.cards.k.KrenkoTinStreetKingpin.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Krenko, Tin Street Kingpin", "137s", Rarity.RARE, mage.cards.k.KrenkoTinStreetKingpin.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Liliana's Triumph", 98, Rarity.UNCOMMON, mage.cards.l.LilianasTriumph.class)); + cards.add(new SetCardInfo("Liliana, Dreadhorde General", "97p", Rarity.MYTHIC, mage.cards.l.LilianaDreadhordeGeneral.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Liliana, Dreadhorde General", "97s", Rarity.MYTHIC, mage.cards.l.LilianaDreadhordeGeneral.class, NON_FULL_USE_VARIOUS)); - //cards.add(new SetCardInfo("Liliana, Dreadhorde General", "97s★", Rarity.MYTHIC, mage.cards.l.LilianaDreadhordeGeneral.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Liliana, Dreadhorde General", "97s*", Rarity.MYTHIC, mage.cards.l.LilianaDreadhordeGeneral.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Living Twister", "203p", Rarity.RARE, mage.cards.l.LivingTwister.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Living Twister", "203s", Rarity.RARE, mage.cards.l.LivingTwister.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Massacre Girl", "99s", Rarity.RARE, mage.cards.m.MassacreGirl.class)); @@ -112,81 +117,82 @@ public class WarOfTheSparkPromos extends ExpansionSet { cards.add(new SetCardInfo("Mobilized District", "249p", Rarity.RARE, mage.cards.m.MobilizedDistrict.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Mobilized District", "249s", Rarity.RARE, mage.cards.m.MobilizedDistrict.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Nahiri, Storm of Stone", "233s", Rarity.UNCOMMON, mage.cards.n.NahiriStormOfStone.class, NON_FULL_USE_VARIOUS)); - //cards.add(new SetCardInfo("Nahiri, Storm of Stone", "233s★", Rarity.UNCOMMON, mage.cards.n.NahiriStormOfStone.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Narset's Reversal", "62s", Rarity.RARE, mage.cards.n.NarsetsReversal.class)); + cards.add(new SetCardInfo("Nahiri, Storm of Stone", "233s*", Rarity.UNCOMMON, mage.cards.n.NahiriStormOfStone.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Narset's Reversal", "62p", Rarity.RARE, mage.cards.n.NarsetsReversal.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Narset's Reversal", "62s", Rarity.RARE, mage.cards.n.NarsetsReversal.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Narset, Parter of Veils", "61s", Rarity.UNCOMMON, mage.cards.n.NarsetParterOfVeils.class, NON_FULL_USE_VARIOUS)); - //cards.add(new SetCardInfo("Narset, Parter of Veils", "61s★", Rarity.UNCOMMON, mage.cards.n.NarsetParterOfVeils.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Narset, Parter of Veils", "61s*", Rarity.UNCOMMON, mage.cards.n.NarsetParterOfVeils.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Neheb, Dreadhorde Champion", "140s", Rarity.RARE, mage.cards.n.NehebDreadhordeChampion.class)); cards.add(new SetCardInfo("Nicol Bolas, Dragon-God", "207p", Rarity.MYTHIC, mage.cards.n.NicolBolasDragonGod.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Nicol Bolas, Dragon-God", "207s", Rarity.MYTHIC, mage.cards.n.NicolBolasDragonGod.class, NON_FULL_USE_VARIOUS)); - //cards.add(new SetCardInfo("Nicol Bolas, Dragon-God", "207s★", Rarity.MYTHIC, mage.cards.n.NicolBolasDragonGod.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Nicol Bolas, Dragon-God", "207s*", Rarity.MYTHIC, mage.cards.n.NicolBolasDragonGod.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Nissa, Who Shakes the World", "169p", Rarity.RARE, mage.cards.n.NissaWhoShakesTheWorld.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Nissa, Who Shakes the World", "169s", Rarity.RARE, mage.cards.n.NissaWhoShakesTheWorld.class, NON_FULL_USE_VARIOUS)); - //cards.add(new SetCardInfo("Nissa, Who Shakes the World", "169s★", Rarity.RARE, mage.cards.n.NissaWhoShakesTheWorld.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Nissa, Who Shakes the World", "169s*", Rarity.RARE, mage.cards.n.NissaWhoShakesTheWorld.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Niv-Mizzet Reborn", "208s", Rarity.MYTHIC, mage.cards.n.NivMizzetReborn.class)); cards.add(new SetCardInfo("Oath of Kaya", "209p", Rarity.RARE, mage.cards.o.OathOfKaya.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Oath of Kaya", "209s", Rarity.RARE, mage.cards.o.OathOfKaya.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Ob Nixilis, the Hate-Twisted", "100s", Rarity.UNCOMMON, mage.cards.o.ObNixilisTheHateTwisted.class, NON_FULL_USE_VARIOUS)); - //cards.add(new SetCardInfo("Ob Nixilis, the Hate-Twisted", "100s★", Rarity.UNCOMMON, mage.cards.o.ObNixilisTheHateTwisted.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Ob Nixilis, the Hate-Twisted", "100s*", Rarity.UNCOMMON, mage.cards.o.ObNixilisTheHateTwisted.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Paradise Druid", 171, Rarity.UNCOMMON, mage.cards.p.ParadiseDruid.class)); cards.add(new SetCardInfo("Parhelion II", "24s", Rarity.RARE, mage.cards.p.ParhelionII.class)); cards.add(new SetCardInfo("Planewide Celebration", "172s", Rarity.RARE, mage.cards.p.PlanewideCelebration.class)); cards.add(new SetCardInfo("Ral, Storm Conduit", "211p", Rarity.RARE, mage.cards.r.RalStormConduit.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Ral, Storm Conduit", "211s", Rarity.RARE, mage.cards.r.RalStormConduit.class, NON_FULL_USE_VARIOUS)); - //cards.add(new SetCardInfo("Ral, Storm Conduit", "211s★", Rarity.RARE, mage.cards.r.RalStormConduit.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Ral, Storm Conduit", "211s*", Rarity.RARE, mage.cards.r.RalStormConduit.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Ravnica at War", "28s", Rarity.RARE, mage.cards.r.RavnicaAtWar.class)); cards.add(new SetCardInfo("Roalesk, Apex Hybrid", "213s", Rarity.MYTHIC, mage.cards.r.RoaleskApexHybrid.class)); cards.add(new SetCardInfo("Role Reversal", "214s", Rarity.RARE, mage.cards.r.RoleReversal.class)); cards.add(new SetCardInfo("Saheeli, Sublime Artificer", "234s", Rarity.UNCOMMON, mage.cards.s.SaheeliSublimeArtificer.class, NON_FULL_USE_VARIOUS)); - //cards.add(new SetCardInfo("Saheeli, Sublime Artificer", "234s★", Rarity.UNCOMMON, mage.cards.s.SaheeliSublimeArtificer.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Saheeli, Sublime Artificer", "234s*", Rarity.UNCOMMON, mage.cards.s.SaheeliSublimeArtificer.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Samut, Tyrant Smasher", "235s", Rarity.UNCOMMON, mage.cards.s.SamutTyrantSmasher.class, NON_FULL_USE_VARIOUS)); - //cards.add(new SetCardInfo("Samut, Tyrant Smasher", "235s★", Rarity.UNCOMMON, mage.cards.s.SamutTyrantSmasher.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Samut, Tyrant Smasher", "235s*", Rarity.UNCOMMON, mage.cards.s.SamutTyrantSmasher.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Sarkhan the Masterless", "143s", Rarity.RARE, mage.cards.s.SarkhanTheMasterless.class, NON_FULL_USE_VARIOUS)); - //cards.add(new SetCardInfo("Sarkhan the Masterless", "143s★", Rarity.RARE, mage.cards.s.SarkhanTheMasterless.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Silent Submersible", "66p", Rarity.RARE, mage.cards.s.SilentSubmersible.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Silent Submersible", "66s", Rarity.RARE, mage.cards.s.SilentSubmersible.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Sarkhan the Masterless", "143s*", Rarity.RARE, mage.cards.s.SarkhanTheMasterless.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Silent Submersible", "66s", Rarity.RARE, mage.cards.s.SilentSubmersible.class)); cards.add(new SetCardInfo("Single Combat", "30s", Rarity.RARE, mage.cards.s.SingleCombat.class)); cards.add(new SetCardInfo("Solar Blaze", "216p", Rarity.RARE, mage.cards.s.SolarBlaze.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Solar Blaze", "216s", Rarity.RARE, mage.cards.s.SolarBlaze.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Sorin, Vengeful Bloodlord", "217p", Rarity.RARE, mage.cards.s.SorinVengefulBloodlord.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Sorin, Vengeful Bloodlord", "217s", Rarity.RARE, mage.cards.s.SorinVengefulBloodlord.class, NON_FULL_USE_VARIOUS)); - //cards.add(new SetCardInfo("Sorin, Vengeful Bloodlord", "217s★", Rarity.RARE, mage.cards.s.SorinVengefulBloodlord.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Sorin, Vengeful Bloodlord", "217s*", Rarity.RARE, mage.cards.s.SorinVengefulBloodlord.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Soul Diviner", "218p", Rarity.RARE, mage.cards.s.SoulDiviner.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Soul Diviner", "218s", Rarity.RARE, mage.cards.s.SoulDiviner.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Spark Double", "68p", Rarity.RARE, mage.cards.s.SparkDouble.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Spark Double", "68s", Rarity.RARE, mage.cards.s.SparkDouble.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Storrev, Devkarin Lich", "219p", Rarity.RARE, mage.cards.s.StorrevDevkarinLich.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Storrev, Devkarin Lich", "219s", Rarity.RARE, mage.cards.s.StorrevDevkarinLich.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Tamiyo, Collector of Tales", "220p", Rarity.RARE, mage.cards.t.TamiyoCollectorOfTales.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Tamiyo, Collector of Tales", "220s", Rarity.RARE, mage.cards.t.TamiyoCollectorOfTales.class, NON_FULL_USE_VARIOUS)); - //cards.add(new SetCardInfo("Tamiyo, Collector of Tales", "220s★", Rarity.RARE, mage.cards.t.TamiyoCollectorOfTales.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Tamiyo, Collector of Tales", "220s*", Rarity.RARE, mage.cards.t.TamiyoCollectorOfTales.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Teferi, Time Raveler", "221p", Rarity.RARE, mage.cards.t.TeferiTimeRaveler.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Teferi, Time Raveler", "221s", Rarity.RARE, mage.cards.t.TeferiTimeRaveler.class, NON_FULL_USE_VARIOUS)); - //cards.add(new SetCardInfo("Teferi, Time Raveler", "221s★", Rarity.RARE, mage.cards.t.TeferiTimeRaveler.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Teferi, Time Raveler", "221s*", Rarity.RARE, mage.cards.t.TeferiTimeRaveler.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Teyo, the Shieldmage", "32s", Rarity.UNCOMMON, mage.cards.t.TeyoTheShieldmage.class, NON_FULL_USE_VARIOUS)); - //cards.add(new SetCardInfo("Teyo, the Shieldmage", "32s★", Rarity.UNCOMMON, mage.cards.t.TeyoTheShieldmage.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Teyo, the Shieldmage", "32s*", Rarity.UNCOMMON, mage.cards.t.TeyoTheShieldmage.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("The Elderspell", "89p", Rarity.RARE, mage.cards.t.TheElderspell.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("The Elderspell", "89s", Rarity.RARE, mage.cards.t.TheElderspell.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("The Wanderer", "37s", Rarity.UNCOMMON, mage.cards.t.TheWanderer.class, NON_FULL_USE_VARIOUS)); - //cards.add(new SetCardInfo("The Wanderer", "37s★", Rarity.UNCOMMON, mage.cards.t.TheWanderer.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("The Wanderer", "37s*", Rarity.UNCOMMON, mage.cards.t.TheWanderer.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Tibalt, Rakish Instigator", "146s", Rarity.UNCOMMON, mage.cards.t.TibaltRakishInstigator.class, NON_FULL_USE_VARIOUS)); - //cards.add(new SetCardInfo("Tibalt, Rakish Instigator", "146s★", Rarity.UNCOMMON, mage.cards.t.TibaltRakishInstigator.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Time Wipe", 223, Rarity.RARE, mage.cards.t.TimeWipe.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Tibalt, Rakish Instigator", "146s*", Rarity.UNCOMMON, mage.cards.t.TibaltRakishInstigator.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Time Wipe", "223p", Rarity.RARE, mage.cards.t.TimeWipe.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Time Wipe", "223s", Rarity.RARE, mage.cards.t.TimeWipe.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Time Wipe", 223, Rarity.RARE, mage.cards.t.TimeWipe.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Tolsimir, Friend to Wolves", "224p", Rarity.RARE, mage.cards.t.TolsimirFriendToWolves.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Tolsimir, Friend to Wolves", "224s", Rarity.RARE, mage.cards.t.TolsimirFriendToWolves.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Tomik, Distinguished Advokist", "34p", Rarity.RARE, mage.cards.t.TomikDistinguishedAdvokist.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Tomik, Distinguished Advokist", "34s", Rarity.RARE, mage.cards.t.TomikDistinguishedAdvokist.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Ugin, the Ineffable", "2p", Rarity.RARE, mage.cards.u.UginTheIneffable.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Ugin, the Ineffable", "2s", Rarity.RARE, mage.cards.u.UginTheIneffable.class, NON_FULL_USE_VARIOUS)); - //cards.add(new SetCardInfo("Ugin, the Ineffable", "2s★", Rarity.RARE, mage.cards.u.UginTheIneffable.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Ugin, the Ineffable", "2s*", Rarity.RARE, mage.cards.u.UginTheIneffable.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Vivien's Arkbow", "181s", Rarity.RARE, mage.cards.v.ViviensArkbow.class)); cards.add(new SetCardInfo("Vivien, Champion of the Wilds", "180p", Rarity.RARE, mage.cards.v.VivienChampionOfTheWilds.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Vivien, Champion of the Wilds", "180s", Rarity.RARE, mage.cards.v.VivienChampionOfTheWilds.class, NON_FULL_USE_VARIOUS)); - //cards.add(new SetCardInfo("Vivien, Champion of the Wilds", "180s★", Rarity.RARE, mage.cards.v.VivienChampionOfTheWilds.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Vivien, Champion of the Wilds", "180s*", Rarity.RARE, mage.cards.v.VivienChampionOfTheWilds.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Vraska, Swarm's Eminence", "236s", Rarity.UNCOMMON, mage.cards.v.VraskaSwarmsEminence.class, NON_FULL_USE_VARIOUS)); - //cards.add(new SetCardInfo("Vraska, Swarm's Eminence", "236s★", Rarity.UNCOMMON, mage.cards.v.VraskaSwarmsEminence.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Vraska, Swarm's Eminence", "236s*", Rarity.UNCOMMON, mage.cards.v.VraskaSwarmsEminence.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Widespread Brutality", "226p", Rarity.RARE, mage.cards.w.WidespreadBrutality.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Widespread Brutality", "226s", Rarity.RARE, mage.cards.w.WidespreadBrutality.class, NON_FULL_USE_VARIOUS)); - } + } } diff --git a/Mage.Sets/src/mage/sets/WorldChampionshipDecks1997.java b/Mage.Sets/src/mage/sets/WorldChampionshipDecks1997.java index 1a83c8799c..741ae62a98 100644 --- a/Mage.Sets/src/mage/sets/WorldChampionshipDecks1997.java +++ b/Mage.Sets/src/mage/sets/WorldChampionshipDecks1997.java @@ -62,7 +62,7 @@ public class WorldChampionshipDecks1997 extends ExpansionSet { cards.add(new SetCardInfo("Frenetic Efreet", "jk264", Rarity.RARE, mage.cards.f.FreneticEfreet.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Fyndhorn Elves", "sg244", Rarity.COMMON, mage.cards.f.FyndhornElves.class)); cards.add(new SetCardInfo("Gemstone Mine", "js164", Rarity.UNCOMMON, mage.cards.g.GemstoneMine.class)); - cards.add(new SetCardInfo("Ghazbán Ogre", "sg298", Rarity.COMMON, mage.cards.g.GhazbanOgre.class)); + cards.add(new SetCardInfo("Ghazban Ogre", "sg298", Rarity.COMMON, mage.cards.g.GhazbanOgre.class)); cards.add(new SetCardInfo("Giant Growth", "sg299", Rarity.COMMON, mage.cards.g.GiantGrowth.class)); cards.add(new SetCardInfo("Hammer of Bogardan", "jk181", Rarity.RARE, mage.cards.h.HammerOfBogardan.class)); cards.add(new SetCardInfo("Harvest Wurm", "sg130", Rarity.COMMON, mage.cards.h.HarvestWurm.class)); diff --git a/Mage.Sets/src/mage/sets/WorldChampionshipDecks1998.java b/Mage.Sets/src/mage/sets/WorldChampionshipDecks1998.java index 071fd53926..cd8507352e 100644 --- a/Mage.Sets/src/mage/sets/WorldChampionshipDecks1998.java +++ b/Mage.Sets/src/mage/sets/WorldChampionshipDecks1998.java @@ -21,9 +21,9 @@ public class WorldChampionshipDecks1998 extends ExpansionSet { this.hasBasicLands = true; cards.add(new SetCardInfo("Abeyance", "bh1sb", Rarity.RARE, mage.cards.a.Abeyance.class)); - cards.add(new SetCardInfo("Armageddon", "bh7sba", Rarity.RARE, mage.cards.a.Armageddon.class)); - cards.add(new SetCardInfo("Aura of Silence", "bh7sbb", Rarity.UNCOMMON, mage.cards.a.AuraOfSilence.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Armageddon", "bh7asb", Rarity.RARE, mage.cards.a.Armageddon.class)); cards.add(new SetCardInfo("Aura of Silence", "bh7b", Rarity.UNCOMMON, mage.cards.a.AuraOfSilence.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Aura of Silence", "bh7bsb", Rarity.UNCOMMON, mage.cards.a.AuraOfSilence.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Ball Lightning", "br210", Rarity.RARE, mage.cards.b.BallLightning.class)); cards.add(new SetCardInfo("Birds of Paradise", "bs280", Rarity.RARE, mage.cards.b.BirdsOfParadise.class)); cards.add(new SetCardInfo("Boil", "bs165sb", Rarity.UNCOMMON, mage.cards.b.Boil.class)); @@ -33,10 +33,10 @@ public class WorldChampionshipDecks1998 extends ExpansionSet { cards.add(new SetCardInfo("City of Brass", "bs112a", Rarity.RARE, mage.cards.c.CityOfBrass.class)); cards.add(new SetCardInfo("Cloudchaser Eagle", "bs15", Rarity.COMMON, mage.cards.c.CloudchaserEagle.class)); cards.add(new SetCardInfo("Counterspell", "rb57", Rarity.COMMON, mage.cards.c.Counterspell.class)); - cards.add(new SetCardInfo("Cursed Scroll", "br281", Rarity.RARE, mage.cards.c.CursedScroll.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Cursed Scroll", "bh281sb", Rarity.RARE, mage.cards.c.CursedScroll.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Disenchant", "bh16sb", Rarity.COMMON, mage.cards.d.Disenchant.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Cursed Scroll", "br281", Rarity.RARE, mage.cards.c.CursedScroll.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Disenchant", "bh16", Rarity.COMMON, mage.cards.d.Disenchant.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Disenchant", "bh16sb", Rarity.COMMON, mage.cards.d.Disenchant.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Dismiss", "rb58a", Rarity.UNCOMMON, mage.cards.d.Dismiss.class)); cards.add(new SetCardInfo("Dissipate", "rb61", Rarity.UNCOMMON, mage.cards.d.Dissipate.class)); cards.add(new SetCardInfo("Dread of Night", "bs130sb", Rarity.UNCOMMON, mage.cards.d.DreadOfNight.class)); @@ -46,14 +46,14 @@ public class WorldChampionshipDecks1998 extends ExpansionSet { cards.add(new SetCardInfo("Empyrial Armor", "bh13", Rarity.COMMON, mage.cards.e.EmpyrialArmor.class)); cards.add(new SetCardInfo("Final Fortune", "br174sb", Rarity.RARE, mage.cards.f.FinalFortune.class)); cards.add(new SetCardInfo("Fireblast", "br79", Rarity.COMMON, mage.cards.f.Fireblast.class)); - cards.add(new SetCardInfo("Firestorm", "bs101", Rarity.RARE, mage.cards.f.Firestorm.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Firestorm", "br101sb", Rarity.RARE, mage.cards.f.Firestorm.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Firestorm", "bs101", Rarity.RARE, mage.cards.f.Firestorm.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Forbid", "rb35", Rarity.UNCOMMON, mage.cards.f.Forbid.class)); cards.add(new SetCardInfo("Force Spike", "rb58b", Rarity.COMMON, mage.cards.f.ForceSpike.class)); - cards.add(new SetCardInfo("Forest", "bs350", Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Forest", "bs349", Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Forest", "bs348", Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Forest", "bs347", Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Forest", "bs348", Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Forest", "bs349", Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Forest", "bs350", Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Gemstone Mine", "bs164", Rarity.UNCOMMON, mage.cards.g.GemstoneMine.class)); cards.add(new SetCardInfo("Goblin Vandal", "br105", Rarity.COMMON, mage.cards.g.GoblinVandal.class)); cards.add(new SetCardInfo("Grindstone", "rb290sb", Rarity.RARE, mage.cards.g.Grindstone.class)); @@ -63,34 +63,34 @@ public class WorldChampionshipDecks1998 extends ExpansionSet { cards.add(new SetCardInfo("Impulse", "rb34", Rarity.COMMON, mage.cards.i.Impulse.class)); cards.add(new SetCardInfo("Incinerate", "br184", Rarity.COMMON, mage.cards.i.Incinerate.class)); cards.add(new SetCardInfo("Ironclaw Orcs", "br245", Rarity.COMMON, mage.cards.i.IronclawOrcs.class)); - cards.add(new SetCardInfo("Island", "rb338", Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Island", "rb337", Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Island", "rb336", Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Island", "rb335", Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Island", "rb336", Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Island", "rb337", Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Island", "rb338", Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Jackal Pup", "br183", Rarity.UNCOMMON, mage.cards.j.JackalPup.class)); - cards.add(new SetCardInfo("Karplusan Forest", "bs356sb", Rarity.RARE, mage.cards.k.KarplusanForest.class)); + cards.add(new SetCardInfo("Karplusan Forest", "bs356", Rarity.RARE, mage.cards.k.KarplusanForest.class)); cards.add(new SetCardInfo("Lobotomy", "bs267", Rarity.UNCOMMON, mage.cards.l.Lobotomy.class)); cards.add(new SetCardInfo("Man-o'-War", "bs37", Rarity.COMMON, mage.cards.m.ManOWar.class)); cards.add(new SetCardInfo("Mana Leak", "rb36", Rarity.COMMON, mage.cards.m.ManaLeak.class)); cards.add(new SetCardInfo("Memory Lapse", "rb32", Rarity.COMMON, mage.cards.m.MemoryLapse.class)); cards.add(new SetCardInfo("Mogg Fanatic", "br190", Rarity.COMMON, mage.cards.m.MoggFanatic.class)); cards.add(new SetCardInfo("Mogg Flunkies", "br92", Rarity.COMMON, mage.cards.m.MoggFlunkies.class)); - cards.add(new SetCardInfo("Mountain", "br346", Rarity.LAND, mage.cards.basiclands.Mountain.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Mountain", "br345", Rarity.LAND, mage.cards.basiclands.Mountain.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Mountain", "br344", Rarity.LAND, mage.cards.basiclands.Mountain.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Mountain", "br343", Rarity.LAND, mage.cards.basiclands.Mountain.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Mountain", "br344", Rarity.LAND, mage.cards.basiclands.Mountain.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Mountain", "br345", Rarity.LAND, mage.cards.basiclands.Mountain.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Mountain", "br346", Rarity.LAND, mage.cards.basiclands.Mountain.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Nekrataal", "bs66", Rarity.UNCOMMON, mage.cards.n.Nekrataal.class)); cards.add(new SetCardInfo("Nevinyrral's Disk", "rb391", Rarity.RARE, mage.cards.n.NevinyrralsDisk.class)); cards.add(new SetCardInfo("Nomads en-Kor", "bh9", Rarity.COMMON, mage.cards.n.NomadsEnKor.class)); cards.add(new SetCardInfo("Orcish Settlers", "bs112b", Rarity.UNCOMMON, mage.cards.o.OrcishSettlers.class)); cards.add(new SetCardInfo("Paladin en-Vec", "bh12", Rarity.RARE, mage.cards.p.PaladinEnVec.class)); cards.add(new SetCardInfo("Phyrexian Furnace", "bs155sb", Rarity.UNCOMMON, mage.cards.p.PhyrexianFurnace.class)); - cards.add(new SetCardInfo("Plains", "bh334", Rarity.LAND, mage.cards.basiclands.Plains.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Plains", "bh333", Rarity.LAND, mage.cards.basiclands.Plains.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Plains", "bh332", Rarity.LAND, mage.cards.basiclands.Plains.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Plains", "bh331", Rarity.LAND, mage.cards.basiclands.Plains.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Pyroblast", "bs213sb", Rarity.COMMON, mage.cards.p.Pyroblast.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Plains", "bh332", Rarity.LAND, mage.cards.basiclands.Plains.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Plains", "bh333", Rarity.LAND, mage.cards.basiclands.Plains.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Plains", "bh334", Rarity.LAND, mage.cards.basiclands.Plains.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Pyroblast", "br213sb", Rarity.COMMON, mage.cards.p.Pyroblast.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Pyroblast", "bs213sb", Rarity.COMMON, mage.cards.p.Pyroblast.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Quicksand", "rb166", Rarity.UNCOMMON, mage.cards.q.Quicksand.class)); cards.add(new SetCardInfo("Rainbow Efreet", "rb41", Rarity.RARE, mage.cards.r.RainbowEfreet.class)); cards.add(new SetCardInfo("Recurring Nightmare", "bs72", Rarity.RARE, mage.cards.r.RecurringNightmare.class)); @@ -123,9 +123,9 @@ public class WorldChampionshipDecks1998 extends ExpansionSet { cards.add(new SetCardInfo("Wall of Blossoms", "bs125", Rarity.UNCOMMON, mage.cards.w.WallOfBlossoms.class)); cards.add(new SetCardInfo("Wall of Roots", "bs253", Rarity.COMMON, mage.cards.w.WallOfRoots.class)); cards.add(new SetCardInfo("Warrior en-Kor", "bh23b", Rarity.UNCOMMON, mage.cards.w.WarriorEnKor.class)); - cards.add(new SetCardInfo("Wasteland", "rb330sb", Rarity.UNCOMMON, mage.cards.w.Wasteland.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Wasteland", "br330", Rarity.UNCOMMON, mage.cards.w.Wasteland.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Wasteland", "rb330sb", Rarity.UNCOMMON, mage.cards.w.Wasteland.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Whispers of the Muse", "rb103", Rarity.UNCOMMON, mage.cards.w.WhispersOfTheMuse.class)); cards.add(new SetCardInfo("White Knight", "bh68", Rarity.UNCOMMON, mage.cards.w.WhiteKnight.class)); - } + } } diff --git a/Mage.Sets/src/mage/sets/WorldChampionshipDecks2004.java b/Mage.Sets/src/mage/sets/WorldChampionshipDecks2004.java index 160c9a8905..27cbc3c4e2 100644 --- a/Mage.Sets/src/mage/sets/WorldChampionshipDecks2004.java +++ b/Mage.Sets/src/mage/sets/WorldChampionshipDecks2004.java @@ -51,7 +51,7 @@ public class WorldChampionshipDecks2004 extends ExpansionSet { cards.add(new SetCardInfo("Forest", "jn348", Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Forest", "jn350", Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Frogmite", "ap172", Rarity.COMMON, mage.cards.f.Frogmite.class)); - cards.add(new SetCardInfo("Furnace Dragon", "ap62sbb", Rarity.RARE, mage.cards.f.FurnaceDragon.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Furnace Dragon", "ap62sb", Rarity.RARE, mage.cards.f.FurnaceDragon.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Furnace Dragon", "mb62sb", Rarity.RARE, mage.cards.f.FurnaceDragon.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Glimmervoid", "ap281", Rarity.RARE, mage.cards.g.Glimmervoid.class)); cards.add(new SetCardInfo("Goblin Charbelcher", "mb176", Rarity.RARE, mage.cards.g.GoblinCharbelcher.class)); @@ -66,7 +66,7 @@ public class WorldChampionshipDecks2004 extends ExpansionSet { cards.add(new SetCardInfo("Myr Incubator", "mb212", Rarity.RARE, mage.cards.m.MyrIncubator.class)); cards.add(new SetCardInfo("Ornithopter", "ap224", Rarity.UNCOMMON, mage.cards.o.Ornithopter.class)); cards.add(new SetCardInfo("Oxidize", "jn79sb", Rarity.COMMON, mage.cards.o.Oxidize.class)); - cards.add(new SetCardInfo("Pacifism", "gn33", Rarity.COMMON, mage.cards.p.Pacifism.class)); + cards.add(new SetCardInfo("Pacifism", "gn33sb", Rarity.COMMON, mage.cards.p.Pacifism.class)); cards.add(new SetCardInfo("Pentad Prism", "mb143", Rarity.COMMON, mage.cards.p.PentadPrism.class)); cards.add(new SetCardInfo("Plains", "gn331", Rarity.LAND, mage.cards.basiclands.Plains.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Plains", "gn332", Rarity.LAND, mage.cards.basiclands.Plains.class, NON_FULL_USE_VARIOUS)); @@ -82,13 +82,13 @@ public class WorldChampionshipDecks2004 extends ExpansionSet { cards.add(new SetCardInfo("Relic Barrier", "gn147sb", Rarity.UNCOMMON, mage.cards.r.RelicBarrier.class)); cards.add(new SetCardInfo("Renewed Faith", "jn50", Rarity.COMMON, mage.cards.r.RenewedFaith.class)); cards.add(new SetCardInfo("Rewind", "gn96", Rarity.UNCOMMON, mage.cards.r.Rewind.class)); - cards.add(new SetCardInfo("Rude Awakening", "jn92", Rarity.RARE, mage.cards.r.RudeAwakening.class)); + cards.add(new SetCardInfo("Rude Awakening", "jn92sb", Rarity.RARE, mage.cards.r.RudeAwakening.class)); cards.add(new SetCardInfo("Scrabbling Claws", "gn237sb", Rarity.UNCOMMON, mage.cards.s.ScrabblingClaws.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Scrabbling Claws", "jn237", Rarity.UNCOMMON, mage.cards.s.ScrabblingClaws.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Scrabbling Claws", "jn237sb", Rarity.UNCOMMON, mage.cards.s.ScrabblingClaws.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Seat of the Synod", "ap283", Rarity.COMMON, mage.cards.s.SeatOfTheSynod.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Seat of the Synod", "mb283", Rarity.COMMON, mage.cards.s.SeatOfTheSynod.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Secluded Steppe", "jn324", Rarity.COMMON, mage.cards.s.SecludedSteppe.class)); - cards.add(new SetCardInfo("Seething Song", "ap104sbb", Rarity.COMMON, mage.cards.s.SeethingSong.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Seething Song", "ap104sb", Rarity.COMMON, mage.cards.s.SeethingSong.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Seething Song", "mb104sb", Rarity.COMMON, mage.cards.s.SeethingSong.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Serum Visions", "ap36sb", Rarity.COMMON, mage.cards.s.SerumVisions.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Serum Visions", "mb36", Rarity.COMMON, mage.cards.s.SerumVisions.class, NON_FULL_USE_VARIOUS)); @@ -98,7 +98,7 @@ public class WorldChampionshipDecks2004 extends ExpansionSet { cards.add(new SetCardInfo("Talisman of Dominance", "mb253", Rarity.UNCOMMON, mage.cards.t.TalismanOfDominance.class)); cards.add(new SetCardInfo("Talisman of Progress", "mb256", Rarity.UNCOMMON, mage.cards.t.TalismanOfProgress.class)); cards.add(new SetCardInfo("Temple of the False God", "gn143", Rarity.UNCOMMON, mage.cards.t.TempleOfTheFalseGod.class)); - cards.add(new SetCardInfo("Thirst for Knowledge", "gn53", Rarity.COMMON, mage.cards.t.ThirstForKnowledge.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Thirst for Knowledge", "gn53", Rarity.UNCOMMON, mage.cards.t.ThirstForKnowledge.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Thirst for Knowledge", "mb53", Rarity.UNCOMMON, mage.cards.t.ThirstForKnowledge.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Thoughtcast", "ap54", Rarity.COMMON, mage.cards.t.Thoughtcast.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Thoughtcast", "mb54", Rarity.COMMON, mage.cards.t.Thoughtcast.class, NON_FULL_USE_VARIOUS)); @@ -113,5 +113,5 @@ public class WorldChampionshipDecks2004 extends ExpansionSet { cards.add(new SetCardInfo("Wing Shards", "jn25", Rarity.UNCOMMON, mage.cards.w.WingShards.class)); cards.add(new SetCardInfo("Wrath of God", "gn58", Rarity.RARE, mage.cards.w.WrathOfGod.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Wrath of God", "jn58", Rarity.RARE, mage.cards.w.WrathOfGod.class, NON_FULL_USE_VARIOUS)); - } + } }