Added huge amount of successfully tested cards, mainly based on revision 1685.

The new introduced "must" also works with "@movedTo..." events (Fire Snake (POR) for example)!

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

@@ -63,6 +63,18 @@ power=7
 toughness=3
 [/card]
 [card]
+text=Whenever you cast a Spirit or Arcane spell, put a +1/+1 counter on target creature.
+name=Briarknit Kami
+id=74163
+rarity=U
+mana={3}{G}{G}
+type=Creature
+subtype=Spirit
+auto=@movedto(arcane,spirit|mystack):counter(1/1) target(creature)
+power=3
+toughness=3
+[/card]
+[card]
 text={R}: Target creature gets +1/+0 until end of turn.
 id=88810
 auto={R}:1/0 target(creature)
@@ -141,7 +153,6 @@ toughness=3
 [card]
 text=Gaze of Adamaro deals damage equal to the number of cards in target player's hand to that player.
 id=89401
-
 target=player
 alias=129750
 name=Gaze of Adamaro
@@ -295,16 +306,30 @@ mana={B}{B}
 type=Sorcery
 [/card]
 [card]
+text=When Kiri-Onna enters the battlefield, return target creature to its owner's hand.   Whenever you cast a Spirit or Arcane spell, you may return Kiri-Onna to its owner's hand.
+name=Kiri-Onna
+id=84704
+name=Kiri-Onna
+mana={4}{U}
+type=Creature
+subtype=Spirit
+auto=moveTo(ownerhand) target(creature)
+auto=@movedto(arcane,spirit|mystack):may moveTo(ownerhand)
+power=2
+toughness=2
+rarity=U
+[/card]
+[card]
 text={1}{W}: Kitsune Loreweaver gets +0/+X until end of turn, where X is the number of cards in your hand.
-name=Kitsune Loreweaver
 id=74213
+name=Kitsune Loreweaver
+rarity=C
 mana={1}{W}
-auto={1}{W}:foreach(*|myhand)0/1
 type=Creature
 subtype=Fox Cleric
+auto={1}{W}:foreach(*|myhand) 0/1
 power=2
 toughness=1
-rarity=C
 [/card]
 [card]
 text=Masumaro, First to Live's power and toughness are each equal to twice the number of cards in your hand.
@@ -362,6 +387,19 @@ power=6
 toughness=4
 [/card]
 [card]
+text=When Nikko-Onna enters the battlefield, destroy target enchantment. Whenever you cast a Spirit or Arcane spell, you may return Nikko-Onna to its owner's hand.
+id=84639
+name=Nikko-Onna
+rarity=U
+mana={2}{W}
+type=Creature
+subtype=Spirit
+auto=destroy target(enchantment)
+auto=@movedto(arcane,spirit|mystack):may moveTo(ownerhand)
+power=2
+toughness=2
+[/card]
+[card]
 text={T}: Add {U} to your mana pool.   {1}: Return Oboro, Palace in the Clouds to its owner's hand.
 id=74206
 name=Oboro, Palace in the Clouds
@@ -595,4 +633,17 @@ auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(ot
 power=3
 toughness=3
 abilities=vigilance
+[/card]
+[card]
+text=When Yuki-Onna enters the battlefield, destroy target artifact. Whenever you cast a Spirit or Arcane spell, you may return Yuki-Onna to its owner's hand.
+id=84712
+name=Yuki-Onna
+rarity=U
+mana={3}{R}
+type=Creature
+subtype=Spirit
+auto=destroy target(artifact)
+auto=@movedto(arcane,spirit|mystack):may moveto(ownerhand)
+power=3
+toughness=1
 [/card]

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

@@ -70,19 +70,6 @@ toughness=4
 rarity=R
 [/card]
 [card]
-text=Whenever you cast a Spirit or Arcane spell, put a +1/+1 counter on target creature.
-name=Briarknit Kami
-id=74163
-mana={3}{G}{G}
-#target does not work in @ auto line, unless there is a may
-auto=@movedto(arcane,spirit|mystack):counter(1/1,1) target(creature)
-type=Creature
-subtype=Spirit
-power=3
-toughness=3
-rarity=U
-[/card]
-[card]
 text=When Burning-Eye Zubera is put into a graveyard from the battlefield, if 4 or more damage was dealt to it this turn, Burning-Eye Zubera deals 3 damage to target creature or player.
 name=Burning-Eye Zubera
 id=50234
@@ -590,18 +577,6 @@ toughness=3
 rarity=U
 [/card]
 [card]
-text=When Kiri-Onna enters the battlefield, return target creature to its owner's hand. Whenever you cast a Spirit or Arcane spell, you may return Kiri-Onna to its owner's hand.
-name=Kiri-Onna
-id=84704
-mana={4}{U}
-auto=@movedto(arcane,spirit|mystack):
-type=Creature
-subtype=Spirit
-power=2
-toughness=2
-rarity=U
-[/card]
-[card]
 text={T}: Prevent the next 3 damage that would be dealt to target creature this turn. Activate this ability only if you have more cards in hand than each opponent.
 name=Kitsune Bonesetter
 id=74046
@@ -791,18 +766,6 @@ type=Sorcery
 rarity=R
 [/card]
 [card]
-text=When Nikko-Onna enters the battlefield, destroy target enchantment. Whenever you cast a Spirit or Arcane spell, you may return Nikko-Onna to its owner's hand.
-name=Nikko-Onna
-id=84639
-mana={2}{W}
-auto=@movedto(arcane,spirit|mystack):
-type=Creature
-subtype=Spirit
-power=2
-toughness=2
-rarity=U
-[/card]
-[card]
 text=Flying {2}, Return a land you control to its owner's hand: Untap target land.
 name=Oboro Breezecaller
 id=88784
@@ -1201,16 +1164,4 @@ id=74130
 mana={3}
 type=Artifact
 rarity=R
-[/card]
-[card]
-text=When Yuki-Onna enters the battlefield, destroy target artifact. Whenever you cast a Spirit or Arcane spell, you may return Yuki-Onna to its owner's hand.
-name=Yuki-Onna
-id=84712
-mana={3}{R}
-auto=@movedto(arcane,spirit|mystack):may moveto(ownerhand)
-type=Creature
-subtype=Spirit
-power=3
-toughness=1
-rarity=U
 [/card]