several card fixes

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

@@ -146,7 +146,7 @@ toughness=3
 [card]
 text=Flying     {1}{W}{B}, {T}: Destroy target creature or enchantment.     {2}{U}: Untap Ethersworn Adjudicator.
 abilities=flying
-auto={1}{W}{B},{T}:destroy target(creature,enchantment)
+auto={1}{W}{B}{T}:destroy target(creature,enchantment)
 auto={2}{U}:untap
 id=175035
 name=Ethersworn Adjudicator
@@ -182,7 +182,7 @@ toughness=2
 [/card]
 [card]
 text=Islandwalk, trample, shroud
-abilities=Islandwalk, trample, shroud
+abilities=islandwalk,trample,shroud
 id=154081
 name=Inkwell Leviathan
 rarity=R
@@ -211,7 +211,7 @@ toughness=*
 [card]
 text=When Kaleidostone comes into play, draw a card.     {5}, {T}, Sacrifice Kaleidostone: Add {W}{U}{B}{R}{G} to your mana pool.
 auto=draw:1
-auto={5},{T},{S}:Add {W}{U}{B}{R}{G}
+auto={5}{T}{S}:Add {W}{U}{B}{R}{G}
 id=189272
 name=Kaleidostone
 rarity=C
@@ -244,11 +244,11 @@ toughness=2
 [/card]
 [card]
 text={1}, {T}: Add one mana of any color to your mana pool.
-auto={1},{T}: Add {G}
+auto={1}{T}: Add {G}
-auto={1},{T}: Add {R}
+auto={1}{T}: Add {R}
-auto={1},{T}: Add {B}
+auto={1}{T}: Add {B}
-auto={1},{T}: Add {U}
+auto={1}{T}: Add {U}
-auto={1},{T}: Add {W}
+auto={1}{T}: Add {W}
 id=189269
 name=Mana Cylix
 rarity=C
@@ -258,7 +258,7 @@ mana={1}
 [card]
 text=Enchant creature     Enchanted creature gets +2/+2 and can't block.
 target=creature
-auto=2/2
+auto=:2/2
 auto=cantblock
 id=182609
 name=Maniacal Rage
@@ -321,8 +321,8 @@ mana={6}
 [/card]
 [card]
 text=Haste     {R}, {T}: Put a 3/1 red Elemental creature token with haste into play.
-abilities=haste, Legendary 
+abilities=haste,legendary 
-auto={R},{T}:token(Elemental,creature, 3/1,haste red)
+auto={R}{T}:token(Elemental,creature, 3/1,haste red)
 id=185810
 name=Rakka Mar
 rarity=R
@@ -347,7 +347,7 @@ toughness=3
 [/card]
 [card]
 text={R}{W}, {T}: Sacellum Archers deals 2 damage to target attacking or blocking creature.
-auto={R}{W},{T}:damage:2 target(creature[attacking;blocking])
+auto={R}{W}{T}:damage:2 target(creature[attacking;blocking])
 id=179488
 name=Sacellum Archers
 rarity=U
@@ -380,7 +380,7 @@ mana={1}{W}{W}
 [/card]
 [card]
 text={3}{U}, {T}: Draw a card.
-auto={3}{U},{T}:Draw:1
+auto={3}{U}{T}:Draw:1
 id=184989
 name=Scepter of Insight
 rarity=R

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

@@ -389,7 +389,7 @@ toughness=2
 [/card]
 [card]
 text=Swampwalk, forestwalk
-abilities=Swampwalk, forestwalk
+abilities=swampwalk,forestwalk
 id=151120
 name=Stalker Hag
 rarity=U
@@ -401,7 +401,7 @@ toughness=2
 [/card]
 [card]
 text=Protection from white and from black     {WB}: Stillmoon Cavalier gains flying until end of turn.     {WB}: Stillmoon Cavalier gains first strike until end of turn.     {WB}{WB}: Stillmoon Cavalier gets +1/+0 until end of turn.
-abilities=protection from black, protection from white
+abilities=protection from black,protection from white
 auto={WB}:flying
 auto={WB}:first strike
 auto={WB}{WB}:+1/+0
@@ -522,4 +522,4 @@ mana={GU}{GU}{GU}
 power=2
 subtype=Merfolk Wizard
 toughness=2
-[/card]
+[/card]

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

