From a5eb2eba376c99936b869e5a9cd323c8c372460e Mon Sep 17 00:00:00 2001
From: valfieri <vittorio.alfieri@leonardocompany.com>
Date: Fri, 8 May 2020 18:29:31 +0200
Subject: [PATCH] Fixed C20 set file and improved Android downloader.

---
 .../src/net/wagic/utils/ImgDownloader.java    |  8 ++-
 projects/mtg/bin/Res/sets/C20/_cards.dat      | 58 +++++++++++--------
 2 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/projects/mtg/Android/src/net/wagic/utils/ImgDownloader.java b/projects/mtg/Android/src/net/wagic/utils/ImgDownloader.java
index c78c0cf8b..43886e7cf 100644
--- a/projects/mtg/Android/src/net/wagic/utils/ImgDownloader.java
+++ b/projects/mtg/Android/src/net/wagic/utils/ImgDownloader.java
@@ -1376,6 +1376,12 @@ public class ImgDownloader {
             cardurl = "https://img.scryfall.com/cards/large/front/1/4/14b28eae-e8ed-4b99-b6ec-86d0716ec473.jpg?1581480007";
         else if(id.equals("479417"))
             cardurl = "https://img.scryfall.com/cards/large/front/e/f/efcbd4ef-3bf4-4f22-9069-2a11c9619a43.jpg?1583965446";
+        else if(id.equals("482713t"))
+            cardurl = "https://img.scryfall.com/cards/large/front/2/9/29d42a00-299d-47d3-ba03-e63812d57931.jpg?1586452636";
+        else if(id.equals("4827131t"))
+            cardurl = "https://img.scryfall.com/cards/large/front/1/d/1dee8c94-cdc8-42b2-a393-0c0c8e439125.jpg?1586453065";
+        else if(id.equals("484902t") || id.equals("484904t"))
+            cardurl = "https://img.scryfall.com/cards/large/front/7/2/720f3e68-84c0-462e-a0d1-90236ccc494a.jpg?1562539782";
         
         return cardurl;
     }
@@ -1818,7 +1824,7 @@ public class ImgDownloader {
                 id.equals("470620") || id.equals("470754") || id.equals("470750") || id.equals("470739") || id.equals("470708") || id.equals("470581") ||
                 id.equals("470578") || id.equals("470571") || id.equals("470552") || id.equals("394490") || id.equals("114921") || id.equals("49775")  ||
                 id.equals("473123") || id.equals("473160") || id.equals("16743")  || id.equals("16741") || id.equals("294493") || id.equals("293253") ||
-                id.equals("293198"))
+                id.equals("293198") || id.equals("479634")  || id.equals("479702"))
             return false;
         return true;
     }
diff --git a/projects/mtg/bin/Res/sets/C20/_cards.dat b/projects/mtg/bin/Res/sets/C20/_cards.dat
index 7eb2d0379..faaa4e902 100644
--- a/projects/mtg/bin/Res/sets/C20/_cards.dat
+++ b/projects/mtg/bin/Res/sets/C20/_cards.dat
@@ -2,25 +2,30 @@
 author=Wagic Team
 name=Commander 2020
 year=2020-04-17
-total=351
+total=353
 [/meta]
 [card]
-primitive=Beast
+primitive=Beast Saw
 id=-484911
 rarity=T
 [/card]
 [card]
-primitive=Beast
+primitive=Beast Cur
 id=-484906
 rarity=T
 [/card]
 [card]
-primitive=Unknown
+primitive=Treasure Sur
 id=-484904
 rarity=T
 [/card]
 [card]
-primitive=soldier
+primitive=Treasure Shi
+id=-484902
+rarity=T
+[/card]
+[card]
+primitive=Soldier Call
 id=-484870
 rarity=T
 [/card]
@@ -30,12 +35,12 @@ id=-484727
 rarity=T
 [/card]
 [card]
-primitive=Snake
+primitive=Snake Xyr
 id=-484725
 rarity=T
 [/card]
 [card]
-primitive=Soldier
+primitive=Human Soldier Jir
 id=-484715
 rarity=T
 [/card]
@@ -45,12 +50,12 @@ id=-484714
 rarity=T
 [/card]
 [card]
-primitive={3}{U}{R}{W}:
+primitive=Bird
 id=-484713
 rarity=T
 [/card]
 [card]
-primitive=Soldier
+primitive=Soldier Try
 id=-484708
 rarity=T
 [/card]
@@ -60,7 +65,7 @@ id=-482862
 rarity=T
 [/card]
 [card]
-primitive=Bird
+primitive=Bird Mig
 id=-482850
 rarity=T
 [/card]
@@ -70,7 +75,7 @@ id=-482847
 rarity=T
 [/card]
 [card]
-primitive=Saproling
+primitive=Saproling Art
 id=-482831
 rarity=T
 [/card]
@@ -80,32 +85,32 @@ id=-482826
 rarity=T
 [/card]
 [card]
-primitive=Beast
+primitive=Beast Hun
 id=-482807
 rarity=T
 [/card]
 [card]
-primitive=Insect
+primitive=Insect Hor
 id=-482804
 rarity=T
 [/card]
 [card]
-primitive=Beast
+primitive=Beast Wit
 id=-482796
 rarity=T
 [/card]
 [card]
-primitive=Elemental
+primitive=Elemental Cha
 id=-482773
 rarity=T
 [/card]
 [card]
-primitive=Zombie
+primitive=Zombie Xat
 id=-482769
 rarity=T
 [/card]
 [card]
-primitive=Drake
+primitive=Drake Tal
 id=-482753
 rarity=T
 [/card]
@@ -115,41 +120,46 @@ id=-482746
 rarity=T
 [/card]
 [card]
-primitive=Drake
+primitive=Drake Hav
 id=-482738
 rarity=T
 [/card]
 [card]
-primitive=Human
+primitive=Human Thr
 id=-482732
 rarity=T
 [/card]
 [card]
-primitive=Spirit
+primitive=Spirit Cai
 id=-482728
 rarity=T
 [/card]
 [card]
-primitive=Human
+primitive=Human Inc
 id=-482719
 rarity=T
 [/card]
 [card]
-primitive=Elemental
+primitive=Elemental Hoo
 id=-482718
 rarity=T
 [/card]
 [card]
-primitive=Angel
+primitive=Angel Des
 id=-482714
 rarity=T
 [/card]
 [card]
-primitive=Soldier
+primitive=Angel Dec
 id=-482713
 rarity=T
 [/card]
 [card]
+primitive=Soldier Dec
+id=-4827131
+rarity=T
+[/card]
+[card]
 primitive=Aerial Responder
 id=482700
 rarity=U