Use scryfall urls (#3474)

Cockatrice · Dec 20, 2018 · ab1c4cb · ab1c4cb
1 parent 4616dd4
commit ab1c4cb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/cockatrice/src/pictureloader.cpp b/cockatrice/src/pictureloader.cpp
@@ -25,6 +25,10 @@
 // never cache more than 300 cards at once for a single deck
 #define CACHED_CARD_PER_DECK_MAX 300
 
+// Other URLs we can use (TODO: Make this less messy)
+#define GATHERER_DEFAULT "http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=!cardid!&type=card"
+#define GATHERER_FALLBACK "http://gatherer.wizards.com/Handlers/Image.ashx?name=!name!&type=card"
+
 class PictureToLoad::SetDownloadPriorityComparator
 {
 public:
@@ -48,6 +52,8 @@ PictureToLoad::PictureToLoad(CardInfoPtr _card) : card(std::move(_card))
     /* #2479 will expand this into a list of Urls */
     urlTemplates.append(settingsCache->getPicUrl());
     urlTemplates.append(settingsCache->getPicUrlFallback());
+    urlTemplates.append(GATHERER_DEFAULT);
+    urlTemplates.append(GATHERER_FALLBACK);
 
     if (card) {
         sortedSets = card->getSets();

diff --git a/cockatrice/src/settingscache.h b/cockatrice/src/settingscache.h
@@ -13,9 +13,10 @@
 
 class ReleaseChannel;
 
-// the falbacks are used for cards without a muid
-#define PIC_URL_DEFAULT "http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=!cardid!&type=card"
-#define PIC_URL_FALLBACK "http://gatherer.wizards.com/Handlers/Image.ashx?name=!name!&type=card"
+// Fallbacks used for cards w/o MultiverseId
+#define PIC_URL_DEFAULT "https://api.scryfall.com/cards/multiverse/!cardid!?format=image"
+#define PIC_URL_FALLBACK "https://api.scryfall.com/cards/named?fuzzy=!name!&format=image"
+
 // size should be a multiple of 64
 #define PIXMAPCACHE_SIZE_DEFAULT 2047
 #define PIXMAPCACHE_SIZE_MIN 64