Added 102! successfully tested cards.

After weeks of hard work, I can proudly present you this huge package of cards, based only on already existing card code elements.

Some examples and important notes:

- Cards that get buried if you don't fulfill a condition
1. when they enter the battlefield (Hidden Horror[WEL]; Mercenary Knight, Thundering Wurm [both POR])
2. during your upkeep (Endless Wurm[USG]).

- Cards that allow to draw a card, then discard a card when entering the battlefield or damaging an opponent (Owl Familiar[POR], Looter il-Kor[TSP]).

IMPORTANT NOTE: Those cards work only correctly because the draw effect resolves before the discard effect. 
Instants and Sorceries with such effects or permanents that have an activation cost for drawing, then discarding a card won't work because the two effects don't trigger in the correct order.

- Land cycle from Visions and Planeshift (both very puzzling, but working perfectly!)


I also updated World enchantments (tested & working, see rules for them in Gatherer!)

Several card fixes.


If you have any questions, post them! ;)

projects/mtg/bin/Res/sets/10E/_cards.dat

@@ -1089,6 +1089,19 @@ power=2
 toughness=1
 [/card]
 [card]
+text=When Hidden Horror enters the battlefield, sacrifice it unless you discard a creature card.
+id=135234
+name=Hidden Horror
+rarity=U
+mana={1}{B}{B}
+type=Creature
+subtype=Horror
+auto=moveTo(graveyard) notatarget(this|myBattlefield)
+auto=moveTo(graveyard) notatarget(creature|myhand)
+power=4
+toughness=4
+[/card]
+[card]
 text=When Highway Robber enters the battlefield, target opponent loses 2 life and you gain 2 life.
 id=129564
 name=Highway Robber
@@ -2571,6 +2584,19 @@ power=1
 toughness=1
 [/card]
 [card]
+text=Trample (If this creature would deal enough combat damage to its blockers to destroy them, you may have it deal the rest of its damage to defending player.)   At the beginning of your upkeep, return a green creature you control to its owner's hand.
+auto=@each my upkeep:moveto(myhand) notatarget(creature[green]|myBattlefield)
+id=135264
+name=Stampeding Wildebeests
+rarity=U
+mana={2}{G}{G}
+type=Creature
+subtype=Antelope Beast
+power=5
+toughness=4
+abilities=trample
+[/card]
+[card]
 text={7}{W}: You gain 5 life.
 id=130385
 name=Starlight Invoker

projects/mtg/bin/Res/sets/10E/todo.dat

@@ -3,7 +3,6 @@ text=If you would draw a card, you may instead choose land or nonland and reveal
 id=130483
 name=Abundance
 rarity=R
-color=Green
 type=Enchantment
 mana={2}{G}{G}
 [/card]
@@ -12,7 +11,6 @@ text=When Academy Researchers comes into play, you may put an Aura card from you
 id=132072
 name=Academy Researchers
 rarity=U
-color=Blue
 type=Creature
 mana={1}{U}{U}
 power=2
@@ -24,7 +22,6 @@ text=Look at target player's hand and choose two cards from it. Put them on top
 id=135228
 name=Agonizing Memories
 rarity=U
-color=Black
 type=Sorcery
 mana={2}{B}{B}
 [/card]
@@ -36,7 +33,6 @@ target=creature
 auto=2/2
 auto={T}:damage:1 target(creature,player)
 rarity=U
-color=Red
 type=Enchantment
 mana={2}{R}
 subtype=Aura
@@ -48,7 +44,6 @@ name=Aura Graft
 target=aura
 auto=moveto(creature)
 rarity=U
-color=Blue
 type=Instant
 mana={1}{U}
 [/card]
@@ -57,7 +52,6 @@ text=Artifact and enchantment spells your opponents play cost {2} more to play.
 id=132127
 name=Aura of Silence
 rarity=U
-color=White
 type=Enchantment
 mana={1}{W}{W}
 [/card]
@@ -66,7 +60,6 @@ text=If an opponent controls at least four more creatures than you, Avatar of Mi
 id=135249
 name=Avatar of Might
 rarity=R
-color=Green
 type=Creature
 mana={6}{G}{G}
 power=8
