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

Added JMP, SSR and M21 sets, fixed C14 set, added new primitives and improved Android downloader.

Browse Source
This commit is contained in:
valfieri
2020-07-04 22:29:09 +02:00
parent ccc26f400d
commit fc40971dc7
9 changed files with 9863 additions and 1862 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1388,6 +1388,14 @@ public class ImgDownloader {
cardurl = "https://img.scryfall.com/cards/large/front/f/9/f918b740-1984-4090-8886-9e290a698b95.jpg?1586451994";
else if(id.equals("479634t"))
cardurl = "https://img.scryfall.com/cards/large/front/a/9/a9cc7c63-5d13-4fd6-af9d-4a26c2bab8e6.jpg?1588521003";
else if(id.equals("485469t"))
cardurl = "https://img.scryfall.com/cards/large/front/4/3/4306be80-d7c9-4bcf-a3de-4bf159475546.jpg?1592323967";
else if(id.equals("489663"))
cardurl = "https://img.scryfall.com/cards/large/front/d/6/d605c780-a42a-4816-8fb9-63e3114a8246.jpg?1592762067";
else if(id.equals("48966310t"))
cardurl = "https://img.scryfall.com/cards/large/front/f/b/fbdf8dc1-1b10-4fce-97b9-1f5600500cc1.jpg?1592324494";
else if(id.equals("48966311t"))
cardurl = "https://img.scryfall.com/cards/large/front/4/f/4f8107b3-8539-4b9c-8d0d-c512c940838f.jpg?1592324480";
return cardurl;
}
@@ -1437,7 +1445,7 @@ public class ImgDownloader {
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("420600t") || id.equals("294436t") || id.equals("489333t"))
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";
@@ -1665,7 +1673,7 @@ public class ImgDownloader {
tokenurl = "https://img.scryfall.com/cards/large/front/d/b/dbf33cc3-254f-4c5c-be22-3a2d96f29b80.jpg?1562936030";
else if(id.equals("213757t") || id.equals("213734t") || id.equals("221554t") || id.equals("48049t") ||
id.equals("46160t") || id.equals("47450t") || id.equals("376421t") || id.equals("213725t") ||
id.equals("52492t"))
id.equals("52492t") || id.equals("489268t") || id.equals("489458t"))
tokenurl = "https://img.scryfall.com/cards/large/front/f/3/f32ad93f-3fd5-465c-ac6a-6f8fb57c19bd.jpg?1561758422";
else if (id.equals("247393t") || id.equals("247399t"))
tokenurl = "https://img.scryfall.com/cards/large/front/1/f/1feaa879-ceb3-4b20-8021-ae41d8be9005.jpg?1562636755";
@@ -1742,7 +1750,7 @@ public class ImgDownloader {
tokenurl = "https://img.scryfall.com/cards/large/front/d/2/d2f51f4d-eb6d-4503-b9a4-559db1b9b16f.jpg?1574710411";
else if(id.equals("19471t") || id.equals("19472t"))
tokenurl = "https://img.scryfall.com/cards/large/front/3/4/340fb06f-4bb0-4d23-b08c-8b1da4a8c2ad.jpg?1574709457";
else if(id.equals("294089t"))
else if(id.equals("294089t") || id.equals("294717t"))
tokenurl = "https://img.scryfall.com/cards/large/front/8/b/8b4f81e2-916f-4af4-9e63-f4469e953122.jpg?1562702183";
else if(id.equals("293323t"))
tokenurl = "https://img.scryfall.com/cards/large/front/2/f/2f4b7c63-8430-4ca4-baee-dc958d5bd22f.jpg?1557575919";
@@ -1812,6 +1820,18 @@ public class ImgDownloader {
tokenurl = "https://img.scryfall.com/cards/large/front/6/0/60466c78-155e-442b-8022-795e1e9de8df.jpg?1581901998";
else if(id.equals("484904t"))
tokenurl = "https://img.scryfall.com/cards/large/front/2/1/21e89101-f1cf-4bbd-a1d5-c5d48512e0dd.jpg?1562539760";
else if(id.equals("489168t"))
tokenurl="https://img.scryfall.com/cards/large/front/d/e/dee1c2ee-d92e-409a-995a-b4c91620c918.jpg?1581901969";
else if(id.equals("489401t"))
tokenurl="https://i.pinimg.com/564x/01/b0/a2/01b0a289e1a28167cbf0f30532328d99.jpg";
else if(id.equals("489171t"))
tokenurl = "https://img.scryfall.com/cards/large/front/4/f/4f8107b3-8539-4b9c-8d0d-c512c940838f.jpg?1592324480";
else if(id.equals("489403t") || id.equals("489358t") || id.equals("489372t"))
tokenurl = "https://img.scryfall.com/cards/large/front/9/5/959ed4bf-b276-45ed-b44d-c757e9c25846.jpg";
else if(id.equals("489562t"))
tokenurl="https://img.scryfall.com/cards/large/front/c/f/cf9a289f-cd3f-42a0-9296-8c7cc7d01a91.jpg?1561758108";
else if(id.equals("489363t"))
tokenurl="https://img.scryfall.com/cards/large/front/8/3/83dcacd3-8707-4354-a1a5-9863d677d67f.jpg?1562702177";
return tokenurl;
}
@@ -2412,7 +2432,7 @@ public class ImgDownloader {
|| scryset.equals("PMPS08") || scryset.equals("PMPS09") || scryset.equals("PMPS10") || scryset.equals("PMPS11") || scryset.equals("GN2")
|| scryset.equals("PAL00") || scryset.equals("PAL01") || scryset.equals("PAL02") || scryset.equals("PAL03") || scryset.equals("PAL04")
|| 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("SLD") || scryset.equals("MB1") || scryset.equals("HA2") || scryset.equals("HA3") || scryset.equals("SS3")){
try {
doc = Jsoup.connect(imageurl + scryset.toLowerCase()).get();
Elements outlinks = doc.select("body a");
@@ -2601,7 +2621,7 @@ public class ImgDownloader {
&& !scryset.equals("PMPS08") && !scryset.equals("PMPS09") && !scryset.equals("PMPS10") && !scryset.equals("PMPS11") && !scryset.equals("GN2")
&& !scryset.equals("PAL00") && !scryset.equals("PAL01") && !scryset.equals("PAL02") && !scryset.equals("PAL03") && !scryset.equals("PAL04")
&& !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("SLD") && !scryset.equals("MB1") && !scryset.equals("HA2") && !scryset.equals("HA3") && !scryset.equals("SS3")){
try {
doc = Jsoup.connect(imageurl + scryset.toLowerCase()).get();
Elements outlinks = doc.select("body a");
@@ -2714,7 +2734,7 @@ public class ImgDownloader {
&& !scryset.equals("PMPS08") && !scryset.equals("PMPS09") && !scryset.equals("PMPS10") && !scryset.equals("PMPS11") && !scryset.equals("GN2")
&& !scryset.equals("PAL00") && !scryset.equals("PAL01") && !scryset.equals("PAL02") && !scryset.equals("PAL03") && !scryset.equals("PAL04")
&& !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("SLD") && !scryset.equals("MB1") && !scryset.equals("HA2") && !scryset.equals("HA3") && !scryset.equals("SS3")){
try {
doc = Jsoup.connect(imageurl + scryset.toLowerCase()).get();
} catch (Exception e) {
@@ -2879,7 +2899,7 @@ public class ImgDownloader {
|| scryset.equals("PMPS09") || scryset.equals("PMPS10") || scryset.equals("PMPS11") || scryset.equals("GN2") || scryset.equals("PAL00")
|| scryset.equals("PAL01") || scryset.equals("PAL02") || scryset.equals("PAL03") || scryset.equals("PAL04") || 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("MB1") || scryset.equals("HA2") || scryset.equals("HA3") || scryset.equals("SS3")){
Elements metadata = doc.select("head meta");
if(metadata != null) {
for (int j = 0; j < metadata.size(); j++){

8
projects/mtg/bin/Res/sets/C14/_cards.dat
View File

@@ -2,7 +2,7 @@
author=Wagic Team
name=Commander 2014
year=2014-11-07
total=337
total=342
[/meta]
[card]
primitive=Abyssal Persecutor
@@ -490,7 +490,7 @@ id=389517
rarity=U
[/card]
[card]
primitive=Fish
primitive=Fish Reef
id=-3896521
rarity=T
[/card]
@@ -780,7 +780,7 @@ id=389574
rarity=C
[/card]
[card]
primitive=Kraken
primitive=Kraken Reef
id=-3896523
rarity=T
[/card]
@@ -1635,7 +1635,7 @@ id=389743
rarity=C
[/card]
[card]
primitive=Whale
primitive=Whale Reef
id=-3896522
rarity=T
[/card]

2681
projects/mtg/bin/Res/sets/JMP/_cards.dat Normal file
View File

File diff suppressed because it is too large Load Diff

1601
projects/mtg/bin/Res/sets/M21/_cards.dat Normal file
View File

File diff suppressed because it is too large Load Diff

51
projects/mtg/bin/Res/sets/SS3/_cards.dat Normal file
View File

@@ -0,0 +1,51 @@
[meta]
author=Wagic Team
name=Signature Spellbok: Chandra
year=2020-06-26
total=9
[/meta]
[card]
primitive=Elemental
id=-294717
rarity=T
[/card]
[card]
primitive=Chandra, Torch of Defiance
id=294710
rarity=M
[/card]
[card]
primitive=Cathartic Reunion
id=294711
rarity=R
[/card]
[card]
primitive=Fiery Confluence
id=294712
rarity=R
[/card]
[card]
primitive=Past in Flames
id=294713
rarity=M
[/card]
[card]
primitive=Pyroblast
id=294714
rarity=R
[/card]
[card]
primitive=Pyromancer Ascension
id=294715
rarity=R
[/card]
[card]
primitive=Rite of Flame
id=294716
rarity=R
[/card]
[card]
primitive=Young Pyromancer
id=294717
rarity=R
[/card]

5760
projects/mtg/bin/Res/sets/primitives/borderline.txt
View File

File diff suppressed because it is too large Load Diff

2
projects/mtg/bin/Res/sets/primitives/crappy.txt
View File

@@ -3,7 +3,7 @@ grade=crappy
###1. Decimate should only be castable if there are 4 legal targets.###
###2. Decimate should fizzle if 1 or more of the 4 targets become illegal or cease to exist.###
#Please keep these card alphabetized, and try to have the "name=" line at the top of each card
#I sorted this programatically so the other comments are removed except for AUTO_DEFINE - Vitty85 09-05-2020
#I sorted this programatically so the other comments are removed except for AUTO_DEFINE - Vitty85 04-07-2020
[card]
name=Decimate
auto=ability$!destroy target(artifact)!$ controller

14
projects/mtg/bin/Res/sets/primitives/mtg.txt
View File

@@ -30678,7 +30678,7 @@ auto=counter(0/0,3,loyalty)
aicode=activate moveto(myhand) target(creature[zpos=1]|mylibrary)
auto={C(0/0,1,Loyalty)}:name(+1: Reveal) reveal:1 optionone target(creature|reveal)moveto(myhand) optiononeend optiontwo name(Put Back On Top) target(<1>*|reveal) moveto(mylibrary) optiontwoend revealend
auto={C(0/0,-2,Loyalty)}:name(-2: Fight) target(creature|mybattlefield) transforms((,newability[target(creature) dynamicability<!powerstrike eachother!>])) ueot
auto={C(0/0,-7,Loyalty)}:name(-7: emblem) emblem transforms((,newability[lord(creature|mybattlefield)double strike],newability[lord(creature|mybattlefield)trample],newability[lord(creature|mybattlefield)hexproof],newability[lord(creature|mybattlefield)haste])) forever dontremove
auto={C(0/0,-7,Loyalty)}:name(-7: emblem) emblem transforms((,newability[lord(creature|mybattlefield) double strike],newability[lord(creature|mybattlefield) trample],newability[lord(creature|mybattlefield) opponentshroud],newability[lord(creature|mybattlefield) haste])) forever dontremove
text=+1: Look at the top card of your library. If it's a creature card, you may reveal it and put it into your hand. -- -2: Target creature you control fights another target creature. -- -7: You get an emblem with "Creatures you control have double strike, trample, hexproof, and haste."
mana={1}{R}{G}
type=Legendary Planeswalker
@@ -58715,7 +58715,7 @@ toughness=1
[/card]
[card]
name=Insidious Mist
abilities=hexproof,unblockable,indestructible,cantblock
abilities=opponentshroud,unblockable,indestructible,cantblock
auto=@combat(notblocked) source(this):transforms((,newability[pay[[{2}{B}]] flip(Elusive Tormentor)])) oneshot
text=Hexproof, indestructible -- Insidious Mist can't block and can't be blocked. -- Whenever Insidious Mist attacks and isn't blocked, you may pay {2}{B}. If you do, transform it.
type=Creature
@@ -63753,7 +63753,7 @@ toughness=2
[/card]
[card]
name=Knight of New Alara
auto=lord(other creature[multicolored]|mybattlefield) transforms((,newability[colors/colors nonstatic]))
auto=lord(other creature[multicolor]|mybattlefield) transforms((,newability[colors/colors nonstatic]))
text=Each other multicolored creature you control gets +1/+1 for each of its colors.
mana={2}{G}{W}
type=Creature
@@ -82029,7 +82029,7 @@ auto=@each combatbegins restriction{type(*[flying]|mybattlefield)~morethan~0}:al
auto=@each combatbegins restriction{type(*[deathtouch]|mybattlefield)~morethan~0}:all(creature|mybattlefield) deathtouch ueot
auto=@each combatbegins restriction{type(*[double strike]|mybattlefield)~morethan~0}:all(creature|mybattlefield) double strike ueot
auto=@each combatbegins restriction{type(*[haste]|mybattlefield)~morethan~0}:all(creature|mybattlefield) haste ueot
auto=@each combatbegins restriction{type(*[hexproof]|mybattlefield)~morethan~0}:all(creature|mybattlefield) hexproof ueot
auto=@each combatbegins restriction{type(*[opponentshroud]|mybattlefield)~morethan~0}:all(creature|mybattlefield) opponentshroud ueot
auto=@each combatbegins restriction{type(*[indestructible]|mybattlefield)~morethan~0}:all(creature|mybattlefield) indestructible ueot
auto=@each combatbegins restriction{type(*[lifelink]|mybattlefield)~morethan~0}:all(creature|mybattlefield) lifelink ueot
auto=@each combatbegins restriction{type(*[reach]|mybattlefield)~morethan~0}:all(creature|mybattlefield) reach ueot
@@ -92457,7 +92457,7 @@ toughness=3
[card]
name=Rattlechains
abilities=flash,flying
auto=target(spirit) hexproof ueot
auto=target(spirit) opponentshroud ueot
auto=lord(spirit|myhand,mylibrary,mygraveyard,myexile) asflash
text=Flash -- Flying -- When Rattlechains enters the battlefield, target Spirit gains hexproof until end of turn. -- You may cast Spirit spells as though they had flash.
mana={1}{U}
@@ -105466,7 +105466,7 @@ type=Sorcery
[card]
name=Sigarda, Heron's Grace
abilities=flying,playershroud
auto=lord(human|mybattlefield) hexproof
auto=lord(human|mybattlefield) opponentshroud
auto={2}{E(*|mygraveyard)}:token(Human Soldier,Creature Human Soldier,1/1,white)
text=Flying -- You and Humans you control have hexproof. -- {2}, Exile a card from your graveyard: Put a 1/1 white Human Soldier creature token onto the battlefield.
mana={3}{G}{W}
@@ -131697,7 +131697,7 @@ toughness=7
[card]
name=Wall of Kelp
abilities=defender
auto={U}{U}{T}:token(Kelp,creature plant wall,0/1,defender blue)
auto={U}{U}{T}:token(Kelp,creature plant wall,0/1,defender,blue)
text=Defender (This creature can't attack.) -- {U}{U}, {T}: Put a 0/1 blue Plant Wall creature token with defender named Kelp onto the battlefield.
mana={U}{U}
type=Creature

1574
projects/mtg/bin/Res/sets/primitives/unsupported.txt
View File

File diff suppressed because it is too large Load Diff