Added several successfully tested cards.

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

@@ -50,6 +50,19 @@ rarity=U
 type=Land
 [/card]
 [card]
+text=Flying, trample   At the beginning of your upkeep, sacrifice a non-Zombie creature, then put a 2/2 black Zombie creature token onto the battlefield.
+auto=@each my upkeep:bury notatarget(creature[-zombie]|myBattlefield) && token(Zombie,creature zombie, 2/2,black)
+id=174847
+name=Archdemon of Unx
+rarity=R
+mana={5}{B}{B}
+type=Creature
+subtype=Demon
+power=6
+toughness=6
+abilities=flying,trample
+[/card]
+[card]
 text=Enchant creature   When enchanted creature is put into a graveyard, that creature's controller loses life equal to its toughness.
 id=174817
 alias=1197
@@ -145,6 +158,17 @@ toughness=5
 abilities=vigilance,haste
 [/card]
 [card]
+text=Return target creature to its owner's hand. Its controller draws a card.
+id=175053
+target=creature
+auto=moveto(ownerhand)
+auto=draw:1 targetController
+name=Call to Heel
+rarity=C
+mana={1}{U}
+type=Instant
+[/card]
+[card]
 text=Counter target spell.
 id=178092
 target=*|stack
@@ -155,24 +179,14 @@ mana={1}{U}{U}
 type=Instant
 [/card]
 [card]
-text=Return target creature to its owner's hand. Its controller draws a card.
-id=175053
-target=creature
-auto=moveto(ownerhand) && draw:1 targetController
-name=Call to Heel
-rarity=C
-mana={1}{U}
-type=Instant
-[/card]
-[card]
 text={T}: Target player puts the top card of his or her library into his or her graveyard.
-auto={T}:deplete:1 target(player)
 id=176433
 name=Cathartic Adept
 rarity=C
 mana={U}
 type=Creature
 subtype=Human Wizard
+auto={T}:deplete:1 target(player)
 power=1
 toughness=1
 [/card]
@@ -203,9 +217,10 @@ abilities=flying
 [/card]
 [card]
 text=Enchant artifact or creature.   Enchanted permanent doesn't untap during its controller's untap step.
+id=175042
+
 target=creature,artifact
 auto=doesnotuntap
-id=175042
 name=Coma Veil
 rarity=C
 mana={4}{U}
@@ -559,31 +574,6 @@ power=1
 toughness=2
 [/card]
 [card]
-text=Choose one - Remove target player's graveyard from the game; or Jund Charm deals 2 damage to each creature; or put two +1/+1 counters on target creature.
-id=137900
-name=Jund Charm
-auto=may moveTo(exile) all(*|opponentgraveyard)
-auto=may moveTo(exile) all(*|mygraveyard)
-auto=may damage:2 all(creature)
-auto=may counter(1/1,2) target(creature)
-rarity=U
-mana={B}{R}{G}
-type=Instant
-[/card]
-[card]
-text=Reach (This can block creatures with flying.)  Cycling {2} ({2}, Discard this card: Draw a card.)
-id=175262
-name=Jungle Weaver
-rarity=C
-type=Creature
-mana={5}{G}{G}
-autohand={2}:cycling
-abilities=reach
-power=5
-subtype=Spider
-toughness=6
-[/card]
-[card]
 text=Flying, trample, haste   {R}: Hellkite Overlord gets +1/+0 until end of turn.   {B}{G}: Regenerate Hellkite Overlord.
 id=175057
 name=Hellkite Overlord
@@ -700,6 +690,18 @@ power=2
 toughness=2
 [/card]
 [card]
+text=Choose one - Remove target player's graveyard from the game; or Jund Charm deals 2 damage to each creature; or put two +1/+1 counters on target creature.
+id=137900
+name=Jund Charm
+auto=may moveTo(exile) all(*|opponentgraveyard)
+auto=may moveTo(exile) all(*|mygraveyard)
+auto=may damage:2 all(creature)
+auto=may counter(1/1,2) target(creature)
+rarity=U
+mana={B}{R}{G}
+type=Instant
+[/card]
+[card]
 text={T}: Add {1} to your mana pool.   {1}, {T}, Sacrifice Jund Panorama: Search your library for a basic Swamp, Mountain, or Forest card and put it onto the battlefield tapped. Then shuffle your library.
 auto={T}:Add {1}
 auto={1}{T}{S}:moveTo(myBattlefield) target(swamp,mountain,forest|mylibrary) && tap
@@ -720,6 +722,19 @@ rarity=U
 type=Land
 [/card]
 [card]
+text=Reach (This can block creatures with flying.)  Cycling {2} ({2}, Discard this card: Draw a card.)
+id=175262
+name=Jungle Weaver
+rarity=C
+type=Creature
+mana={5}{G}{G}
+autohand={2}:cycling
+abilities=reach
+power=5
+subtype=Spider
+toughness=6
+[/card]
+[card]
 text=Target player gains 7 life and draws two cards.
 id=174976
 target=player
@@ -1044,6 +1059,19 @@ mana={W}{U}{U}{B}
 type=Instant
 [/card]
 [card]
+text={U}, {T}: Put a 0/1 blue Homunculus artifact creature token onto the battlefield.   At the beginning of your upkeep, sacrifice a Homunculus.
+id=175012
+name=Puppet Conjurer
+rarity=U
+mana={1}{B}
+type=Artifact Creature
+subtype=Human Wizard
+auto={U}{T}:token(Homonculus,Creature Homonclulus,0/1,blue)
+auto=@each my upkeep:bury notatarget(homonculus|myBattlefield)
+power=1
+toughness=2
+[/card]
+[card]
 text={1}: Target creature with power 5 or greater gains first strike until end of turn.
 id=175253
 name=Rakeclaw Gargantuan
