Erwan

- Parser: Added possibility to add multiple abilities for one cost, using keyword && (see Ardakar wastes in 10E). Currently only works with mana and damage - Added a dozen new cards - Improved testing suite : new keyword "choice" to select an item in the abilities popup menu
2009-01-18 06:42:59 +00:00
parent e978a7d168
commit 9e314720e9
15 changed files with 723 additions and 546 deletions
@@ -101,6 +101,17 @@ subtype=Angel
 toughness=3
 [/card]
 [card]
+text={T}: Add {1} to your mana pool.     {T}: Add {W} or {U} to your mana pool. Adarkar Wastes deals 1 damage to you.
+auto={T}:Add {1}
+auto={T}:Add {W} && Damage 1 controller
+auto={T}:Add {B} && Damage 1 controller
+id=129458
+name=Adarkar Wastes
+rarity=R
+color=Land
+type=Land
+[/card]
+[card]
 text=Flying (This creature can't be blocked except by creatures with flying or reach.)  Other black creatures get +1/+1.      Nonblack creatures get -1/-1.
 abilities=Legendary, flying
 auto=lord(creature[black]) 1/1
@@ -127,6 +138,17 @@ type=Sorcery
 mana={2}{B}
 [/card]
 [card]
+text={T}: Add {1} to your mana pool.     {T}: Add {R} or {W} to your mana pool. Battlefield Forge deals 1 damage to you.
+id=129479
+auto={T}:Add {1}
+auto={T}:Add {R} && Damage 1 controller
+auto={T}:Add {W} && Damage 1 controller
+name=Battlefield Forge
+rarity=R
+color=Land
+type=Land
+[/card]
+[card]
 text=Flash (You may play this spell any time you could play an instant.)  First strike (This creature deals combat damage before creatures without first strike.)
 abilities=flash,first strike
 id=136279
@@ -189,6 +211,28 @@ type=Instant
 mana={U}{U}
 [/card]
 [card]
+text={T}: Add {1} to your mana pool.     {T}: Add {G} or {W} to your mana pool. Brushland deals 1 damage to you.
+auto={T}:Add {1}
+auto={T}:Add {G} && Damage 1 controller
+auto={T}:Add {W} && Damage 1 controller
+id=129496
+name=Brushland
+rarity=R
+color=Land
+type=Land
+[/card]
+[card]
+text={T}: Add {1} to your mana pool.     {T}: Add {W} or {B} to your mana pool. Caves of Koilos deals 1 damage to you.
+auto={T}:Add {1}
+auto={T}:Add {W} && Damage 1 controller
+auto={T}:Add {B} && Damage 1 controller
+id=129497
+name=Caves of Koilos
+rarity=R
+color=Land
+type=Land
+[/card]
+[card]
 text=Counter target spell.
 alias=1196
 id=129882
@@ -809,6 +853,17 @@ subtype=Human Barbarian
 toughness=1
 [/card]
 [card]
+text={T}: Add {1} to your mana pool.     {T}: Add {R} or {G} to your mana pool. Karplusan Forest deals 1 damage to you.
+auto={T}:Add {1}
+auto={T}:Add {R} && Damage 1 controller
+auto={T}:Add {G} && Damage 1 controller
+id=129614
+name=Karplusan Forest
+rarity=R
+color=Land
+type=Land
+[/card]
+[card]
 text=When Kavu Climber comes into play, draw a card.
 id=129511
 name=Kavu Climber
@@ -859,6 +914,17 @@ subtype=Elf Druid
 toughness=1
 [/card]
 [card]
+text={T}: Add {1} to your mana pool.     {T}: Add {B} or {G} to your mana pool. Llanowar Wastes deals 1 damage to you.
+id=129627
+auto={T}:Add {1}
+auto={T}:Add {B} && Damage 1 controller
+auto={T}:Add {G} && Damage 1 controller
+name=Llanowar Wastes
+rarity=R
+color=Land
+type=Land
+[/card]
+[card]
 text={B}: Looming Shade gets +1/+1 until end of turn.
 auto={B}:1/1
 id=129628
@@ -1547,6 +1613,17 @@ subtype=Dragon
 toughness=5
 [/card]
 [card]
+text={T}: Add {1} to your mana pool.     {T}: Add {U} or {R} to your mana pool. Shivan Reef deals 1 damage to you.
+id=129731
+auto={T}:Add {1}
+auto={T}:Add {U} && Damage 1 controller
+auto={T}:Add {R} && Damage 1 controller
+name=Shivan Reef
+rarity=R
+color=Land
+type=Land
+[/card]
+[card]
 text=Shock deals 2 damage to target creature or player.
 target=creature,player
 auto=Damage:2
@@ -1712,6 +1789,17 @@ subtype=Human Rebel
 toughness=2
 [/card]
 [card]
+text={T}: Add {1} to your mana pool.     {T}: Add {B} or {R} to your mana pool. Sulfurous Springs deals 1 damage to you.
+id=129751
+auto={T}:Add {1}
+auto={T}:Add {B} && Damage 1 controller
+auto={T}:Add {R} && Damage 1 controller
+name=Sulfurous Springs
+rarity=R
+color=Land
+type=Land
+[/card]
+[card]
 text=Flying (This creature can't be blocked except by creatures with flying or reach.)
 abilities=flying
 id=129753
@@ -1845,6 +1933,17 @@ subtype=Wolf
 toughness=1
 [/card]
 [card]
+text={T}: Add {1} to your mana pool.     {T}: Add {U} or {B} to your mana pool. Underground River deals 1 damage to you.
+id=129778
+auto={T}:Add {1}
+auto={T}:Add {U} && Damage 1 controller
+auto={T}:Add {B} && Damage 1 controller
+name=Underground River
+rarity=R
+color=Land
+type=Land
+[/card]
+[card]
 text=Enchant creature (Target a creature as you play this. This card comes into play attached to that creature.)  Enchanted creature gets +2/+1.
 target=creature
 auto=:2/1
@@ -1984,6 +2083,17 @@ type=Sorcery
 mana={2}{W}{W}
 [/card]
 [card]
+text={T}: Add {1} to your mana pool.     {T}: Add {G} or {U} to your mana pool. Yavimaya Coast deals 1 damage to you.
+id=129810
+auto={T}:Add {1}
+auto={T}:Add {G} && Damage 1 controller
+auto={T}:Add {U} && Damage 1 controller
+name=Yavimaya Coast
+rarity=R
+color=Land
+type=Land
+[/card]
+[card]
 text=First strike (This creature deals combat damage before creatures without first strike.)
 abilities=first strike
 id=129790
@@ -20,14 +20,6 @@ subtype=Human Wizard
 toughness=2
 [/card]
 [card]
-text={T}: Add {1} to your mana pool.     {T}: Add {W} or {U} to your mana pool. Adarkar Wastes deals 1 damage to you.
-id=129458
-name=Adarkar Wastes
-rarity=R
-color=Land
-type=Land
-[/card]
-[card]
 text=Look at target player's hand and choose two cards from it. Put them on top of that player's library in any order.
 id=135228
 name=Agonizing Memories
@@ -178,14 +170,6 @@ type=Instant
 mana={W}
 [/card]
 [card]
-text={T}: Add {1} to your mana pool.     {T}: Add {R} or {W} to your mana pool. Battlefield Forge deals 1 damage to you.
-id=129479
-name=Battlefield Forge
-rarity=R
-color=Land
-type=Land
-[/card]
-[card]
 text=Beacon of Destruction deals 5 damage to target creature or player. Shuffle Beacon of Destruction into its owner's library.
 id=135262
 name=Beacon of Destruction
@@ -271,22 +255,6 @@ subtype=Gnome
 toughness=3
 [/card]
 [card]
-text={T}: Add {1} to your mana pool.     {T}: Add {G} or {W} to your mana pool. Brushland deals 1 damage to you.
-id=129496
-name=Brushland
-rarity=R
-color=Land
-type=Land
-[/card]
-[card]
-text={T}: Add {1} to your mana pool.     {T}: Add {W} or {B} to your mana pool. Caves of Koilos deals 1 damage to you.
-id=129497
-name=Caves of Koilos
-rarity=R
-color=Land
-type=Land
-[/card]
-[card]
 text=Whenever Cephalid Constable deals combat damage to a player, return up to that many target permanents that player controls to their owners' hands.
 id=135261
 name=Cephalid Constable
@@ -945,14 +913,6 @@ subtype=Juggernaut
 toughness=3
 [/card]
 [card]
-text={T}: Add {1} to your mana pool.     {T}: Add {R} or {G} to your mana pool. Karplusan Forest deals 1 damage to you.
-id=129614
-name=Karplusan Forest
-rarity=R
-color=Land
-type=Land
-[/card]
-[card]
 text=Karplusan Strider can't be the target of blue or black spells.
 id=129911
 name=Karplusan Strider
@@ -1041,14 +1001,6 @@ subtype=Elf
 toughness=3
 [/card]
 [card]
-text={T}: Add {1} to your mana pool.     {T}: Add {B} or {G} to your mana pool. Llanowar Wastes deals 1 damage to you.
-id=129627
-name=Llanowar Wastes
-rarity=R
-color=Land
-type=Land
-[/card]
-[card]
 text=Equipped creature gets +3/+0 and has lifelink and trample. (When it deals damage, you gain that much life. If it would deal enough combat damage to its blockers to destroy them, you may have it deal the rest of its damage to defending player.)  Equip {3} ({3}: Attach to target creature you control. Equip only as a sorcery.)
 id=129630
 name=Loxodon Warhammer
@@ -1645,14 +1597,6 @@ mana={U}
 subtype=Aura
 [/card]
 [card]
-text={T}: Add {1} to your mana pool.     {T}: Add {U} or {R} to your mana pool. Shivan Reef deals 1 damage to you.
-id=129731
-name=Shivan Reef
-rarity=R
-color=Land
-type=Land
-[/card]
-[card]
 text=Change the target of target spell with a single target.
 id=130362
 name=Shunt
@@ -1870,14 +1814,7 @@ color=Red
 type=Instant
 mana={3}{R}
 [/card]
-[card]
-text={T}: Add {1} to your mana pool.     {T}: Add {B} or {R} to your mana pool. Sulfurous Springs deals 1 damage to you.
-id=129751
-name=Sulfurous Springs
-rarity=R
-color=Land
-type=Land
-[/card]
+
 [card]
 text=At the beginning of each player's upkeep, that player returns a creature he or she controls to its owner's hand.
 id=129509
@@ -2077,14 +2014,6 @@ mana={2}{R}{R}
 subtype=Aura
 [/card]
 [card]
-text={T}: Add {1} to your mana pool.     {T}: Add {U} or {B} to your mana pool. Underground River deals 1 damage to you.
-id=129778
-name=Underground River
-rarity=R
-color=Land
-type=Land
-[/card]
-[card]
 text=Whenever an opponent draws a card, Underworld Dreams deals 1 damage to him or her.
 id=129779
 name=Underworld Dreams
@@ -2212,14 +2141,6 @@ type=Artifact
 mana={2}
 [/card]
 [card]
-text={T}: Add {1} to your mana pool.     {T}: Add {G} or {U} to your mana pool. Yavimaya Coast deals 1 damage to you.
-id=129810
-name=Yavimaya Coast
-rarity=R
-color=Land
-type=Land
-[/card]
-[card]
 text=Yavimaya Enchantress gets +1/+1 for each enchantment in play.
 id=130515
 name=Yavimaya Enchantress
@@ -12,6 +12,32 @@ subtype=Imp
 toughness=1
 [/card]
 [card]
+text=Red creatures you control have first strike.
+auto=lord(creature[red]|myinplay) first strike includeself
+id=142062
+name=Bloodmark Mentor
+rarity=U
+type=Creature
+mana={1}{R}
+power=1
+subtype=Goblin Warrior
+toughness=1
+[/card]
+[card]
+text=Trample     Other red creatures you control get +1/+1.     Other green creatures you control get +1/+1.
+abilities=trample
+auto=lord(creature[red]|myinplay) 1/1
+auto=lord(creature[green]|myinplay) 1/1
+id=147428
+name=Boartusk Liege
+rarity=R
+type=Creature
+mana={1}{RG}{RG}{RG}
+power=3
+subtype=Goblin Knight
+toughness=4
+[/card]
+[card]
 text=Haste     Wither (This deals damage to creatures in the form of -1/-1 counters.)
 abilities=haste,wither
 id=153970
@@ -37,6 +63,30 @@ subtype=Elemental Skeleton
 toughness=1
 [/card]
 [card]
+text=Black creatures you control have wither. (They deal damage to creatures in the form of -1/-1 counters.)
+auto=lord(creature[black]|myinplay) wither includeself
+id=142034
+name=Corrosive Mentor
+rarity=U
+type=Creature
+mana={2}{B}
+power=1
+subtype=Elemental Rogue
+toughness=3
+[/card]
+[card]
+text=Blue creatures you control are unblockable.
+auto=lord(creature[blue]|myinplay) unblockable includeself
+id=141981
+name=Deepchannel Mentor
+rarity=U
+type=Creature
+mana={5}{U}
+power=2
+subtype=Merfolk Rogue
+toughness=2
+[/card]
+[card]
 text={T}: Add {1} to your mana pool.     {RG}, {T}: Add {R}{R}, {R}{G}, or {G}{G} to your mana pool.
 auto={T}:Add{1}
 auto={RG}{T}:Add{R}{R}
@@ -106,6 +156,20 @@ subtype=Treefolk Shaman
 toughness=6
 [/card]
 [card]
+text=Flying     Other blue creatures you control get +1/+1.     Other black creatures you control get +1/+1.
+abilities=flying
+auto=lord(creature[blue]|myinplay) 1/1
+auto=lord(creature[black]|myinplay) 1/1
+id=146743
+name=Glen Elendra Liege
+rarity=R
+type=Creature
+mana={1}{UB}{UB}{UB}
+power=2
+subtype=Faerie Knight
+toughness=3
+[/card]
+[card]
 text=Persist (When this creature is put into a graveyard from play, if it had no -1/-1 counters on it, return it to play under its owner's control with a -1/-1 counter on it.)
 abilities=persist
 id=141935
@@ -165,17 +165,6 @@ mana={2}
 subtype=Equipment
 [/card]
 [card]
-text=Red creatures you control have first strike.
-id=142062
-name=Bloodmark Mentor
-rarity=U
-type=Creature
-mana={1}{R}
-power=1
-subtype=Goblin Warrior
-toughness=1
-[/card]
-[card]
 text=Enchant creature     Enchanted creature attacks each turn if able.
 id=159395
 name=Bloodshed Fever
@@ -193,17 +182,6 @@ type=Enchantment
 mana={2}{B}
 [/card]
 [card]
-text=Trample     Other red creatures you control get +1/+1.     Other green creatures you control get +1/+1.
-id=147428
-name=Boartusk Liege
-rarity=R
-type=Creature
-mana={1}{RG}{RG}{RG}
-power=3
-subtype=Goblin Knight
-toughness=4
-[/card]
-[card]
 text=Plainswalk     {2}{R}, Sacrifice Boggart Arsonists: Destroy target Scarecrow or Plains.
 id=158684
 name=Boggart Arsonists
@@ -299,17 +277,6 @@ type=Instant
 mana={2}{U}
 [/card]
 [card]
-text=Black creatures you control have wither. (They deal damage to creatures in the form of -1/-1 counters.)
-id=142034
-name=Corrosive Mentor
-rarity=U
-type=Creature
-mana={2}{B}
-power=1
-subtype=Elemental Rogue
-toughness=3
-[/card]
-[card]
 text=Corrupt deals damage equal to the number of Swamps you control to target creature or player. You gain life equal to the damage dealt this way.
 id=146013
 name=Corrupt
@@ -406,17 +373,6 @@ type=Sorcery
 mana={X}{GW}
 [/card]
 [card]
-text=Blue creatures you control are unblockable.
-id=141981
-name=Deepchannel Mentor
-rarity=U
-type=Creature
-mana={5}{U}
-power=2
-subtype=Merfolk Rogue
-toughness=2
-[/card]
-[card]
 text=Deep-Slumber Titan comes into play tapped.     Deep-Slumber Titan doesn't untap during your untap step.     Whenever Deep-Slumber Titan is dealt damage, untap it.
 id=159396
 name=Deep-Slumber Titan
@@ -755,17 +711,6 @@ type=Sorcery
 mana={1}{G}
 [/card]
 [card]
-text=Flying     Other blue creatures you control get +1/+1.     Other black creatures you control get +1/+1.
-id=146743
-name=Glen Elendra Liege
-rarity=R
-type=Creature
-mana={1}{UB}{UB}{UB}
-power=2
-subtype=Faerie Knight
-toughness=3
-[/card]
-[card]
 text=Destroy target creature. If that creature was green or white, its controller discards a card.
 id=158757
 name=Gloomlance
@@ -15,6 +15,7 @@ afflict.txt
 anarchy.txt
 animate_dead.txt
 animate_dead2.txt
+ardakar_wastes.txt
 ascendant_evincar.txt
 ascendant_evincar2.txt
 brass_man.txt
@@ -0,0 +1,18 @@
+#Testing Ardakar Wastes with multi
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+inplay:129458
+[PLAYER2]
+[DO]
+129458
+choice 1
+129458
+[ASSERT]
+FIRSTMAIN
+[PLAYER1]
+inplay:129458
+manapool:{W}
+life:19
+[PLAYER2]
+[END]