@@ -78,7 +71,6 @@ text=Flying (This creature can't be blocked except by creatures with flying or r
 id=129473
 name=Aven Windreader
 rarity=C
-color=Blue
 type=Creature
 mana={3}{U}{U}
 power=3
@@ -92,7 +84,6 @@ id=129477
 name=Ballista Squad
 auto={X}{W}{T}:damage:x target(creature[attacking;blocking])
 rarity=U
-color=White
 type=Creature
 mana={3}{W}
 power=2
@@ -106,7 +97,6 @@ name=Bandage
 target=creature,player
 auto=draw:1 controller
 rarity=C
-color=White
 type=Instant
 mana={W}
 [/card]
@@ -115,8 +105,6 @@ text=Whenever Cephalid Constable deals combat damage to a player, return up to t
 id=135261
 name=Cephalid Constable
 rarity=R
-auto=@damaged(player) from(this):
-color=Blue
 type=Creature
 mana={1}{U}{U}
 power=1
@@ -130,7 +118,6 @@ id=135254
 name=Chimeric Staff
 auto={X}:becomes(Artifact Creature Construct,x/x)
 rarity=R
-color=Artifact
 type=Artifact
 mana={4}
 [/card]
@@ -139,7 +126,6 @@ text=Prevent all damage that would be dealt to Cho-Manno, Revolutionary.
 id=130554
 name=Cho-Manno, Revolutionary
 rarity=R
-color=White
 type=Legendary Creature
 mana={2}{W}{W}
 power=2
@@ -151,7 +137,6 @@ text={X}, {T}: Search your library for a creature card with converted mana cost
 id=135244
 name=Citanul Flute
 rarity=R
-color=Artifact
 type=Artifact
 mana={5}
 [/card]
@@ -160,7 +145,6 @@ text=Each creature gets +1/+1 for each other creature in play that shares a crea
 id=129502
 name=Coat of Arms
 rarity=R
-color=Artifact
 type=Artifact
 mana={5}
 [/card]
@@ -169,7 +153,6 @@ text=Look at the top five cards of your library. You may reveal a creature card
 id=130521
 name=Commune with Nature
 rarity=C
-color=Green
 type=Sorcery
 mana={G}
 [/card]
@@ -178,7 +161,6 @@ text=Put target attacking creature on the bottom of its owner's library. Its con
 id=130528
 name=Condemn
 rarity=U
-color=White
 type=Instant
 mana={W}
 [/card]
@@ -187,7 +169,6 @@ text=Cone of Flame deals 1 damage to target creature or player, 2 damage to anot
 id=130535
 name=Cone of Flame
 rarity=U
-color=Red
 type=Sorcery
 mana={3}{R}{R}
 [/card]
@@ -199,7 +180,6 @@ target=creature
 auto=aslongas(mytgt[attacking])life:-3 targetController
 auto=aslongas(mytgt[blocking])life:-3 targetController
 rarity=C
-color=Black
 type=Enchantment
 mana={1}{B}
 subtype=Aura
@@ -209,7 +189,6 @@ text=You may play land cards from your graveyard.
 id=129480
 name=Crucible of Worlds
 rarity=R
-color=Artifact
 type=Artifact
 mana={3}
 [/card]
@@ -218,7 +197,6 @@ text=Target opponent sacrifices a creature.
 id=129514
 name=Cruel Edict
 rarity=U
-color=Black
 type=Sorcery
 mana={1}{B}
 [/card]
@@ -227,7 +205,6 @@ text=Counter target spell. Look at the top four cards of your library, then put
 id=134749
 name=Discombobulate
 rarity=U
-color=Blue
 type=Instant
 mana={2}{U}{U}
 [/card]
@@ -235,10 +212,7 @@ mana={2}{U}{U}
 text=Target player reveals his or her hand. You choose a nonland card from it. That player discards that card.
 id=135219
 name=Distress
-target=*[-land]|opponentHand
-auto=moveto(opponentGraveyard)
 rarity=C
-color=Black
 type=Sorcery
 mana={B}{B}
 [/card]
@@ -247,7 +221,6 @@ text={3}, {T}: Double the amount of each type of mana in your mana pool.
 id=135243
 name=Doubling Cube
 rarity=R
-color=Artifact
 type=Artifact
 mana={2}
 [/card]
@@ -256,7 +229,6 @@ text={1}{R}: Target creature can't block Duct Crawler this turn.
 id=129579
 name=Duct Crawler
 rarity=C
-color=Red
 type=Creature
 mana={R}
 power=1
@@ -272,7 +244,6 @@ auto=tap
 auto={T}:add {U}
 auto={1}{U}:becomes(Creature Faerie,2/1,flying blue)
 #will only work if activatedability is added for becomes
-color=Land
 type=Land
 [/card]
 [card]
@@ -280,7 +251,6 @@ text=Flying (This creature can't be blocked except by creatures with flying or r
 id=132073
 name=Fog Elemental
 rarity=U
-color=Blue
 type=Creature
 mana={2}{U}
 power=4
@@ -292,7 +262,6 @@ text=Forbidding Watchtower comes into play tapped.     {T}: Add {W} to your mana
 id=106428
 name=Forbidding Watchtower
 rarity=U
-color=Land
 type=Land
 [/card]
 [card]
@@ -300,7 +269,6 @@ text=If a source would deal damage to a creature or player, it deals double that
 id=129566
 name=Furnace of Rath
 rarity=R
-color=Red
 type=Enchantment
 mana={1}{R}{R}{R}
 [/card]
@@ -311,7 +279,6 @@ name=Gaea's Herald
 auto=lord(creature|stack)shroud
 #Not tested yet could evtl work
 rarity=R
-color=Green
 type=Creature
 mana={1}{G}
 power=1
@@ -323,17 +290,14 @@ text=Ghitu Encampment comes into play tapped.     {T}: Add {R} to your mana pool
 id=106564
 name=Ghitu Encampment
 rarity=U
-color=Land
 type=Land
 [/card]
 [card]
 text=Whenever Goblin Elite Infantry blocks or becomes blocked, it gets -1/-1 until end of turn.
 id=130380
 name=Goblin Elite Infantry
-auto=bushido(-1/-1)
 #Could be coded once rampage is fixed bushido will be only a formality lot of cards have such ability but do not include the term bushido this one is an example.
 rarity=C
-color=Red
 type=Creature
 mana={1}{R}
 power=2
@@ -345,7 +309,6 @@ text=Whenever a creature you control is put into a graveyard from play, each oth
 id=129583
 name=Grave Pact
 rarity=R
-color=Black
 type=Enchantment
 mana={1}{B}{B}{B}
 [/card]
@@ -354,7 +317,6 @@ text=Guerrilla Tactics deals 2 damage to target creature or player.     When a s
 id=129588
 name=Guerrilla Tactics
 rarity=U
-color=Red
 type=Instant
 mana={1}{R}
 [/card]
@@ -363,7 +325,6 @@ text=Hail of Arrows deals X damage divided as you choose among any number of tar
 id=132107
 name=Hail of Arrows
 rarity=U
-color=White
 type=Instant
 mana={X}{W}
 [/card]
@@ -372,7 +333,6 @@ text=Target opponent puts the cards from his or her hand on top of his or her li
 id=135255
 name=Head Games
 rarity=R
-color=Black
 type=Sorcery
 mana={3}{B}{B}
 [/card]
@@ -381,29 +341,15 @@ text=Enchant creature (Target a creature as you play this. This card comes into
 id=132090
 name=Heart of Light
 rarity=C
-color=White
 type=Enchantment
 mana={2}{W}
 subtype=Aura
 [/card]
 [card]
-text=When Hidden Horror comes into play, sacrifice it unless you discard a creature card.
-id=135234
-name=Hidden Horror
-rarity=U
-color=Black
-type=Creature
-mana={1}{B}{B}
-power=4
-subtype=Horror
-toughness=4
-[/card]
-[card]
 text=Each creature you control can block an additional creature.
 id=132145
 name=High Ground
 rarity=U
-color=White
 type=Enchantment
 mana={W}
 [/card]
@@ -412,7 +358,6 @@ text=When Hunted Wumpus comes into play, each other player may put a creature ca
 id=129599
 name=Hunted Wumpus
 rarity=U
-color=Green
 type=Creature
 mana={3}{G}
 power=6
@@ -424,7 +369,6 @@ text=Incinerate deals 3 damage to target creature or player. A creature dealt da
 id=134751
 name=Incinerate
 rarity=C
-color=Red
 type=Instant
 mana={1}{R}
 [/card]
@@ -433,7 +377,6 @@ text=Karplusan Strider can't be the target of blue or black spells.
 id=129911
 name=Karplusan Strider
 rarity=U
-color=Green
 type=Creature
 mana={3}{G}
 power=3
@@ -445,7 +388,6 @@ text={T}: All combat damage that would be dealt to you by unblocked creatures th
 id=130551
 name=Kjeldoran Royal Guard
 rarity=R
-color=White
 type=Creature
 mana={3}{W}{W}
 power=2
@@ -457,7 +399,6 @@ text={B}{B}: Destroy target creature blocking Knight of Dusk.
 id=129574
 name=Knight of Dusk
 rarity=U
-color=Black
 type=Creature
 mana={1}{B}{B}
 power=2
@@ -471,24 +412,22 @@ name=Legacy Weapon
 auto={W}{U}{B}{R}{G}:moveto(exile) target(*)
 #as the same ability as darksteel collosus
 rarity=R
-color=Artifact
 abilities=legendary
 type=Artifact
 mana={7}
 [/card]
 [card]
-text=When Llanowar Sentinel comes into play, you may pay {1}{G}. If you do, search your library for a card named Llanowar Sentinel and put that card into play. Then shuffle your library.
+####Cannot be integrated for now because normally you should be able to search for a sentinel EACH time a sentinel enters the battlefield. Read Gatherer-Card-Info for more information. (0.10.1)
+text=When Llanowar Sentinel enters the battlefield, you may pay {1}{G}. If you do, search your library for a card named Llanowar Sentinel and put that card into play. Then shuffle your library.
 id=129536
 name=Llanowar Sentinel
 rarity=C
-color=Green
 type=Creature
+subtype=Elf
 mana={2}{G}
 kicker={1}{G}
-#does not work in WTH 0.8.1
 auto=kicker moveto(mybattlefield) target(Llanowar Sentinel|mylibrary)
 power=2
-subtype=Elf
 toughness=3
 [/card]
 [card]
@@ -496,7 +435,6 @@ text=When Loyal Sentry blocks a creature, destroy that creature and Loyal Sentry
 id=129798
 name=Loyal Sentry
 rarity=R
-color=White
 type=Creature
 mana={W}
 power=1
@@ -508,7 +446,6 @@ text=Prevent all damage that black sources and red sources would deal this turn.
 id=129912
 name=Luminesce
 rarity=U
-color=White
 type=Instant
 mana={W}
 [/card]
@@ -517,7 +454,6 @@ text=Enchant creature (Target a creature as you play this. This card comes into
 id=135226
 name=Lure
 rarity=U
-color=Green
 type=Enchantment
 mana={1}{G}{G}
 subtype=Aura
@@ -529,8 +465,7 @@ name=Manabarbs
 #will also deal damage if land not tapped for mana
 auto=@tapped(land|opponentBattlefield):damage:1 opponent
 auto=@tapped(land|myBattlefield):damage:1 controller
-rarity=R
-color=Red
+rarity=
 type=Enchantment
 mana={3}{R}
 [/card]
@@ -540,7 +475,6 @@ id=106555
 name=March of the Machines
 auto=lord(artifact[-creature])becomes(Artifact Creature,manacost/manacost)
 rarity=R
-color=Blue
 type=Enchantment
 mana={3}{U}
 [/card]
@@ -550,7 +484,6 @@ id=130900
 name=Merfolk Looter
 auto={T}:draw:1 controller && moveto(graveyard) target(*|myHand)
 rarity=C
-color=Blue
 type=Creature
 mana={1}{U}
 power=1
@@ -562,7 +495,6 @@ text=Remove X target creature cards in your graveyard from the game. For each cr
 id=135272
 name=Midnight Ritual
 rarity=R
-color=Black
 type=Sorcery
 mana={X}{2}{B}
 [/card]
@@ -571,18 +503,14 @@ text=Change the text of target permanent by replacing all instances of one color
 id=129644
 name=Mind Bend
 rarity=R
-color=Blue
 type=Instant
 mana={U}
 [/card]
 [card]
 text=Target player discards two cards.
 id=129645
-target=player
-auto=discard:2
 name=Mind Rot
 rarity=C
-color=Black
 type=Sorcery
 mana={2}{B}
 [/card]
@@ -591,7 +519,6 @@ text=At the beginning of your upkeep, if twenty or more creature cards are in yo
 id=135259
 name=Mortal Combat
 rarity=R
-color=Black
 type=Enchantment
 mana={2}{B}{B}
 [/card]
@@ -600,7 +527,6 @@ text=Sacrifice No Rest for the Wicked: Return to your hand all creature cards th
 id=136283
 name=No Rest for the Wicked
 rarity=U
-color=Black
 type=Enchantment
 mana={1}{B}
 [/card]
@@ -609,8 +535,6 @@ text={W}, {T}: Put target Aura card in a graveyard into play attached to a creat
 id=130547
 name=Nomad Mythmaker
 rarity=R
-auto=moveto(creature|myBattlefield) target(aura|graveyard)
-color=White
 type=Creature
 mana={2}{W}
 power=2
@@ -624,7 +548,6 @@ name=Overgrowth
 target=land
 auto=@tapped(this):add{G}{G}
 rarity=C
-color=Green
 type=Enchantment
 mana={2}{G}
 subtype=Aura
@@ -634,7 +557,6 @@ text=Enchant creature (Target a creature as you play this. This card comes into
 id=135248
 name=Pariah
 rarity=R
-color=White
 type=Enchantment
 mana={2}{W}
 subtype=Aura
@@ -643,10 +565,7 @@ subtype=Aura
 text=Look at target player's hand.     Draw a card.
 id=130903
 name=Peek
-target=opponenthand
-auto=draw:1 controller
 rarity=C
-color=Blue
 type=Instant
 mana={U}
 [/card]
@@ -655,7 +574,6 @@ text=When Phage the Untouchable comes into play, if you didn't play it from your
 id=106427
 name=Phage the Untouchable
 rarity=R
-color=Black
 type=Legendary Creature
 mana={3}{B}{B}{B}{B}
 power=4
@@ -667,7 +585,6 @@ text=As Pithing Needle comes into play, name a card.     Activated abilities of
 id=129526
 name=Pithing Needle
 rarity=R
-color=Artifact
 type=Artifact
 mana={1}
 [/card]
@@ -676,7 +593,6 @@ text=Until end of turn, if target player would draw a card, instead that player
 id=129883
 name=Plagiarize
 rarity=R
-color=Blue
 type=Instant
 mana={3}{U}
 [/card]
@@ -685,7 +601,6 @@ text=Flying (This creature can't be blocked except by creatures with flying or r
 id=106537
 name=Platinum Angel
 rarity=R
-color=Artifact
 type=Artifact Creature
 mana={7}
 power=4
@@ -696,9 +611,7 @@ toughness=4
 text=When Ravenous Rats comes into play, target opponent discards a card.
 id=129692
 name=Ravenous Rats
-auto=discard:1 target(player)
 rarity=C
-color=Black
 type=Creature
 mana={1}{B}
 power=1
@@ -710,7 +623,6 @@ text=First strike (This creature deals combat damage before creatures without fi
 id=106552
 name=Razormane Masticore
 rarity=R
-color=Artifact
 type=Artifact Creature
 mana={5}
 power=5
@@ -722,7 +634,6 @@ text=Untap all creatures that attacked this turn. After this main phase, there i
 id=129697
 name=Relentless Assault
 rarity=R
-color=Red
 type=Sorcery
 mana={2}{R}{R}
 [/card]
@@ -731,7 +642,6 @@ text=You may have Rhox assign its combat damage as though it weren't blocked.
 id=106504
 name=Rhox
 rarity=R
-color=Green
 type=Creature
 mana={4}{G}{G}
 power=5
@@ -744,7 +654,6 @@ id=135251
 name=Root Maze
 auto=lord(artifact,land) tap
 rarity=R
-color=Green
 type=Enchantment
 mana={G}
 [/card]
@@ -753,7 +662,6 @@ text={T}: Gain control of target creature as long as that creature is enchanted.
 id=135252
 name=Rootwater Matriarch
 rarity=R
-color=Blue
 type=Creature
 mana={2}{U}{U}
 power=2
@@ -765,7 +673,6 @@ text=Each player can't play more than one spell each turn.
 id=136291
 name=Rule of Law
 rarity=U
-color=White
 type=Enchantment
 mana={2}{W}
 [/card]
@@ -774,7 +681,6 @@ text=Flying (This creature can't be blocked except by creatures with flying or r
 id=135217
 name=Sage Owl
 rarity=C
-color=Blue
 type=Creature
 mana={1}{U}
 power=1
@@ -786,7 +692,6 @@ text={T}: Prevent the next 1 damage that would be dealt to target creature or pl
 id=132101
 name=Samite Healer
 rarity=C
-color=White
 type=Creature
 mana={1}{W}
 power=1
@@ -798,7 +703,6 @@ text=Flying (This creature can't be blocked except by creatures with flying or r
 id=130818
 name=Scalpelexis
 rarity=R
-color=Blue
 type=Creature
 mana={4}{U}
 power=1
@@ -810,7 +714,6 @@ text=At the beginning of your upkeep, flip a coin. If you lose the flip, return
 id=130374
 name=Scoria Wurm
 rarity=R
-color=Red
 type=Creature
 mana={4}{R}
 power=7
@@ -822,7 +725,6 @@ text=Flying (This creature can't be blocked except by creatures with flying or r
 id=129724
 name=Sengir Vampire
 rarity=R
-color=Black
 type=Creature
 mana={3}{B}{B}
 power=4
@@ -834,7 +736,6 @@ text=Change the target of target spell with a single target.
 id=130362
 name=Shunt
 rarity=R
-color=Red
 type=Instant
 mana={1}{R}{R}
 [/card]
@@ -847,7 +748,6 @@ target=*|myhand
 auto=moveto(mygraveyard) 
 name=Sift
 rarity=C
-color=Blue
 type=Sorcery
 mana={3}{U}
 [/card]
@@ -856,7 +756,6 @@ text=Spawning Pool comes into play tapped.     {T}: Add {B} to your mana pool.
 id=106556
 name=Spawning Pool
 rarity=U
-color=Land
 type=Land
 [/card]
 [card]
@@ -864,7 +763,6 @@ text=You have no maximum hand size.
 id=129741
 name=Spellbook
 rarity=U
-color=Artifact
 type=Artifact
 mana={0}
 [/card]
@@ -873,20 +771,17 @@ text=Flying (This creature can't be blocked except by creatures with flying or r
 id=129901
 name=Spiketail Hatchling
 rarity=U
-color=Blue
 type=Creature
 mana={1}{U}
 power=1
 subtype=Drake
 toughness=1
 [/card]
-
 [card]
 text=Stalking Tiger can't be blocked by more than one creature.
 id=135184
 name=Stalking Tiger
 rarity=C
-color=Green
 type=Creature
 mana={3}{G}
 power=3
@@ -894,24 +789,10 @@ subtype=Cat
 toughness=3
 [/card]
 [card]
-text=Trample (If this creature would deal enough combat damage to its blockers to destroy them, you may have it deal the rest of its damage to defending player.)  At the beginning of your upkeep, return a green creature you control to its owner's hand.
-id=135264
-name=Stampeding Wildebeests
-#does not work because you cannot have a target after a line with @
-auto=@each my upkeep:moveto(myhand) target(creature[green]|myBattlefield)
-rarity=U
-type=Creature
-mana={2}{G}{G}
-power=5
-subtype=Antelope Beast
-toughness=4
-[/card]
-[card]
 text=You can't play creature spells.
 id=135235
 name=Steel Golem
 rarity=U
-color=Artifact
 type=Artifact Creature
 mana={3}
 power=3
@@ -923,7 +804,6 @@ text=As Story Circle comes into play, choose a color.     {W}: The next time a s
 id=129748
 name=Story Circle
 rarity=R
-color=White
 type=Enchantment
 mana={1}{W}{W}
 [/card]
@@ -931,8 +811,6 @@ mana={1}{W}{W}
 text=At the beginning of each player's upkeep, that player returns a creature he or she controls to its owner's hand.
 id=129509
 name=Sunken Hope
-auto=@each my upkeep:moveto(ownerHand) target(creature|myinplay)
-auto=@each opponent upkeep:moveto(ownerHand) target(creature|Opponentinplay)
 rarity=R
 type=Enchantment
 mana={3}{U}{U}
@@ -942,7 +820,6 @@ text=Your opponents play with their hands revealed.
 id=129761
 name=Telepathy
 rarity=U
-color=Blue
 type=Enchantment
 mana={U}
 [/card]
@@ -951,7 +828,6 @@ text=Look at the top three cards of your library. Put one of those cards into yo
 id=132071
 name=Telling Time
 rarity=U
-color=Blue
 type=Instant
 mana={1}{U}
 [/card]
@@ -960,9 +836,6 @@ text={1}{B}, Sacrifice Thrull Surgeon: Look at target player's hand and choose a
 id=136282
 name=Thrull Surgeon
 rarity=U
-auto={1}{B}{S}:moveto(graveyard) target(*|opponentHand)
-#unfortunately you can target opponenthand but it does not show when targetted
-color=Black
 type=Creature
 mana={1}{B}
 power=1
@@ -974,7 +847,6 @@ text=End the turn. (Remove all spells and abilities on the stack from the game,
 id=129898
 name=Time Stop
 rarity=R
-color=Blue
 type=Instant
 mana={4}{U}{U}
 [/card]
@@ -983,7 +855,6 @@ text=Target player takes two extra turns after this one.
 id=129677
 name=Time Stretch
 rarity=R
-color=Blue
 type=Sorcery
 mana={8}{U}{U}
 [/card]
@@ -992,7 +863,6 @@ text=Treetop Village comes into play tapped.     {T}: Add {G} to your mana pool.
 id=106455
 name=Treetop Village
 rarity=U
-color=Land
 type=Land
 [/card]
 [card]
@@ -1000,7 +870,6 @@ text=You have shroud. (You can't be the target of spells or abilities.)
 id=129610
 name=True Believer
 rarity=R
-color=White
 type=Creature
 mana={W}{W}
 power=2
@@ -1012,7 +881,6 @@ text=Copy target instant or sorcery spell. You may choose new targets for the co
 id=129887
 name=Twincast
 rarity=R
-color=Blue
 type=Instant
 mana={U}{U}
 [/card]
@@ -1021,7 +889,6 @@ text=Mana pools don't empty at the end of phases or turns. (This effect stops ma
 id=130494
 name=Upwelling
 rarity=R
-color=Green
 type=Enchantment
 mana={3}{G}
 [/card]
@@ -1030,7 +897,6 @@ text=Viashino Runner can't be blocked except by two or more creatures.
 id=130531
 name=Viashino Runner
 rarity=C
-color=Red
 type=Creature
 mana={3}{R}
 power=3
@@ -1042,7 +908,6 @@ text=Flying (This creature can't be blocked except by creatures with flying or r
 id=136290
 name=Voice of All
 rarity=R
-color=White
 type=Creature
 mana={2}{W}{W}
 power=2
@@ -1054,7 +919,6 @@ text=Each player shuffles all permanents he or she owns into his or her library,
 id=130364
 name=Warp World
 rarity=R
-color=Red
 type=Sorcery
 mana={5}{R}{R}{R}
 [/card]

projects/mtg/bin/Res/sets/5DN/_cards.dat

@@ -231,6 +231,19 @@ auto={1}:equip
 rarity=C
 [/card]
 [card]
+text=Fear (This creature can't be blocked except by artifact creatures and/or black creatures.)   Whenever a player casts a spell, sacrifice a creature.
+id=50204
+name=Desecration Elemental
+rarity=R
+mana={3}{B}
+type=Creature
+subtype=Elemental
+auto=@movedto(*|stack):moveTo(ownergraveyard) notatarget(creature|myBattlefield)
+power=8
+toughness=8
+abilities=fear
+[/card]
+[card]
 text=Destroy target creature. It can't be regenerated. You lose life equal to that creature's toughness.
 id=50210
 target=creature

projects/mtg/bin/Res/sets/5DN/todo.dat

@@ -211,21 +211,6 @@ text=Enchant land Whenever enchanted land is tapped for mana, its controller add
 rarity=C
 [/card]
 [card]
-id=50204
-name=Desecration Elemental
-mana={3}{B}
-type=Creature
-subtype=Elemental
-power=8
-toughness=8
-text=Fear (This creature can't be blocked except by artifact creatures and/or black creatures.) Whenever a player casts a spell, sacrifice a creature.
-# Following line does not work: triggered effects can't choose
-# targets. (Also the effect could probably be canceled.)
-auto=@movedto(*|stack):bury target(creature|mybattlefield)
-abilities=Fear
-rarity=R
-[/card]
-[card]
 id=76971
 name=Disruption Aura
 mana={2}{U}

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

@@ -254,7 +254,7 @@ toughness=1
 [card]
 text=Island Fish Jasconius can't attack unless defending player controls an Island.   Jasconius doesn't untap during your untap step.   At the beginning of your upkeep, you may pay {U}{U}{U}. If you do, untap Jasconius.   When you control no Islands, sacrifice Jasconius.
 id=935
-auto={U}{U}{U}:untap
+auto={U}{U}{U}:untap myUpkeepOnly
 name=Island Fish Jasconius
 rarity=R
 mana={4}{U}{U}{U}

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

@@ -342,7 +342,7 @@ text=Enchant creature   Enchanted creature has flying.   Sacrifice Phantom Wings
 id=74496
 target=creature
 auto=flying
-auto={S}:moveTo(ownerhand)
+auto={S}:moveTo(ownerhand) notatarget(mytgt)
 name=Phantom Wings
 rarity=C
 mana={1}{U}

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

@@ -257,6 +257,17 @@ power=2
 toughness=2
 [/card]
 [card]
+text=Dark Temper deals 2 damage to target creature. If you control a black permanent, destroy the creature instead.
+id=185143
+target=creature
+auto=aslongas(*[black]|myBattlefield) destroy
+auto=damage:2
+name=Dark Temper
+rarity=C
+mana={2}{R}
+type=Instant
+[/card]
+[card]
 text=Flying   {B}: Darklit Gargoyle gets +2/-1 until end of turn.
 id=180334
 name=Darklit Gargoyle
@@ -322,6 +333,19 @@ toughness=3
 abilities=flying
 [/card]
 [card]
+text=Flying   At the beginning of your upkeep, return an artifact you control to its owner's hand.
+auto=@each my upkeep:moveTo(ownerhand) notatarget(artifact|myBattlefield)
+id=180158
+name=Esperzoa
+rarity=U
+mana={2}{U}
+type=Artifact Creature
+subtype=Jellyfish
+power=4
+toughness=3
+abilities=flying
+[/card]
+[card]
 text=Flying   {1}{W}{B}, {T}: Destroy target creature or enchantment.   {2}{U}: Untap Ethersworn Adjudicator.
 id=175035
 name=Ethersworn Adjudicator

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

@@ -52,17 +52,6 @@ type=Sorcery
 mana={3}{W}{U}{B}{R}{G}
 [/card]
 [card]
-text=Dark Temper deals 2 damage to target creature. If you control a black permanent, destroy the creature instead.
-id=185143
-target=creature
-auto=aslongas(*[black]|myinplay)destroy
-auto=damage:2
-name=Dark Temper
-rarity=C
-type=Instant
-mana={2}{R}
-[/card]
-[card]
 text=First strike     {W}{U}{B}{R}{G}: Until end of turn, Dragonsoul Knight becomes a Dragon, gets +5/+3, and gains flying and trample.
 id=186392
 name=Dragonsoul Knight
@@ -83,17 +72,6 @@ mana={3}{U}{B}{R}
 subtype=Aura
 [/card]
 [card]
-text=Flying     At the beginning of your upkeep, return an artifact you control to its owner's hand.
-id=180158
-name=Esperzoa
-rarity=U
-type=Artifact Creature
-mana={2}{U}
-power=4
-subtype=Jellyfish
-toughness=3
-[/card]
-[card]
 text={T}: Add to your mana pool one mana of any color that a land an opponent controls could produce.
 id=189273
 name=Exotic Orchard
@@ -317,7 +295,6 @@ power=6
 subtype=Demon Dragon
 toughness=6
 [/card]
-
 [card]
 text=Prevent all noncombat damage that would be dealt to creatures you control.
 id=186615
@@ -368,7 +345,6 @@ power=4
 subtype=Rhino Soldier
 toughness=4
 [/card]
-
 [card]
 text=Vigilance     {R}, {T}: Target creature can't block this turn.     {G}, {T}: Target creature blocks this turn if able.
 abilities=vigilance
@@ -475,7 +451,6 @@ name=Rupture Spire
 rarity=C
 type=Land
 [/card]
-
 [card]
 text={1}{B}, {T}: Target player discards a card. Play this ability only during your turn.
 id=189084

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

@@ -269,6 +269,18 @@ toughness=2
 abilities=flying
 [/card]
 [card]
+text=Whenever you cast a Spirit or Arcane spell, target creature gains flying until end of turn.
+auto=@movedTo(arcane,spirit|mystack):flying target(creature) ueot
+id=79194
+name=Guardian of Solitude
+rarity=U
+mana={1}{U}
+type=Creature
+subtype=Spirit
+power=1
+toughness=2
+[/card]
+[card]
 text={1}{G}, Sacrifice Hana Kami: Return target Arcane card from your graveyard to your hand.
 auto={1}{G}{S}:moveTo(myhand) target(arcane|mygraveyard)
 id=77138
@@ -285,9 +297,9 @@ text=Counter target Spirit or Arcane spell.
 target=spirit,arcane|stack
 auto=fizzle
 rarity=C
+mana={1}{U}
 id=50439
 name=Hisoka's Defiance
-mana={1}{U}
 type=Instant
 [/card]
 [card]
@@ -310,6 +322,16 @@ type=Legendary Enchantment
 subtype=Shrine
 [/card]
 [card]
+text=At the beginning of your upkeep, Honden of Infinite Rage deals damage to target creature or player equal to the number of Shrines you control.
+auto=@each my upkeep:foreach(shrine|myBattlefield) damage:1 target(creature,player)
+id=79110
+name=Honden of Infinite Rage
+mana={2}{R}
+type=Legendary Enchantment
+subtype=Shrine
+rarity=U
+[/card]
+[card]
 text=At the beginning of your upkeep, put a 1/1 colorless Spirit creature token onto the battlefield for each Shrine you control.
 auto=@each my upkeep:foreach(shrine|myBattlefield) token(Spirit,Creature Spirit,1/1,artifact)
 id=79180
@@ -330,6 +352,18 @@ type=Legendary Enchantment
 subtype=Shrine
 [/card]
 [card]
+text=Whenever you cast a Spirit or Arcane spell, regenerate target creature.
+auto=@movedTo(arcane,spirit|mystack):regenerate target(creature)
+id=79226
+name=Horizon Seed
+rarity=U
+mana={4}{W}
+type=Creature
+subtype=Spirit
+power=2
+toughness=1
+[/card]
+[card]
 text=Shroud
 id=78684
 name=Humble Budoka
@@ -482,6 +516,18 @@ power=2
 toughness=2
 [/card]
 [card]
+text=Whenever you cast a Spirit or Arcane spell, target creature can't block this turn.
+auto=@movedTo(arcane,spirit|mystack):cantblock target(creature)
+id=79195
+name=Kami of Fire's Roar
+rarity=C
+mana={3}{R}
+type=Creature
+subtype=Spirit
+power=2
+toughness=3
+[/card]
+[card]
 text=Flying   Soulshift 5 (When this is put into a graveyard from the battlefield, you may return target Spirit card with converted mana cost 5 or less from your graveyard to your hand.)
 id=77921
 name=Kami of Lunacy
@@ -546,6 +592,19 @@ toughness=2
 abilities=flying,first strike
 [/card]
 [card]
+text=Flying   Whenever you cast a Spirit or Arcane spell, target creature gains fear until end of turn.
+auto=@movedTo(arcane,spirit|mystack):fear target(creature)
+id=50311
+name=Kami of the Waning Moon
+rarity=C
+mana={2}{B}
+type=Creature
+subtype=Spirit
+power=1
+toughness=1
+abilities=flying
+[/card]
+[card]
 text=Sacrifice Kami of Twisted Reflection: Return target creature you control to its owner's hand.
 id=50228
 name=Kami of Twisted Reflection
@@ -798,14 +857,28 @@ rarity=U
 [/card]
 [card]
 text={T}: Add {G} to your mana pool.   {G}, {T}: Target legendary Creature gets +1/+1 until end of turn.
-auto={T}:Add {G}
-auto={G}{T}:1/1 target(creature[legendary])
 id=80251
 name=Okina, Temple to the Grandfathers
+auto={T}:Add {G}
+auto={G}{T}:1/1 target(creature[legendary])
 rarity=R
 type=Legendary Land
 [/card]
 [card]
+text=Enchant creature   At the beginning of your upkeep, sacrifice a creature.   Enchanted creature gets +3/+3 and has trample.   Enchanted creature is a Demon Spirit.
+auto=@each my upkeep:moveTo(graveyard) notatarget(creature|myBattlefield)
+id=197016
+target=creature
+auto=becomes(Creature Demon Spirit,p/t)
+auto=3/3
+auto=trample
+name=Oni Possession
+rarity=U
+mana={2}{B}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
 text=Reach (This creature can block creatures with flying.)   Whenever you cast a Spirit or Arcane spell, Orbweaver Kumo gains forestwalk until end of turn.
 id=50261
 name=Orbweaver Kumo
@@ -830,7 +903,7 @@ toughness=3
 [/card]
 [card]
 text=Whenever you cast a Spirit or Arcane spell, you may destroy target nonbasic land.
-auto=@movedTo(spirit,arcane|mystack):may destroy(land[-basic])
+auto=@movedTo(spirit,arcane|mystack):may destroy target(land[-basic])
 id=78984
 name=Ore Gorger
 rarity=U
@@ -1055,11 +1128,11 @@ power=6
 toughness=5
 [/card]
 [card]
-text=Flash   Enchant creature Enchanted creature gets +1/+1.   {G}: Regenerate enchanted creature.
+text=Flash   Enchant creature   Enchanted creature gets +1/+1.   {G}: Regenerate enchanted creature.
+id=75404
 target=creature
 auto=1/1
 auto={G}:regenerate
-id=75404
 name=Serpent Skin
 rarity=C
 mana={2}{G}
@@ -1124,6 +1197,18 @@ toughness=3
 abilities=mountainwalk
 [/card]
 [card]
+text=Whenever you cast a Spirit or Arcane spell, Soul of Magma deals 1 damage to target creature.
+auto=@movedTo(arcane,spirit|mystack):damage:1 target(creature)
+id=79253
+name=Soul of Magma
+rarity=C
+mana={3}{R}{R}
+type=Creature
+subtype=Spirit
+power=2
+toughness=2
+[/card]
+[card]
 text=As an additional cost to play Soulblast, sacrifice all creatures you control.  Soulblast deals damage to target creature or player equal to the total power of the sacrificed creatures.
 id=80246
 alias=130369
@@ -1135,9 +1220,10 @@ target=creature,player
 [/card]
 [card]
 text=Destroy target land.
+id=79223
+
 target=land
 auto=destroy
-id=79223
 name=Stone Rain
 rarity=C
 mana={2}{R}
@@ -1145,9 +1231,9 @@ type=Sorcery
 [/card]
 [card]
 text=Target creature gets +X/+X until end of turn, where X is the number of lands you control.
+id=75366
 target=creature
 auto=foreach(land|myBattlefield) 1/1
-id=75366
 name=Strength of Cedars
 rarity=U
 mana={4}{G}
@@ -1155,6 +1241,18 @@ type=Instant
 subtype=Arcane
 [/card]
 [card]
+text=Swallowing Plague deals X damage to target creature and you gain X life.
+id=79089
+target=creature
+auto=damage:X
+auto=life:X controller
+name=Swallowing Plague
+rarity=U
+mana={X}{B}{B}
+type=Sorcery
+subtype=Arcane
+[/card]
+[card]
 id=79073
 name=Swamp
 auto={T}:Add {B}
@@ -1192,14 +1290,14 @@ rarity=L
 [/card]
 [card]
 text=Flying   Whenever you cast a Spirit or Arcane spell, you may tap or untap target creature.
+auto=@movedTo(arcane,spirit|mystack):may tap target(creature)
+auto=@movedTo(arcane,spirit|mystack):may untap target(creature)
 id=75285
 name=Teller of Tales
 rarity=C
 mana={3}{U}{U}
 type=Creature
 subtype=Spirit
-auto=@movedTo(arcane,spirit|mystack):may tap target(creature)
-auto=@movedTo(arcane,spirit|mystack):may untap target(creature)
 power=3
 toughness=3
 abilities=flying
@@ -1219,14 +1317,14 @@ abilities=flying,trample
 [/card]
 [card]
 text=Whenever you cast a Spirit or Arcane spell, target opponent loses 1 life and you gain 1 life.   Soulshift 2 (When this is put into a graveyard from the battlefield, you may return target Spirit card with converted mana cost 2 or less from your graveyard to your hand.)
+auto=@movedTo(arcane,spirit|mystack):life:-1 opponent && life:1 controller
+auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(other spirit[manacost<=2]|mygraveyard)
 id=77920
 name=Thief of Hope
 rarity=U
 mana={2}{B}
 type=Creature
 subtype=Spirit
-auto=@movedTo(arcane,spirit|mystack):life:-1 opponent && life:1 controller
-auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(other spirit[manacost<=2]|mygraveyard)
 power=2
 toughness=2
 [/card]
@@ -1242,32 +1340,32 @@ type=Instant
 [/card]
 [card]
 text=Soulshift 7 (When this is put into a graveyard from the battlefield, you may return target Spirit card with converted mana cost 7 or less from your graveyard to your hand.)
+auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(other spirit[manacost<=7]|mygraveyard)
 id=50438
 name=Thousand-legged Kami
 rarity=U
 mana={6}{G}{G}
 type=Creature
 subtype=Spirit
-auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(other spirit[manacost<=7]|mygraveyard)
 power=6
 toughness=6
 [/card]
 [card]
 text=Search your library for a legendary creature card, reveal it, and put it into your hand. Then shuffle your library.
 id=78987
+target=creature[legendary]|mylibrary
+auto=moveTo(myHand)
 name=Time of Need
 rarity=U
 mana={1}{G}
 type=Sorcery
-target=creature[legendary]|mylibrary
-auto=moveTo(myHand)
 [/card]
 [card]
 text=Enchant Creature   Flash   Enchanted Creature gets +2/+2 and attacks each turn if able.
+id=50315
 target=creature
 auto=2/2
 auto=mustattack
-id=50315
 name=Uncontrollable Anger
 rarity=C
 mana={2}{R}{R}
@@ -1277,9 +1375,9 @@ abilities=flash
 [/card]
 [card]
 text=Target Creature gains haste until end of turn.
+id=77926
 target=creature
 auto=haste
-id=77926
 name=Unnatural Speed
 rarity=C
 mana={R}
@@ -1301,9 +1399,9 @@ abilities=reach
 [/card]
 [card]
 text=Enchant Creature   Enchanted Creature has vigilance.
+id=50414
 target=creature
 auto=vigilance
-id=50414
 name=Vigilance
 rarity=C
 mana={W}

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

@@ -526,17 +526,6 @@ text=You have no maximum hand size.
 rarity=U
 [/card]
 [card]
-id=79194
-name=Guardian of Solitude
-mana={1}{U}
-type=Creature
-subtype=Spirit
-power=1
-toughness=2
-text=Whenever you play a Spirit or Arcane spell, target creature gains flying until end of turn.
-rarity=U
-[/card]
-[card]
 id=79088
 name=Gutwrencher Oni
 mana={3}{B}{B}
@@ -672,17 +661,6 @@ text=You may choose not to untap Hisoka's Guard during your untap step. {1}{U},
 rarity=C
 [/card]
 [card]
-id=79110
-name=Honden of Infinite Rage
-mana={2}{R}
-type=Enchantment
-subtype=Shrine
-abilities=Legendary
-text=At the beginning of your upkeep, Honden of Infinite Rage deals damage to target creature or player equal to the number of Shrines you control.
-auto=@each my upkeep:foreach(shrine|myinplay) damage:1 target(creature,player)
-rarity=U
-[/card]
-[card]
 id=79098
 name=Honden of Night's Reach
 mana={3}{B}
@@ -700,17 +678,6 @@ text={T}: Add {1} to your mana pool. Tap an untapped legendary permanent you con
 rarity=U
 [/card]
 [card]
-id=79226
-name=Horizon Seed
-mana={4}{W}
-type=Creature
-subtype=Spirit
-power=2
-toughness=1
-text=Whenever you play a Spirit or Arcane spell, regenerate target creature.
-rarity=U
-[/card]
-[card]
 id=78854
 name=Horobi, Death's Wail
 mana={2}{B}{B}
@@ -800,28 +767,6 @@ text={2}{U}, {T}: Draw a card. If you have nine or more cards in hand, flip Jush
 rarity=R
 [/card]
 [card]
-id=79195
-name=Kami of Fire's Roar
-mana={3}{R}
-type=Creature
-subtype=Spirit
-power=2
-toughness=3
-text=Whenever you play a Spirit or Arcane spell, target creature can't block this turn.
-rarity=C
-[/card]
-[card]
-id=50311
-name=Kami of the Waning Moon
-mana={2}{B}
-type=Creature
-subtype=Spirit
-power=1
-toughness=1
-text=Flying Whenever you play a Spirit or Arcane spell, target creature gains fear until end of turn.
-rarity=C
-[/card]
-[card]
 id=76634
 name=Kashi-Tribe Reaver
 mana={3}{G}
@@ -1045,7 +990,6 @@ type=Sorcery
 text=Sacrifice any number of lands. Add {1} to your mana pool for each land sacrificed this way.
 rarity=U
 [/card]
-
 [card]
 id=79215
 name=Masako the Humorless
@@ -1068,8 +1012,6 @@ toughness=3
 text={2}{G}: Target creature blocks Matsu-Tribe Decoy this turn if able. Whenever Matsu-Tribe Decoy deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step.
 rarity=C
 [/card]
-
-
 [card]
 id=75248
 name=Mindblaze
@@ -1097,7 +1039,6 @@ toughness=2
 text=Flying Bushido 1 (When this blocks or becomes blocked, it gets +1/+1 until end of turn.)
 rarity=C
 [/card]
-
 [card]
 id=78681
 name=Myojin of Cleansing Fire
@@ -1153,7 +1094,6 @@ toughness=3
 text=Myojin of Seeing Winds comes into play with a divinity counter on it if you played it from your hand. Myojin of Seeing Winds is indestructible as long as it has a divinity counter on it. Remove a divinity counter from Myojin of Seeing Winds: Draw a card for each permanent you control.
 rarity=R
 [/card]
-
 [card]
 id=79136
 name=Nagao, Bound by Honor
@@ -1223,7 +1163,6 @@ type=Enchantment
 text=Whenever a source you control deals damage to another player, put that many theft counters on Night Dealings. {2}{B}{B}, Remove X theft counters from Night Dealings: Search your library for a nonland card with converted mana cost X, reveal it, and put it into your hand. Then shuffle your library.
 rarity=R
 [/card]
-
 [card]
 id=50413
 name=Nine-Ringed Bo
@@ -1232,7 +1171,6 @@ type=Artifact
 text={T}: Nine-Ringed Bo deals 1 damage to target Spirit creature. If that creature would be put into a graveyard this turn, remove it from the game instead.
 rarity=U
 [/card]
-
 [card]
 id=50431
 name=Numai Outcast
@@ -1253,17 +1191,6 @@ subtype=Equipment
 text=Equipped creature gets +3/+1. Whenever equipped creature is put into a graveyard from play, return that card to play under your control if it's a Samurai. When Oathkeeper, Takeno's Daisho is put into a graveyard from play, remove equipped creature from the game. Equip {2}
 rarity=R
 [/card]
-[card]
-id=197016
-name=Oni Possession
-mana={2}{B}
-type=Enchantment
-subtype=Aura
-text=Enchant creature At the beginning of your upkeep, sacrifice a creature. Enchanted creature gets +3/+3 and has trample. Enchanted creature is a Demon Spirit.
-rarity=U
-[/card]
-
-
 [card]
 id=78975
 name=Orochi Eggwatcher (Shidako, Broodmistress)
@@ -1304,7 +1231,6 @@ toughness=1
 text=Whenever Orochi Ranger deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step.
 rarity=C
 [/card]
-
 [card]
 id=197017
 name=Otherworldly Journey
@@ -1373,7 +1299,6 @@ toughness=2
 text=At the beginning of your upkeep, put a devotion counter on Pious Kitsune. Then if a creature named Eight-and-a-Half-Tails is in play, you gain 1 life for each devotion counter on Pious Kitsune. {T}, Remove a devotion counter from Pious Kitsune: You gain 1 life.
 rarity=C
 [/card]
-
 [card]
 id=80242
 name=Psychic Puppetry
@@ -1635,17 +1560,6 @@ text=Other Snake creatures you control get +1/+0. Whenever a Warrior you control
 rarity=U
 [/card]
 [card]
-id=79253
-name=Soul of Magma
-mana={3}{R}{R}
-type=Creature
-subtype=Spirit
-power=2
-toughness=2
-text=Whenever you play a Spirit or Arcane spell, Soul of Magma deals 1 damage to target creature.
-rarity=C
-[/card]
-[card]
 id=50288
 name=Soulless Revival
 mana={1}{B}
@@ -1701,15 +1615,6 @@ toughness=1
 text=When Student of Elements has flying, flip it. rarity=U
 [/card]
 [card]
-id=79089
-name=Swallowing Plague
-mana={X}{B}{B}
-type=Sorcery
-subtype=Arcane
-text=Swallowing Plague deals X damage to target creature and you gain X life.
-rarity=U
-[/card]
-[card]
 id=80276
 name=Swirl the Mists
 mana={2}{U}{U}

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

@@ -409,6 +409,25 @@ auto=bury
 rarity=U
 [/card]
 [card]
+text=Flying   As long as Pristine Angel is untapped, it has protection from artifacts and from all colors.   Whenever you cast a spell, you may untap Pristine Angel.
+id=47587
+name=Pristine Angel
+rarity=R
+mana={4}{W}{W}
+type=Creature
+subtype=Angel
+auto=lord(pristine angel[-tapped]) protection from(white)
+auto=lord(pristine angel[-tapped]) protection from(blue)
+auto=lord(pristine angel[-tapped]) protection from(black)
+auto=lord(pristine angel[-tapped]) protection from(red)
+auto=lord(pristine angel[-tapped]) protection from(green)
+auto=lord(pristine angel[-tapped]) protection from(artifact)
+auto=@movedTo(*|mystack):may untap
+power=4
+toughness=4
+abilities=flying
+[/card]
+[card]
 text=Flying. Sacrifice Pteron Ghost: Regenerate target artifact.
 id=49035
 name=Pteron Ghost
@@ -523,6 +542,18 @@ auto=destroy all(*[-artifact])
 rarity=R
 [/card]
 [card]
+text={W}, {T}, Return Steelshaper Apprentice to its owner's hand: Search your library for an Equipment card, reveal that card, and put it into your hand. Then shuffle your library.
+auto={W}{T}:moveTo(ownerhand) all(this) && moveTo(myhand) target(equipment|mylibrary)
+id=49078
+name=Steelshaper Apprentice
+rarity=R
+mana={2}{W}{W}
+type=Creature
+subtype=Human Soldier
+power=1
+toughness=3
+[/card]
+[card]
 id=47453
 name=Sword of Light and Shadow
 mana={3}
@@ -554,7 +585,7 @@ text=Creatures you control are unblockable as long as defending player controls
 id=43547
 name=Tanglewalker
 mana={2}{G}
-auto=aslongas(land[artifact]|opponentBattlefield)lord(creature|myBattlefield)unblockable
+auto=aslongas(land[artifact]|opponentBattlefield) lord(creature|myBattlefield) unblockable
 type=Creature
 subtype=Dryad
 power=2

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

@@ -591,17 +591,6 @@ text=Imprint - {X}, {T}: You may exile an instant or sorcery card with converted
 rarity=R
 [/card]
 [card]
-id=47587
-name=Pristine Angel
-mana={4}{W}{W}
-type=Creature
-subtype=Angel
-power=4
-toughness=4
-text=Flying As long as Pristine Angel is untapped, it has protection from artifacts and from all colors. Whenever you cast a spell, you may untap Pristine Angel.
-rarity=R
-[/card]
-[card]
 id=48163
 name=Psychic Overload
 mana={3}{U}
@@ -810,17 +799,6 @@ text=Put two +1/+1 counters on target creature and two +1/+1 counters on another
 rarity=U
 [/card]
 [card]
-id=49078
-name=Steelshaper Apprentice
-mana={2}{W}{W}
-type=Creature
-subtype=Human Soldier
-power=1
-toughness=3
-text={W}, {T}, Return Steelshaper Apprentice to its owner's hand: Search your library for an Equipment card, reveal that card, and put it into your hand. Then shuffle your library.
-rarity=R
-[/card]
-[card]
 id=45961
 name=Stir the Pride
 mana={4}{W}

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

@@ -97,6 +97,18 @@ toughness=3
 abilities=flying
 [/card]
 [card]
+text=At the beginning of your upkeep, return a permanent you control to its owner's hand.
+auto=@each my upkeep:moveTo(ownerhand) notatarget(*|myBattlefield)
+id=153419
+name=Cache Raiders
+rarity=U
+mana={3}{U}{U}
+type=Creature
+subtype=Merfolk Rogue
+power=4
+toughness=4
+[/card]
+[card]
 text=Put a 5/5 blue and red Elemental creature token with flying onto the battlefield.   Retrace (You may cast this card from your graveyard by discarding a land card in addition to paying its other costs.)
 autograveyard={5}{UR}{UR}{S(land|myhand)}:token(Elemental,creature elemental, 5/5,flying red,blue) asSorcery
 auto=token(Elemental,creature elemental, 5/5,flying red,blue)

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

@@ -72,17 +72,6 @@ subtype=Elf Druid
 toughness=1
 [/card]
 [card]
-text=At the beginning of your upkeep, return a permanent you control to its owner's hand.
-id=153419
-name=Cache Raiders
-rarity=U
-type=Creature
-mana={3}{U}{U}
-power=4
-subtype=Merfolk Rogue
-toughness=4
-[/card]
-[card]
 text=As Canker Abomination comes into play, choose an opponent. Canker Abomination comes into play with a -1/-1 counter on it for each creature that player controls.
 id=152033
 name=Canker Abomination

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

@@ -27,6 +27,17 @@ mana={2}{W}
 type=Instant
 [/card]
 [card]
+text=Enchant creature   When enchanted creature is put into a graveyard, you draw two cards.
+id=6147
+target=creature
+auto=@movedTo(mytgt|mygraveyard):draw:2 controller
+name=Bequeathal
+rarity=C
+mana={G}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
 text=When Cartographer enters the battlefield, you may return target land card from your graveyard to your hand.
 id=6144
 name=Cartographer
@@ -335,6 +346,15 @@ power=3
 toughness=3
 [/card]
 [card]
+text=Whenever you cast a creature spell, tap target creature.
+id=6115
+auto=@movedTo(creature|mystack):tap target(creature)
+name=Onslaught
+rarity=C
+mana={R}
+type=Enchantment
+[/card]
+[card]
 text=First strike, protection from black, protection from red (This creature deals combat damage before creatures without first strike. It can't be blocked, targeted, dealt damage, or enchanted by anything black or red.)
 id=5199
 name=Paladin en-Vec
@@ -590,7 +610,7 @@ abilities=trample
 [/card]
 [card]
 text=Shadow (This creature can block or be blocked by only creatures with shadow.) Whenever Soltari Visionary deals damage to a player, destroy target enchantment that player controls.
-auto=@damaged(player) from(this):may destroy target(enchantment|opponentBattlefield)
+auto=@damaged(player) from(this):destroy target(enchantment|opponentBattlefield)
 id=6031
 name=Soltari Visionary
 rarity=C
@@ -726,7 +746,7 @@ abilities=flying
 [/card]
 [card]
 text=Flying   When Welkin Hawk is put into a graveyard from the battlefield, you may search your library for a card named Welkin Hawk, reveal that card, put it into your hand, then shuffle your library.
-auto=@movedTo(this|graveyard):may moveTo(myHand) target(Welkin Hawk|mylibrary)
+auto=@movedTo(this|graveyard) from(battlefield):may moveTo(myHand) target(welkin hawk|mylibrary)
 id=6034
 name=Welkin Hawk
 rarity=C

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

@@ -15,15 +15,6 @@ text=Buyback {3} (You may pay an additional {3} as you play this spell. If you d
 rarity=C
 [/card]
 [card]
-id=6147
-name=Bequeathal
-mana={G}
-type=Enchantment
-subtype=Aura
-text=Enchant creature When enchanted creature is put into a graveyard, you draw two cards.
-rarity=C
-[/card]
-[card]
 id=6079
 name=Carnophage
 mana={B}
@@ -415,16 +406,6 @@ text=At the beginning of each player's upkeep, if that player has fewer cards in
 rarity=R
 [/card]
 [card]
-id=6115
-name=Onslaught
-mana={R}
-type=Enchantment
-text=Whenever you play a creature spell, tap target creature.
-auto=@movedTo(creature|mystack):tap target(creature)
-#0.8 @movedTo wont work with target, may is needed
-rarity=C
-[/card]
-[card]
 id=6126
 name=Pandemonium
 mana={3}{R}

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

@@ -109,6 +109,15 @@ toughness=1
 abilities=flying,cantblock
 [/card]
 [card]
+text=({WB} can be paid with either White or Black.)   At the beginning of your upkeep, put target creature card in a graveyard onto the battlefield under your control.
+auto=@each my upkeep:moveTo(myBattlefield) target(creature|graveyard)
+id=97193
+name=Debtors' Knell
+rarity=R
+mana={4}{BW}{BW}{BW}
+type=Enchantment
+[/card]
+[card]
 text=Douse in Gloom deals 2 damage to target creature and you gain 2 life.
 target=creature
 auto=Damage:2
@@ -238,6 +247,19 @@ mana={2}
 type=Artifact
 [/card]
 [card]
+text=Flying   At the beginning of your upkeep, tap target creature.
+auto=@each my upkeep:tap target(creature)
+id=96843
+name=Harrier Griffin
+rarity=U
+mana={5}{W}
+type=Creature
+subtype=Griffin
+power=3
+toughness=3
+abilities=flying
+[/card]
+[card]
 text=When Hatching Plans is put into a graveyard from the battlefield, draw three cards.
 id=96873
 auto=@movedto(this|graveyard) from(mybattlefield):draw:3
@@ -247,6 +269,15 @@ mana={1}{U}
 type=Enchantment
 [/card]
 [card]
+text=Whenever a creature attacks you, its controller loses 1 life.
+auto=@each my blockers:foreach(creature[attacking]|opponentBattlefield) life:-1 opponent
+id=96922
+name=Hissing Miasma
+rarity=U
+mana={1}{B}{B}
+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
@@ -257,6 +288,16 @@ rarity=C
 type=Land
 [/card]
 [card]
+text=Choose one - Draw X cards; or Invoke the Firemind deals X damage to target creature or player.
+id=83630
+auto=may draw:X
+auto=may damage:X target(creature,player)
+name=Invoke the Firemind
+rarity=R
+mana={X}{U}{U}{R}
+type=Sorcery
+[/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
@@ -389,11 +430,11 @@ type=Instant
 [/card]
 [card]
 text=Enchant creature   Enchanted creature can't attack or block.   Enchanted creature has "At the beginning of your upkeep, you lose 1 life."
+id=96882
 target=creature
 auto=cantattack
 auto=cantblock
-auto=@each my upkeep:life:-1 targetController
-id=96882
+auto=@each targetcontroller upkeep:life:-1 targetController
 name=Pillory of the Sleepless
 rarity=C
 mana={1}{W}{B}
@@ -593,6 +634,19 @@ power=6
 toughness=4
 [/card]
 [card]
+text=Whenever you cast a blue spell, target creature gains flying until end of turn.   Whenever you cast a red spell, Tibor and Lumia deals 1 damage to each creature without flying.
+auto=@movedTo(*[blue]|mystack):flying target(creature) ueot
+auto=@movedTo(*[red]|mystack):damage:1 all(creature[-flying])
+id=97208
+name=Tibor and Lumia
+rarity=R
+mana={2}{U}{R}
+type=Legendary Creature
+subtype=Human Wizard
+power=3
+toughness=3
+[/card]
+[card]
 text=Untap all creatures you control. Draw a card.
 auto=lord(creature|myBattlefield) untap
 auto=draw:1

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

@@ -166,16 +166,6 @@ text=When Crystal Seer enters the battlefield, look at the top four cards of you
 rarity=C
 [/card]
 [card]
-text=({WB} can be paid with either White or Black.)   At the beginning of your upkeep, put target creature card in a graveyard onto the battlefield under your control.
-auto=@each my upkeep:moveTo(myBattlefield) target(creature|graveyard)
-id=97193
-name=Debtors' Knell
-color=White,Black
-rarity=R
-mana={4}{BW}{BW}{BW}
-type=Enchantment
-[/card]
-[card]
 id=97197
 name=Djinn Illuminatus
 mana={5}{(}{U}{/}{R}{)}{(}{U}{/}{R}{)}
@@ -388,25 +378,6 @@ text=Flash Enchant creature Creatures you control that are enchanted get +1/+1.
 rarity=C
 [/card]
 [card]
-id=96843
-name=Harrier Griffin
-mana={5}{W}
-type=Creature
-subtype=Griffin
-power=3
-toughness=3
-text=Flying At the beginning of your upkeep, tap target creature.
-rarity=U
-[/card]
-[card]
-id=96922
-name=Hissing Miasma
-mana={1}{B}{B}
-type=Enchantment
-text=Whenever a creature attacks you, its controller loses 1 life.
-rarity=U
-[/card]
-[card]
 id=96840
 name=Hypervolt Grasp
 mana={2}{R}
@@ -436,14 +407,6 @@ text=Whenever a player casts an instant or sorcery spell, if Ink-Treader Nephili
 rarity=R
 [/card]
 [card]
-id=83630
-name=Invoke the Firemind
-mana={X}{U}{U}{R}
-type=Sorcery
-text=Choose one - Draw X cards; or Invoke the Firemind deals X damage to target creature or player.
-rarity=R
-[/card]
-[card]
 id=96966
 name=Izzet Guildmage
 mana={(}{U}{/}{R}{)}{(}{U}{/}{R}{)}
@@ -943,23 +906,6 @@ text=Replicate {2}{U} (When you cast this spell, copy it for each time you paid
 rarity=U
 [/card]
 [card]
-####
-####The first ability cannot work for now because it has no may condition!! (0.9.1)
-####
-id=97208
-name=Tibor and Lumia
-mana={2}{U}{R}
-type=Creature
-subtype=Human Wizard
-power=3
-toughness=3
-text=Whenever you cast a blue spell, target creature gains flying until end of turn.   Whenever you cast a red spell, Tibor and Lumia deals 1 damage to each creature without flying.
-auto=@movedTo(*[blue]|mystack):flying target(creature) ueot
-auto=@movedTo(*[red]|mystack):damage:1 all(creature[-flying])
-abilities=legendary
-rarity=R
-[/card]
-[card]
 id=96960
 name=Tin Street Hooligan
 mana={1}{R}

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

@@ -348,6 +348,18 @@ mana={1}{U}
 type=Instant
 [/card]
 [card]
+text=Enchant creature   Enchanted creature gets +2/+0.   At the beginning of the upkeep of enchanted creature's controller, put a -0/-1 counter on that creature.
+id=2505
+target=creature
+auto=2/0
+auto=@each targetcontroller upkeep:counter(0/-1)
+name=Essence Flare
+rarity=C
+mana={U}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
 text=Target creature gains trample and gets +3/+0 until end of turn.
 id=2558
 target=creature

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

@@ -34,8 +34,6 @@ subtype=Aura
 [card]
 text=As an additional cost to play Altar of Bone, sacrifice a creature.       Search your library for a creature card, reveal that card, and put it into your hand. Then shuffle your library.
 id=2717
-target=creature|mylibrary
-auto=moveto(myhand) && destroy target(creature)
 name=Altar of Bone
 rarity=R
 type=Sorcery
@@ -258,7 +256,6 @@ rarity=U
 type=Enchantment
 mana={2}{U}{U}
 [/card]
-
 [card]
 text={1}{G}, {T}: Counter target activated ability from an artifact source. (Mana abilities can't be targeted.)
 id=2552
@@ -549,18 +546,6 @@ type=Sorcery
 mana={1}{G}{G}
 [/card]
 [card]
-text=Enchant creature     Enchanted creature gets +2/+0.     At the beginning of the upkeep of enchanted creature's controller, put a -0/-1 counter on that creature.
-target=creature
-auto=2/0
-auto=@each targetcontroller upkeep:counter(0/-1)
-id=2505
-name=Essence Flare
-rarity=C
-type=Enchantment
-mana={U}
-subtype=Aura
-[/card]
-[card]
 text=Destroy target creature unless its controller pays life equal to its toughness. A creature destroyed this way can't be regenerated.
 id=2723
 name=Essence Vortex

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

@@ -480,6 +480,20 @@ power=3
 toughness=3
 [/card]
 [card]
+text=Flying, trample   At the beginning of your upkeep, sacrifice a creature.   Sacrifice a creature: Regenerate Devouring Strossus.
+auto=@each my upkeep:moveTo(mygraveyard) notatarget(creature|myBattlefield)
+id=23050
+name=Devouring Strossus
+rarity=R
+mana={5}{B}{B}{B}
+type=Creature
+subtype=Horror
+auto={S(creature|myBattlefield)}:regenerate
+power=9
+toughness=9
+abilities=flying,trample
+[/card]
+[card]
 text=Kicker {2}{U} (You may pay an additional {2}{U} as you play this spell.)    Destroy target artifact or enchantment.       If the kicker cost was paid, draw two cards.
 id=22946
 target=artifact,enchantment
@@ -2264,6 +2278,19 @@ power=3
 toughness=1
 [/card]
 [card]
+text=When Vodalian Merchant enters the battlefield, draw a card, then discard a card.
+id=26296
+name=Vodalian Merchant
+rarity=C
+mana={1}{U}
+type=Creature
+subtype=Merfolk
+auto=draw:1
+auto=moveTo(mygraveyard) notatarget(*|myhand)
+power=1
+toughness=2
+[/card]
+[card]
 text=Kicker {2} (You may pay an additional {2} as you play this spell.) Vodalian Serpent can't attack unless defending player controls an Island. If the kicker cost was paid, Vodalian Serpent enters the battlefield with four +1/+1 counters on it.
 id=22976
 name=Vodalian Serpent
@@ -2291,6 +2318,19 @@ toughness=2
 abilities=protection from green
 [/card]
 [card]
+text=First strike   Whenever Voracious Cobra deals combat damage to a creature, destroy that creature.
+id=23203
+name=Voracious Cobra
+rarity=U
+mana={2}{R}{G}
+type=Creature
+subtype=Snake
+auto=lord(voracious cobra[attacking;blocking]) deathtouch
+power=2
+toughness=2
+auto=first strike
+[/card]
+[card]
 text=Destroy target blue or black creature with flying.
 target=creature[black;blue;flying]
 auto=destroy

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

@@ -256,17 +256,6 @@ type=Sorcery
 mana={1}{B}
 [/card]
 [card]
-text=Flying, trample     At the beginning of your upkeep, sacrifice a creature.     Sacrifice a creature: Regenerate Devouring Strossus.
-id=23050
-name=Devouring Strossus
-rarity=R
-type=Creature
-mana={5}{B}{B}{B}
-power=9
-subtype=Horror
-toughness=9
-[/card]
-[card]
 text=Counter target instant or sorcery spell unless its controller pays {1}.       Draw a card.
 id=23000
 name=Disrupt
@@ -1307,17 +1296,6 @@ subtype=Merfolk Wizard
 toughness=1
 [/card]
 [card]
-text=When Vodalian Merchant comes into play, draw a card, then discard a card.
-id=26296
-name=Vodalian Merchant
-rarity=C
-type=Creature
-mana={1}{U}
-power=1
-subtype=Merfolk
-toughness=2
-[/card]
-[card]
 text=Choose a number. Destroy all artifacts and creatures with converted mana cost equal to that number. Then target player reveals his or her hand and discards all nonland cards with converted mana cost equal to the number.
 id=23200
 name=Void
@@ -1326,17 +1304,6 @@ type=Sorcery
 mana={3}{B}{R}
 [/card]
 [card]
-text=First strike       Whenever Voracious Cobra deals combat damage to a creature, destroy that creature.
-id=23203
-name=Voracious Cobra
-rarity=U
-type=Creature
-mana={2}{R}{G}
-power=2
-subtype=Snake
-toughness=2
-[/card]
-[card]
 text=Return all permanents of the color of your choice to their owners' hands.
 id=25320
 name=Wash Out

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

@@ -169,12 +169,12 @@ toughness=4
 abilities=flying
 [/card]
 [card]
-text=Enchant creature.   Enchanted creature gets +3/+3.   When enchanted creature is put into a graveyard, put a 3/3 green Elephant creature token onto the battlefield.
+text=Enchant creature   Enchanted creature gets +3/+3.   When enchanted creature is put into a graveyard, put a 3/3 green Elephant creature token onto the battlefield.
 id=12692
 name=Elephant Guide
 target=creature
 auto=3/3
-auto=@movedto(this|graveyard):token(Elephant,Creature Elephant,3/3,green)
+auto=@movedto(mytgt|graveyard):token(Elephant,Creature Elephant,3/3,green)
 rarity=U
 mana={2}{G}
 type=Enchantment

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

@@ -203,11 +203,12 @@ type=Sorcery
 [card]
 text=All creatures have haste.
 auto=lord(creature) haste
+auto=@movedTo(enchantment[world]|battlefield):bury
 id=1519
 name=Concordant Crossroads
 rarity=R
 mana={G}
-type=Enchantment
+type=World Enchantment
 [/card]
 [card]
 text=Trample   Rampage 2 (Whenever this creature becomes blocked, it gets +2/+2 until end of turn for each creature blocking it beyond the first.)
@@ -520,12 +521,13 @@ abilities=first strike
 [/card]
 [card]
 text=All creatures lose flying.
-auto=lord(creature) -flying
 id=1577
+auto=lord(creature) -flying
+auto=@movedTo(enchantment[world]|battlefield):bury
 name=Gravity Sphere
 rarity=R
 mana={2}{R}
-type=Enchantment
+type=World Enchantment
 [/card]
 [card]
 text=Target creature gets +0/+X until end of turn, where X is its converted mana cost.
@@ -699,7 +701,7 @@ toughness=4
 [card]
 text=Protection from red   Creatures named Ivory Guardians get +1/+1 as long as an opponent controls a red permanent.
 id=1621
-auto=aslongas(*[red]|opponentBattlefield) lord(Ivory Guardians) 1/1
+auto=aslongas(*[red]|opponentBattlefield) lord(ivory guardians) 1/1
 name=Ivory Guardians
 rarity=U
 mana={4}{W}{W}
@@ -1043,6 +1045,18 @@ power=5
 toughness=4
 [/card]
 [card]
+text={T}: Psionic Entity deals 2 damage to target creature or player and 3 damage to itself.
+id=1493
+name=Psionic Entity
+auto={T}:damage:2 target(creature,player) && damage:3 all(this)
+rarity=R
+mana={G}
+type=Creature
+subtype=Illusion
+power=2
+toughness=2
+[/card]
+[card]
 text=Creatures with swampwalk can be blocked as though they didn't have swampwalk.
 auto=lord(creature) -swampwalk
 id=1455
@@ -1250,6 +1264,20 @@ mana={2}{W}{W}
 type=Enchantment
 [/card]
 [card]
+text=When Stangg enters the battlefield, put a legendary 3/4 red and green Human Warrior creature token named Stangg Twin onto the battlefield.   When Stangg leaves the battlefield, exile that token.   When that token leaves the battlefield, sacrifice Stangg.
+auto=token(Stangg Twin,legendary creature human warrior, 3/4,red green)
+auto=@movedTo(this|exile,graveyard,library,hand) from(battlefield):moveTo(exile) all(stangg twin)
+auto=@movedTo(stangg twin|exile,graveyard,library,hand) from(battlefield):bury all(this)
+id=1686
+name=Stangg
+rarity=R
+mana={4}{G}{R}
+type=Legendary Creature
+subtype=Human Warrior
+power=3
+toughness=4
+[/card]
+[card]
 text=Storm Seeker deals damage equal to the number of cards in target player's hand to that player.
 id=1545
 target=player

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

@@ -593,16 +593,17 @@ type=Land
 abilities=legendary
 [/card]
 [card]
-text=At the beginning of your upkeep, if Hazezon Tamar came into play since the beginning of your last upkeep, put a 1/1 red, green, and white Sand Warrior creature token into play for each land you control. Those creatures have "When a permanent named Hazezon Tamar isn't in play, remove this creature from the game."
+####PROBLEM: The token effect triggers at each controllers upkeep.
+text=When Hazezon Tamar enters the battlefield, put X 1/1 Sand Warrior creature tokens that are red, green, and white onto the battlefield at the beginning of your next upkeep, where X is the number of lands you control at that time.   When Hazezon leaves the battlefield, exile all Sand Warriors.
 id=1656
 name=Hazezon Tamar
-auto=@next my upkeep:foreach(land|myinplay) token(Sand Warrior,Creature Sand Warrior,1/1,red green)
-auto=@movedTo(this|mygraveyard) from(myinplay):moveto(graveyard) all(Sand Warrior|myinplay)
+auto=@next my upkeep:foreach(land|myBattlefield) token(Sand Warrior,Creature Sand Warrior,1/1,red green white)
+auto=@movedTo(this|graveyard,exile,library,hand) from(battlefield):moveto(exile) all(sand warrior)
 rarity=R
 type=Legendary Creature
-mana={4}{R}{G}{W}
-power=2
 subtype=Human Warrior
+mana={G}
+power=2
 toughness=4
 [/card]
 [card]
@@ -962,18 +963,6 @@ subtype=Ooze
 toughness=1
 [/card]
 [card]
-text={T}: Psionic Entity deals 2 damage to target creature or player and 3 damage to itself.
-id=1493
-name=Psionic Entity
-auto={T}:damage:3 && damage:2 target(creature,player)
-rarity=R
-type=Creature
-mana={4}{U}
-power=2
-subtype=Illusion
-toughness=2
-[/card]
-[card]
 text=Psychic Purge deals 1 damage to target creature or player.     When a spell or ability an opponent controls causes you to discard Psychic Purge, that player loses 5 life.
 id=1494
 name=Psychic Purge
@@ -1236,17 +1225,6 @@ mana={U}{U}
 subtype=Aura
 [/card]
 [card]
-text=When Stangg comes into play, if Stangg is in play, put a legendary 3/4 red and green Human Warrior creature token named Stangg Twin into play. When Stangg leaves play, remove that token from the game. When that token leaves play, sacrifice Stangg.
-id=1686
-name=Stangg
-rarity=R
-type=Legendary Creature
-mana={4}{R}{G}
-power=3
-subtype=Human Warrior
-toughness=4
-[/card]
-[card]
 text=At the beginning of each player's upkeep, Storm World deals X damage to that player, where X is 4 minus the number of cards in his or her hand.
 id=1591
 name=Storm World

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

@@ -338,6 +338,18 @@ power=3
 toughness=3
 [/card]
 [card]
+text=When Goblin Firebug leaves the battlefield, sacrifice a land.
+auto=@movedTo(this|exile,graveyard,hand,library) from(battlefield):moveTo(mygraveyard) notatarget(land|myBattlefield)
+id=44286
+name=Goblin Firebug
+rarity=C
+mana={1}{R}
+type=Creature
+subtype=Goblin
+power=2
+toughness=2
+[/card]
+[card]
 text={T}, Sacrifice a Goblin: All Goblin creatures get +2/+0 until end of turn.
 id=45123
 name=Goblin Lookout
@@ -674,6 +686,18 @@ power=3
 toughness=3
 [/card]
 [card]
+text=Whenever a Sliver deals combat damage to a creature, destroy that creature. It can't be regenerated.
+id=42038
+name=Toxin Sliver
+rarity=R
+mana={3}{B}
+type=Creature
+subtype=Sliver
+auto=lord(sliver[attacking;blocking]) deathtouch
+power=3
+toughness=3
+[/card]
+[card]
 text=Vexing Beetle can't be countered.   Vexing Beetle gets +3/+3 as long as no opponent controls a creature.
 id=44327
 name=Vexing Beetle

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

@@ -317,7 +317,6 @@ toughness=3
 text=Amplify 2 (As this card enters the battlefield, put two +1/+1 counters on it for each Beast card you reveal in your hand.) Provoke (When this attacks, you may have target creature defending player controls untap and block it if able.)
 rarity=R
 [/card]
-
 [card]
 id=42178
 name=Ghastly Remains
@@ -374,17 +373,6 @@ text={T}: Goblin Dynamo deals 1 damage to target creature or player. {X}{R}, {T}
 rarity=U
 [/card]
 [card]
-id=44286
-name=Goblin Firebug
-mana={1}{R}
-type=Creature
-subtype=Goblin
-power=2
-toughness=2
-text=When Goblin Firebug leaves the battlefield, sacrifice a land.
-rarity=C
-[/card]
-[card]
 id=39888
 name=Goblin Goon
 mana={3}{R}
@@ -770,17 +758,6 @@ text=Flying {1}: Swooping Talon loses flying until end of turn. Provoke (When th
 rarity=U
 [/card]
 [card]
-id=42038
-name=Toxin Sliver
-mana={3}{B}
-type=Creature
-subtype=Sliver
-power=3
-toughness=3
-text=Whenever a Sliver deals combat damage to a creature, destroy that creature. It can't be regenerated.
-rarity=R
-[/card]
-[card]
 id=42170
 name=Tribal Forcemage
 mana={1}{G}

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

@@ -704,6 +704,17 @@ power=1
 toughness=1
 [/card]
 [card]
+text=Target creature gains deathtouch until end of turn. (Whenever it deals damage to a creature, destroy that creature.)  Draw a card.
+id=143376
+target=creature
+auto=deathtouch
+auto=draw:1 controller
+name=Lace with Moonglove
+rarity=C
+mana={2}{G}
+type=Instant
+[/card]
+[card]
 text={T}: Add {G} to your mana pool.
 auto={T}:Add {G}
 id=139487
@@ -716,17 +727,6 @@ subtype=Elf Druid
 toughness=1
 [/card]
 [card]
-text=Target creature gains deathtouch until end of turn. (Whenever it deals damage to a creature, destroy that creature.)  Draw a card.
-id=143376
-target=creature
-auto=deathtouch
-auto=draw:1 controller
-name=Lace with Moonglove
-rarity=C
-mana={2}{G}
-type=Instant
-[/card]
-[card]
 text=Whenever you cast an Elf spell, you may put a 1/1 green Elf Warrior creature token onto the battlefield.
 auto=@movedTo(elf|mystack):may token(Elf Warrior,Creature Elf Warrior,1/1,green)
 id=139401
@@ -775,6 +775,20 @@ type=Tribal Enchantment
 subtype=Merfolk
 [/card]
 [card]
+text=Other Merfolk creatures you control get +1/+1.   Whenever you play a Merfolk spell, you may tap or untap target permanent.
+auto=lord(merfolk|myBattlefield) 1/1 other
+auto=@movedTo(merfolk|mystack):may tap target(*)
+auto=@movedTo(merfolk|mystack):may untap target(*)
+id=139702
+name=Merrow Reejerey
+rarity=U
+mana={2}{U}
+type=Creature
+subtype=Merfolk Soldier
+power=2
+toughness=2
+[/card]
+[card]
 text=Sacrifice Moonglove Extract: Moonglove Extract deals 2 damage to target creature or player.
 auto={S}:damage:2 target(creature,player)
 id=139506
@@ -833,7 +847,7 @@ subtype=Mountain
 [/card]
 [card]
 text=When Mudbutton Torchrunner is put into a graveyard from the battlefield, it deals 3 damage to target creature or player.
-auto=@movedTo(this|graveyard):damage:3 target(creature,player)
+auto=@movedTo(this|graveyard)from(battlefield):damage:3 target(creature,player)
 id=139742
 name=Mudbutton Torchrunner
 rarity=C
@@ -1262,6 +1276,18 @@ type=Instant
 subtype=Tribal Goblin
 [/card]
 [card]
+text=Whenever you cast a Treefolk spell, you may have target creature get +3/-3 until end of turn.
+id=143015
+name=Thorntooth Witch
+rarity=U
+mana={5}{B}
+type=Creature
+subtype=Treefolk Shaman
+auto=@movedTo(treefolk|mystack):may 3/-3 target(creature)
+power=3
+toughness=4
+[/card]
+[card]
 text=When Thundercloud Shaman enters the battlefield, it deals damage equal to the number of Giants you control to each non-Giant creature.
 id=139738
 auto=foreach(giant|myBattlefield) damage:1 all(creature[-giant])

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

@@ -422,7 +422,7 @@ toughness=6
 [card]
 ###opponentTurnOnly does not work here! (0.10.1)
 text=Flying   Whenever you cast a spell during an opponent's turn, you may have target creature get -1/-1 until end of turn.
-auto=@movedTo(*|mystack):may -1/-1 target(creature) opponentTurnOnly
+auto=@movedTo(*|mystack):may -1/-1 target(creature)
 id=139453
 name=Dreamspoiler Witches
 rarity=C
@@ -496,7 +496,7 @@ auto=@movedTo(*|mystack):may token(Elemental,creature elemental,4/4,green) oppon
 id=143728
 name=Eyes of the Wisent
 rarity=R
-mana={G}
+mana={1}{G}
 type=Enchantment
 subtype=Tribal Elemental
 [/card]
@@ -1060,21 +1060,6 @@ subtype=Merfolk Wizard
 toughness=3
 [/card]
 [card]
-###CODED WRONG! THIS CANNOT BE CODED RIGHT NOW!!!!
-text=Other Merfolk creatures you control get +1/+1.     Whenever you play a Merfolk spell, you may tap or untap target permanent.
-auto=lord(merfolk|myinplay) 1/1 other
-auto=@movedTo(merfolk|mystack):may tap target(*)
-auto=@movedTo(merfolk|mystack):may untap target(*)
-id=139702
-name=Merrow Reejerey
-rarity=U
-type=Creature
-mana={2}{U}
-power=2
-subtype=Merfolk Soldier
-toughness=2
-[/card]
-[card]
 text=Whenever a nontoken creature you control attacks, you may pay {W}. If you do, put a 1/1 white Kithkin Soldier creature token into play tapped and attacking.
 id=140193
 name=Militia's Pride
@@ -1105,7 +1090,6 @@ power=4
 subtype=Faerie Wizard
 toughness=4
 [/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 {G} to your mana pool.     {G}, {T}: You may play the removed card without paying its mana cost if creatures you control have total power 10 or greater.
 id=139515
@@ -1547,18 +1531,6 @@ type=Artifact
 mana={2}
 [/card]
 [card]
-text=Whenever you play a Treefolk spell, you may have target creature get +3/-3 until end of turn.
-id=143015
-auto=@movedTo(Treefolk|mystack):may 3/3 target(creature)
-name=Thorntooth Witch
-rarity=U
-type=Creature
-mana={5}{B}
-power=3
-subtype=Treefolk Shaman
-toughness=4
-[/card]
-[card]
 text=Target player reveals his or her hand. You choose a nonland card from it. That player discards that card. You lose 2 life.
 id=145969
 name=Thoughtseize

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

@@ -1717,16 +1717,27 @@ auto=life:4 controller
 rarity=C
 [/card]
 [card]
+text=Enchant creature   At the beginning of the upkeep of enchanted creature's controller, that player loses 1 life.
+id=190557
+target=creature
+auto=@each targetcontroller upkeep:life:-1 targetController
+name=Soul Bleed
+rarity=C
+mana={2}{B}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
+text=Whenever another creature enters the battlefield, you gain 1 life.
 id=190571
 name=Soul Warden
+rarity=U
 mana={W}
 type=Creature
 subtype=Human Cleric
+auto=@movedTo(creature|battlefield):life:1
 power=1
 toughness=1
-text=Whenever another creature enters the battlefield, you gain 1 life.
-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.

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

@@ -417,17 +417,6 @@ text=Tap all creatures target player controls. Those creatures don't untap durin
 rarity=U
 [/card]
 [card]
-id=190557
-name=Soul Bleed
-mana={2}{B}
-type=Enchantment
-subtype=Aura
-text=Enchant creature At the beginning of the upkeep of enchanted creature's controller, that player loses 1 life.
-target=creature
-auto=@each ??? upkeep:life:-1 targetController
-rarity=C
-[/card]
-[card]
 id=191338
 name=Spellbook
 mana={0}

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

@@ -806,6 +806,17 @@ subtype=Island
 rarity=L
 [/card]
 [card]
+text=You may tap or untap target artifact, creature, or land.   Draw a card at the beginning of the next turn's upkeep.
+id=3341
+auto=@next upkeep:draw:1 controller
+auto=may tap target(artifact,creature,land)
+auto=may untap target(artifact,creature,land)
+name=Jolt
+rarity=C
+mana={2}{U}
+type=Instant
+[/card]
+[card]
 text={1}{G}{T}: Put a 0/1 green Plant Wall creature token with defender onto the battlefield.   Sacrifice a Plant Wall token: Add {R} to your mana pool.
 id=3392
 auto={1}{G}{T}:token(Plant Wall,creature Plant Wall, 0/1,green defender)
@@ -1213,11 +1224,11 @@ toughness=1
 [/card]
 [card]
 text=Enchant creature   When Ritual of Steel enters the battlefield, draw a card at the beginning of the next turn's upkeep.   Enchanted creature gets +0/+2.
-id=3511 
-name=Ritual of Steel
+id=3511
 target=creature
 auto=0/2
-auto=@next upkeep:draw:1
+auto=@next upkeep:draw:1 controller
+name=Ritual of Steel
 rarity=C
 mana={2}{W}
 type=Enchantment
@@ -1236,7 +1247,7 @@ power=4
 toughness=5
 [/card]
 [card]
-text=Rocky Tar Pit enters the battlefield tapped.       {T}, Sacrifice Rocky Tar Pit: Search your library for a Swamp or Mountain card and put it into play. Then shuffle your library.
+text=Rocky Tar Pit enters the battlefield tapped.   {T}, Sacrifice Rocky Tar Pit: Search your library for a Swamp or Mountain card and put it into play. Then shuffle your library.
 auto=tap
 auto={T}{S}:moveTo(myBattlefield) target(mountain,swamp|myLibrary)
 id=3575
@@ -1245,6 +1256,16 @@ rarity=U
 type=Land
 [/card]
 [card]
+text=At the beginning of your upkeep, sacrifice Sacred Mesa unless you sacrifice a Pegasus.   {1}{W}: Put a 1/1 white Pegasus creature token with flying onto the battlefield.
+auto=@each my upkeep:bury notatarget(sacred mesa,pegasus|myBattlefield)
+auto={1}{W}:token(Pegasus,creature pegasus, 1/1,white flying)
+id=3512
+name=Sacred Mesa
+rarity=R
+mana={2}{W}
+type=Enchantment
+[/card]
+[card]
 text=Sandstorm deals 1 damage to each attacking creature.
 id=3408
 name=Sandstorm
@@ -1368,6 +1389,18 @@ mana={2}
 rarity=U
 [/card]
 [card]
+text=Noncreature artifacts have shroud as long as Spectral Guardian is untapped. (They can't be the targets of spells or abilities.)
+id=3516
+name=Spectral Guardian
+rarity=R
+mana={2}{W}{W}
+type=Creature
+subtype=Spirit
+auto=aslongas(spectral guardian[-tapped]|myBattlefield) lord(artifact[-creature]) shroud
+power=2
+toughness=3
+[/card]
+[card]
 text=Flying, trample, haste, protection from black     Spirit of the Night has first strike as long as it's attacking.
 id=3315
 name=Spirit of the Night
@@ -1465,7 +1498,7 @@ rarity=L
 [/card]
 [card]
 text=Haste
-id=3467 
+id=3467
 name=Talruum Minotaur
 rarity=C
 mana={2}{R}{R}
@@ -1490,19 +1523,20 @@ abilities=flying,trample
 [/card]
 [card]
 text={2}{T}: Telim'Tor's Darts deals 1 damage to target player. 
-id=3269 
+id=3269
 name=Telim'Tor's Darts
 auto={2}{T}:damage:1 target(player)
 rarity=U
-type=Artifact
 mana={2}
+type=Artifact
 [/card]
 [card]
 text=Exile target permanent you own or control. Draw a card at the beginning of the next turn's upkeep.
-id=3469 
-name=Telim'Tor's Edict
-auto=moveTo(myexile) target(*|myBattlefield)
+id=3469
+target=*|myBattlefield
+auto=moveTo(myexile)
 auto=@next upkeep:draw:1
+name=Telim'Tor's Edict
 rarity=R
 mana={R}
 type=Instant
@@ -1528,7 +1562,7 @@ type=Sorcery
 [/card]
 [card]
 text=Flying   {3}{G}, Sacrifice Uktabi Faerie: Destroy target artifact.
-id=3416 
+id=3416
 name=Uktabi Faerie
 rarity=C
 mana={1}{G}
@@ -1554,7 +1588,7 @@ toughness=*
 [/card]
 [card]
 text=Forestwalk   {1}{G}{G}: Target creature gains forestwalk until end of turn.
-id=3418 
+id=3418
 name=Unseen Walker
 rarity=U
 mana={1}{G}
@@ -1567,13 +1601,13 @@ abilities=forestwalk
 [/card]
 [card]
 text=Unyaro Bee Sting deals 2 damage to target creature or player.
-id=3419 
-name=Unyaro Bee Sting
+id=3419
 target=creature,player
 auto=damage:2
-type=Sorcery
+name=Unyaro Bee StinG
 rarity=U
 mana={3}{G}
+type=Sorcery
 [/card]
 [card]
 text=Flying   Sacrifice Unyaro Griffin: Counter target red instant or sorcery spell.
@@ -1613,7 +1647,7 @@ power=1
 toughness=1
 [/card]
 [card]
-id=3471 
+id=3471
 name=Viashino Warrior
 rarity=C
 mana={3}{R}
@@ -1644,7 +1678,7 @@ type=Instant
 [/card]
 [card]
 text=Flying,haste
-id=3472 
+id=3472
 name=Volcanic Dragon
 rarity=R
 mana={4}{R}{R}
@@ -1669,7 +1703,7 @@ abilities=defender
 [/card]
 [card]
 text=Trample
-id=3423 
+id=3423
 name=Wild Elephant
 rarity=C
 mana={3}{G}
@@ -1681,7 +1715,7 @@ abilities=trample
 [/card]
 [card]
 text=Protection from white   {1}{R}: Wildfire Emissary gets +1/+0 until end of turn.
-id=3474 
+id=3474
 name=Wildfire Emissary
 rarity=U
 mana={3}{R}
@@ -1694,7 +1728,7 @@ abilities=protection from white
 [/card]
 [card]
 text=Flying, protection from blue
-id=3560 
+id=3560
 name=Windreaper Falcon
 rarity=U
 mana={1}{R}{G}
@@ -1706,10 +1740,10 @@ abilities=flying,protection from blue
 [/card]
 [card]
 text=As an additional cost to play Withering Boon, pay 3 life.   Counter target creature spell.
+id=3321
 target=creature|stack
 auto=fizzle
 auto=life:-3 controller
-id=3321
 name=Withering Boon
 rarity=U
 mana={1}{B}
@@ -1717,7 +1751,7 @@ type=Instant
 [/card]
 [card]
 text=Lifelink (Whenever this creature deals damage, you gain that much life.)
-id=3561 
+id=3561
 name=Zebra Unicorn
 type=Creature
 subtype=Unicorn
@@ -1729,7 +1763,7 @@ abilities=lifelink
 [/card]
 [card]
 text=Flying   Other Griffin creatures get +1/+1.
-id=3526 
+id=3526
 name=Zuberi, Golden Feather
 type=Legendary Creature
 subtype=Griffin

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

@@ -798,15 +798,6 @@ toughness=2
 rarity=C
 [/card]
 [card]
-text=You may tap or untap target artifact, creature, or land.     Draw a card at the beginning of the next turn's upkeep.
-id=3341
-name=Jolt
-target=artifact,creature,land
-type=Instant
-mana={2}{U}
-rarity=C
-[/card]
-[card]
 text=Destroy target creature with converted mana cost X. If that creature is put into a graveyard this way, Kaervek's Purge deals damage equal to the creature's power to the creature's controller.
 id=3541
 name=Kaervek's Purge
@@ -1299,14 +1290,6 @@ subtype=Snake
 toughness=2
 [/card]
 [card]
-text=At the beginning of your upkeep, sacrifice Sacred Mesa unless you sacrifice a Pegasus.     {1}{W}: Put a 1/1 white Pegasus creature token with flying into play.
-id=3512
-name=Sacred Mesa
-rarity=R
-type=Enchantment
-mana={2}{W}
-[/card]
-[card]
 text=When a spell or ability an opponent controls causes you to discard Sand Golem, return Sand Golem from your graveyard to play at end of turn with a +1/+1 counter on it.
 id=3266
 name=Sand Golem
@@ -1470,17 +1453,6 @@ type=Enchantment
 mana={U}{B}
 [/card]
 [card]
-text=Noncreature artifacts have shroud as long as Spectral Guardian is untapped. (They can't be the targets of spells or abilities.)
-id=3516
-name=Spectral Guardian
-rarity=R
-type=Creature
-mana={2}{W}{W}
-power=2
-subtype=Spirit
-toughness=3
-[/card]
-[card]
 text=Stalking Tiger can't be blocked by more than one creature.
 id=3412
 name=Stalking Tiger

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

@@ -327,6 +327,18 @@ type=Instant
 subtype=Wizard Tribal 
 [/card]
 [card]
+text={1}{R}, {T}: Sunflare Shaman deals X damage to target creature or player and X damage to itself, where X is the number of Elemental cards in your graveyard.
+id=153155
+name=Sunflare Shaman
+rarity=C
+mana={1}{R}
+type=Creature
+subtype=Elemental Shaman
+auto={1}{R}{T}:foreach(elemental|mygraveyard) damage:1 target(creature,player) && foreach(elemental|mygraveyard) damage:1 all(this)
+power=2
+toughness=1
+[/card]
+[card]
 text=Vengeful Firebrand has haste as long as a Warrior card is in your graveyard.   {R}: Vengeful Firebrand gets +1/+0 until end of turn.
 id=153153
 name=Vengeful Firebrand
@@ -352,9 +364,21 @@ type=Instant
 subtype=Faerie Tribal 
 [/card]
 [card]
+text=At the beginning of your upkeep, target creature other than Weed-Pruner Poplar gets -1/-1 until end of turn.
+auto=@each my upkeep:-1/-1 target(other crature)
+id=152741
+name=Weed-Pruner Poplar
+rarity=C
+mana={4}{B}
+type=Creature
+subtype=Treefolk Assassin
+power=3
+toughness=3
+[/card]
+[card]
 text={3}{B}, Sacrifice a Goblin: Put two 1/1 black Goblin Rogue creature tokens onto the battlefield.
 id=153011
-auto={3}{B}{S(goblin|myBattlefield)}:token(Goblin Rogue,Creature Goblin,1/1,black) && token(Goblin Rogue,Creature Goblin,1/1,black)
+auto={3}{B}{S(goblin|myBattlefield)}:token(Goblin Rogue,Creature goblin,1/1,black)*2
 name=Weirding Shaman
 rarity=R
 mana={1}{B}

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

@@ -1022,18 +1022,6 @@ toughness=1
 text=Islandwalk Merfolk spells and Wizard spells you cast cost {1} less to cast.
 rarity=C
 [/card]
-
-[card]
-id=153155
-name=Sunflare Shaman
-mana={1}{R}
-type=Creature
-subtype=Elemental Shaman
-power=2
-toughness=1
-text={1}{R}, {T}: Sunflare Shaman deals X damage to target creature or player and X damage to itself, where X is the number of Elemental cards in your graveyard.
-rarity=C
-[/card]
 [card]
 id=152533
 name=Supreme Exemplar
@@ -1115,7 +1103,6 @@ toughness=1
 text=Flash Flying When Vendilion Clique enters the battlefield, look at target player's hand. You may choose a nonland card from it. If you do, that player reveals the chosen card, puts it on the bottom of his or her library, then draws a card.
 rarity=R
 [/card]
-
 [card]
 id=153012
 name=Veteran's Armaments
@@ -1125,7 +1112,6 @@ subtype=Soldier Equipment
 text=Equipped creature has "Whenever this creature attacks or blocks, it gets +1/+1 until end of turn for each attacking creature." Whenever a Soldier creature enters the battlefield, you may attach Veteran's Armaments to it. Equip {2}
 rarity=U
 [/card]
-
 [card]
 id=152553
 name=Walker of the Grove
@@ -1180,17 +1166,6 @@ text=Kinship  EAt the beginning of your upkeep, you may look at the top card o
 rarity=U
 [/card]
 [card]
-id=152741
-name=Weed-Pruner Poplar
-mana={4}{B}
-type=Creature
-subtype=Treefolk Assassin
-power=3
-toughness=3
-text=At the beginning of your upkeep, target creature other than Weed-Pruner Poplar gets -1/-1 until end of turn.
-rarity=C
-[/card]
-[card]
 id=152737
 name=Weight of Conscience
 mana={1}{W}
@@ -1199,7 +1174,6 @@ subtype=Aura
 text=Enchant creature Enchanted creature can't attack. Tap two untapped creatures you control that share a creature type: Exile enchanted creature.
 rarity=C
 [/card]
-
 [card]
 id=152669
 name=Winnower Patrol

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

@@ -870,7 +870,6 @@ subtype=Mountain
 [card]
 text=When Myr Retriever is put into a graveyard from the battlefield, return another target artifact card from your graveyard to your hand.
 auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) target(other artifact|mygraveyard)
-
 id=46126
 name=Myr Retriever
 rarity=U
@@ -1080,7 +1079,7 @@ type=Artifact
 [/card]
 [card]
 text=Put two 1/1 white Soldier creature tokens onto the battlefield.
-auto=token(Soldier,creature token soldier, 1/1,white)*2
+auto=token(Soldier,creature soldier, 1/1,white)*2
 id=48103
 name=Raise the Alarm
 rarity=C
@@ -1105,7 +1104,7 @@ rarity=R
 mana={4}{B}{B}{B}{B}
 type=Creature
 subtype=Demon
-auto=@movedTo(myBattlefield) from(mystack):destroy all(creature[-black;-artifact])
+auto=@movedTo(this|myBattlefield) from(mystack):destroy all(creature[-black;-artifact])
 power=6
 toughness=6
 abilities=flying
@@ -1603,7 +1602,7 @@ rarity=R
 mana={4}{B}
 type=Creature
 subtype=Horror
-auto=@movedTo(artifact|myBattlefield):4/4 ueot
+auto=@movedTo(artifact|battlefield):4/4 ueot
 power=1
 toughness=1
 [/card]

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

@@ -600,6 +600,15 @@ power=2
 toughness=2
 [/card]
 [card]
+text=Whenever you cast a creature spell, Furious Assault deals 1 damage to target player.
+id=19848
+auto=@movedTo(creature|mystack):damage:1 target(player)
+name=Furious Assault
+rarity=C
+mana={2}{R}
+type=Enchantment
+[/card]
+[card]
 text=Trample, haste
 id=19842
 name=Gerrard's Irregulars
@@ -935,6 +944,18 @@ toughness=2
 abilities=first strike
 [/card]
 [card]
+text=At the beginning of your upkeep, sacrifice Lithophage unless you sacrifice a Mountain.
+auto=@each my upkeep:bury notatarget(lithophage,mountain|myBattlefield)
+id=19731
+name=Lithophage
+rarity=R
+mana={3}{R}{R}
+type=Creature
+subtype=Insect
+power=7
+toughness=7
+[/card]
+[card]
 text=All creatures have forestwalk.
 id=19860
 name=Lumbering Satyr

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

@@ -626,15 +626,6 @@ rarity=U
 type=Land
 [/card]
 [card]
-text=Whenever you play a creature spell, Furious Assault deals 1 damage to target player.
-id=19848
-auto=@movedTo(creature|mystack):damage:1 target(player)
-name=Furious Assault
-rarity=C
-type=Enchantment
-mana={2}{R}
-[/card]
-[card]
 text=At the beginning of your upkeep, each player reveals the top card of his or her library. If all cards revealed this way are creature cards, put those cards into play under their owners' control.
 id=19742
 name=Game Preserve
@@ -707,9 +698,6 @@ mana={6}
 text=When Howling Wolf comes into play, you may search your library for up to three cards named Howling Wolf, reveal them, and put them into your hand. If you do, shuffle your library.
 id=19632
 name=Howling Wolf
-auto=may moveTo(myhand) target(creature[Howling Wolf]|mylibrary)
-auto=may moveTo(myhand) target(creature[Howling Wolf]|mylibrary)
-auto=may moveTo(myhand) target(creature[Howling Wolf]|mylibrary)
 rarity=C
 type=Creature
 mana={2}{G}{G}

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

@@ -346,6 +346,20 @@ toughness=3
 abilities=Protection from red
 [/card]
 [card]
+text=As Overlaid Terrain enters the battlefield, sacrifice all lands you control.   Lands you control have "{T}: Add two mana of any one color to your mana pool."
+id=22061
+auto=moveTo(graveyard) all(land|myBattlefield)
+auto=lord(land|myBattlefield) {T}:Add{W}{W}
+auto=lord(land|myBattlefield) {T}:Add{U}{U}
+auto=lord(land|myBattlefield) {T}:Add{B}{B}
+auto=lord(land|myBattlefield) {T}:Add{R}{R}
+auto=lord(land|myBattlefield) {T}:Add{G}{G}
+name=Overlaid Terrain
+rarity=R
+mana={2}{G}{G}
+type=Enchantment
+[/card]
+[card]
 text=When Phyrexian Driver enters the battlefield, all other Mercenary creatures get +1/+1 until end of turn.
 id=22379
 name=Phyrexian Driver
@@ -570,6 +584,18 @@ toughness=2
 abilities=cantblock
 [/card]
 [card]
+text=At the beginning of your upkeep, Spiteful Bully deals 3 damage to target creature you control.
+auto=@each my upkeep:damage:3 target(creature|myBattlefield)
+id=21309
+name=Spiteful Bully
+rarity=C
+mana={1}{B}
+type=Creature
+subtype=Zombie Mercenary
+power=3
+toughness=3
+[/card]
+[card]
 text={1}{G}, {T}, Discard a card: Creatures you control get +1/+1 and gain trample until end of turn.
 auto={1}{G}{T}{S(*|myhand)}:lord(creature|myBattlefield) 1/1 && lord(creature|mybattlefield) trample
 id=21359

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

@@ -416,14 +416,6 @@ text={T}: All damage that would be dealt to target creature this turn by a sourc
 rarity=R
 [/card]
 [card]
-id=22061
-name=Overlaid Terrain
-mana={2}{G}{G}
-type=Enchantment
-text=As Overlaid Terrain enters the battlefield, sacrifice all lands you control. Lands you control have "{T}: Add two mana of any one color to your mana pool."
-rarity=R
-[/card]
-[card]
 id=21375
 name=Pack Hunt
 mana={3}{G}
@@ -679,17 +671,6 @@ text=Creatures and lands you control have shroud. (They can't be the targets of
 rarity=R
 [/card]
 [card]
-id=21309
-name=Spiteful Bully
-mana={1}{B}
-type=Creature
-subtype=Zombie Mercenary
-power=3
-toughness=3
-text=At the beginning of your upkeep, Spiteful Bully deals 3 damage to target creature you control.
-rarity=C
-[/card]
-[card]
 id=21357
 name=Stronghold Gambit
 mana={1}{R}

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

@@ -200,6 +200,16 @@ rarity=U
 type=Land
 [/card]
 [card]
+text=Whenever a creature blocks, Battle Strain deals 1 damage to that creature's controller.
+auto=@each my combatdamage:foreach(creature[blocking]|opponentBattlefield) damage:1 opponent
+auto=@each opponent combatdamage:foreach(creature[blocking]|myBattlefield) damage:1 controller
+id=29861
+name=Battle Strain
+rarity=U
+mana={1}{R}
+type=Enchantment
+[/card]
+[card]
 text=Protection from creatures
 id=29798
 name=Beloved Chaplain

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

@@ -137,14 +137,6 @@ type=Enchantment
 mana={3}{U}{U}
 [/card]
 [card]
-text=Whenever a creature blocks, Battle Strain deals 1 damage to that creature's controller.
-id=29861
-name=Battle Strain
-rarity=U
-type=Enchantment
-mana={1}{R}
-[/card]
-[card]
 text={1}{G}, Remove two cards in your graveyard from the game: Put a 2/2 green Bear creature token into play.
 id=30747
 name=Bearscape

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

@@ -1093,7 +1093,7 @@ type=Instant
 [/card]
 [card]
 text=Whenever a creature attacks, you gain 1 life.
-auto=@each blockers step:foreach(creature[attacking]) life:1
+auto=@each blockers:foreach(creature[attacking]) life:1
 id=40656
 name=Righteous Cause
 rarity=U

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

@@ -538,6 +538,19 @@ mana={2}{B}
 type=Sorcery
 [/card]
 [card]
+text=When Hidden Horror enters the battlefield, sacrifice it unless you discard a creature card.
+id=6574
+name=Hidden Horror
+rarity=U
+mana={1}{B}{B}
+type=Creature
+subtype=Horror
+auto=moveTo(graveyard) notatarget(this|myBattlefield)
+auto=moveTo(graveyard) notatarget(creature|myhand)
+power=4
+toughness=4
+[/card]
+[card]
 text=Hurricane deals X damage to each creature with flying and each player.
 id=6640
 auto=damage:X all(creature[flying])
@@ -911,6 +924,20 @@ mana={G}
 type=Sorcery
 [/card]
 [card]
+text=Flying   When Screeching Drake enters the battlefield, draw a card, then discard a card.
+id=6523
+name=Screeching Drake
+rarity=C
+mana={3}{U}
+type=Creature
+subtype=Drake
+auto=draw:1
+auto=moveTo(mygraveyard) notatarget(*|myhand)
+power=2
+toughness=2
+abilities=flying
+[/card]
+[card]
 text=Spitting Earth deals damage equal to the number of Mountains you control to target creature.
 id=6589
 target=creature

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

@@ -140,17 +140,6 @@ text=Tap any number of untapped creatures you control. You gain 4 life for each
 rarity=U
 [/card]
 [card]
-id=6574
-name=Hidden Horror
-mana={1}{B}{B}
-type=Creature
-subtype=Horror
-power=4
-toughness=4
-text=When Hidden Horror enters the battlefield, sacrifice it unless you discard a creature card.
-rarity=U
-[/card]
-[card]
 id=6628
 name=Ironhoof Ox
 mana={3}{G}{G}
@@ -310,17 +299,6 @@ auto=destroy all(creature[tapped])
 rarity=R
 [/card]
 [card]
-id=6523
-name=Screeching Drake
-mana={3}{U}
-type=Creature
-subtype=Drake
-power=2
-toughness=2
-text=Flying When Screeching Drake enters the battlefield, draw a card, then discard a card.
-rarity=C
-[/card]
-[card]
 id=6539
 name=Sea Drake
 mana={2}{U}

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

@@ -37,6 +37,19 @@ mana={2}{W}
 type=Enchantment
 [/card]
 [card]
+text=Protection from white   At the beginning of your upkeep, sacrifice Bog Elemental unless you sacrifice a land.
+auto=@each my upkeep:moveTo(mygraveyard) notatarget(bog elemental,land|myBattlefield)
+id=24620
+name=Bog Elemental
+rarity=R
+mana={3}{B}{B}
+type=Creature
+subtype=Elemental
+power=5
+toughness=4
+abilities=protection from white
+[/card]
+[card]
 text=Flying   {T}, Sacrifice a land: Search your library for a Mercenary permanent card with converted mana cost 2 or less and put that card onto the battlefield. Then shuffle your library.
 id=24600
 name=Bog Glider
@@ -63,6 +76,16 @@ power=2
 toughness=2
 [/card]
 [card]
+text=Destroy all enchantments you don't control. Then, if you control an untapped land, destroy all enchantments you control.
+id=24659
+auto=destroy all(enchantment|opponentBattlefield)
+auto=aslongas(land[-tapped]|myBattlefield) destroy all(enchantment|myBattlefield)
+name=Calming Verse
+rarity=C
+mana={3}{G}
+type=Sorcery
+[/card]
+[card]
 text=At the beginning of each player's end step, Citadel of Pain deals X damage to that player, where X is the number of untapped lands he or she controls.
 auto=@each my end:foreach(land[-tapped]|myBattlefield) damage:1 controller
 auto=@each opponent end:foreach(land[-tapped]|opponentBattlefield) damage:1 opponent
@@ -190,6 +213,17 @@ subtype=Aura
 abilities=flash
 [/card]
 [card]
+text=Enchant land   Enchanted land is a 5/6 green Treefolk creature that's still a land.
+id=24667
+target=land
+auto=becomes(Creature Treefolk,5/6,green)
+name=Living Terrain
+rarity=U
+mana={2}{G}{G}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
 text=Flash   Enchant creature   Enchanted creature gets +1/+2.
 target=creature
 auto=1/2
@@ -226,6 +260,19 @@ power=1
 toughness=1
 [/card]
 [card]
+text=You can't untap more than one land during your untap step.
+auto=@each my untap:untap notatarget(land|myBattlefield)
+id=24675
+name=Mungha Wurm
+rarity=R
+mana={G}
+type=Creature
+subtype=Wurm
+auto=lord(land|myBattlefield) doesnotuntap
+power=6
+toughness=5
+[/card]
+[card]
 text=Destroy all creatures you don't control. They can't be regenerated.
 auto=bury all(creature|opponentBattlefield)
 id=24622
@@ -271,6 +318,15 @@ power=1
 toughness=2
 [/card]
 [card]
+text=Mercenaries don't untap during their controllers' untap steps.
+id=24665
+auto=lord(mercenary) doesnotuntap
+name=Root Cage
+rarity=U
+mana={1}{G}
+type=Enchantment
+[/card]
+[card]
 text=Scoria Cat gets +3/+3 as long as you control no untapped lands.
 id=24636
 name=Scoria Cat
@@ -284,15 +340,25 @@ toughness=6
 [/card]
 [card]
 text=Searing Wind deals 10 damage to target creature or player.
+id=24650
 target=creature,player
 auto=damage:10
-id=24650
 name=Searing Wind
 rarity=R
 mana={8}{R}
 type=Instant
 [/card]
 [card]
+text=Basic lands each player controls have shroud as long as that player controls three or fewer lands. (They can't be the targets of spells or abilities.)
+auto=aslongas(land|myBattlefield) lord(land[basic]|myBattlefield) shroud <3
+auto=aslongas(land|opponentBattlefield) lord(land[basic]|opponentBattlefield) shroud <3
+id=24568
+name=Sheltering Prayers
+rarity=R
+mana={W}
+type=Enchantment
+[/card]
+[card]
 text=When Silt Crawler enters the battlefield, tap all lands you control.
 id=24655
 name=Silt Crawler
@@ -348,7 +414,7 @@ rarity=R
 mana={2}{G}{G}
 type=Creature
 subtype=Human Druid
-auto={1}{G}{S(land|myBattlefield)}:token(Squirrel,creature squirrel token,1/1,green)*2
+auto={1}{G}{S(land|myBattlefield)}:token(Squirrel,creature squirrel,1/1,green)*2
 auto={1}{G}{S(land|myBattlefield)}:lord(squirrel) 1/1 ueot
 power=2
 toughness=2

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

@@ -90,17 +90,6 @@ text=Target player's life total becomes 20.
 rarity=R
 [/card]
 [card]
-id=24620
-name=Bog Elemental
-mana={3}{B}{B}
-type=Creature
-subtype=Elemental
-power=5
-toughness=4
-text=Protection from white At the beginning of your upkeep, sacrifice Bog Elemental unless you sacrifice a land.
-rarity=R
-[/card]
-[card]
 id=24635
 name=Brutal Suppression
 mana={R}
@@ -109,14 +98,6 @@ text=Activated abilities of nontoken Rebels cost an additional "Sacrifice a land
 rarity=U
 [/card]
 [card]
-id=24659
-name=Calming Verse
-mana={3}{G}
-type=Sorcery
-text=Destroy all enchantments you don't control. Then, if you control an untapped land, destroy all enchantments you control.
-rarity=C
-[/card]
-[card]
 id=24567
 name=Celestial Convergence
 mana={2}{W}{W}
@@ -469,15 +450,6 @@ text=Whenever Lesser Gargadon attacks or blocks, sacrifice a land.
 rarity=U
 [/card]
 [card]
-id=24667
-name=Living Terrain
-mana={2}{G}{G}
-type=Enchantment
-subtype=Aura
-text=Enchant land Enchanted land is a 5/6 green Treefolk creature that's still a land.
-rarity=U
-[/card]
-[card]
 id=24565
 name=Mageta the Lion
 mana={3}{W}{W}
@@ -517,17 +489,6 @@ text=All combat damage that would be dealt to you this turn by target unblocked
 rarity=U
 [/card]
 [card]
-id=24675
-name=Mungha Wurm
-mana={2}{G}{G}
-type=Creature
-subtype=Wurm
-power=6
-toughness=5
-text=You can't untap more than one land during your untap step.
-rarity=R
-[/card]
-[card]
 id=24598
 name=Nakaya Shade
 mana={1}{B}
@@ -726,14 +687,6 @@ text=Flying {2}: Ribbon Snake loses flying until end of turn. Any player may act
 rarity=C
 [/card]
 [card]
-id=24665
-name=Root Cage
-mana={1}{G}
-type=Enchantment
-text=Mercenaries don't untap during their controllers' untap steps.
-rarity=U
-[/card]
-[card]
 id=24570
 name=Samite Sanctuary
 mana={2}{W}
@@ -750,14 +703,6 @@ text=Reorder your graveyard at random. An opponent chooses a card at random in y
 rarity=R
 [/card]
 [card]
-id=24568
-name=Sheltering Prayers
-mana={W}
-type=Enchantment
-text=Basic lands each player controls have shroud as long as that player controls three or fewer lands. (They can't be the targets of spells or abilities.)
-rarity=R
-[/card]
-[card]
 id=24556
 name=Shield Dancer
 mana={2}{W}

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

@@ -176,7 +176,7 @@ toughness=1
 text=Choose one - Search your library for a basic land card, reveal it, put it into your hand, then shuffle your library; or return target creature card from your graveyard to your hand; or target creature gains flying until end of turn.
 id=124047
 auto=may moveTo(myhand) target(land[basic]|mylibrary)
-auto=may moveTo(myhand) target(land[basic]|mygraveyard)
+auto=may moveTo(myhand) target(creature|mygraveyard)
 auto=may flying target(creature)
 name=Evolution Charm
 rarity=C

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

@@ -66,6 +66,17 @@ toughness=1
 abilities=flying
 [/card]
 [card]
+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
+auto=aslongas(land[-lair]|myBattlefield) moveTo(ownerhand) notatarget(land[-lair]|myBattlefield)
+auto=moveTo(graveyard) notatarget(this|myBattlefield)
+auto=@movedTo(land[-lair]|myhand) from(myBattlefield):lord(crosis's catacombs) {T}:Add{U} && lord(crosis's catacombs) {T}:Add{B} && lord(crosis's catacombs) {T}:Add{R}
+rarity=U
+type=Land
+subtype=Lair
+[/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
@@ -77,6 +88,17 @@ mana={U}{B}{R}
 type=Instant
 [/card]
 [card]
+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
+auto=aslongas(land[-lair]|myBattlefield) moveTo(ownerhand) notatarget(land[-lair]|myBattlefield)
+auto=moveTo(graveyard) notatarget(this|myBattlefield)
+auto=@movedTo(land[-lair]|myhand) from(myBattlefield):lord(darigaaz's caldera) {T}:Add{B} && lord(darigaaz's caldera) {T}:Add{R} && lord(darigaaz's caldera) {T}:Add{G}
+rarity=U
+type=Land
+subtype=Lair
+[/card]
+[card]
 text=Choose one - Return target creature card from your graveyard to your hand; or Darigaaz's Charm deals 3 damage to target creature or player; or target creature gets +3/+3 until end of turn.
 id=25864
 name=Darigaaz's Charm
@@ -123,6 +145,17 @@ mana={2}{W}
 type=Instant
 [/card]
 [card]
+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
+auto=aslongas(land[-lair]|myBattlefield) moveTo(ownerhand) notatarget(land[-lair]|myBattlefield)
+auto=moveTo(graveyard) notatarget(this|myBattlefield)
+auto=@movedTo(land[-lair]|myhand) from(myBattlefield):lord(dromar's cavern) {T}:Add{W} && lord(dromar's cavern) {T}:Add{U} && lord(dromar's cavern) {T}:Add{B}
+rarity=U
+type=Land
+subtype=Lair
+[/card]
+[card]
 text=Choose one - You gain 5 life; or counter target spell; or target creature gets -2/-2 until end of turn.
 id=25862
 name=Dromar's Charm
@@ -466,6 +499,18 @@ power=4
 toughness=5
 [/card]
 [card]
+text=When Phyrexian Bloodstock leaves the battlefield, destroy target white creature. It can't be regenerated.
+auto=@moveTo(this|exile,graveyard,hand,library) from(battlefield):bury target(creature[white])
+id=26280
+name=Phyrexian Bloodstock
+rarity=C
+mana={4}{B}
+type=Creature
+subtype=Zombie
+power=3
+toughness=3
+[/card]
+[card]
 text=When Pygmy Kavu enters the battlefield, draw a card for each black creature your opponents control.
 auto=foreach(creature[black]|opponentBattlefield) draw:1 controller
 id=23113
@@ -490,6 +535,17 @@ power=1
 toughness=1
 [/card]
 [card]
+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
+auto=aslongas(land[-lair]|myBattlefield) moveTo(ownerhand) notatarget(land[-lair]|myBattlefield)
+auto=moveTo(graveyard) notatarget(this|myBattlefield)
+auto=@movedTo(land[-lair]|myhand) from(myBattlefield):lord(rith's grove) {T}:Add{R} && lord(rith's grove) {T}:Add{G} && lord(rith's grove) {T}:Add{W}
+rarity=U
+type=Land
+subtype=Lair
+[/card]
+[card]
 text={2}{G}, {T}, Sacrifice Root Greevil: Destroy all enchantments of the color of your choice.
 id=8827
 name=Root Greevil
@@ -656,6 +712,17 @@ mana={B}{R}
 type=Instant
 [/card]
 [card]
+text=When Treva's Ruins enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand.   {T}: Add {G}, {W}, or {U} to your mana pool.
+id=25940
+name=Treva's Ruins
+auto=aslongas(land[-lair]|myBattlefield) moveTo(ownerhand) notatarget(land[-lair]|myBattlefield)
+auto=moveTo(graveyard) notatarget(this|myBattlefield)
+auto=@movedTo(land[-lair]|myhand) from(myBattlefield):lord(treva's ruins) {T}:Add{G} && lord(treva's ruins) {T}:Add{W} && lord(treva's ruins) {T}:Add{U}
+rarity=U
+type=Land
+subtype=Lair
+[/card]
+[card]
 text=Flying   {1}{R}: Volcano Imp gains first strike until end of turn.
 id=26368
 name=Volcano Imp

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

@@ -56,32 +56,6 @@ 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
-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
-[/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
-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
-[/card]
-[card]
 id=26414
 name=Dark Suspicions
 mana={2}{B}{B}
@@ -166,19 +140,6 @@ 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
-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
-[/card]
-[card]
 id=26590
 name=Ertai's Trickery
 mana={U}
@@ -390,17 +351,6 @@ text=Kicker {W} (You may pay an additional {W} as you cast this spell.) Target p
 rarity=R
 [/card]
 [card]
-id=26280
-name=Phyrexian Bloodstock
-mana={4}{B}
-type=Creature
-subtype=Zombie
-power=3
-toughness=3
-text=When Phyrexian Bloodstock leaves the battlefield, destroy target white creature. It can't be regenerated.
-rarity=C
-[/card]
-[card]
 id=26477
 name=Phyrexian Scuta
 mana={3}{B}
@@ -539,19 +489,6 @@ 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
-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
-[/card]
-[card]
 id=25942
 name=Rushing River
 mana={2}{U}
@@ -655,14 +592,6 @@ text=Enchant creature When Sleeping Potion enters the battlefield, tap enchanted
 rarity=C
 [/card]
 [card]
-id=25880
-name=Star Compass
-mana={2}
-type=Artifact
-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.
-rarity=U
-[/card]
-[card]
 id=25913
 name=Stormscape Battlemage
 mana={2}{U}
@@ -797,15 +726,6 @@ text=Choose one - Destroy target enchantment; or exile target attacking creature
 rarity=U
 [/card]
 [card]
-id=25940
-name=Treva's Ruins
-mana=
-type=Land
-subtype=Lair
-text=When Treva's Ruins enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand. {T}: Add {G}, {W}, or {U} to your mana pool.
-rarity=U
-[/card]
-[card]
 id=25918
 name=Urza's Guilt
 mana={2}{U}{B}

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

@@ -338,21 +338,10 @@ toughness=5
 abilities=cantattack
 [/card]
 [card]
-text=Play Defiant Stand only during the declare attackers step and only if you are the defending player. Target creature gets +1/+3 until the end of the turn. If that creature is tapped, untap it.
-target=creature
-auto=untap
-auto=1/3
-id=4380
-name=Defiant Stand
-rarity=U
-mana={1}{W}
-type=Instant
-[/card]
-[card]
 text=Return target sorcery card from your graveyard to your hand.
+id=4259
 target=sorcery|myGraveyard
 auto=moveTo(myHand)
-id=4259
 name=Deja vu
 rarity=C
 mana={2}{U}
@@ -402,6 +391,15 @@ toughness=6
 abilities=flying
 [/card]
 [card]
+text=Until end of turn, black creatures you control can be blocked only by black creatures.
+id=4216
+auto=lord(creature|myBattlefield) cantbeblockedby(creature[-black])
+name=Dread Charge
+rarity=R
+mana={3}{B}
+type=Sorcery
+[/card]
+[card]
 text=Flying. When Dread Reaper enters the battlefield, you lose 5 life.
 auto=life:-5
 id=4217
@@ -447,9 +445,9 @@ abilities=forestwalk
 [/card]
 [card]
 text=Return target card from your graveyard to your hand.
+id=4295
 target=*|myGraveyard
 auto=moveTo(myHand)
-id=4295
 name=Elven Cache
 rarity=C
 mana={2}{G}{G}
@@ -467,7 +465,7 @@ toughness=1
 [/card]
 [card]
 text=When Endless Cockroaches is put into a graveyard the battlefield, return Endless Cockroaches to its owner's hand.
-auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(endless cockroaches|mygraveyard)
+auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(this|mygraveyard)
 id=4220
 name=Endless Cockroaches
 rarity=R
@@ -883,6 +881,20 @@ power=2
 toughness=2
 [/card]
 [card]
+text=When Mercenary Knight enters the battlefield, sacrifice it unless you discard a creature card.
+id=4228
+auto=
+name=Mercenary Knight
+rarity=R
+mana={2}{B}
+type=Creature
+subtype=Human Mercenary Knight
+auto=moveTo(graveyard) notatarget(this|myBattlefield)
+auto=moveTo(graveyard) notatarget(*|myhand)
+power=4
+toughness=4
+[/card]
+[card]
 id=4267
 name=Merfolk of the Pearl Trident
 rarity=C
@@ -1003,9 +1015,9 @@ toughness=1
 [/card]
 [card]
 text=Counter target creature or sorcery spell.
+id=4268
 target=creature,sorcery|stack
 auto=fizzle
-id=4268
 name=Mystic Denial
 rarity=U
 mana={1}{U}{U}
@@ -1013,9 +1025,9 @@ type=Instant
 [/card]
 [card]
 text=Target player gains 8 life.
+id=4308
 target=player
 auto=life:8
-id=4308
 name=Natural Spring
 rarity=U
 mana={3}{G}{G}
@@ -1042,8 +1054,9 @@ type=Sorcery
 [/card]
 [card]
 text=Destroy all green creatures.
-auto=destroy all(creature[green])
 id=4232
+
+auto=destroy all(creature[green])
 name=Nature's Ruin
 rarity=U
 mana={2}{B}
@@ -1059,6 +1072,20 @@ mana={2}{G}
 type=Sorcery
 [/card]
 [card]
+text=Flying     When Owl Familiar enters the battlefield, draw a card, then discard a card.
+id=4270
+name=Owl Familiar
+rarity=C
+mana={1}{U}
+type=Creature
+subtype=Bird
+auto=draw:1
+auto=moveTo(mygraveyard) notatarget(*|myhand)
+power=1
+toughness=1
+abilities=flying
+[/card]
+[card]
 id=9845
 name=Panther Warriors
 rarity=C
@@ -1128,6 +1155,19 @@ type=Basic Land
 subtype=Plains
 [/card]
 [card]
+text=When Plant Elemental enters the battlefield, sacrifice it unless you sacrifice a Forest.
+auto=moveTo(graveyard) notatarget(this|myBattlefield)
+auto=moveTo(graveyard) notatarget(forest|myBattlefield)
+id=4313
+name=Plant Elemental
+rarity=U
+mana={1}{G}
+type=Creature
+subtype=Plant Elemental
+power=3
+toughness=4
+[/card]
+[card]
 text=Each player draws X cards.
 id=4273
 auto=Draw:X controller
@@ -1514,6 +1554,19 @@ mana={2}{U}
 type=Sorcery
 [/card]
 [card]
+text=When Thundering Wurm enters the battlefield, sacrifice it unless you discard a land card.
+id=4321
+name=Thundering Wurm
+rarity=R
+mana={2}{G}
+type=Creature
+subtype=Wurm
+auto=moveTo(graveyard) notatarget(this|myBattlefield)
+auto=moveTo(graveyard) notatarget(land|myhand)
+power=4
+toughness=4
+[/card]
+[card]
 text=Haste (This creature can attack the turn it comes under your control.)  When Thundermare enters the battlefield, tap all other creatures.
 id=4364
 name=Thundermare
@@ -1547,7 +1600,7 @@ type=Sorcery
 [/card]
 [card]
 text=When Undying Beast is put into a graveyard from the battlefield, put Undying Beast on top of its owner's library.
-auto=@movedTo(this|graveyard) from(battlefield):moveTo(mylibrary) notatarget(undying beast|mygraveyard)
+auto=@movedTo(this|graveyard) from(battlefield):moveTo(mylibrary) notatarget(this|mygraveyard)
 id=4242
 name=Undying Beast
 rarity=C
@@ -1577,15 +1630,6 @@ mana={1}{W}{W}
 type=Sorcery
 [/card]
 [card]
-text=Creatures you control get +1/+1 until end of turn.
-id=4406
-auto=lord(creature|myBattlefield) 1/1
-name=Warrior's Charge
-rarity=C
-mana={2}{W}
-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
@@ -1684,6 +1728,15 @@ toughness=5
 abilities=defender,flying
 [/card]
 [card]
+text=Creatures you control get +1/+1 until end of turn.
+id=4406
+auto=lord(creature|myBattlefield) 1/1
+name=Warrior's Charge
+rarity=C
+mana={2}{W}
+type=Sorcery
+[/card]
+[card]
 id=4324
 name=Whiptail Wurm
 rarity=U

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

@@ -102,12 +102,16 @@ 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
-name=Dread Charge
-rarity=R
-type=Sorcery
-mana={3}{B}
+####Cannot be coded right now! (0.10.1)
+text=Play Defiant Stand only during the declare attackers step and only if you are the defending player. Target creature gets +1/+3 until the end of the turn. If that creature is tapped, untap it.
+id=4380
+target=creature
+auto=untap
+auto=1/3
+name=Defiant Stand
+rarity=U
+mana={1}{W}
+type=Instant
 [/card]
 [card]
 text=Flying     When Ebon Dragon comes into play, you may have target opponent discard a card.
@@ -196,18 +200,6 @@ type=Sorcery
 mana={R}{R}
 [/card]
 [card]
-text=When Mercenary Knight comes into play, sacrifice it unless you discard a creature card.
-id=4228
-auto=discard:1
-name=Mercenary Knight
-rarity=R
-type=Creature
-mana={2}{B}
-power=4
-subtype=Human Mercenary Knight
-toughness=4
-[/card]
-[card]
 text=Target player discards two cards.
 target=player
 auto=discard:2
@@ -245,17 +237,6 @@ type=Sorcery
 mana={1}{U}
 [/card]
 [card]
-text=Flying     When Owl Familiar comes into play, draw a card, then discard a card.
-id=4270
-name=Owl Familiar
-rarity=C
-type=Creature
-mana={1}{U}
-power=1
-subtype=Bird
-toughness=1
-[/card]
-[card]
 text=Search your library for a sorcery card and reveal that card. Shuffle your library, then put the card on top of it.
 id=4271
 name=Personal Tutor
@@ -277,17 +258,6 @@ 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
-rarity=U
-type=Creature
-mana={1}{G}
-power=3
-subtype=Plant Elemental
-toughness=4
-[/card]
-[card]
 text=When Primeval Force comes into play, sacrifice it unless you sacrifice three Forests.
 id=4314
 name=Primeval Force
@@ -388,17 +358,6 @@ subtype=Leviathan
 toughness=9
 [/card]
 [card]
-text=When Thundering Wurm comes into play, sacrifice it unless you discard a land card.
-id=4321
-name=Thundering Wurm
-rarity=R
-type=Creature
-mana={2}{G}
-power=4
-subtype=Wurm
-toughness=4
-[/card]
-[card]
 text=Tap up to three target creatures without flying.
 id=4281
 name=Tidal Surge

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

@@ -161,6 +161,19 @@ power=3
 toughness=1
 [/card]
 [card]
+text=Flying   {U}: Cerulean Sphinx's owner shuffles it into his or her library.
+id=89095
+name=Cerulean Sphinx
+auto={U}:moveto(mylibrary) && shuffle
+rarity=R
+type=Creature
+subtype=Sphinx
+mana={4}{U}{U}
+power=5
+toughness=5
+abilities=flying
+[/card]
+[card]
 text=Char deals 4 damage to target creature or player and 2 damage to you.
 target=creature,player
 auto=Damage:4
@@ -319,6 +332,20 @@ power=3
 toughness=4
 [/card]
 [card]
+text=Flying   When Drake Familiar enters the battlefield, sacrifice it unless you return an enchantment on the battlefield to its owner's hand.
+id=87960
+name=Drake Familiar
+rarity=C
+mana={1}{U}
+type=Creature
+subtype=Drake
+auto=moveTo(graveyard) notatarget(this|myBattlefield)
+auto=moveTo(ownerhand) notatarget(enchantment|battlefield)
+power=2
+toughness=1
+abilities=flying
+[/card]
+[card]
 text=Enchant permanent   You may cast Dream Leash only on a tapped permanent.   You control enchanted permanent.
 target=*[tapped]
 alias=1194
@@ -356,10 +383,10 @@ toughness=5
 [/card]
 [card]
 text={T}: Add {1} to your mana pool.   {U}{B}, {T}: Target player puts the top card of his or her library into his or her graveyard.
-auto={T}:Add {1}
-auto={U}{B}{T}:deplete:1 target(player)
 id=88943
 name=Duskmantle, House of Shadow
+auto={T}:Add {1}
+auto={U}{B}{T}:deplete:1 target(player)
 rarity=U
 type=Land
 [/card]
@@ -438,10 +465,10 @@ abilities=flying,first strike
 [/card]
 [card]
 text=Enchant creature   When Fists of Ironwood enters the battlefield, put two 1/1 green Saproling creature tokens onto the battlefield.   Enchanted creature has trample.
+id=83672
 target=creature
 auto=token(Saproling,creature saproling, 1/1,green)*2
 auto=trample
-id=83672
 name=Fists of Ironwood
 rarity=C
 mana={1}{G}
@@ -732,10 +759,11 @@ type=Instant
 [/card]
 [card]
 text=Lightning Helix deals 3 damage to target creature or player and you gain 3 life.
+id=87908
+
 target=creature,player
 auto=Damage:3
 auto=life:3 controller
-id=87908
 name=Lightning Helix
 rarity=U
 mana={W}{R}
@@ -748,18 +776,18 @@ name=Mnemonic Nexus
 auto=moveto(opponentlibrary) all(*|opponentgraveyard) && shuffle opponent
 auto=moveto(mylibrary) all(*|mygraveyard) && shuffle controller
 rarity=U
-type=Instant
 mana={3}{U}
+type=Instant
 [/card]
 [card]
-text=Flying. At the beginning of your upkeep, you lose 1 life.
-auto=@each my upkeep:life:-1 controller
+text=Flying   At the beginning of your upkeep, you lose 1 life.
 id=83631
 name=Moroii
 rarity=U
 mana={2}{U}{B}
 type=Creature
 subtype=Vampire
+auto=@each my upkeep:life:-1 controller
 power=4
 toughness=4
 abilities=flying
@@ -1085,7 +1113,7 @@ type=Artifact
 text=When Sell-Sword Brute is put into a graveyard from the battlefield, it deals 2 damage to you.
 id=87909
 name=Sell-Sword Brute
-auto=@movedto(this|graveyard) from(batlefield):damage:2 controller
+auto=@movedto(this|graveyard) from(battlefield):damage:2 controller
 rarity=C
 mana={1}{R}
 type=Creature
@@ -1094,14 +1122,14 @@ power=2
 toughness=2
 [/card]
 [card]
-text=Swampwalk   Sacrifice Sewerdreg: Remove target card in a graveyard from the game.
+text=Swampwalk   Sacrifice Sewerdreg: Exile target card in a graveyard.
 id=88995
 name=Sewerdreg
 rarity=C
 mana={3}{B}{B}
 type=Creature
 subtype=Spirit
-auto={S}:moveTo(removedfromgame) target(*|graveyard)
+auto={S}:moveTo(exile) target(*|graveyard)
 power=3
 toughness=3
 abilities=swampwalk
@@ -1412,6 +1440,19 @@ power=1
 toughness=2
 [/card]
 [card]
+text=When Vindictive Mob enters the battlefield, sacrifice a creature.   Vindictive Mob can't be blocked by Saprolings.
+id=89002
+name=Vindictive Mob
+rarity=U
+mana={4}{B}{B}
+type=Creature
+subtype=Human Berserker
+auto=moveTo(ownergraveyard) notatarget(creature)
+auto=cantbeblockedby(saproling)
+power=5
+toughness=5
+[/card]
+[card]
 text=Whenever a land enters the battlefield under your control, put a +1/+1 counter on Vinelasher Kudzu.
 auto=@movedTo(land|myBattlefield):counter(1/1)
 id=83559
@@ -1426,9 +1467,9 @@ toughness=1
 [card]
 text={T}: Add {1} to your mana pool.  {2}{G}{W}, {T}: Put a 1/1 green Saproling creature token onto the battlefield.
 id=89016
+name=Vitu-Ghazi, the City-Tree
 auto={T}:Add {1} 
 auto={2}{G}{W}{T}:token(Saproling,creature saproling, 1/1, green)
-name=Vitu-Ghazi, the City-Tree
 rarity=U
 type=Land
 [/card]
@@ -1446,13 +1487,13 @@ toughness=1
 [/card]
 [card]
 text=Flying   Whenever a card is put into an opponent's graveyard from anywhere, put a +1/+1 counter on Vulturous Zombie.
-auto=@movedTo(*|opponentgraveyard):counter(1/1)
 id=89082
 name=Vulturous Zombie
 rarity=R
 mana={3}{B}{G}
 type=Creature
 subtype=Plant Zombie
+auto=@movedTo(*|opponentgraveyard):counter(1/1)
 power=3
 toughness=3
 abilities=flying
@@ -1465,7 +1506,7 @@ rarity=C
 mana={R}
 type=Creature
 subtype=Goblin Warrior
-auto={R}{S}:Damage:2 target(creature[attacking;blocking])
+auto={R}{S}:Damage:2 target(creature[blocking])
 power=1
 toughness=1
 [/card]

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

@@ -138,19 +138,6 @@ subtype=Human Cleric
 toughness=1
 [/card]
 [card]
-#To test
-text=Flying     {U}: Cerulean Sphinx's owner shuffles it into his or her library.
-id=89095
-name=Cerulean Sphinx
-auto={U}:moveto(mylibrary) && shuffle
-rarity=R
-type=Creature
-mana={4}{U}{U}
-power=5
-subtype=Sphinx
-toughness=5
-[/card]
-[card]
 text=Convoke (Each creature you tap while playing this spell reduces its cost by {1} or by one mana of that creature's color.)  Prevent all damage that would be dealt by creatures this turn. You gain life equal to the damage prevented this way.
 id=87957
 name=Chant of Vitu-Ghazi
@@ -417,17 +404,6 @@ type=Enchantment
 mana={4}{G}
 [/card]
 [card]
-text=Flying     When Drake Familiar comes into play, sacrifice it unless you return an enchantment in play to its owner's hand.
-id=87960
-name=Drake Familiar
-rarity=C
-type=Creature
-mana={1}{U}
-power=2
-subtype=Drake
-toughness=1
-[/card]
-[card]
 text={2}{B}{G}, Sacrifice a creature: Target creature gets +2/+2 until end of turn. Another target creature gets -2/-2 until end of turn.
 id=87989
 name=Drooling Groodion
@@ -1579,17 +1555,6 @@ type=Sorcery
 mana={2}{B}{B}
 [/card]
 [card]
-text=When Vindictive Mob comes into play, sacrifice a creature.     Vindictive Mob can't be blocked by Saprolings.
-id=89002
-name=Vindictive Mob
-rarity=U
-type=Creature
-mana={4}{B}{B}
-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
 name=Voyager Staff

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

@@ -1579,7 +1579,7 @@ toughness=2
 abilities=flying
 [/card]
 [card]
-text=Enchant creature   When Paralyze enters the battlefield, tap enchanted creature.   Enchanted creature doesn't untap during its controller's untap step.   Enchanted creature has "At the beginning of your upkeep, you may pay {4}. If you do, untap this creature."
+text=Enchant creature   When Paralyze enters the battlefield, tap enchanted creature.   Enchanted creature doesn't untap during its controller's untap step.   At the beginning of the upkeep of enchanted creature's controller, that player may pay 4. If he or she does, untap the creature.
 id=1171
 target=creature
 name=Paralyze
@@ -2422,9 +2422,9 @@ abilities=defender
 [/card]
 [card]
 text=Enchant creature   At the beginning of the upkeep of enchanted creature's controller, Wanderlust deals 1 damage to that player.
-target=creature
 id=1276
-auto=@each my upkeep:damage:1 targetController
+target=creature
+auto=@each targetcontroller upkeep:damage:1 targetController
 name=Wanderlust
 rarity=U
 mana={2}{G}

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

@@ -108,7 +108,7 @@ power=2
 toughness=1
 text=Flying When Death's-Head Buzzard is put into a graveyard from the battlefield, all creatures get -1/-1 until end of turn.
 abilities=flying
-auto=@movedto(this|graveyard):-1/-1 all(creature|Battlefield) ueot
+auto=@movedto(this|graveyard) from(battlefield):-1/-1 all(creature|Battlefield) ueot
 rarity=C
 [/card]
 [card]

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

@@ -267,6 +267,16 @@ toughness=3
 abilities=cantattack
 [/card]
 [card]
+text=Whenever a creature blocks, Heat of Battle deals 1 damage to that creature's controller.
+auto=@each my combatdamage:foreach(creature[blocking]|opponentBattlefield) damage:1 opponent
+auto=@each opponent combatdamage:foreach(creature[blocking]|myBattlefield) damage:1 controller
+id=5165
+name=Heat of Battle
+rarity=U
+mana={1}{R}
+type=Enchantment
+[/card]
+[card]
 text={W}: Honor Guard gets +0/+1 until end of turn.
 id=5170
 name=Honor Guard
@@ -511,9 +521,9 @@ rarity=U
 mana={R}{G}
 type=Creature
 subtype=Sliver
+auto=lord(sliver) rampage(1/1,0)
 power=2
 toughness=2
-auto=lord(sliver) rampage(1/1,0)
 [/card]
 [card]
 id=5245

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

@@ -212,14 +212,6 @@ text=Activated abilities of creatures cost {1} less to activate. This effect can
 rarity=U
 [/card]
 [card]
-id=5165
-name=Heat of Battle
-mana={1}{R}
-type=Enchantment
-text=Whenever a creature blocks, Heat of Battle deals 1 damage to that creature's controller.
-rarity=U
-[/card]
-[card]
 id=5166
 name=Hermit Druid
 mana={1}{G}

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

@@ -161,6 +161,15 @@ power=1
 toughness=3
 [/card]
 [card]
+text=Return Broken Fall to its owner's hand: Regenerate target creature.
+id=4750
+auto={0}:moveTo(ownerhand) all(this) && regenerate target(creature) limit:1
+name=Broken Fall
+rarity=C
+mana={2}{G}
+type=Enchantment
+[/card]
+[card]
 text=Caldera Lake enters the battlefield tapped.   {T}: Add {1} to your mana pool.   {T}: Add {U} or {R} to your mana pool. Caldera Lake deals 1 damage to you.
 id=4930
 name=Caldera Lake
@@ -527,6 +536,25 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
+text=As long as an opponent controls a creature with flying not named Escaped Shapeshifter, Escaped Shapeshifter has flying. The same is true for first strike, trample, and protection from any color.
+id=4699
+name=Escaped Shapeshifter
+auto=aslongas(creature[flying;-escaped shapeshifter]|opponentinplay) flying
+auto=aslongas(creature[first strike;-escaped shapeshifter]|opponentinplay) first strike
+auto=aslongas(creature[trample;-escaped shapeshifter]|opponentinplay) trample
+auto=aslongas(creature[protection from black;-escaped shapeshifter]|opponentinplay) protection from black
+auto=aslongas(creature[protection from blue;-escaped shapeshifter]|opponentinplay) protection from blue
+auto=aslongas(creature[protection from red;-escaped shapeshifter]|opponentinplay) protection from red
+auto=aslongas(creature[protection from white;-escaped shapeshifter]|opponentinplay) protection from white
+auto=aslongas(creature[protection from green;-escaped shapeshifter]|opponentinplay) protection from green
+rarity=R
+mana={3}{U}{U}
+type=Creature
+subtype=Shapeshifter
+power=3
+toughness=4
+[/card]
+[card]
 text={2}{B}{B}: Put a -1/-1 counter on target creature.
 id=4664
 auto={2}{B}{B}:counter(-1/-1) target(creature)
@@ -644,10 +672,10 @@ subtype=Forest
 [/card]
 [card]
 text=Enchant creature   When Frog Tongue enters the battlefield, draw a card.   Enchanted creature has reach. (It can block creatures with flying.)
+id=4762
 target=creature
 auto=reach
 auto=draw:1 controller
-id=4762
 name=Frog Tongue
 rarity=C
 mana={G}
@@ -656,10 +684,10 @@ subtype=Aura
 [/card]
 [card]
 text=Target blocking creature gets +4/+4 until end of turn.   Draw a card.
+id=4876
 target=creature[blocking]
 auto=4/4
 auto=draw:1 controller
-id=4876
 name=Gallantry
 rarity=U
 mana={1}{W}
@@ -809,13 +837,13 @@ subtype=Aura
 [/card]
 [card]
 text=All Sliver creatures have trample.
-auto=lord(sliver) trample
 id=4768
 name=Horned Sliver
 rarity=U
 mana={2}{G}
 type=Creature
 subtype=Sliver
+auto=lord(sliver) trample
 power=2
 toughness=2
 [/card]
@@ -886,10 +914,10 @@ type=Artifact
 [/card]
 [card]
 text=Kindle deals X damage to target creature or player, where X is 2 plus the number of cards named Kindle in all graveyards.
+id=4826
 target=creature,player
 auto=foreach(kindle|graveyard) damage:1
 auto=damage:2
-id=4826
 name=Kindle
 rarity=C
 mana={1}{R}
@@ -924,9 +952,9 @@ type=Enchantment
 [/card]
 [card]
 text=Lightning Blast deals 4 damage to target creature or player.
+id=4827
 target=creature,player
 auto=Damage:4
-id=4827
 name=Lightning Blast
 rarity=C
 mana={3}{R}
@@ -946,13 +974,13 @@ abilities=haste
 [/card]
 [card]
 text={T}, Sacrifice Lotus Petal: Add one mana of any color to your mana pool.
+id=4614
+name=Lotus Petal
 auto={T}{S}:Add{G}
 auto={T}{S}:Add{R}
 auto={T}{S}:Add{U}
 auto={T}{S}:Add{B}
 auto={T}{S}:Add{W}
-id=4614
-name=Lotus Petal
 rarity=C
 mana={0}
 type=Artifact
@@ -968,14 +996,14 @@ power=4
 toughness=3
 [/card]
 [card]
-text={T}: Add {1} to your mana pool.
-auto={T}:Add {1} 
+text={T}: Add {1} to your mana pool. 
 id=4616
 name=Manakin
 rarity=C
 mana={2}
 type=Artifact Creature
 subtype=Construct
+auto={T}:Add {1}
 power=1
 toughness=1
 [/card]
@@ -1017,25 +1045,25 @@ toughness=2
 [/card]
 [card]
 text={W}, {T}: Tap target creature.
-auto={W}{T}:tap target(creature)
 id=4887
 name=Master Decoy
 rarity=C
 mana={1}{W}
 type=Creature
 subtype=Human Soldier
+auto={W}{T}:tap target(creature)
 power=1
 toughness=2
 [/card]
 [card]
 text=Flying   {T}: Mawcor deals 1 damage to target creature or player.
-auto={T}:damage:1 target(creature,player)
 id=4712
 name=Mawcor
 rarity=R
 mana={3}{U}{U}
 type=Creature
 subtype=Beast
+auto={T}:damage:1 target(creature,player)
 power=3
 toughness=3
 abilities=flying
@@ -1063,11 +1091,11 @@ toughness=1
 text=All Slivers have "{2}, Sacrifice this permanent: Draw a card."
 id=4714
 name=Mnemonic Sliver
-auto=lord(sliver) {2}{S}:draw:1
 rarity=U
 mana={2}{U}
 type=Creature
 subtype=Sliver
+auto=lord(sliver) {2}{S}:draw:1
 power=2
 toughness=2
 [/card]
@@ -1244,7 +1272,7 @@ toughness=1
 [/card]
 [card]
 text={2}, Discard a card: Put a 1/1 white Pegasus creature token with flying onto the battlefield.
-auto={2}{S(*|myhand)}:token(Pegasus,Pegasus Token Creature, 1/1,flying white)
+auto={2}{S(*|myhand)}:token(Pegasus,Creature Pegasus, 1/1,flying white)
 id=4893
 name=Pegasus Refuge
 rarity=R
@@ -1297,11 +1325,11 @@ type=Land
 text=Flying   {B}: Pit Imp gets +1/+0 until end of turn. Play this ability no more than twice each turn.
 id=4677
 name=Pit Imp
-auto={B}:1/0 limit:2
 rarity=C
 mana={B}
 type=Creature
 subtype=Imp
+auto={B}:1/0 limit:2
 power=0
 toughness=1
 abilities=flying
@@ -1420,9 +1448,9 @@ type=Sorcery
 [/card]
 [card]
 text=Prevent all combat damage that would be dealt this turn.   You gain 1 life for each attacking creature.
+id=4783
 auto=preventAllcombatDamage ueot
 auto=foreach(creature[attacking]) life:1 controller
-id=4783
 name=Respite
 rarity=C
 mana={1}{G}
@@ -1430,10 +1458,10 @@ type=Instant
 [/card]
 [card]
 text=Target creature loses shadow until end of turn.   Draw a card.
+id=4780
 target=creature
 auto=-shadow
 auto=draw:1 controller
-id=4780
 name=Reality Anchor
 rarity=C
 mana={1}{G}
@@ -1453,13 +1481,13 @@ abilities=trample
 [/card]
 [card]
 text={1}{G}: Rootwalla gets +2/+2 until end of turn. Play this ability only once each turn.
-auto={1}{G}:2/2 limit:1
 id=4786
 name=Rootwalla
 rarity=C
 mana={2}{G}
 type=Creature
 subtype=Lizard
+auto={1}{G}:2/2 limit:1
 power=2
 toughness=2
 [/card]
@@ -1467,11 +1495,11 @@ toughness=2
 text={T}, Sacrifice Rootwater Diver: Return target artifact card from your graveyard to your hand.
 id=4720
 name=Rootwater Diver
-auto={T}{S}:moveTo(myhand) target(artifact|mygraveyard)
 rarity=U
 mana={U}
 type=Creature
 subtype=Merfolk
+auto={T}{S}:moveTo(myhand) target(artifact|mygraveyard)
 power=1
 toughness=1
 [/card]
@@ -1479,19 +1507,19 @@ toughness=1
 text={T}: Rootwater Hunter deals 1 damage to target creature or player.
 id=4721
 name=Rootwater Hunter
-auto={T}:damage:1 target(creature,player)
 rarity=C
 mana={2}{U}
 type=Creature
 subtype=Merfolk
+auto={T}:damage:1 target(creature,player)
 power=1
 toughness=1
 [/card]
 [card]
 text=Enchant creature   Whenever a creature is put into a graveyard from the battlefield, put a +1/+1 counter on enchanted creature.
+id=4682
 target=creature
 auto=@movedTo(graveyard) from(creature|battlefield):counter(1/1)
-id=4682
 name=Sadistic Glee
 rarity=C
 type=Enchantment
@@ -1500,9 +1528,9 @@ subtype=Aura
 [/card]
 [card]
 text={2}{W}: Prevent all combat damage that would be dealt by target creature this turn.
+auto={2}{W}:preventAllCombatDamage from target(creature) ueot
 id=4897
 name=Safeguard
-auto={2}{W}:preventAllCombatDamage from target(creature) ueot
 rarity=R
 mana={3}{W}{W}
 type=Enchantment
@@ -1543,6 +1571,15 @@ rarity=R
 type=Land
 [/card]
 [card]
+text=At the beginning of your upkeep, if you have three or fewer cards in hand, Scalding Tongs deals 1 damage to target opponent.
+auto=@each my upkeep:aslongas(*|myhand) damage:1 opponent <4
+id=4627
+name=Scalding Tongs
+rarity=R
+mana={2}
+type=Artifact
+[/card]
+[card]
 text=Scragnoth can't be countered.   Protection from blue
 id=4787
 name=Scragnoth
@@ -1769,6 +1806,20 @@ toughness=1
 abilities=shadow
 [/card]
 [card]
+####This has been successfully tested because first strike is not cumulative.
+text=Shadow (This creature can block or be blocked by only creatures with shadow.)  Soltari Lancer has first strike as long as it's attacking.
+id=4902
+name=Soltari Lancer
+rarity=C
+mana={2}{W}
+type=Creature
+subtype=Soltari Knight
+auto=lord(soltari lancer[attacking]|myBattlefield) first strike
+power=2
+toughness=2
+abilities=shadow
+[/card]
+[card]
 text=Protection from black   Shadow (This creature can block or be blocked by only creatures with shadow.)
 id=4903
 name=Soltari Monk

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

@@ -103,14 +103,6 @@ subtype=Human Archer Minion
 toughness=2
 [/card]
 [card]
-text=Return Broken Fall to its owner's hand: Regenerate target creature.
-id=4750
-name=Broken Fall
-rarity=C
-type=Enchantment
-mana={2}{G}
-[/card]
-[card]
 text=Buyback {3} (You may pay an additional {3} as you play this spell. If you do, put this card into your hand as it resolves.)  Return target permanent to its owner's hand.
 id=4691
 name=Capsize
@@ -403,26 +395,6 @@ type=Instant
 mana={X}{U}
 [/card]
 [card]
-text=As long as an opponent controls a creature with flying not named Escaped Shapeshifter, Escaped Shapeshifter has flying. The same is true for first strike, trample, and protection from any color.
-id=4699
-name=Escaped Shapeshifter
-## flying,first strike,trample works, protection doesn't
-auto=aslongas(creature[flying;-Escaped Shapeshifter]|opponentinplay) flying
-auto=aslongas(creature[first strike;-Escaped Shapeshifter]|opponentinplay) first strike
-auto=aslongas(creature[trample;-Escaped Shapeshifter]|opponentinplay) trample
-auto=aslongas(creature[protection from black;-Escaped Shapeshifter]|opponentinplay) protection from black
-auto=aslongas(creature[protection from blue;-Escaped Shapeshifter]|opponentinplay) protection from blue
-auto=aslongas(creature[protection from red;-Escaped Shapeshifter]|opponentinplay) protection from red
-auto=aslongas(creature[protection from white;-Escaped Shapeshifter]|opponentinplay) protection from white
-auto=aslongas(creature[protection from green;-Escaped Shapeshifter]|opponentinplay) protection from green
-rarity=R
-type=Creature
-mana={3}{U}{U}
-power=3
-subtype=Shapeshifter
-toughness=4
-[/card]
-[card]
 text={3}, {T}: Put an elixir counter on Essence Bottle.     {T}, Remove all elixir counters from Essence Bottle: You gain 2 life for each elixir counter removed this way.
 id=4606
 name=Essence Bottle
@@ -534,7 +506,6 @@ power=1
 subtype=Squid Beast
 toughness=3
 [/card]
-
 [card]
 text={T}: Add {1} to your mana pool.     {0}: Return Ghost Town to its owner's hand. Play this ability only if it's not your turn.
 id=4932
@@ -935,7 +906,6 @@ rarity=U
 type=Enchantment
 mana={2}{U}
 [/card]
-
 [card]
 text={1}{W}, {T}: Quickening Licid loses this ability and becomes an Aura enchantment with enchant creature. Attach it to target creature. You may pay {W} to end this effect.     Enchanted creature has first strike.
 id=4894
@@ -947,9 +917,6 @@ power=1
 subtype=Licid
 toughness=1
 [/card]
-
-
-
 [card]
 text=Flying (This creature can't be blocked except by creatures with flying or reach.)  When Rathi Dragon comes into play, sacrifice it unless you sacrifice two Mountains.
 id=4838
@@ -1021,8 +988,6 @@ rarity=R
 type=Enchantment
 mana={G}
 [/card]
-
-
 [card]
 text={T}: Add {1} to your mana pool.     {T}: Add {U} or {B} to your mana pool. Rootwater Depths doesn't untap during your next untap step.
 id=4937
@@ -1030,8 +995,6 @@ name=Rootwater Depths
 rarity=U
 type=Land
 [/card]
-
-
 [card]
 text={T}: Gain control of target creature as long as that creature is enchanted.
 id=4722
@@ -1090,14 +1053,6 @@ type=Enchantment
 mana={B}
 [/card]
 [card]
-text=At the beginning of your upkeep, if you have three or fewer cards in hand, Scalding Tongs deals 1 damage to target opponent.
-id=4627
-name=Scalding Tongs
-rarity=R
-type=Artifact
-mana={2}
-[/card]
-[card]
 text=As an additional cost to play Scorched Earth, discard X land cards.     Destroy X target lands.
 id=4842
 name=Scorched Earth
@@ -1177,19 +1132,6 @@ subtype=Soltari Soldier
 toughness=2
 [/card]
 [card]
-text=Shadow (This creature can block or be blocked by only creatures with shadow.)  Soltari Lancer has first strike as long as it's attacking.
-id=4902
-auto=aslongas(this[attacking]|myinplay) first strike
-abilities=shadow
-name=Soltari Lancer
-rarity=C
-type=Creature
-mana={2}{W}
-power=2
-subtype=Soltari Knight
-toughness=2
-[/card]
-[card]
 text=Shadow (This creature can block or be blocked by only creatures with shadow.)  Whenever Soltari Trooper attacks, it gets +1/+1 until end of turn.
 id=4905
 auto=aslongas(this[attacking]|myinplay) 1/1
@@ -1324,13 +1266,10 @@ auto={T}: Add {U}
 rarity=U
 type=Land
 [/card]
-
-
 [card]
 text=At the beginning of your upkeep, if you have five or more cards in hand, Thumbscrews deals 1 damage to target opponent.
 id=4632
 auto=aslongas(*|myhand) damage:1 opponent >4
-#this only works for 1 turn, then it no longer works
 name=Thumbscrews
 rarity=R
 type=Artifact

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

@@ -86,6 +86,16 @@ rarity=U
 type=Land
 [/card]
 [card]
+text=Add {B}{B}{B} to your mana pool.   Threshold - Add {B}{B}{B}{B}{B} to your mana pool instead if seven or more cards are in your graveyard.
+id=30564
+auto=Add{B}{B}{B}
+auto=aslongas(*|mygraveyard) add{B}{B} >6
+name=Cabal Ritual
+rarity=C
+mana={1}{B}
+type=Instant
+[/card]
+[card]
 text={B}, {T}: Target creature gets -1/-1 until end of turn. Threshold - {3}{B}{B}, {T}: Target creature gets -2/-2 until end of turn. Activate this ability only if seven or more cards are in your graveyard.
 id=32226
 name=Cabal Torturer

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

@@ -88,7 +88,6 @@ mana={X}{U}
 type=Sorcery
 rarity=U
 [/card]
-
 [card]
 text={2}{B}{B}, {T}, Exile two cards from your graveyard: Return target creature card from your graveyard to your hand.
 name=Cabal Surgeon
@@ -100,18 +99,14 @@ power=2
 toughness=1
 rarity=C
 [/card]
-
 [card]
-text=Add {B}{B}{B} to your mana pool.Threshold : Add {B}{B}{B}{B}{B} to your mana pool instead if seven or more cards are in your graveyard.
+text=Add {B}{B}{B} to your mana pool. Threshold - Add {B}{B}{B}{B}{B} to your mana pool instead if seven or more cards are in your graveyard.
 name=Cabal Ritual
 id=30564
 mana={1}{B}
 type=Instant
 rarity=C
 [/card]
-
-
-
 [card]
 text=Whenever Carrion Rats attacks or blocks, any player may exile a card from his or her graveyard. If a player does, Carrion Rats assigns no combat damage this turn.
 name=Carrion Rats

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

@@ -390,6 +390,19 @@ power=1
 toughness=1
 [/card]
 [card]
+text=Enchant creature   Enchanted creature gets +2/+2 and has flying.   When enchanted creature is put into a graveyard, put a 2/2 white Griffin creature token with flying onto the battlefield.
+id=110514
+target=creature
+auto=2/2
+auto=flying
+auto=@movedTo(mytgt|mygraveyard):token(Griffin,creature griffin, 2/2,flying, white)
+name=Griffin Guide
+rarity=U
+mana={2}{W}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
 text=Flash (You may cast this spell any time you could cast an instant.) Trample. 
 id=108808
 name=Havenwood Wurm
@@ -426,6 +439,19 @@ power=1
 toughness=1
 [/card]
 [card]
+text=Ironclaw Buzzardiers can't block creatures with power 2 or greater.   {R}: Ironclaw Buzzardiers gains flying until end of turn.
+id=116723
+name=Ironclaw Buzzardiers
+rarity=C
+mana={2}{R}
+type=Creature
+subtype=Orc Scout
+auto=cantbeblockedby(creature[power>=2])
+auto={R}:flying
+power=2
+toughness=2
+[/card]
+[card]
 id=122089
 name=Island
 type=Basic Land
@@ -470,8 +496,7 @@ mana={1}{R}{R}
 type=Legendary Creature
 subtype=Human Spellshaper
 auto={R}{T}{S(*|myHand)}:destroy target(*[blue])
-auto={1}{R}{T}{S(*|myHand)}:cantregenerate && damage:3 target(creature)
-auto={1}{R}{T}{S(*|myHand)}:damage:3 target(player)
+auto={1}{R}{T}{S(*|myHand)}:damage:3 && cantregenerate target(creature,player)
 auto={5}{R}{R}{S(*|myHand)}:damage:6 all(creature,player)
 power=2
 toughness=2
@@ -499,6 +524,20 @@ rarity=R
 type=Legendary Land
 [/card]
 [card]
+text=Shadow (This creature can block or be blocked by only creatures with shadow.)   Whenever Looter il-Kor deals damage to an opponent, draw a card, then discard a card.
+id=118918
+name=Looter il-Kor
+rarity=C
+mana={1}{U}
+type=Creature
+subtype=Kor Rogue
+auto=@damaged(player) from(this):moveTo(mygraveyard) notatarget(*|myHand)
+auto=@damaged(player) from(this):draw:1 controller
+power=1
+toughness=1
+abilities=shadow
+[/card]
+[card]
 text=Magus of the Disk enters the battlefield tapped.   {1}, {T}: Destroy all artifacts, creatures, and enchantments.
 id=126298
 name=Magus of the Disk
@@ -584,6 +623,18 @@ mana={1}{R}{R}
 type=Instant
 [/card]
 [card]
+text=Flash (You may cast this spell any time you could cast an instant.)   Enchant creature   Whenever enchanted creature deals damage to an opponent, you may draw a card.
+id=108795
+target=creature
+auto=@damaged(player) from(this):may draw:1 controller
+name=Ophidian Eye
+rarity=C
+mana={2}{U}
+type=Enchantment
+subtype=Aura
+abilities=flash
+[/card]
+[card]
 text=Reach (This creature can block creatures with flying.)   When Penumbra Spider is put into a graveyard from the battlefield, put a 2/4 black Spider creature token with reach onto the battlefield.
 id=118899
 name=Penumbra Spider
@@ -597,6 +648,18 @@ toughness=4
 abilities=reach
 [/card]
 [card]
+text={T}: Each 1/1 creature you control gets +1/+2 until end of turn.
+id=111083
+name=Pendelhaven Elder
+rarity=U
+mana={1}{G}
+type=Creature
+subtype=Elf Shaman
+auto={T}:lord(creature[power=1;toughness=1]|myBattlefield) 1/2 
+power=1
+toughness=1
+[/card]
+[card]
 text=All Slivers have "At the beginning of your upkeep, this permanent deals 1 damage to you."
 auto=@each my upkeep:foreach(sliver|myBattlefield) life:-1 controller
 auto=@each opponent upkeep:foreach(sliver|opponentBattlefield) life:-1 opponent
@@ -685,13 +748,13 @@ toughness=5
 [/card]
 [card]
 text=All Slivers have "{T}: Target player puts the top card of his or her library into his or her graveyard."
-auto=lord(sliver) {T}:deplete:1 target(player)
 id=122387
 name=Screeching Sliver
 rarity=C
 mana={U}
 type=Creature
 subtype=Sliver
+auto=lord(sliver) {T}:deplete:1 target(player)
 power=1
 toughness=1
 [/card]
@@ -726,9 +789,9 @@ id=118878
 name=Skittering Monstrosity
 rarity=U
 mana={3}{B}{B}
-auto=@movedTo(creature|mystack):bury
 type=Creature
 subtype=Horror
+auto=@movedTo(creature|mystack):bury
 power=5
 toughness=5
 [/card]
@@ -803,6 +866,19 @@ toughness=4
 abilities=trample
 [/card]
 [card]
+text=Flying   Stormcloud Djinn can block only creatures with flying.   {R}{R}: Stormcloud Djinn gets +2/+0 until end of turn and deals 1 damage to you.
+id=118894
+name=Stormcloud Djinn
+rarity=U
+mana={4}{U}
+type=Creature
+subtype=Djinn
+auto={R}{R}:2/0 && damage:1 controller
+power=3
+toughness=3
+abilities=flying,cloud
+[/card]
+[card]
 text=Until end of turn, target creature gains trample and gets +X/+X, where X is the number of attacking creatures.
 id=116730
 target=creature
@@ -898,10 +974,10 @@ type=Sorcery
 [/card]
 [card]
 text=Tendrils of Corruption deals X damage to target creature and you gain X life, where X is the number of Swamps you control.
+
 target=creature
 auto=foreach(swamp|myBattlefield) damage:1
 auto=foreach(swamp|myBattlefield) life:1 controller
-id=106632
 name=Tendrils of Corruption
 rarity=C
 mana={3}{B}
@@ -995,15 +1071,6 @@ toughness=1
 abilities=flying
 [/card]
 [card]
-text={T}: Add {1} to your mana pool.   {7}, {T}: Put a 2/2 Assembly-Worker artifact creature token onto the battlefield.
-id=116384
-auto={T}:Add {1} 
-auto={7}{T}:token(Assembly-Worker,creature artifact, 2/2, artifact)
-name=Urza's Factory
-rarity=U
-type=Land
-[/card]
-[card]
 text={2}{B}, {T}, Discard a card: Each other player loses 2 life. You gain life equal to the life lost this way.
 auto={2}{B}{T}{S(*|myhand)}:life:-2 opponent && life:2 controller
 id=108798
@@ -1016,6 +1083,15 @@ power=2
 toughness=2
 [/card]
 [card]
+text={T}: Add {1} to your mana pool.   {7}, {T}: Put a 2/2 Assembly-Worker artifact creature token onto the battlefield.
+id=116384
+auto={T}:Add {1} 
+auto={7}{T}:token(Assembly-Worker,creature artifact, 2/2, artifact)
+name=Urza's Factory
+rarity=U
+type=Land
+[/card]
+[card]
 id=125866
 name=Venser's Sliver
 rarity=C
@@ -1026,7 +1102,7 @@ power=3
 toughness=3
 [/card]
 [card]
-text=Enchant creature Enchanted creature gets +3/+3 and has "At the beginning of each upkeep, put a 1/1 green Saproling creature token onto the battlefield under your control."
+text=Enchant creature   Enchanted creature gets +3/+3 and has "At the beginning of each upkeep, put a 1/1 green Saproling creature token onto the battlefield under your control."
 id=109766
 target=creature
 auto=3/3
@@ -1101,11 +1177,11 @@ text=Forestwalk When Yavimaya Dryad enters the battlefield, you may search your
 auto=may moveTo(myBattlefield) target(forest|mylibrary) && tap
 id=118884
 name=Yavimaya Dryad
-abilities=forestwalk
 rarity=U
 mana={1}{G}{G}
 type=Creature
 subtype=Dryad
 power=2
 toughness=1
+abilities=forestwalk
 [/card]

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

@@ -727,15 +727,6 @@ text=Suspend 10?{R} Sacrifice an artifact, creature, or land: Remove a time coun
 rarity=R
 [/card]
 [card]
-id=110514
-name=Griffin Guide
-mana={2}{W}
-type=Enchantment
-subtype=Aura
-text=Enchant creature Enchanted creature gets +2/+2 and has flying. When enchanted creature is put into a graveyard, put a 2/2 white Griffin creature token with flying into play.
-rarity=U
-[/card]
-[card]
 id=108905
 name=Ground Rift
 mana={R}
@@ -774,7 +765,6 @@ type=Instant
 text=Target player discards two cards. If you played this spell during your main phase, that player discards four cards instead.
 rarity=U
 [/card]
-
 [card]
 id=116387
 name=Hivestone
@@ -811,17 +801,6 @@ text=Target player reveals a card at random from his or her hand. Ignite Memorie
 rarity=U
 [/card]
 [card]
-id=116723
-name=Ironclaw Buzzardiers
-mana={2}{R}
-type=Creature
-subtype=Orc Scout
-power=2
-toughness=2
-text=Ironclaw Buzzardiers can't block creatures with power 2 or greater. {R}: Ironclaw Buzzardiers gains flying until end of turn.
-rarity=C
-[/card]
-[card]
 id=114903
 name=Ith, High Arcanist
 mana={5}{W}{U}
@@ -953,17 +932,6 @@ text=Spells you play cost {1} less to play for each card with the same name as t
 rarity=U
 [/card]
 [card]
-id=118918
-name=Looter il-Kor
-mana={1}{U}
-type=Creature
-subtype=Kor Rogue
-power=1
-toughness=1
-text=Shadow (This creature can block or be blocked by only creatures with shadow.) Whenever Looter il-Kor deals damage to an opponent, draw a card, then discard a card.
-rarity=C
-[/card]
-[card]
 id=114904
 name=Lotus Bloom
 mana=
@@ -1187,15 +1155,6 @@ text=All Slivers have "Whenever this permanent becomes the target of a spell an
 rarity=U
 [/card]
 [card]
-id=108795
-name=Ophidian Eye
-mana={2}{U}
-type=Enchantment
-subtype=Aura
-text=Flash (You may play this spell any time you could play an instant.) Enchant creature Whenever enchanted creature deals damage to an opponent, you may draw a card.
-rarity=C
-[/card]
-[card]
 id=118902
 name=Outrider en-Kor
 mana={2}{W}
@@ -1235,17 +1194,6 @@ text=Flying {R}: Pardic Dragon gets +1/+0 until end of turn. Suspend 2?{R}{R} Wh
 rarity=R
 [/card]
 [card]
-id=111083
-name=Pendelhaven Elder
-mana={1}{G}
-type=Creature
-subtype=Elf Shaman
-power=1
-toughness=1
-text={T}: Each 1/1 creature you control gets +1/+2 until end of turn.
-rarity=U
-[/card]
-[card]
 id=110533
 name=Pentarch Paladin
 mana={2}{W}{W}{W}
@@ -1647,17 +1595,6 @@ text=Split second (As long as this spell is on the stack, players can't play spe
 rarity=R
 [/card]
 [card]
-id=118894
-name=Stormcloud Djinn
-mana={4}{U}
-type=Creature
-subtype=Djinn
-power=3
-toughness=3
-text=Flying Stormcloud Djinn can block only creatures with flying. {R}{R}: Stormcloud Djinn gets +2/+0 until end of turn and deals 1 damage to you.
-rarity=U
-[/card]
-[card]
 id=109710
 name=Strangling Soot
 mana={2}{B}

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

@@ -189,9 +189,9 @@ rarity=R
 mana={4}{R}
 type=Creature
 subtype=Dragon
-auto=aslongas(artifact|myBattlefield) -99/-99 <1
-power=6
-toughness=5
+auto=aslongas(artifact|myBattlefield) 96/95 
+power=-90
+toughness=-90
 abilities=flying
 [/card]
 [card]
@@ -220,9 +220,9 @@ subtype=Aura
 [/card]
 [card]
 text=Target player gains control of target permanent you control.
+id=15168
 target=*|myBattlefield
 auto=moveTo(opponentBattlefield)
-id=15168
 name=Donate
 rarity=R
 mana={2}{U}
@@ -260,9 +260,9 @@ rarity=R
 mana={3}{G}
 type=Creature
 subtype=Crocodile
-auto=aslongas(other creature|myBattlefield) -99/-99 <1
-power=5
-toughness=5
+auto=aslongas(other creature|myBattlefield) 95/95
+power=-90
+toughness=-90
 [/card]
 [card]
 text=When False Prophet is put into a graveyard from the battlefield, exile all creatures.
@@ -384,7 +384,6 @@ subtype=Aura
 [card]
 text=Flying   When Junk Diver is put into a graveyard from the battlefield, return another target artifact card from your graveyard to your hand.
 auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) target(other artifact|mygraveyard)
-
 id=15256
 name=Junk Diver
 rarity=R
@@ -444,6 +443,18 @@ power=2
 toughness=3
 [/card]
 [card]
+text=Enchant creature   Enchanted creature has haste.   At the beginning of the end step, return Mark of Fury to its owner's hand.
+id=15203
+target=creature
+auto=haste
+auto=@next endofturn:moveTo(ownerhand) all(this)
+name=Mark of Fury
+rarity=C
+mana={R}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
 text={1}, Discard a card: Draw a card.
 id=15158
 name=Mental Discipline

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

@@ -90,14 +90,6 @@ text={2}{R}, {T}: Reveal any number of red cards in your hand. Cinder Seer deals
 rarity=U
 [/card]
 [card]
-id=15168
-name=Donate
-mana={2}{U}
-type=Sorcery
-text=Target player gains control of target permanent you control.
-rarity=R
-[/card]
-[card]
 id=15183
 name=Dying Wail
 mana={1}{B}
@@ -318,15 +310,6 @@ text=When an opponent has 10 or less life, if Lurking Jackals is an enchantment,
 rarity=U
 [/card]
 [card]
-id=15203
-name=Mark of Fury
-mana={R}
-type=Enchantment
-subtype=Aura
-text=Enchant creature Enchanted creature has haste. At the beginning of the end step, return Mark of Fury to its owner's hand.
-rarity=C
-[/card]
-[card]
 id=15874
 name=Master Healer
 mana={4}{W}

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

@@ -86,7 +86,7 @@ type=Instant
 [/card]
 [card]
 text=Enchant creature   Enchanted creature can't attack.   When Cessation is put into a graveyard from the battlefield, return Cessation to its owner's hand.
-auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(cessation|mygraveyard)
+auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(this|mygraveyard)
 id=12359
 target=creature
 auto=cantattack
@@ -384,8 +384,9 @@ toughness=1
 [/card]
 [card]
 text=Target player draws four cards.
-auto=draw:4
 id=12822
+target=player
+auto=draw:4
 name=Opportunity
 rarity=U
 mana={4}{U}{U}
@@ -541,11 +542,12 @@ type=Instant
 [/card]
 [card]
 text=Enchant creature   Enchanted creature gets +2/+0 and has trample.   When Rancor is put into a graveyard from the battlefield, return Rancor to its owner's hand.
-auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(rancor|mygraveyard)
+auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(this|mygraveyard)
 id=12433
 target=creature
 auto=2/0
 auto=trample
+auto={S}:Add{G}
 name=Rancor
 rarity=C
 mana={G}
@@ -573,7 +575,7 @@ type=Artifact
 [/card]
 [card]
 text=Flying   When Shivan Phoenix is put into a graveyard from the battlefield, return Shivan Phoenix to its owner's hand.
-auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(shivan phoenix|mygraveyard)
+auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(this|mygraveyard)
 
 id=12423
 name=Shivan Phoenix
@@ -598,7 +600,7 @@ type=Instant
 [/card]
 [card]
 text=Enchant creature   Enchanted creature has fear. (It can't be blocked except by artifact creatures and/or black creatures.)   When Sleeper's Guile is put into a graveyard from the battlefield, return Sleeper's Guile to its owner's hand.
-auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(sleeper's guile|mygraveyard)
+auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(this|mygraveyard)
 id=12397
 target=creature
 auto=fear
@@ -610,7 +612,7 @@ subtype=Aura
 [/card]
 [card]
 text=Enchant creature   Enchanted creature can't block.   When Sluggishness is put into a graveyard from the battlefield, return Sluggishness to its owner's hand.
-auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(sluggishness|mygraveyard)
+auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(this|mygraveyard)
 id=12416
 target=creature
 auto=cantblock
@@ -678,6 +680,18 @@ mana={B}
 type=Sorcery
 [/card]
 [card]
+text=If Viashino Bey attacks, all creatures you control attack if able.
+auto=aslongas(viashino bey[attacking]|myBattlefield) lord(creature|myBattlefield) mustattack
+id=12948
+name=Viashino Bey
+rarity=C
+mana={2}{R}{R}
+type=Creature
+subtype=Viashino
+power=4
+toughness=3
+[/card]
+[card]
 text=Haste   At the beginning of the end step, return Viashino Cutthroat to its owner's hand.
 id=12419
 name=Viashino Cutthroat
@@ -756,7 +770,7 @@ abilities=flying,protection from red
 [/card]
 [card]
 text=Trample   When Weatherseed Treefolk is put into a graveyard from the battlefield, return Weatherseed Treefolk to its owner's hand.
-auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(weatherseed treefolk|mygraveyard)
+auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(this|mygraveyard)
 id=12438
 name=Weatherseed Treefolk
 rarity=R

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

@@ -215,12 +215,12 @@ text=Untap two target creatures. Each of them gets +1/+1 until end of turn.
 rarity=U
 [/card]
 [card]
+text=At the beginning of your upkeep, if there are seven or more lands on the battlefield, sacrifice Impending Disaster. If you do, destroy all lands.
 id=12426
 name=Impending Disaster
-mana={1}{R}
-type=Enchantment
-text=At the beginning of your upkeep, if there are seven or more lands on the battlefield, sacrifice Impending Disaster. If you do, destroy all lands.
 rarity=R
+mana={G}
+type=Enchantment
 [/card]
 [card]
 id=12378

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

@@ -25,11 +25,11 @@ type=Enchantment
 text=Acidic Soil deals damage to each player equal to the number of lands he or she controls.
 id=5722
 name=Acidic Soil
-auto=foreach(land|myinplay) damage:1 controller
-auto=foreach(land|opponentinplay) damage:1 opponent
-type=Sorcery
-mana={2}{R}
 rarity=U
+mana={2}{R}
+auto=foreach(land|myBattlefield) damage:1 controller
+auto=foreach(land|opponentBattlefield) damage:1 opponent
+type=Sorcery
 [/card]
 [card]
 text=Swampwalk (This creature is unblockable as long as defending player controls a Swamp.)
@@ -81,10 +81,10 @@ auto=@movedTo(enchantment|mystack):draw:1
 id=5686
 name=Argothian Enchantress
 rarity=R
-type=Creature
 mana={1}{G}
-power=0
+type=Creature
 subtype=Human Druid
+power=0
 toughness=1
 abilities=shroud
 [/card]
@@ -106,8 +106,8 @@ auto=lord(land[-basic]) doesnotuntap
 id=5711
 name=Back to Basics
 rarity=R
-type=Enchantment
 mana={2}{U}
+type=Enchantment
 [/card]
 [card]
 text={2}, Sacrifice a permanent: Return target creature to its owner's hand.
@@ -209,7 +209,7 @@ type=Instant
 [/card]
 [card]
 text=Enchant creature   Enchanted creature gets +1/+2.   When Brilliant Halo is put into a graveyard from the battlefield, return Brilliant Halo to its owner's hand.
-auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(brilliant halo|mygraveyard)
+auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(this|mygraveyard)
 id=9890
 target=creature
 auto=1/2
@@ -232,11 +232,25 @@ toughness=3
 abilities=islandwalk
 [/card]
 [card]
+text=At the beginning of your precombat main phase, you may add up to X mana of any one color to your mana pool, where X is the number of Islands target opponent controls.
+auto=@each my firstmain:may foreach(island|opponentbattlefield) Add{W}
+auto=@each my firstmain:may foreach(island|opponentbattlefield) Add{U}
+
+auto=@each my firstmain:may foreach(island|opponentbattlefield) Add{B}
+auto=@each my firstmain:may foreach(island|opponentbattlefield) Add{R}
+auto=@each my firstmain:may foreach(island|opponentbattlefield) Add{G}
+id=5858
+name=Carpet of Flowers
+rarity=U
+mana={G}
+type=Enchantment
+[/card]
+[card]
 text=Destroy all lands or all creatures. Creatures destroyed this way can't be regenerated.
 id=5637
 name=Catastrophe
-auto=may bury all(creature)
 auto=may destroy all(land)
+auto=may bury all(creature)
 rarity=R
 mana={4}{W}{W}
 type=Sorcery
@@ -273,9 +287,9 @@ rarity=R
 mana={3}{G}
 type=Creature
 subtype=Human Druid
+auto=lord(creature|myBattlefield) {T}:Add{G}
 power=3
 toughness=2
-auto=lord(creature|myBattlefield) {T}:Add{G}
 [/card]
 [card]
 text={1}, Sacrifice a permanent: You gain 1 life.
@@ -299,9 +313,9 @@ type=Instant
 [/card]
 [card]
 text=Enchant creature   Enchanted creature is unblockable.
+id=5718
 target=creature
 auto=unblockable
-id=5718
 name=Cloak of Mists
 rarity=C
 mana={1}{U}
@@ -309,7 +323,7 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
-text=Enchant permanent (Target a permanent as you play this. This card enters the battlefield attached to that permanent.)   You control enchanted permanent.
+text=Enchant permanent (Target a permanent as you cast this. This card enters the battlefield attached to that permanent.)   You control enchanted permanent.
 target=*
 alias=1194
 id=10426
@@ -321,9 +335,9 @@ subtype=Aura
 [/card]
 [card]
 text=Target player gains 2 life for each creature on the battlefield.
+id=9702
 target=player
 auto=foreach(creature) life:2
-id=9702
 name=Congregate
 rarity=C
 mana={3}{W}
@@ -332,12 +346,12 @@ type=Instant
 [card]
 text={4}, Sacrifice Copper Gnomes: You may put an artifact card from your hand onto the battlefield.
 id=8815
-auto={4}{S}:moveTo(myBattlefield) target(artifact|myhand)
 name=Copper Gnomes
 rarity=R
 mana={2}
 type=Artifact Creature
 subtype=Gnome
+auto={4}{S}:moveTo(myBattlefield) target(artifact|myhand)
 power=1
 toughness=1
 [/card]
@@ -416,7 +430,7 @@ type=Instant
 [/card]
 [card]
 text=Enchant creature   Enchanted creature gets -2/-0.   When Despondency is put into a graveyard from play, return Despondency to its owner's hand.
-auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(despondency|mygraveyard)
+auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(this|mygraveyard)
 id=10656
 target=creature
 auto=-2/0
@@ -454,15 +468,26 @@ auto=protection from red
 [/card]
 [card]
 text=destroy target artifact or enchantment
+id=5630
 target=artifact,enchantment
 auto=destroy
-id=5630
 name=Disenchant
 rarity=C
 mana={1}{W}
 type=Instant
 [/card]
 [card]
+text=Disorder deals 2 damage to each white creature and each player who controls a white creature.
+id=5854
+auto=damage:2 all(creature[white])
+auto=aslongas(creature[white]|myBattlefield) damage:2 controller
+auto=aslongas(creature[white]|opponentBattlefield) damage:2 opponent
+name=Disorder
+rarity=U
+mana={1}{R}
+type=Sorcery
+[/card]
+[card]
 text={1}{U}: Counter target red spell.
 id=5723
 name=Douse
@@ -539,6 +564,19 @@ power=1
 toughness=1
 [/card]
 [card]
+text=Trample   At the beginning of your upkeep, sacrifice Endless Wurm unless you sacrifice an enchantment.
+auto=@each my upkeep:moveTo(graveyard) notatarget(this,enchantment|myBattlefield)
+id=8820
+name=Endless Wurm
+rarity=R
+mana={3}{G}{G}
+type=Creature
+subtype=Wurm
+power=9
+toughness=9
+abilities=trample
+[/card]
+[card]
 text=Destroy target nonartifact, nonblack creature. It can't be regenerated.   Cycling {2} ({2}, Discard this card: Draw a card.)
 id=5819
 target=creature[-back;-artifact]
@@ -569,8 +607,19 @@ mana={X}{R}{R}
 type=Instant
 [/card]
 [card]
+text=Whenever a creature is put into a graveyard from the battlefield, that creature's controller may draw a card.
+id=5604
+name=Fecundity
+auto=@movedTo(creature|mygraveyard) from(battlefield):may draw:1 controller
+auto=@movedTo(creature|opponentgraveyard) from(battlefield):draw:1 opponent
+auto={T}:damage:3 target(creature)
+rarity=U
+mana={2}{G}
+type=Enchantment
+[/card]
+[card]
 text=Enchant creature   When Fiery Mantle is put into a graveyard from the battlefield, return Fiery Mantle to its owner's hand.   {R}: Enchanted creature gets +1/+0 until end of turn.
-auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(fiery mantle|mygraveyard)
+auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(this|mygraveyard)
 id=10425
 target=creature
 auto={R}:1/0
@@ -644,7 +693,7 @@ subtype=Forest
 [/card]
 [card]
 text=Enchant creature   When Fortitude is put into a graveyard from the battlefield, return Fortitude to its owner's hand.   Sacrifice a Forest: Regenerate enchanted creature.
-auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(fortitude|mygraveyard)
+auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(this|mygraveyard)
 id=9850
 target=creature
 auto={S(forest|myBattlefield)}:regenerate
@@ -828,11 +877,11 @@ type=Instant
 text={0}: Hopping Automaton gets -1/-1 and gains flying until end of turn.
 id=5700
 name=Hopping Automaton
-auto={0}:-1/-1 && flying
 rarity=U
 mana={3}
 type=Artifact Creature
 subtype=Construct
+auto={0}:-1/-1 && flying
 power=2
 toughness=2
 [/card]
@@ -878,7 +927,7 @@ rarity=R
 mana={2}{W}
 type=Creature
 subtype=Human Soldier
-auto=destroy target(creature[power>=4])
+auto={T}:destroy target(creature[power>=4])
 power=1
 toughness=1
 [/card]
@@ -920,7 +969,7 @@ subtype=Island
 [/card]
 [card]
 text=Enchant creature   Enchanted creature has flying.   When Launch is put into a graveyard from the battlefield, return Launch to its owner's hand.
-auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(launch|mygraveyard)
+auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(this|mygraveyard)
 id=5832
 target=creature
 auto=flying
@@ -1065,6 +1114,17 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
+text=Enchant creature   At the beginning of the upkeep of enchanted creature's controller, Parasitic Bond deals 2 damage to that player.
+id=8816
+target=creature
+auto=@each targetcontroller upkeep:damage:2 targetController
+name=Parasitic Bond
+rarity=U
+mana={3}{B}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
 text=Destroy target creature. Its owner gains 4 life.
 id=5684
 target=creature
@@ -1229,7 +1289,7 @@ type=Instant
 [/card]
 [card]
 text=At the beginning of your upkeep, if you control another nonland permanent, sacrifice Reclusive Wight.
-auto=@each my upkeep:aslongas(*[-land]|mybattlefield) other bury
+auto=@each my upkeep:aslongas(other *[-land]|mybattlefield) bury
 id=8803
 name=Reclusive Wight
 rarity=U
@@ -1282,6 +1342,15 @@ mana={1}{U}{U}
 type=Instant
 [/card]
 [card]
+text=Creatures you control have "Whenever this creature becomes blocked, it gets +1/+1 until end of turn for each creature blocking it."
+auto=lord(creature|myBattlefield) rampage(1/1,0)
+id=10408
+name=Retaliation
+rarity=U
+mana={2}{G}
+type=Enchantment
+[/card]
+[card]
 text=Cycling {2} ({2}, Discard this card: Draw a card.)
 id=5815
 name=Sandbar Merfolk
@@ -1523,7 +1592,7 @@ text=Enchant Swamp   When enchanted land becomes tapped, destroy it.   When Spre
 id=10409
 target=swamp
 auto=@tapped(mytgt):destroy
-auto=@movedTo(this|mygraveyard) from(battlefield):moveTo(myhand) notatarget(spreading algae|mygraveyard)
+auto=@movedTo(this|mygraveyard) from(battlefield):moveTo(myhand) notatarget(this|mygraveyard)
 name=Spreading Algae
 rarity=U
 mana={G}
@@ -1753,6 +1822,15 @@ power=3
 toughness=3
 [/card]
 [card]
+text={3}: Each player puts the top two cards of his or her library into his or her graveyard.
+auto={3}:deplete:2 controller && deplete:2 opponent
+id=7247
+name=Whetstone
+rarity=R
+mana={3}
+type=Artifact
+[/card]
+[card]
 text=Destroy all creatures with flying.
 id=8849
 auto=destroy all(creature[flying])
@@ -1788,6 +1866,18 @@ toughness=4
 abilities=swampwalk
 [/card]
 [card]
+text={T}: Return Wizard Mentor and target creature you control to their owner's hand.
+id=8907
+name=Wizard Mentor
+rarity=C
+mana={2}{U}
+type=Creature
+subtype=Human Wizard
+auto={T}:moveTo(ownerhand) all(this) && moveTo(ownerhand) target(creature|myBattlefield)
+power=2
+toughness=2
+[/card]
+[card]
 text=Worn Powerstone enters the battlefield tapped.  {T}: Add 2 Mana to your mana pool.
 auto=tap
 auto={T}:Add {2}
@@ -1799,8 +1889,8 @@ type=Artifact
 [/card]
 [card]
 text=Whenever an opponent plays a white spell, that player loses 1 life and you gain 1 life.
-auto=@movedTo(*[white]|opponentStack): life:-1 opponent
-auto=@movedTo(*[white]|opponentStack): life:1 controller
+auto=@movedTo(*[white]|opponentStack):life:-1 opponent
+auto=@movedTo(*[white]|opponentStack):life:1 controller
 id=5696
 name=Yawgmoth's Edict
 rarity=U

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

@@ -160,15 +160,6 @@ subtype=Zombie
 toughness=1
 [/card]
 [card]
-text=At the beginning of your precombat main phase, you may add up to X mana of any one color to your mana pool, where X is the number of Islands target opponent controls.
-auto=@each my firstmain:may foreach(island|opponentbattlefield) Add{*}
-id=5858
-name=Carpet of Flowers
-rarity=U
-type=Enchantment
-mana={G}
-[/card]
-[card]
 text={2}{B}, {T}: Remove up to three target cards in a single graveyard from the game.
 id=5620
 name=Carrion Beetles
@@ -305,14 +296,6 @@ type=Enchantment
 mana={3}{B}{B}
 [/card]
 [card]
-text=Disorder deals 2 damage to each white creature and each player who controls a white creature.
-id=5854
-name=Disorder
-rarity=U
-type=Sorcery
-mana={1}{R}
-[/card]
-[card]
 text={T}: Counter target spell unless its controller pays {1}.
 id=10695
 name=Disruptive Student
@@ -375,17 +358,6 @@ type=Instant
 mana={U}
 [/card]
 [card]
-text=Trample     At the beginning of your upkeep, sacrifice Endless Wurm unless you sacrifice an enchantment.
-id=8820
-name=Endless Wurm
-rarity=R
-type=Creature
-mana={3}{G}{G}
-power=9
-subtype=Wurm
-toughness=9
-[/card]
-[card]
 text=You may choose not to untap Endoskeleton during your untap step.       {2}, {T}: Target creature gets +0/+3 as long as Endoskeleton remains tapped.
 id=8846
 name=Endoskeleton
@@ -437,17 +409,6 @@ subtype=Human Cleric
 toughness=1
 [/card]
 [card]
-text=Whenever a creature is put into a graveyard from play, that creature's controller may draw a card.
-id=5604
-name=Fecundity
-auto=@movedTo(creature|mygraveyard) from(inplay):may draw:1 controller
-auto=@movedTo(creature|opponentgraveyard) from(inplay):may draw:1 opponent
-#not tested
-type=Enchantment
-mana={2}{G}
-rarity=U
-[/card]
-[card]
 text=Enchant land     Whenever enchanted land is tapped for mana, its controller adds one mana of any color to his or her mana pool (in addition to the mana the land produces).
 id=5655
 name=Fertile Ground
@@ -866,15 +827,6 @@ type=Instant
 mana={X}{R}
 [/card]
 [card]
-text=Enchant creature     At the beginning of the upkeep of enchanted creature's controller, Parasitic Bond deals 2 damage to that player.
-id=8816
-name=Parasitic Bond
-rarity=U
-type=Enchantment
-mana={3}{B}
-subtype=Aura
-[/card]
-[card]
 text=Enchant creature (Target a creature as you play this. This card comes into play attached to that creature.)  All damage that would be dealt to you is dealt to enchanted creature instead.
 id=5773
 name=Pariah
@@ -1042,15 +994,6 @@ type=Sorcery
 mana={2}{B}{B}
 [/card]
 [card]
-text=Creatures you control have "Whenever this creature becomes blocked, it gets +1/+1 until end of turn for each creature blocking it."
-auto=lord(creature|myBattlefield) rampage(1/1,0)
-id=10408
-name=Retaliation
-rarity=U
-type=Enchantment
-mana={2}{G}
-[/card]
-[card]
 text=Whenever Retromancer becomes the target of a spell or ability, Retromancer deals 3 damage to that spell or ability's controller.
 id=5826
 name=Retromancer
@@ -1563,14 +1506,6 @@ type=Instant
 mana={2}{W}
 [/card]
 [card]
-text={3}: Each player puts the top two cards of his or her library into his or her graveyard.
-id=7247
-name=Whetstone
-rarity=R
-type=Artifact
-mana={3}
-[/card]
-[card]
 text=At the beginning of your upkeep, if a player has more life than any other, that player gains control of Wild Dogs.     Cycling {2} ({2}, Discard this card: Draw a card.)
 id=8826
 name=Wild Dogs
@@ -1609,17 +1544,6 @@ subtype=Wurm
 toughness=6
 [/card]
 [card]
-text={T}: Return Wizard Mentor and target creature you control to their owner's hand.
-id=8907
-name=Wizard Mentor
-rarity=C
-type=Creature
-mana={2}{U}
-power=2
-subtype=Human Wizard
-toughness=2
-[/card]
-[card]
 text=If you control a creature, damage that would reduce your life total to less than 1 reduces it to 1 instead.
 id=5576
 name=Worship

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

@@ -64,6 +64,17 @@ toughness=3
 abilities=cloud,flying
 [/card]
 [card]
+text=Coral Atoll enters the battlefield tapped. When Coral Atoll enters the battlefield, sacrifice it unless you return an untapped Island you control to its owner's hand.   {T}: Add {1}{U} to your mana pool.
+id=3748
+name=Coral Atoll
+auto=tap
+auto=aslongas(island[-tapped]|myBattlefield) moveTo(ownerhand) notatarget(island[-tapped]|myBattlefield)
+auto=moveTo(graveyard) notatarget(this|myBattlefield)
+auto=@movedTo(island[-tapped]|myhand) from(myBattlefield):lord(coral atoll) {T}:Add{1}{U}
+rarity=U
+type=Land
+[/card]
+[card]
 text=Destroy target artifact, land or enchantment.
 id=3660
 name=Creeping Mold
@@ -113,6 +124,17 @@ mana={4}
 type=Artifact
 [/card]
 [card]
+text=Dormant Volcano enters the battlefield tapped. When Dormant Volcano enters the battlefield, sacrifice it unless you return an untapped Mountain you control to its owner's hand.   {T}: Add {1}{R} to your mana pool.
+id=3749
+name=Dormant Volcano
+auto=tap
+auto=aslongas(mountain[-tapped]|myBattlefield) moveTo(ownerhand) notatarget(mountain[-tapped]|myBattlefield)
+auto=moveTo(graveyard) notatarget(this|myBattlefield)
+auto=@movedTo(mountain[-tapped]|myhand) from(myBattlefield):lord(dormant volcano) {T}:Add{1}{R}
+rarity=U
+type=Land
+[/card]
+[card]
 text=Return target card from your graveyard to your hand.
 id=3662
 target=*|myGraveyard
@@ -123,15 +145,26 @@ mana={2}{G}{G}
 type=Sorcery
 [/card]
 [card]
-id=3663
-name=Emerald Charm
-mana={G}
-type=Instant
 text=Choose one - Untap target permanent; or destroy target non-Aura enchantment; or target creature loses flying until end of turn.
+id=3663
 auto=may untap target(*)
 auto=may destroy target(enchantment[-aura])
 auto=may -flying target(creature)
+name=Emerald Charm
+mana={G}
 rarity=C
+type=Instant
+[/card]
+[card]
+text=Everglades enters the battlefield tapped.   When Everglades enters the battlefield, sacrifice it unless you return an untapped Swamp you control to its owner's hand.   {T}: Add {1}{B} to your mana pool.
+id=3750
+name=Everglades
+auto=tap
+auto=aslongas(swamp[-tapped]|myBattlefield) moveTo(ownerhand) notatarget(swamp[-tapped]|myBattlefield)
+auto=moveTo(graveyard) notatarget(this|myBattlefield)
+auto=@movedTo(swamp[-tapped]|myhand) from(myBattlefield):lord(everglades) {T}:Add{1}{B}
+rarity=U
+type=Land
 [/card]
 [card]
 text=Whenever an enchantment is put into a graveyard from the battlefield, draw a card.
@@ -149,12 +182,12 @@ toughness=2
 text=Target creature gets +1/+1 until end of turn.   Draw a card at the beginning of the next turn's upkeep.
 id=3664
 target=creature
+auto=1/1
+auto=@next upkeep:draw:1 controller
 name=Feral Instinct
 rarity=C
 mana={1}{G}
 type=Instant
-auto=1/1
-auto=@next upkeep:draw:1
 [/card]
 [card]
 text=Flying, protection from red
@@ -258,6 +291,28 @@ power=3
 toughness=1
 [/card]
 [card]
+text=Jungle Basin enters the battlefield tapped.   When Jungle Basin enters the battlefield, sacrifice it unless you return an untapped Forest you control to its owner's hand.   {T}: Add {1}{G} to your mana pool.
+id=3752
+name=Jungle Basin
+auto=tap
+auto=aslongas(forest[-tapped]|myBattlefield) moveTo(ownerhand) notatarget(forest[-tapped]|myBattlefield)
+auto=moveTo(graveyard) notatarget(this|myBattlefield)
+auto=@movedTo(forest[-tapped]|myhand) from(myBattlefield):lord(jungle basin) {T}:Add{1}{G}
+rarity=U
+type=Land
+[/card]
+[card]
+text=Karoo enters the battlefield tapped.   When Karoo enters the battlefield, sacrifice it unless you return an untapped Plains you control to its owner's hand.   {T}: Add {1}{W} to your mana pool.
+id=3753
+name=Karoo
+auto=tap
+auto=aslongas(plains[-tapped]|myBattlefield) moveTo(ownerhand) notatarget(plains[-tapped]|myBattlefield)
+auto=moveTo(graveyard) notatarget(this|myBattlefield)
+auto=@movedTo(plains[-tapped]|myhand) from(myBattlefield):lord(karoo) {T}:Add{1}{W}
+rarity=U
+type=Land
+[/card]
+[card]
 text={R}: Keeper of Kookus gains protection from red until end of turn.
 id=3692
 name=Keeper of Kookus
@@ -298,6 +353,20 @@ toughness=5
 abilities=trample,mustattack
 [/card]
 [card]
+text=Flying   {G}: Kyscu Drake gets +0/+1 until end of turn. Activate this ability only once each turn.   Sacrifice Kyscu Drake and a creature named Spitting Drake: Search your library for a card named Viashivan Dragon and put that card onto the battlefield. Then shuffle your library.
+id=3668
+name=Kyscu Drake
+rarity=U
+mana={2}{G}
+type=Creature
+subtype=Drake
+auto={G}:0/1 limit:1
+auto=aslongas(viashivan dragon|mylibrary) {S(spitting drake|myBattlefield)}:moveTo(mygraveyard) all(this) && moveTo(myBattlefield) target(viashivan dragon|mylibrary) limit:1
+power=2
+toughness=2
+abilities=flying
+[/card]
+[card]
 text=First strike, reach (This creature can block creatures with flying.)
 id=3719
 name=Longbow Archer
@@ -345,17 +414,15 @@ mana={4}{W}
 type=Instant
 [/card]
 [card]
-text=First strike (This creature deals combat damage before creatures without first strike.)   When Nekrataal enters the battlefield, destroy target nonartifact, nonblack creature. That creature can't be regenerated.
-id=3623
-name=Nekrataal
-rarity=U
-mana={2}{B}{B}
-type=Creature
-subtype=Human Assassin
-auto=bury target(creature[-black;-artifact])
-power=2
-toughness=1
-abilities=first strike
+text=Enchant creature   When enchanted creature is dealt damage, destroy it.
+id=3670
+target=creature
+auto=@damaged(mytgt):destroy
+name=Mortal Wound
+rarity=C
+mana={G}
+type=Enchantment
+subtype=Aura
 [/card]
 [card]
 text={3}{B}{B}, Sacrifice a creature: Return Necrosavant from your graveyard to the battlefield. Activate this ability only during your upkeep.
@@ -370,6 +437,19 @@ power=5
 toughness=5
 [/card]
 [card]
+text=First strike (This creature deals combat damage before creatures without first strike.)   When Nekrataal enters the battlefield, destroy target nonartifact, nonblack creature. That creature can't be regenerated.
+id=3623
+name=Nekrataal
+rarity=U
+mana={2}{B}{B}
+type=Creature
+subtype=Human Assassin
+auto=bury target(creature[-black;-artifact])
+power=2
+toughness=1
+abilities=first strike
+[/card]
+[card]
 id=3672
 name=Panther Warriors
 rarity=C
@@ -508,17 +588,30 @@ auto={T}:Add {2}
 [card]
 text=Flying   {R}: Spitting Drake gets +1/+0 until end of turn. Play this ability only once each turn.
 id=3702
-auto={R}:1/0 limit:1
 name=Spitting Drake
 rarity=U
 mana={3}{R}
 type=Creature
 subtype=Drake
+auto={R}:1/0 limit:1
 power=2
 toughness=2
 abilities=flying
 [/card]
 [card]
+text=Trample (If this creature would deal enough damage to its blockers to destroy them, you may have it deal the rest of its damage to defending player or planeswalker.)   At the beginning of your upkeep, return a green creature you control to its owner's hand.
+auto=@each my upkeep:moveTo(myhand) notatarget(creature[green]|myBattlefield)
+id=3678
+name=Stampeding Wildebeests
+rarity=U
+mana={2}{G}{G}
+type=Creature
+subtype=Antelope Beast
+power=5
+toughness=4
+abilities=trample
+[/card]
+[card]
 text=When Suleiman's Legacy enters the battlefield, destroy all Djinns and Efreets. They can't be regenerated.   Whenever a Djinn or Efreet comes into play, destroy it. It can't be regenerated.
 id=3745
 auto=lord(djinn) -99/-99

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

@@ -105,14 +105,6 @@ text=Target opponent reveals his or her hand. You choose a card from it. That pl
 rarity=U
 [/card]
 [card]
-id=3748
-name=Coral Atoll
-mana=
-type=Land
-text=Coral Atoll enters the battlefield tapped. When Coral Atoll enters the battlefield, sacrifice it unless you return an untapped Island you control to its owner's hand. {T}: Add {1}{U} to your mana pool.
-rarity=U
-[/card]
-[card]
 id=3735
 name=Corrosion
 mana={1}{B}{R}
@@ -166,14 +158,6 @@ text=At the beginning of the end step, each player who tapped a land for mana th
 rarity=U
 [/card]
 [card]
-id=3749
-name=Dormant Volcano
-mana=
-type=Land
-text=Dormant Volcano enters the battlefield tapped. When Dormant Volcano enters the battlefield, sacrifice it unless you return an untapped Mountain you control to its owner's hand. {T}: Add {1}{R} to your mana pool.
-rarity=U
-[/card]
-[card]
 id=3592
 name=Dragon Mask
 mana={3}
@@ -216,7 +200,6 @@ type=World Enchantment
 text=At the beginning of each player's upkeep, that player exiles a card at random from his or her hand. The player may play that card this turn. At the beginning of the next end step, if the player hasn't played the card, he or she puts it into his or her graveyard.
 rarity=R
 [/card]
-
 [card]
 id=3710
 name=Equipoise
@@ -226,14 +209,6 @@ text=At the beginning of your upkeep, for each land target player controls in ex
 rarity=R
 [/card]
 [card]
-id=3750
-name=Everglades
-mana=
-type=Land
-text=Everglades enters the battlefield tapped. When Everglades enters the battlefield, sacrifice it unless you return an untapped Swamp you control to its owner's hand. {T}: Add {1}{B} to your mana pool.
-rarity=U
-[/card]
-[card]
 id=3711
 name=Eye of Singularity
 mana={3}{W}
@@ -368,7 +343,6 @@ type=Instant
 text=The next time a source of your choice would deal damage to target creature or player this turn, prevent that damage. If damage from a red source is prevented this way, Honorable Passage deals that much damage to the source's controller.
 rarity=U
 [/card]
-
 [card]
 id=3641
 name=Impulse
@@ -405,14 +379,6 @@ text=Cumulative upkeep {1} (At the beginning of your upkeep, put an age counter
 rarity=U
 [/card]
 [card]
-id=3752
-name=Jungle Basin
-mana=
-type=Land
-text=Jungle Basin enters the battlefield tapped. When Jungle Basin enters the battlefield, sacrifice it unless you return an untapped Forest you control to its owner's hand. {T}: Add {1}{G} to your mana pool.
-rarity=U
-[/card]
-[card]
 id=3620
 name=Kaervek's Spite
 mana={B}{B}{B}
@@ -421,14 +387,6 @@ text=As an additional cost to cast Kaervek's Spite, sacrifice all permanents you
 rarity=R
 [/card]
 [card]
-id=3753
-name=Karoo
-mana=
-type=Land
-text=Karoo enters the battlefield tapped. When Karoo enters the battlefield, sacrifice it unless you return an untapped Plains you control to its owner's hand. {T}: Add {1}{W} to your mana pool.
-rarity=U
-[/card]
-[card]
 id=3666
 name=Katabatic Winds
 mana={2}{G}
@@ -459,17 +417,6 @@ text=Flanking (Whenever a creature without flanking blocks this creature, the bl
 rarity=C
 [/card]
 [card]
-id=3668
-name=Kyscu Drake
-mana={3}{G}
-type=Creature
-subtype=Drake
-power=2
-toughness=2
-text=Flying {G}: Kyscu Drake gets +0/+1 until end of turn. Activate this ability only once each turn. Sacrifice Kyscu Drake and a creature named Spitting Drake: Search your library for a card named Viashivan Dragon and put that card onto the battlefield. Then shuffle your library.
-rarity=U
-[/card]
-[card]
 id=3596
 name=Lead-Belly Chimera
 mana={4}
@@ -517,15 +464,6 @@ text=Enchant creature Enchanted creature has trample. Whenever all non-Wall crea
 rarity=U
 [/card]
 [card]
-id=3670
-name=Mortal Wound
-mana={G}
-type=Enchantment
-subtype=Aura
-text=Enchant creature When enchanted creature is dealt damage, destroy it.
-rarity=C
-[/card]
-[card]
 id=3739
 name=Mundungu
 mana={1}{U}{B}
@@ -783,17 +721,6 @@ text=Sacrifice a land: Add to your mana pool one mana of any type the sacrificed
 rarity=R
 [/card]
 [card]
-id=3678
-name=Stampeding Wildebeests
-mana={2}{G}{G}
-type=Creature
-subtype=Antelope Beast
-power=5
-toughness=4
-text=Trample (If this creature would deal enough damage to its blockers to destroy them, you may have it deal the rest of its damage to defending player or planeswalker.) At the beginning of your upkeep, return a green creature you control to its owner's hand.
-rarity=U
-[/card]
-[card]
 id=3679
 name=Summer Bloom
 mana={1}{G}

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

@@ -48,6 +48,18 @@ toughness=2
 abilities=flash,first strike
 [/card]
 [card]
+text=Enchant creature   Sacrifice an untapped creature: Enchanted creature gets +2/+0 until end of turn.   Sacrifice enchanted creature: Creatures you control get +2/+0 until end of turn.
+id=4535
+target=creature
+auto={S(creature[-tapped]|myBattlefield)}:2/0
+auto={S(mytgt)}:lord(creature|myBattlefield) 2/0 ueot
+name=Betrothed of Fire
+rarity=C
+mana={1}{R}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
 text=Bloodrock Cyclops attacks each turn if able.
 id=4536
 name=Bloodrock Cyclops
@@ -171,6 +183,19 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
+text=When Fallow Wurm enters the battlefield, sacrifice it unless you discard a land card.
+id=4514
+name=Fallow Wurm
+rarity=U
+mana={2}{G}
+type=Creature
+subtype=Wurm
+auto=moveTo(graveyard) notatarget(this|myBattlefield)
+auto=moveTo(graveyard) notatarget(land|myhand)
+power=4
+toughness=4
+[/card]
+[card]
 text=Creatures you control have haste.
 id=4545
 auto=lord(creature|myBattlefield) haste
@@ -227,7 +252,7 @@ text=Target creature gets +1/+0 and gains first strike until end of turn.   Draw
 target=creature
 auto=1/0
 auto=first strike
-auto=draw:1
+auto=draw:1 controller
 id=4578
 name=Guided Strike
 rarity=C
@@ -235,6 +260,19 @@ mana={1}{W}
 type=Instant
 [/card]
 [card]
+text=When Harvest Wurm enters the battlefield, sacrifice it unless you return a basic land card from your graveyard to your hand.
+id=4518
+name=Harvest Wurm
+rarity=C
+mana={1}{G}
+type=Creature
+subtype=Wurm
+auto=moveTo(graveyard) notatarget(this|myBattlefield)
+auto=moveTo(myhand) notatarget(land[basic]|mygraveyard)
+power=3
+toughness=2
+[/card]
+[card]
 text={T}: Heavy Ballista deals 2 damage to target attacking or blocking creature.
 id=4579
 name=Heavy Ballista
@@ -247,6 +285,19 @@ power=2
 toughness=3
 [/card]
 [card]
+text=When Hidden Horror enters the battlefield, sacrifice it unless you discard a creature card.
+id=4460
+name=Hidden Horror
+rarity=U
+mana={1}{B}{B}
+type=Creature
+subtype=Horror
+auto=moveTo(graveyard) notatarget(this|myBattlefield)
+auto=moveTo(graveyard) notatarget(creature|myhand)
+power=4
+toughness=4
+[/card]
+[card]
 text={2}, Sacrifice a nontoken permanent: Draw a card.
 id=4461
 auto={2}{S(*[-token]|myBattlefield)}:draw:1
@@ -318,6 +369,19 @@ power=*
 toughness=*
 [/card]
 [card]
+text=When Merfolk Traders enters the battlefield, draw a card, then discard a card.
+id=4489
+name=Merfolk Traders
+rarity=C
+mana={1}{U}
+type=Creature
+subtype=Merfolk
+auto=draw:1
+auto=moveTo(graveyard) notatarget(*|myhand)
+power=1
+toughness=2
+[/card]
+[card]
 text={T}: Add {1} to your mana pool.   {1}, {T}, Sacrifice Mind Stone: Draw a card.
 id=4436
 auto={T}:Add {1}
@@ -363,6 +427,18 @@ toughness=2
 abilities=unblockable
 [/card]
 [card]
+text=Enchant creature   Enchanted creature has flying.   Sacrifice Phantom Wings: Return enchanted creature to its owner's hand.
+id=4495
+target=creature
+auto=flying
+auto={S}:moveTo(ownerhand) notatarget(mytgt)
+name=Phantom Wings
+rarity=C
+mana={1}{U}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
 text=Fear (This creature can't be blocked except by artifact creatures and/or black creatures.)
 id=4466
 name=Razortooth Rats
@@ -396,6 +472,18 @@ mana={1}{U}{U}
 type=Sorcery
 [/card]
 [card]
+text=When Rogue Elephant enters the battlefield, sacrifice it unless you sacrifice a Forest.
+id=4527
+name=Rogue Elephant
+rarity=C
+mana={G}
+type=Creature
+subtype=Elephant
+auto=moveTo(mygraveyard) notatarget(this,forest|myBattlefield)
+power=3
+toughness=3
+[/card]
+[card]
 text=At the beginning of your upkeep, destroy all artifacts and enchantments. They can't be regenerated.
 auto=@each my upkeep:bury all(artifact,enchantment)
 id=4586
@@ -549,6 +637,19 @@ mana={1}{G}
 type=Enchantment
 [/card]
 [card]
+text=At the beginning of each player's upkeep, if that player controls a nonblack, nonland permanent, Urborg Stalker deals 1 damage to that player.
+auto=@each my upkeep:aslongas(*[-black;-land]|myBattlefield) damage:1 controller
+auto=@each opponent upkeep:aslongas(*[-black;-land]|opponentBattlefield) damage:1 opponent
+id=4473
+name=Urborg Stalker
+rarity=R
+mana={3}{B}
+type=Creature
+subtype=Horror
+power=2
+toughness=4
+[/card]
+[card]
 text=Untap all creatures you control.
 auto=untap all(creature|myBattlefield)
 id=4533

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

@@ -180,15 +180,6 @@ text={1}{W}, {T}: Prevent all combat damage that would be dealt by target blocke
 rarity=C
 [/card]
 [card]
-id=4535
-name=Betrothed of Fire
-mana={1}{R}
-type=Enchantment
-subtype=Aura
-text=Enchant creature Sacrifice an untapped creature: Enchanted creature gets +2/+0 until end of turn. Sacrifice enchanted creature: Creatures you control get +2/+0 until end of turn.
-rarity=C
-[/card]
-[card]
 id=4450
 name=Bone Dancer
 mana={1}{B}{B}
@@ -360,17 +351,6 @@ text=Phasing (This phases in or out before you untap during each of your untap s
 rarity=R
 [/card]
 [card]
-id=4514
-name=Fallow Wurm
-mana={2}{G}
-type=Creature
-subtype=Wurm
-power=4
-toughness=4
-text=When Fallow Wurm enters the battlefield, sacrifice it unless you discard a land card.
-rarity=U
-[/card]
-[card]
 id=4515
 name=Familiar Ground
 mana={2}{G}
@@ -502,17 +482,6 @@ text=Whenever Goblin Vandal attacks and isn't blocked, you may pay {R}. If you d
 rarity=C
 [/card]
 [card]
-id=4518
-name=Harvest Wurm
-mana={1}{G}
-type=Creature
-subtype=Wurm
-power=3
-toughness=2
-text=When Harvest Wurm enters the battlefield, sacrifice it unless you return a basic land card from your graveyard to your hand.
-rarity=C
-[/card]
-[card]
 id=4459
 name=Haunting Misery
 mana={1}{B}{B}
@@ -537,17 +506,6 @@ text=At end of combat, destroy each creature that blocked or was blocked this tu
 rarity=R
 [/card]
 [card]
-id=4460
-name=Hidden Horror
-mana={1}{B}{B}
-type=Creature
-subtype=Horror
-power=4
-toughness=4
-text=When Hidden Horror enters the battlefield, sacrifice it unless you discard a creature card.
-rarity=U
-[/card]
-[card]
 id=4554
 name=Hurloon Shaman
 mana={1}{R}{R}
@@ -664,17 +622,6 @@ text=First strike {1}{W}: Tap target creature blocking Master of Arms. Prevent a
 rarity=U
 [/card]
 [card]
-id=4489
-name=Merfolk Traders
-mana={1}{U}
-type=Creature
-subtype=Merfolk
-power=1
-toughness=2
-text=When Merfolk Traders enters the battlefield, draw a card, then discard a card.
-rarity=C
-[/card]
-[card]
 id=4583
 name=Mistmoon Griffin
 mana={3}{W}
@@ -807,18 +754,6 @@ text=All creatures have "At the beginning of your upkeep, sacrifice this creatur
 rarity=R
 [/card]
 [card]
-text=Enchant creature   Enchanted creature has flying.   Sacrifice Phantom Wings: Return enchanted creature to its owner's hand.
-id=4495
-target=creature
-auto=flying
-auto={S}:moveTo(ownerhand)
-name=Phantom Wings
-rarity=C
-mana={1}{U}
-type=Enchantment
-subtype=Aura
-[/card]
-[card]
 id=4438
 name=Phyrexian Furnace
 mana={1}
@@ -857,17 +792,6 @@ text=Roc Hatchling enters the battlefield with four shell counters on it. At the
 rarity=U
 [/card]
 [card]
-id=4527
-name=Rogue Elephant
-mana={G}
-type=Creature
-subtype=Elephant
-power=3
-toughness=3
-text=When Rogue Elephant enters the battlefield, sacrifice it unless you sacrifice a Forest.
-rarity=C
-[/card]
-[card]
 id=4498
 name=Sage Owl
 mana={1}{U}
@@ -1028,17 +952,6 @@ text=Target opponent sacrifices a creature for each creature put into your grave
 rarity=R
 [/card]
 [card]
-id=4473
-name=Urborg Stalker
-mana={3}{B}
-type=Creature
-subtype=Horror
-power=2
-toughness=4
-text=At the beginning of each player's upkeep, if that player controls a nonblack, nonland permanent, Urborg Stalker deals 1 damage to that player.
-rarity=R
-[/card]
-[card]
 id=4532
 name=Veteran Explorer
 mana={G}

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

@@ -883,15 +883,15 @@ toughness=2
 abilities=cantblock
 [/card]
 [card]
+text=Enchant creature   When enchanted creature is dealt damage, destroy it.
 id=190401
-name=Mire Blight
-mana={B}
 target=creature
+auto=@damaged(mytgt):destroy(mytgt)
+name=Mire Blight
+rarity=C
+mana={B}
 type=Enchantment
 subtype=Aura
-text=Enchant creature   When enchanted creature is dealt damage, destroy it.
-auto=@damaged(mytgt):destroy(mytgt)
-rarity=C
 [/card]
 [card]
 text={T}, Pay 1 Life, Sacrifice Misty Rainforest: Search your library for a Forest or Island card and put it onto the battlefield. Then shuffle your library.
@@ -1013,10 +1013,10 @@ toughness=2
 [/card]
 [card]
 text=Return target permanent you control to its owner's hand. You gain 4 life.
+id=180360
 target=*|myBattlefield
 auto=moveTo(ownerhand)
 auto=life:4 controller
-id=180360
 name=Narrow Escape
 rarity=C
 mana={2}{W}
@@ -1037,10 +1037,10 @@ toughness=2
 [/card]
 [card]
 text=Enchant creature   Enchanted creature gets +1/+2 and has flying.
+id=180346
 target=creature
 auto=1/2
 auto=flying
-id=180346
 name=Nimbus Wings
 rarity=C
 mana={1}{W}
@@ -1273,6 +1273,19 @@ rarity=R
 type=Land
 [/card]
 [card]
+text=Shroud (This creature can't be the target of spells or abilities.)   When Scythe Tiger enters the battlefield, sacrifice it unless you sacrifice a land.
+id=178113
+name=Scythe Tiger
+rarity=C
+mana={G}
+type=Creature
+subtype=Cat
+auto=moveTo(mygraveyard) notatarget(this;land|myBattlefield)
+power=3
+toughness=2
+abilities=shroud
+[/card]
+[card]
 text={T}: Draw a card for each Ally you control.
 id=195629
 name=Sea Gate Loremaster
@@ -1355,10 +1368,11 @@ abilities=flying
 [/card]
 [card]
 text=Target creature gets +3/+0 and gains first strike until end of turn.
+id=178136
+
 target=creature
 auto=3/0
 auto=first strike
-id=178136
 name=Slaughter Cry
 rarity=C
 mana={2}{R}
@@ -1570,16 +1584,6 @@ power=4
 toughness=4
 [/card]
 [card]
-text=Search your library for a Trap card, reveal it, and put it into your hand. Then shuffle your library.
-id=192223
-target=trap|mylibrary
-auto=moveTo(myhand)
-name=Trapmaker's Snare
-rarity=U
-mana={1}{U}
-type=Instant
-[/card]
-[card]
 text=Equipped creature has nonbasic landwalk. (It's unblockable as long as defending player controls a nonbasic land.)   Equip {2}
 id=190410
 auto={2}:equip
@@ -1591,6 +1595,16 @@ type=Artifact
 subtype=Equipment
 [/card]
 [card]
+text=Search your library for a Trap card, reveal it, and put it into your hand. Then shuffle your library.
+id=192223
+target=trap|mylibrary
+auto=moveTo(myhand)
+name=Trapmaker's Snare
+rarity=U
+mana={1}{U}
+type=Instant
+[/card]
+[card]
 text=Equipped creature gets +2/+1. Equip {2}
 id=193396
 auto={2}:equip
@@ -1710,7 +1724,6 @@ type=Instant
 [card]
 text=Double strike   Whenever Warren Instigator deals damage to an opponent, you may put a Goblin creature card from your hand onto the battlefield.
 auto=@damaged(player) from(this):may moveto(myBattlefield) target(creature[goblin]|myHand)
-
 id=191368
 name=Warren Instigator
 rarity=M

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

@@ -886,17 +886,6 @@ auto=@each my upkeep:aslongas(land|mybattlefield) counter(1/1,4) >4
 rarity=R
 [/card]
 [card]
-id=178113
-name=Scythe Tiger
-mana={G}
-type=Creature
-subtype=Cat
-power=3
-toughness=2
-text=Shroud (This creature can't be the target of spells or abilities.) When Scythe Tiger enters the battlefield, sacrifice it unless you sacrifice a land.
-rarity=C
-[/card]
-[card]
 id=197527
 name=Summoning Trap
 mana={4}{G}{G}