* Cards: updated old sets with new scryfall numbers, fixed set codes;

Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java

@@ -14,6 +14,10 @@ import static org.mage.plugins.card.dl.DownloadJob.fromURL;
 import static org.mage.plugins.card.dl.DownloadJob.toFile;
 import static org.mage.plugins.card.utils.CardImageUtils.getImagesDir;
 
+/**
+ * WARNING, unsupported images plugin, last updates from 2018
+ */
+
 public class GathererSets implements Iterable<DownloadJob> {
 
     private class CheckResult {
@@ -99,7 +103,7 @@ public class GathererSets implements Iterable<DownloadJob> {
 
     private static final String[] symbolsOnlyMyth = {
             "DRB", "V09", "V10", "V12", "V13", "V14", "V15", "V16", "V17", "EXP", "MED"
-            // "HTR" does not exist
+            // "HTR16" does not exist
     };
     private static final String[] symbolsOnlySpecial = {
             "MPS", "MP2"

Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportCards.java

@@ -202,7 +202,7 @@ public class ScryfallImageSupportCards {
             add("P09"); // Magic Player Rewards 2009
             add("G09"); // Judge Gift Cards 2009
             add("F09"); // Friday Night Magic 2009
-            add("PBOK"); // Miscellaneous Book Promos
+            add("PBOOK"); // Miscellaneous Book Promos
             add("CON"); // Conflux
             add("DDC"); // Duel Decks: Divine vs. Demonic
             add("PPRE"); // Prerelease Events
@@ -307,7 +307,6 @@ public class ScryfallImageSupportCards {
             add("PJOU"); // Journey into Nyx Promos
             add("JOU"); // Journey into Nyx
             add("MD1"); // Modern Event Deck 2014
-            add("PLPA"); // Launch Parties
             add("CNS"); // Conspiracy
             add("VMA"); // Vintage Masters
             add("PS14"); // San Diego Comic-Con 2014
@@ -388,7 +387,7 @@ public class ScryfallImageSupportCards {
             add("C17"); // Commander 2017
             add("PWCQ"); // World Magic Cup Qualifiers
             add("H17"); // HasCon 2017
-            add("HTR"); // 2016 Heroes of the Realm
+            add("HTR16"); // 2016 Heroes of the Realm
             add("PXLN"); // Ixalan Promos
             add("XLN"); // Ixalan
             add("PSS2"); // XLN Standard Showdown

Mage.Sets/src/mage/sets/AvacynRestoredPromos.java

@@ -22,8 +22,8 @@ public class AvacynRestoredPromos extends ExpansionSet {
 
         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));
-        cards.add(new SetCardInfo("Moonsilver Spear", 217, Rarity.RARE, mage.cards.m.MoonsilverSpear.class));
+        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("Restoration Angel", "32*", Rarity.RARE, mage.cards.r.RestorationAngel.class));
         cards.add(new SetCardInfo("Silverblade Paladin", "*36", Rarity.RARE, mage.cards.s.SilverbladePaladin.class));
-     }
+    }
 }

Mage.Sets/src/mage/sets/HeroesOfTheRealm2016.java

@@ -17,7 +17,7 @@ public final class HeroesOfTheRealm2016 extends ExpansionSet {
     }
 
     private HeroesOfTheRealm2016() {
-        super("Heroes of the Realm 2016", "HTR", ExpansionSet.buildDate(2017, 9, 20), SetType.JOKESET);
+        super("Heroes of the Realm 2016", "HTR16", ExpansionSet.buildDate(2017, 9, 20), SetType.JOKESET);
         this.hasBasicLands = false;
 
         cards.add(new SetCardInfo("Chandra, Gremlin Wrangler", 1, Rarity.MYTHIC, mage.cards.c.ChandraGremlinWrangler.class));

Mage.Sets/src/mage/sets/InnistradPromos.java

@@ -23,9 +23,10 @@ public class InnistradPromos extends ExpansionSet {
         cards.add(new SetCardInfo("Devil's Play", 140, Rarity.RARE, mage.cards.d.DevilsPlay.class));
         cards.add(new SetCardInfo("Diregraf Ghoul", 97, Rarity.UNCOMMON, mage.cards.d.DiregrafGhoul.class));
         cards.add(new SetCardInfo("Elite Inquisitor", 13, Rarity.RARE, mage.cards.e.EliteInquisitor.class));
-        cards.add(new SetCardInfo("Howlpack Alpha", 193, Rarity.RARE, mage.cards.h.HowlpackAlpha.class));
+        cards.add(new SetCardInfo("Howlpack Alpha", "193*", Rarity.RARE, mage.cards.h.HowlpackAlpha.class));
-        cards.add(new SetCardInfo("Ludevic's Abomination", 64, Rarity.RARE, mage.cards.l.LudevicsAbomination.class));
+        cards.add(new SetCardInfo("Ludevic's Abomination", "64*", Rarity.RARE, mage.cards.l.LudevicsAbomination.class));
-        cards.add(new SetCardInfo("Ludevic's Test Subject", 64, Rarity.RARE, mage.cards.l.LudevicsTestSubject.class));
+        cards.add(new SetCardInfo("Ludevic's Test Subject", "64*", Rarity.RARE, mage.cards.l.LudevicsTestSubject.class));
-        cards.add(new SetCardInfo("Mayor of Avabruck", 193, Rarity.RARE, mage.cards.m.MayorOfAvabruck.class));
+        cards.add(new SetCardInfo("Mayor of Avabruck", "193*", Rarity.RARE, mage.cards.m.MayorOfAvabruck.class));
-     }
+
+    }
 }

Mage.Sets/src/mage/sets/LaunchParties.java

@@ -1,30 +0,0 @@
-package mage.sets;
-
-import mage.cards.ExpansionSet;
-import mage.constants.Rarity;
-import mage.constants.SetType;
-
-/**
- * https://scryfall.com/sets/plpa
- */
-public class LaunchParties extends ExpansionSet {
-
-    private static final LaunchParties instance = new LaunchParties();
-
-    public static LaunchParties getInstance() {
-        return instance;
-    }
-
-    private LaunchParties() {
-        super("Launch Parties", "PLPA", ExpansionSet.buildDate(2014, 6, 6), SetType.PROMOTIONAL);
-        this.hasBoosters = false;
-        this.hasBasicLands = false;
-
-        cards.add(new SetCardInfo("Earwig Squad", 1, Rarity.RARE, mage.cards.e.EarwigSquad.class));
-        cards.add(new SetCardInfo("Figure of Destiny", 3, Rarity.RARE, mage.cards.f.FigureOfDestiny.class));
-        cards.add(new SetCardInfo("Knight of New Alara", 6, Rarity.RARE, mage.cards.k.KnightOfNewAlara.class));
-        cards.add(new SetCardInfo("Magister of Worth", 7, Rarity.RARE, mage.cards.m.MagisterOfWorth.class));
-        cards.add(new SetCardInfo("Obelisk of Alara", 5, Rarity.RARE, mage.cards.o.ObeliskOfAlara.class));
-        cards.add(new SetCardInfo("Vexing Shusher", 2, Rarity.RARE, mage.cards.v.VexingShusher.class));
-     }
-}

Mage.Sets/src/mage/sets/Magic2010Promos.java

@@ -20,10 +20,10 @@ public class Magic2010Promos extends ExpansionSet {
         this.hasBoosters = false;
         this.hasBasicLands = false;
 
-        cards.add(new SetCardInfo("Ant Queen", 166, Rarity.RARE, mage.cards.a.AntQueen.class));
+        cards.add(new SetCardInfo("Ant Queen", "166*", Rarity.RARE, mage.cards.a.AntQueen.class));
-        cards.add(new SetCardInfo("Honor of the Pure", "*16", Rarity.RARE, mage.cards.h.HonorOfThePure.class));
+        cards.add(new SetCardInfo("Honor of the Pure", "16*", Rarity.RARE, mage.cards.h.HonorOfThePure.class));
         cards.add(new SetCardInfo("Mycoid Shepherd", 28, Rarity.RARE, mage.cards.m.MycoidShepherd.class));
         cards.add(new SetCardInfo("Naya Sojourners", 29, Rarity.RARE, mage.cards.n.NayaSojourners.class));
-        cards.add(new SetCardInfo("Vampire Nocturnus", 118, Rarity.MYTHIC, mage.cards.v.VampireNocturnus.class));
+        cards.add(new SetCardInfo("Vampire Nocturnus", "118*", Rarity.MYTHIC, mage.cards.v.VampireNocturnus.class));
-     }
+    }
 }

