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 c383ae123e..a9bbb968f3 100644 --- a/Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java +++ b/Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java @@ -1505,7 +1505,15 @@ public class DragCardGrid extends JPanel implements DragCardSource, DragCardTarg pimpedSets.put("JR", 1); pimpedSets.put("MPS", 1); pimpedSets.put("CLASH", 1); - pimpedSets.put("ARENA", 1); + pimpedSets.put("PARL", 1); + pimpedSets.put("PAL99", 1); + pimpedSets.put("PAL00", 1); + pimpedSets.put("PAL01", 1); + pimpedSets.put("PAL02", 1); + pimpedSets.put("PAL03", 1); + pimpedSets.put("PAL04", 1); + pimpedSets.put("PAL05", 1); + pimpedSets.put("PAL06", 1); pimpedSets.put("UGIN", 1); pimpedSets.put("WMCQ", 1); pimpedSets.put("PALP", 1); 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 ba94c15313..a71a365f76 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 @@ -62,7 +62,6 @@ public class GathererSets implements Iterable { "ARC", "DD3EVG", "W16", "W17", // "PALP" -- Gatherer does not have the set Asia Pacific Land Program - // "ARENA" -- is't many set with different codes, not one // "ATH" -- has cards from many sets, symbol does not exist on gatherer // "CLASH", "CP", "DPA", "PELP", "FNMP", "GPX", "GRC", "GUR", "H17", "JR", "MBP", "MGDC", "MLP", "MPRP", "PTC", "SUS", "SWS", "WMCQ", // need to fix "H09", "PD2", "PD3", "UNH", "CM1", "V11", "A25", "UST", "IMA", "DD2", "EVG", "DDC", "DDE", "DDD", "8EB", "9EB", "CHR", "G18", "DD3GVL", "S00", "S99", "UGL" // ok 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 dc006d90de..64d36ac979 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 @@ -65,7 +65,18 @@ public class ScryfallImageSupportCards { add("G99"); add("G00"); add("G01"); - + + // Arena League + add("PARL"); + add("PAL99"); + add("PAL00"); + add("PAL01"); + add("PAL02"); + add("PAL03"); + add("PAL04"); + add("PAL05"); + add("PAL06"); + // Other promo sets add("PWOR"); add("PWOS"); diff --git a/Mage.Sets/src/mage/sets/ArenaLeague.java b/Mage.Sets/src/mage/sets/ArenaLeague.java deleted file mode 100644 index 4eefe4b34c..0000000000 --- a/Mage.Sets/src/mage/sets/ArenaLeague.java +++ /dev/null @@ -1,101 +0,0 @@ - -package mage.sets; - -import mage.cards.ExpansionSet; -import mage.constants.Rarity; -import mage.constants.SetType; - -/** - * - * @author fireshoes - */ -public final class ArenaLeague extends ExpansionSet { - - private static final ArenaLeague instance = new ArenaLeague(); - - public static ArenaLeague getInstance() { - return instance; - } - - private ArenaLeague() { - super("Arena League", "ARENA", ExpansionSet.buildDate(1996, 7, 4), SetType.PROMOTIONAL); - this.hasBoosters = false; - cards.add(new SetCardInfo("Arc Lightning", 42, Rarity.COMMON, mage.cards.a.ArcLightning.class)); - cards.add(new SetCardInfo("Bonesplitter", 52, Rarity.COMMON, mage.cards.b.Bonesplitter.class)); - cards.add(new SetCardInfo("Castigate", 80, Rarity.COMMON, mage.cards.c.Castigate.class)); - cards.add(new SetCardInfo("Chill", 19, Rarity.SPECIAL, mage.cards.c.Chill.class)); - cards.add(new SetCardInfo("Coiling Oracle", 82, Rarity.COMMON, mage.cards.c.CoilingOracle.class)); - cards.add(new SetCardInfo("Creeping Mold", 28, Rarity.SPECIAL, mage.cards.c.CreepingMold.class)); - cards.add(new SetCardInfo("Darksteel Ingot", 58, Rarity.COMMON, mage.cards.d.DarksteelIngot.class)); - cards.add(new SetCardInfo("Dauthi Slayer", 43, Rarity.SPECIAL, mage.cards.d.DauthiSlayer.class)); - cards.add(new SetCardInfo("Diabolic Edict", 37, Rarity.COMMON, mage.cards.d.DiabolicEdict.class)); - cards.add(new SetCardInfo("Disenchant", 6, Rarity.COMMON, mage.cards.d.Disenchant.class)); - cards.add(new SetCardInfo("Dismiss", 29, Rarity.SPECIAL, mage.cards.d.Dismiss.class)); - cards.add(new SetCardInfo("Duress", 17, Rarity.COMMON, mage.cards.d.Duress.class)); - cards.add(new SetCardInfo("Elvish Aberration", 51, Rarity.COMMON, mage.cards.e.ElvishAberration.class)); - cards.add(new SetCardInfo("Empyrial Armor", 31, Rarity.SPECIAL, mage.cards.e.EmpyrialArmor.class)); - cards.add(new SetCardInfo("Enlightened Tutor", 21, Rarity.SPECIAL, mage.cards.e.EnlightenedTutor.class)); - cards.add(new SetCardInfo("Fireball", 7, Rarity.SPECIAL, mage.cards.f.Fireball.class)); - cards.add(new SetCardInfo("Fling", 30, Rarity.COMMON, mage.cards.f.Fling.class)); - cards.add(new SetCardInfo("Forest", 5, Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Forest", 12, Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Forest", 27, Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Forest", 36, Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Forest", 40, Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Forest", 49, Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Forest", 57, Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Forest", 71, Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Forest", 79, Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Gaea's Blessing", 38, Rarity.SPECIAL, mage.cards.g.GaeasBlessing.class)); - cards.add(new SetCardInfo("Genju of the Spires", 72, Rarity.SPECIAL, mage.cards.g.GenjuOfTheSpires.class)); - cards.add(new SetCardInfo("Glacial Ray", 60, Rarity.COMMON, mage.cards.g.GlacialRay.class)); - cards.add(new SetCardInfo("Island", 2, Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Island", 9, Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Island", 24, Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Island", 33, Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Island", 39, Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Island", 46, Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Island", 54, Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Island", 68, Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Island", 76, Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Karn, Silver Golem", 16, Rarity.SPECIAL, mage.cards.k.KarnSilverGolem.class)); - cards.add(new SetCardInfo("Mana Leak", 44, Rarity.COMMON, mage.cards.m.ManaLeak.class)); - cards.add(new SetCardInfo("Man-o'-War", 41, Rarity.COMMON, mage.cards.m.ManOWar.class)); - cards.add(new SetCardInfo("Mountain", 4, Rarity.LAND, mage.cards.basiclands.Mountain.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Mountain", 11, Rarity.LAND, mage.cards.basiclands.Mountain.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Mountain", 26, Rarity.LAND, mage.cards.basiclands.Mountain.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Mountain", 35, Rarity.LAND, mage.cards.basiclands.Mountain.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Mountain", 48, Rarity.LAND, mage.cards.basiclands.Mountain.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Mountain", 56, Rarity.LAND, mage.cards.basiclands.Mountain.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Mountain", 70, Rarity.LAND, mage.cards.basiclands.Mountain.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Mountain", 78, Rarity.LAND, mage.cards.basiclands.Mountain.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Okina Nightwatch", 73, Rarity.COMMON, mage.cards.o.OkinaNightwatch.class)); - cards.add(new SetCardInfo("Pillage", 20, Rarity.SPECIAL, mage.cards.p.Pillage.class)); - cards.add(new SetCardInfo("Plains", 1, Rarity.LAND, mage.cards.basiclands.Plains.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Plains", 8, Rarity.LAND, mage.cards.basiclands.Plains.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Plains", 23, Rarity.LAND, mage.cards.basiclands.Plains.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Plains", 32, Rarity.LAND, mage.cards.basiclands.Plains.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Plains", 45, Rarity.LAND, mage.cards.basiclands.Plains.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Plains", 53, Rarity.LAND, mage.cards.basiclands.Plains.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Plains", 67, Rarity.LAND, mage.cards.basiclands.Plains.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Plains", 75, Rarity.LAND, mage.cards.basiclands.Plains.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Pouncing Jaguar", 13, Rarity.COMMON, mage.cards.p.PouncingJaguar.class)); - cards.add(new SetCardInfo("Rewind", 15, Rarity.COMMON, mage.cards.r.Rewind.class)); - cards.add(new SetCardInfo("Serum Visions", 59, Rarity.COMMON, mage.cards.s.SerumVisions.class)); - cards.add(new SetCardInfo("Skirk Marauder", 50, Rarity.COMMON, mage.cards.s.SkirkMarauder.class)); - cards.add(new SetCardInfo("Skittering Skirge", 14, Rarity.COMMON, mage.cards.s.SkitteringSkirge.class)); - cards.add(new SetCardInfo("Skyknight Legionnaire", 74, Rarity.COMMON, mage.cards.s.SkyknightLegionnaire.class)); - cards.add(new SetCardInfo("Stupor", 22, Rarity.COMMON, mage.cards.s.Stupor.class)); - cards.add(new SetCardInfo("Surging Flame", 83, Rarity.COMMON, mage.cards.s.SurgingFlame.class)); - cards.add(new SetCardInfo("Swamp", 3, Rarity.LAND, mage.cards.basiclands.Swamp.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Swamp", 10, Rarity.LAND, mage.cards.basiclands.Swamp.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Swamp", 25, Rarity.LAND, mage.cards.basiclands.Swamp.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Swamp", 34, Rarity.LAND, mage.cards.basiclands.Swamp.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Swamp", 47, Rarity.LAND, mage.cards.basiclands.Swamp.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Swamp", 55, Rarity.LAND, mage.cards.basiclands.Swamp.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Swamp", 69, Rarity.LAND, mage.cards.basiclands.Swamp.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Swamp", 77, Rarity.LAND, mage.cards.basiclands.Swamp.class, NON_FULL_USE_VARIOUS)); - cards.add(new SetCardInfo("Uktabi Orangutan", 18, Rarity.SPECIAL, mage.cards.u.UktabiOrangutan.class)); - cards.add(new SetCardInfo("Wee Dragonauts", 81, Rarity.COMMON, mage.cards.w.WeeDragonauts.class)); - } -} diff --git a/Mage.Sets/src/mage/sets/ArenaLeague1996.java b/Mage.Sets/src/mage/sets/ArenaLeague1996.java new file mode 100644 index 0000000000..8a7869dc87 --- /dev/null +++ b/Mage.Sets/src/mage/sets/ArenaLeague1996.java @@ -0,0 +1,31 @@ +package mage.sets; + +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; + +/** + * https://scryfall.com/sets/parl + */ +public class ArenaLeague1996 extends ExpansionSet { + + private static final ArenaLeague1996 instance = new ArenaLeague1996(); + + public static ArenaLeague1996 getInstance() { + return instance; + } + + private ArenaLeague1996() { + super("Arena League 1996", "PARL", ExpansionSet.buildDate(1996, 8, 2), SetType.PROMOTIONAL); + this.hasBoosters = false; + this.hasBasicLands = true; + + cards.add(new SetCardInfo("Disenchant", 6, Rarity.RARE, mage.cards.d.Disenchant.class)); + cards.add(new SetCardInfo("Fireball", 7, Rarity.RARE, mage.cards.f.Fireball.class)); + cards.add(new SetCardInfo("Forest", 5, Rarity.LAND, mage.cards.basiclands.Forest.class)); + cards.add(new SetCardInfo("Island", 2, Rarity.LAND, mage.cards.basiclands.Island.class)); + cards.add(new SetCardInfo("Mountain", 4, Rarity.LAND, mage.cards.basiclands.Mountain.class)); + cards.add(new SetCardInfo("Plains", 1, Rarity.LAND, mage.cards.basiclands.Plains.class)); + cards.add(new SetCardInfo("Swamp", 3, Rarity.LAND, mage.cards.basiclands.Swamp.class)); + } +} diff --git a/Mage.Sets/src/mage/sets/ArenaLeague1999.java b/Mage.Sets/src/mage/sets/ArenaLeague1999.java new file mode 100644 index 0000000000..9e90235cf9 --- /dev/null +++ b/Mage.Sets/src/mage/sets/ArenaLeague1999.java @@ -0,0 +1,34 @@ +package mage.sets; + +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; + +/** + * https://scryfall.com/sets/pal99 + */ +public class ArenaLeague1999 extends ExpansionSet { + + private static final ArenaLeague1999 instance = new ArenaLeague1999(); + + public static ArenaLeague1999 getInstance() { + return instance; + } + + private ArenaLeague1999() { + super("Arena League 1999", "PAL99", ExpansionSet.buildDate(1999, 1, 1), SetType.PROMOTIONAL); + this.hasBoosters = false; + this.hasBasicLands = true; + + cards.add(new SetCardInfo("Forest", 1, Rarity.LAND, mage.cards.basiclands.Forest.class)); + cards.add(new SetCardInfo("Island", 3, Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Island", "3+", Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Karn, Silver Golem", 8, Rarity.RARE, mage.cards.k.KarnSilverGolem.class)); + cards.add(new SetCardInfo("Mountain", 5, Rarity.LAND, mage.cards.basiclands.Mountain.class)); + cards.add(new SetCardInfo("Plains", 7, Rarity.LAND, mage.cards.basiclands.Plains.class)); + cards.add(new SetCardInfo("Pouncing Jaguar", 2, Rarity.RARE, mage.cards.p.PouncingJaguar.class)); + cards.add(new SetCardInfo("Rewind", 6, Rarity.RARE, mage.cards.r.Rewind.class)); + cards.add(new SetCardInfo("Skittering Skirge", 4, Rarity.RARE, mage.cards.s.SkitteringSkirge.class)); + cards.add(new SetCardInfo("Swamp", 9, Rarity.LAND, mage.cards.basiclands.Swamp.class)); + } +} diff --git a/Mage.Sets/src/mage/sets/ArenaLeague2000.java b/Mage.Sets/src/mage/sets/ArenaLeague2000.java new file mode 100644 index 0000000000..6652265841 --- /dev/null +++ b/Mage.Sets/src/mage/sets/ArenaLeague2000.java @@ -0,0 +1,35 @@ +package mage.sets; + +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; + +/** + * https://scryfall.com/sets/pal00 + */ +public class ArenaLeague2000 extends ExpansionSet { + + private static final ArenaLeague2000 instance = new ArenaLeague2000(); + + public static ArenaLeague2000 getInstance() { + return instance; + } + + private ArenaLeague2000() { + super("Arena League 2000", "PAL00", ExpansionSet.buildDate(2000, 1, 1), SetType.PROMOTIONAL); + this.hasBoosters = false; + this.hasBasicLands = true; + + cards.add(new SetCardInfo("Chill", 4, Rarity.RARE, mage.cards.c.Chill.class)); + cards.add(new SetCardInfo("Duress", 2, Rarity.RARE, mage.cards.d.Duress.class)); + cards.add(new SetCardInfo("Enlightened Tutor", 6, Rarity.RARE, mage.cards.e.EnlightenedTutor.class)); + cards.add(new SetCardInfo("Forest", 12, Rarity.LAND, mage.cards.basiclands.Forest.class)); + cards.add(new SetCardInfo("Island", 9, Rarity.LAND, mage.cards.basiclands.Island.class)); + cards.add(new SetCardInfo("Mountain", 11, Rarity.LAND, mage.cards.basiclands.Mountain.class)); + cards.add(new SetCardInfo("Pillage", 5, Rarity.RARE, mage.cards.p.Pillage.class)); + cards.add(new SetCardInfo("Plains", 8, Rarity.LAND, mage.cards.basiclands.Plains.class)); + cards.add(new SetCardInfo("Stupor", 7, Rarity.RARE, mage.cards.s.Stupor.class)); + cards.add(new SetCardInfo("Swamp", 10, Rarity.LAND, mage.cards.basiclands.Swamp.class)); + cards.add(new SetCardInfo("Uktabi Orangutan", 3, Rarity.RARE, mage.cards.u.UktabiOrangutan.class)); + } +} diff --git a/Mage.Sets/src/mage/sets/ArenaLeague2001.java b/Mage.Sets/src/mage/sets/ArenaLeague2001.java new file mode 100644 index 0000000000..9ddcfa7f08 --- /dev/null +++ b/Mage.Sets/src/mage/sets/ArenaLeague2001.java @@ -0,0 +1,36 @@ +package mage.sets; + +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; + +/** + * https://scryfall.com/sets/pal01 + */ +public class ArenaLeague2001 extends ExpansionSet { + + private static final ArenaLeague2001 instance = new ArenaLeague2001(); + + public static ArenaLeague2001 getInstance() { + return instance; + } + + private ArenaLeague2001() { + super("Arena League 2001", "PAL01", ExpansionSet.buildDate(2001, 1, 1), SetType.PROMOTIONAL); + this.hasBoosters = false; + this.hasBasicLands = true; + + cards.add(new SetCardInfo("Creeping Mold", 2, Rarity.RARE, mage.cards.c.CreepingMold.class)); + cards.add(new SetCardInfo("Diabolic Edict", 10, Rarity.RARE, mage.cards.d.DiabolicEdict.class)); + cards.add(new SetCardInfo("Dismiss", 4, Rarity.RARE, mage.cards.d.Dismiss.class)); + cards.add(new SetCardInfo("Empyrial Armor", 8, Rarity.RARE, mage.cards.e.EmpyrialArmor.class)); + cards.add(new SetCardInfo("Fling", 6, Rarity.RARE, mage.cards.f.Fling.class)); + cards.add(new SetCardInfo("Forest", 1, Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Forest", 11, Rarity.LAND, mage.cards.basiclands.Forest.class, NON_FULL_USE_VARIOUS)); + cards.add(new SetCardInfo("Gaea's Blessing", 12, Rarity.RARE, mage.cards.g.GaeasBlessing.class)); + cards.add(new SetCardInfo("Island", 3, Rarity.LAND, mage.cards.basiclands.Island.class)); + cards.add(new SetCardInfo("Mountain", 5, Rarity.LAND, mage.cards.basiclands.Mountain.class)); + cards.add(new SetCardInfo("Plains", 7, Rarity.LAND, mage.cards.basiclands.Plains.class)); + cards.add(new SetCardInfo("Swamp", 9, Rarity.LAND, mage.cards.basiclands.Swamp.class)); + } +} diff --git a/Mage.Sets/src/mage/sets/ArenaLeague2002.java b/Mage.Sets/src/mage/sets/ArenaLeague2002.java new file mode 100644 index 0000000000..371b130cad --- /dev/null +++ b/Mage.Sets/src/mage/sets/ArenaLeague2002.java @@ -0,0 +1,29 @@ +package mage.sets; + +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; + +/** + * https://scryfall.com/sets/pal02 + */ +public class ArenaLeague2002 extends ExpansionSet { + + private static final ArenaLeague2002 instance = new ArenaLeague2002(); + + public static ArenaLeague2002 getInstance() { + return instance; + } + + private ArenaLeague2002() { + super("Arena League 2002", "PAL02", ExpansionSet.buildDate(2002, 1, 1), SetType.PROMOTIONAL); + this.hasBoosters = false; + this.hasBasicLands = true; + + cards.add(new SetCardInfo("Arc Lightning", 3, Rarity.RARE, mage.cards.a.ArcLightning.class)); + cards.add(new SetCardInfo("Dauthi Slayer", 4, Rarity.RARE, mage.cards.d.DauthiSlayer.class)); + cards.add(new SetCardInfo("Island", 1, Rarity.LAND, mage.cards.basiclands.Island.class)); + cards.add(new SetCardInfo("Man-o'-War", 2, Rarity.RARE, mage.cards.m.ManOWar.class)); + cards.add(new SetCardInfo("Mana Leak", 5, Rarity.RARE, mage.cards.m.ManaLeak.class)); + } +} diff --git a/Mage.Sets/src/mage/sets/ArenaLeague2003.java b/Mage.Sets/src/mage/sets/ArenaLeague2003.java new file mode 100644 index 0000000000..71639edaf1 --- /dev/null +++ b/Mage.Sets/src/mage/sets/ArenaLeague2003.java @@ -0,0 +1,32 @@ +package mage.sets; + +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; + +/** + * https://scryfall.com/sets/pal03 + */ +public class ArenaLeague2003 extends ExpansionSet { + + private static final ArenaLeague2003 instance = new ArenaLeague2003(); + + public static ArenaLeague2003 getInstance() { + return instance; + } + + private ArenaLeague2003() { + super("Arena League 2003", "PAL03", ExpansionSet.buildDate(2003, 1, 1), SetType.PROMOTIONAL); + this.hasBoosters = false; + this.hasBasicLands = true; + + cards.add(new SetCardInfo("Bonesplitter", 8, Rarity.RARE, mage.cards.b.Bonesplitter.class)); + cards.add(new SetCardInfo("Elvish Aberration", 7, Rarity.RARE, mage.cards.e.ElvishAberration.class)); + cards.add(new SetCardInfo("Forest", 5, Rarity.LAND, mage.cards.basiclands.Forest.class)); + cards.add(new SetCardInfo("Island", 2, Rarity.LAND, mage.cards.basiclands.Island.class)); + cards.add(new SetCardInfo("Mountain", 4, Rarity.LAND, mage.cards.basiclands.Mountain.class)); + cards.add(new SetCardInfo("Plains", 1, Rarity.LAND, mage.cards.basiclands.Plains.class)); + cards.add(new SetCardInfo("Skirk Marauder", 6, Rarity.RARE, mage.cards.s.SkirkMarauder.class)); + cards.add(new SetCardInfo("Swamp", 3, Rarity.LAND, mage.cards.basiclands.Swamp.class)); + } +} diff --git a/Mage.Sets/src/mage/sets/ArenaLeague2004.java b/Mage.Sets/src/mage/sets/ArenaLeague2004.java new file mode 100644 index 0000000000..9c6345f092 --- /dev/null +++ b/Mage.Sets/src/mage/sets/ArenaLeague2004.java @@ -0,0 +1,41 @@ +package mage.sets; + +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; + +/** + * https://scryfall.com/sets/pal04 + */ +public class ArenaLeague2004 extends ExpansionSet { + + private static final ArenaLeague2004 instance = new ArenaLeague2004(); + + public static ArenaLeague2004 getInstance() { + return instance; + } + + private ArenaLeague2004() { + super("Arena League 2004", "PAL04", ExpansionSet.buildDate(2004, 1, 1), SetType.PROMOTIONAL); + this.hasBoosters = false; + this.hasBasicLands = true; + + // Not implemented + //cards.add(new SetCardInfo("Ashnod's Coupon", 14, Rarity.RARE, mage.cards.a.AshnodsCoupon.class)); + cards.add(new SetCardInfo("Booster Tutor", 11, Rarity.RARE, mage.cards.b.BoosterTutor.class)); + // Not implemented + //cards.add(new SetCardInfo("Circle of Protection: Art", 9, Rarity.RARE, mage.cards.c.CircleOfProtectionArt.class)); + cards.add(new SetCardInfo("Darksteel Ingot", 6, Rarity.RARE, mage.cards.d.DarksteelIngot.class)); + cards.add(new SetCardInfo("Forest", 5, Rarity.LAND, mage.cards.basiclands.Forest.class)); + cards.add(new SetCardInfo("Glacial Ray", 8, Rarity.RARE, mage.cards.g.GlacialRay.class)); + // Not implemented + // cards.add(new SetCardInfo("Goblin Mime", 12, Rarity.RARE, mage.cards.g.GoblinMime.class)); + // cards.add(new SetCardInfo("Granny's Payback", 13, Rarity.RARE, mage.cards.g.GrannysPayback.class)); + cards.add(new SetCardInfo("Island", 2, Rarity.LAND, mage.cards.basiclands.Island.class)); + cards.add(new SetCardInfo("Mise", 10, Rarity.RARE, mage.cards.m.Mise.class)); + cards.add(new SetCardInfo("Mountain", 4, Rarity.LAND, mage.cards.basiclands.Mountain.class)); + cards.add(new SetCardInfo("Plains", 1, Rarity.LAND, mage.cards.basiclands.Plains.class)); + cards.add(new SetCardInfo("Serum Visions", 7, Rarity.RARE, mage.cards.s.SerumVisions.class)); + cards.add(new SetCardInfo("Swamp", 3, Rarity.LAND, mage.cards.basiclands.Swamp.class)); + } +} diff --git a/Mage.Sets/src/mage/sets/ArenaLeague2005.java b/Mage.Sets/src/mage/sets/ArenaLeague2005.java new file mode 100644 index 0000000000..dff0c3aea2 --- /dev/null +++ b/Mage.Sets/src/mage/sets/ArenaLeague2005.java @@ -0,0 +1,32 @@ +package mage.sets; + +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; + +/** + * https://scryfall.com/sets/pal05 + */ +public class ArenaLeague2005 extends ExpansionSet { + + private static final ArenaLeague2005 instance = new ArenaLeague2005(); + + public static ArenaLeague2005 getInstance() { + return instance; + } + + private ArenaLeague2005() { + super("Arena League 2005", "PAL05", ExpansionSet.buildDate(2005, 1, 1), SetType.PROMOTIONAL); + this.hasBoosters = false; + this.hasBasicLands = true; + + cards.add(new SetCardInfo("Forest", 5, Rarity.LAND, mage.cards.basiclands.Forest.class)); + cards.add(new SetCardInfo("Genju of the Spires", 6, Rarity.RARE, mage.cards.g.GenjuOfTheSpires.class)); + cards.add(new SetCardInfo("Island", 2, Rarity.LAND, mage.cards.basiclands.Island.class)); + cards.add(new SetCardInfo("Mountain", 4, Rarity.LAND, mage.cards.basiclands.Mountain.class)); + cards.add(new SetCardInfo("Okina Nightwatch", 7, Rarity.RARE, mage.cards.o.OkinaNightwatch.class)); + cards.add(new SetCardInfo("Plains", 1, Rarity.LAND, mage.cards.basiclands.Plains.class)); + cards.add(new SetCardInfo("Skyknight Legionnaire", 8, Rarity.RARE, mage.cards.s.SkyknightLegionnaire.class)); + cards.add(new SetCardInfo("Swamp", 3, Rarity.LAND, mage.cards.basiclands.Swamp.class)); + } +} diff --git a/Mage.Sets/src/mage/sets/ArenaLeague2006.java b/Mage.Sets/src/mage/sets/ArenaLeague2006.java new file mode 100644 index 0000000000..ebfd6feb49 --- /dev/null +++ b/Mage.Sets/src/mage/sets/ArenaLeague2006.java @@ -0,0 +1,33 @@ +package mage.sets; + +import mage.cards.ExpansionSet; +import mage.constants.Rarity; +import mage.constants.SetType; + +/** + * https://scryfall.com/sets/pal06 + */ +public class ArenaLeague2006 extends ExpansionSet { + + private static final ArenaLeague2006 instance = new ArenaLeague2006(); + + public static ArenaLeague2006 getInstance() { + return instance; + } + + private ArenaLeague2006() { + super("Arena League 2006", "PAL06", ExpansionSet.buildDate(2006, 1, 1), SetType.PROMOTIONAL); + this.hasBoosters = false; + this.hasBasicLands = true; + + cards.add(new SetCardInfo("Castigate", 6, Rarity.RARE, mage.cards.c.Castigate.class)); + cards.add(new SetCardInfo("Coiling Oracle", 8, Rarity.RARE, mage.cards.c.CoilingOracle.class)); + cards.add(new SetCardInfo("Forest", 5, Rarity.LAND, mage.cards.basiclands.Forest.class)); + cards.add(new SetCardInfo("Island", 2, Rarity.LAND, mage.cards.basiclands.Island.class)); + cards.add(new SetCardInfo("Mountain", 4, Rarity.LAND, mage.cards.basiclands.Mountain.class)); + cards.add(new SetCardInfo("Plains", 1, Rarity.LAND, mage.cards.basiclands.Plains.class)); + cards.add(new SetCardInfo("Surging Flame", 9, Rarity.RARE, mage.cards.s.SurgingFlame.class)); + cards.add(new SetCardInfo("Swamp", 3, Rarity.LAND, mage.cards.basiclands.Swamp.class)); + cards.add(new SetCardInfo("Wee Dragonauts", 7, Rarity.RARE, mage.cards.w.WeeDragonauts.class)); + } +} diff --git a/Mage.Verify/src/main/java/mage/verify/MtgJson.java b/Mage.Verify/src/main/java/mage/verify/MtgJson.java index 28498f180c..0b10985754 100644 --- a/Mage.Verify/src/main/java/mage/verify/MtgJson.java +++ b/Mage.Verify/src/main/java/mage/verify/MtgJson.java @@ -37,7 +37,7 @@ public final class MtgJson { mtgJsonToXMageCodes.put("pGPX", "GPX"); mtgJsonToXMageCodes.put("pFNM", "FNMP"); mtgJsonToXMageCodes.put("pELP", "PELP"); - mtgJsonToXMageCodes.put("pARL", "ARENA"); + mtgJsonToXMageCodes.put("pARL", "PARL"); // TODO: What about the other Arena League sets (1999-2006)? mtgJsonToXMageCodes.put("pALP", "PALP"); mtgJsonToXMageCodes.put("PO2", "P02"); mtgJsonToXMageCodes.put("DD3_JVC", "DD3JVC");