Added 38 successfully tested cards.

This update contents:

1. Creatures which get a certain power- and/or toughness-bonus when attacking or blocking.

2. Creatures which leave the battlefield at end of combat after having attacked or blocked.

3. Clockwork-"family" from Mirrodin.

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

@@ -902,6 +902,19 @@ mana={X}{2}{R}{R}
 type=Sorcery
 [/card]
 [card]
+text=Flying (This creature can't be blocked except by creatures with flying or reach.)   When Fog Elemental attacks or blocks, sacrifice it at end of combat.
+id=132073
+name=Fog Elemental
+rarity=U
+mana={2}{U}
+type=Creature
+subtype=Elemental
+auto=@each combatends:moveTo(ownerhand) all(fog elemental[attacking;blocking]|myBattlefield)
+power=4
+toughness=4
+abilities=flying
+[/card]
+[card]
 id=129559
 primitive=Forest
 rarity=L

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

@@ -247,17 +247,6 @@ auto={1}{U}:becomes(Creature Faerie,2/1,flying blue)
 type=Land
 [/card]
 [card]
-text=Flying (This creature can't be blocked except by creatures with flying or reach.)  When Fog Elemental attacks or blocks, sacrifice it at end of combat.
-id=132073
-name=Fog Elemental
-rarity=U
-type=Creature
-mana={2}{U}
-power=4
-subtype=Elemental
-toughness=4
-[/card]
-[card]
 text=Forbidding Watchtower comes into play tapped.     {T}: Add {W} to your mana pool.     {1}{W}: Forbidding Watchtower becomes a 1/5 white Soldier creature until end of turn. It's still a land.
 id=106428
 name=Forbidding Watchtower

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

@@ -381,6 +381,19 @@ rarity=U
 type=Land
 [/card]
 [card]
+text=Defender   Whenever Shield Sphere blocks, put a -0/-1 counter on it.
+id=3056
+name=Shield Sphere
+rarity=U
+mana={0}
+type=Artifact Creature
+subtype=Wall
+auto=@each combatdamage:counter(0/-1) all(shield sphere[blocking]|myBattlefield) && counter(0/1) all(other shield sphere[blocking]|myBattlefield)
+power=0
+toughness=6
+abilities=defender
+[/card]
+[card]
 text=Whenever Soldevi Steam Beast becomes tapped, target opponent gains 2 life.   {2}: Regenerate Soldevi Steam Beast.
 id=3061
 name=Soldevi Steam Beast

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

@@ -22,7 +22,6 @@ type=Instant
 text=Counter target spell. Its controller may draw up to two cards at the beginning of the next turn's upkeep. You draw a card at the beginning of the next turn's upkeep.
 rarity=C
 [/card]
-
 [card]
 id=3042
 name=Ashnod's Cylix
@@ -1076,17 +1075,6 @@ text=If Sheltered Valley would enter the battlefield, instead sacrifice each oth
 rarity=R
 [/card]
 [card]
-id=3056
-name=Shield Sphere
-mana={0}
-type=Artifact Creature
-subtype=Wall
-power=0
-toughness=6
-text=Defender Whenever Shield Sphere blocks, put a -0/-1 counter on it.
-rarity=U
-[/card]
-[card]
 id=3057
 name=Sol Grail
 mana={3}

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

@@ -247,6 +247,19 @@ mana={1}{W}{B}{R}
 type=Enchantment
 [/card]
 [card]
+Whenever Flowstone Charger attacks, it gets +3/-3 until end of turn.
+id=19117
+name=Flowstone Charger
+rarity=U
+mana={2}{R}{W}
+type=Creature
+subtype=Beast
+auto=lord(flowstone charger[attacking]|myBattlefield) 3/-3
+auto=lord(other flowstone charger[attacking]|myBattlefield) -3/3
+power=2
+toughness=5
+[/card]
+[card]
 text=Flying
 id=26757
 name=Gaea's Skyfolk

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

@@ -243,17 +243,6 @@ type=Instant
 text=Fire deals 2 damage divided as you choose among any number of target creatures and/or players. rarity=U
 [/card]
 [card]
-id=19117
-name=Flowstone Charger
-mana={2}{R}{W}
-type=Creature
-subtype=Beast
-power=2
-toughness=5
-Whenever Flowstone Charger attacks, it gets +3/-3 until end of turn.
-rarity=U
-[/card]
-[card]
 id=28805
 name=Foul Presence
 mana={2}{B}

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

@@ -240,6 +240,19 @@ toughness=1
 abilities=flying
 [/card]
 [card]
+text=Giant Tortoise gets +0/+3 as long as it's untapped.
+id=934
+name=Giant Tortoise
+rarity=C
+mana={1}{U}
+type=Creature
+subtype=Turtle
+auto=lord(giant tortoise[-tapped]) 0/3
+auto=lord(other giant tortoise[-tapped]) 0/-3
+power=1
+toughness=1
+[/card]
+[card]
 text={T}: Target creature can't be regenerated this turn.
 id=961
 name=Hurr Jackal

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

@@ -124,17 +124,6 @@ text=At the beginning of your upkeep, if a player has more life than any other,
 rarity=C
 [/card]
 [card]
-id=934
-name=Giant Tortoise
-mana={1}{U}
-type=Creature
-subtype=Turtle
-power=1
-toughness=1
-text=Giant Tortoise gets +0/+3 as long as it's untapped.
-rarity=C
-[/card]
-[card]
 id=918
 name=Guardian Beast
 mana={3}{B}

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

@@ -458,6 +458,19 @@ mana={U}
 type=Instant
 [/card]
 [card]
+text=Defender (This creature can't attack.)   Flying   When Stoic Ephemera blocks, sacrifice it at end of combat.
+id=107527
+name=Stoic Ephemera
+rarity=U
+mana={2}{W}
+type=Creature
+subtype=Spirit
+auto=@each combatends:moveTo(ownergraveyard) all(stoic ephemera[attacking;blocking]|myBattlefield)
+power=5
+toughness=5
+abilities=flying,defender
+[/card]
+[card]
 text=Counter all other spells. Draw a card for each spell countered this way.
 id=107284
 name=Swift Silence

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

@@ -1125,17 +1125,6 @@ text=Creatures you control get +1/+1 until end of turn. Forecast - {W}, Reveal S
 rarity=C
 [/card]
 [card]
-id=107527
-name=Stoic Ephemera
-mana={2}{W}
-type=Creature
-subtype=Spirit
-power=5
-toughness=5
-text=Defender (This creature can't attack.) Flying When Stoic Ephemera blocks, sacrifice it at end of combat.
-rarity=U
-[/card]
-[card]
 id=107505
 name=Stomp and Howl
 mana={2}{G}

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

@@ -109,6 +109,20 @@ toughness=5
 abilities=defender
 [/card]
 [card]
+text=Whenever Cave People attacks, it gets +1/-2 until end of turn.   {1}{R}{R}, {T}: Target creature gains mountainwalk until end of turn.
+id=1786
+name=Cave People
+rarity=U
+mana={1}{R}{R}
+type=Creature
+subtype=Human
+auto=lord(cave people[attacking]|mybattlefield) 1/-2
+auto=lord(other people[attacking]|mybattlefield) -1/2
+auto={1}{R}{R}{T}:mountainwalk target(creature)
+power=1
+toughness=4
+[/card]
+[card]
 text={3}, Sacrifice Coal Golem: Add {R}{R}{R} to your mana pool. 
 id=1711
 name=Coal Golem

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

@@ -59,17 +59,6 @@ text=Enchant creature Enchanted creature can't attack unless its controller pays
 rarity=C
 [/card]
 [card]
-id=1786
-name=Cave People
-mana={1}{R}{R}
-type=Creature
-subtype=Human
-power=1
-toughness=4
-text=Whenever Cave People attacks, it gets +1/-2 until end of turn. {1}{R}{R}, {T}: Target creature gains mountainwalk until end of turn.
-rarity=U
-[/card]
-[card]
 id=1823
 name=City of Shadows
 mana=

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

@@ -50,6 +50,19 @@ power=2
 toughness=2
 [/card]
 [card]
+text=Whenever Charging Paladin attacks, it gets +0/+3 until end of turn.
+id=6035
+name=Charging Paladin
+auto=lord(charging paladin[attacking]|myBattlefield) 0/3
+auto=lord(other charging paladin[attacking]|myBattlefield) 0/-3
+rarity=C
+mana={2}{W}
+type=Creature
+subtype=Human Knight
+power=2
+toughness=2
+[/card]
+[card]
 text=When you play another land, sacrifice City of Traitors.   {T}: Add {2} to your mana pool.
 id=6168
 name=City of Traitors

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

@@ -45,17 +45,6 @@ text=Each player chooses from the permanents he or she controls an artifact, a c
 rarity=R
 [/card]
 [card]
-id=6035
-name=Charging Paladin
-mana={2}{W}
-type=Creature
-subtype=Human Knight
-power=2
-toughness=2
-text=Whenever Charging Paladin attacks, it gets +0/+3 until end of turn.
-rarity=U
-[/card]
-[card]
 id=6105
 name=Cinder Crawler
 mana={1}{R}

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

@@ -711,6 +711,19 @@ mana={2}{G}
 type=Instant
 [/card]
 [card]
+text=Whenever you cast a spell, you may put two +1/+1 counters on Witch-Maw Nephilim.   Whenever Witch-Maw Nephilim attacks, it gains trample until end of turn if its power is 10 or greater.
+id=107090
+name=Witch-Maw Nephilim
+rarity=R
+mana={G}{W}{U}{B}
+type=Creature
+subtype=Nephilim
+auto=@movedTo(*|mystack):may counter(1/1,2)
+auto=lord(witch-maw nephilim[attacking;power>=10] trample
+power=1
+toughness=1
+[/card]
+[card]
 id=107693
 name=Wreak Havoc
 mana={2}{R}{G}

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

@@ -972,17 +972,6 @@ text=Defender (This creature can't attack.) Whenever Vertigo Spawn blocks a crea
 rarity=U
 [/card]
 [card]
-id=107090
-name=Witch-Maw Nephilim
-mana={G}{W}{U}{B}
-type=Creature
-subtype=Nephilim
-power=1
-toughness=1
-text=Whenever you cast a spell, you may put two +1/+1 counters on Witch-Maw Nephilim. Whenever Witch-Maw Nephilim attacks, it gains trample until end of turn if its power is 10 or greater.
-rarity=R
-[/card]
-[card]
 id=97203
 name=Withstand
 mana={2}{W}

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

@@ -52,7 +52,6 @@ toughness=2
 text={G}: Beast Walkers gains banding until end of turn. (Any creatures with banding, and up to one without, can attack in a band. Bands are blocked as a group. If any creatures with banding you control are blocking or being blocked by a creature, you divide that creature's combat damage, not its controller, among any of the creatures it's being blocked by or is blocking.)
 rarity=R
 [/card]
-
 [card]
 #require testing
 id=2912
@@ -173,34 +172,6 @@ text=Creature spells cost {2} more to cast.
 rarity=R
 [/card]
 [card]
-id=2967
-name=Folk of An-Havva
-mana={G}
-type=Creature
-subtype=Human
-power=1
-toughness=1
-text=Whenever Folk of An-Havva blocks, it gets +2/+0 until end of turn.
-auto=@blocked(creature) from(this):2/0
-#or
-auto=aslongas(this[blocking]|myBattlefield)2/0
-rarity=C
-[/card]
-[card]
-id=2968
-name=Folk of An-Havva
-mana={G}
-type=Creature
-subtype=Human
-power=1
-toughness=1
-text=Whenever Folk of An-Havva blocks, it gets +2/+0 until end of turn.
-auto=@blocked(creature) from(this):2/0
-#or
-auto=aslongas(this[blocking]|myBattlefield)2/0
-rarity=C
-[/card]
-[card]
 id=2941
 name=Forget
 mana={U}{U}
@@ -508,18 +479,6 @@ auto={T}:damage:2 target(creature,player) && doesnotuntap
 rarity=U
 [/card]
 [card]
-id=2976
-name=Root Spider
-mana={3}{G}
-type=Creature
-subtype=Spider
-power=2
-toughness=2
-text=Whenever Root Spider blocks, it gets +1/+0 and gains first strike until end of turn.
-auto=@blocked(creature) from(this):1/0 && first strike
-rarity=U
-[/card]
-[card]
 id=2978
 name=Rysorian Badger
 mana={2}{G}

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

@@ -1702,6 +1702,16 @@ mana={2}
 type=Artifact
 [/card]
 [card]
+text=All creatures lose flying until end of turn.   Sacrifice a snow land: Return Whiteout from your graveyard to your hand.
+id=2599
+auto=lord(creature) -flying
+autograveyard={S(land[snow]|myBattlefield)}:moveTo(myhand)
+name=Whiteout
+rarity=U
+mana={1}{G}
+type=Instant
+[/card]
+[card]
 text=Enchant creature   Enchanted creature can't be blocked by white creatures.   Enchanted creature gets +2/+2 as long as an opponent controls a white permanent.
 id=2716
 target=creature

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

@@ -1289,11 +1289,10 @@ mana={2}
 text=Whenever Marton Stromgald attacks, other attacking creatures get +1/+1 until end of turn for each attacking creature other than Marton Stromgald.     Whenever Marton Stromgald blocks, other blocking creatures get +1/+1 until end of turn for each blocking creature other than Marton Stromgald.
 id=2635
 name=Marton Stromgald
-auto=aslongas(Marton Stromgald[attacking]|myBattlefield):lord(creature[attacking]) foreach(creature[attacking] other|myBattlefield) 1/1 other
+auto=aslongas(marton stromgald[attacking]|myBattlefield) lord(creature[attacking]) foreach(creature[attacking]|myBattlefield) 1/1 other
-auto=aslongas(Marton Stromgald[blocking]|myBattlefield):lord(creature[blocking]) foreach(creature[blocking] other|myBattlefield) 1/1 other
+auto=aslongas(marton stromgald[blocking]|myBattlefield) lord(creature[blocking]) foreach(creature[blocking]|myBattlefield) 1/1 other
 rarity=R
-type=Creature
+type=Legendary Creature
-abilities=legendary
 mana={2}{R}{R}
 power=1
 subtype=Human Knight
@@ -1975,14 +1974,6 @@ toughness=4
 subtype=Wall
 [/card]
 [card]
-text=All creatures lose flying until end of turn.     Sacrifice a snow land: Return Whiteout from your graveyard to your hand.
-id=2599
-name=Whiteout
-rarity=U
-type=Instant
-mana={1}{G}
-[/card]
-[card]
 text=Wiitigo comes into play with six +1/+1 counters on it.     At the beginning of your upkeep, put a +1/+1 counter on Wiitigo if it has blocked or been blocked since your last upkeep. Otherwise, remove a +1/+1 counter from it.
 auto=counter(1/1,6)
 id=2600

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

@@ -2278,6 +2278,19 @@ power=3
 toughness=1
 [/card]
 [card]
+text=Whenever Vicious Kavu attacks, it gets +2/+0 until end of turn.
+id=23151
+name=Vicious Kavu
+rarity=U
+mana={1}{B}{R}
+type=Creature
+subtype=Kavu
+auto=lord(vicious kavu[attacking]|mybattlefield) 2/0
+auto=lord(other vicious kavu[attacking]|mybattlefield) -2/0
+power=2
+toughness=2
+[/card]
+[card]
 text=When Vodalian Merchant enters the battlefield, draw a card, then discard a card.
 id=26296
 name=Vodalian Merchant

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

@@ -1258,17 +1258,6 @@ toughness=7
 rarity=R
 [/card]
 [card]
-text=Whenever Vicious Kavu attacks, it gets +2/+0 until end of turn.
-id=23151
-name=Vicious Kavu
-rarity=U
-type=Creature
-mana={1}{B}{R}
-power=2
-subtype=Kavu
-toughness=2
-[/card]
-[card]
 text=Kicker {W} (You may pay an additional {W} as you play this spell.)    Target creature gains trample until end of turn. Whenever that creature deals combat damage this turn, if the kicker cost was paid, you gain life equal to that damage.
 id=23121
 name=Vigorous Charge

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

@@ -229,6 +229,19 @@ auto=foreach(land|mybattlefield) life:1
 rarity=C
 [/card]
 [card]
+text=Whenever Bramble Creeper attacks, it gets +5/+0 until end of turn.
+id=189915
+name=Bramble Creeper
+rarity=C
+mana={4}{G}
+type=Creature
+subtype=Elemental
+auto=lord(bramble creeper[attacking]|mybattlefield) 5/0
+auto=lord(other bramble creeper[attacking]|mybattlefield) -5/0
+power=0
+toughness=3
+[/card]
+[card]
 id=191096
 name=Burning Inquiry
 mana={R}

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

@@ -30,17 +30,6 @@ text=Flash (You may cast this spell any time you could cast an instant.) Flying
 rarity=M
 [/card]
 [card]
-id=189915
-name=Bramble Creeper
-mana={4}{G}
-type=Creature
-subtype=Elemental
-power=0
-toughness=3
-text=Whenever Bramble Creeper attacks, it gets +5/+0 until end of turn.
-rarity=C
-[/card]
-[card]
 id=189914
 name=Capricious Efreet
 mana={4}{R}{R}

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

@@ -144,11 +144,68 @@ mana={1}
 type=Artifact
 [/card]
 [card]
-text=Cloudpost comes into play tapped.   {T}: Add {1} to your mana pool for each Locus in play.
+text=Clockwork Beetle enters the battlefield with two +1/+1 counters on it.   Whenever Clockwork Beetle attacks or blocks, remove a +1/+1 counter from it at end of combat.
-auto=tap
+id=48119
-auto={T}:foreach(Locus)add:{1}
+name=Clockwork Beetle
+rarity=C
+mana={1}
+type=Artifact Creature
+subtype=Insect
+auto=counter(1/1,2)
+auto=@each combatends:counter(1/1,-1) all(clockwork beetle[attacking;blocking]) && counter(1/1) all(other clockwork beetle[attacking;blocking])
+power=0
+toughness=0
+[/card]
+[card]
+text=Flying   Clockwork Condor enters the battlefield with three +1/+1 counters on it.   Whenever Clockwork Condor attacks or blocks, remove a +1/+1 counter from it at end of combat.
+id=46124
+name=Clockwork Condor
+rarity=C
+mana={4}
+type=Artifact Creature
+subtype=Bird
+auto=counter(1/1,3)
+auto=@each combatends:counter(1/1,-1) all(clockwork condor[attacking;blocking]) && counter(1/1) all(other clockwork condor[attacking;blocking])
+power=0
+toughness=0
+abilities=flying
+[/card]
+[card]
+text=Flying   Clockwork Dragon enters the battlefield with six +1/+1 counters on it.   Whenever Clockwork Dragon attacks or blocks, remove a +1/+1 counter from it at end of combat.   {3}: Put a +1/+1 counter on Clockwork Dragon.
+id=46704
+name=Clockwork Dragon
+rarity=R
+mana={7}
+type=Artifact Creature
+subtype=Dragon
+auto=counter(1/1,6)
+auto={3}:counter(1/1)
+auto=@each combatends:counter(1/1,-1) all(clockwork dragon[attacking;blocking]) && counter(1/1) all(other clockwork dragon[attacking;blocking])
+power=0
+toughness=0
+abilities=flying
+[/card]
+[card]
+text=Trample   Clockwork Vorrac enters the battlefield with four +1/+1 counters on it.   Whenever Clockwork Vorrac attacks or blocks, remove a +1/+1 counter from it at end of combat.   {T}: Put a +1/+1 counter on Clockwork Vorrac.
+id=46123
+name=Clockwork Vorrac
+rarity=U
+mana={5}
+type=Artifact Creature
+subtype=Boar Beast
+auto=counter(1/1,4)
+auto={T}:counter(1/1)
+auto=@each combatends:counter(1/1,-1) all(clockwork vorrac[attacking;blocking]) && counter(1/1) all(other clockwork vorrac[attacking;blocking])
+power=0
+toughness=0
+abilities=trample
+[/card]
+[card]
+text=Cloudpost enters the battlefield tapped.   {T}: Add {1} to your mana pool for each Locus in play.
 id=49050
 name=Cloudpost
+auto=tap
+auto={T}:foreach(locus)add:{1}
 rarity=C
 type=Land
 subtype=Locus

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

@@ -174,50 +174,6 @@ type=Artifact
 mana={0}
 [/card]
 [card]
-text=Clockwork Beetle comes into play with two +1/+1 counters on it.     Whenever Clockwork Beetle attacks or blocks, remove a +1/+1 counter from it at end of combat.
-id=48119
-name=Clockwork Beetle
-rarity=C
-type=Artifact Creature
-mana={1}
-power=0
-subtype=Insect
-toughness=0
-[/card]
-[card]
-text=Flying Clockwork Condor comes into play with three +1/+1 counters on it. Whenever Clockwork Condor attacks or blocks, remove a +1/+1 counter from it at end of combat.
-id=46124
-name=Clockwork Condor
-rarity=C
-type=Artifact Creature
-mana={4}
-power=0
-subtype=Bird
-toughness=0
-[/card]
-[card]
-text=Flying Clockwork Dragon comes into play with six +1/+1 counters on it. Whenever Clockwork Dragon attacks or blocks, remove a +1/+1 counter from it at end of combat. {3}: Put a +1/+1 counter on Clockwork Dragon.
-id=46704
-name=Clockwork Dragon
-rarity=R
-type=Artifact Creature
-mana={7}
-power=0
-subtype=Dragon
-toughness=0
-[/card]
-[card]
-text=Trample     Clockwork Vorrac comes into play with four +1/+1 counters on it.     Whenever Clockwork Vorrac attacks or blocks, remove a +1/+1 counter from it at end of combat.     {T}: Put a +1/+1 counter on Clockwork Vorrac.
-id=46123
-name=Clockwork Vorrac
-rarity=U
-type=Artifact Creature
-mana={5}
-power=0
-subtype=Boar Beast
-toughness=0
-[/card]
-[card]
 text=Whenever an artifact, creature, or enchantment comes into play, its controller chooses target permanent another player controls that shares a type with it. Exchange control of those permanents.
 id=49528
 name=Confusion in the Ranks

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

@@ -288,6 +288,18 @@ toughness=3
 abilities=mountainwalk
 [/card]
 [card]
+text=When Ceremonial Guard attacks or blocks, destroy it at end of combat.
+id=19603
+name=Ceremonial Guard
+rarity=C
+mana={2}{R}
+type=Creature
+subtype=Human Soldier
+auto=@each combatends:destroy all(ceremonial guard[attacking;blocking]|myBattlefield)
+power=3
+toughness=4
+[/card]
+[card]
 text=Flying (This creature can't be blocked except by creatures with flying or reach.)   Cloud Sprite can block only creatures with flying.
 id=19563
 name=Cloud Sprite
@@ -1355,6 +1367,18 @@ power=2
 toughness=2
 [/card]
 [card]
+text=When Saprazzan Outrigger attacks or blocks, put it on top of its owner's library at end of combat.
+id=21773
+name=Saprazzan Outrigger
+rarity=C
+mana={3}{U}
+type=Creature
+subtype=Merfolk
+auto=@each combatends:moveTo(ownerlibrary) all(saprazzan outrigger[attacking;blocking]|myBattlefield)
+power=5
+toughness=5
+[/card]
+[card]
 text={2}{R}{T}, Discard a card: Destroy target land.
 id=19835
 name=Seismic Mage

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

@@ -170,17 +170,6 @@ type=Sorcery
 mana={3}{R}{R}
 [/card]
 [card]
-text=When Ceremonial Guard attacks or blocks, destroy it at end of combat.
-id=19603
-name=Ceremonial Guard
-rarity=C
-type=Creature
-mana={2}{R}
-power=3
-subtype=Human Soldier
-toughness=4
-[/card]
-[card]
 text=Whenever Chambered Nautilus becomes blocked, you may draw a card.
 id=19798
 name=Chambered Nautilus
@@ -1347,17 +1336,6 @@ subtype=Merfolk Soldier
 toughness=3
 [/card]
 [card]
-text=When Saprazzan Outrigger attacks or blocks, put it on top of its owner's library at end of combat.
-id=21773
-name=Saprazzan Outrigger
-rarity=C
-type=Creature
-mana={3}{U}
-power=5
-subtype=Merfolk
-toughness=5
-[/card]
-[card]
 text=When Saprazzan Raider becomes blocked, return it to its owner's hand.
 id=19564
 name=Saprazzan Raider

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

@@ -1347,6 +1347,18 @@ power=1
 toughness=2
 [/card]
 [card]
+text=When Phantom Whelp attacks or blocks, return it to its owner's hand at end of combat.
+id=31814
+name=Phantom Whelp
+rarity=C
+mana={1}{U}
+type=Creature
+subtype=Illusion Hound
+auto=@each combatends:moveTo(ownerhand) all(phantom whelp[attacking;blocking]|myBattlefield)
+power=2
+toughness=2
+[/card]
+[card]
 ####Please don't correct the card name by adding a "," because then the first auto line won't work anymore and even won't work when you add an "," there, too! (0.10.1) 
 text=Whenever Pianna Nomad Captain attacks, attacking creatures get +1/+1 until end of turn.
 id=31790

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

@@ -1036,17 +1036,6 @@ type=Instant
 mana={U}
 [/card]
 [card]
-text=When Phantom Whelp attacks or blocks, return it to its owner's hand at end of combat.
-id=31814
-name=Phantom Whelp
-rarity=C
-type=Creature
-mana={1}{U}
-power=2
-subtype=Illusion Hound
-toughness=2
-[/card]
-[card]
 text=Protection from red     {W}, Sacrifice Pilgrim of Justice: The next time a red source of your choice would deal damage this turn, prevent that damage.
 id=29690
 name=Pilgrim of Justice

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

@@ -440,6 +440,18 @@ power=1
 toughness=1
 [/card]
 [card]
+text=Whenever Goblin General attacks, Goblin creatures you control get +1/+1 until end of turn.
+id=6604
+name=Goblin General
+rarity=U
+mana={1}{R}{R}
+type=Creature
+subtype=Goblin Warrior
+auto=aslongas(goblin general[attacking]|myBattlefield) lord(goblin|myBattlefield) 1/1 ueot
+power=1
+toughness=1
+[/card]
+[card]
 text=Flying   Goblin Glider can't block.
 id=6584
 name=Goblin Glider
@@ -600,6 +612,19 @@ mana={4}{R}
 type=Sorcery
 [/card]
 [card]
+text=Whenever Lurking Nightstalker attacks, it gets +2/+0 until end of turn.
+id=6557
+name=Lurking Nightstalker
+rarity=C
+mana={B}{B}
+type=Creature
+subtype=Nightstalker
+auto=lord(lurking nightstalker[attacking]|mybattlefield) 2/0
+auto=lord(other lurking nightstalker[attacking]|mybattlefield) -2/0
+power=1
+toughness=1
+[/card]
+[card]
 text=Forestwalk
 id=6611
 name=Lynx
@@ -1008,7 +1033,6 @@ text=Sylvan Yeti's power is equal to the number of cards in your hand.
 id=6635
 name=Sylvan Yeti
 rarity=R
-
 mana={2}{G}{G}
 auto=foreach(*|myhand) 1/0
 type=Creature
@@ -1127,6 +1151,19 @@ mana={3}{U}
 type=Sorcery
 [/card]
 [card]
+text=Whenever Town Sentry blocks, it gets +0/+2 until end of turn.
+id=6494
+name=Town Sentry
+rarity=C
+mana={2}{W}
+type=Creature
+subtype=Human Soldier
+auto=lord(town sentry[blocking]|mybattlefield) 0/2
+auto=lord(other town sentry[blocking]|mybattlefield) 0/-2
+power=2
+toughness=2
+[/card]
+[card]
 text=Reach (This creature can block creatures with flying.)
 id=6619
 name=Tree Monkey

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

@@ -113,17 +113,6 @@ text=Look at the top card of target player's library. You may put that card into
 rarity=U
 [/card]
 [card]
-id=6604
-name=Goblin General
-mana={1}{R}{R}
-type=Creature
-subtype=Goblin Warrior
-power=1
-toughness=1
-text=Whenever Goblin General attacks, Goblin creatures you control get +1/+1 until end of turn.
-rarity=U
-[/card]
-[card]
 id=6603
 name=Goblin War Cry
 mana={2}{R}
@@ -170,17 +159,6 @@ text=You may have Lone Wolf assign its combat damage as though it weren't blocke
 rarity=U
 [/card]
 [card]
-id=6557
-name=Lurking Nightstalker
-mana={B}{B}
-type=Creature
-subtype=Nightstalker
-power=1
-toughness=1
-text=Whenever Lurking Nightstalker attacks, it gets +2/+0 until end of turn.
-rarity=C
-[/card]
-[card]
 id=6562
 #No Discard unless random
 name=Mind Rot
@@ -356,17 +334,6 @@ text=Tap up to three target creatures without flying.
 rarity=C
 [/card]
 [card]
-id=6494
-name=Town Sentry
-mana={2}{W}
-type=Creature
-subtype=Human Soldier
-power=2
-toughness=2
-text=Whenever Town Sentry blocks, it gets +0/+2 until end of turn.
-rarity=C
-[/card]
-[card]
 id=6540
 name=Undo
 mana={1}{U}{U}

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

@@ -517,6 +517,19 @@ power=2
 toughness=1
 [/card]
 [card]
+text=Flying   Whenever Windscouter attacks or blocks, return it to its owner's hand at end of combat.
+id=24585
+name=Windscouter
+rarity=U
+mana={3}{U}
+type=Creature
+subtype=Human Scout
+auto=@each combatends:moveTo(ownerhand) all(windscouter[attacking;blocking]|myBattlefield)
+power=3
+toughness=3
+abilities=flying
+[/card]
+[card]
 text=Wing Storm deals damage to each player equal to twice the number of creatures with flying that player controls.
 auto=foreach(creature[flying]|myBattlefield) damage:2 controller
 auto=foreach(creature[flying]|opponentBattlefield) damage:2 opponent

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

@@ -895,17 +895,6 @@ text=Target creature gets +1/+1 until end of turn. That creature gets an additio
 rarity=C
 [/card]
 [card]
-id=24585
-name=Windscouter
-mana={3}{U}
-type=Creature
-subtype=Human Scout
-power=3
-toughness=3
-text=Flying Whenever Windscouter attacks or blocks, return it to its owner's hand at end of combat.
-rarity=U
-[/card]
-[card]
 id=23318
 name=Wintermoon Mesa
 mana=

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

@@ -244,6 +244,32 @@ power=1
 toughness=1
 [/card]
 [card]
+text=Whenever Charging Bandits attacks, it gets +2/+0 until end of turn.
+id=4212
+name=Charging Bandits
+rarity=U
+mana={4}{B}
+type=Creature
+subtype=Human Rogue
+auto=lord(charging paladin[attacking]|myBattlefield) 2/0
+auto=lord(other charging paladin[attacking]|myBattlefield) -2/0
+power=3
+toughness=3
+[/card]
+[card]
+text=Whenever Charging Paladin attacks, it gets +0/+3 until end of turn.
+id=4379
+name=Charging Paladin
+auto=lord(charging paladin[attacking]|myBattlefield) 0/3
+auto=lord(other charging paladin[attacking]|myBattlefield) 0/-3
+rarity=U
+mana={2}{W}
+type=Creature
+subtype=Human Knight
+power=2
+toughness=2
+[/card]
+[card]
 text=Target creature gains flying until end of turn.   Draw a card.
 id=4251
 target=creature

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

@@ -36,29 +36,6 @@ type=Sorcery
 mana={3}{U}{U}
 [/card]
 [card]
-text=Whenever Charging Bandits attacks, it gets +2/+0 until end of turn.
-id=4212
-name=Charging Bandits
-rarity=U
-type=Creature
-mana={4}{B}
-power=3
-subtype=Human Rogue
-toughness=3
-[/card]
-[card]
-text=Whenever Charging Paladin attacks, it gets +0/+3 until end of turn.
-id=4379
-name=Charging Paladin
-auto=lord(creature[Charging Paladin;attacking]|myinplay) 0/3
-rarity=U
-type=Creature
-mana={2}{W}
-power=2
-subtype=Human Knight
-toughness=2
-[/card]
-[card]
 text=Charging Rhino can't be blocked by more than one creature.
 id=4291
 name=Charging Rhino

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

@@ -738,6 +738,19 @@ toughness=2
 abilities=horsemanship
 [/card]
 [card]
+text=Whenever Shu Defender blocks, it gets +0/+2 until end of turn.
+id=10624
+name=Shu Defender
+rarity=C
+mana={2}{W}
+type=Creature
+subtype=Human Soldier
+auto=lord(shu defender[blocking]|mybattlefield) 0/2
+auto=lord(other shu defender[blocking]|mybattlefield) 0/-2
+power=2
+toughness=2
+[/card]
+[card]
 text=Horsemanship (This creature can't be blocked except by creatures with horsemanship.)
 id=10497
 name=Shu Elite Companions
@@ -1036,6 +1049,19 @@ power=1
 toughness=2
 [/card]
 [card]
+text=Whenever Wei Ambush Force attacks, it gets +2/+0 until end of turn.
+id=10557
+name=Wei Ambush Force
+rarity=C
+mana={1}{B}
+type=Creature
+subtype=Human Soldier
+auto=lord(wei ambush force[attacking]|mybattlefield) 2/0
+auto=lord(other wei ambush force[attacking]|mybattlefield) -2/0
+power=1
+toughness=1
+[/card]
+[card]
 text=Horsemanship (This creature can't be blocked except by creatures with horsemanship.)
 id=10511
 name=Wei Elite Companions
@@ -1269,7 +1295,7 @@ rarity=R
 mana={3}{B}{B}
 type=Legendary Creature
 subtype=Human Soldier
-auto=aslongas(zhang he wei general[attacking]|myBattlefield) lord(creature other|myBattlefield) 0/1
+auto=aslongas(zhang he wei general[attacking]|myBattlefield) lord(creature[-zhang he wei general]|myBattlefield) 0/1
 power=4
 toughness=2
 abilities=horsemanship
@@ -1283,7 +1309,7 @@ rarity=R
 mana={3}{W}{W}
 type=Legendary Creature
 subtype=Human Soldier Warrior
-auto=aslongas(zhao zilong tiger general[blocking]|myBattlefield) lord(zhao zilong tiger general[blocking]|myBattlefield) 1/1
+auto=lord(zhao zilong tiger general[blocking]|myBattlefield) 1/1
 power=3
 toughness=3
 auto=horsemanship

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

@@ -269,17 +269,6 @@ text=Target creature gets +2/+2 and gains horsemanship. (It can't be blocked exc
 rarity=U
 [/card]
 [card]
-id=10624
-name=Shu Defender
-mana={2}{W}
-type=Creature
-subtype=Human Soldier
-power=2
-toughness=2
-text=Whenever Shu Defender blocks, it gets +0/+2 until end of turn.
-rarity=C
-[/card]
-[card]
 id=10591
 name=Slashing Tiger
 mana={2}{G}{G}
@@ -345,17 +334,6 @@ text=Cast Warrior's Stand only during the declare attackers step and only if you
 rarity=U
 [/card]
 [card]
-id=10557
-name=Wei Ambush Force
-mana={1}{B}
-type=Creature
-subtype=Human Soldier
-power=1
-toughness=1
-text=Whenever Wei Ambush Force attacks, it gets +2/+0 until end of turn.
-rarity=C
-[/card]
-[card]
 id=10583
 name=Wei Assassins
 mana={3}{B}{B}

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

@@ -651,6 +651,20 @@ mana={6}{G}
 type=Sorcery
 [/card]
 [card]
+text=Trample   Whenever Hungry Spriggan attacks, it gets +3/+3 until end of turn.
+id=153997
+name=Hungry Spriggan
+rarity=C
+mana={2}{G}
+type=Creature
+subtype=Goblin Warrior
+auto=lord(hungry spriggan[attacking]|mybattlefield) 3/3
+auto=lord(other hungry spriggan[attacking]|mybattlefield) -3/-3
+power=1
+toughness=1
+abilities=trample
+[/card]
+[card]
 text=Inkfathom Infiltrator can't block and is unblockable.
 id=154401
 name=Inkfathom Infiltrator
@@ -1596,6 +1610,18 @@ toughness=4
 abilities=cantattack
 [/card]
 [card]
+text=Whenever Wicker Warcrawler attacks or blocks, put a -1/-1 counter on it at end of combat.
+id=154410
+name=Wicker Warcrawler
+rarity=U
+mana={5}
+type=Artifact Creature
+subtype=Scarecrow
+auto=@each combatends:counter(-1/-1) all(wicker warcrawler[attacking;blocking]|myBattlefield) && counter(1/1) all(other wicker warcrawler[attacking;blocking]|myBattlefield)
+power=6
+toughness=6
+[/card]
+[card]
 text=Wither (This deals damage to creatures in the form of -1/-1 counters.)
 id=135436
 name=Wildslayer Elves

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

@@ -522,20 +522,6 @@ power=*
 subtype=Goblin
 toughness=*
 [/card]
-#works but will also give 3/3 to all ungry spriggan in myinplay if attacking
-[card]
-text=Trample     Whenever Hungry Spriggan attacks, it gets +3/+3 until end of turn.
-id=153997
-abilities=trample
-auto=aslongas(Hungry Spriggan[attacking]|myinplay) 3/3
-name=Hungry Spriggan
-rarity=C
-type=Creature
-mana={2}{G}
-power=1
-subtype=Goblin Warrior
-toughness=1
-[/card]
 [card]
 text={1}, {T}, Reveal two cards from your hand that share a color: Draw a card.
 id=146040
@@ -1430,17 +1416,6 @@ mana={GW}{GW}
 subtype=Aura
 [/card]
 [card]
-text=Whenever Wicker Warcrawler attacks or blocks, put a -1/-1 counter on it at end of combat.
-id=154410
-name=Wicker Warcrawler
-rarity=U
-type=Artifact Creature
-mana={5}
-power=6
-subtype=Scarecrow
-toughness=6
-[/card]
-[card]
 text=Choose three target nonenchantment permanents. Destroy one of them at random.
 id=158686
 name=Wild Swing

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

@@ -1844,6 +1844,20 @@ toughness=1
 abilities=shadow,protection from red
 [/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
+name=Soltari Trooper
+rarity=C
+mana={1}{W}
+type=Creature
+subtype=Soltari Soldier
+auto=lord(soltari trooper[attacking]|mybattlefield) 1/1
+auto=lord(other soltari trooper[attacking]|mybattlefield) -1/-1
+power=1
+toughness=1
+abilities=shadow
+[/card]
+[card]
 text=Pay 3 life: Put a +1/+1 counter on Souldrinker.
 id=4687
 name=Souldrinker

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

@@ -963,7 +963,6 @@ type=Land
 text=First strike      Whenever Renegade Warlord attacks, each other attacking creature gets +1/+0 until end of turn.
 id=4839
 name=Renegade Warlord
-auto=aslongas(this[attacking]|myBattlefield):lord(creature[attacking]) 1/0 other
 rarity=U
 type=Creature
 mana={4}{R}
@@ -1132,19 +1131,6 @@ subtype=Soltari Soldier
 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
-abilities=shadow
-name=Soltari Trooper
-rarity=C
-type=Creature
-mana={1}{W}
-power=1
-subtype=Soltari Soldier
-toughness=1
-[/card]
-[card]
 text=Spike Drone comes into play with a +1/+1 counter on it.     {2}, Remove a +1/+1 counter from Spike Drone: Put a +1/+1 counter on target creature.
 id=4792
 name=Spike Drone

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

@@ -182,6 +182,20 @@ mana={1}{U}{U}
 type=Instant
 [/card]
 [card]
+text=Flying   As long as Castle Raptors is untapped, it gets +0/+2.
+id=113614
+name=Castle Raptors
+rarity=C
+mana={4}{W}
+type=Creature
+subtype=Bird Soldier
+auto=lord(castle raptors[-tapped]) 0/2
+auto=lord(other castle raptors[-tapped]) 0/-2
+power=3
+toughness=3
+abilities=flying
+[/card]
+[card]
 text={1}, {T}, Sacrifice Chromatic Star: Add one mana of any color to your mana pool. When Chromatic Star is put into a graveyard from the battlefield, draw a card.
 id=118891
 name=Chromatic Star

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

@@ -121,17 +121,6 @@ text=Target player draws four cards, then discards three cards. If you played th
 rarity=U
 [/card]
 [card]
-id=113614
-name=Castle Raptors
-mana={4}{W}
-type=Creature
-subtype=Bird Soldier
-power=3
-toughness=3
-text=Flying As long as Castle Raptors is untapped, it gets +0/+2.
-rarity=C
-[/card]
-[card]
 id=108903
 name=Cavalry Master
 mana={2}{W}{W}

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

@@ -633,6 +633,20 @@ mana={3}{B}{B}
 type=Enchantment
 [/card]
 [card]
+text=Flying   Whenever Sustainer of the Realm blocks, it gets +0/+2 until end of turn.
+id=12814
+name=Sustainer of the Realm
+rarity=U
+mana={2}{W}{W}
+type=Creature
+subtype=Angel
+auto=lord(sustainer of the realm[blocking]|mybattlefield) 0/2
+auto=lord(other sustainer of the realm[blocking]|mybattlefield) 0/-2
+power=2
+toughness=3
+abilities=flying
+[/card]
+[card]
 text=Destroy target creature with power 2 or less.   Cycling {2} ({2}, Discard this card: Draw a card.)
 id=9694
 target=creature[power<=2]

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

@@ -523,17 +523,6 @@ text=Spawning Pool enters the battlefield tapped. {T}: Add {B} to your mana pool
 rarity=U
 [/card]
 [card]
-id=12814
-name=Sustainer of the Realm
-mana={2}{W}{W}
-type=Creature
-subtype=Angel
-power=2
-toughness=3
-text=Flying Whenever Sustainer of the Realm blocks, it gets +0/+2 until end of turn.
-rarity=U
-[/card]
-[card]
 id=9840
 name=Tethered Skirge
 mana={2}{B}

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

@@ -873,6 +873,19 @@ mana={2}{U}
 type=Instant
 [/card]
 [card]
+text=Whenever Hollow Dogs attacks, it gets +2/+0 until end of turn.
+id=5606
+name=Hollow Dogs
+rarity=C
+mana={4}{B}
+type=Creature
+subtype=Zombie Hound
+auto=lord(hollow dogs[attacking]|mybattlefield) 2/0
+auto=lord(other hollow dogs[attacking]|mybattlefield) -2/0
+power=3
+toughness=3
+[/card]
+[card]
 text={0}: Hopping Automaton gets -1/-1 and gains flying until end of turn.
 id=5700
 name=Hopping Automaton
@@ -1287,6 +1300,20 @@ mana={B}
 type=Instant
 [/card]
 [card]
+text=Flying   Whenever Ravenous Skirge attacks, it gets +2/+0 until end of turn.
+id=9720
+name=Ravenous Skirge
+rarity=C
+mana={2}{B}
+type=Creature
+subtype=Imp
+auto=lord(ravenous skirge[attacking]|mybattlefield) 2/0
+auto=lord(other ravenous skirge[attacking]|mybattlefield) -2/0
+power=1
+toughness=1
+abilities=flying
+[/card]
+[card]
 text=At the beginning of your upkeep, if you control another nonland permanent, sacrifice Reclusive Wight.
 auto=@each my upkeep:aslongas(other *[-land]|mybattlefield) bury
 id=8803
@@ -1621,9 +1648,9 @@ toughness=2
 [/card]
 [card]
 text=Target player draws X cards.
+id=5677
 target=player
 auto=draw:X
-id=5677
 name=Stroke of Genius
 rarity=R
 mana={X}{2}{U}
@@ -1742,26 +1769,40 @@ toughness=2
 [/card]
 [card]
 text={B}: Regenerate Unworthy Dead.
-auto={B}:regenerate
 id=5780
 name=Unworthy Dead
 rarity=C
 mana={1}{B}
 type=Creature
 subtype=Skeleton
+auto={B}:regenerate
 power=1
 toughness=1
 [/card]
 [card]
-text=Enchant creature. Enchanted creature has deathtouch. (Whenever it deals damage to a creature, destroy that creature.)
+text=Vebulid enters the battlefield with a +1/+1 counter on it.   At the beginning of your upkeep, you may put a +1/+1 counter on Vebulid.   When Vebulid attacks or blocks, destroy it at end of combat.
+id=5688
+name=Vebulid
+rarity=R
+mana={B}
+type=Creature
+subtype=Horror
+auto=counter(1/1)
+auto=@each my upkeep:may counter(1/1)
+auto=@each combatends:destroy all(vebuild[attacking;blocking]|myBattlefield)
+power=0
+toughness=0
+[/card]
+[card]
+text=Enchant creature   Enchanted creature has deathtouch. (Whenever it deals damage to a creature, destroy that creature.)
 id=8908
-name=Venomous Fangs
 target=creature
 auto=deathtouch
-type=Enchantment
+name=Venomous Fangs
-mana={2}{G}
-subtype=Aura
 rarity=C
+mana={2}{G}
+type=Enchantment
+subtype=Aura
 [/card]
 [card]
 text=Whenever Viashino Weaponsmith becomes blocked, it gets +2/+2 until end of turn for each creature blocking it.
@@ -1809,6 +1850,19 @@ mana={1}
 type=Artifact
 [/card]
 [card]
+text=Defender (This creature can't attack.)   Whenever Wall of Junk blocks, return it to its owner's hand at end of combat.
+id=8871
+name=Wall of Junk
+rarity=U
+mana={2}
+type=Artifact Creature
+subtype=Wall
+auto=@each combatends:moveTo(ownerhand) all(wall of junk[blocking])
+power=0
+toughness=7
+abilities=defender
+[/card]
+[card]
 text={B}{B}, {T}: Destroy target white creature. 
 id=5861
 name=Western Paladin

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

@@ -592,17 +592,6 @@ type=Enchantment
 mana={1}{G}
 [/card]
 [card]
-text=Whenever Hollow Dogs attacks, it gets +2/+0 until end of turn.
-id=5606
-name=Hollow Dogs
-rarity=C
-type=Creature
-mana={4}{B}
-power=3
-subtype=Zombie Hound
-toughness=3
-[/card]
-[card]
 text=Target creature loses all abilities and becomes 0/1 until end of turn.
 id=5702
 name=Humble
@@ -943,17 +932,6 @@ type=Sorcery
 mana={4}{R}{R}
 [/card]
 [card]
-text=Flying     Whenever Ravenous Skirge attacks, it gets +2/+0 until end of turn.
-id=9720
-name=Ravenous Skirge
-rarity=C
-type=Creature
-mana={2}{B}
-power=1
-subtype=Imp
-toughness=1
-[/card]
-[card]
 text=As an additional cost to play Raze, sacrifice a land.       Destroy target land.
 id=5544
 name=Raze
@@ -1360,17 +1338,6 @@ mana={2}{B}{B}
 subtype=Aura
 [/card]
 [card]
-text=Vebulid comes into play with a +1/+1 counter on it.     At the beginning of your upkeep, you may put a +1/+1 counter on Vebulid.     When Vebulid attacks or blocks, destroy it at end of combat.
-id=5688
-name=Vebulid
-rarity=R
-type=Creature
-mana={B}
-power=0
-subtype=Horror
-toughness=0
-[/card]
-[card]
 text=When an opponent plays a spell, if Veil of Birds is an enchantment, Veil of Birds becomes a 1/1 Bird creature with flying.
 id=5788
 name=Veil of Birds
@@ -1479,17 +1446,6 @@ subtype=Lizard
 toughness=4
 [/card]
 [card]
-text=Defender (This creature can't attack.)  Whenever Wall of Junk blocks, return it to its owner's hand at end of combat.
-id=8871
-name=Wall of Junk
-rarity=U
-type=Artifact Creature
-mana={2}
-power=0
-subtype=Wall
-toughness=7
-[/card]
-[card]
 text=At the beginning of your upkeep, you may put a verse counter on War Dance.       Sacrifice War Dance: Target creature gets +X/+X until end of turn, where X is the number of verse counters on War Dance.
 id=5689
 name=War Dance

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

@@ -128,6 +128,18 @@ power=5
 toughness=3
 [/card]
 [card]
+text=Defender (This creature can't attack.)   When Cinder Wall blocks, destroy it at end of combat.
+id=4540
+name=Cinder Wall
+rarity=C
+mana={R}
+type=Creature
+subtype=Wall
+auto=@each combatends:destroy all(cinder wall[attacking;blocking]|myBattlefield)
+power=3
+toughness=3
+[/card]
+[card]
 text=Flying   Cloud Djinn can block only creatures with flying.
 id=4482
 name=Cloud Djinn

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

@@ -239,17 +239,6 @@ text=Cast Choking Vines only during the declare blockers step. X target attackin
 rarity=C
 [/card]
 [card]
-id=4540
-name=Cinder Wall
-mana={R}
-type=Creature
-subtype=Wall
-power=3
-toughness=3
-text=Defender (This creature can't attack.) When Cinder Wall blocks, destroy it at end of combat.
-rarity=C
-[/card]
-[card]
 id=4452
 name=Circling Vultures
 mana={B}
@@ -392,17 +381,6 @@ text=Each player discards any number of cards, then draws that many cards. Draw
 rarity=U
 [/card]
 [card]
-id=4486
-name=Fog Elemental
-mana={2}{U}
-type=Creature
-subtype=Elemental
-power=4
-toughness=4
-text=Flying (This creature can't be blocked except by creatures with flying or reach.) When Fog Elemental attacks or blocks, sacrifice it at end of combat.
-rarity=U
-[/card]
-[card]
 id=4576
 name=Foriysian Brigade
 mana={3}{W}