Mage.Sets/src/mage/sets/Magic2011Promos.java

@@ -20,10 +20,10 @@ public class Magic2011Promos extends ExpansionSet {
         this.hasBoosters = false;
         this.hasBasicLands = false;
 
-        cards.add(new SetCardInfo("Ancient Hellkite", 122, Rarity.RARE, mage.cards.a.AncientHellkite.class));
+        cards.add(new SetCardInfo("Ancient Hellkite", "122*", Rarity.RARE, mage.cards.a.AncientHellkite.class));
-        cards.add(new SetCardInfo("Birds of Paradise", "*165", Rarity.RARE, mage.cards.b.BirdsOfParadise.class));
+        cards.add(new SetCardInfo("Birds of Paradise", "165*", Rarity.RARE, mage.cards.b.BirdsOfParadise.class));
         cards.add(new SetCardInfo("Liliana's Specter", 104, Rarity.COMMON, mage.cards.l.LilianasSpecter.class));
         cards.add(new SetCardInfo("Mitotic Slime", 53, Rarity.RARE, mage.cards.m.MitoticSlime.class));
-        cards.add(new SetCardInfo("Sun Titan", 35, Rarity.MYTHIC, mage.cards.s.SunTitan.class));
+        cards.add(new SetCardInfo("Sun Titan", "35*", Rarity.MYTHIC, mage.cards.s.SunTitan.class));
-     }
+    }
 }