@@ -45,7 +45,7 @@ toughness=2
 [/card]
 [card]
 text={W}, {T}: Tap target artifact.
-auto={W},{T}:tap target(artifact)
+auto={W}{T}:tap target(artifact)
 id=45963
 name=Auriok Transfixer
 color=White
@@ -144,7 +144,7 @@ text=Destroy target artifact. Then add {G}{G}{G} to your mana pool.
 id=49060
 target=artifact
 auto=destroy
-auto=:Add {G}{G}{G}
+auto=Add:{G}{G}{G}
 name=Deconstruct
 color=Green
 rarity=C
@@ -174,7 +174,7 @@ type=Creature
 subtype=Zombie
 power=2
 toughness=1
-abilities=Fear
+abilities=fear
 [/card]
 [card]
 text={1}{G}, Sacrifice Elf Replica: Destroy target enchantment.
@@ -297,7 +297,7 @@ type=Creature
 subtype=Goblin Berserker
 power=1
 toughness=1
-abilities=First strike, haste
+abilities=first strike,haste
 [/card]
 [card]
 text={T}: Add {W} to your mana pool.
@@ -430,7 +430,7 @@ type=Creature
 subtype=Cat Knight
 power=2
 toughness=2
-abilities=Flying
+abilities=flying
 [/card]
 [card]
 text=Flying When Looming Hoverguard comes into play, put target artifact on top of its owner's library.
@@ -579,7 +579,7 @@ rarity=U
 [card]
 text=Flying. Nim Shrieker gets +1/+0 for each artifact you control.
 id=48584
-abilities=Flying
+abilities=flying
 name=Nim Shrieker
 auto=foreach(artifact|myinplay) 1/0
 mana={3}{B}
@@ -621,7 +621,7 @@ type=Artifact Creature
 subtype=Thopter
 power=0
 toughness=2
-abilities=Flying
+abilities=flying
 [/card]
 [card]
 text={1}{B}: Regenerate Pewter Golem.
@@ -676,7 +676,7 @@ subtype=Plains
 text=Target creature gets +3/+3 and gains trample until end of turn.
 id=48595
 target=creature
-auto=:trample
+auto=trample
 auto=:3/3
 name=Predator's Strike
 color=Green
@@ -708,8 +708,8 @@ type=Instant
 [card]
 text=Return target permanent to its owner's hand.
 id=49061
-alias=1229
 target=*
+auto=moveTo(ownerhand)
 name=Regress
 color=Blue
 rarity=C
@@ -719,7 +719,7 @@ type=Instant
 [card]
 text=Add {R}{R}{R}{R}{R} to your mana pool.
 id=34945
-auto=Add {R}{R}{R}{R}{R}
+auto=Add:{R}{R}{R}{R}{R}
 name=Seething Song
 color=Red
 rarity=C
@@ -772,7 +772,7 @@ type=Creature
 subtype=Cat Knight
 power=2
 toughness=3
-abilities=Flying, first strike
+abilities=flying,first strike
 [/card]
 [card]
 text={1}{W}, Sacrifice Soldier Replica: Soldier Replica deals 3 damage to target attacking or blocking creature.
@@ -1010,5 +1010,5 @@ type=Artifact Creature
 subtype=Soldier
 power=1
 toughness=4
-abilities=Vigilance
+abilities=vigilance
 [/card]

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

@@ -54,7 +54,7 @@ abilities=defender
 [card]
 text=Flying   Battle Squadron's power and toughness are each equal to the number of creatures you control.
 id=19712
-auto=foreach(creature|myinplay) 1/1 includeself
+auto=foreach(creature|myinplay) 1/1
 name=Battle Squadron
 color=Red
 rarity=R
@@ -615,7 +615,7 @@ toughness=2
 [/card]
 [card]
 text=Creatures you control have fear.
-auto=lord(creature|myinplay) fear includeself
+auto=lord(creature|myinplay) fear
 id=19833
 name=Intimidation
 color=Black
@@ -745,12 +745,12 @@ rarity=U
 mana={2}{G}{G}
 type=Creature
 subtype=Satyr Beast
-auto=lord(creature) forestwalk includeself
+auto=lord(creature) forestwalk
 power=5
 toughness=4
 [/card]
 [card]
-text=Flash      Enchant creature        Enchanted creature gets +2/-2.
+text=Flash    Enchant creature     Enchanted creature gets +2/-2.
 id=19594
 target=creature
 auto=:2/-2
