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/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}