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