diff --git a/Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java b/Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java index 5c73134de7..70f2b95737 100644 --- a/Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java +++ b/Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java @@ -1666,7 +1666,6 @@ public class DragCardGrid extends JPanel implements DragCardSource, DragCardTarg pimpedSets.put("P11", 1); pimpedSets.put("OVNT", 1); // Vintage Championship - pimpedSets.put("PREL", 1); // Release Events pimpedSets.put("PJSE", 1); // Junior Series Europe pimpedSets.put("P2HG", 1); // Two-Headed Giant Tournament pimpedSets.put("PGTW", 1); // Gateway 2006 @@ -1675,9 +1674,7 @@ public class DragCardGrid extends JPanel implements DragCardSource, DragCardTarg pimpedSets.put("EXP", 1); pimpedSets.put("PGPX", 1); pimpedSets.put("PMEI", 1); - pimpedSets.put("PREL", 1); pimpedSets.put("PLS", 1); - pimpedSets.put("PPRE", 1); String[] sets = pimpedSets.keySet().toArray(new String[pimpedSets.keySet().size()]); Boolean didModify = false; diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java index 7b6eb6489f..b3bda42631 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java @@ -67,7 +67,7 @@ public class GathererSets implements Iterable { "W16", "W17", // "PALP" -- Gatherer does not have the set Asia Pacific Land Program // "ATH" -- has cards from many sets, symbol does not exist on gatherer - // "CP", "DPA", "PELP", "PGPX", "PGRU", "H17", "JR", "PPRE", "SWS", // need to fix + // "CP", "DPA", "PELP", "PGPX", "PGRU", "H17", "JR", "SWS", // need to fix "H09", "PD2", "PD3", "UNH", "CM1", "V11", "A25", "UST", "IMA", "DD2", "EVG", "DDC", "DDE", "DDD", "8EB", "9EB", "CHR", "G18", "GVL", "S00", "S99", "UGL" // ok // current testing }; diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MagidexImageSource.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MagidexImageSource.java index 56d94b74e6..104b0fb49c 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MagidexImageSource.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MagidexImageSource.java @@ -16,7 +16,6 @@ public enum MagidexImageSource implements CardImageSource { MagidexImageSource() { supportedSets = new LinkedHashSet<>(); - // supportedSets.add("PPRE"); // Prerelease Events // supportedSets.add("JR"); // TODO: Set was split into the individual sets as listed on Scryfall supportedSets.add("LEA"); supportedSets.add("LEB"); 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 f050e7e8c6..f9ce7c0ec3 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 @@ -174,7 +174,6 @@ public class ScryfallImageSupportCards { add("P10E"); // Tenth Edition Promos add("PSUM"); // Summer of Magic add("ME1"); // Masters Edition - add("PREL"); // Release Events add("LRW"); // Lorwyn add("DD1"); // Duel Decks: Elves vs. Goblins add("PSUS"); // Junior Super Series @@ -195,6 +194,7 @@ public class ScryfallImageSupportCards { add("ME2"); // Masters Edition II add("PWPN"); // Wizards Play Network 2008 add("ALA"); // Shards of Alara + add("PALA"); // Shards of Alara Promos add("DD2"); // Duel Decks: Jace vs. Chandra add("PWP09"); // Wizards Play Network 2009 add("PDTP"); // Duels of the Planeswalkers 2009 Promos @@ -205,7 +205,6 @@ public class ScryfallImageSupportCards { add("PBOOK"); // Miscellaneous Book Promos add("CON"); // Conflux add("DDC"); // Duel Decks: Divine vs. Demonic - add("PPRE"); // Prerelease Events add("ARB"); // Alara Reborn add("PM10"); // Magic 2010 Promos add("M10"); // Magic 2010 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 7adbb010cb..65d87a18ed 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 @@ -55,7 +55,6 @@ public enum WizardCardsImageSource implements CardImageSource { languageAliases.put(CardLanguage.CHINES_TRADITION, "Chinese Traditional "); supportedSets = new LinkedHashSet<>(); - // supportedSets.add("PPRE"); // Prerelease Events supportedSets.add("LEA"); supportedSets.add("LEB"); supportedSets.add("2ED"); @@ -392,7 +391,6 @@ public enum WizardCardsImageSource implements CardImageSource { setsAliases.put("PLS", "Planeshift"); setsAliases.put("PO2", "Portal Second Age"); setsAliases.put("POR", "Portal"); - setsAliases.put("PPRE", "Prerelease Events"); setsAliases.put("PTK", "Portal Three Kingdoms"); setsAliases.put("RAV", "Ravnica: City of Guilds"); setsAliases.put("ROE", "Rise of the Eldrazi"); diff --git a/Mage.Sets/src/mage/sets/HeroesOfTheRealm2016.java b/Mage.Sets/src/mage/sets/HeroesOfTheRealm2016.java index 59435f4d04..6d403b8eb2 100644 --- a/Mage.Sets/src/mage/sets/HeroesOfTheRealm2016.java +++ b/Mage.Sets/src/mage/sets/HeroesOfTheRealm2016.java @@ -5,7 +5,7 @@ import mage.constants.Rarity; import mage.constants.SetType; /** - * https://scryfall.com/sets/htr + * https://scryfall.com/sets/htr16 * @author TheElk801 */ public final class HeroesOfTheRealm2016 extends ExpansionSet { diff --git a/Mage.Sets/src/mage/sets/MirrodinBesiegedPromos.java b/Mage.Sets/src/mage/sets/MirrodinBesiegedPromos.java index 1ed8c3a1ab..2c4f68829f 100644 --- a/Mage.Sets/src/mage/sets/MirrodinBesiegedPromos.java +++ b/Mage.Sets/src/mage/sets/MirrodinBesiegedPromos.java @@ -21,10 +21,10 @@ public class MirrodinBesiegedPromos extends ExpansionSet { this.hasBasicLands = false; cards.add(new SetCardInfo("Black Sun's Zenith", 39, Rarity.RARE, mage.cards.b.BlackSunsZenith.class)); - cards.add(new SetCardInfo("Glissa, the Traitor", 96, Rarity.MYTHIC, mage.cards.g.GlissaTheTraitor.class)); - cards.add(new SetCardInfo("Hero of Bladehold", 8, Rarity.MYTHIC, mage.cards.h.HeroOfBladehold.class)); + cards.add(new SetCardInfo("Glissa, the Traitor", "96*", Rarity.MYTHIC, mage.cards.g.GlissaTheTraitor.class)); + cards.add(new SetCardInfo("Hero of Bladehold", "8*", Rarity.MYTHIC, mage.cards.h.HeroOfBladehold.class)); cards.add(new SetCardInfo("Mirran Crusader", "*14", Rarity.RARE, mage.cards.m.MirranCrusader.class)); - cards.add(new SetCardInfo("Thopter Assembly", 140, Rarity.RARE, mage.cards.t.ThopterAssembly.class)); + cards.add(new SetCardInfo("Thopter Assembly", "140*", Rarity.RARE, mage.cards.t.ThopterAssembly.class)); cards.add(new SetCardInfo("Treasure Mage", 34, Rarity.UNCOMMON, mage.cards.t.TreasureMage.class)); - } + } } diff --git a/Mage.Sets/src/mage/sets/NewPhyrexiaPromos.java b/Mage.Sets/src/mage/sets/NewPhyrexiaPromos.java index adb3eb70bd..13b47364fa 100644 --- a/Mage.Sets/src/mage/sets/NewPhyrexiaPromos.java +++ b/Mage.Sets/src/mage/sets/NewPhyrexiaPromos.java @@ -21,10 +21,10 @@ public class NewPhyrexiaPromos extends ExpansionSet { this.hasBasicLands = false; cards.add(new SetCardInfo("Myr Superion", 146, Rarity.RARE, mage.cards.m.MyrSuperion.class)); - cards.add(new SetCardInfo("Phyrexian Metamorph", 42, Rarity.RARE, mage.cards.p.PhyrexianMetamorph.class)); + cards.add(new SetCardInfo("Phyrexian Metamorph", "42*", Rarity.RARE, mage.cards.p.PhyrexianMetamorph.class)); cards.add(new SetCardInfo("Priest of Urabrask", 90, Rarity.UNCOMMON, mage.cards.p.PriestOfUrabrask.class)); cards.add(new SetCardInfo("Pristine Talisman", 151, Rarity.COMMON, mage.cards.p.PristineTalisman.class)); - cards.add(new SetCardInfo("Sheoldred, Whispering One", 73, Rarity.MYTHIC, mage.cards.s.SheoldredWhisperingOne.class)); + cards.add(new SetCardInfo("Sheoldred, Whispering One", "73*", Rarity.MYTHIC, mage.cards.s.SheoldredWhisperingOne.class)); cards.add(new SetCardInfo("Surgical Extraction", "*74", Rarity.RARE, mage.cards.s.SurgicalExtraction.class)); - } + } } diff --git a/Mage.Sets/src/mage/sets/PrereleaseEvents.java b/Mage.Sets/src/mage/sets/PrereleaseEvents.java deleted file mode 100644 index f3c647779b..0000000000 --- a/Mage.Sets/src/mage/sets/PrereleaseEvents.java +++ /dev/null @@ -1,62 +0,0 @@ -package mage.sets; - -import mage.cards.ExpansionSet; -import mage.constants.Rarity; -import mage.constants.SetType; - -public final class PrereleaseEvents extends ExpansionSet { - - private static final PrereleaseEvents instance = new PrereleaseEvents(); - - public static PrereleaseEvents getInstance() { - return instance; - } - - private PrereleaseEvents() { - super("Prerelease Events", "PPRE", ExpansionSet.buildDate(1990, 1, 1), SetType.PROMOTIONAL); - this.hasBoosters = false; - this.hasBasicLands = false; - - // Commented cards are non-English printings - cards.add(new SetCardInfo("Ajani Vengeant", 38, Rarity.MYTHIC, mage.cards.a.AjaniVengeant.class)); - cards.add(new SetCardInfo("Allosaurus Rider", 30, Rarity.RARE, mage.cards.a.AllosaurusRider.class)); - cards.add(new SetCardInfo("Avatar of Discord", 29, Rarity.RARE, mage.cards.a.AvatarOfDiscord.class)); - cards.add(new SetCardInfo("Avatar of Hope", 11, Rarity.RARE, mage.cards.a.AvatarOfHope.class)); - cards.add(new SetCardInfo("Beast of Burden", 5, Rarity.RARE, mage.cards.b.BeastOfBurden.class)); - cards.add(new SetCardInfo("Demigod of Revenge", 36, Rarity.RARE, mage.cards.d.DemigodOfRevenge.class)); - cards.add(new SetCardInfo("Dirtcowl Wurm", 1, Rarity.RARE, mage.cards.d.DirtcowlWurm.class)); - cards.add(new SetCardInfo("Djinn Illuminatus", 28, Rarity.RARE, mage.cards.d.DjinnIlluminatus.class)); - cards.add(new SetCardInfo("Door of Destinies", 35, Rarity.RARE, mage.cards.d.DoorOfDestinies.class)); - cards.add(new SetCardInfo("Dragon Broodmother", 40, Rarity.MYTHIC, mage.cards.d.DragonBroodmother.class)); - cards.add(new SetCardInfo("False Prophet", 7, Rarity.RARE, mage.cards.f.FalseProphet.class)); - cards.add(new SetCardInfo("Feral Throwback", 19, Rarity.RARE, mage.cards.f.FeralThrowback.class)); - //cards.add(new SetCardInfo("Fungal Shambler", 14, Rarity.RARE, mage.cards.f.FungalShambler.class)); - cards.add(new SetCardInfo("Gleancrawler", 27, Rarity.RARE, mage.cards.g.Gleancrawler.class)); - //cards.add(new SetCardInfo("Glory", 17, Rarity.RARE, mage.cards.g.Glory.class)); - cards.add(new SetCardInfo("Helm of Kaldra", 23, Rarity.RARE, mage.cards.h.HelmOfKaldra.class)); - cards.add(new SetCardInfo("Ink-Eyes, Servant of Oni", 25, Rarity.RARE, mage.cards.i.InkEyesServantOfOni.class)); - cards.add(new SetCardInfo("Kiyomaro, First to Stand", 26, Rarity.RARE, mage.cards.k.KiyomaroFirstToStand.class)); - cards.add(new SetCardInfo("Korlash, Heir to Blackblade", 33, Rarity.RARE, mage.cards.k.KorlashHeirToBlackblade.class)); - //cards.add(new SetCardInfo("Laquatus's Champion", 16, Rarity.RARE, mage.cards.l.LaquatussChampion.class)); - cards.add(new SetCardInfo("Lightning Dragon", 4, Rarity.RARE, mage.cards.l.LightningDragon.class)); - cards.add(new SetCardInfo("Lotus Bloom", 31, Rarity.RARE, mage.cards.l.LotusBloom.class)); - cards.add(new SetCardInfo("Lu Bu, Master-at-Arms", 6, Rarity.RARE, mage.cards.l.LuBuMasterAtArms.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Lu Bu, Master-at-Arms", 8, Rarity.RARE, mage.cards.l.LuBuMasterAtArms.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Malfegor", 39, Rarity.RARE, mage.cards.m.Malfegor.class)); - cards.add(new SetCardInfo("Monstrous Hound", 3, Rarity.RARE, mage.cards.m.MonstrousHound.class)); - cards.add(new SetCardInfo("Oros, the Avenger", 32, Rarity.RARE, mage.cards.o.OrosTheAvenger.class)); - cards.add(new SetCardInfo("Overbeing of Myth", 37, Rarity.RARE, mage.cards.o.OverbeingOfMyth.class)); - cards.add(new SetCardInfo("Overtaker", 9, Rarity.RARE, mage.cards.o.Overtaker.class)); - //cards.add(new SetCardInfo("Questing Phelddagrif", 13, Rarity.RARE, mage.cards.q.QuestingPhelddagrif.class)); - //cards.add(new SetCardInfo("Raging Kavu", 12, Rarity.RARE, mage.cards.r.RagingKavu.class)); - cards.add(new SetCardInfo("Rathi Assassin", 10, Rarity.RARE, mage.cards.r.RathiAssassin.class)); - cards.add(new SetCardInfo("Revenant", 2, Rarity.RARE, mage.cards.r.Revenant.class)); - cards.add(new SetCardInfo("Ryusei, the Falling Star", 24, Rarity.RARE, mage.cards.r.RyuseiTheFallingStar.class)); - cards.add(new SetCardInfo("Shield of Kaldra", 22, Rarity.RARE, mage.cards.s.ShieldOfKaldra.class)); - cards.add(new SetCardInfo("Silent Specter", 18, Rarity.RARE, mage.cards.s.SilentSpecter.class)); - cards.add(new SetCardInfo("Soul Collector", 20, Rarity.RARE, mage.cards.s.SoulCollector.class)); - //cards.add(new SetCardInfo("Stone-Tongue Basilisk", 15, Rarity.RARE, mage.cards.s.StoneTongueBasilisk.class)); - cards.add(new SetCardInfo("Sword of Kaldra", 21, Rarity.RARE, mage.cards.s.SwordOfKaldra.class)); - cards.add(new SetCardInfo("Wren's Run Packmaster", 34, Rarity.RARE, mage.cards.w.WrensRunPackmaster.class)); - } -} \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/RavnicaAllegiancePromos.java b/Mage.Sets/src/mage/sets/RavnicaAllegiancePromos.java index 2034e2cd02..d983dff710 100644 --- a/Mage.Sets/src/mage/sets/RavnicaAllegiancePromos.java +++ b/Mage.Sets/src/mage/sets/RavnicaAllegiancePromos.java @@ -35,7 +35,6 @@ public class RavnicaAllegiancePromos extends ExpansionSet { cards.add(new SetCardInfo("Breeding Pool", "246p", Rarity.RARE, mage.cards.b.BreedingPool.class)); cards.add(new SetCardInfo("Cindervines", "161p", Rarity.RARE, mage.cards.c.Cindervines.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Cindervines", "161s", Rarity.RARE, mage.cards.c.Cindervines.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Consecrate // Consume", "224p", Rarity.UNCOMMON, mage.cards.c.ConsecrateConsume.class)); cards.add(new SetCardInfo("Deputy of Detention", "165p", Rarity.RARE, mage.cards.d.DeputyOfDetention.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Deputy of Detention", "165s", Rarity.RARE, mage.cards.d.DeputyOfDetention.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Electrodominance", "99p", Rarity.RARE, mage.cards.e.Electrodominance.class)); @@ -67,8 +66,8 @@ public class RavnicaAllegiancePromos extends ExpansionSet { cards.add(new SetCardInfo("Kaya's Wrath", "187p", Rarity.RARE, mage.cards.k.KayasWrath.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Kaya's Wrath", "187s", Rarity.RARE, mage.cards.k.KayasWrath.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Kaya, Orzhov Usurper", "186p", Rarity.MYTHIC, mage.cards.k.KayaOrzhovUsurper.class)); - cards.add(new SetCardInfo("Lavinia, Azorius Renegade", 189, Rarity.RARE, mage.cards.l.LaviniaAzoriusRenegade.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Lavinia, Azorius Renegade", "189s", Rarity.RARE, mage.cards.l.LaviniaAzoriusRenegade.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Lavinia, Azorius Renegade", 189, Rarity.RARE, mage.cards.l.LaviniaAzoriusRenegade.class)); cards.add(new SetCardInfo("Light Up the Stage", 107, Rarity.UNCOMMON, mage.cards.l.LightUpTheStage.class)); cards.add(new SetCardInfo("Lumbering Battlement", "15s", Rarity.RARE, mage.cards.l.LumberingBattlement.class)); cards.add(new SetCardInfo("Mass Manipulation", "42p", Rarity.RARE, mage.cards.m.MassManipulation.class)); @@ -86,10 +85,11 @@ public class RavnicaAllegiancePromos extends ExpansionSet { cards.add(new SetCardInfo("Rix Maadi Reveler", "109s", Rarity.RARE, mage.cards.r.RixMaadiReveler.class)); cards.add(new SetCardInfo("Seraph of the Scales", "205p", Rarity.MYTHIC, mage.cards.s.SeraphOfTheScales.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Seraph of the Scales", "205s", Rarity.MYTHIC, mage.cards.s.SeraphOfTheScales.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Simic Ascendancy", 207, Rarity.RARE, mage.cards.s.SimicAscendancy.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Simic Ascendancy", "207s", Rarity.RARE, mage.cards.s.SimicAscendancy.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Simic Ascendancy", 207, Rarity.RARE, mage.cards.s.SimicAscendancy.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Skarrgan Hellkite", "114p", Rarity.MYTHIC, mage.cards.s.SkarrganHellkite.class)); cards.add(new SetCardInfo("Smothering Tithe", "22p", Rarity.RARE, mage.cards.s.SmotheringTithe.class)); + cards.add(new SetCardInfo("Spawn of Mayhem", "85p", Rarity.MYTHIC, mage.cards.s.SpawnOfMayhem.class)); cards.add(new SetCardInfo("Sphinx of Foresight", "55s", Rarity.RARE, mage.cards.s.SphinxOfForesight.class)); cards.add(new SetCardInfo("Stomping Ground", "259p", Rarity.RARE, mage.cards.s.StompingGround.class)); cards.add(new SetCardInfo("Teysa Karlov", "212p", Rarity.RARE, mage.cards.t.TeysaKarlov.class, NON_FULL_USE_VARIOUS)); @@ -97,7 +97,8 @@ public class RavnicaAllegiancePromos extends ExpansionSet { cards.add(new SetCardInfo("Theater of Horrors", "213s", Rarity.RARE, mage.cards.t.TheaterOfHorrors.class)); cards.add(new SetCardInfo("Tithe Taker", "27p", Rarity.RARE, mage.cards.t.TitheTaker.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Tithe Taker", "27s", Rarity.RARE, mage.cards.t.TitheTaker.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Unbreakable Formation", "29s", Rarity.RARE, mage.cards.u.UnbreakableFormation.class)); + cards.add(new SetCardInfo("Unbreakable Formation", "29p", Rarity.RARE, mage.cards.u.UnbreakableFormation.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Unbreakable Formation", "29s", Rarity.RARE, mage.cards.u.UnbreakableFormation.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Zegana, Utopian Speaker", "214s", Rarity.RARE, mage.cards.z.ZeganaUtopianSpeaker.class)); - } + } } diff --git a/Mage.Sets/src/mage/sets/ReleaseEvents.java b/Mage.Sets/src/mage/sets/ReleaseEvents.java deleted file mode 100644 index 7d9afc40b0..0000000000 --- a/Mage.Sets/src/mage/sets/ReleaseEvents.java +++ /dev/null @@ -1,39 +0,0 @@ -package mage.sets; - -import mage.cards.ExpansionSet; -import mage.constants.Rarity; -import mage.constants.SetType; - -/** - * https://scryfall.com/sets/prel - */ -public class ReleaseEvents extends ExpansionSet { - - private static final ReleaseEvents instance = new ReleaseEvents(); - - public static ReleaseEvents getInstance() { - return instance; - } - - private ReleaseEvents() { - super("Release Events", "PREL", ExpansionSet.buildDate(2007, 10, 12), SetType.PROMOTIONAL); - this.hasBoosters = false; - this.hasBasicLands = false; - - // Silver-bordered card not implemented - // cards.add(new SetCardInfo("Ass Whuppin'", 2, Rarity.RARE, mage.cards.a.AssWhuppin.class)); - cards.add(new SetCardInfo("Azorius Guildmage", 9, Rarity.RARE, mage.cards.a.AzoriusGuildmage.class)); - cards.add(new SetCardInfo("Budoka Pupil", "3a", Rarity.UNCOMMON, mage.cards.b.BudokaPupil.class)); - cards.add(new SetCardInfo("Dimir Guildmage", 7, Rarity.RARE, mage.cards.d.DimirGuildmage.class)); - cards.add(new SetCardInfo("Force of Nature", 5, Rarity.RARE, mage.cards.f.ForceOfNature.class)); - cards.add(new SetCardInfo("Ghost-Lit Raider", 4, Rarity.RARE, mage.cards.g.GhostLitRaider.class)); - cards.add(new SetCardInfo("Gruul Guildmage", 8, Rarity.RARE, mage.cards.g.GruulGuildmage.class)); - cards.add(new SetCardInfo("Hedge Troll", 11, Rarity.RARE, mage.cards.h.HedgeTroll.class)); - cards.add(new SetCardInfo("Rukh Egg", 1, Rarity.RARE, mage.cards.r.RukhEgg.class)); - // Russian-only printing - //cards.add(new SetCardInfo("Shivan Dragon", 6, Rarity.RARE, mage.cards.s.ShivanDragon.class)); - cards.add(new SetCardInfo("Shriekmaw", 13, Rarity.RARE, mage.cards.s.Shriekmaw.class)); - cards.add(new SetCardInfo("Storm Entity", 12, Rarity.RARE, mage.cards.s.StormEntity.class)); - cards.add(new SetCardInfo("Sudden Shock", 10, Rarity.RARE, mage.cards.s.SuddenShock.class)); - } -} diff --git a/Mage.Sets/src/mage/sets/ResalePromos.java b/Mage.Sets/src/mage/sets/ResalePromos.java index 35ce780add..deb28e216b 100644 --- a/Mage.Sets/src/mage/sets/ResalePromos.java +++ b/Mage.Sets/src/mage/sets/ResalePromos.java @@ -19,35 +19,38 @@ public class ResalePromos extends ExpansionSet { } private ResalePromos() { - super("Resale Promos", "PRES", ExpansionSet.buildDate(2019, 7, 1), SetType.PROMOTIONAL); + 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("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("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)); - // Japanese-only printing - //cards.add(new SetCardInfo("Goblin Chieftain", "141*", Rarity.RARE, mage.cards.g.GoblinChieftain.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)); - // Japanese-only printings - //cards.add(new SetCardInfo("Loam Lion", "13*", Rarity.UNCOMMON, mage.cards.l.LoamLion.class)); - //cards.add(new SetCardInfo("Oran-Rief, the Vastwood", "221*", Rarity.RARE, mage.cards.o.OranRiefTheVastwood.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.Sets/src/mage/sets/ShardsOfAlaraPromos.java b/Mage.Sets/src/mage/sets/ShardsOfAlaraPromos.java new file mode 100644 index 0000000000..7ff1177dc2 --- /dev/null +++ b/Mage.Sets/src/mage/sets/ShardsOfAlaraPromos.java @@ -0,0 +1,28 @@ +package mage.sets; + +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; + +/** + * @author JayDi85 + * + * https://scryfall.com/sets/pala + */ +public final class ShardsOfAlaraPromos extends ExpansionSet { + + private static final ShardsOfAlaraPromos instance = new ShardsOfAlaraPromos(); + + public static ShardsOfAlaraPromos getInstance() { + return instance; + } + + private ShardsOfAlaraPromos() { + super("Shards of Alara Promos", "PALA", ExpansionSet.buildDate(2008, 10, 3), SetType.PROMOTIONAL); + this.blockName = "Shards of Alara"; + this.hasBoosters = false; + this.hasBasicLands = false; + + cards.add(new SetCardInfo("Ajani Vengeant", "154*", Rarity.MYTHIC, mage.cards.a.AjaniVengeant.class)); + } +}