@@ -1233,21 +1261,21 @@ type=Artifact
 [/card]
 [card]
 text=Seaside Citadel enters the battlefield tapped.   {T}: Add {G}, {W}, or {U} to your mana pool.
+id=174950
+name=Seaside Citadel
 auto=tap
 auto={T}:Add {G}
 auto={T}:Add {W}
 auto={T}:Add {U}
-id=174950
-name=Seaside Citadel
 rarity=U
 type=Land
 [/card]
 [card]
 text=Exile target card in a graveyard. You gain 3 life.
+id=177473
 target=*|graveyard
 auto=moveto(exile)
 auto=life:3 controller
-id=177473
 name=Shadowfeed
 rarity=C
 mana={B}

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

@@ -44,17 +44,6 @@ subtype=Human Cleric
 toughness=1
 [/card]
 [card]
-text=Flying, trample     At the beginning of your upkeep, sacrifice a non-Zombie creature, then put a 2/2 black Zombie creature token into play.
-id=174847
-name=Archdemon of Unx
-rarity=R
-type=Creature
-mana={5}{B}{B}
-power=6
-subtype=Demon
-toughness=6
-[/card]
-[card]
 text=Choose one - Destroy target artifact; or put target creature on the bottom of its owner's library; or counter target instant spell.
 id=137931
 name=Bant Charm
@@ -639,21 +628,6 @@ power=7
 subtype=Demon
 toughness=7
 [/card]
-
-
-[card]
-text={U}, {T}: Put a 0/1 blue Homunculus artifact creature token into play.     At the beginning of your upkeep, sacrifice a Homunculus.
-id=175012
-auto={U}{T}:token(Homonculus,Creature Homonclulus,0/1,blue)
-auto=@each my upkeep:bury target(homonculus|myinplay)
-name=Puppet Conjurer
-rarity=U
-type=Artifact Creature
-mana={1}{B}
-power=1
-subtype=Human Wizard
-toughness=2
-[/card]
 [card]
 text=Reach     If a creature is attacking you and you control a Forest and a Plains, you may play Qasali Ambusher without paying its mana cost and as though it had flash.
 id=174869

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

@@ -217,7 +217,7 @@ mana=
 type=Land
 text={T}: Add {1} to your mana pool. {1}: Mishra's Factory becomes a 2/2 Assembly-Worker artifact creature until end of turn. It's still a land. {T}: Target Assembly-Worker creature gets +1/+1 until end of turn.
 auto={T}:add{1}
-auto={1}:becomes(Assembly-Worker,2/2,Artifact Creature)
+auto={1}:becomes(Artifact Creature Assembly-Worker,2/2)
 auto={T}:1/1 target(Assembly-Worker)
 rarity=U
 [/card]

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

@@ -205,7 +205,7 @@ subtype=Aura
 text=Enchant Forest or Plains.   Whenever enchanted land becomes tapped, its controller loses 2 life.
 id=183054
 target=forest,plains
-alias=1218
+auto=@tapped(mytgt):life:-2 targetController
 name=Corrupted Roots
 rarity=U
 mana={B}

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

@@ -340,6 +340,18 @@ subtype=Aura
 abilities=flash
 [/card]
 [card]
+text=Enchant land   Whenever enchanted land becomes tapped, its controller loses 2 life.   {3}{B}: Destroy enchanted land.
+id=136211
+target=land
+auto=@tapped(mytgt):life:-2 targetController
+auto={3}{B}:destroy
+name=Pooling Venom
+rarity=U
+mana={1}{B}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
 text={6}, {T}: Return target Rebel permanent card with converted mana cost 5 or less from your graveyard to the battlefield.
 id=136145
 name=Ramosian Revivalist

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

@@ -845,15 +845,6 @@ text=Chroma — Reveal any number of cards in your hand. You gain 2 life for eac
 rarity=U
 [/card]
 [card]
-id=136211
-name=Pooling Venom
-mana={1}{B}
-type=Enchantment
-subtype=Aura
-text=Enchant land Whenever enchanted land becomes tapped, its controller loses 2 life. {3}{B}: Destroy enchanted land.
-rarity=U
-[/card]
-[card]
 id=126148
 name=Putrid Cyclops
 mana={2}{B}

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

@@ -135,6 +135,17 @@ toughness=3
 abilities=protection from red
 [/card]
 [card]
+text=Enchant land     When enchanted land becomes tapped, destroy it.
+id=1429
+target=land
+auto=@tapped(mytgt):destroy
+name=Blight
+rarity=U
+mana={B}{B}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
 text=Return target permanent to its owner's hand.
 target=*
 auto=moveto(ownerhand)
@@ -963,8 +974,8 @@ toughness=6
 [/card]
 [card]
 text=Mountainwalk, protection from white 
-name=Mountain Yeti
 id=1585
+name=Mountain Yeti
 rarity=U
 mana={2}{R}{R}
 type=Creature
@@ -989,7 +1000,7 @@ toughness=3
 text={T}: Add {G} to your mana pool.   {T}: Target 1/1 creature gets +1/+2 until end of turn.
 id=1703
 auto={T}:Add {G}
-auto={T}: 1/2 target(creature[power=1;toughness=1])
+auto={T}:1/2 target(creature[power=1;toughness=1])
 name=Pendelhaven
 rarity=U
 type=Legendary Land
@@ -1063,7 +1074,7 @@ power=2
 toughness=2
 [/card]
 [card]
-text={W}{U}{G}, {T}:  Regenerate target creature.
+text={W}{U}{G}, {T}: Regenerate target creature.
 id=1676
 name=Ragnar
 rarity=R
@@ -1158,8 +1169,8 @@ id=1634
 auto=lord(creature|myBattlefield) 0/2
 name=Shield Wall
 rarity=U
-type=Instant
 mana={1}{W}
+type=Instant
 [/card]
 [card]
 id=1684
