Added huge amount of successfully tested cards, mainly based on revision 1685.

The new introduced "must" also works with "@movedTo..." events (Fire Snake (POR) for example)!

projects/mtg/bin/Res/sets/ARB/_cards.dat

@@ -443,7 +443,7 @@ rarity=U
 mana={1}{G}{U}
 type=Creature
 subtype=Beast
-auto=moveTo(ownerlibrary) target(creature|myBattlefield)
+auto=moveTo(ownerlibrary) notatarget(creature|myBattlefield)
 power=5
 toughness=6
 [/card]

projects/mtg/bin/Res/sets/DIS/_cards.dat

@@ -16,6 +16,16 @@ toughness=3
 abilities=flying,trample
 [/card]
 [card]
+text=Azorius Chancery enters the battlefield tapped.   When Azorius Chancery enters the battlefield, return a land you control to its owner's hand.   {T}: Add {W}{U} to your mana pool.
+id=97087
+name=Azorius Chancery
+auto=tap
+auto=moveTo(ownerhand) notatarget(land|mybattlefield)
+auto={T}:Add{W}{U}
+rarity=C
+type=Land
+[/card]
+[card]
 text=Flying, protection from enchantments
 id=97101
 name=Azorius First-Wing
@@ -222,6 +232,16 @@ toughness=1
 abilities=flying
 [/card]
 [card]
+text=Rakdos Carnarium enters the battlefield tapped.   When Rakdos Carnarium enters the battlefield, return a land you control to its owner's hand.   {T}: Add {B}{R} to your mana pool.
+id=97082
+name=Rakdos Carnarium
+auto=tap
+auto=moveTo(ownerhand) notatarget(land|myBattlefield)
+auto={T}:Add{B}{R}
+rarity=C
+type=Land
+[/card]
+[card]
 text={T}: Rakdos Ickspitter deals 1 damage to target creature and that creature's controller loses 1 life.
 auto={T}:damage:1 target(creature) && life:-1 targetcontroller
 id=97074
@@ -325,6 +345,16 @@ toughness=1
 abilities=flying
 [/card]
 [card]
+text=Simic Growth Chamber enters the battlefield tapped.   When Simic Growth Chamber enters the battlefield, return a land you control to its owner's hand.   {T}: Add {G}{U} to your mana pool.
+id=97089
+name=Simic Growth Chamber
+auto=tap
+auto=moveTo(ownerhand) notatarget(land|myBattlefield)
+auto={T}:Add{G}{U}
+rarity=C
+type=Land
+[/card]
+[card]
 text={U}: Untap Simic Ragworm.
 id=107565
 name=Simic Ragworm

projects/mtg/bin/Res/sets/DIS/todo.dat

@@ -59,14 +59,6 @@ text=Whenever a permanent is returned to your hand, you may pay {1}. If you do,
 rarity=U
 [/card]
 [card]
-id=97087
-name=Azorius Chancery
-mana=
-type=Land
-text=Azorius Chancery enters the battlefield tapped. When Azorius Chancery enters the battlefield, return a land you control to its owner's hand. {T}: Add {W}{U} to your mana pool.
-rarity=C
-[/card]
-[card]
 id=97077
 name=Azorius Guildmage
 mana={WU}{WU}
@@ -934,16 +926,6 @@ text=First strike {T}: Reveal your hand and discard a card of target opponent's
 rarity=R
 [/card]
 [card]
-id=97082
-name=Rakdos Carnarium
-mana=
-type=Land
-text=Rakdos Carnarium enters the battlefield tapped. When Rakdos Carnarium enters the battlefield, return a land you control to its owner's hand. {T}: Add {B}{R} to your mana pool.
-auto=moveTo(ownerhand) target(land)
-auto={T}:add:{B}{R}
-rarity=C
-[/card]
-[card]
 id=97108
 name=Rakdos Guildmage
 mana={BR}{BR}
@@ -1037,17 +1019,6 @@ text=Graft 3 (This creature enters the battlefield with three +1/+1 counters on
 rarity=U
 [/card]
 [card]
-id=97089
-name=Simic Growth Chamber
-mana=
-type=Land
-text=Simic Growth Chamber enters the battlefield tapped. When Simic Growth Chamber enters the battlefield, return a land you control to its owner's hand. {T}: Add {G}{U} to your mana pool.
-auto=moveTo(ownerhand) target(land)
-auto=tap
-auto={T}:addd:{G}{U}
-rarity=C
-[/card]
-[card]
 id=97078
 name=Simic Guildmage
 mana={GU}{GU}

projects/mtg/bin/Res/sets/EVE/_cards.dat

@@ -576,7 +576,7 @@ toughness=2
 text=When Noggle Bridgebreaker enters the battlefield, return a land you control to its owner's hand.
 id=158899
 name=Noggle Bridgebreaker
-auto=moveTo(ownerhand) target(land|myBattlefield)
+auto=moveTo(ownerhand) notatarget(land|myBattlefield)
 rarity=C
 mana={2}{UR}{UR}
 type=Creature

projects/mtg/bin/Res/sets/EXO/_cards.dat

@@ -426,6 +426,18 @@ toughness=1
 abilities=haste
 [/card]
 [card]
+text=When Ravenous Baboons enters the battlefield, destroy target nonbasic land.
+id=5207
+name=Ravenous Baboons
+mana={3}{R}
+type=Creature
+subtype=Ape
+auto=destroy target(land[-basic])
+power=2
+toughness=2
+rarity=R
+[/card]
+[card]
 text=Put target card from your graveyard on top of your library.
 target=*|mygraveyard
 auto=moveTo(myLibrary)
@@ -438,7 +450,6 @@ type=Sorcery
 [card]
 text=Sacrifice a creature, Return Recurring Nightmare to its owner's hand: Return target creature card from your graveyard to the battlefield. Activate this ability only any time you could cast a sorcery.
 auto={S(creature|myBattlefield)}:moveto(myhand) all(this) && moveto(myBattlefield) target(creature|mygraveyard) asSorcery
-
 id=6103
 name=Recurring Nightmare
 rarity=R
@@ -739,6 +750,7 @@ power=1
 toughness=3
 [/card]
 [card]
+###Wood Elves ability should stay optional ("may") because when you are searching for sth in your library, the official rules say that you don'T have to find anything even if there is a legal target!
 text=When Wood Elves enters the battlefield, search your library for a Forest card and put that card onto the battlefield. Then shuffle your library.
 auto=may moveTo(mybattlefield) target(forest|myLibrary)
 id=6135

projects/mtg/bin/Res/sets/EXO/todo.dat

@@ -480,20 +480,6 @@ text={X}{X}{B}: Destroy target nonblack creature with converted mana cost X.
 rarity=R
 [/card]
 [card]
-text=When Ravenous Baboons comes into play, destroy target nonbasic land.
-#"When [this] enters the battlefield ... target ..." abilities are not supported unless there is a "may" (Wagic 0.9)
-id=5207
-name=Ravenous Baboons
-target=land[-basic]
-mana={3}{R}
-type=Creature
-subtype=Ape
-auto=destroy
-power=2
-toughness=2
-rarity=R
-[/card]
-[card]
 id=6037
 name=Reaping the Rewards
 mana={W}

projects/mtg/bin/Res/sets/FUT/_cards.dat

@@ -456,6 +456,20 @@ rarity=U
 type=Land
 [/card]
 [card]
+text=Flash (You may cast this spell any time you could cast an instant.)   When Vedalken AEthermage enters the battlefield, return target Sliver to its owner's hand.   Wizardcycling {3} ({3}, Discard this card: Search your library for a Wizard card, reveal it, and put it into your hand. Then shuffle your library.)
+id=130325
+name=Vedalken AEthermage
+rarity=C
+mana={1}{U}
+type=Creature
+subtype=Vedalken Wizard
+autohand={3}{S}:moveTo(myhand) target(wizard|mylibrary)
+auto=moveto(ownerhand) target(sliver)
+power=1
+toughness=2
+abilities=flash
+[/card]
+[card]
 text=Whenever you cast a spell, creatures you control can't be the targets of spells or abilities your opponents control this turn.
 auto=@movedTo(*|mystack):lord(creature|myBattlefield) opponentshroud ueot
 id=136149

projects/mtg/bin/Res/sets/FUT/todo.dat

@@ -1290,19 +1290,6 @@ text=At the beginning of your upkeep, put a spore counter on Utopia Mycon. Remov
 rarity=U
 [/card]
 [card]
-id=130325
-name=Vedalken AEthermage
-mana={1}{U}
-type=Creature
-subtype=Vedalken Wizard
-power=1
-toughness=2
-text=Flash (You may play this spell any time you could play an instant.) When Vedalken AEthermage comes into play, return target Sliver to its owner's hand. Wizardcycling {3} ({3}, Discard this card: Search your library for a Wizard card, reveal it, and put it into your hand. Then shuffle your library.)
-abilities=flash
-autohand={3}{S}:moveTo(myhand) target(wizard|mylibrary)
-rarity=C
-[/card]
-[card]
 id=136209
 name=Venser, Shaper Savant
 mana={2}{U}{U}

projects/mtg/bin/Res/sets/GPT/_cards.dat

@@ -30,6 +30,19 @@ power=2
 toughness=3
 [/card]
 [card]
+text=Flying   When Angel of Despair enters the battlefield, destroy target permanent.
+id=83869
+name=Angel of Despair
+rarity=R
+mana={3}{W}{W}{B}{B}
+type=Creature
+subtype=Angel
+auto=destroy target(*)
+power=5
+toughness=5
+abilities=flying
+[/card]
+[card]
 text=Trample   Whenever Borborygmos deals combat damage to a player, put a +1/+1 counter on each creature you control.
 id=97229
 name=Borborygmos
@@ -230,8 +243,40 @@ id=96873
 auto=@movedto(this|graveyard) from(mybattlefield):draw:3
 name=Hatching Plans
 rarity=R
-type=Enchantment
 mana={1}{U}
+type=Enchantment
+[/card]
+[card]
+text=Gruul Turf enters the battlefield tapped.   When Gruul Turf enters the battlefield, return a land you control to its owner's hand.   {T}: Add {R}{G} to your mana pool.
+id=97223
+name=Gruul Turf
+auto=tap
+auto=moveTo(ownerhand) notatarget(land|mybattlefield)
+auto={T}:Add{R}{G}
+rarity=C
+type=Land
+[/card]
+[card]
+text=Izzet Boilerworks enters the battlefield tapped.   When Izzet Boilerworks enters the battlefield, return a land you control to its owner's hand.   {T}: Add {U}{R} to your mana pool.
+id=97220
+name=Izzet Boilerworks
+auto=tap
+auto=moveTo(ownerhand) notatarget(land|mybattlefield)
+auto={T}:Add{U}{R}
+rarity=C
+type=Land
+[/card]
+[card]
+text=When Izzet Chronarch enters the battlefield, return target instant or sorcery card from your graveyard to your hand.
+id=97202
+name=Izzet Chronarch
+rarity=C
+mana={3}{U}{R}
+type=Creature
+subtype=Human Wizard
+auto=moveTo(myhand) target(instant,sorcery|mygraveyard)
+power=2
+toughness=2
 [/card]
 [card]
 text={1}, {T}: Add {U}{R} to your mana pool.

projects/mtg/bin/Res/sets/GPT/todo.dat

@@ -21,22 +21,6 @@ text=Whenever ÁEherplasm blocks a creature, you may return ÁEherplasm to its o
 rarity=U
 [/card]
 [card]
-text=Flying   When Angel of Despair enters the battlefield, destroy target permanent.
-target=*
-#Does not work currently. "When ... enters the battlefield ... target..." does not work unless there is a "may" condition
-auto=destroy
-id=83869
-name=Angel of Despair
-color=White,Black
-rarity=R
-mana={3}{W}{W}{B}{B}
-type=Creature
-subtype=Angel
-power=5
-toughness=5
-abilities=flying
-[/card]
-[card]
 id=96964
 name=Battering Wurm
 mana={6}{G}
@@ -387,14 +371,6 @@ text=When Gruul Scrapper enters the battlefield, if {R} was spent to cast Gruul
 rarity=C
 [/card]
 [card]
-id=97223
-name=Gruul Turf
-mana=
-type=Land
-text=Gruul Turf enters the battlefield tapped. When Gruul Turf enters the battlefield, return a land you control to its owner's hand. {T}: Add {R}{G} to your mana pool.
-rarity=C
-[/card]
-[card]
 id=107098
 name=Gruul War Plow
 mana={4}
@@ -468,28 +444,6 @@ text=Choose one - Draw X cards; or Invoke the Firemind deals X damage to target
 rarity=R
 [/card]
 [card]
-id=97220
-name=Izzet Boilerworks
-mana=
-type=Land
-text=Izzet Boilerworks enters the battlefield tapped. When Izzet Boilerworks enters the battlefield, return a land you control to its owner's hand. {T}: Add {U}{R} to your mana pool.
-rarity=C
-[/card]
-[card]
-id=97202
-name=Izzet Chronarch
-mana={3}{U}{R}
-type=Creature
-subtype=Human Wizard
-power=2
-toughness=2
-text=When Izzet Chronarch enters the battlefield, return target instant or sorcery card from your graveyard to your hand.
-#"When [this] enters the battlefield ... target ..." abilities are not supported unless there is a "may" (Wagic 0.9)
-target=instant,sorcery
-auto=moveTo(myhand)
-rarity=C
-[/card]
-[card]
 id=96966
 name=Izzet Guildmage
 mana={(}{U}{/}{R}{)}{(}{U}{/}{R}{)}

projects/mtg/bin/Res/sets/ICE/_cards.dat

@@ -765,6 +765,19 @@ power=1
 toughness=1
 [/card]
 [card]
+text=When Kjeldoran Dead enters the battlefield, sacrifice a creature.   {B}: Regenerate Kjeldoran Dead.
+id=2461
+name=Kjeldoran Dead
+rarity=C
+mana={B}
+type=Creature
+subtype=Skeleton
+auto=bury notatarget(creature|myBattlefield)
+auto={B}:regenerate
+power=3
+toughness=1
+[/card]
+[card]
 text=Whenever Kjeldoran Frostbeast blocks or becomes blocked by a creature, destroy that creature at end of combat.
 id=2732
 alias=1267

projects/mtg/bin/Res/sets/ICE/todo.dat

@@ -1058,19 +1058,6 @@ subtype=Yeti
 toughness=3
 [/card]
 [card]
-text=When Kjeldoran Dead comes into play, sacrifice a creature.     {B}: Regenerate Kjeldoran Dead.
-id=2461
-auto=bury target(creature|myinplay)
-auto={B}:regenerate
-name=Kjeldoran Dead
-rarity=C
-type=Creature
-mana={B}
-power=3
-subtype=Skeleton
-toughness=1
-[/card]
-[card]
 text={T}: Target creature gets +2/+2 until end of turn. When that creature leaves play this turn, sacrifice Kjeldoran Elite Guard. Play this ability only during combat.
 id=2694
 name=Kjeldoran Elite Guard

projects/mtg/bin/Res/sets/INV/_cards.dat

@@ -181,6 +181,19 @@ mana={1}{B}{R}
 type=Instant
 [/card]
 [card]
+text=Kicker {1}{G} (You may pay an additional {1}{G} as you cast this spell.)  When Benalish Emissary enters the battlefield, if the kicker cost was paid, destroy target land.
+id=22948
+name=Benalish Emissary
+rarity=U
+mana={2}{W}
+kicker={1}{G}
+auto=kicker destroy target(land)
+type=Creature
+subtype=Human Wizard
+power=1
+toughness=4
+[/card]
+[card]
 text={3}{U},{T}: Draw a card.
 id=22947
 name=Benalish Heralds
@@ -430,6 +443,19 @@ toughness=2
 abilities=protection from black
 [/card]
 [card]
+text=Flying, protection from white   When Crypt Angel enters the battlefield, return target blue or red creature card from your graveyard to your hand.
+id=23320
+name=Crypt Angel
+auto=moveTo(myhand) target(creature[blue;red]|mygraveyard)
+rarity=R
+mana={4}{B}
+type=Creature
+subtype=Angel
+power=3
+toughness=3
+abilities=flying,protection from white 
+[/card]
+[card]
 text=Enchant creature   Enchanted creature gets -1/-1 and has fear.
 target=creature
 auto=-1/-1
@@ -1627,6 +1653,19 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
+text=Kicker {1}{B} (You may pay an additional {1}{B} as you cast this spell.)   When Shivan Emissary enters the battlefield, if the kicker cost was paid, destroy target nonblack creature. It can't be regenerated.
+id=23084
+name=Shivan Emissary
+rarity=U
+mana={2}{R}
+kicker={1}{B}
+auto=kicker bury target(creature[-black])
+type=Creature
+power=1
+subtype=Human Wizard
+toughness=1
+[/card]
+[card]
 text={1}{R}, Sacrifice a creature: Destroy target nonbasic land.
 auto={1}{R}{S(creature|mybattlefield)}:destroy target(land[-basic])
 id=23091
@@ -2004,7 +2043,7 @@ auto={T}:Add {W}
 type=Artifact
 [/card]
 [card]
-text=Tinder Farm enters the battlefield tapped.   {T}: Add {G} to your mana pool.    {T}, Sacrifice Geothermal Crevice: Add {R}{W} to your mana pool. 
+text=Tinder Farm enters the battlefield tapped.   {T}: Add {G} to your mana pool.   {T}, Sacrifice Geothermal Crevice: Add {R}{W} to your mana pool. 
 auto=tap
 auto={T}:Add {G}
 auto={T}{S}:Add {R}{W}
@@ -2014,6 +2053,20 @@ rarity=C
 type=Land
 [/card]
 [card]
+text=Kicker {1}{W} (You may pay an additional {1}{W} as you cast this spell.)   Flying   When Tolarian Emissary enters the battlefield, if the kicker cost was paid, destroy target enchantment.
+id=22991
+name=Tolarian Emissary
+rarity=U
+mana={2}{U}
+kicker={1}{W}
+auto=kicker destroy target(enchantment)
+type=Creature
+subtype=Human Wizard
+power=1
+toughness=2
+abilities=flying
+[/card]
+[card]
 text=Flying   {W}: Tower Drake gets +0/+1 until end of turn.
 id=22974
 name=Tower Drake
@@ -2121,14 +2174,27 @@ toughness=3
 abilities=flying,mustattack
 [/card]
 [card]
+text=Kicker {1}{U} (You may pay an additional {1}{U} as you cast this spell.)  When Urborg Emissary enters the battlefield, if the kicker cost was paid, return target permanent to its owner's hand.
+id=23038
+name=Urborg Emissary
+rarity=U
+mana={2}{B}
+kicker={1}{U}
+auto=kicker moveTo(ownerhand) target(*|battlefield))
+type=Creature
+subtype=Human Wizard
+power=3
+toughness=1
+[/card]
+[card]
 text=Other black creatures get -1/-1.