@@ -1130,7 +1130,7 @@ type=Sorcery
 text=When Strongarm Thug comes into play, you may return target Mercenary card from your graveyard to your hand.
 id=19689
 name=Strongarm Thug
-auto=may moveto(myhand) target(Mercenary|mygraveyard)
+auto=may moveto(myhand) target(mercenary|mygraveyard)
 rarity=U
 type=Creature
 mana={2}{B}
@@ -1358,4 +1358,4 @@ type=Creature
 subtype=Cat
 power=3
 toughness=3
-[/card]
+[/card]

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

@@ -90,7 +90,7 @@ text=Flying. {2}{W}{T}: Aven Archer deals 2 damage to target attacking or blocki
 id=29691
 name=Aven Archer
 abilities=flying 
-auto={2}{W}{T}:damage:2 target(Creature[attacking;blocking])
+auto={2}{W}{T}:damage:2 target(creature[attacking;blocking])
 mana={3}{W}{W}
 type=Creature
 subtype=Bird Soldier
@@ -158,7 +158,7 @@ name=Barbarian Lunatic
 mana={2}{R}
 type=Creature
 subtype=Human Barbarian
-auto={2}{R}{S}:damage:2 target(Creature)
+auto={2}{R}{S}:damage:2 target(creature)
 power=2
 toughness=1
 rarity=C
@@ -168,7 +168,7 @@ text=Other creatures you control get +0/+1.
 id=29688
 name=Blessed Orator
 mana={3}{W}
-auto=lord(Creature|myinplay) 0/1 other
+auto=lord(creature|myinplay) 0/1 other
 type=Creature
 subtype=Human Cleric
 power=1
@@ -297,7 +297,7 @@ id=31771
 name=Dedicated Martyr
 mana={W}
 color=white
-auto={W}{S}: life:3
+auto={W}{S}:life:3
 type=Creature
 subtype=Cleric
 power=1
@@ -311,7 +311,7 @@ name=Demolish
 target=artifact,land
 auto=destroy
 mana={3}{R}
-color=red
+color=Red
 type=Sorcery
 rarity=U
 [/card]
@@ -643,11 +643,11 @@ text=Sacrifice an artifact: Lithatog gets +1/+1 until end of turn. Sacrifice a l
 id=31770
 name=Lithatog
 mana={1}{R}{G}
-color=red,green
+color=Red,Green
 type=Creature
 subtype=Atog
-auto={s(artifact|myinplay)}: 1/1
+auto={s(artifact|myinplay)}:1/1
-auto={s(land|myinplay)}: 1/1
+auto={s(land|myinplay)}:1/1
 power=1
 toughness=2
 rarity=U
@@ -680,7 +680,7 @@ id=30560
 name=Malevolent Awakening
 mana={1}{B}{B}
 color=black
-auto={1}{B}{B}{S(Creature|myinplay)}:moveTo(myhand) target(creature|mygraveyard)
+auto={1}{B}{B}{S(creature|myinplay)}:moveTo(myhand) target(creature|mygraveyard)
 type=Enchantment
 rarity=U
 [/card]
@@ -909,7 +909,7 @@ text=Enchanted creature has trample.
 id=31812
 name=Primal Frenzy
 target=Creature
-auto=:trample
+auto=trample
 mana={G}
 color=green
 type=Enchantment
@@ -1194,7 +1194,7 @@ text=Sacrifice a land: Thaumatog gets +1/+1 until end of turn. Sacrifice an ench
 id=31835
 name=Thaumatog
 mana={1}{G}{W}
-color=green,white
+color=Green,White
 type=Creature
 subtype=Atog
 auto={s(land|myinplay)}:1/1
@@ -1271,7 +1271,7 @@ name=Whispering Shade
 abilities=swampwalk
 auto={B}:1/1
 mana={3}{B}
-color=black
+color=Black
 type=Creature
 subtype=Shade
 power=1
@@ -1283,7 +1283,7 @@ text=
 id=29772
 name=Woodland Druid
 mana={G}
-color=green
+color=Green
 type=Creature
 subtype=Human Druid
 power=1
@@ -1297,7 +1297,7 @@ name=Zombify
 target=creature|mygraveyard
 auto=moveTo(myinplay)
 mana={3}{B}
-color=black
+color=Black
 type=Sorcery
 rarity=U
 [/card]