From ce06ed62b0f948a9d6376c3ce9780453a792fe38 Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Mon, 20 Mar 2023 22:31:26 +0400 Subject: [PATCH] * Images: fixed miss cards from Alchemy: Innistrad, Secret Lair Drop, PMEI and PRES (#9249); --- .../dl/sources/ScryfallImageSupportCards.java | 17 ++++++++++++++--- Mage.Sets/src/mage/sets/AlchemyInnistrad.java | 2 +- Mage.Sets/src/mage/sets/SecretLairDrop.java | 5 +++++ .../java/mage/verify/VerifyCardDataTest.java | 8 +++++++- 4 files changed, 27 insertions(+), 5 deletions(-) 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 aaf976343a..9e06cb11d1 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 @@ -503,7 +503,7 @@ public class ScryfallImageSupportCards { add("MIC"); // Midnight Hunt Commander add("VOW"); // Innistrad: Crimson Vow add("VOC"); // Crimson Vow Commander - add("Y22"); // Alchemy: Innistrad + add("YMID"); // Alchemy: Innistrad add("DBL"); // Innistrad: Double Feature add("CC2"); // Commander Collection: Black add("NEO"); // Kamigawa: Neon Dynasty @@ -550,7 +550,8 @@ public class ScryfallImageSupportCards { // set/card_name/card_number_2 // // Cards with non-ASCII collector numbers must use direct download (cause xmage uses different card number) - // Verify checks must check and show missing data from that list + // Verify checks must check and show missing data from that list, + // see test_checkMissingScryfallSettingsAndCardNumbers // 10E put("10E/Air Elemental/64*", "https://api.scryfall.com/cards/10e/64★/"); @@ -974,7 +975,7 @@ public class ScryfallImageSupportCards { put("WAR/Vivien, Champion of the Wilds/180*", "https://api.scryfall.com/cards/war/180★/"); put("WAR/Vraska, Swarm's Eminence/236*", "https://api.scryfall.com/cards/war/236★/"); // SLD - // TODO: update direct image links in 2022 for HQ images + // fake double faced cards put("SLD/Zndrsplt, Eye of Wisdom/379", "https://api.scryfall.com/cards/sld/379/"); put("SLD/Zndrsplt, Eye of Wisdom/379b", "https://c1.scryfall.com/file/scryfall-cards/large/back/d/5/d5dfd236-b1da-4552-b94f-ebf6bb9dafdf.jpg"); put("SLD/Krark's Thumb/383", "https://api.scryfall.com/cards/sld/383/"); @@ -985,6 +986,16 @@ public class ScryfallImageSupportCards { put("SLD/Propaganda/381b", "https://c1.scryfall.com/file/scryfall-cards/large/back/3/e/3e3f0bcd-0796-494d-bf51-94b33c1671e9.jpg"); put("SLD/Stitch in Time/382", "https://api.scryfall.com/cards/sld/382/"); put("SLD/Stitch in Time/382b", "https://c1.scryfall.com/file/scryfall-cards/large/back/0/8/087c3a0d-c710-4451-989e-596b55352184.jpg"); + // normal cards + put("SLD/Demonlord Belzenlok/159*", "https://api.scryfall.com/cards/sld/159★/"); + put("SLD/Griselbrand/160*", "https://api.scryfall.com/cards/sld/160★/"); + put("SLD/Kothophed, Soul Hoarder/162*", "https://api.scryfall.com/cards/sld/162★/"); + put("SLD/Liliana's Contract/161*", "https://api.scryfall.com/cards/sld/161★/"); + put("SLD/Razaketh, the Foulblooded/163*", "https://api.scryfall.com/cards/sld/163★/"); + // PMEI + put("PMEI/Jamuraan Lion/10*", "https://api.scryfall.com/cards/pmei/10★/"); + // PRES + put("PRES/Lathliss, Dragon Queen/149*", "https://api.scryfall.com/cards/pres/149★/"); } }; diff --git a/Mage.Sets/src/mage/sets/AlchemyInnistrad.java b/Mage.Sets/src/mage/sets/AlchemyInnistrad.java index 9e4500ddfb..c0d36a9114 100644 --- a/Mage.Sets/src/mage/sets/AlchemyInnistrad.java +++ b/Mage.Sets/src/mage/sets/AlchemyInnistrad.java @@ -16,7 +16,7 @@ public final class AlchemyInnistrad extends ExpansionSet { } private AlchemyInnistrad() { - super("Alchemy: Innistrad", "Y22", ExpansionSet.buildDate(2021, 12, 9), SetType.MAGIC_ARENA); + super("Alchemy: Innistrad", "YMID", ExpansionSet.buildDate(2021, 12, 9), SetType.MAGIC_ARENA); this.blockName = "Alchemy"; this.hasBoosters = false; this.hasBasicLands = false; diff --git a/Mage.Sets/src/mage/sets/SecretLairDrop.java b/Mage.Sets/src/mage/sets/SecretLairDrop.java index ed9c6842d4..b6dec7a11c 100644 --- a/Mage.Sets/src/mage/sets/SecretLairDrop.java +++ b/Mage.Sets/src/mage/sets/SecretLairDrop.java @@ -20,6 +20,11 @@ public class SecretLairDrop extends ExpansionSet { this.hasBoosters = false; this.hasBasicLands = true; + // warning + // set uses faked double faced cards (example: Zndrsplt, Eye of Wisdom), + // so it must be split to two different cards (one card for one side, another card for another side), + // also must add second side to directDownloadLinks in scryfall + cards.add(new SetCardInfo("Demonlord Belzenlok", "159*", Rarity.MYTHIC, mage.cards.d.DemonlordBelzenlok.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Griselbrand", "160*", Rarity.MYTHIC, mage.cards.g.Griselbrand.class, NON_FULL_USE_VARIOUS)); cards.add(new SetCardInfo("Kothophed, Soul Hoarder", "162*", Rarity.RARE, mage.cards.k.KothophedSoulHoarder.class, NON_FULL_USE_VARIOUS)); diff --git a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java index aa19194490..be814dd2d9 100644 --- a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java +++ b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java @@ -206,7 +206,12 @@ public class VerifyCardDataTest { skipListAddName(SKIP_LIST_WRONG_CARD_NUMBERS, "UND"); // un-sets don't have full implementation of card variations skipListAddName(SKIP_LIST_WRONG_CARD_NUMBERS, "UST"); // un-sets don't have full implementation of card variations skipListAddName(SKIP_LIST_WRONG_CARD_NUMBERS, "SOI", "Tamiyo's Journal"); // not all variations implemented - skipListAddName(SKIP_LIST_WRONG_CARD_NUMBERS, "SLD", "Zndrsplt, Eye of Wisdom"); // xmage adds additional card for alternative image (second side) + skipListAddName(SKIP_LIST_WRONG_CARD_NUMBERS, "SLD", "Zndrsplt, Eye of Wisdom"); // has alternative image as second side + skipListAddName(SKIP_LIST_WRONG_CARD_NUMBERS, "SLD", "Krark's Thumb"); // has alternative image as second side + skipListAddName(SKIP_LIST_WRONG_CARD_NUMBERS, "SLD", "Okaun, Eye of Chaos"); // has alternative image as second side + skipListAddName(SKIP_LIST_WRONG_CARD_NUMBERS, "SLD", "Propaganda"); // has alternative image as second side + skipListAddName(SKIP_LIST_WRONG_CARD_NUMBERS, "SLD", "Stitch in Time"); // has alternative image as second side + skipListAddName(SKIP_LIST_WRONG_CARD_NUMBERS, "SLD", "Zndrsplt, Eye of Wisdom"); // has alternative image as second side // scryfall download sets (missing from scryfall website) @@ -732,6 +737,7 @@ public class VerifyCardDataTest { if (key != null) { foundedDirectDownloadKeys.add(key); } else { + // how-to fix: add miss images links in ScryfallImageSupportCards->directDownloadLinks errorsList.add("Error: scryfall download can't find non-ascii card link in direct download list " + set.getCode() + " - " + set.getName() + " - " + card.getName() + " - " + jsonCard.number); } }