-auto=lord(creature[black]) -1/-1 other
 id=23035
 name=Urborg Shambler
 rarity=U
 mana={2}{B}{B}
 type=Creature
 subtype=Horror
+auto=lord(creature[black]) -1/-1 other
 power=4
 toughness=3
 [/card]
@@ -2173,6 +2239,19 @@ power=0
 toughness=2
 [/card]
 [card]
+text=Kicker {1}{R} (You may pay an additional {1}{R} as you cast this spell.)  When Verduran Emissary enters the battlefield, if the kicker cost was paid, destroy target artifact. It can't be regenerated.
+id=23127
+name=Verduran Emissary
+rarity=U
+mana={2}{G}
+kicker={1}{R}
+auto=kicker bury target(artifact)
+type=Creature
+subtype=Human Wizard
+power=2
+toughness=3
+[/card]
+[card]
 text={G}: Viashino Grappler gains trample until end of turn.
 id=22930
 name=Viashino Grappler

projects/mtg/bin/Res/sets/INV/todo.dat

@@ -102,17 +102,6 @@ type=Instant
 mana={1}{U}
 [/card]
 [card]
-text=Kicker {1}{G} (You may pay an additional {1}{G} as you play this spell.)  When Benalish Emissary comes into play, if the kicker cost was paid, destroy target land.
-id=22948
-name=Benalish Emissary
-rarity=U
-type=Creature
-mana={2}{W}
-power=1
-subtype=Human Wizard
-toughness=4
-[/card]
-[card]
 text=Each player separates all lands he or she controls into two piles. For each player, an opponent chooses a pile. Destroy all lands in the chosen piles. Tap all lands in the other piles.
 id=23099
 name=Bend or Break
@@ -224,21 +213,6 @@ subtype=Dragon
 toughness=6
 [/card]
 [card]
-text=Flying, protection from white. When Crypt Angel comes into play, return target blue or red creature card from your graveyard to your hand.
-id=23320
-name=Crypt Angel
-target=creature[blue;red]|mygraveyard
-#"When [this] enters the battlefield ... target ..." abilities are not supported unless there is a "may" (Wagic 0.9)
-auto=moveTo(myhand)
-rarity=R
-type=Creature
-mana={4}{B}
-power=3
-subtype=Angel
-toughness=3
-abilities=flying,protection from white 
-[/card]
-[card]
 text=Change the text of target spell or permanent by replacing all instances of one color word or basic land type with another until end of turn.       Draw a card.
 id=23008
 name=Crystal Spray
@@ -993,17 +967,6 @@ type=Enchantment
 mana={2}{U}{B}
 [/card]
 [card]
-text=Kicker {1}{B} (You may pay an additional {1}{B} as you play this spell.)  When Shivan Emissary comes into play, if the kicker cost was paid, destroy target nonblack creature. It can't be regenerated.
-id=23084
-name=Shivan Emissary
-rarity=U
-type=Creature
-mana={2}{R}
-power=1
-subtype=Human Wizard
-toughness=1
-[/card]
-[card]
 text=Kicker {R} (You may pay an additional {R} as you play this spell.)  Trample, haste     At end of turn, sacrifice Skizzik unless the kicker cost was paid.
 id=23096
 name=Skizzik
@@ -1188,17 +1151,6 @@ subtype=Merfolk Wizard
 toughness=1
 [/card]
 [card]
-text=Kicker {1}{W} (You may pay an additional {1}{W} as you play this spell.)    Flying       When Tolarian Emissary comes into play, if the kicker cost was paid, destroy target enchantment.
-id=22991
-name=Tolarian Emissary
-rarity=U
-type=Creature
-mana={2}{U}
-power=1
-subtype=Human Wizard
-toughness=2
-[/card]
-[card]
 text=Enchant creature     As Traveler's Cloak comes into play, choose a land type.     Enchanted creature has landwalk of the chosen type.     When Traveler's Cloak comes into play, draw a card.
 id=22987
 name=Traveler's Cloak
@@ -1273,17 +1225,6 @@ type=Sorcery
 mana={4}{B}{B}
 [/card]
 [card]
-text=Kicker {1}{U} (You may pay an additional {1}{U} as you play this spell.)  When Urborg Emissary comes into play, if the kicker cost was paid, return target permanent to its owner's hand.
-id=23038
-name=Urborg Emissary
-rarity=U
-type=Creature
-mana={2}{B}
-power=3
-subtype=Human Wizard
-toughness=1
-[/card]
-[card]
 text=Urborg Phantom can't block.     {U}: Prevent all combat damage that would be dealt to and dealt by Urborg Phantom this turn.
 id=23018
 name=Urborg Phantom
@@ -1328,17 +1269,6 @@ toughness=7
 rarity=R
 [/card]
 [card]
-text=Kicker {1}{R} (You may pay an additional {1}{R} as you play this spell.)  When Verduran Emissary comes into play, if the kicker cost was paid, destroy target artifact. It can't be regenerated.
-id=23127
-name=Verduran Emissary
-rarity=U
-type=Creature
-mana={2}{G}
-power=2
-subtype=Human Wizard
-toughness=3
-[/card]
-[card]
 text=Whenever Vicious Kavu attacks, it gets +2/+0 until end of turn.
 id=23151
 name=Vicious Kavu

projects/mtg/bin/Res/sets/JUD/_cards.dat

@@ -29,6 +29,19 @@ power=2
 toughness=2
 [/card]
 [card]
+text=Flying   When Aven Fogbringer enters the battlefield, return target land to its owner's hand.
+id=21275
+name=Aven Fogbringer
+rarity=C
+mana={3}{U}
+type=Creature
+subtype=Bird Wizard
+auto=moveTo(ownerhand) target(land|battlefield)
+power=2
+toughness=1
+abilities=flying
+[/card]
+[card]
 text=Minion creatures get +1/+1.   {B}{B}{B}, Exile Balthor the Defiled: Each player returns all black and all red creature cards from his or her graveyard to the battlefield.
 id=20842
 name=Balthor the Defiled
@@ -255,6 +268,18 @@ toughness=3
 abilities=flying
 [/card]
 [card]
+text=When Goretusk Firebeast enters the battlefield, it deals 4 damage to target player.
+id=34917
+name=Goretusk Firebeast
+rarity=C
+mana={5}{R}
+type=Creature
+subtype=Elemental Boar Beast
+auto=damage:4 target(player)
+power=2
+toughness=2
+[/card]
+[card]
 text=Target creature gets +1/+0 and gains first strike until end of turn.   Draw a card.
 id=36431
 target=creature
@@ -267,6 +292,18 @@ mana={1}{W}
 type=Instant
 [/card]
 [card]
+text=When Ironshell Beetle enters the battlefield, put a +1/+1 counter on target creature.
+id=34758
+name=Ironshell Beetle
+rarity=C
+mana={1}{G}
+type=Creature
+subtype=Insect
+auto=counter(1/1) target(creature)
+power=1
+toughness=1
+[/card]
+[card]
 text=First strike, haste.   {T}: Jeska, Warrior Adept deals 1 damage to target creature or player.
 id=36451
 name=Jeska, Warrior Adept
@@ -455,6 +492,18 @@ power=6
 toughness=6
 [/card]
 [card]
+text=Enchant creature   When Unquestioned Authority enters the battlefield, draw a card.   Enchanted creature has protection from creatures.
+id=24541
+target=creature
+auto=draw:1 controller
+auto=protection from(creature)
+name=Unquestioned Authority
+rarity=U
+mana={2}{W}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
 text=Threshold - As long as seven or more cards are in your graveyard, Vigilant Sentry gets +1/+1 and has "{T}: Target attacking or blocking creature gets +3/+3 until end of turn."
 id=36035
 name=Vigilant Sentry

projects/mtg/bin/Res/sets/JUD/todo.dat