Mage.Sets/src/mage/sets/Magic2012Promos.java

@@ -20,10 +20,10 @@ public class Magic2012Promos extends ExpansionSet {
         this.hasBoosters = false;
         this.hasBasicLands = false;
 
-        cards.add(new SetCardInfo("Bloodlord of Vaasgoth", 82, Rarity.MYTHIC, mage.cards.b.BloodlordOfVaasgoth.class));
+        cards.add(new SetCardInfo("Bloodlord of Vaasgoth", "82*", Rarity.MYTHIC, mage.cards.b.BloodlordOfVaasgoth.class));
-        cards.add(new SetCardInfo("Chandra's Phoenix", "*126", Rarity.RARE, mage.cards.c.ChandrasPhoenix.class));
+        cards.add(new SetCardInfo("Chandra's Phoenix", "126*", Rarity.RARE, mage.cards.c.ChandrasPhoenix.class));
         cards.add(new SetCardInfo("Dungrove Elder", 171, Rarity.RARE, mage.cards.d.DungroveElder.class));
-        cards.add(new SetCardInfo("Garruk's Horde", 176, Rarity.RARE, mage.cards.g.GarruksHorde.class));
+        cards.add(new SetCardInfo("Garruk's Horde", "176*", Rarity.RARE, mage.cards.g.GarruksHorde.class));
         cards.add(new SetCardInfo("Stormblood Berserker", 156, Rarity.UNCOMMON, mage.cards.s.StormbloodBerserker.class));
-     }
+    }
 }

Mage.Sets/src/mage/sets/Magic2013Promos.java

