From 55edfc6374de5677430110c5fb812cdded981cc2 Mon Sep 17 00:00:00 2001 From: Vittorio Alfieri Date: Sat, 22 May 2021 20:40:04 +0200 Subject: [PATCH] Added HA5 set and imnproved Android downloader. --- .../src/net/wagic/utils/ImgDownloader.java | 11 +- projects/mtg/bin/Res/sets/HA5/_cards.dat | 137 ++++++++++++++++++ 2 files changed, 143 insertions(+), 5 deletions(-) create mode 100644 projects/mtg/bin/Res/sets/HA5/_cards.dat diff --git a/projects/mtg/Android/src/net/wagic/utils/ImgDownloader.java b/projects/mtg/Android/src/net/wagic/utils/ImgDownloader.java index cde419a20..bb47c0a6b 100644 --- a/projects/mtg/Android/src/net/wagic/utils/ImgDownloader.java +++ b/projects/mtg/Android/src/net/wagic/utils/ImgDownloader.java @@ -1876,7 +1876,8 @@ public class ImgDownloader { 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("295775t") || id.equals("295714t") || id.equals("295698t") || id.equals("295635t") || + id.equals("296365t")) tokenurl = "https://deckmaster.info/images/cards/MBS/-216-hr.jpg"; else if (id.equals("53057t") || id.equals("425825t")) tokenurl = "https://deckmaster.info/images/cards/SOM/-226-hr.jpg"; @@ -2953,7 +2954,7 @@ public class ImgDownloader { || scryset.equals("PAL05") || scryset.equals("PAL06") || scryset.equals("PAL99") || scryset.equals("PARL") || scryset.equals("HA1") || scryset.equals("SLD") || scryset.equals("MB1") || scryset.equals("HA2") || scryset.equals("HA3") || scryset.equals("SS3") || scryset.equals("AKR") || scryset.equals("ANB") || scryset.equals("PLIST") || scryset.equals("KLR") || scryset.equals("CC1") - || scryset.equals("ATH") || scryset.equals("HA4") || scryset.equals("TSR")){ + || scryset.equals("ATH") || scryset.equals("HA4") || scryset.equals("TSR") || scryset.equals("HA5")){ try { doc = Jsoup.connect(imageurl + scryset.toLowerCase()).get(); Elements outlinks = doc.select("body a"); @@ -3144,7 +3145,7 @@ public class ImgDownloader { && !scryset.equals("PAL05") && !scryset.equals("PAL06") && !scryset.equals("PAL99") && !scryset.equals("PARL") && !scryset.equals("HA1") && !scryset.equals("SLD") && !scryset.equals("MB1") && !scryset.equals("HA2") && !scryset.equals("HA3") && !scryset.equals("SS3") && !scryset.equals("AKR") && !scryset.equals("ANB") && !scryset.equals("PLIST") && !scryset.equals("KLR") && !scryset.equals("CC1") - && !scryset.equals("ATH") && !scryset.equals("HA4") && !scryset.equals("TSR")){ + && !scryset.equals("ATH") && !scryset.equals("HA4") && !scryset.equals("TSR") && !scryset.equals("HA5")){ try { doc = Jsoup.connect(imageurl + scryset.toLowerCase()).get(); Elements outlinks = doc.select("body a"); @@ -3259,7 +3260,7 @@ public class ImgDownloader { && !scryset.equals("PAL05") && !scryset.equals("PAL06") && !scryset.equals("PAL99") && !scryset.equals("PARL") && !scryset.equals("HA1") && !scryset.equals("SLD") && !scryset.equals("MB1") && !scryset.equals("HA2") && !scryset.equals("HA3") && !scryset.equals("SS3") && !scryset.equals("AKR") && !scryset.equals("ANB") && !scryset.equals("PLIST") && !scryset.equals("KLR") && !scryset.equals("CC1") - && !scryset.equals("ATH") && !scryset.equals("HA4") && !scryset.equals("TSR")){ + && !scryset.equals("ATH") && !scryset.equals("HA4") && !scryset.equals("TSR") && !scryset.equals("HA5")){ try { doc = Jsoup.connect(imageurl + scryset.toLowerCase()).get(); } catch (Exception e) { @@ -3426,7 +3427,7 @@ public class ImgDownloader { || scryset.equals("PAL06") || scryset.equals("PAL99") || scryset.equals("PARL") || scryset.equals("HA1") || scryset.equals("SLD") || scryset.equals("MB1") || scryset.equals("HA2") || scryset.equals("HA3") || scryset.equals("SS3") || scryset.equals("AKR") || scryset.equals("ANB") || scryset.equals("PLIST") || scryset.equals("KLR") || scryset.equals("CC1") || scryset.equals("ATH") - || scryset.equals("HA4") || scryset.equals("TSR")){ + || scryset.equals("HA4") || scryset.equals("TSR") || scryset.equals("HA5")){ Elements metadata = doc.select("head meta"); if(metadata != null) { for (int j = 0; j < metadata.size(); j++){ diff --git a/projects/mtg/bin/Res/sets/HA5/_cards.dat b/projects/mtg/bin/Res/sets/HA5/_cards.dat new file mode 100644 index 000000000..302ff56b4 --- /dev/null +++ b/projects/mtg/bin/Res/sets/HA5/_cards.dat @@ -0,0 +1,137 @@ +[meta] +author=Wagic Team +name=Historic Anthology 5 +orderindex=PRO-ZB.HA5 +year=2021-05-27 +total=26 +[/meta] +[card] +primitive=Thopter +id=-296365 +rarity=T +[/card] +[card] +primitive=Atarka's Command +id=296341 +rarity=R +[/card] +[card] +primitive=Ancient Grudge +id=296342 +rarity=U +[/card] +[card] +primitive=Court Homunculus +id=296343 +rarity=C +[/card] +[card] +primitive=Dromoka's Command +id=296344 +rarity=R +[/card] +[card] +primitive=Dragonstorm +id=296345 +rarity=R +[/card] +[card] +primitive=Elesh Norn, Grand Cenobite +id=296346 +rarity=M +[/card] +[card] +primitive=Grisly Salvage +id=296347 +rarity=C +[/card] +[card] +primitive=Into the North +id=296348 +rarity=C +[/card] +[card] +primitive=Intangible Virtue +id=296349 +rarity=U +[/card] +[card] +primitive=Ichor Wellspring +id=296350 +rarity=C +[/card] +[card] +primitive=Jin-Gitaxias, Core Augur +id=296351 +rarity=M +[/card] +[card] +primitive=Kolaghan's Command +id=296352 +rarity=R +[/card] +[card] +primitive=Merfolk Looter +id=296353 +rarity=C +[/card] +[card] +primitive=Ojutai's Command +id=296354 +rarity=R +[/card] +[card] +primitive=Reverse Engineer +id=296355 +rarity=U +[/card] +[card] +primitive=Relic of Progenitus +id=296356 +rarity=C +[/card] +[card] +primitive=Ray of Revelation +id=296357 +rarity=C +[/card] +[card] +primitive=Stifle +id=296358 +rarity=R +[/card] +[card] +primitive=Silumgar's Command +id=296359 +rarity=R +[/card] +[card] +primitive=Sheoldred, Whispering One +id=296360 +rarity=M +[/card] +[card] +primitive=Trash for Treasure +id=296361 +rarity=U +[/card] +[card] +primitive=Urabrask the Hidden +id=296362 +rarity=M +[/card] +[card] +primitive=Vault Skirge +id=296363 +rarity=C +[/card] +[card] +primitive=Vorinclex, Voice of Hunger +id=296364 +rarity=M +[/card] +[card] +primitive=Whirler Rogue +id=296365 +rarity=U +[/card]