@@ -41,17 +41,6 @@ text=Enchant creature (Target a creature as you cast this. This card enters the
 rarity=U
 [/card]
 [card]
-id=21275
-name=Aven Fogbringer
-mana={3}{U}
-type=Creature
-subtype=Bird Wizard
-power=2
-toughness=1
-text=Flying When Aven Fogbringer enters the battlefield, return target land to its owner's hand.
-rarity=C
-[/card]
-[card]
 id=34865
 name=Aven Warcraft
 mana={2}{W}
@@ -325,17 +314,6 @@ text=You may choose an artifact or enchantment card you own from outside the gam
 rarity=R
 [/card]
 [card]
-id=34917
-name=Goretusk Firebeast
-mana={5}{R}
-type=Creature
-subtype=Elemental Boar Beast
-power=2
-toughness=2
-text=When Goretusk Firebeast enters the battlefield, it deals 4 damage to target player.
-rarity=C
-[/card]
-[card]
 id=35161
 name=Grave Consequences
 mana={1}{B}
@@ -410,17 +388,6 @@ text=Enchant creature Enchanted creature gets +2/-1. When enchanted creature is
 rarity=U
 [/card]
 [card]
-id=34758
-name=Ironshell Beetle
-mana={1}{G}
-type=Creature
-subtype=Insect
-power=1
-toughness=1
-text=When Ironshell Beetle enters the battlefield, put a +1/+1 counter on target creature.
-rarity=C
-[/card]
-[card]
 id=36113
 name=Krosan Reclamation
 mana={1}{G}
@@ -863,15 +830,6 @@ text=Threshold - As long as seven or more cards are in your graveyard, Treachero
 rarity=C
 [/card]
 [card]
-id=24541
-name=Unquestioned Authority
-mana={2}{W}
-type=Enchantment
-subtype=Aura
-text=Enchant creature When Unquestioned Authority enters the battlefield, draw a card. Enchanted creature has protection from creatures.
-rarity=U
-[/card]
-[card]
 id=33719
 name=Valor
 mana={3}{W}

projects/mtg/bin/Res/sets/LRW/_cards.dat

@@ -606,6 +606,18 @@ subtype=Merfolk Wizard
 toughness=1
 [/card]
 [card]
+text=When Kinsbaile Skirmisher enters the battlefield, target creature gets +1/+1 until end of turn.
+auto=1/1 target(creature) ueot
+id=143018
+name=Kinsbaile Skirmisher
+rarity=C
+mana={1}{W}
+type=Creature
+subtype=Kithkin Soldier
+power=2
+toughness=2
+[/card]
+[card]
 text={G}, {T}: Target attacking creature gets +2/+2 until end of turn.
 auto={G}{T}:2/2 target(creature[attacking])
 id=139498
@@ -1076,6 +1088,18 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
+text=When Spiderwig Boggart enters the battlefield, target creature gains fear until end of turn.
+id=146445
+name=Spiderwig Boggart
+rarity=C
+mana={2}{B}
+type=Creature
+subtype=Goblin Shaman
+auto=fear target(creature) ueot
+power=2
+toughness=2
+[/card]
+[card]
 text={T}, Tap an untapped creature you control: Add one mana of any color to your mana pool.
 auto={T}:tap target(creature[-tapped]|myBattlefield) && Add{B}
 auto={T}:tap target(creature[-tapped]|myBattlefield) && Add{U}

projects/mtg/bin/Res/sets/LRW/todo.dat

@@ -961,20 +961,6 @@ subtype=Kithkin Soldier
 toughness=2
 [/card]
 [card]
-text=When Kinsbaile Skirmisher enters the battlefield, target creature gets +1/+1 until end of turn.
-#"When [this] enters the battlefield ... target ..." abilities are not supported unless there is a "may" (Wagic 0.9)
-target=creature
-auto=1/1 ueot
-id=143018
-name=Kinsbaile Skirmisher
-rarity=C
-type=Creature
-mana={1}{W}
-power=2
-subtype=Kithkin Soldier
-toughness=2
-[/card]
-[card]
 text=When Kithkin Harbinger comes into play, you may search your library for a Kithkin card, reveal it, then shuffle your library and put that card on top of it.
 id=139399
 name=Kithkin Harbinger
@@ -1490,20 +1476,6 @@ subtype=Faerie Wizard
 toughness=1
 [/card]
 [card]
-text=When Spiderwig Boggart enters the battlefield, target creature gains fear until end of turn.
-#"When [this] enters the battlefield ... target ..." abilities are not supported unless there is a "may" (Wagic 0.9)
-target=creature
-auto=fear ueot
-id=146445
-name=Spiderwig Boggart
-rarity=C
-type=Creature
-mana={2}{B}
-power=2
-subtype=Goblin Shaman
-toughness=2
-[/card]
-[card]
 text=Hideaway (This land comes into play tapped. When it does, look at the top four cards of your library, remove one from the game face down, then put the rest on the bottom of your library.)  {T}: Add {R} to your mana pool.     {R}, {T}: You may play the removed card without paying its mana cost if an opponent was dealt 7 or more damage this turn.
 id=139514
 name=Spinerock Knoll

projects/mtg/bin/Res/sets/M10/_cards.dat

@@ -4,6 +4,19 @@ name=Wagic 2010
 year=2009
 [/meta]
 [card]
+text=Deathtouch (Creatures dealt damage by this creature are destroyed. You can divide this creature's combat damage among any of the creatures blocking or blocked by it.)   When Acidic Slime enters the battlefield, destroy target artifact, enchantment, or land.
+id=189880
+name=Acidic Slime
+rarity=U
+mana={3}{G}{G}
+type=Creature
+subtype=Ooze
+auto=destroy target(artifact,enchantment,land)
+power=2
+toughness=2
+abilities=deathtouch
+[/card]
+[card]
 id=191082
 alias=129767
 name=Act of Treason
@@ -1716,6 +1729,18 @@ auto=@movedTo(creature|battlefield): life:1
 rarity=U
 [/card]
 [card]
+text=When Sparkmage Apprentice enters the battlefield, it deals 1 damage to target creature or player.
+id=191053
+name=Sparkmage Apprentice
+rarity=C
+mana={1}{R}
+type=Creature
+subtype=Human Wizard
+auto=damage:1 target(creature,player)
+power=1
+toughness=1
+[/card]
+[card]
 id=189899
 name=Stampeding Rhino
 mana={4}{G}

projects/mtg/bin/Res/sets/M10/todo.dat

@@ -1,15 +1,4 @@
 [card]
-id=189880
-name=Acidic Slime
-mana={3}{G}{G}
-type=Creature
-subtype=Ooze
-power=2
-toughness=2
-text=Deathtouch (Creatures dealt damage by this creature are destroyed. You can divide this creature's combat damage among any of the creatures blocking or blocked by it.) When Acidic Slime enters the battlefield, destroy target artifact, enchantment, or land.
-rarity=U
-[/card]
-[card]
 id=191239
 name=Ajani Goldmane
 mana={2}{W}{W}
@@ -439,20 +428,6 @@ auto=@each ??? upkeep:life:-1 targetController
 rarity=C
 [/card]
 [card]
-id=191053
-name=Sparkmage Apprentice
-target=creature,player
-mana={1}{R}
-type=Creature
-subtype=Human Wizard
-power=1
-toughness=1
-text=When Sparkmage Apprentice enters the battlefield, it deals 1 damage to target creature or player.
-#"When [this] enters the battlefield ... target ..." abilities are not supported unless there is a "may" (Wagic 0.9)
-auto=damage:1
-rarity=C
-[/card]
-[card]
 id=191338
 name=Spellbook
 mana={0}

projects/mtg/bin/Res/sets/MOR/_cards.dat

@@ -201,6 +201,18 @@ toughness=2
 abilities=reach
 [/card]
 [card]
+text=When Merrow Witsniper enters the battlefield, target player puts the top card of his or her library into his or her graveyard.
+id=152699
+name=Merrow Witsniper
+rarity=C
+mana={U}
+type=Creature
+subtype=Merfolk Rogue
+auto=deplete:1 target(player)
+power=1
+toughness=1
+[/card]
+[card]
 text=Target player discards X cards at random.
 id=157422
 target=player

projects/mtg/bin/Res/sets/MOR/todo.dat

@@ -510,7 +510,6 @@ toughness=4
 text=Whenever Lunk Errant attacks alone, it gets +1/+1 and gains trample until end of turn.
 rarity=C
 [/card]
-
 [card]
 id=152546
 name=Maralen of the Mornsong
@@ -533,21 +532,6 @@ toughness=3
 text=When Meadowboon leaves the battlefield, put a +1/+1 counter on each creature target player controls. Evoke {3}{W} (You may cast this spell for its evoke cost. If you do, it's sacrificed when it enters the battlefield.)
 rarity=U
 [/card]
-[card]
-id=152699
-name=Merrow Witsniper
-target=player
-mana={U}
-type=Creature
-subtype=Merfolk Rogue
-power=1
-toughness=1
-text=When Merrow Witsniper enters the battlefield, target player puts the top card of his or her library into his or her graveyard.
-#"When [this] enters the battlefield ... target ..." abilities are not supported unless there is a "may" (Wagic 0.9)
-auto=deplete:1
-rarity=C
-[/card]
-
 [card]
 id=143218
 name=Moonglove Changeling

projects/mtg/bin/Res/sets/MRD/_cards.dat

@@ -713,6 +713,19 @@ auto=haste
 subtype=Equipment
 [/card]
 [card]
+text=Flying   When Looming Hoverguard enters the battlefield, put target artifact on top of its owner's library.
+id=48114
+name=Looming Hoverguard
+rarity=U
+mana={4}{U}{U}
+type=Creature
+subtype=Drone
+auto=moveTo(ownerLibrary) target(artifact)
+power=3
+toughness=3
+abilities=flying
+[/card]
+[card]
 text={W}, {T}: Regenerate target artifact.
 auto={W}{T}:regenerate target(artifact)
 id=46071
@@ -739,13 +752,13 @@ subtype=Equipment
 [/card]
 [card]
 text=Flying   Whenever an artifact enters the battlefield under your control, you may tap target permanent.
-auto=@movedTo(artifact|myBattlefield):may tap target(*)
 id=45972
 name=Lumengrid Sentinel
 rarity=U
 mana={2}{U}
 type=Creature
 subtype=Human Wizard
+auto=@movedTo(artifact|myBattlefield):may tap target(*)
 power=1
 toughness=2
 abilities=flying
@@ -1097,6 +1110,18 @@ subtype=Ogre
 toughness=4
 [/card]
 [card]
+text=When Rustspore Ram enters the battlefield, destroy target Equipment.
+id=46138
+name=Rustspore Ram
+rarity=U
+mana={4}
+type=Artifact Creature
+subtype=Sheep
+auto=destroy target(equipment)
+power=1
+toughness=3
+[/card]
+[card]
 text=As Sculpting Steel enters the battlefield, you may choose an artifact on the battlefield. If you do, Sculpting Steel enters the battlefield as a copy of that artifact.
 auto=may copy notatarget(artifact)
 id=46720
@@ -1493,35 +1518,35 @@ mana={4}
 [/card]
 [card]
 text=(Tree of Tales isn't a spell.)  {T}: Add {G} to your mana pool.
-auto={T}:Add{G}
 id=46067
 name=Tree of Tales
+auto={T}:Add{G}
 rarity=C
 type=Land
 subtype=Artifact
 [/card]
 [card]
 text=Troll Ascetic can't be the target of spells or abilities your opponents control.     {1}{G}: Regenerate Troll Ascetic. (The next time this creature would be destroyed this turn, it isn't. Instead tap it, remove all damage from it, and remove it from combat.)
-auto={1}{G}:regenerate
 id=49828
 name=Troll Ascetic
 rarity=R
 mana={1}{G}{G}
 type=Creature
 subtype=Troll Shaman
+auto={1}{G}:regenerate
 power=3
 toughness=2
 abilities=opponentshroud
 [/card]
 [card]
 text={1}{G}: Regenerate target green creature.
-auto={1}{G}:regenerate target(creature[green])
 id=46117
 name=Trolls of Tel-Jilad
 rarity=U
 mana={5}{G}{G}
 type=Creature
 subtype=Troll Shaman
+auto={1}{G}:regenerate target(creature[green])
 power=5
 toughness=6
 [/card]
@@ -1538,39 +1563,51 @@ type=Instant
 [/card]
 [card]
 text=(Vault of Whispers isn't a spell.)  {T}: Add {B} to your mana pool.
-auto={T}:Add{B}
 id=46065
 name=Vault of Whispers
+auto={T}:Add{B}
 rarity=C
 type=Land
 subtype=Artifact
 [/card]
 [card]
 text=Whenever you cast an artifact spell, draw a card.
-auto=@movedTo(artifact|mystack):draw:1 controller
 id=46557
 name=Vedalken Archmage
 rarity=R
 mana={2}{U}{U}
 type=Creature
 subtype=Vedalken Wizard
+auto=@movedTo(artifact|mystack):draw:1 controller
 power=0
 toughness=2
 [/card]
 [card]
 text=Whenever an artifact enters the battlefield, Vermiculos gets +4/+4 until end of turn.
-auto=@movedTo(artifact|myBattlefield):4/4 ueot
 id=47936
 name=Vermiculos
 rarity=R
 mana={4}{B}
 type=Creature
 subtype=Horror
+auto=@movedTo(artifact|myBattlefield):4/4 ueot
 power=1
 toughness=1
 [/card]
 [card]
-text=Equipped creature gets +3/+3.     Equip {3} ({3}: Attach to target creature you control. Equip only as a sorcery. This card comes into play unattached and stays in play if the creature leaves play.)
+text=When Viridian Shaman enters the battlefield, destroy target artifact.
+id=46119
+name=Viridian Shaman
+rarity=U
+mana={2}{G}
+type=Creature
+subtype=Elf Shaman
+auto=destroy target(artifact)
+power=2
+toughness=2
+[/card]
+[card]
+text=Equipped creature gets +3/+3.   Equip {3} ({3}: Attach to target creature you control. Equip only as a sorcery. This card comes into play unattached and stays in play if the creature leaves play.)
 id=48121
 name=Vulshok Battlegear
 rarity=U

projects/mtg/bin/Res/sets/MRD/todo.dat

@@ -615,21 +615,6 @@ subtype=Myr
 toughness=2
 [/card]
 [card]
-text=Flying. When Looming Hoverguard enters the battlefield, put target artifact on top of its owner's library.
-target=artifact
-#does not work. "When ...enters the battlefield ... target..." does not work unless there is a "may"
-auto=moveTo(ownerLibrary)
-id=48114
-name=Looming Hoverguard
-rarity=U
-mana={4}{U}{U}
-type=Creature
-subtype=Drone
-power=3
-toughness=3
-abilities=flying
-[/card]
-[card]
 text=At the beginning of your upkeep, the player with the lowest life total gains control of Loxodon Peacekeeper. If two or more players are tied for lowest life total, you choose one of them, and that player gains control of Loxodon Peacekeeper.
 id=48180
 name=Loxodon Peacekeeper
@@ -651,7 +636,6 @@ power=2
 subtype=Elephant Soldier
 toughness=2
 [/card]
-
 [card]
 text={1}, {T}: Target player draws a card, then discards a card. If that player discards an artifact card this way, untap Lumengrid Augur.
 id=47791
@@ -663,8 +647,6 @@ power=2
 subtype=Vedalken Wizard
 toughness=2
 [/card]
-
-
 [card]
 text=Each noncreature artifact is an artifact creature with power and toughness each equal to its converted mana cost. (Equipment that's a creature can't equip a creature.)
 id=46699
@@ -682,7 +664,6 @@ type=Artifact
 mana={2}
 subtype=Equipment
 [/card]
-
 [card]
 text=Whenever a permanent becomes untapped, that permanent's controller puts the top card of his or her library into his or her graveyard.
 id=30008
@@ -1048,17 +1029,6 @@ subtype=Elemental
 toughness=4
 [/card]
 [card]
-text=When Rustspore Ram comes into play, destroy target Equipment.
-id=46138
-name=Rustspore Ram
-rarity=U
-type=Artifact Creature
-mana={4}
-power=1
-subtype=Sheep
-toughness=3
-[/card]
-[card]
 text=Flash     Affinity for artifacts (This spell costs {1} less to play for each artifact you control.)  {T}: Target creature gets +0/+1 until end of turn.
 id=48400
 name=Scale of Chiss-Goria
@@ -1074,7 +1044,6 @@ rarity=U
 type=Artifact
 mana={1}
 [/card]
-
 [card]
 text=Equipped creature gets +2/+2.     Whenever a creature dealt damage by equipped creature this turn is put into a graveyard, return that card to play under your control. Attach Scythe of the Wretched to that creature.     Equip {4}
 id=49048
@@ -1084,7 +1053,6 @@ type=Artifact
 mana={2}
 subtype=Equipment
 [/card]
-
 [card]
 text=Each player returns to play all artifact, creature, enchantment, and land cards that were put into his or her graveyard from play this turn.
 id=49009
@@ -1093,7 +1061,6 @@ rarity=R
 type=Instant
 mana={1}{W}{W}
 [/card]
-
 [card]
 text=Whenever Serum Tank or another artifact comes into play, put a charge counter on Serum Tank.     {3}, {T}, Remove a charge counter from Serum Tank: Draw a card.
 id=46156
@@ -1110,7 +1077,6 @@ rarity=R
 type=Enchantment
 mana={4}{U}
 [/card]
-
 [card]
 text=As an additional cost to play Shrapnel Blast, sacrifice an artifact. Shrapnel Blast deals 5 damage to target creature or player.
 id=49835
@@ -1119,8 +1085,6 @@ rarity=U
 type=Instant
 mana={1}{R}
 [/card]
-
-
 [card]
 text=As long as Skyhunter Cub is equipped, it gets +1/+1 and has flying.
 id=48046
@@ -1132,7 +1096,6 @@ power=2
 subtype=Cat Knight
 toughness=2
 [/card]
-
 [card]
 text=Whenever Slith Strider becomes blocked, draw a card.     Whenever Slith Strider deals combat damage to a player, put a +1/+1 counter on it.
 id=46080
@@ -1152,8 +1115,6 @@ rarity=R
 type=Sorcery
 mana={4}{W}{W}
 [/card]
-
-
 [card]
 text=Affinity for artifacts (This spell costs {1} less to play for each artifact you control.)  Flying
 id=45973
@@ -1223,7 +1184,6 @@ name=Stalking Stones
 rarity=U
 type=Land
 [/card]
-
 [card]
 text=Whenever you're dealt damage, put that many charge counters on Sun Droplet.     At the beginning of each upkeep, you may remove a charge counter from Sun Droplet. If you do, you gain 1 life.
 id=48931
@@ -1241,7 +1201,6 @@ type=Legendary Artifact
 mana={4}
 subtype=Equipment
 [/card]
-
 [card]
 text={2}, {T}: Remove target permanent you control from the game.     {2}, Sacrifice Synod Sanctum: Return to play under your control all cards removed from the game with Synod Sanctum.
 id=46719
@@ -1261,7 +1220,6 @@ power=2
 subtype=Cat Soldier
 toughness=3
 [/card]
-
 [card]
 text=Whenever a player plays a creature spell, that player adds {G} to his or her mana pool.
 id=49767
@@ -1272,7 +1230,6 @@ rarity=R
 type=Artifact
 mana={3}
 [/card]
-
 [card]
 text={T}: Put target permanent you own on the bottom of your library.
 id=46729
@@ -1289,7 +1246,6 @@ rarity=R
 type=Sorcery
 mana={5}{U}{U}
 [/card]
-
 [card]
 text=Draw three cards. Then discard two cards unless you discard an artifact card.
 id=45978
@@ -1322,7 +1278,6 @@ rarity=R
 type=Artifact
 mana={5}
 [/card]
-
 [card]
 text=Choose one - Search your library for up to two creature cards, reveal them, put them into your hand, then shuffle your library; or put up to two creature cards from your hand into play.     Entwine {2} (Choose both if you pay the entwine cost.)
 id=48122
@@ -1379,20 +1334,6 @@ mana={1}
 subtype=Equipment
 [/card]
 [card]
-text=When Viridian Shaman comes into play, destroy target artifact.
-target=artifact
-#"when ... comes into play .. target..." are not supported unless there is a "may"
-auto=destroy
-id=46119
-name=Viridian Shaman
-rarity=U
-type=Creature
-mana={2}{G}
-power=2
-subtype=Elf Shaman
-toughness=2
-[/card]
-[card]
 text=Equipped creature has trample and can't be blocked by more than one creature.     Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery. This card comes into play unattached and stays in play if the creature leaves play.)
 id=46053
 name=Vorrac Battlehorns

projects/mtg/bin/Res/sets/ODY/_cards.dat

@@ -115,6 +115,19 @@ toughness=2
 abilities=flying
 [/card]
 [card]
+text=Flying (This creature can't be blocked except by creatures with flying or reach.)   When Aven Cloudchaser enters the battlefield, destroy target enchantment.
+id=29694
+name=Aven Cloudchaser
+rarity=C
+mana={3}{W}
+type=Creature
+subtype=Bird Soldier
+auto=destroy target(enchantment)
+power=2
+toughness=2
+abilities=flying
+[/card]
+[card]
 text=Flying (This creature can't be blocked except by creatures with flying or reach.)  When Aven Fisher is put into a graveyard from play, you may draw a card.
 auto=@movedTo(this|graveyard) from(battlefield):may draw:1
 id=31815

projects/mtg/bin/Res/sets/ODY/todo.dat

@@ -75,21 +75,6 @@ type=Instant
 mana={1}{U}
 [/card]
 [card]
-text=Flying (This creature can't be blocked except by creatures with flying or reach.)   When Aven Cloudchaser comes into play, destroy target enchantment.
-id=29694
-name=Aven Cloudchaser
-target=enchantment
-#"When [this] enters the battlefield ... target ..." abilities are not supported unless there is a "may" (Wagic 0.9)
-abilities=flying
-auto=destroy
-rarity=C
-type=Creature
-mana={3}{W}
-power=2
-subtype=Bird Soldier
-toughness=2
-[/card]
-[card]
 text=Whenever a player plays a spell, that player gains X life, where X is the number of cards in all graveyards with the same name as that spell.
 id=29923
 name=Aven Shrine

projects/mtg/bin/Res/sets/ONS/_cards.dat

@@ -4,6 +4,18 @@ year=2002
 block=Slaughter
 [/meta]
 [card]
+text=When Accursed Centaur enters the battlefield, sacrifice a creature.
+id=26715
+name=Accursed Centaur
+rarity=C
+mana={B}
+type=Creature
+subtype=Zombie Centaur
+auto=bury notatarget(creature|myBattlefield)
+power=2
+toughness=2
+[/card]
+[card]
 text=Whenever a Beast enters the battlefield under your control, you may have it deal 4 damage to target opponent.
 auto=@movedTo(beast|myBattlefield):may damage:4 opponent
 id=12425

projects/mtg/bin/Res/sets/ONS/todo.dat

@@ -1,17 +1,4 @@
 [card]
-text=When Accursed Centaur enters the battlefield, sacrifice a creature.
-target=creature[myBattlefield] ## this is different from r954, this is wrong, destroy and sacrifce is different.
-auto=destroy
-id=26715
-name=Accursed Centaur
-mana={B}
-type=Creature
-subtype=Zombie Centaur
-power=2
-toughness=2
-rarity=C
-[/card]
-[card]
 id=40195
 name=Aggravated Assault
 mana={2}{R}

projects/mtg/bin/Res/sets/P02/_cards.dat

@@ -269,6 +269,18 @@ mana={B}
 type=Sorcery
 [/card]
 [card]
+text={T}: Return Coastal Wizard and another target creature to their owners' hands. Activate this ability only during your turn, before attackers are declared.
+id=6544
+name=Coastal Wizard
+rarity=R
+mana={2}{U}{U}
+type=Creature
+subtype=Human Wizard
+auto={T}:moveTo(ownerhand) all(this) && moveTo(ownerhand) target(creature) myTurnOnly
+power=1
+toughness=1
+[/card]
+[card]
 text=Flying
 id=6553
 name=Dakmor Bat
@@ -393,6 +405,19 @@ type=Basic Land
 subtype=Forest
 [/card]
 [card]
+text=Flying   When Foul Spirit enters the battlefield, sacrifice a land.
+id=6568
+name=Foul Spirit
+rarity=U
+mana={2}{B}
+type=Creature
+subtype=Spirit
+auto=bury notatarget(land|myBattlefield)
+power=3
+toughness=2
+abilities=flying
+[/card]
+[card]
 id=6587
 name=Goblin Cavaliers
 rarity=C
@@ -713,6 +738,18 @@ power=4
 toughness=4
 [/card]
 [card]
+text=When Ogre Arsonist enters the battlefield, destroy target land.
+id=6595
+name=Ogre Arsonist
+rarity=U
+mana={4}{R}
+type=Creature
+subtype=Ogre
+auto=destroy target(lad)
+power=3
+toughness=3
+[/card]
+[card]
 text=Haste
 id=6586
 name=Ogre Berserker

projects/mtg/bin/Res/sets/P02/todo.dat

@@ -51,17 +51,6 @@ text=Flying When Angel of Fury is put into your graveyard from the battlefield,
 rarity=R
 [/card]
 [card]
-id=6544
-name=Coastal Wizard
-mana={2}{U}{U}
-type=Creature
-subtype=Human Wizard
-power=1
-toughness=1
-text={T}: Return Coastal Wizard and another target creature to their owners' hands. Activate this ability only during your turn, before attackers are declared.
-rarity=R
-[/card]
-[card]
 id=6570
 name=Coercion
 mana={2}{B}
@@ -124,17 +113,6 @@ text=Look at the top card of target player's library. You may put that card into
 rarity=U
 [/card]
 [card]
-id=6568
-name=Foul Spirit
-mana={2}{B}
-type=Creature
-subtype=Spirit
-power=3
-toughness=2
-text=Flying When Foul Spirit enters the battlefield, sacrifice a land.
-rarity=U
-[/card]
-[card]
 id=6604
 name=Goblin General
 mana={1}{R}{R}
@@ -245,17 +223,6 @@ text=Whenever Norwood Warrior becomes blocked, it gets +1/+1 until end of turn.
 rarity=C
 [/card]
 [card]
-id=6595
-name=Ogre Arsonist
-mana={4}{R}
-type=Creature
-subtype=Ogre
-power=3
-toughness=3
-text=When Ogre Arsonist enters the battlefield, destroy target land.
-rarity=U
-[/card]
-[card]
 id=6550
 name=Piracy
 mana={U}{U}

projects/mtg/bin/Res/sets/PCY/_cards.dat

@@ -17,9 +17,9 @@ toughness=1
 [/card]
 [card]
 text=Flash   Enchant creature   Enchanted creature has shroud. (It can't be the target of spells or abilities.)
+id=24579
 target=creature
 auto=shroud
-id=24579
 name=Alexi's Cloak
 rarity=C
 mana={1}{U}
@@ -132,22 +132,22 @@ toughness=2
 [/card]
 [card]
 text=Fen Stalker has fear as long as you control no untapped lands.
-auto=aslongas(land[-tapped]|myBattlefield) -fear
 id=24602
 name=Fen Stalker
 rarity=C
 mana={3}{B}
 type=Creature
 subtype=Nightstalker
+auto=aslongas(land[-tapped]|myBattlefield) -fear
 power=3
 toughness=2
 abilities=fear
 [/card]
 [card]
 text=Flash   Enchant creature   Enchanted creature -3/-0.
+id=24604
 target=creature
 auto=-3/-0
-id=24604
 name=Greel's Caress
 rarity=C
 mana={1}{B}
@@ -168,6 +168,16 @@ power=1
 toughness=1
 [/card]
 [card]
+text=As Heightened Awareness enters the battlefield, discard your hand. At the beginning of your draw step, draw an additional card.
+id=24594
+auto=moveTo(mygraveyard) all(*|myhand)
+auto=@each my draw:draw:1
+name=Heightened Awareness
+rarity=R
+mana={3}{U}{U}
+type=Enchantment
+[/card]
+[card]
 text=Flash   Enchant creature   
 target=creature
 auto={1}{G}:regenerate

projects/mtg/bin/Res/sets/PCY/todo.dat

@@ -341,14 +341,6 @@ text=When Gulf Squid enters the battlefield, tap all lands target player control
 rarity=C
 [/card]
 [card]
-id=24594
-name=Heightened Awareness
-mana={3}{U}{U}
-type=Enchantment
-text=As Heightened Awareness enters the battlefield, discard your hand. At the beginning of your draw step, draw an additional card.
-rarity=R
-[/card]
-[card]
 id=24679
 name=Hollow Warrior
 mana={4}

projects/mtg/bin/Res/sets/PLC/_cards.dat

@@ -686,4 +686,17 @@ auto=@damaged(player) from(this):cloud
 power=6
 toughness=6
 abilities=flying
+[/card]
+[card]
+text=Flash (You may cast this spell any time you could cast an instant.)   When Whitemane Lion enters the battlefield, return a creature you control to its owner's hand.
+id=122477
+name=Whitemane Lion
+rarity=C
+mana={1}{W}
+type=Creature
+subtype=Cat
+auto=moveTo(ownerhand) notatarget(creature|myBattlefield)
+power=2
+toughness=2
+abilities=flash
 [/card]

projects/mtg/bin/Res/sets/PLC/todo.dat

@@ -1090,18 +1090,4 @@ mana={2}{U}
 type=Sorcery
 text=Target player draws two cards, then discards four cards.
 rarity=C
-[/card]
-[card]
-id=122477
-name=Whitemane Lion
-mana={1}{W}
-type=Creature
-subtype=Cat
-power=2
-toughness=2
-text=Flash (You may cast this spell any time you could cast an instant.) When Whitemane Lion enters the battlefield, return a creature you control to its owner's hand.
-target=creature|myinplay
-auto=moveTo(ownerhand)
-abilities=flash
-rarity=C
 [/card]

projects/mtg/bin/Res/sets/PLS/_cards.dat

@@ -52,6 +52,20 @@ mana={1}{W}
 type=Instant
 [/card]
 [card]
+text=Flying   When Cavern Harpy enters the battlefield, return a blue or black creature you control to its owner's hand.   Pay 1 life: Return Cavern Harpy to its owner's hand.
+id=25926
+name=Cavern Harpy
+rarity=C
+mana={U}{B}
+type=Creature
+subtype=Harpy Beast
+auto=moveTo(ownerhand) notatarget(creature[blue;black]|myBattlefield)
+auto={0}:moveTo(ownerhand) && life:-1 controller
+power=2
+toughness=1
+abilities=flying
+[/card]
+[card]
 text=Choose one - Return target permanent to its owner's hand; or destroy target nonblack creature, and it can't be regenerated; or destroy target artifact.
 id=25863
 name=Crosis's Charm
@@ -164,6 +178,31 @@ mana={4}{B}
 type=Sorcery
 [/card]
 [card]
+text=When Flametongue Kavu enters the battlefield, it deals 4 damage to target creature.
+id=26262
+name=Flametongue Kavu
+rarity=U
+mana={3}{R}
+type=Creature
+subtype=Kavu
+auto=damage:4 target(creature)
+power=4
+toughness=2
+[/card]
+[card]
+text=Flash   When Fleetfoot Panther enters the battlefield, return a green or white creature you control to its owner's hand.
+id=26479
+name=Fleetfoot Panther
+rarity=U
+mana={1}{G}{W}
+type=Creature
+subtype=Cat
+auto=moveTo(ownerhand) notatarget(creature[green;white]|myBattlefield)
+power=3
+toughness=4
+abilities=flash
+[/card]
+[card]
 text=Forsaken City doesn't untap during your untap step. At the beginning of your upkeep, you may exile a card from your hand. If you do, untap Forsaken City.   {T}: Add one mana of any color to your mana pool.
 id=25893
 name=Forsaken City
@@ -214,18 +253,43 @@ type=Instant
 [/card]
 [card]
 text=When Honorable Scout enters the battlefield, you gain 2 life for each black and/or red creature target opponent controls.
+auto=foreach(creature[black]|opponentBattlefield) life:2 controller
+auto=foreach(creature[red]|opponentBattlefield) life:2 controller
 id=26263
 name=Honorable Scout
 rarity=C
 mana={W}
 type=Creature
 subtype=Human Soldier Scout
-auto=foreach(creature[black]|opponentBattlefield) life:2 controller
-auto=foreach(creature[red]|opponentBattlefield) life:2 controller
 power=1
 toughness=1
 [/card]
 [card]
+text=When Horned Kavu enters the battlefield, return a red or green creature you control to its owner's hand.
+id=25928
+name=Horned Kavu
+rarity=C
+mana={R}{G}
+type=Creature
+subtype=Kavu
+auto=moveTo(ownerhand) notatarget(creature[red;green]|myBattlefield)
+power=3
+toughness=4
+[/card]
+[card]
+text=Flying   When Hunting Drake enters the battlefield, put target red or green creature on top of its owner's library.
+id=22980
+name=Hunting Drake
+rarity=C
+mana={4}{U}
+type=Creature
+subtype=Drake
+auto=moveTo(ownerLibrary) target(creature[red;green]|battlefield)
+power=2
+toughness=2
+abilities=flying
+[/card]
+[card]
 text=Destroy target land.   Draw a card.
 id=26260
 target=land
@@ -261,6 +325,19 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
+text=When Lava Zombie enters the battlefield, return a black or red creature you control to its owner's hand.   {2}: Lava Zombie gets +1/+0 until end of turn.
+id=25927
+name=Lava Zombie
+rarity=C
+mana={1}{B}{R}
+type=Creature
+subtype=Zombie
+auto=moveTo(ownerhand) notatarget(creature[black;red]|myBattlefield)
+auto={2}:1/0
+power=4
+toughness=3
+[/card]
+[card]
 text=Other Zombie creatures get +1/+1.   {1}{B}, {T}: Return target Zombie card from your graveyard to your hand.
 id=10742
 name=Lord of the Undead
@@ -429,6 +506,19 @@ power=2
 toughness=3
 [/card]
 [card]
+text=Trample   When Shivan Wurm enters the battlefield, return a red or green creature you control to its owner's hand.
+id=25924
+name=Shivan Wurm
+rarity=R
+mana={3}{R}{G}
+type=Creature
+subtype=Wurm
+auto=moveTo(ownerhand) notatarget(creature[red;green]|myBattlefield)
+power=7
+toughness=7
+abilities=trample
+[/card]
+[card]
 text=Target creature gains fear until end of turn.
 id=27229
 target=creature
@@ -439,6 +529,19 @@ mana={1}{B}
 type=Instant
 [/card]
 [card]
+text=Flying   When Silver Drake enters the battlefield, return a white or blue creature you control to its owner's hand.
+id=25925
+name=Silver Drake
+rarity=C
+mana={1}{W}{U}
+type=Creature
+subtype=Drake
+auto=moveTo(ownerhand) notatarget(creature[white;blue]|myBattlefield)
+power=3
+toughness=3
+abilities=flying
+[/card]
+[card]
 text=Lands gain shroud until end of turn. (They can't be the targets of spells or abilities.)   Draw a card.
 id=26402
 auto=lord(land) shroud
@@ -472,6 +575,19 @@ power=2
 toughness=2
 [/card]
 [card]
+text=When Sparkcaster enters the battlefield, return a red or green creature you control to its owner's hand.   When Sparkcaster enters the battlefield, it deals 1 damage to target player.
+id=25935
+name=Sparkcaster
+rarity=U
+mana={2}{R}{G}
+type=Creature
+subtype=Kavu
+auto=moveTo(ownerhand) notatarget(creature[red;green]|myBattlefield)
+auto=damage:1 opponent
+power=5
+toughness=3
+[/card]
+[card]
 text=Star Compass enters the battlefield tapped.   {T}: Add to your mana pool one mana of any color a basic land you control could produce.
 id=25880
 name=Star Compass
@@ -486,6 +602,19 @@ auto=aslongas(mountain|myBattlefield) {T}:Add {R}
 auto=aslongas(forest|myBattlefield) {T}:Add {G}
 [/card]
 [card]
+text=First strike   When Steel Leaf Paladin enters the battlefield, return a green or white creature you control to its owner's hand.
+id=25929
+name=Steel Leaf Paladin
+rarity=C
+mana={4}{G}{W}
+type=Creature
+subtype=Elf Knight
+auto=moveTo(ownerhand) notatarget(creature[green;white]|myBattlefield)
+power=4
+toughness=4
+abilities=first strike
+[/card]
+[card]
 text={R}: Stone Kavu gets +1/+0 until end of turn.   {W}: Stone Kavu gets +0/+1 until end of turn.
 id=26377
 name=Stone Kavu

projects/mtg/bin/Res/sets/PLS/todo.dat

@@ -40,17 +40,6 @@ text=Kicker—Sacrifice two lands. (You may sacrifice two lands in addition to a
 rarity=C
 [/card]
 [card]
-id=25926
-name=Cavern Harpy
-mana={U}{B}
-type=Creature
-subtype=Harpy Beast
-power=2
-toughness=1
-text=Flying When Cavern Harpy enters the battlefield, return a blue or black creature you control to its owner's hand. Pay 1 life: Return Cavern Harpy to its owner's hand.
-rarity=C
-[/card]
-[card]
 id=25899
 name=Cloud Cover
 mana={2}{W}{U}
@@ -67,22 +56,30 @@ text=Counter target spell that targets one or more creatures.  Draw a card.
 rarity=C
 [/card]
 [card]
+###Not 100% codable! 0.10.1
+text=When Crosis's Catacombs enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand.   {T}: Add {U}, {B}, or {R} to your mana pool.
 id=25936
 name=Crosis's Catacombs
-mana=
+auto=moveTo(ownerhand) notatarget(land[-lair]|myBattlefield)
+auto={T}:Add{U}
+auto={T}:Add{B}
+auto={T}:Add{R}
+rarity=U
 type=Land
 subtype=Lair
-text=When Crosis's Catacombs enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand. {T}: Add {U}, {B}, or {R} to your mana pool.
-rarity=U
 [/card]
 [card]
+###Not 100% codable! 0.10.1
+text=When Darigaaz's Caldera enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand.   {T}: Add {B}, {R}, or {G} to your mana pool.
 id=25938
 name=Darigaaz's Caldera
-mana=
+rarity=U
+auto=moveTo(ownerhand) notatarget(land[-lair]|myBattlefield)
+auto={T}:Add{B}
+auto={T}:Add{R}
+auto={T}:Add{G}
 type=Land
 subtype=Lair
-text=When Darigaaz's Caldera enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand. {T}: Add {B}, {R}, or {G} to your mana pool.
-rarity=U
 [/card]
 [card]
 id=26414
@@ -169,13 +166,17 @@ text=Kicker—{2}{B}, Discard a creature card. (You may pay {2}{B} and discard a
 rarity=R
 [/card]
 [card]
+###Not 100% codable! 0.10.1
+text=When Dromar's Cavern enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand.   {T}: Add {W}, {U}, or {B} to your mana pool.
 id=25932
 name=Dromar's Cavern
-mana=
+auto=moveTo(ownerhand) notatarget(land[-lair]|myBattlefield)
+auto={T}:Add{W}
+auto={T}:Add{U}
+auto={T}:Add{B}
+rarity=U
 type=Land
 subtype=Lair
-text=When Dromar's Cavern enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand. {T}: Add {W}, {U}, or {B} to your mana pool.
-rarity=U
 [/card]
 [card]
 id=26590
@@ -194,28 +195,6 @@ text=Kicker—Sacrifice a land. (You may sacrifice a land in addition to any oth
 rarity=C
 [/card]
 [card]
-id=26262
-name=Flametongue Kavu
-mana={3}{R}
-type=Creature
-subtype=Kavu
-power=4
-toughness=2
-text=When Flametongue Kavu enters the battlefield, it deals 4 damage to target creature.
-rarity=U
-[/card]
-[card]
-id=26479
-name=Fleetfoot Panther
-mana={1}{G}{W}
-type=Creature
-subtype=Cat
-power=3
-toughness=4
-text=Flash When Fleetfoot Panther enters the battlefield, return a green or white creature you control to its owner's hand.
-rarity=U
-[/card]
-[card]
 id=26411
 name=Gaea's Herald
 mana={1}{G}
@@ -264,17 +243,6 @@ text=Enchant creature When Hobble enters the battlefield, draw a card. Enchanted
 rarity=C
 [/card]
 [card]
-id=25928
-name=Horned Kavu
-mana={R}{G}
-type=Creature
-subtype=Kavu
-power=3
-toughness=4
-text=When Horned Kavu enters the battlefield, return a red or green creature you control to its owner's hand.
-rarity=C
-[/card]
-[card]
 id=25872
 name=Hull Breach
 mana={R}{G}
@@ -283,17 +251,6 @@ text=Choose one - Destroy target artifact; or destroy target enchantment; or des
 rarity=C
 [/card]
 [card]
-id=22980
-name=Hunting Drake
-mana={4}{U}
-type=Creature
-subtype=Drake
-power=2
-toughness=2
-text=Flying When Hunting Drake enters the battlefield, put target red or green creature on top of its owner's library.
-rarity=C
-[/card]
-[card]
 id=26268
 name=Kavu Recluse
 mana={2}{R}
@@ -321,17 +278,6 @@ text=When Lashknife Barrier enters the battlefield, draw a card. If a source wou
 rarity=U
 [/card]
 [card]
-id=25927
-name=Lava Zombie
-mana={1}{B}{R}
-type=Creature
-subtype=Zombie
-power=4
-toughness=3
-text=When Lava Zombie enters the battlefield, return a black or red creature you control to its owner's hand. {2}: Lava Zombie gets +1/+0 until end of turn.
-rarity=C
-[/card]
-[card]
 id=25944
 name=Magma Burst
 mana={3}{R}
@@ -593,13 +539,17 @@ mana={R}{G}{W}
 type=Instant
 [/card]
 [card]
+###Not 100% codable! 0.10.1
+text=When Rith's Grove enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand.   {T}: Add {R}, {G}, or {W} to your mana pool.
 id=25939
 name=Rith's Grove
-mana=
+auto=moveTo(ownerhand) notatarget(land[-lair]|myBattlefield)
+auto={T}:Add{R}
+auto={T}:Add{G}
+auto={T}:Add{W}
+rarity=U
 type=Land
 subtype=Lair
-text=When Rith's Grove enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand. {T}: Add {R}, {G}, or {W} to your mana pool.
-rarity=U
 [/card]
 [card]
 id=25942
@@ -662,28 +612,6 @@ text=As Shifting Sky enters the battlefield, choose a color. All nonland permane
 rarity=U
 [/card]
 [card]
-id=25924
-name=Shivan Wurm
-mana={3}{R}{G}
-type=Creature
-subtype=Wurm
-power=7
-toughness=7
-text=Trample When Shivan Wurm enters the battlefield, return a red or green creature you control to its owner's hand.
-rarity=R
-[/card]
-[card]
-id=25925
-name=Silver Drake
-mana={1}{W}{U}
-type=Creature
-subtype=Drake
-power=3
-toughness=3
-text=Flying When Silver Drake enters the battlefield, return a white or blue creature you control to its owner's hand.
-rarity=C
-[/card]
-[card]
 id=25900
 name=Singe
 mana={R}
@@ -727,17 +655,6 @@ text=Enchant creature When Sleeping Potion enters the battlefield, tap enchanted
 rarity=C
 [/card]
 [card]
-id=25935
-name=Sparkcaster
-mana={2}{R}{G}
-type=Creature
-subtype=Kavu
-power=5
-toughness=3
-text=When Sparkcaster enters the battlefield, return a red or green creature you control to its owner's hand. When Sparkcaster enters the battlefield, it deals 1 damage to target player.
-rarity=U
-[/card]
-[card]
 id=25880
 name=Star Compass
 mana={2}
@@ -746,17 +663,6 @@ text=Star Compass enters the battlefield tapped. {T}: Add to your mana pool one
 rarity=U
 [/card]
 [card]
-id=25929
-name=Steel Leaf Paladin
-mana={4}{G}{W}
-type=Creature
-subtype=Elf Knight
-power=4
-toughness=4
-text=First strike When Steel Leaf Paladin enters the battlefield, return a green or white creature you control to its owner's hand.
-rarity=C
-[/card]
-[card]
 id=25913
 name=Stormscape Battlemage
 mana={2}{U}

projects/mtg/bin/Res/sets/POR/_cards.dat

@@ -19,14 +19,14 @@ abilities=swampwalk
 [/card]
 [card]
 text=Target creature gets +3/+3 and gains flying until end of turn.
-target=creature
 id=4370
+target=creature
+auto=3/3
+auto=flying
 name=Angelic Blessing
 rarity=C
 mana={2}{W}
 type=Sorcery
-auto=3/3
-auto=flying
 [/card]
 [card]
 text=Flying, vigilance
@@ -200,9 +200,9 @@ toughness=4
 [/card]
 [card]
 text=Return target creature card from your graveyard to the battlefield.
+id=4378
 target=creature|mygraveyard
 auto=moveTo(myBattlefield)
-id=4378
 name=Breath of Life
 rarity=C
 mana={3}{W}
@@ -222,10 +222,10 @@ abilities=Islandwalk
 [/card]
 [card]
 text=Target creature gets +2/+0 until end of turn. Burning Cloak deals 2 damage to that creature.
+id=4331
 target=creature
 auto=2/0
 auto=damage:2
-id=4331
 name=Burning Cloak
 rarity=C
 mana={R}
@@ -245,10 +245,10 @@ toughness=1
 [/card]
 [card]
 text=Target creature gains flying until end of turn.   Draw a card.
+id=4251
 target=creature
 auto=flying
-auto=draw:1
+auto=draw:1 controller
-id=4251
 name=Cloak of Feathers
 rarity=C
 mana={U}
@@ -425,8 +425,9 @@ type=Sorcery
 [/card]
 [card]
 text=Earthquake deals X damage to each creature without flying and each player.
-alias=1289
 id=4335
+auto=damage:X all(creature[-flying])
+auto=damage:X all(player)
 name=Earthquake
 rarity=R
 mana={X}{R}
@@ -477,6 +478,43 @@ toughness=1
 abilities=flying
 [/card]
 [card]
+text=Flying   When Fire Dragon enters the battlefield, it deals damage equal to the number of Mountains you control to target creature.
+id=4336
+name=Fire Dragon
+rarity=R
+mana={6}{R}{R}{R}
+type=Creature
+subtype=Dragon
+auto=foreach(mountain|myBattlefield) damage:1 target(creature)
+power=6
+toughness=6
+abilities=flying
+[/card]
+[card]
+text=When Fire Imp enters the battlefield, it deals 2 damage to target creature.
+id=4337
+name=Fire Imp
+rarity=U
+mana={2}{R}
+type=Creature
+subtype=Imp
+auto=damage:2 target(creature)
+power=2
+toughness=1
+[/card]
+[card]
+text=When Fire Snake is put into a graveyard from the battlefield, destroy target land.
+id=4338
+name=Fire Snake
+rarity=C
+mana={4}{R}
+type=Creature
+subtype=Snake
+auto=@movedTo(this|mygraveyard) from(battlefield):destroy target(land)
+power=3
+toughness=1
+[/card]
+[card]
 text=Fire Tempest deals 6 damage to each creature and each player.
 id=4339
 name=Fire Tempest
@@ -821,6 +859,18 @@ power=4
 toughness=2
 [/card]
 [card]
+text=When Man-o'-War enters the battlefield, return target creature to its owner's hand.
+id=4266
+name=Man-o'-War
+rarity=U
+mana={2}{U}
+type=Creature
+subtype=Jellyfish
+auto=moveTo(ownerhand) target(creature)
+power=2
+toughness=2
+[/card]
+[card]
 id=4267
 name=Merfolk of the Pearl Trident
 rarity=C
@@ -970,10 +1020,10 @@ type=Sorcery
 [/card]
 [card]
 text=Search your library for a Forest card and put that card onto the battlefield. Then shuffle your library.
-target=Forest|myLibrary
-auto=moveTo(myBattlefield)
 id=4310
 name=Nature's Lore
+target=Forest|myLibrary
+auto=moveTo(myBattlefield)
 rarity=C
 mana={1}{G}
 type=Sorcery
@@ -989,8 +1039,8 @@ type=Sorcery
 [/card]
 [card]
 text=Needle Storm deals 4 damage to each creature with flying.
-auto=damage:4 all(creature[flying])
 id=4311
+auto=damage:4 all(creature[flying])
 name=Needle Storm
 rarity=U
 mana={2}{G}
@@ -1010,7 +1060,8 @@ toughness=3
 text=Destroy target creature. Its owner gains 4 life.
 id=4389
 target=creature
-auto=destroy && life:4 targetController
+auto=destroy
+auto=life:4 targetController
 name=Path of Peace
 rarity=C
 mana={3}{W}
@@ -1029,18 +1080,6 @@ toughness=2
 abilities=unblockable
 [/card]
 [card]
-text=When Pillaging Horde enters the battlefield, sacrifice it unless you discard a card at random.
-id=4353
-auto=discard:1
-name=Pillaging Horde
-rarity=R
-mana={2}{R}{R}
-type=Creature
-subtype=Human Barbarian
-power=5
-toughness=5
-[/card]
-[card]
 text={T}: Add {W} to your mana pool.
 auto={T}:Add {W}
 id=4425
@@ -1143,9 +1182,9 @@ abilities=haste
 [/card]
 [card]
 text=Destroy target land.
+id=4235
 target=land
 auto=destroy
-id=4235
 name=Rain of Tears
 rarity=U
 mana={1}{B}{B}
@@ -1153,8 +1192,8 @@ type=Sorcery
 [/card]
 [card]
 text=Return target creature card from your graveyard to your hand.
-target=creature|myGraveyard
 id=4236
+target=creature|myGraveyard
 auto=moveTo(myHand)
 name=Raise Dead
 rarity=C
@@ -1233,25 +1272,25 @@ type=Sorcery
 [/card]
 [card]
 text=When Serpent Assassin enters the battlefield, you may destroy target nonblack creature.
-auto=may destroy target(creature[-black])
 id=4237
 name=Serpent Assassin
 rarity=R
 mana={3}{B}{B}
 type=Creature
 subtype=Snake Assassin
+auto=may destroy target(creature[-black])
 power=2
 toughness=2
 [/card]
 [card]
 text=When Serpent Warrior enters the battlefield, you lose 3 life.
-auto=life:-3
 id=4238
 name=Serpent Warrior
 rarity=C
 mana={2}{B}
 type=Creature
 subtype=Snake Warrior
+auto=life:-3
 power=3
 toughness=3
 [/card]
@@ -1289,10 +1328,10 @@ abilities=flying
 [/card]
 [card]
 text=Soul Shred deals 3 damage to target nonblack creature. You gain 3 life.
+id=4241
 target=creature[-black]
 auto=destroy
 auto=life:3 controller
-id=4241
 name=Soul Shred
 rarity=C
 mana={3}{B}{B}
@@ -1310,13 +1349,13 @@ toughness=4
 [/card]
 [card]
 text=When Spiritual Guardian enters the battlefield, you gain 4 life.
-auto=life:4
 id=4395
 name=Spiritual Guardian
 rarity=R
 mana={3}{W}{W}
 type=Creature
 subtype=Spirit
+auto=life:4
 power=3
 toughness=4
 [/card]
@@ -1365,8 +1404,8 @@ abilities=flying
 [/card]
 [card]
 text=Creatures you control get +0/+3 until end of turn.
-auto=lord(creature|myBattlefield) 0/3
 id=4399
+auto=lord(creature|myBattlefield) 0/3
 name=Steadfastness
 rarity=C
 mana={1}{W}
@@ -1386,9 +1425,9 @@ toughness=2
 [/card]
 [card]
 text=Destroy target land.
+id=4363
 target=land
 auto=destroy
-id=4363
 name=Stone Rain
 rarity=C
 mana={2}{R}
@@ -1444,10 +1483,10 @@ subtype=Swamp
 [/card]
 [card]
 text=Return target creature to its owner's hand.   Draw a card.
+id=4277
 target=creature
 auto=moveTo(ownerhand)
-auto=draw:1
+auto=draw:1 controller
-id=4277
 name=Symbol of Unsummoning
 rarity=C
 mana={2}{U}
@@ -1464,23 +1503,22 @@ type=Sorcery
 [/card]
 [card]
 text=Haste (This creature can attack the turn it comes under your control.)  When Thundermare enters the battlefield, tap all other creatures.
-auto=tap all(creature)
-auto=untap(this)
 id=4364
 name=Thundermare
 rarity=R
 mana={5}{R}
 type=Creature
 subtype=Elemental Horse
+auto=tap all(other creature)
 power=5
 toughness=5
 abilities=haste
 [/card]
 [card]
 text=Put target creature on top of its owner's library.
+id=4282
 target=creature
 auto=moveTo(ownerLibrary)
-id=4282
 name=Time Ebb
 rarity=C
 mana={2}{U}
@@ -1488,8 +1526,8 @@ type=Sorcery
 [/card]
 [card]
 text=Draw two cards.
-auto=draw:2
 id=4283
+auto=draw:2
 name=Touch of Brilliance
 rarity=C
 mana={3}{U}
@@ -1497,8 +1535,8 @@ type=Sorcery
 [/card]
 [card]
 text=White creatures get +2/+0 until end of turn.
-auto=lord(creature[white]) 2/0
 id=4402
+auto=lord(creature[white]) 2/0
 name=Valorous Charge
 rarity=U
 mana={1}{W}{W}
@@ -1506,8 +1544,8 @@ type=Sorcery
 [/card]
 [card]
 text=Creatures you control get +1/+1 until end of turn.
-auto=lord(creature|myBattlefield) 1/1
 id=4406
+auto=lord(creature|myBattlefield) 1/1
 name=Warrior's Charge
 rarity=C
 mana={2}{W}
@@ -1515,9 +1553,9 @@ type=Sorcery
 [/card]
 [card]
 text=Search your library for a basic land card and put that card onto the battlefield. Then shuffle your library.
+id=4323
 target=land[basic]|myLibrary
 auto=moveTo(myBattlefield)
-id=4323
 name=Untamed Wilds
 rarity=U
 mana={2}{G}
@@ -1525,10 +1563,10 @@ type=Sorcery
 [/card]
 [card]
 text=Vampiric Feast deals 4 damage to target creature or player and you gain 4 life.
+id=4243
 target=creature,player
 auto=damage:4
 auto=life:4 controller
-id=4243
 name=Vampiric Feast
 rarity=U
 mana={5}{B}{B}
@@ -1536,9 +1574,9 @@ type=Sorcery
 [/card]
 [card]
 text=Vampiric Touch deals 2 damage to target opponent and you gain 2 life.
+id=4244
 auto=damage:2 opponent
 auto=life:2 controller
-id=4244
 name=Vampiric Touch
 rarity=C
 mana={2}{B}
@@ -1546,21 +1584,21 @@ type=Sorcery
 [/card]
 [card]
 text=When Venerable Monk enters the battlefield, you gain 2 life.
-auto=life:2
 id=4403
 name=Venerable Monk
 rarity=U
 mana={2}{W}
 type=Creature
 subtype=Human Monk Cleric
+auto=life:2
 power=2
 toughness=2
 [/card]
 [card]
 text=Destroy target tapped creature.
+id=4404
 target=creature[tapped]
 auto=destroy
-id=4404
 name=Vengeance
 rarity=U
 mana={3}{W}
@@ -1589,9 +1627,9 @@ abilities=flying,haste
 [/card]
 [card]
 text=Volcanic Hammer deals 3 damage to target creature or player.
+id=4366
 target=creature,player
 auto=Damage:3
-id=4366
 name=Volcanic Hammer
 rarity=C
 mana={1}{R}
@@ -1657,18 +1695,30 @@ abilities=flying
 [/card]
 [card]
 text=Destroy target land.
+id=4326
 target=land
 auto=destroy
-id=4326
 name=Winter's Grasp
 rarity=U
 mana={1}{G}{G}
 type=Sorcery
 [/card]
 [card]
+###Wood Elves ability should stay optional ("may") because when you are searching for sth in your library, the official rules say that you don'T have to find anything even if there is a legal target!
+text=When Wood Elves enters the battlefield, search your library for a Forest card and put that card onto the battlefield. Then shuffle your library.
+id=4327
+name=Wood Elves
+rarity=R
+mana={2}{G}
+type=Creature
+subtype=Elf Scout
+auto=may moveTo(myBattlefield) target(forest|myLibrary)
+power=1
+toughness=1
+[/card]
+[card]
 text=Destroy all creatures. They can't be regenerated.
 auto=bury all(creature)
-alias=1372
 id=4408
 name=Wrath of God
 rarity=R

projects/mtg/bin/Res/sets/POR/todo.dat

@@ -101,7 +101,6 @@ rarity=U
 type=Instant
 mana={1}{G}
 [/card]
-
 [card]
 text=Until end of turn, black creatures you control can be blocked only by black creatures.
 id=4216
@@ -157,42 +156,6 @@ type=Sorcery
 mana={2}{B}{B}
 [/card]
 [card]
-text=Flying     When Fire Dragon comes into play, it deals damage equal to the number of Mountains you control to target creature.
-id=4336
-name=Fire Dragon
-rarity=R
-type=Creature
-mana={6}{R}{R}{R}
-power=6
-subtype=Dragon
-toughness=6
-[/card]
-[card]
-text=When Fire Imp comes into play, it deals 2 damage to target creature.
-#"When [this] enters the battlefield ... target ..." abilities are not supported unless there is a "may" (Wagic 0.9)
-target=creature
-auto=damage:2
-id=4337
-name=Fire Imp
-rarity=U
-mana={2}{R}
-type=Creature
-subtype=Imp
-power=2
-toughness=1
-[/card]
-[card]
-text=When Fire Snake is put into a graveyard from play, destroy target land.
-id=4338
-name=Fire Snake
-rarity=C
-type=Creature
-mana={4}{R}
-power=3
-subtype=Snake
-toughness=1
-[/card]
-[card]
 text=Each player discards any number of cards, then draws that many cards.     Draw a card.
 id=4262
 name=Flux
@@ -244,20 +207,6 @@ type=Sorcery
 mana={R}{R}
 [/card]
 [card]
-text=When Man-o'-War comes into play, return target creature to its owner's hand.
-#"When [this] enters the battlefield ... target ..." abilities are not supported unless there is a "may" (Wagic 0.9)
-id=4266
-target=creature
-auto=moveTo(ownerhand)
-name=Man-o'-War
-mana={2}{U}
-rarity=U
-type=Creature
-subtype=Jellyfish
-power=2
-toughness=2
-[/card]
-[card]
 text=When Mercenary Knight comes into play, sacrifice it unless you discard a creature card.
 id=4228
 auto=discard:1
@@ -326,6 +275,19 @@ type=Sorcery
 mana={U}
 [/card]
 [card]
+###Cannot be coded right now! 0.10.1
+text=When Pillaging Horde enters the battlefield, sacrifice it unless you discard a card at random.
+id=4353
+auto=discard:1
+name=Pillaging Horde
+rarity=R
+mana={2}{R}{R}
+type=Creature
+subtype=Human Barbarian
+power=5
+toughness=5
+[/card]
+[card]
 text=When Plant Elemental comes into play, sacrifice it unless you sacrifice a Forest.
 id=4313
 name=Plant Elemental
@@ -447,7 +409,6 @@ power=4
 subtype=Wurm
 toughness=4
 [/card]
-
 [card]
 text=Tap up to three target creatures without flying.
 id=4281
@@ -475,9 +436,6 @@ power=3
 subtype=Beast
 toughness=2
 [/card]
-
-
-
 [card]
 text=Destroy two target nonblack creatures. You lose 5 life.
 id=4246
@@ -501,16 +459,4 @@ name=Withering Gaze
 rarity=U
 type=Sorcery
 mana={2}{U}
-[/card]
+[/card]
-[card]
-text=When Wood Elves comes into play, search your library for a Forest card and put that card into play. Then shuffle your library.
-auto=moveTo(inPlay) target(forest|myLibrary)
-id=4327
-name=Wood Elves
-rarity=R
-type=Creature
-mana={2}{G}
-power=1
-subtype=Elf Scout
-toughness=1
-[/card]

projects/mtg/bin/Res/sets/PTK/_cards.dat

@@ -118,6 +118,18 @@ toughness=3
 abilities=horsemanship
 [/card]
 [card]
+text=When Corrupt Eunuchs enters the battlefield, it deals 2 damage to target creature.
+id=10734
+name=Corrupt Eunuchs
+rarity=U
+mana={3}{R}
+type=Creature
+subtype=Human Advisor
+auto=damage:2 target(creature)
+power=2
+toughness=2
+[/card]
+[card]
 text=When Council of Advisors enters the battlefield, draw a card.
 id=10601
 auto=draw:1
@@ -626,6 +638,18 @@ mana={3}{W}
 type=Sorcery
 [/card]
 [card]
+text=When Ravaging Horde enters the battlefield, destroy target land.
+id=13805
+name=Ravaging Horde
+rarity=U
+mana={3}{R}{R}
+type=Creature
+subtype=Human Soldier
+auto=destroy target(land)
+power=3
+toughness=3
+[/card]
+[card]
 text=Red Cliffs Armada can't attack unless defending player controls an Island.
 id=10501
 name=Red Cliffs Armada

projects/mtg/bin/Res/sets/PTK/todo.dat

@@ -77,17 +77,6 @@ text=When Corrupt Court Official enters the battlefield, target opponent discard
 rarity=U
 [/card]
 [card]
-id=10734
-name=Corrupt Eunuchs
-mana={3}{R}
-type=Creature
-subtype=Human Advisor
-power=2
-toughness=2
-text=When Corrupt Eunuchs enters the battlefield, it deals 2 damage to target creature.
-rarity=U
-[/card]
-[card]
 id=10628
 name=Counterintelligence
 mana={2}{U}{U}
@@ -264,17 +253,6 @@ text=Cast Rally the Troops only during the declare attackers step and only if yo
 rarity=U
 [/card]
 [card]
-id=13805
-name=Ravaging Horde
-mana={3}{R}{R}
-type=Creature
-subtype=Human Soldier
-power=3
-toughness=3
-text=When Ravaging Horde enters the battlefield, destroy target land.
-rarity=U
-[/card]
-[card]
 id=10592
 name=Relentless Assault
 mana={2}{R}{R}

projects/mtg/bin/Res/sets/RAV/_cards.dat

@@ -55,6 +55,16 @@ mana={3}{R}{R}
 type=Enchantment
 [/card]
 [card]
+text=Boros Garrison enters the battlefield tapped.   When Boros Garrison enters the battlefield, return a land you control to its owner's hand.   {T}: Add {R}{W} to your mana pool.
+id=83900
+name=Boros Garrison
+auto=tap
+auto=moveto(ownerhand) notatarget(land|myBattlefield)
+auto={T}:Add {R}{W}
+rarity=C
+type=Land
+[/card]
+[card]
 text=({RW} can be paid with either {R} or {W}.) {1}{R}: Target creature gains haste until end of turn.   {1}{W}: Target creature gains first strike until end of turn.
 id=87918
 name=Boros Guildmage
@@ -205,6 +215,16 @@ mana={B}{G}
 type=Enchantment
 [/card]
 [card]
+text=Dimir Aqueduct enters the battlefield tapped.   When Dimir Aqueduct enters the battlefield, return a land you control to its owner's hand.   {T}: Add {U}{B} to your mana pool.
+id=87929
+name=Dimir Aqueduct
+auto=tap
+auto=moveto(ownerhand) notatarget(land|myBattlefield)
+auto={T}:Add {U}{B}
+rarity=C
+type=Land
+[/card]
+[card]
 text=Fear   Sacrifice a creature: Regenerate Dimir House Guard.     Transmute {1}{B}{B} ({1}{B}{B}, Discard this card: Search your library for a card with the same converted mana cost as this card, reveal it, and put it into your hand. Then shuffle your library. Transmute only as a sorcery.)
 id=87926
 name=Dimir House Guard
@@ -536,6 +556,16 @@ power=2
 toughness=2
 [/card]
 [card]
+text=Golgari Rot Farm enters the battlefield tapped.   When Golgari Rot Farm enters the battlefield, return a land you control to its owner's hand.   {T}: Add {B}{G} to your mana pool.
+id=87939
+name=Golgari Rot Farm
+auto=tap
+auto=moveto(ownerhand) notatarget(land|myBattlefield)
+auto={T}:Add {B}{G}
+rarity=C
+type=Land
+[/card]
+[card]
 text={B}, Sacrifice a creature: Target player loses 1 life.
 id=89038
 auto={B}{S(creature|myBattlefield)}:life:-1 target(player)
@@ -593,6 +623,18 @@ power=3
 toughness=4
 [/card]
 [card]
+text=When Infectious Host is put into a graveyard from the battlefield, target player loses 2 life.
+id=87966
+auto=@movedTo(this|graveyard) from(battlefield):life:-2 target(player)
+name=Infectious Host
+rarity=C
+mana={2}{B}
+type=Creature
+subtype=Zombie
+power=1
+toughness=1
+[/card]
+[card]
 text={T}: Add {U} to your mana pool.
 auto={T}:Add {U}
 id=95113
@@ -653,6 +695,19 @@ power=1
 toughness=2
 [/card]
 [card]
+text=Flying   When Keening Banshee enters the battlefield, target creature gets -2/-2 until end of turn.
+id=83599
+name=Keening Banshee
+rarity=C
+mana={2}{B}{B}
+type=Creature
+subtype=Spirit
+auto=-2/-2 target(creature) ueot
+power=2
+toughness=2
+abilities=flying
+[/card]
+[card]
 text=Target creature gets -3/-3 until end of turn.
 id=89056
 target=creature
@@ -854,13 +909,13 @@ subtype=Plains
 [/card]
 [card]
 text=Whenever you cast a creature spell, you may draw a card.
-auto=@movedTo(creature|mystack):may draw:1
 id=89083
 name=Primordial Sage
 rarity=R
 mana={4}{G}{G}
 type=Creature
 subtype=Spirit
+auto=@movedTo(creature|mystack):may draw:1
 power=4
 toughness=5
 [/card]
@@ -884,9 +939,9 @@ mana={X}{U}{B}
 [/card]
 [card]
 text=Destroy target artifact or creature. It can't be regenerated.
+id=89063
 target=creature,artifact
 auto=bury
-id=89063
 name=Putrefy
 rarity=U
 mana={1}{B}{G}
@@ -903,8 +958,9 @@ type=Sorcery
 [/card]
 [card]
 text=Return target card from your graveyard to your hand.
-auto=moveto(myHand) target(*|myGraveyard)
 id=88966
+target=*|myGraveyard
+auto=moveto(myHand)
 name=Recollect
 rarity=U
 mana={2}{G}
@@ -936,41 +992,63 @@ subtype=Mountain Plains
 [/card]
 [card]
 text=Scion of the Wild's power and toughness are each equal to the number of creatures you control.
-id=83647
+id=83647 
-auto=foreach(creature|myBattlefield) 1/1 
 name=Scion of the Wild
 rarity=R
 mana={1}{G}{G}
 type=Creature
 subtype=Avatar
+auto=foreach(creature|myBattlefield) 1/1
 power=*
 toughness=*
 [/card]
 [card]
 text=Destroy target land. Add {R}{R} to your mana pool.
+id=83829
 target=land
 auto=destroy
 auto=Add{R}{R} controller
-id=83829
 name=Seismic Spike
 rarity=C
 mana={2}{R}{R}
 type=Sorcery
 [/card]
 [card]
+text={1}, {T}, Tap an untapped creature you control: Put a 1/1 green Saproling creature token onto the battlefield.
+auto={1}{T}:tap notatarget(creature[-tapped]|myBattlefield) && token(Saproling,creature saproling, 1/1, green)
+id=87936
+name=Selesnya Evangel
+rarity=C
+mana={G}{W}
+type=Creature
+subtype=Elf Shaman
+power=1
+toughness=2
+[/card]
+[card]
 text=({GW} can be paid with either {G} or {W}.)  {3}{G}: Put a 1/1 green Saproling creature token onto the battlefield.   {3}{W}: Creatures you control get +1/+1 until end of turn.
-id=87988
+id=87988 
-auto={3}{G}:token(saproling,creature saproling,1/1,green)
-auto={3}{W}:lord(creature|myBattlefield) 1/1 
 name=Selesnya Guildmage
 rarity=U
 mana={GW}{GW}
 type=Creature
 subtype=Elf Wizard
+auto={3}{G}:token(saproling,creature saproling,1/1,green)
+auto={3}{W}:lord(creature|myBattlefield) 1/1
 power=2
 toughness=2
 [/card]
 [card]
+text=Selesnya Sanctuary enters the battlefield tapped.   When Selesnya Sanctuary enters the battlefield, return a land you control to its owner's hand.   {T}: Add {G}{W} to your mana pool.
+id=87963
+name=Selesnya Sanctuary
+auto=tap
+auto=moveto(ownerhand) notatarget(land|myBattlefield)
+auto={T}:Add {G}{W}
+rarity=C
+type=Land
+[/card]
+[card]
 text={1}, {T}: Add {G}{W} to your mana pool.
 auto={1}{T}:Add {G}{W}
 id=95538
@@ -1018,10 +1096,10 @@ abilities=flying,haste
 [/card]
 [card]
 text=Destroy target artifact.   Draw a card.
+id=83646
 target=artifact
 auto=destroy
-auto=draw:1
+auto=draw:1 controller
-id=83646
 name=Smash
 rarity=C
 mana={2}{R}
@@ -1040,6 +1118,18 @@ toughness=2
 abilities=flying
 [/card]
 [card]
+text=When Sparkmage Apprentice enters the battlefield, it deals 1 damage to target creature or player.
+id=87967
+name=Sparkmage Apprentice
+rarity=C
+mana={1}{R}
+type=Creature
+subtype=Human Wizard
+auto=Damage:1 target(creature,player)
+power=1
+toughness=1
+[/card]
+[card]
 text=Whenever a land enters the battlefield under your control, untap Stone-Seeder Hierophant.   {T}: Untap target land.
 id=89041
 name=Stone-Seeder Hierophant
@@ -1161,6 +1251,18 @@ mana={1}
 type=Artifact
 [/card]
 [card]
+text={T}: Target creature can't attack or block this turn.
+id=83611
+name=Thundersong Trumpeter
+rarity=C
+mana={R}{W}
+type=Creature
+subtype=Human Soldier
+auto={T}:cantattack && cantblock target(creature)
+power=2
+toughness=1
+[/card]
+[card]
 text=Defender (This creature can't attack.)   {4}: Tidewater Minion loses defender until end of turn. {T}: Untap target permanent.
 id=83679
 name=Tidewater Minion
@@ -1226,6 +1328,18 @@ power=3
 toughness=3
 [/card]
 [card]
+text=When Vedalken Dismisser enters the battlefield, put target creature on top of its owner's library.
+id=87898
+name=Vedalken Dismisser
+rarity=C
+mana={5}{U}
+type=Creature
+subtype=Vedalken Wizard
+auto=moveTo(ownerLibrary) target(creature)
+power=2
+toughness=2
+[/card]
+[card]
 text={U}, {T}: Target player puts the top two cards of his or her library into his or her graveyard.
 id=89028
 auto={U}{T}:deplete:2 target(player)

projects/mtg/bin/Res/sets/RAV/todo.dat

@@ -98,16 +98,6 @@ type=Instant
 mana={2}{W}
 [/card]
 [card]
-text=Boros Garrison comes into play tapped.     When Boros Garrison comes into play, return a land you control to its owner's hand.     {T}: Add {R}{W} to your mana pool.
-id=83900
-auto=moveto(ownerhand) target(land|myBattlefield)
-auto=tap
-auto={T}: add {R}{W}
-name=Boros Garrison
-rarity=C
-type=Land
-[/card]
-[card]
 text=At the beginning of each opponent's upkeep, remove all cards in your hand from the game face down.     At the beginning of your upkeep, return all cards you own removed from the game with Bottled Cloister to your hand, then draw a card.
 id=89018
 name=Bottled Cloister
@@ -224,12 +214,12 @@ type=Instant
 mana={4}{R}
 [/card]
 [card]
-text=Whenever a nonartifact permanent comes into play under your control, you may return another permanent you control that shares a card type with it to its owner's hand.
+text=Whenever a nonartifact permanent enters the battlefield under your control, you may return another permanent you control that shares a card type with it to its owner's hand.
 id=89089
 name=Cloudstone Curio
 rarity=R
+mana={1}
 type=Artifact
-mana={3}
 [/card]
 [card]
 text=Whenever Coalhauler Swine is dealt damage, it deals that much damage to each player.
@@ -385,13 +375,6 @@ type=Instant
 mana={1}{W}{W}
 [/card]
 [card]
-text=Dimir Aqueduct comes into play tapped.     When Dimir Aqueduct comes into play, return a land you control to its owner's hand.     {T}: Add {U}{B} to your mana pool.
-id=87929
-name=Dimir Aqueduct
-rarity=C
-type=Land
-[/card]
-[card]
 text=Whenever Dimir Cutpurse deals combat damage to a player, that player discards a card and you draw a card.
 id=87906
 name=Dimir Cutpurse
@@ -506,7 +489,6 @@ type=Enchantment
 mana={3}{W}
 subtype=Aura
 [/card]
-
 [card]
 text=Prevent the next X damage that would be dealt to you this turn.     Draw a card.
 id=83884
@@ -665,7 +647,6 @@ power=2
 subtype=Lizard
 toughness=3
 [/card]
-
 [card]
 #to test
 text=Golgari Grave-Troll comes into play with a +1/+1 counter on it for each creature card in your graveyard.     {1}, Remove a +1/+1 counter from Golgari Grave-Troll: Regenerate Golgari Grave-Troll.     Dredge 6
@@ -681,13 +662,6 @@ subtype=Skeleton Troll
 toughness=0
 [/card]
 [card]
-text=Golgari Rot Farm comes into play tapped.     When Golgari Rot Farm comes into play, return a land you control to its owner's hand.     {T}: Add {B}{G} to your mana pool.
-id=87939
-name=Golgari Rot Farm
-rarity=C
-type=Land
-[/card]
-[card]
 text=When Golgari Thug is put into a graveyard from play, put target creature card in your graveyard on top of your library.     Dredge 4 (If you would draw a card, instead you may put exactly four cards from the top of your library into your graveyard. If you do, return this card from your graveyard to your hand. Otherwise, draw a card.)
 id=88994
 name=Golgari Thug
@@ -869,19 +843,6 @@ type=Instant
 mana={2}{U}{U}
 [/card]
 [card]
-#to test
-text=When Infectious Host is put into a graveyard from play, target player loses 2 life.
-id=87966
-auto=@movedto(this|graveyard):damage:2 target(player) #does not work yet
-name=Infectious Host
-rarity=C
-type=Creature
-mana={2}{B}
-power=1
-subtype=Zombie
-toughness=1
-[/card]
-[card]
 text=Enchant creature     Enchanted creature has "At the end of your turn, sacrifice this creature unless it attacked this turn."
 id=88997
 name=Instill Furor
@@ -902,22 +863,6 @@ subtype=Golem
 toughness=6
 [/card]
 [card]
-text=Flying. When Keening Banshee comes into play, target creature gets -2/-2 until end of turn.
-#"When [this] enters the battlefield ... target ..." abilities are not supported unless there is a "may" (Wagic 0.9)
-id=83599
-name=Keening Banshee
-target=creature
-auto=-2/-2 ueot
-rarity=C
-color=Black
-mana={2}{B}{B}
-type=Creature
-subtype=Spirit
-power=2
-toughness=2
-abilities=flying
-[/card]
-[card]
 text=Put a card in your hand on top of your library: Return Leashling to its owner's hand.
 id=89008
 name=Leashling
@@ -1171,8 +1116,6 @@ rarity=C
 type=Instant
 mana={1}{U}
 [/card]
-
-
 [card]
 text=Counter target spell unless its controller discards his or her hand.     Transmute {1}{U}{B} ({1}{U}{B}, Discard this card: Search your library for a card with the same converted mana cost as this card, reveal it, and put it into your hand. Then shuffle your library. Play only as a sorcery.)
 id=87992
@@ -1375,19 +1318,6 @@ type=Instant
 mana={G}{W}
 [/card]
 [card]
-#to test
-text={1}, {T}, Tap an untapped creature you control: Put a 1/1 green Saproling creature token into play.
-id=87936
-auto={1}{T}:tap (creature[-tapped]|myinplay) && token(Saproling,creature saproling, 1/1, green)
-name=Selesnya Evangel
-rarity=C
-type=Creature
-mana={G}{W}
-power=1
-subtype=Elf Shaman
-toughness=2
-[/card]
-[card]
 text=Reach (This creature can block creatures with flying.)  Selesnya Sagittars can block an additional creature.
 id=83880
 name=Selesnya Sagittars
@@ -1398,14 +1328,6 @@ power=2
 subtype=Elf Archer
 toughness=5
 [/card]
-[card]
-text=Selesnya Sanctuary comes into play tapped.     When Selesnya Sanctuary comes into play, return a land you control to its owner's hand.     {T}: Add {G}{W} to your mana pool.
-id=87963
-name=Selesnya Sanctuary
-rarity=C
-type=Land
-[/card]
-
 [card]
 text=({UB} can be paid with either {U} or {B}.)  Players can't search libraries this turn.     Draw a card.
 id=83827
@@ -1464,20 +1386,6 @@ subtype=Gorgon
 toughness=5
 [/card]
 [card]
-text=When Sparkmage Apprentice comes into play, it deals 1 damage to target creature or player.
-#"When [this] enters the battlefield ... target ..." abilities are not supported unless there is a "may" (Wagic 0.9)
-id=87967
-name=Sparkmage Apprentice
-target=creature,player
-auto=Damage:1
-rarity=C
-mana={1}{R}
-type=Creature
-subtype=Human Wizard
-power=1
-toughness=1
-[/card]
-[card]
 text=When Spawnbroker comes into play, you may exchange control of target creature you control and target creature with power less than or equal to that creature's power an opponent controls.
 id=83748
 name=Spawnbroker
@@ -1554,7 +1462,7 @@ mana={3}
 subtype=Equipment
 [/card]
 [card]
-#lifelink ?
+#lifelink ? no!
 text=Whenever Sunhome Enforcer deals combat damage, you gain that much life.     {1}{R}: Sunhome Enforcer gets +1/+0 until end of turn.
 id=89070
 name=Sunhome Enforcer
@@ -1618,7 +1526,6 @@ power=2
 subtype=Human Wizard
 toughness=2
 [/card]
-
 [card]
 text={1}, Sacrifice a creature: Look at the top two cards of target opponent's library, then remove one of them from the game.
 id=83576
@@ -1639,19 +1546,6 @@ type=Sorcery
 mana={4}{W}
 [/card]
 [card]
-#to test
-text={T}: Target creature can't attack or block this turn.
-id=83611
-name=Thundersong Trumpeter
-auto={T}:cantattack && cantblock target(creature)
-rarity=C
-type=Creature
-mana={R}{W}
-power=2
-subtype=Human Soldier
-toughness=1
-[/card]
-[card]
 text=Defender (This creature can't attack.)  Sacrifice three lands: Torpid Moloch loses defender until end of turn.
 id=89004
 name=Torpid Moloch
@@ -1701,18 +1595,6 @@ type=Sorcery
 mana={4}{U}{B}
 [/card]
 [card]
-text=When Vedalken Dismisser comes into play, put target creature on top of its owner's library.
-auto=moveTo(ownerLibrary) target(creature) #Can't target anything when come into play unless it is a "may" ability
-id=87898
-name=Vedalken Dismisser
-rarity=C
-type=Creature
-mana={5}{U}
-power=2
-subtype=Vedalken Wizard
-toughness=2
-[/card]
-[card]
 text=Return target creature card from your graveyard to play. If {G} was spent to play Vigor Mortis, that creature comes into play with an additional +1/+1 counter on it.
 id=88986
 name=Vigor Mortis
@@ -1731,7 +1613,6 @@ power=5
 subtype=Human Berserker
 toughness=5
 [/card]
-
 [card]
 text={2}, Sacrifice Voyager Staff: Remove target creature from the game. Return the removed card to play under its owner's control at end of turn.
 id=88991
@@ -1740,7 +1621,6 @@ rarity=U
 type=Artifact
 mana={1}
 [/card]
-
 [card]
 text=Each player shuffles all permanents he or she owns into his or her library, then reveals that many cards from the top of his or her library. Each player puts all artifact, creature, and land cards revealed this way into play, then puts all enchantment cards revealed this way into play, then puts all cards revealed this way that weren't put into play on the bottom of his or her library in any order.
 id=89084
@@ -1834,4 +1714,4 @@ mana={5}{U}
 power=0
 subtype=Spirit
 toughness=6
-[/card]
+[/card]

projects/mtg/bin/Res/sets/SHM/_cards.dat

@@ -276,6 +276,18 @@ toughness=*
 abilities=fear
 [/card]
 [card]
+text=When Cultbrand Cinder enters the battlefield, put a -1/-1 counter on target creature.
+id=142068
+auto=counter(-1/-1) target(creature)
+name=Cultbrand Cinder
+rarity=C
+mana={4}{BR}
+type=Creature
+subtype=Elemental Shaman
+power=3
+toughness=3
+[/card]
+[card]
 text=Enchant creature   At the beginning of each upkeep, tap enchanted creature.
 id=146079
 target=creature
@@ -1074,6 +1086,19 @@ power=3
 toughness=3
 [/card]
 [card]
+text=({2W} can be paid with any two mana or with {W}. This card's converted mana cost is 10.)   Other Scarecrow creatures you control get +1/+1.   Whenever another Scarecrow enters the battlefield under your control, destroy target permanent.
+id=159408
+name=Reaper King
+rarity=R
+mana={2W}{2U}{2B}{2R}{2G}
+type=Legendary Artifact Creature
+subtype=Scarecrow
+auto=lord(creature[scarecrow]|myBattlefield) 1/1 other
+auto=@movedTo(other scarecrow|myBattlefield):destroy target(*)
+power=6
+toughness=6
+[/card]
+[card]
 text=Regenerate target permanent.
 target=*
 auto=regenerate
@@ -1644,6 +1669,19 @@ power=3
 toughness=5
 [/card]
 [card]
+text=Trample   When Woodfall Primus enters the battlefield, destroy target noncreature permanent.   Persist (When this creature is put into a graveyard from the battlefield, if it had no -1/-1 counters on it, return it to the battlefield under its owner's control with a -1/-1 counter on it.)
+id=151987
+name=Woodfall Primus
+rarity=R
+mana={5}{G}{G}{G}
+type=Creature
+subtype=Treefolk Shaman
+auto=destroy target(*[-creature])
+power=6
+toughness=6
+abilities=persist,trample
+[/card]
+[card]
 text=Flash
 id=142028
 name=Zealous Guardian

projects/mtg/bin/Res/sets/SHM/todo.dat

@@ -73,7 +73,6 @@ rarity=U
 type=Sorcery
 mana={2B}{2B}{2B}
 [/card]
-
 [card]
 text=Whenever a creature is put into a graveyard from play, if it had a -1/-1 counter on it, put a -1/-1 counter on target creature.
 id=135429
@@ -90,7 +89,6 @@ rarity=R
 type=Enchantment
 mana={4}{W}
 [/card]
-
 [card]
 text=Burn Trail deals 3 damage to target creature or player.     Conspire (As you play this spell, you may tap two untapped creatures you control that share a color with it. When you do, copy it and you may choose a new target for the copy.)
 id=158688
@@ -126,7 +124,6 @@ rarity=C
 type=Instant
 mana={U}
 [/card]
-
 [card]
 text={T}: Target player discards a card. Play this ability only during your turn.     Put a -1/-1 counter on Cinderhaze Wretch: Untap Cinderhaze Wretch.
 id=135439
@@ -174,20 +171,6 @@ type=Instant
 mana={R}
 [/card]
 [card]
-text=When Cultbrand Cinder comes into play, put a -1/-1 counter on target creature.
-#"When [this] enters the battlefield ... target ..." abilities are not supported unless there is a "may" (Wagic 0.9)
-id=142068
-target=creature
-auto=counter(-1/-1,1)
-name=Cultbrand Cinder
-rarity=C
-type=Creature
-mana={4}{BR}
-power=3
-subtype=Elemental Shaman
-toughness=3
-[/card]
-[card]
 text=Sacrifice Cursecatcher: Counter target instant or sorcery spell unless its controller pays {1}.
 id=158763
 name=Cursecatcher
@@ -1095,17 +1078,6 @@ type=Enchantment
 mana={1}{G}{G}
 [/card]
 [card]
-text=({2W} can be paid with any two mana or with {W}. This card's converted mana cost is 10.)  Other Scarecrow creatures you control get +1/+1.     Whenever another Scarecrow comes into play under your control, destroy target permanent.
-id=159408
-name=Reaper King
-rarity=R
-type=Legendary Artifact Creature
-mana={2W}{2U}{2B}{2R}{2G}
-power=6
-subtype=Scarecrow
-toughness=6
-[/card]
-[card]
 text={T}: Add to your mana pool one mana of any type that a land you control could produce.
 id=152158
 name=Reflecting Pool
@@ -1501,18 +1473,6 @@ power=9
 subtype=Wurm
 toughness=9
 [/card]
-
-[card]
-text=Trample     When Woodfall Primus comes into play, destroy target noncreature permanent.     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.)
-id=151987
-name=Woodfall Primus
-rarity=R
-type=Creature
-mana={5}{G}{G}{G}
-power=6
-subtype=Treefolk Shaman
-toughness=6
-[/card]
 [card]
 text=Return all permanents to their owners' hands. Each player chooses up to seven cards in his or her hand, then shuffles the rest into his or her library. Empty all mana pools.
 id=141991

projects/mtg/bin/Res/sets/SOK/_cards.dat

@@ -63,6 +63,18 @@ power=7
 toughness=3
 [/card]
 [card]
+text=Whenever you cast a Spirit or Arcane spell, put a +1/+1 counter on target creature.
+name=Briarknit Kami
+id=74163
+rarity=U
+mana={3}{G}{G}
+type=Creature
+subtype=Spirit
+auto=@movedto(arcane,spirit|mystack):counter(1/1) target(creature)
+power=3
+toughness=3
+[/card]
+[card]
 text={R}: Target creature gets +1/+0 until end of turn.
 id=88810
 auto={R}:1/0 target(creature)
@@ -141,7 +153,6 @@ toughness=3
 [card]
 text=Gaze of Adamaro deals damage equal to the number of cards in target player's hand to that player.
 id=89401
-
 target=player
 alias=129750
 name=Gaze of Adamaro
@@ -295,16 +306,30 @@ mana={B}{B}
 type=Sorcery
 [/card]
 [card]
+text=When Kiri-Onna enters the battlefield, return target creature to its owner's hand.   Whenever you cast a Spirit or Arcane spell, you may return Kiri-Onna to its owner's hand.
+name=Kiri-Onna
+id=84704
+name=Kiri-Onna
+mana={4}{U}
+type=Creature
+subtype=Spirit
+auto=moveTo(ownerhand) target(creature)
+auto=@movedto(arcane,spirit|mystack):may moveTo(ownerhand)
+power=2
+toughness=2
+rarity=U
+[/card]
+[card]
 text={1}{W}: Kitsune Loreweaver gets +0/+X until end of turn, where X is the number of cards in your hand.
-name=Kitsune Loreweaver
 id=74213
+name=Kitsune Loreweaver
+rarity=C
 mana={1}{W}
-auto={1}{W}:foreach(*|myhand)0/1
 type=Creature
 subtype=Fox Cleric
+auto={1}{W}:foreach(*|myhand) 0/1
 power=2
 toughness=1
-rarity=C
 [/card]
 [card]
 text=Masumaro, First to Live's power and toughness are each equal to twice the number of cards in your hand.
@@ -362,6 +387,19 @@ power=6
 toughness=4
 [/card]
 [card]
+text=When Nikko-Onna enters the battlefield, destroy target enchantment. Whenever you cast a Spirit or Arcane spell, you may return Nikko-Onna to its owner's hand.
+id=84639
+name=Nikko-Onna
+rarity=U
+mana={2}{W}
+type=Creature
+subtype=Spirit
+auto=destroy target(enchantment)
+auto=@movedto(arcane,spirit|mystack):may moveTo(ownerhand)
+power=2
+toughness=2
+[/card]
+[card]
 text={T}: Add {U} to your mana pool.   {1}: Return Oboro, Palace in the Clouds to its owner's hand.
 id=74206
 name=Oboro, Palace in the Clouds
@@ -595,4 +633,17 @@ auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(ot
 power=3
 toughness=3
 abilities=vigilance
+[/card]
+[card]
+text=When Yuki-Onna enters the battlefield, destroy target artifact. Whenever you cast a Spirit or Arcane spell, you may return Yuki-Onna to its owner's hand.
+id=84712
+name=Yuki-Onna
+rarity=U
+mana={3}{R}
+type=Creature
+subtype=Spirit
+auto=destroy target(artifact)
+auto=@movedto(arcane,spirit|mystack):may moveto(ownerhand)
+power=3
+toughness=1
 [/card]

projects/mtg/bin/Res/sets/SOK/todo.dat

@@ -70,19 +70,6 @@ toughness=4
 rarity=R
 [/card]
 [card]
-text=Whenever you cast a Spirit or Arcane spell, put a +1/+1 counter on target creature.
-name=Briarknit Kami
-id=74163
-mana={3}{G}{G}
-#target does not work in @ auto line, unless there is a may
-auto=@movedto(arcane,spirit|mystack):counter(1/1,1) target(creature)
-type=Creature
-subtype=Spirit
-power=3
-toughness=3
-rarity=U
-[/card]
-[card]
 text=When Burning-Eye Zubera is put into a graveyard from the battlefield, if 4 or more damage was dealt to it this turn, Burning-Eye Zubera deals 3 damage to target creature or player.
 name=Burning-Eye Zubera
 id=50234
@@ -590,18 +577,6 @@ toughness=3
 rarity=U
 [/card]
 [card]
-text=When Kiri-Onna enters the battlefield, return target creature to its owner's hand. Whenever you cast a Spirit or Arcane spell, you may return Kiri-Onna to its owner's hand.
-name=Kiri-Onna
-id=84704
-mana={4}{U}
-auto=@movedto(arcane,spirit|mystack):
-type=Creature
-subtype=Spirit
-power=2
-toughness=2
-rarity=U
-[/card]
-[card]
 text={T}: Prevent the next 3 damage that would be dealt to target creature this turn. Activate this ability only if you have more cards in hand than each opponent.
 name=Kitsune Bonesetter
 id=74046
@@ -791,18 +766,6 @@ type=Sorcery
 rarity=R
 [/card]
 [card]
-text=When Nikko-Onna enters the battlefield, destroy target enchantment. Whenever you cast a Spirit or Arcane spell, you may return Nikko-Onna to its owner's hand.
-name=Nikko-Onna
-id=84639
-mana={2}{W}
-auto=@movedto(arcane,spirit|mystack):
-type=Creature
-subtype=Spirit
-power=2
-toughness=2
-rarity=U
-[/card]
-[card]
 text=Flying {2}, Return a land you control to its owner's hand: Untap target land.
 name=Oboro Breezecaller
 id=88784
@@ -1201,16 +1164,4 @@ id=74130
 mana={3}
 type=Artifact
 rarity=R
-[/card]
-[card]
-text=When Yuki-Onna enters the battlefield, destroy target artifact. Whenever you cast a Spirit or Arcane spell, you may return Yuki-Onna to its owner's hand.
-name=Yuki-Onna
-id=84712
-mana={3}{R}
-auto=@movedto(arcane,spirit|mystack):may moveto(ownerhand)
-type=Creature
-subtype=Spirit
-power=3
-toughness=1
-rarity=U
 [/card]