@@ -20,10 +20,10 @@ public class Magic2013Promos extends ExpansionSet {
         this.hasBoosters = false;
         this.hasBasicLands = false;
 
-        cards.add(new SetCardInfo("Cathedral of War", "*221", Rarity.RARE, mage.cards.c.CathedralOfWar.class));
+        cards.add(new SetCardInfo("Cathedral of War", "221*", Rarity.RARE, mage.cards.c.CathedralOfWar.class));
-        cards.add(new SetCardInfo("Magmaquake", 140, Rarity.RARE, mage.cards.m.Magmaquake.class));
+        cards.add(new SetCardInfo("Magmaquake", "140*", Rarity.RARE, mage.cards.m.Magmaquake.class));
-        cards.add(new SetCardInfo("Mwonvuli Beast Tracker", 177, Rarity.UNCOMMON, mage.cards.m.MwonvuliBeastTracker.class));
+        cards.add(new SetCardInfo("Mwonvuli Beast Tracker", "177*", Rarity.UNCOMMON, mage.cards.m.MwonvuliBeastTracker.class));
-        cards.add(new SetCardInfo("Staff of Nin", 217, Rarity.RARE, mage.cards.s.StaffOfNin.class));
+        cards.add(new SetCardInfo("Staff of Nin", "217*", Rarity.RARE, mage.cards.s.StaffOfNin.class));
-        cards.add(new SetCardInfo("Xathrid Gorgon", 118, Rarity.RARE, mage.cards.x.XathridGorgon.class));
+        cards.add(new SetCardInfo("Xathrid Gorgon", "118*", Rarity.RARE, mage.cards.x.XathridGorgon.class));
-     }
+    }
 }

Mage.Sets/src/mage/sets/Magic2014Promos.java

@@ -20,10 +20,10 @@ public class Magic2014Promos extends ExpansionSet {
         this.hasBoosters = false;
         this.hasBasicLands = false;
 
-        cards.add(new SetCardInfo("Colossal Whale", 48, Rarity.RARE, mage.cards.c.ColossalWhale.class));
+        cards.add(new SetCardInfo("Colossal Whale", "48*", Rarity.RARE, mage.cards.c.ColossalWhale.class));
-        cards.add(new SetCardInfo("Goblin Diplomats", 141, Rarity.RARE, mage.cards.g.GoblinDiplomats.class));
+        cards.add(new SetCardInfo("Goblin Diplomats", "141*", Rarity.RARE, mage.cards.g.GoblinDiplomats.class));
-        cards.add(new SetCardInfo("Hive Stirrings", 21, Rarity.COMMON, mage.cards.h.HiveStirrings.class));
+        cards.add(new SetCardInfo("Hive Stirrings", "21*", Rarity.COMMON, mage.cards.h.HiveStirrings.class));
-        cards.add(new SetCardInfo("Megantic Sliver", 185, Rarity.RARE, mage.cards.m.MeganticSliver.class));
+        cards.add(new SetCardInfo("Megantic Sliver", "185*", Rarity.RARE, mage.cards.m.MeganticSliver.class));
-        cards.add(new SetCardInfo("Ratchet Bomb", 215, Rarity.RARE, mage.cards.r.RatchetBomb.class));
+        cards.add(new SetCardInfo("Ratchet Bomb", "215*", Rarity.RARE, mage.cards.r.RatchetBomb.class));
-     }
+    }
 }

Mage.Sets/src/mage/sets/MiscellaneousBookPromos.java

@@ -5,7 +5,7 @@ import mage.constants.Rarity;
 import mage.constants.SetType;
 
 /**
- * https://scryfall.com/sets/pbok
+ * https://scryfall.com/sets/pbook
  */
 public class MiscellaneousBookPromos extends ExpansionSet {
 
@@ -16,10 +16,10 @@ public class MiscellaneousBookPromos extends ExpansionSet {
     }
 
     private MiscellaneousBookPromos() {
-        super("Miscellaneous Book Promos", "PBOK", ExpansionSet.buildDate(2009, 1, 27), SetType.PROMOTIONAL);
+        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));
-     }
+    }
 }