@@ -1175,10 +1186,10 @@ toughness=4
 id=1683
 name=Sir Shandlar of Eberyn
 rarity=U
-type=Legendary Creature
 mana={4}{G}{W}
-power=4
+type=Legendary Creature
 subtype=Human Knight
+power=4
 toughness=7
 [/card]
 [card]
@@ -1208,9 +1219,9 @@ toughness=2
 [/card]
 [card]
 text=Enchant creature (Target a creature as you cast this. This card enters the battlefield attached to that creature.)   Whenever enchanted creature deals damage, you gain that much life.
+id=1635
 target=creature
 auto=lifelink
-id=1635
 name=Spirit Link
 rarity=U
 mana={W}
@@ -1218,6 +1229,17 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
+text=Enchant creature   Whenever enchanted creature becomes tapped, put a -0/-2 counter on it.
+id=1457
+target=creature
+auto=@tapped(mytgt):counter(0/-2)
+name=Spirit Shackle
+rarity=C
+mana={B}{B}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
 text=At the beginning of each player's upkeep, if that player controls a Plains, he or she gains 1 life.
 id=1636
 auto=@each my upkeep:aslongas(plains|myBattlefield) life:1 controller

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

@@ -176,15 +176,6 @@ subtype=Elemental
 toughness=3
 [/card]
 [card]
-text=Enchant land     When enchanted land becomes tapped, destroy it.
-id=1429
-name=Blight
-rarity=U
-type=Enchantment
-mana={B}{B}
-subtype=Aura
-[/card]
-[card]
 text=If target creature has toughness 5 or greater, it gets +4/-4 until end of turn. Otherwise, it gets +4/-X until end of turn, where X is its toughness minus 1.
 id=1561
 name=Blood Lust
@@ -1245,15 +1236,6 @@ mana={U}{U}
 subtype=Aura
 [/card]
 [card]
-text=Enchant creature     Whenever enchanted creature becomes tapped, put a -0/-2 counter on it.
-id=1457
-name=Spirit Shackle
-rarity=C
-type=Enchantment
-mana={B}{B}
-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

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

