Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed dat file for J21 set, improved Android downloader for J21 set.

Browse Source
This commit is contained in:
Vittorio Alfieri
2021-08-30 12:15:43 +02:00
parent 790f02905a
commit e1f91a50f6
4 changed files with 638 additions and 3039 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@@ -2,8 +2,11 @@
## [master] (https://github.com/WagicProject/wagic/tree/master)
### 30/08/21
- *Committed:* Fixed dat file for J21 set, improved Android downloader for J21 set. ([Vitty85](https://github.com/Vitty85))
### 29/08/21
- *Committed:* Fixed dat file for MB1, PRM and PSAL sets. ([Vitty85](https://github.com/Vitty85))
- *Committed:* Fixed dat file for MB1, PRM and PSAL sets. https://github.com/WagicProject/wagic/commit/790f02905ac44cbcabd2fa7cd00ea11e6a36379c ([Vitty85](https://github.com/Vitty85))
- *Committed:* Added/fixed primitives, fixed dat file of several sets, updated the "missing_cards_by_sets" folder, updated README.md file, improved Android downloader. https://github.com/WagicProject/wagic/commit/32008496b3016ebb0c8dc60e037c8ba7e6890802 ([Vitty85](https://github.com/Vitty85))

304
projects/mtg/Android/src/net/wagic/utils/ImgDownloader.java
View File

@@ -519,9 +519,9 @@ public class ImgDownloader {
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/d/a/da59fb40-b218-452f-b161-3bde15e30c74.jpg?1593142801";
else if(id.equals("401722t"))
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/d/3/d365bf32-74a3-436b-b1cc-1a7d3254257a.jpg?1593142810";
else if(id.equals("19784311t")) //Snake 1/1
else if(id.equals("19784311t") || id.equals("29669411t")) //Snake 1/1
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/2/a/2a452235-cebd-4e8f-b217-9b55fc1c3830.jpg?1562701977";
else if(id.equals("19784313t")) //Elephant 3/3
else if(id.equals("19784313t") || id.equals("29669413t")) //Elephant 3/3
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/2/d/2dbccfc7-427b-41e6-b770-92d73994bf3b.jpg?1562701986";
else if(id.equals("20787512t")) //Wurm T2 3/3
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/a/6/a6ee0db9-ac89-4ab6-ac2e-8a7527d9ecbd.jpg?1598312477";
@@ -531,7 +531,7 @@ public class ImgDownloader {
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/1/6/165164e7-5693-4d65-b789-8ed8a222365b.jpg?1547509191";
else if(id.equals("11492112t")) //Camarid 1/1
cardurl = "https://www.mtg.onl/static/f5ec1ae8d4ec1a8be1c20ec315956bfa/4d406/PROXY_Camarid_U_1_1.jpg";
else if(id.equals("11492114t") || id.equals("16932t") || id.equals("293980t") || id.equals("293981t") || id.equals("296909t")) //Goblin 1/1
else if(id.equals("11492114t") || id.equals("16932t") || id.equals("293980t") || id.equals("293981t") || id.equals("296660t")) //Goblin 1/1
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/1/4/1425e965-7eea-419c-a7ec-c8169fa9edbf.jpg?1626139812";
else if(id.equals("3896522t")) //Whale 6/6
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/8/7/87a6f719-3e2f-48ea-829d-77134a2a8432.jpg?1618767707";
@@ -579,7 +579,7 @@ public class ImgDownloader {
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/a/1/a10729a5-061a-4daf-91d6-0f6ce813a992.jpg?1562539791";
else if(id.equals("52149t") || id.equals("52136t")) //Soldier 1/1
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/4/5/45907b16-af17-4237-ab38-9d7537fd30e8.jpg?1572892483";
else if(id.equals("52637t") || id.equals("52945t") || id.equals("296853t")) // Thopter 1/1
else if(id.equals("52637t") || id.equals("52945t") || id.equals("296637t")) // Thopter 1/1
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/5/a/5a4649cc-07fb-4ff0-9ac6-846763b799df.jpg?1561757203";
else if(id.equals("74272"))
cardurl = "https://img.scryfall.com/cards/large/front/4/5/45af7f55-9a69-43dd-969f-65411711b13e.jpg?1562487939";
@@ -1187,7 +1187,7 @@ public class ImgDownloader {
else if(id.equals("16981t") || id.equals("16978t") || id.equals("16967t") || id.equals("17841t")
|| id.equals("17850t") || id.equals("17852t")) // Elf Warrior 1/1
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/1/1/118d0655-5719-4512-8bc1-fe759669811b.jpg?1615686731";
else if (id.equals("16975t") || id.equals("17848t") || id.equals("53054t") || id.equals("19784312t")) // Wolf 2/2
else if (id.equals("16975t") || id.equals("17848t") || id.equals("53054t") || id.equals("19784312t") || id.equals("29669412t")) // Wolf 2/2
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/4/6/462ff49b-a004-4dab-a25b-65cb18c1bbec.jpg?1592672584";
else if (id.equals("16933t") || id.equals("476107t")) //Dragon 5/5
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/9/9/993b3b90-74c3-479b-b3e6-3f1cd8f1da04.jpg?1561757651";
@@ -1217,7 +1217,7 @@ public class ImgDownloader {
cardurl = "https://img.scryfall.com/cards/large/front/a/c/acd51eed-bd5a-417a-811d-fbd1c08a3715.jpg?1561757812";
else if(id.equals("17955"))
cardurl = "https://img.scryfall.com/cards/large/front/b/8/b86ac828-7b49-4663-a718-99fcac904568.jpg?1561756381";
else if(id.equals("476097t") || id.equals("293685t") || id.equals("293652t") || id.equals("296775t")) //Zombie 2/2
else if(id.equals("476097t") || id.equals("293685t") || id.equals("293652t")) //Zombie 2/2
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/b/5/b5bd6905-79be-4d2c-a343-f6e6a181b3e6.jpg?1562844819";
else if(id.equals("999901t")) //Monarch Token
cardurl = "https://img.scryfall.com/cards/large/front/4/0/40b79918-22a7-4fff-82a6-8ebfe6e87185.jpg?1561897497";
@@ -1537,7 +1537,7 @@ public class ImgDownloader {
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/c/b/cbbd8a12-d916-4fb1-994a-7d4a3e2ae2ab.jpg?1562935938";
else if(id.equals("44680711"))
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/a/0/a00a7180-49bd-4ead-852a-67b6b5e4b933.jpg?1564694995";
else if(id.equals("295726t") || id.equals("295673t") || id.equals("295532t") || id.equals("297169t")) //Servo 1/1
else if(id.equals("295726t") || id.equals("295673t") || id.equals("295532t")) //Servo 1/1
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/d/7/d79e2bf1-d26d-4be3-a5ad-a43346ed445a.jpg?1562640071";
else if(id.equals("295632t"))
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/1/e/1ebc91a9-23e0-4ca1-bc6d-e710ad2efb31.jpg?1561756762";
@@ -1915,50 +1915,22 @@ public class ImgDownloader {
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/7/2/72887f7f-4156-4b88-aef5-b96dea57903e.jpg?1562545665";
else if (id.equals("5270410"))
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/back/7/2/72887f7f-4156-4b88-aef5-b96dea57903e.jpg?1562545665";
else if(id.equals("297220"))
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/back/9/5/953dbe84-bcf5-4942-9eca-8617e4713984.jpg?1628323501"; //Pelakka Caverns
else if(id.equals("297221"))
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/back/e/1/e168c4e2-cfcb-48f8-a85d-16733579c606.jpg?1628323574"; //Vastwood Thicket
else if(id.equals("297222"))
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/back/7/5/754d4460-9307-4717-a214-c393b3d54846.jpg?1628323427"; //Jwari Ruins
else if(id.equals("297223"))
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/back/5/9/59c3e376-a9d2-48db-889d-c469ddaac3c6.jpg?1628323539"; //Harnfel, Horn of Bounty
else if(id.equals("297224"))
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/back/6/3/6317573e-d892-48ce-bba4-76f9f632ed2b.jpg?1628323467"; //Heir to the Night
else if(id.equals("297225"))
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/back/7/e/7e6b3fb3-897b-4665-b053-a29f25850b25.jpg?1628323389"; //Westvale Cult Leader
else if(id.equals("296800"))
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/9/5/953dbe84-bcf5-4942-9eca-8617e4713984.jpg?1628323501"; //Pelakka Predation
else if(id.equals("297092"))
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/e/1/e168c4e2-cfcb-48f8-a85d-16733579c606.jpg?1628323574"; //Vastwood Fortification
else if(id.equals("296635"))
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/7/5/754d4460-9307-4717-a214-c393b3d54846.jpg?1628323427"; //Jwari Disruption
else if(id.equals("296845"))
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/5/9/59c3e376-a9d2-48db-889d-c469ddaac3c6.jpg?1628323539"; //Birgi, God of Storytelling
else if(id.equals("296767"))
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/6/3/6317573e-d892-48ce-bba4-76f9f632ed2b.jpg?1628323467"; //Heir of Falkenrath
else if(id.equals("296519"))
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/7/e/7e6b3fb3-897b-4665-b053-a29f25850b25.jpg?1628323389"; //Hanweir Militia Captain
else if(id.equals("297132t")) // Clue
else if(id.equals("296818"))
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/back/6/3/6317573e-d892-48ce-bba4-76f9f632ed2b.jpg?1630243608";
else if(id.equals("296817"))
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/back/7/e/7e6b3fb3-897b-4665-b053-a29f25850b25.jpg?1630243654";
else if(id.equals("296594"))
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/6/3/6317573e-d892-48ce-bba4-76f9f632ed2b.jpg?1630243608";
else if(id.equals("296486"))
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/7/e/7e6b3fb3-897b-4665-b053-a29f25850b25.jpg?1630243654";
else if(id.equals("296764t")) // Clue
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/f/2/f2c859e1-181e-44d1-afbd-bbd6e52cf42a.jpg?1562086885";
else if (id.equals("296995t")) //Cat 2/2
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/2/e/2e07758f-0d1c-47d9-ba5a-43bc2a7423cd.jpg?1615686706";
else if(id.equals("296991t")) //Elf Warrior 1/1
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/1/1/118d0655-5719-4512-8bc1-fe759669811b.jpg?1615686731";
else if(id.equals("296981t")) //Squirrel 1/1
else if(id.equals("296695t")) //Squirrel 1/1
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/9/7/977ddd05-1aae-46fc-95ce-866710d1c5c6.jpg?1626092815";
else if(id.equals("296653t")) // Djinn Monk 2/2
else if(id.equals("296549t")) // Djinn Monk 2/2
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/f/2/f2e8077e-4400-4923-afe6-6ff5a51b5e91.jpg?1561758421";
else if(id.equals("296626t")) //Giant Wizard 4/4
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/a/4/a40a0cb8-0caf-4dd1-b7d0-abbc626985d2.jpg?1615686247";
else if(id.equals("296593t")) //Reflection 3/2
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/a/b/ab1c23b2-ac39-46b1-aa2b-7d6cbedba767.jpg?1581901994";
else if (id.equals("296583t")) //Angel Warrior 4/4
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/3/b/3bd871a3-3802-4bdc-8033-3ecfd01c0449.jpg?1615686143";
else if(id.equals("296439t")) //Kraken 8/8
cardurl= "https://c1.scryfall.com/file/scryfall-cards/large/front/c/a/ca17c7b2-180a-4bd1-9ab2-152f8f656dba.jpg?1591225580";
else if (id.equals("296576t")) //Wall 0/3
cardurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/e/8/e8ae8c31-70cb-44e1-a105-f4d29f1f9356.jpg?1557575887";
return cardurl;
}
@@ -1966,69 +1938,50 @@ public class ImgDownloader {
public static String getSpecialTokenUrl(String id) {
String tokenurl = "";
if(id.equals("296984t") || id.equals("296982t") || id.equals("296983t") || id.equals("296794t") || id.equals("297062t") ||
id.equals("297076t") || id.equals("297074t") || id.equals("297093t") || id.equals("297116t")) //Squirrel 1/1
if(id.equals("296754t") || id.equals("296741t") || id.equals("296730t") || id.equals("296728t") || id.equals("296723t") ||
id.equals("296696t") || id.equals("296697t") || id.equals("296606t")) //Squirrel 1/1
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/9/7/977ddd05-1aae-46fc-95ce-866710d1c5c6.jpg?1626092815";
else if(id.equals("296478t")) //Dinosaur 3/3
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/b/1/b1ade1a5-74bf-41cd-b3b4-3bf33cf6d016.jpg?1576266741";
else if(id.equals("296649t")) //Illusion 1/1
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/e/b/ebccb29b-8b69-4813-94bb-d96e117b609e.jpg?1563073051";
else if(id.equals("296888t") || id.equals("296899t") || id.equals("296890t") || id.equals("296924t") || id.equals("296843t") ||
id.equals("296815t") || id.equals("296864t")) //Goblin 1/1
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/1/4/1425e965-7eea-419c-a7ec-c8169fa9edbf.jpg?1627700700";
else if(id.equals("296891t")) //Goblin 1/1 prowess
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/f/d/fd7094d6-6e23-47f2-a9da-4dd680294ac8.jpg?1594733537";
else if(id.equals("296665t")) //Elemental 4/4 red and blue
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/3/d/3d0b9b88-705e-4df0-8a93-3e240b81355b.jpg?1624757148";
else if(id.equals("296682t") || id.equals("296673t") || id.equals("296629t")) //Crab 0/3
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/7/e/7ef7f37a-b7f5-45a1-8f2b-7097089ca2e5.jpg?1626092589";
else if(id.equals("297141t") || id.equals("297089t")) //Spider 1/2
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/0/1/01591603-d903-419d-9957-cf0ae7f79240.jpg?1563073166";
else if(id.equals("297164t")) //Phyrexian Germ 0/0
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/b/5/b53e0681-603e-4180-bc86-3dadf214e61a.jpg?1626092621";
else if(id.equals("297165t") || id.equals("296526t")) //Shapeshifter 2/2
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/a/3/a33fda72-e61d-478f-bc33-ff1a23b5f45b.jpg?1563072987";
else if(id.equals("296483t") || id.equals("297181t")) //Phyrexian Golem 3/3
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/7/b/7becaa04-f142-4163-9286-00018b95c4ca.jpg?1601138543";
else if(id.equals("297115t") || id.equals("297016t") || id.equals("297013t")) //Beast 4/4
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/0/6/06b5e4d2-7eac-4ee9-82aa-80a668705679.jpg?1625974919";
else if (id.equals("297125t")) //Faerie 1/1
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/b/c/bcd82cb0-ff4b-4f4d-b3d0-3ac53883b099.jpg?1572489144";
else if (id.equals("297131t") || id.equals("296596t")) //Zombie Army 0/0
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/c/4/c46d82e0-ef99-473c-a09c-8f552db759bf.jpg?1626093060";
else if(id.equals("296917t") || id.equals("296784t") || id.equals("296801t")) //Rat 1/1
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/1/a/1a85fe9d-ef18-46c4-88b0-cf2e222e30e4.jpg?1562279130";
else if (id.equals("296938t") || id.equals("296964t")) //Elemental 1/1
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/e/5/e5b57672-c346-42f5-ac3e-82466a13b957.jpg?1563073089";
else if(id.equals("296579t") || id.equals("296582t") || id.equals("296539t") || id.equals("297090t")) //Human Soldier 1/1
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/d/9/d9cbf36e-4044-4f08-9bae-f0dcb2455716.jpg?1562086882";
else if(id.equals("296523t")) //Sliver 1/1
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/d/e/dec96e95-5580-4110-86ec-561007ab0f1e.jpg?1562640084";
else if(id.equals("296549t")) //Bird 3/3
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/5/9/5988dc9e-724f-4645-8769-b94c5ef631b9.jpg?1568003326";
else if(id.equals("297020t")) //Insect 1/1
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/0/4/0436e71b-c1f9-4ca8-a29c-775da858a0cd.jpg?1572892506";
else if(id.equals("297022t")) //Merfolk 1/1 hexproof
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/9/0/90317f5e-d121-4c00-86cc-5bbee953f600.jpg?1562539786";
else if (id.equals("297033t")) //Bear 2/2
else if (id.equals("296713t")) //Bear 2/2
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/c/8/c879d4a6-cef5-48f1-8c08-f5b59ec850de.jpg?1562857282";
else if (id.equals("297050t")) //Pest 1/1
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/d/0/d0ddbe3e-4a66-494d-9304-7471232549bf.jpg?1624757253";
else if(id.equals("297072t")) //Elf Knight 2/2
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/7/4/74506297-41ad-40e5-bb05-175650ff4907.jpg?1572892512";
else if(id.equals("297088t") || id.equals("296976t")) //Elephant 3/3
else if (id.equals("296771t") || id.equals("296738t")) //Spider 1/2
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/0/1/01591603-d903-419d-9957-cf0ae7f79240.jpg?1563073166";
else if(id.equals("296753t") || id.equals("296707t") || id.equals("296708t")) //Beast 4/4
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/0/6/06b5e4d2-7eac-4ee9-82aa-80a668705679.jpg?1625974919";
else if(id.equals("296546t")) //Illusion 1/1
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/e/b/ebccb29b-8b69-4813-94bb-d96e117b609e.jpg?1563073051";
else if(id.equals("296665t") || id.equals("296655t") || id.equals("296615t")) //Goblin 1/1
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/1/4/1425e965-7eea-419c-a7ec-c8169fa9edbf.jpg?1627700700";
else if(id.equals("296562t") || id.equals("296559t") || id.equals("296539t")) //Crab 0/3
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/7/e/7ef7f37a-b7f5-45a1-8f2b-7097089ca2e5.jpg?1626092589";
else if(id.equals("296793t") || id.equals("296786t")) //Phyrexian Germ 0/0
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/b/5/b53e0681-603e-4180-bc86-3dadf214e61a.jpg?1626092621";
else if(id.equals("296787t") || id.equals("296490t")) //Shapeshifter 2/2
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/a/3/a33fda72-e61d-478f-bc33-ff1a23b5f45b.jpg?1563072987";
else if(id.equals("296472t")) //Phyrexian Golem 3/3
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/7/b/7becaa04-f142-4163-9286-00018b95c4ca.jpg?1601138543";
else if (id.equals("296763t")) //Zombie Army 0/0
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/c/4/c46d82e0-ef99-473c-a09c-8f552db759bf.jpg?1626093060";
else if(id.equals("296601t")) //Rat 1/1
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/1/a/1a85fe9d-ef18-46c4-88b0-cf2e222e30e4.jpg?1562279130";
else if (id.equals("296673t")) //Elemental 1/1
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/e/5/e5b57672-c346-42f5-ac3e-82466a13b957.jpg?1563073089";
else if(id.equals("296739t") || id.equals("296516t")) //Human Soldier 1/1
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/d/9/d9cbf36e-4044-4f08-9bae-f0dcb2455716.jpg?1562086882";
else if(id.equals("296488t")) //Sliver 1/1
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/d/e/dec96e95-5580-4110-86ec-561007ab0f1e.jpg?1562640084";
else if(id.equals("296500t")) //Bird 3/3
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/5/9/5988dc9e-724f-4645-8769-b94c5ef631b9.jpg?1568003326";
else if(id.equals("296737t")) //Elephant 3/3
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/2/d/2dbccfc7-427b-41e6-b770-92d73994bf3b.jpg?1562701986";
else if(id.equals("296726t") || id.equals("296737t") || id.equals("296745t")) //Zombie 2/2
else if(id.equals("296582t") || id.equals("296580t")) //Zombie 2/2
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/8/a/8a73e348-5bf1-4465-978b-3f31408bade9.jpg?1561757530";
else if(id.equals("296863t")) //Dragon 2/2 red
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/f/4/f43a5ec2-8898-4645-84d7-b7218682be9b.jpg?1562702442";
else if(id.equals("121236t") || id.equals("296482t") || id.equals("296567t") || id.equals("296551t")) //Bird 1/1
else if(id.equals("121236t") || id.equals("296511t") || id.equals("296502t") || id.equals("296471t")) //Bird 1/1
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/e/8/e8a1b1f2-f067-4c8a-b134-4567e4d5a7c6.jpg?1561758355";
else if (id.equals("380486t")) //Bird Enchantment 2/2
tokenurl = "https://www.mtg.onl/static/4952002452e39de9aa2c98b1f0e3765f/4d406/BNG_4_Bird_U_2_2.jpg";
else if (id.equals("52181t")) //Centaur Enchantment 3/3
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/9/8/985be507-6125-4db2-b99f-8b61149ffeeb.jpg?1562636802";
else if (id.equals("262699t") || id.equals("262875t") || id.equals("262857t") || id.equals("53054t") || id.equals("296999t")) //Wolf 2/2
else if (id.equals("262699t") || id.equals("262875t") || id.equals("262857t") || id.equals("53054t")) //Wolf 2/2
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/4/6/462ff49b-a004-4dab-a25b-65cb18c1bbec.jpg?1592672584";
else if(id.equals("378445t")) //Gold
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/0/c/0ca10abd-8d9d-4c0b-9d33-c3516abdf6b3.jpg?1562857254";
@@ -2059,15 +2012,15 @@ public class ImgDownloader {
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/a/5/a53f8031-aaa8-424c-929a-5478538a8cc6.jpg?1562639960";
else if(id.equals("52494t") || id.equals("293206t") || id.equals("294605t")) //Golem 3/3
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/5/0/509be7b3-490d-4229-ba10-999921a6b977.jpg?1562841177";
else if(id.equals("294598t") || id.equals("297180t")) //Myr 1/1
else if(id.equals("294598t")) //Myr 1/1
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/d/b/dbad9b20-0b13-41b9-a84a-06b691ee6c71.jpg?1562542415";
else if(id.equals("423817t") || id.equals("423700t") || id.equals("183017t") || id.equals("383129t") ||
id.equals("6164t") || id.equals("456522t") || id.equals("456545t") || id.equals("397624t") ||
id.equals("52637t") || id.equals("52945t") || id.equals("53460t") || id.equals("53473t") ||
id.equals("420600t") || id.equals("294436t") || id.equals("489333t") || id.equals("495977t") ||
id.equals("295775t") || id.equals("295714t") || id.equals("295698t") || id.equals("295635t") ||
id.equals("296365t") || id.equals("296479t") || id.equals("296506t") || id.equals("296597t") ||
id.equals("296613t")) // Thopter 1/1
id.equals("296365t") || id.equals("296532t") || id.equals("296482t") ||
id.equals("296470t")) // Thopter 1/1
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/5/a/5a4649cc-07fb-4ff0-9ac6-846763b799df.jpg?1561757203";
else if (id.equals("53057t") || id.equals("425825t")) //Wurm T1 3/3
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/b/6/b68e816f-f9ac-435b-ad0b-ceedbe72447a.jpg?1598312203";
@@ -2153,7 +2106,7 @@ public class ImgDownloader {
tokenurl = "https://www.mtg.onl/static/8b684bdea239d594e296a134f5ec1783/4d406/PROXY_Hippo_G_1_1.jpg";
else if (id.equals("3148t")) //Splinter 1/1
tokenurl = "https://www.mtg.onl/static/73cad75db99d3ba716082464bfd85b2e/4d406/PROXY_Splinter_G_1_1.jpg";
else if(id.equals("26815t") || id.equals("51774t") || id.equals("297046t")) //Cat 2/1
else if(id.equals("26815t") || id.equals("51774t")) //Cat 2/1
tokenurl = "https://www.mtg.onl/static/8bb68cf125fdcc9d8a21b3dade2f11cb/4d406/PROXY_Cat_B_2_1.jpg";
else if (id.equals("1534t")) //Wolves of the Hunt 1/1
tokenurl = "https://www.mtg.onl/static/e34edc351ea7ef08c4c4064d1f890731/4d406/PROXY_Wolves_of_the_Hunt_G_1_1.jpg";
@@ -2198,7 +2151,7 @@ public class ImgDownloader {
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/c/f/cf64f834-a645-4db4-a34f-9cab725fc1b1.jpg?1620531482";
else if(id.equals("53244t")) //Soldier 1/1
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/0/a/0a47f751-52f1-4042-85dd-ea222e5d969d.jpg?1562896993";
else if(id.equals("53240t") || id.equals("296499t") || id.equals("296765t")) //Spirit 1/1
else if(id.equals("53240t") || id.equals("296593t") || id.equals("296479t")) //Spirit 1/1
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/4/9/4914610d-7d4f-4cf6-98db-c39e79cce25c.jpg?1562702037";
else if(id.equals("53299t")) //Thopter Blue 1/1
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/e/e/eef8b4fc-238f-4c1f-ad98-a1769fd44eab.jpg?1598311587";
@@ -2208,7 +2161,7 @@ public class ImgDownloader {
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/9/9/99a6ebce-f391-4642-857a-4dc1466895f3.jpg?1562926018";
else if(id.equals("53264t")) //Lizard 8/8
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/7/0/70345006-5cde-44f8-ab66-9d8163d4c4f6.jpg?1561897499";
else if(id.equals("53289t") || id.equals("297102t") || id.equals("296741t") || id.equals("297070t") || id.equals("297057t")) //Saproling 1/1
else if(id.equals("53289t")) //Saproling 1/1
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/0/3/0302fa7d-2e34-4f4a-a84e-7a78febc77f5.jpg?1562895593";
else if(id.equals("53300t")) //Construct 1/1
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/7/c/7c82af53-2de8-4cd6-84bf-fb39d2693de2.jpg?1561897501";
@@ -2229,7 +2182,7 @@ public class ImgDownloader {
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/b/1/b10441dd-9029-4f95-9566-d3771ebd36bd.jpg?1626572250";
else if(id.equals("53190t")) //Elemental 5/1
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/0/5/05aa19b7-da04-4845-868e-3ad2edb9a9ba.jpg?1562701877";
else if (id.equals("452760t") || id.equals("296561t")) //Angel 4/4
else if (id.equals("452760t") || id.equals("296508t")) //Angel 4/4
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/a/c/acb271a8-68bb-45e6-9f99-568479e92ea0.jpg?1572892475";
else if(id.equals("53453t")) //Mask Enchantment
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/b/2/b21b5504-c5ef-4dfc-8219-8db90aca7694.jpg?1592709997";
@@ -2244,7 +2197,7 @@ public class ImgDownloader {
else if (id.equals("116384t") || id.equals("376564t") || id.equals("52993t")) //Assembly-Worker 2/2
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/e/7/e72daa68-0680-431c-a616-b3693fd58813.jpg?1619404806";
else if(id.equals("17841t") || id.equals("17850t") || id.equals("17852t") || id.equals("19444t") || id.equals("294101t") ||
id.equals("294226t") || id.equals("296993t") || id.equals("296992t")) //Elf Warrior 1/1
id.equals("294226t")) //Elf Warrior 1/1
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/1/1/118d0655-5719-4512-8bc1-fe759669811b.jpg?1615686731";
else if(id.equals("383392t")) //Beast 3/3
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/3/f/3fc3a29a-280d-4f2c-9a01-8cfead75f583.jpg?1561756988";
@@ -2262,7 +2215,7 @@ public class ImgDownloader {
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/b/3/b3c9a097-219b-4aaf-831f-cc0cddbcfaae.jpg?1561757870";
else if (id.equals("53454t")) // Zombie 2/2
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/b/5/b5bd6905-79be-4d2c-a343-f6e6a181b3e6.jpg?1562844819";
else if (id.equals("417465t") || id.equals("294137t") || id.equals("296731t")) //Eldrazi Scion 1/1
else if (id.equals("417465t") || id.equals("294137t") || id.equals("296576t")) //Eldrazi Scion 1/1
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/a/7/a7ba0398-35e1-4733-ad29-e853757d6f24.jpg?1562230140";
else if (id.equals("417480t")) //Demon 5/5
tokenurl = "https://c1.scryfall.com/file/scryfall-cards/large/front/5/4/545639fc-e521-41f2-81b2-a671007321eb.jpg?1562229670";
@@ -2577,7 +2530,7 @@ public class ImgDownloader {
id.equals("294872") || id.equals("295110") || id.equals("294842") || id.equals("295067") || id.equals("491767") || id.equals("295386") ||
id.equals("295229") || id.equals("295387") || id.equals("295206") || id.equals("295706") || id.equals("497549") || id.equals("497666") ||
id.equals("503860") || id.equals("522280") || id.equals("522111") || id.equals("527288") || id.equals("531927") || id.equals("527295") ||
id.equals("111220") || id.equals("416829") || id.equals("296647") || id.equals("297100"))
id.equals("111220") || id.equals("416829") || id.equals("296545") || id.equals("296694"))
return false;
return true;
}
@@ -2631,103 +2584,6 @@ public class ImgDownloader {
}
} catch (Exception e) {
}
/*System.out.println("Warning: Token " + name + " has not been found in " + set + " tokens, i will search for it in https://deckmaster.info");
String json = "";
try {
URL url = new URL("https://deckmaster.info/includes/ajax.php?action=cardSearch&searchString=" + name);
HttpURLConnection httpcon = (HttpURLConnection) url.openConnection();
if (httpcon != null) {
httpcon.addRequestProperty("User-Agent", "Mozilla/4.76");
InputStream stream = httpcon.getInputStream();
if (stream != null) {
int i;
while ((i = stream.read()) != -1) {
json = json + ((char) i);
}
}
}
} catch (Exception e) {
}
List<String> urls = new ArrayList<String>();
String[] tok = json.split(",");
for (int i = 0; i < tok.length; i++) {
if (tok[i].contains("multiverseid")) {
String id = tok[i].split(":")[1].replace("\"", "");
urls.add(id);
}
}
for (int i = 0; i < urls.size() && parent.downloadInProgress; i++) {
while (parent.paused && parent.downloadInProgress) {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
}
}
if (!parent.downloadInProgress)
break;
try {
Document tokendoc = Jsoup.connect("https://deckmaster.info/card.php?multiverseid=" + urls.get(i)).get();
if (tokendoc == null)
continue;
Elements stats = tokendoc.select("head meta");
if (stats != null) {
for (int j = 0; j < stats.size() && parent.downloadInProgress; j++) {
while (parent.paused && parent.downloadInProgress) {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
}
}
if (!parent.downloadInProgress)
break;
if (stats.get(j).attributes().get("content").contains("Token Creature")
&& stats.get(j).attributes().get("content").toLowerCase().contains(name.toLowerCase())) {
stats = tokendoc.select("body textarea");
if (stats != null) {
for (int y = 0; y < stats.size() && parent.downloadInProgress; y++) {
while (parent.paused && parent.downloadInProgress) {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
}
}
if (!parent.downloadInProgress)
break;
List<Node> nodes = stats.get(y).childNodes();
if (nodes != null) {
for (int p = 0; p < nodes.size() && parent.downloadInProgress; p++) {
while (parent.paused && parent.downloadInProgress) {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
}
}
if (!parent.downloadInProgress)
break;
if (stats.get(y).childNode(p).attributes().get("#text").contains(tokenstats)) {
if (!color.equals("(C)")) {
if (stats.get(y).childNode(p).attributes().get("#text").contains(color))
return tokendoc;
} else {
if (!stats.get(y).childNode(p).attributes().get("#text").contains("(U") &&
!stats.get(y).childNode(p).attributes().get("#text").contains("(G") &&
!stats.get(y).childNode(p).attributes().get("#text").contains("(B") &&
!stats.get(y).childNode(p).attributes().get("#text").contains("(R") &&
!stats.get(y).childNode(p).attributes().get("#text").contains("(W"))
return tokendoc;
}
}
}
}
}
}
}
}
}
} catch (Exception e) {
}
}
System.out.println("Warning: Token " + name + " has not been found in https://deckmaster.info so i will search for it between any other set in " + imageurl + " (it may take a long time)");*/
System.out.println("Warning: Token " + name + " has not been found in " + set + " tokens, i will search for it between any other set in " + imageurl + " (it may take a long time)");
for (int i = 0; i < availableSets.length; i++) {
String currentSet = availableSets[i].toLowerCase().split(" - ")[0];
@@ -2934,10 +2790,9 @@ public class ImgDownloader {
if(id != null && (id.equals("209162") || id.equals("209163") || id.equals("401721") || id.equals("401722") || id.equals("999902")))
rarity = "t";
if(id != null && (id.equals("1750411") || id.equals("5176911") || id.equals("44680711") || id.equals("29530711") ||
id.equals("45108910") || id.equals("530447") || id.equals("530448") || id.equals("530449") || id.equals("297220") ||
id.equals("297221") || id.equals("297222") || id.equals("297223") || id.equals("297224") || id.equals("297225") ||
id.equals("29339510") || id.equals("1749810") || id.equals("5197410") || id.equals("5249510") || id.equals("5247310") ||
id.equals("5213710") || id.equals("5253010") || id.equals("5270410")))
id.equals("45108910") || id.equals("530447") || id.equals("530448") || id.equals("530449") || id.equals("296817") ||
id.equals("296818") || id.equals("29339510") || id.equals("1749810") || id.equals("5197410") || id.equals("5249510") ||
id.equals("5247310") || id.equals("5213710") || id.equals("5253010") || id.equals("5270410")))
rarity = "";
int c = lines.indexOf("[/card]", lastIndex);
if (c > 0)
@@ -3343,33 +3198,6 @@ public class ImgDownloader {
if (!parent.downloadInProgress)
break;
/*if (false){
cardname = cardname.replace(" (a)", "");
cardname = cardname.replace(" (b)", "");
cardname = cardname.replace(" (c)", "");
cardname = cardname.replace(" (d)", "");
cardname = cardname.replace(" (e)", "");
cardname = cardname.replace(" (f)", "");
cardname = cardname.replace(" ...", "");
String deckutrl = "https://deckmaster.info/card.php?multiverseid=";
try {
doc = Jsoup.connect(deckutrl + id).get();
} catch (Exception e) {
System.out.println("Warning: Problem reading card (" + mappa.get(id) + ") infos from: " + deckutrl + id + ", i will retry 2 times more...");
try {
doc = Jsoup.connect(deckutrl + id).get();
} catch (Exception e2) {
System.out.println("Warning: Problem reading card (" + mappa.get(id) + ") infos from: " + deckutrl + id + ", i will retry 1 time more...");
try {
doc = Jsoup.connect(deckutrl + id).get();
} catch (Exception e3) {
System.err.println("Error: Problem reading card (" + mappa.get(id) + ") infos from: " + deckutrl + id + ", i will not retry anymore...");
res = mappa.get(id) + " - " + set + File.separator + id + ".jpg\n" + res;
continue;
}
}
}
} else*/
if(targetres.equals("High") && !scryset.equals("TD2") && !scryset.equals("PRM") && !scryset.equals("TD0") && !scryset.equals("PZ2")
&& !scryset.equals("PHPR") && !scryset.equals("PGRU") && !scryset.equals("PGRU") && !scryset.equals("ANA") && !scryset.equals("HTR")
&& !scryset.equals("HTR17") && !scryset.equals("PI13") && !scryset.equals("PI14") && !scryset.equals("PSAL") && !scryset.equals("PS11")

7
projects/mtg/bin/Res/missing_cards_by_sets/J21.txt
View File

@@ -1,7 +0,0 @@
[card]
name=Ascent of the Worthy
text=(As this Saga enters and after your draw step, add a lore counter. Sacrifice after III.) -- I, II — Choose a creature you control. Until your next turn, all damage that would be dealt to creatures you control is dealt to that creature instead. -- III — Return target creature card from your graveyard to the battlefield with a flying counter on it. That creature is an Angel Warrior in addition to its other types.
mana={1}{W}{B}
type=Enchantment
subtype=Saga
[/card]

3361
projects/mtg/bin/Res/sets/J21/_cards.dat
View File

File diff suppressed because it is too large Load Diff