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 d10fe0ebb7e..718056a739e 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 @@ -145,7 +145,7 @@ public class ScryfallImageSupportCards { add("PAL06"); // Arena League 2006 //add("PMPS06"); // Magic Premiere Shop 2006 add("PHUK"); // Hachette UK - add("PDCI"); // DCI Promos + add("DCI"); // DCI Promos add("P06"); // Magic Player Rewards 2006 add("G06"); // Judge Gift Cards 2006 add("F06"); // Friday Night Magic 2006 @@ -190,7 +190,6 @@ public class ScryfallImageSupportCards { add("P09"); // Magic Player Rewards 2009 add("G09"); // Judge Gift Cards 2009 add("F09"); // Friday Night Magic 2009 - add("PBOOK"); // Miscellaneous Book Promos add("CON"); // Conflux add("DDC"); // Duel Decks: Divine vs. Demonic add("ARB"); // Alara Reborn diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java index 5d9535e2278..0f294434a0b 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java @@ -365,7 +365,7 @@ public enum WizardCardsImageSource implements CardImageSource { setsAliases.put("M13", "Magic 2013"); setsAliases.put("M14", "Magic 2014"); setsAliases.put("M15", "Magic 2015"); - setsAliases.put("PMEI", "Media Inserts"); + setsAliases.put("PMEI", "Media and Collaboration Promos"); setsAliases.put("MBS", "Mirrodin Besieged"); setsAliases.put("ME2", "Masters Edition II"); setsAliases.put("ME3", "Masters Edition III"); diff --git a/Mage.Sets/src/mage/sets/AvacynRestoredPromos.java b/Mage.Sets/src/mage/sets/AvacynRestoredPromos.java index bc99712af1d..6f7ea822edc 100644 --- a/Mage.Sets/src/mage/sets/AvacynRestoredPromos.java +++ b/Mage.Sets/src/mage/sets/AvacynRestoredPromos.java @@ -1,6 +1,8 @@ package mage.sets; +import mage.cards.CardGraphicInfo; import mage.cards.ExpansionSet; +import mage.cards.FrameStyle; import mage.constants.Rarity; import mage.constants.SetType; @@ -20,8 +22,11 @@ public class AvacynRestoredPromos extends ExpansionSet { this.hasBoosters = false; this.hasBasicLands = false; - cards.add(new SetCardInfo("Killing Wave", 111, Rarity.RARE, mage.cards.k.KillingWave.class)); - cards.add(new SetCardInfo("Latch Seeker", 63, Rarity.UNCOMMON, mage.cards.l.LatchSeeker.class)); + final CardGraphicInfo FULL_ART = new CardGraphicInfo(FrameStyle.MPOP_FULL_ART_BASIC, false); + + cards.add(new SetCardInfo("Angel of Glory's Rise", "A9", Rarity.RARE, mage.cards.a.AngelOfGlorysRise.class)); + cards.add(new SetCardInfo("Killing Wave", 111, Rarity.RARE, mage.cards.k.KillingWave.class, FULL_ART)); + cards.add(new SetCardInfo("Latch Seeker", 63, Rarity.UNCOMMON, mage.cards.l.LatchSeeker.class, FULL_ART)); cards.add(new SetCardInfo("Moonsilver Spear", "217*", Rarity.RARE, mage.cards.m.MoonsilverSpear.class)); cards.add(new SetCardInfo("Restoration Angel", "32*", Rarity.RARE, mage.cards.r.RestorationAngel.class)); cards.add(new SetCardInfo("Silverblade Paladin", "36*", Rarity.RARE, mage.cards.s.SilverbladePaladin.class)); diff --git a/Mage.Sets/src/mage/sets/DCIPromos.java b/Mage.Sets/src/mage/sets/DCIPromos.java index eab7956adcd..00d94d6ffd5 100644 --- a/Mage.Sets/src/mage/sets/DCIPromos.java +++ b/Mage.Sets/src/mage/sets/DCIPromos.java @@ -5,7 +5,7 @@ import mage.constants.Rarity; import mage.constants.SetType; /** - * https://scryfall.com/sets/pdci + * https://scryfall.com/sets/dci */ public class DCIPromos extends ExpansionSet { @@ -16,7 +16,7 @@ public class DCIPromos extends ExpansionSet { } private DCIPromos() { - super("DCI Promos", "PDCI", ExpansionSet.buildDate(2006, 1, 1), SetType.PROMOTIONAL); + super("DCI Promos", "DCI", ExpansionSet.buildDate(2006, 1, 1), SetType.PROMOTIONAL); this.hasBoosters = false; this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/MiscellaneousBookPromos.java b/Mage.Sets/src/mage/sets/MiscellaneousBookPromos.java deleted file mode 100644 index 5481744701e..00000000000 --- a/Mage.Sets/src/mage/sets/MiscellaneousBookPromos.java +++ /dev/null @@ -1,25 +0,0 @@ -package mage.sets; - -import mage.cards.ExpansionSet; -import mage.constants.Rarity; -import mage.constants.SetType; - -/** - * https://scryfall.com/sets/pbook - */ -public class MiscellaneousBookPromos extends ExpansionSet { - - private static final MiscellaneousBookPromos instance = new MiscellaneousBookPromos(); - - public static MiscellaneousBookPromos getInstance() { - return instance; - } - - private MiscellaneousBookPromos() { - super("Miscellaneous Book Promos", "PBOOK", ExpansionSet.buildDate(2009, 1, 27), SetType.PROMOTIONAL); - this.hasBoosters = false; - this.hasBasicLands = false; - - cards.add(new SetCardInfo("Jace Beleren", 1, Rarity.MYTHIC, mage.cards.j.JaceBeleren.class)); - } -} diff --git a/Mage.Sets/src/mage/sets/ResalePromos.java b/Mage.Sets/src/mage/sets/ResalePromos.java deleted file mode 100644 index deb28e216b8..00000000000 --- a/Mage.Sets/src/mage/sets/ResalePromos.java +++ /dev/null @@ -1,56 +0,0 @@ -package mage.sets; - -import mage.cards.ExpansionSet; -import mage.constants.Rarity; -import mage.constants.SetType; - -/** - * https://scryfall.com/sets/pres - * Stance on non-english cards: - * https://github.com/magefree/mage/pull/6190#issuecomment-582353697 - * https://github.com/magefree/mage/pull/6190#issuecomment-582354790 - */ -public class ResalePromos extends ExpansionSet { - - private static final ResalePromos instance = new ResalePromos(); - - public static ResalePromos getInstance() { - return instance; - } - - private ResalePromos() { - super("Resale Promos", "PRES", ExpansionSet.buildDate(2007, 1, 1), SetType.PROMOTIONAL); - this.hasBoosters = false; - this.hasBasicLands = false; - - cards.add(new SetCardInfo("Angel of Glory's Rise", "A9", Rarity.RARE, mage.cards.a.AngelOfGlorysRise.class)); - cards.add(new SetCardInfo("Angelic Skirmisher", "A11", Rarity.RARE, mage.cards.a.AngelicSkirmisher.class)); - cards.add(new SetCardInfo("Atarka, World Render", 149, Rarity.RARE, mage.cards.a.AtarkaWorldRender.class)); - cards.add(new SetCardInfo("Beast Whisperer", 123, Rarity.RARE, mage.cards.b.BeastWhisperer.class)); - cards.add(new SetCardInfo("Brion Stoutarm", "A2", Rarity.RARE, mage.cards.b.BrionStoutarm.class)); - cards.add(new SetCardInfo("Bristling Hydra", 147, Rarity.RARE, mage.cards.b.BristlingHydra.class)); - cards.add(new SetCardInfo("Broodmate Dragon", "A3", Rarity.RARE, mage.cards.b.BroodmateDragon.class)); - cards.add(new SetCardInfo("Curator of Mysteries", 49, Rarity.RARE, mage.cards.c.CuratorOfMysteries.class)); - cards.add(new SetCardInfo("Etali, Primal Storm", 100, Rarity.RARE, mage.cards.e.EtaliPrimalStorm.class)); - cards.add(new SetCardInfo("Felidar Sovereign", 26, Rarity.RARE, mage.cards.f.FelidarSovereign.class)); - cards.add(new SetCardInfo("Gargos, Vicious Watcher", 172, Rarity.RARE, mage.cards.g.GargosViciousWatcher.class)); - cards.add(new SetCardInfo("Genesis Hydra", 176, Rarity.RARE, mage.cards.g.GenesisHydra.class)); - cards.add(new SetCardInfo("Goblin Chieftain", "141*", Rarity.RARE, mage.cards.g.GoblinChieftain.class)); - cards.add(new SetCardInfo("Hamletback Goliath", "A10", Rarity.RARE, mage.cards.h.HamletbackGoliath.class)); - cards.add(new SetCardInfo("Jaya Ballard, Task Mage", "A1", Rarity.RARE, mage.cards.j.JayaBallardTaskMage.class)); - cards.add(new SetCardInfo("Knight Exemplar", "A7", Rarity.RARE, mage.cards.k.KnightExemplar.class)); - cards.add(new SetCardInfo("Lathliss, Dragon Queen", "149*", Rarity.RARE, mage.cards.l.LathlissDragonQueen.class)); - cards.add(new SetCardInfo("Loam Lion", "13*", Rarity.UNCOMMON, mage.cards.l.LoamLion.class)); - cards.add(new SetCardInfo("Neheb, Dreadhorde Champion", 140, Rarity.RARE, mage.cards.n.NehebDreadhordeChampion.class)); - cards.add(new SetCardInfo("Opportunistic Dragon", 133, Rarity.RARE, mage.cards.o.OpportunisticDragon.class)); - cards.add(new SetCardInfo("Oran-Rief, the Vastwood", "221*", Rarity.RARE, mage.cards.o.OranRiefTheVastwood.class)); - cards.add(new SetCardInfo("Outland Colossus", 193, Rarity.RARE, mage.cards.o.OutlandColossus.class)); - cards.add(new SetCardInfo("Retaliator Griffin", "A4", Rarity.RARE, mage.cards.r.RetaliatorGriffin.class)); - cards.add(new SetCardInfo("Stonecoil Serpent", 235, Rarity.RARE, mage.cards.s.StonecoilSerpent.class)); - cards.add(new SetCardInfo("Sunblast Angel", "A8", Rarity.RARE, mage.cards.s.SunblastAngel.class)); - cards.add(new SetCardInfo("Terastodon", "A6", Rarity.RARE, mage.cards.t.Terastodon.class)); - cards.add(new SetCardInfo("Terra Stomper", "A5", Rarity.RARE, mage.cards.t.TerraStomper.class)); - cards.add(new SetCardInfo("Thalia's Lancers", 47, Rarity.RARE, mage.cards.t.ThaliasLancers.class)); - cards.add(new SetCardInfo("Xathrid Necromancer", "A12", Rarity.RARE, mage.cards.x.XathridNecromancer.class)); - } -} diff --git a/Mage/src/test/data/importer/testdeckCommander.json b/Mage/src/test/data/importer/testdeckCommander.json index e7d123006f3..023863fc520 100644 --- a/Mage/src/test/data/importer/testdeckCommander.json +++ b/Mage/src/test/data/importer/testdeckCommander.json @@ -11960,7 +11960,7 @@ "ONC", "OTC", "OTP", - "PDCI", + "DCI", "PF20", "PIP", "PLST",