@@ -26,6 +26,16 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
+text=Until end of turn, target land becomes a 3/3 creature that's still a land.
+id=21377
+target=land
+auto=becomes(Creature,3/3) ueot
+name=Animate Land
+rarity=U
+mana={G}
+type=Instant
+[/card]
+[card]
 text=Flying (This creature can't be blocked except by creatures with flying or reach.)   Other black creatures get +1/+1.   Nonblack creatures get -1/-1.
 id=22897
 name=Ascendant Evincar

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

@@ -26,14 +26,6 @@ text=If you control a Plains, you may tap an untapped creature you control rathe
 rarity=U
 [/card]
 [card]
-id=21377
-name=Animate Land
-mana={G}
-type=Instant
-text=Until end of turn, target land becomes a 3/3 creature that's still a land.
-rarity=U
-[/card]
-[card]
 id=21343
 name=Arc Mage
 mana={2}{R}

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

@@ -1872,6 +1872,17 @@ mana={4}{U}{U}
 type=Sorcery
 [/card]
 [card]
+text=Target land becomes a 3/3 creature until end of turn. It's still a land.   Draw a card.
+id=30546
+target=land
+auto=becomes(Creature,3/3) ueot
+auto=draw:1 controller
+name=Vivify
+rarity=U
+mana={2}{G}
+type=Instant
+[/card]
+[card]
 text={T}: Add {G} to your mana pool.   Threshold - Werebear gets +3/+3 as long as seven or more cards are in your graveyard.
 id=29785
 name=Werebear

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

@@ -1575,14 +1575,6 @@ type=Enchantment
 mana={4}{G}
 [/card]
 [card]
-text=Target land becomes a 3/3 creature until end of turn. It's still a land.       Draw a card.
-id=30546
-name=Vivify
-rarity=U
-type=Instant
-mana={2}{G}
-[/card]
-[card]
 text=Volcanic Spray deals 1 damage to each creature without flying and each player.       Flashback {1}{R} (You may play this card from your graveyard for its flashback cost. Then remove it from the game.)
 id=29768
 name=Volcanic Spray

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

@@ -1580,12 +1580,12 @@ 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."
-target=creature
 id=1171
+target=creature
 name=Paralyze
 auto=tap
 auto=doesnotuntap
-auto={4}:untap upkeepOlny
+auto={4}:untap UpkeepOnly
 rarity=C
 mana={B}
 type=Enchantment

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

@@ -142,14 +142,27 @@ name=Divergent Growth
 mana={G}
 type=Instant
 text=Until end of turn, lands you control gain "{T}: Add one mana of any color to your mana pool."
-auto=lord(land|myinplay) {T}:add {G}
+auto=lord(land|myBattlefield) {T}:add {G}
-auto=lord(land|myinplay) {T}:add {W}
+auto=lord(land|myBattlefield) {T}:add {W}
-auto=lord(land|myinplay) {T}:add {B}
+auto=lord(land|myBattlefield) {T}:add {B}
-auto=lord(land|myinplay) {T}:add {U}
+auto=lord(land|myBattlefield) {T}:add {U}
-auto=lord(land|myinplay) {T}:add {R}
+auto=lord(land|myBattlefield) {T}:add {R}
 rarity=C
 [/card]
 [card]
+text=Flying   Whenever Dragon Mage deals combat damage to a player, each player discards his or her hand and draws seven cards.
+auto=@damaged(player) from(this):moveto(graveyard) all(*|myhand) && draw:7 controller && moveto(graveyard) all(*|opponenthand) && draw:7 opponent
+id=43569
+name=Dragon Mage
+rarity=R
+mana={5}{R}{R}
+type=Creature
+subtype=Dragon Wizard
+power=5
+toughness=5
+abilities=flying
+[/card]
+[card]
 text=Flying, protection from Dragons
 id=39714
 name=Dragonstalker
@@ -176,18 +189,17 @@ power=4
 toughness=5
 [/card]
 [card]
-id=45844
-name=Enrage
-mana={X}{R}
-type=Instant
 text=Target creature gets +X/+0 until end of turn.
+id=45844
 target=creature
 auto=X/0
+name=Enrage
 rarity=U
+mana={X}{R}
+type=Instant
 [/card]
 [card]
 text=Flying   {3}{W}{W}: Return Eternal Dragon from your graveyard to your hand. Activate this ability only during your upkeep.   Plainscycling {2} ({2}, Discard this card: Search your library for a Plains card, reveal it, and put it into your hand. Then shuffle your library.)
-autograveyard={3}{W}{W}:moveTo(myhand) myUpkeepOnly
 id=44398
 name=Eternal Dragon
 rarity=R
@@ -195,6 +207,7 @@ mana={5}{W}{W}
 type=Creature
 subtype=Dragon Spirit
 autohand={2}{S}:moveTo(myhand) target(plains|mylibrary)
+autograveyard={3}{W}{W}:moveTo(myhand) myUpkeepOnly
 power=5
 toughness=5
 abilities=flying
@@ -212,26 +225,38 @@ power=1
 toughness=1
 [/card]
 [card]
+text=Enchant creature   Enchanted creature doesn't untap during its controller's untap step.   When enchanted creature is dealt damage, destroy it.
+id=43500
+target=creature
+auto=doesnotuntap
+auto=@damaged(mytgt):destroy
+name=Frozen Solid
+rarity=C 
+mana={1}{U}{U}
+type=Enchantment
+subtype=Aura 
+[/card]
+[card]
+text=Goblin Brigand attacks each turn if able.
 id=43525
 name=Goblin Brigand
+rarity=C
 mana={1}{R}
 type=Creature
 subtype=Goblin Warrior
 power=2
 toughness=2
-text=Goblin Brigand attacks each turn if able.
 abilities=mustattack
-rarity=C
 [/card]
 [card]
+text=Goblin War Strike deals damage equal to the number of Goblins you control to target player.
 id=44292
+target=player
+auto=foreach(goblin|myBattlefield) damage:1
 name=Goblin War Strike
+rarity=C
 mana={R}
 type=Sorcery
-text=Goblin War Strike deals damage equal to the number of Goblins you control to target player.
-target=player
-auto=foreach(goblin|myBattlefield)damage:1
-rarity=C
 [/card]
 [card]
 text=Whenever you cast a creature spell with converted mana cost 6 or more, put three +1/+1 counters on Kurgadon.
@@ -259,19 +284,19 @@ toughness=6
 abilities=vigilance
 [/card]
 [card]
+text=Enchant creature   {U}: Untap enchanted creature.   {U}: Enchanted creature gains flying until end of turn.   {U}: Enchanted creature gains shroud until end of turn. (It can't be the target of spells or abilities.)   {1}: Enchanted creature gets +1/-1 or -1/+1 until end of turn.
 id=43581
 name=Pemmin's Aura
+rarity=U
 mana={1}{U}{U}
 type=Enchantment
 subtype=Aura
-text=Enchant creature {U}: Untap enchanted creature. {U}: Enchanted creature gains flying until end of turn. {U}: Enchanted creature gains shroud until end of turn. (It can't be the target of spells or abilities.) {1}: Enchanted creature gets +1/-1 or -1/+1 until end of turn.
 target=creature
 auto={U}:untap mytgt
 auto={U}:flying mytgt
 auto={U}:shroud mytgt
 auto={1}:+1/-1 mytgt
 auto={1}:-1/+1 mytgt
-rarity=U
 [/card]
 [card]
 text=Whenever a player casts a spell with converted mana cost 3 or less, Pyrostatic Pillar deals 2 damage to that player.
@@ -284,13 +309,13 @@ mana={1}{R}
 type=Enchantment
 [/card]
 [card]
-id=43622
-name=Rain of Blades
-mana={W}
-type=Instant
 text=Rain of Blades deals 1 damage to each attacking creature.
 auto=damage:1 all(creature[attacking])
+id=43622
+name=Rain of Blades
 rarity=U
+mana={W}
+type=Instant
 [/card]
 [card]
 text=Flying   Islandcycling {2} ({2}, Discard this card: Search your library for an Island card, reveal it, and put it into your hand. Then shuffle your library.)
@@ -306,29 +331,29 @@ toughness=4
 abilities=flying
 [/card]
 [card]
+text=When Siege-Gang Commander enters the battlefield, put three 1/1 red Goblin creature tokens onto the battlefield.   {1}{R}, Sacrifice a Goblin: Siege-Gang Commander deals 2 damage to target creature or player.
 id=43552
 name=Siege-Gang Commander
+rarity=R
 mana={3}{R}{R}
 type=Creature
 subtype=Goblin
-power=2
-toughness=2
-text=When Siege-Gang Commander enters the battlefield, put three 1/1 red Goblin creature tokens onto the battlefield. {1}{R}, Sacrifice a Goblin: Siege-Gang Commander deals 2 damage to target creature or player.
 auto=token(Goblin,creature goblin, 1/1,red)*3
 auto={1}{R}{S(goblin|myinplay)}:Damage:2 target(creature,player)
-rarity=R
+power=2
+toughness=2
 [/card]
 [card]
+text=First strike, protection from red
 id=44313
 name=Silver Knight
+rarity=U
 mana={W}{W}
 type=Creature
 subtype=Human Knight
 power=2
 toughness=2
-text=First strike, protection from red
+abilities=first strike,protection from red
-abilities=First strike,protection from red
-rarity=U
 [/card]
 [card]
 id=43734
@@ -413,6 +438,17 @@ power=5
 toughness=3
 [/card]
 [card]
+text=Enchant nonbasic land   When enchanted land becomes tapped, destroy it.
+id=46614
+target=land[-basic]
+auto=@tapped(mytgt):destroy
+name=Uncontrolled Infestation
+rarity=C
+mana={1}{R}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
 id=46418
 name=Unspeakable Symbol
 mana={1}{B}{B}

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

@@ -230,7 +230,6 @@ type=Enchantment
 text=When Day of the Dragons enters the battlefield, exile all creatures you control. Then put that many 5/5 red Dragon creature tokens with flying onto the battlefield. When Day of the Dragons leaves the battlefield, sacrifice all Dragons you control. Then return the exiled cards to the battlefield under your control.
 rarity=R
 [/card]
-
 [card]
 id=45141
 name=Decree of Justice
@@ -290,19 +289,6 @@ text=Enchant creature Enchanted creature gets +1/+1 and has trample. When a crea
 rarity=C
 [/card]
 [card]
-id=43569
-name=Dragon Mage
-mana={5}{R}{R}
-type=Creature
-subtype=Dragon Wizard
-power=5
-toughness=5
-text=Flying Whenever Dragon Mage deals combat damage to a player, each player discards his or her hand and draws seven cards.
-auto=@damaged(player) from(this):moveto(graveyard) all(*|myhand) && draw:7 controller
-auto=@damaged(player) from(this):moveto(graveyard) all(*|opponenthand) && draw:7 opponent
-rarity=R
-[/card]
-[card]
 id=44400
 name=Dragon Scales
 mana={1}{W}
@@ -456,18 +442,6 @@ text=Morph {W} (You may cast this face down as a 2/2 creature for {3}. Turn it f
 rarity=C
 [/card]
 [card]
-id=43500
-name=Frozen Solid
-mana={1}{U}{U}
-type=Enchantment
-subtype=Aura
-text=Enchant creature  Enchanted creature doesn't untap during its controller's untap step.  When enchanted creature is dealt damage, destroy it.
-target=creature
-auto=doesnotuntap
-auto=@damaged(mytgt):destroy
-rarity=C
-[/card]
-[card]
 id=43623
 name=Gilded Light
 mana={1}{W}
@@ -960,15 +934,6 @@ text=Target player discards two cards. Cycling {2} ({2}, Discard this card: Draw
 rarity=C
 [/card]
 [card]
-id=46614
-name=Uncontrolled Infestation
-mana={1}{R}
-type=Enchantment
-subtype=Aura
-text=Enchant nonbasic land When enchanted land becomes tapped, destroy it.
-rarity=C
-[/card]
-[card]
 id=43586
 name=Undead Warchief
 mana={2}{B}{B}

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

@@ -129,6 +129,28 @@ mana={4}{G}
 type=Sorcery
 [/card]
 [card]
+text=Flying   At the beginning of your upkeep, return a white creature you control to its owner's hand.
+auto=@each my upkeep:moveTo(ownerhand) notatarget(creature[white]|myBattlefield)
+id=74373
+name=Eiganjo Free-Riders
+rarity=U
+mana={3}{W}
+type=Creature
+subtype=Human Soldier
+power=3
+toughness=4
+abilities=flying
+[/card]
+[card]
+text=At the beginning of each opponent's upkeep, if that player has seven or more cards in hand, Ebony Owl Netsuke deals 4 damage to him or her.
+auto=@each opponent upkeep:aslongas(*|opponenthand) damage:4 opponent >6
+id=88799
+name=Ebony Owl Netsuke
+rarity=U
+mana={2}
+type=Artifact
+[/card]
+[card]
 text=Put three 3/1 red Elemental creature tokens with haste onto the battlefield. Exile them at the beginning of the next end step.
 auto=token(Elemental, Creature Elemental Kijhjjghtsdrw,3/1,haste red)*3
 auto=@next endofturn:moveto(exile) all(kijhjjghtsdrw)
@@ -247,6 +269,15 @@ mana={3}{R}
 type=Sorcery
 [/card]
 [card]
+text=At the beginning of your upkeep, if you have seven or more cards in hand, you gain 4 life.
+auto=@each my upkeep:aslongas(*|myhand) life:4 controller >6
+id=88796
+name=Ivory Crane Netsuke
+mana={2}
+rarity=U
+type=Artifact
+[/card]
+[card]
 text=Kagemaro, First to Suffer's power and toughness are each equal to the number of cards in your hand.   {B}, Sacrifice Kagemaro: All creatures get -X/-X until end of turn, where X is the number of cards in your hand.
 id=74016
 name=Kagemaro, First to Suffer
@@ -263,7 +294,7 @@ toughness=*
 text=Enchant creature   Enchanted creature gets -X/-X, where X is the number of cards in your hand.
 id=74560
 target=creature
-auto=foreach(*|myhand)-1/-1
+auto=foreach(*|myhand) -1/-1
 name=Kagemaro's Clutch
 rarity=C
 mana={3}{B}
@@ -332,6 +363,21 @@ power=2
 toughness=1
 [/card]
 [card]
+text=Kiyomaro, First to Stand's power and toughness are each equal to the number of cards in your hand.   As long as you have four or more cards in hand, Kiyomaro has vigilance.   Whenever Kiyomaro deals damage, if you have seven or more cards in hand, you gain 7 life.
+id=74054
+name=Kiyomaro, First to Stand
+rarity=R
+mana={3}{W}{W}
+type=Legendary Creature
+subtype=Spirit
+auto=foreach(*|myhand) 1/1
+auto=aslongas(*|myhand) vigilance >3
+auto=@damaged(player) from(this):aslongas(*|myhand) life:7 controller >6
+auto=@damaged(creature) from(this):aslongas(*|myhand) life:7 controller >6
+power=*
+toughness=*
+[/card]
+[card]
 text=Masumaro, First to Live's power and toughness are each equal to twice the number of cards in your hand.
 id=74184
 name=Masumaro, First to Live
@@ -344,6 +390,17 @@ power=*
 toughness=*
 [/card]
 [card]
+text=At the beginning of your end step, sacrifice Measure of Wickedness and you lose 8 life.   Whenever another card is put into your graveyard from anywhere, target opponent gains control of Measure of Wickedness.
+id=88821
+name=Measure of Wickedness
+rarity=U
+mana={3}{B}
+auto=@next my endofturn:bury
+auto=@next my endofturn:life:-8 controller
+auto=@movedto(* other|graveyard):moveto(opponentBattlefield)
+type=Enchantment
+[/card]
+[card]
 text=All creatures get -X/-0, where X is the number of cards in your hand.
 id=89406
 auto=foreach(*|myhand) lord(creature) -1/0
@@ -362,6 +419,15 @@ rarity=R
 type=Legendary Land
 [/card]
 [card]
+text=Return Molting Skin to its owner's hand: Regenerate target creature.
+auto={0}:moveTo(ownerhand) all(this) && regenerate target(creature) limit:1
+id=87331
+name=Molting Skin
+rarity=U
+mana={2}{G}
+type=Enchantment
+[/card]
+[card]
 text=Flying   {W}: Moonwing Moth gets +0/+1 until end of turn.
 id=84643
 name=Moonwing Moth
@@ -418,6 +484,19 @@ mana={B}
 type=Instant
 [/card]
 [card]
+text=Haste   At the beginning of your upkeep, return a red creature you control to its owner's hand.
+auto=@each my upkeep:moveTo(ownerhand) notatarget(creature[red]|myBattlefield)
+id=74048
+name=Oni of Wild Places
+rarity=U
+mana={5}{R}
+type=Creature
+subtype=Demon Spirit
+power=6
+toughness=5
+abilities=haste
+[/card]
+[card]
 text=Counter target creature spell. Draw cards equal to that spell's converted mana cost.
 id=89403
 target=creature|stack
@@ -477,7 +556,7 @@ rarity=U
 mana={3}{B}
 type=Creature
 subtype=Demon Spirit
-auto=lord(creature[black])cantblock
+auto=lord(creature[black]) cantblock
 power=4
 toughness=5
 [/card]
@@ -576,6 +655,19 @@ toughness=1
 abilities=first strike
 [/card]
 [card]
+text=At the beginning of your upkeep, return a black creature you control to its owner's hand.   {1}{B}: Regenerate Skull Collector.
+auto=@each my upkeep:moveTo(ownerhand) notatarget(creature[black]|myBattlefield)
+id=88797
+name=Skull Collector
+rarity=U
+mana={1}{B}{B}
+type=Creature
+subtype=Ogre Warrior
+auto={1}{B}:regenerate
+power=3
+toughness=3
+[/card]
+[card]
 text=Flying   Soramaro, First to Dream's power and toughness are each equal to the number of cards in your hand. {4}, Return a land you control to its owner's hand: Draw a card.
 id=74170
 name=Soramaro, First to Dream
@@ -603,7 +695,7 @@ type=Artifact
 text=Spiraling Embers deals damage to target creature or player equal to the number of cards in your hand.
 id=74503
 target=creature,player)
-auto=foreach(*|myhand)damage:1
+auto=foreach(*|myhand) damage:1
 name=Spiraling Embers
 rarity=C
 mana={3}{R}
@@ -611,6 +703,19 @@ type=Sorcery
 subtype=Arcane
 [/card]
 [card]
+text=Trample   At the beginning of your upkeep, return a green creature you control to its owner's hand.
+auto=@each my upkeep:moveTo(ownerhand) notatarget(creature[green]|myBattlefield)
+id=74407
+name=Stampeding Serow
+rarity=U
+mana={2}{G}{G}
+type=Creature
+subtype=Antelope Beast
+power=5
+toughness=4
+abilities=trample
+[/card]
+[card]
 text=Destroy target artifact or land.
 id=88808
 target=artifact,land

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

@@ -214,27 +214,6 @@ toughness=1
 rarity=C
 [/card]
 [card]
-text=At the beginning of each opponent's upkeep, if that player has seven or more cards in hand, Ebony Owl Netsuke deals 4 damage to him or her.
-name=Ebony Owl Netsuke
-auto=@each opponent upkeep:aslongas(*|opponenthand) damage:4 opponent >6
-#not sure if working then some muse from 10E could be softcoded
-id=88799
-mana={2}
-type=Artifact
-rarity=U
-[/card]
-[card]
-text=Flying At the beginning of your upkeep, return a white creature you control to its owner's hand.
-name=Eiganjo Free-Riders
-id=74373
-mana={3}{W}
-type=Creature
-subtype=Human Soldier
-power=3
-toughness=4
-rarity=U
-[/card]
-[card]
 text=Whenever you cast a Spirit or Arcane spell, reveal the top three cards of your library. Put all land cards revealed this way into your hand and the rest on the bottom of your library in any order. 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.)
 name=Elder Pine of Jukai
 id=74204
@@ -500,16 +479,6 @@ subtype=Arcane
 rarity=C
 [/card]
 [card]
-text=At the beginning of your upkeep, if you have seven or more cards in hand, you gain 4 life.
-name=Ivory Crane Netsuke
-auto=@each my upkeep:aslongas(*|myhand) life:4 controller >6
-## dont think @each works 100% with aslongas + >X
-id=88796
-mana={2}
-type=Artifact
-rarity=U
-[/card]
-[card]
 text={X}{R}, {T}: Jiwari, the Earth Aflame deals X damage to target creature without flying. Channel — {X}{R}{R}{R}, Discard Jiwari: Jiwari deals X damage to each creature without flying.
 name=Jiwari, the Earth Aflame
 id=74047
@@ -599,23 +568,6 @@ toughness=3
 rarity=C
 [/card]
 [card]
-text=Kiyomaro, First to Stand's power and toughness are each equal to the number of cards in your hand. As long as you have four or more cards in hand, Kiyomaro has vigilance. Whenever Kiyomaro deals damage, if you have seven or more cards in hand, you gain 7 life.
-name=Kiyomaro, First to Stand
-id=74054
-mana={3}{W}{W}
-type=Creature
-subtype=Spirit
-auto=foreach(*|myhand) 1/1
-auto=aslongas(*|myhand) vigilance >3
-auto=@damaged(player) from(this):aslongas(*|myhand) life:7 controller >6
-auto=@damaged(creature) from(this):aslongas(*|myhand) life:7 controller >6
-##need more testing, I don't think the life gaining is working
-power=*
-toughness=*
-abilities=legendary
-rarity=R
-[/card]
-[card]
 text=At the beginning of the end step, if three or more creatures were put into graveyards from the battlefield this turn, flip Kuon, Ogre Ascendant.
 name=Kuon, Ogre Ascendant
 id=87596
@@ -688,17 +640,6 @@ toughness=2
 rarity=C
 [/card]
 [card]
-####Does not work!
-text=At the beginning of your end step, sacrifice Measure of Wickedness and you lose 8 life.   Whenever another card is put into your graveyard from anywhere, target opponent gains control of Measure of Wickedness.
-id=88821
-name=Measure of Wickedness
-rarity=U
-mana={3}{B}
-auto=@next my endofturn:bury && life:-8 controller
-auto=@movedto(other|graveyard):moveto(opponentBattlefield)
-type=Enchantment
-[/card]
-[card]
 text=Whenever a source an opponent controls deals damage to you, that player sacrifices a permanent.
 name=Michiko Konda, Truth Seeker
 id=84359
@@ -730,14 +671,6 @@ abilities=legendary
 rarity=R
 [/card]
 [card]
-text=Return Molting Skin to its owner's hand: Regenerate target creature.
-name=Molting Skin
-id=87331
-mana={2}{G}
-type=Enchantment
-rarity=U
-[/card]
-[card]
 text=Flying {2}, Return a land you control to its owner's hand: Target land becomes the basic land type of your choice until end of turn.
 name=Moonbow Illusionist
 id=74198
@@ -810,17 +743,6 @@ subtype=Equipment
 rarity=U
 [/card]
 [card]
-text=Haste At the beginning of your upkeep, return a red creature you control to its owner's hand.
-name=Oni of Wild Places
-id=74048
-mana={5}{R}
-type=Creature
-subtype=Demon Spirit
-power=6
-toughness=5
-rarity=U
-[/card]
-[card]
 text=Counter target spell unless its controller pays {1} for each card in your hand.
 name=Oppressive Will
 id=74423
@@ -1046,17 +968,6 @@ subtype=Arcane
 rarity=C
 [/card]
 [card]
-text=At the beginning of your upkeep, return a black creature you control to its owner's hand. {1}{B}: Regenerate Skull Collector.
-name=Skull Collector
-id=88797
-mana={1}{B}{B}
-type=Creature
-subtype=Ogre Warrior
-power=3
-toughness=3
-rarity=U
-[/card]
-[card]
 text=Flying Whenever you cast a Spirit or Arcane spell, you may gain control of target creature with that spell's converted mana cost until end of turn.
 name=Skyfire Kirin
 id=88793
@@ -1101,17 +1012,6 @@ subtype=Arcane
 rarity=C
 [/card]
 [card]
-text=Trample At the beginning of your upkeep, return a green creature you control to its owner's hand.
-name=Stampeding Serow
-id=74407
-mana={2}{G}{G}
-type=Creature
-subtype=Antelope Beast
-power=5
-toughness=4
-rarity=U
-[/card]
-[card]
 text=Each player sacrifices a land for each card in your hand.
 name=Thoughts of Ruin
 id=74374

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

@@ -807,9 +807,9 @@ type=Instant
 [/card]
 [card]
 text=Heat Ray deals X damage to target creature.
+id=10464
 target=creature
 auto=damage:X
-id=10464
 name=Heat Ray
 rarity=C
 type=Instant
@@ -943,13 +943,13 @@ type=Sorcery
 [/card]
 [card]
 text={B}: Looming Shade gets +1/+1 until end of turn.
-auto={B}:1/1
 id=5591
 name=Looming Shade
 rarity=C
 mana={2}{B}
 type=Creature
 subtype=Shade
+auto={B}:1/1
 power=1
 toughness=1
 [/card]
@@ -1068,7 +1068,8 @@ subtype=Aura
 text=Destroy target creature. Its owner gains 4 life.
 id=5684
 target=creature
-auto=destroy && life:4 targetController
+auto=destroy
+auto=life:4 targetController
 name=Path of Peace
 rarity=C
 mana={3}{W}
@@ -1110,13 +1111,13 @@ type=Enchantment
 [/card]
 [card]
 text=Sacrifice a creature: Phyrexian Ghoul gets +2/+2 until end of turn.
-auto={S(creature|myBattlefield)}:2/2
 id=5652
 name=Phyrexian Ghoul
 rarity=C
 mana={2}{B}
 type=Creature
 subtype=Zombie
+auto={S(creature|myBattlefield)}:2/2
 power=2
 toughness=2
 [/card]
@@ -1125,7 +1126,7 @@ text={T}: Add {1} to your mana pool.  {T}, Sacrifice a creature: Add {B}{B} to y
 id=10677
 name=Phyrexian Tower
 auto={T}:Add {1}
-auto={T}{s(creature|myBattlefield)}:Add {B}{B}
+auto={T}{S(creature|myBattlefield)}:Add {B}{B}
 rarity=R
 type=Legendary Land
 [/card]
@@ -1190,31 +1191,31 @@ auto=@movedTo(enchantment|stack):fizzle all(enchantment|stack)
 id=8811
 name=Presence of the Master
 rarity=U
-type=Enchantment
 mana={3}{W}
+type=Enchantment
 [/card]
 [card]
 text=When Priest of Gix enters the battlefield, add {B}{B}{B} to your mana pool.
-auto=Add:{B}{B}{B}
 id=9724
 name=Priest of Gix
 rarity=U
 mana={2}{B}
 type=Creature
 subtype=Human Cleric Minion
+auto=Add:{B}{B}{B}
 power=2
 toughness=1
 [/card]
 [card]
 text={T}: Add {G} to your mana pool for each Elf on the battlefield.
-auto={T}:foreach(elf)add:{G}
 id=5823
 name=Priest of Titania
 rarity=C
-type=Creature
 mana={1}{G}
-power=1
+type=Creature
 subtype=Elf Druid
+auto={T}:foreach(elf)add:{G}
+power=1
 toughness=1
 [/card]
 [card]
@@ -1223,8 +1224,8 @@ auto=lord(land|mybattlefield) {S}:Add{B}
 id=5831
 name=Rain of Filth
 rarity=U
-type=Instant
 mana={B}
+type=Instant
 [/card]
 [card]
 text=At the beginning of your upkeep, if you control another nonland permanent, sacrifice Reclusive Wight.
@@ -1240,9 +1241,9 @@ toughness=4
 [/card]
 [card]
 text=Enchant creature   Enchanted creature has first strike.
+id=10465
 target=creature
 auto=first strike
-id=10465
 name=Reflexes
 rarity=C
 mana={R}
@@ -1306,13 +1307,13 @@ toughness=4
 [/card]
 [card]
 text=First strike   {1}{B}: Regenerate Sanguine Guard.
-auto={1}{B}:regenerate
 id=5627
 name=Sanguine Guard
 rarity=U
 mana={1}{B}{B}
 type=Creature
 subtype=Zombie Knight
+auto={1}{B}:regenerate
 power=2
 toughness=2
 abilities=first strike
@@ -1341,12 +1342,12 @@ toughness=1
 abilities=first strike
 [/card]
 [card]
-text=Enchant creature (Target a creature as you play this. This card comes into play attached to that creature.)  Enchanted creature gets +2/+2 and has flying and vigilance. (It can't be blocked except by creatures with flying or reach, and attacking doesn't cause it to tap.)
+text=Enchant creature (Target a creature as you cast this. This card enters the battlefield attached to that creature.)   Enchanted creature gets +2/+2 and has flying and vigilance. (It can't be blocked except by creatures with flying or reach, and attacking doesn't cause it to tap.)
+id=9682
 target=creature
 auto=2/2
 auto=flying
 auto=vigilance
-id=9682
 name=Serra's Embrace
 rarity=U
 mana={2}{W}{W}
@@ -1376,24 +1377,24 @@ auto=defender,first strike
 [/card]
 [card]
 text=Flying (This creature can't be blocked except by creatures with flying or reach.)  {1}{R}: Shivan Hellkite deals 1 damage to target creature or player.
-auto={1}{R}:damage:1 target(creature,player)
 id=5660
 name=Shivan Hellkite
 rarity=R
 mana={5}{R}{R}
 type=Creature
 subtype=Dragon
+auto={1}{R}:damage:1 target(creature,player)
 power=5
 toughness=5
 abilities=flying
 [/card]
 [card]
 text=Enchant creature    Enchanted creature gets +2/+2 and has flying.   {R}: Enchanted creature gets +1/+0 until end of turn.
+id=5721
 target=creature
 auto=2/2
 auto=flying
 auto={R}:1/0
-id=5721
 name=Shivan Embrace
 rarity=U
 mana={2}{R}{R}
@@ -1518,6 +1519,18 @@ power=5
 toughness=1
 [/card]
 [card]
+text=Enchant Swamp   When enchanted land becomes tapped, destroy it.   When Spreading Algae is put into a graveyard from the battlefield, return Spreading Algae to its owner's hand.
+id=10409
+target=swamp
+auto=@tapped(mytgt):destroy
+auto=@movedTo(this|mygraveyard) from(battlefield):moveTo(myhand) notatarget(spreading algae|mygraveyard)
+name=Spreading Algae
+rarity=U
+mana={G}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
 text=Steam Blast deals 2 damage to each creature and each player.
 id=5563
 auto=damage:2 all(creature,player)

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

@@ -1297,15 +1297,6 @@ type=Enchantment
 mana={3}{G}
 [/card]
 [card]
-text=Enchant Swamp     When enchanted land becomes tapped, destroy it.     When Spreading Algae is put into a graveyard from play, return Spreading Algae to its owner's hand.
-id=10409
-name=Spreading Algae
-rarity=U
-type=Enchantment
-mana={G}
-subtype=Aura
-[/card]
-[card]
 text=If a red spell would deal damage to a creature or player, it deals that much damage plus 1 to that creature or player instead.
 id=5638
 name=Sulfuric Vapors

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

@@ -41,6 +41,17 @@ power=1
 toughness=1
 [/card]
 [card]
+text=Enchant creature an opponent controls   Whenever enchanted creature becomes tapped, you draw a card.
+id=3633
+target=creature|opponentBattlefield
+auto=@tapped(mytgt):draw:1 controller
+name=Betrayal
+rarity=C
+mana={U}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
 text=Flying   Cloud Spirit can block only creatures with flying.
 id=3636
 name=Cloud Elemental

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

@@ -7,15 +7,6 @@ text=Players have no maximum hand size. At the beginning of each player's draw s
 rarity=R
 [/card]
 [card]
-id=3633
-name=Betrayal
-mana={U}
-type=Enchantment
-subtype=Aura
-text=Enchant creature an opponent controls Whenever enchanted creature becomes tapped, you draw a card.
-rarity=C
-[/card]
-[card]
 id=3609
 name=Blanket of Night
 mana={1}{B}{B}