From 08f69dc832dd1244b4b6ecca9bd9654f7ccae094 Mon Sep 17 00:00:00 2001 From: valfieri Date: Fri, 22 Nov 2019 22:22:25 +0100 Subject: [PATCH] Added HA1 set, fixed primitives and improved Android downloader. --- .../src/net/wagic/utils/ImgDownloader.java | 2 +- projects/mtg/bin/Res/sets/HA1/_cards.dat | 116 ++++++++++++++++++ projects/mtg/bin/Res/sets/primitives/ELD.txt | 9 +- projects/mtg/bin/Res/sets/primitives/GS1.txt | 6 +- projects/mtg/bin/Res/sets/primitives/M20.txt | 2 +- 5 files changed, 125 insertions(+), 10 deletions(-) create mode 100644 projects/mtg/bin/Res/sets/HA1/_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 c6410543c..33ac49dfb 100644 --- a/projects/mtg/Android/src/net/wagic/utils/ImgDownloader.java +++ b/projects/mtg/Android/src/net/wagic/utils/ImgDownloader.java @@ -1540,7 +1540,7 @@ public class ImgDownloader { tokenurl = "https://deckmaster.info/images/cards/GK1_DIMIR/-6541-hr.jpg"; else if (id.equals("116384t") || id.equals("376564t") || id.equals("52993t")) tokenurl = "https://deckmaster.info/images/cards/TSP/-114916-hr.jpg"; - else if(id.equals("17841t") || id.equals("17850t") || id.equals("17852t")) + else if(id.equals("17841t") || id.equals("17850t") || id.equals("17852t") || id.equals("19444t")) tokenurl = "https://deckmaster.info/images/cards/EVG/159047-hr.jpg"; else if(id.equals("383392t")) tokenurl = "https://deckmaster.info/images/cards/DDD/201842-hr.jpg"; diff --git a/projects/mtg/bin/Res/sets/HA1/_cards.dat b/projects/mtg/bin/Res/sets/HA1/_cards.dat new file mode 100644 index 000000000..ce2188625 --- /dev/null +++ b/projects/mtg/bin/Res/sets/HA1/_cards.dat @@ -0,0 +1,116 @@ +[meta] +author=Wagic Team +name=Historic Anthology 1 +year=2019-11-21 +total=22 +[/meta] +[card] +primitive=Warrior +id=-19444 +rarity=T +[/card] +[card] +primitive=Zombie +id=-19435 +rarity=T +[/card] +[card] +primitive=Serra Ascendant +id=19430 +rarity=R +[/card] +[card] +primitive=Soul Warden +id=19431 +rarity=C +[/card] +[card] +primitive=Kinsbaile Cavalier +id=19432 +rarity=R +[/card] +[card] +primitive=Treasure Hunt +id=19433 +rarity=C +[/card] +[card] +primitive=Distant Melody +id=19434 +rarity=C +[/card] +[card] +primitive=Cryptbreaker +id=19435 +rarity=R +[/card] +[card] +primitive=Hypnotic Specter +id=19436 +rarity=R +[/card] +[card] +primitive=Phyrexian Arena +id=19437 +rarity=R +[/card] +[card] +primitive=Tendrils of Corruption +id=19438 +rarity=C +[/card] +[card] +primitive=Kiln Fiend +id=19439 +rarity=C +[/card] +[card] +primitive=Goblin Matron +id=19440 +rarity=U +[/card] +[card] +primitive=Hidetsugu's Second Rite +id=19441 +rarity=R +[/card] +[card] +primitive=Elvish Visionary +id=19442 +rarity=C +[/card] +[card] +primitive=Fauna Shaman +id=19443 +rarity=R +[/card] +[card] +primitive=Imperious Perfect +id=19444 +rarity=U +[/card] +[card] +primitive=Burning-Tree Emissary +id=19445 +rarity=U +[/card] +[card] +primitive=Captain Sisay +id=19446 +rarity=R +[/card] +[card] +primitive=Ornithopter +id=19447 +rarity=U +[/card] +[card] +primitive=Mind Stone +id=19448 +rarity=C +[/card] +[card] +primitive=Darksteel Reactor +id=19449 +rarity=R +[/card] diff --git a/projects/mtg/bin/Res/sets/primitives/ELD.txt b/projects/mtg/bin/Res/sets/primitives/ELD.txt index d02f68576..9ef7646be 100644 --- a/projects/mtg/bin/Res/sets/primitives/ELD.txt +++ b/projects/mtg/bin/Res/sets/primitives/ELD.txt @@ -167,7 +167,7 @@ toughness=4 name=Syr Gwyn, Hero of Ashvale abilities=vigilance,menace auto=@combat(attacking) source(creature[geared]|mybattlefield):draw:1 && life:-1 controller -#MISSED: equip 0 to knight +auto=lord(equipment|mybattlefield) transforms((,newability[{0}:name(Equip Zero to a Knight) rehook target(creature[Knight]|mybattlefield) assorcery])) text=Vigilance, menace -- Whenever an equipped creature you control attacks, you draw a card and you lose 1 life. -- Equipment you control have equip Knight {0}. mana={3}{R}{W}{B} type=Legendary Creature @@ -2675,7 +2675,7 @@ name=Rankle, Master of Pranks abilities=flying,haste auto=@combatdamaged(player) from(this):may name(discard) transforms((,newability[ability$!name(discard) notatarget(*|myhand) reject!$ controller],newability[ability$!name(discard) notatarget(*|myhand) reject!$ opponent])) ueot auto=@combatdamaged(player) from(this):may name(life and draw) draw:1 controller && draw:1 opponent && life:-1 controller && life:-1 opponent -auto=@combatdamaged(player) from(this):may name(sacrifice) sacrifice tatarget(creature|mybattlefield) controller and!(sacrifice tatarget(creature|opponentBattlefield) opponent)! +auto=@combatdamaged(player) from(this):may name(sacrifice) sacrifice target(creature|mybattlefield) controller and!(sacrifice target(creature|opponentBattlefield) opponent)! text=Flying, haste -- Whenever Rankle, Master of Pranks deals combat damage to a player, choose any number — -- • Each player discards a card. -- • Each player loses 1 life and draws a card. -- • Each player sacrifices a creature. mana={2}{B}{B} type=Legendary Creature @@ -2764,19 +2764,18 @@ toughness=4 [/card] [card] name=Once Upon a Time -#MISSING: First spell of game aicode=activate moveto(myhand) target(*[creature;land;zpos<=5]|mylibrary) auto=name(look) reveal:5 optionone name(Get a card) target(<1>*[creature;land]|reveal) moveto(myhand) optiononeend optiontwo name(put on bottom) target(<5>*|reveal) bottomoflibrary optiontwoend revealend +auto=@movedto(*|mystack) restriction{thisturn(*|mystack)~lessthan~2}:castcard(this) ueot oneshot text=If this spell is the first spell you've cast this game, you may cast it without paying its mana cost. -- Look at the top five cards of your library. You may reveal a creature or land card from among them and put it into your hand. Put the rest on the bottom of your library in a random order. mana={1}{G} type=Instant [/card] [card] name=Clackbridge Troll -#MISSING: At the beginning of combat on your turn abilities=trample,haste auto=create(Goat:creature Goat:0/1:white)*3 opponent -auto=@sacrificed(creature|opponentBattlefield):{T}:draw:1 controller && life:3 controller +auto=@each my combatbegins restriction{type(creature|opponentbattlefield)~morethan~0}:ability$!name(sacrifice creature) notatarget(creature|mybattlefield) sacrifice!$ opponent && tap (this) && draw:1 controller && life:3 controller text=Trample, haste -- When Clackbridge Troll enters the battlefield, target opponent creates three 0/1 white Goat creature tokens. -- At the beginning of combat on your turn, any opponent may sacrifice a creature. If a player does, tap Clackbridge Troll, you gain 3 life, and you draw a card. mana={3}{B}{B} type=Creature diff --git a/projects/mtg/bin/Res/sets/primitives/GS1.txt b/projects/mtg/bin/Res/sets/primitives/GS1.txt index 64c26dfa7..ef8ea8e87 100644 --- a/projects/mtg/bin/Res/sets/primitives/GS1.txt +++ b/projects/mtg/bin/Res/sets/primitives/GS1.txt @@ -3,7 +3,7 @@ grade=borderline name=Mu Yanling auto=counter(0/0,5,loyalty) auto={C(0/0,2,Loyalty)}:name(+2: Target creature can't be blocked) unblockable target(creature) -auto={C(0/0,-3,Loyalty)}:name(-3: Draw two cards) draw:2 +auto={C(0/0,-3,Loyalty)}:name(-3: Draw two cards) draw:2 controller auto={C(0/0,-10,Loyalty)}:name(-10: Tap all creatures and take and extra turn) tap all(creature|opponentbattlefield) && turns:+1 controller text=+2: Target creature can't be blocked this turn. -- -3: Draw two cards. -- -10: Tap all creatures your opponents control. You take an extra turn after this one. mana={4}{U}{U} @@ -154,8 +154,8 @@ type=Sorcery name=Jiang Yanggu auto=counter(0/0,4,loyalty) auto={C(0/0,1,Loyalty)}:name(+1: Target creature gets +2/+2 until end of turn.) target(creature) 2/2 ueot -auto={C(0/0,-1,Loyalty)}:name(-1: Create a legendary 3/3 green Mowu creature token) auto=@each my upkeep restriction{type(Mowu|myBattlefield)~lessthan~1}:token(Mowu,legendary creature hound,3/3,green) -auto={C(0/0,-5,Loyalty)}:name(-5: Target creature gains trample and +X/+X until end of turn.) foreach(land|myBattlefield) 1/1 && trample ueot +auto={C(0/0,-1,Loyalty)}:name(-1: Create a legendary 3/3 green Mowu creature token) restriction{type(Mowu|myBattlefield)~lessthan~1}:token(Mowu) +auto={C(0/0,-5,Loyalty)}:name(-5: Target creature gains trample and +X/+X until end of turn.) target(creature) foreach(land|myBattlefield) 1/1 && trample ueot text=+1: Target creature gets +2/+2 until end of turn. -- -1: If you don't control a creature named Mowu, create a legendary 3/3 green Hound creature token named Mowu. -- -5: Until end of turn, target creature gains trample and gets +X/+X, where X is the number of lands you control. mana={4}{G} type=Legendary Planeswalker diff --git a/projects/mtg/bin/Res/sets/primitives/M20.txt b/projects/mtg/bin/Res/sets/primitives/M20.txt index f9c0e7786..98e733753 100644 --- a/projects/mtg/bin/Res/sets/primitives/M20.txt +++ b/projects/mtg/bin/Res/sets/primitives/M20.txt @@ -511,7 +511,7 @@ type=Sorcery [card] name=Leyline of Abundance abilities=leyline -auto=lord(creature|mybattlefield) transforms((,newability[producecolor:green])) +auto=@tappedformana(creature|myBattlefield):add{G} auto={6}{G}{G}:all(creature|mybattlefield) counter(1/1,1) text=If Leyline of Abundance is in your opening hand, you may begin the game with it on the battlefield. -- Whenever you tap a creature for mana, add an additional {G}. -- {6}{G}{G}: Put a +1/+1 counter on each creature you control. mana={2}{G}{G}