From 55cbdec5c6b3787041612ec16036112266c38412 Mon Sep 17 00:00:00 2001
From: "wagic.laurent" <wagic.laurent@01922e74-a4c3-11dd-a5cd-697bfd0a0cef>
Date: Fri, 11 Dec 2009 17:29:25 +0000
Subject: [PATCH] Laurent - Update HML (finally). Was a pain(bis) because of
 the duplicated card. Note that 6 cards in this set could be added by
 implementing @blocked trigger : Folk of An-Havva (*2), Ghost Hound, Rashka
 the Slayer, Root Spider, Serra Inquisitors. See Todo.dat

---
 projects/mtg/bin/Res/sets/HML/_cards.dat | 802 +++++++++++++++++++++++
 projects/mtg/bin/Res/sets/HML/todo.dat   | 686 +++++--------------
 2 files changed, 950 insertions(+), 538 deletions(-)

diff --git a/projects/mtg/bin/Res/sets/HML/_cards.dat b/projects/mtg/bin/Res/sets/HML/_cards.dat
index 3e3ae8fa6..d9418e168 100644
--- a/projects/mtg/bin/Res/sets/HML/_cards.dat
+++ b/projects/mtg/bin/Res/sets/HML/_cards.dat
@@ -10,3 +10,805 @@ text=Flying, protection from red
 abilities=Flying, protection from red
 rarity=U
 [/card]
+[card]
+id=3011
+name=Abbey Matron
+mana={2}{W}
+type=Creature
+subtype=Human Cleric
+power=1
+toughness=3
+text={W}, {T}: Abbey Matron gets +0/+3 until end of turn.
+auto={W}{T}:0/3
+rarity=C
+[/card]
+[card]
+id=3012
+name=Abbey Matron
+mana={2}{W}
+type=Creature
+subtype=Human Cleric
+power=1
+toughness=3
+text={W}, {T}: Abbey Matron gets +0/+3 until end of turn.
+auto={W}{T}:0/3
+rarity=C
+[/card]
+[card]
+id=2985
+name=Aliban's Tower
+mana={1}{R}
+type=Instant
+text=Target blocking creature gets +3/+1 until end of turn.
+target=creature[blocking]
+auto=3/1
+rarity=C
+[/card]
+[card]
+id=2986
+name=Aliban's Tower
+mana={1}{R}
+type=Instant
+text=Target blocking creature gets +3/+1 until end of turn.
+target=creature[blocking]
+auto=3/1
+rarity=C
+[/card]
+[card]
+id=2987
+name=Ambush
+mana={3}{R}
+type=Instant
+text=Blocking creatures gain first strike until end of turn.
+auto=lord(creature[blocking]) first strike
+rarity=C
+[/card]
+[card]
+id=2988
+name=Ambush Party
+mana={4}{R}
+type=Creature
+subtype=Human Rogue
+power=3
+toughness=1
+text=First strike, haste
+abilities=first strike,haste
+rarity=C
+[/card]
+[card]
+id=2989
+name=Ambush Party
+mana={4}{R}
+type=Creature
+subtype=Human Rogue
+power=3
+toughness=1
+text=First strike, haste
+abilities=first strike,haste
+rarity=C
+[/card]
+[card]
+id=2991
+name=Anaba Ancestor
+mana={1}{R}
+type=Creature
+subtype=Minotaur Spirit
+power=1
+toughness=1
+text={T}: Another target Minotaur creature gets +1/+1 until end of turn.
+auto={T}:1/1 target(minotaur other)
+rarity=R
+[/card]
+[card]
+id=2993
+name=Anaba Bodyguard
+mana={3}{R}
+type=Creature
+subtype=Minotaur
+power=2
+toughness=3
+text=First strike (This creature deals combat damage before creatures without first strike.)
+abilities=first strike
+rarity=C
+[/card]
+[card]
+id=2994
+name=Anaba Shaman
+mana={3}{R}
+type=Creature
+subtype=Minotaur Shaman
+power=2
+toughness=2
+text={R}, {T}: Anaba Shaman deals 1 damage to target creature or player.
+auto={R}{T}:damage:1 target(creature,player)
+rarity=C
+[/card]
+[card]
+id=2995
+name=Anaba Shaman
+mana={3}{R}
+type=Creature
+subtype=Minotaur Shaman
+power=2
+toughness=2
+text={R}, {T}: Anaba Shaman deals 1 damage to target creature or player.
+auto={R}{T}:damage:1 target(creature,player)
+rarity=C
+[/card]
+[card]
+id=2996
+name=Anaba Spirit Crafter
+mana={2}{R}{R}
+type=Creature
+subtype=Minotaur Shaman
+power=1
+toughness=3
+text=Minotaur creatures get +1/+0.
+auto=lord(minotaur)1/0
+rarity=R
+[/card]
+[card]
+id=2960
+name=An-Havva Constable
+mana={1}{G}{G}
+type=Creature
+subtype=Human
+power=2
+toughness=1+*
+text=An-Havva Constable's toughness is equal to 1 plus the number of green creatures on the battlefield.
+auto=foreach(creature[green]|battlefield)0/1
+rarity=R
+[/card]
+[card]
+id=2961
+name=An-Havva Inn
+mana={1}{G}{G}
+type=Sorcery
+text=You gain X plus 1 life, where X is the number of green creatures on the battlefield.
+auto=foreach(creature[green]|battlefield)life:1 controller
+auto=life:1 controller
+rarity=U
+[/card]
+[card]
+id=3035
+name=An-Havva Township
+type=Land
+text={T}: Add {1} to your mana pool.  {1}, {T}: Add {G} to your mana pool.  {2}, {T}: Add {R} or {W} to your mana pool.
+auto={T}:add{1}
+auto={1}{T}:add{G}
+auto={2}{T}:add{R}
+auto={2}{T}:add{W}
+rarity=U
+[/card]
+[card]
+id=2962
+name=Autumn Willow
+mana={4}{G}{G}
+type=Creature
+subtype=Avatar
+power=4
+toughness=4
+text=Shroud {G}: Until end of turn, Autumn Willow can be the target of spells and abilities controlled by target player as though it didn't have shroud.
+abilities=opponentshroud,shroud,legendary
+auto={G}:-shroud
+#Slightly borderline assumption you will never activate this ability to let the opponent target Autumn Willow
+rarity=R
+[/card]
+[card]
+id=3036
+name=Aysen Abbey
+type=Land
+text={T}: Add {1} to your mana pool.  {1}, {T}: Add {W} to your mana pool.  {2}, {T}: Add {G} or {U} to your mana pool.
+auto={T}:add{1}
+auto={1}{T}:add{W}
+auto={2}{T}:add{G}
+auto={2}{T}:add{U}
+rarity=U
+[/card]
+[card]
+id=3015
+name=Aysen Crusader
+mana={2}{W}{W}
+type=Creature
+subtype=Human Knight
+power=2+*
+toughness=2+*
+text=Aysen Crusader's power and toughness are each equal to 2 plus the number of Soldiers and Warriors you control.
+auto=foreach(soldier|myBattlefield)1/1
+auto=foreach(warrior|myBattlefield)1/1
+rarity=U
+[/card]
+[card]
+id=3016
+name=Aysen Highway
+mana={3}{W}{W}{W}
+type=Enchantment
+text=White creatures have plainswalk.
+auto=lord(creature[white])plainswalk
+rarity=R
+[/card]
+[card]
+id=2911
+name=Black Carriage
+mana={3}{B}{B}
+type=Creature
+subtype=Horse
+power=4
+toughness=4
+text=Trample Black Carriage doesn't untap during your untap step. Sacrifice a creature: Untap Black Carriage. Activate this ability only during your upkeep.
+abilities=trample,doesnotuntap
+auto={S(creature|myBattlefield)}:untap myturnonly
+#not 100% correct same as brass man, colossus of sardia, etc.
+rarity=R
+[/card]
+[card]
+id=2963
+name=Carapace
+mana={G}
+type=Enchantment
+subtype=Aura
+text=Enchant creature Enchanted creature gets +0/+2. Sacrifice Carapace: Regenerate enchanted creature.
+target=creature
+auto=0/2
+auto={S}:regenerate
+rarity=C
+[/card]
+[card]
+id=2964
+name=Carapace
+mana={G}
+type=Enchantment
+subtype=Aura
+text=Enchant creature Enchanted creature gets +0/+2. Sacrifice Carapace: Regenerate enchanted creature.
+target=creature
+auto=0/2
+auto={S}:regenerate
+rarity=C
+[/card]
+[card]
+id=3037
+name=Castle Sengir
+type=Land
+text={T}: Add {1} to your mana pool.  {1}, {T}: Add {B} to your mana pool.  {2}, {T}: Add {U} or {R} to your mana pool.
+rarity=U
+auto={T}:add{1}
+auto={1}{T}:add{B}
+auto={2}{T}:add{U}
+auto={2}{T}:add{R}
+[/card]
+[card]
+id=2913
+name=Cemetery Gate
+mana={2}{B}
+type=Creature
+subtype=Wall
+power=0
+toughness=5
+text=Defender (This creature can't attack.) Protection from black
+abilities=defender,protection from black
+rarity=C
+[/card]
+[card]
+id=2914
+name=Cemetery Gate
+mana={2}{B}
+type=Creature
+subtype=Wall
+power=0
+toughness=5
+text=Defender (This creature can't attack.) Protection from black
+abilities=defender,protection from black
+rarity=C
+[/card]
+[card]
+id=2997
+name=Chandler
+mana={4}{R}
+type=Creature
+subtype=Human Rogue
+power=3
+toughness=3
+text={R}{R}{R}, {T}: Destroy target artifact creature.
+abilities=legendary
+auto={R}{R}{R}{T}:destroy target(creature[artifact])
+rarity=C
+[/card]
+[card]
+id=2901
+name=Clockwork Gnomes
+mana={4}
+type=Artifact Creature
+subtype=Gnome
+power=2
+toughness=2
+text={3}, {T}: Regenerate target artifact creature.
+auto={3}{T}:regenerate target(creature[artifact])
+rarity=C
+[/card]
+[card]
+id=3018
+name=Death Speakers
+mana={W}
+type=Creature
+subtype=Human Cleric
+power=1
+toughness=1
+text=Protection from black
+abilities=protection from black
+rarity=U
+[/card]
+[card]
+id=2904
+name=Didgeridoo
+mana={1}
+type=Artifact
+text={3}: You may put a Minotaur permanent card from your hand onto the battlefield.
+auto={3}:moveTo(myBattlefield) target(minotaur|myhand)
+rarity=U
+[/card]
+[card]
+text=Dry Spell deals 1 damage to each creature and each player.
+id=2916
+name=Dry Spell
+rarity=C
+type=Sorcery
+mana={1}{B}
+auto=damage:1 all(creature,player)
+[/card]
+[card]
+text=Dry Spell deals 1 damage to each creature and each player.
+id=2917
+name=Dry Spell
+rarity=C
+type=Sorcery
+mana={1}{B}
+auto=damage:1 all(creature,player)
+[/card]
+[card]
+id=2998
+name=Dwarven Pony
+mana={R}
+type=Creature
+subtype=Horse
+power=1
+toughness=1
+text={1}{R}, {T}: Target Dwarf creature gains mountainwalk until end of turn.
+auto={1}{R}{T}:mountainwalk target(dwarf)
+rarity=R
+[/card]
+[card]
+text= 
+id=3000
+name=Dwarven Trader
+rarity=C
+type=Creature
+subtype=Dwarf
+mana={R}
+power=1
+toughness=1
+[/card]
+[card]
+text= 
+id=3001
+name=Dwarven Trader
+rarity=C
+type=Creature
+subtype=Dwarf
+mana={R}
+power=1
+toughness=1
+[/card]
+[card]
+id=2905
+name=Ebony Rhino
+mana={7}
+type=Artifact Creature
+subtype=Rhino
+power=4
+toughness=5
+text=Trample
+abilities=trample
+rarity=C
+[/card]
+[card]
+id=3002
+name=Eron the Relentless
+mana={3}{R}{R}
+type=Creature
+subtype=Human Rogue
+power=5
+toughness=2
+text=Haste {R}{R}{R}: Regenerate Eron the Relentless.
+abilities=legendary,haste
+auto={R}{R}{R}:regenerate
+rarity=U
+[/card]
+[card]
+id=3003
+name=Evaporate
+mana={2}{R}
+type=Sorcery
+text=Evaporate deals 1 damage to each creature that's white or blue.
+auto=damage:1 all(creature[white;blue])
+rarity=U
+[/card]
+[card]
+id=2966
+name=Faerie Noble
+mana={2}{G}
+type=Creature
+subtype=Faerie
+power=1
+toughness=2
+text=Flying Other Faerie creatures you control get +0/+1. {T}: Other Faerie creatures you control get +1/+0 until end of turn.
+auto=lord(faerie other|myBattlefield) 0/1
+auto={T}:lord((faerie other|myBattlefield) 1/0
+abilities=flying
+rarity=U
+[/card]
+[card]
+id=2918
+name=Feast of the Unicorn
+mana={3}{B}
+type=Enchantment
+subtype=Aura
+text=Enchant creature Enchanted creature gets +4/+0.
+target=creature
+auto=4/0
+rarity=C
+[/card]
+[card]
+id=2919
+name=Feast of the Unicorn
+mana={3}{B}
+type=Enchantment
+subtype=Aura
+text=Enchant creature Enchanted creature gets +4/+0.
+target=creature
+auto=4/0
+rarity=C
+[/card]
+[card]
+id=2922
+name=Grandmother Sengir
+mana={4}{B}
+type=Creature
+subtype=Human Wizard
+power=3
+toughness=3
+text={1}{B}, {T}: Target creature gets -1/-1 until end of turn.
+abilities=legendary
+auto={1}{B}{T}:-1/-1 target(creature)
+rarity=R
+[/card]
+[card]
+id=2924
+name=Headstone
+mana={1}{B}
+type=Instant
+text=Exile target card from a graveyard. Draw a card at the beginning of the next turn's upkeep.
+target=*|graveyard
+auto=moveto(exile)
+auto=@next upkeep:draw:1 controller
+rarity=C
+[/card]
+[card]
+id=2925
+name=Ihsan's Shade
+mana={3}{B}{B}{B}
+type=Creature
+subtype=Shade Knight
+power=5
+toughness=5
+text=Protection from white
+abilities=legendary,protection from white
+rarity=U
+[/card]
+[card]
+id=3006
+name=Joven
+mana={3}{R}{R}
+type=Creature
+subtype=Human Rogue
+power=3
+toughness=3
+text={R}{R}{R}, {T}: Destroy target noncreature artifact.
+abilities=legendary
+auto={R}{R}{R}{T}:destroy target(artifact[-creature])
+rarity=C
+[/card]
+[card]
+id=3038
+name=Koskun Keep
+type=Land
+text={T}: Add {1} to your mana pool.  {1}, {T}: Add {R} to your mana pool.  {2}, {T}: Add {B} or {G} to your mana pool.
+auto={T}:add{1}
+auto={1}{T}:add{R}
+auto={2}{T}:add{B}
+auto={2}{T}:add{G}
+rarity=U
+[/card]
+[card]
+id=2972
+name=Leaping Lizard
+mana={1}{G}{G}
+type=Creature
+subtype=Lizard
+power=2
+toughness=3
+text={1}{G}: Leaping Lizard gains flying and gets -0/-1 until end of turn.
+auto={1}{G}:flying && 0/-1
+rarity=C
+[/card]
+[card]
+id=2951
+name=Merchant Scroll
+mana={1}{U}
+type=Sorcery
+text=Search your library for a blue instant card, reveal that card, and put it into your hand. Then shuffle your library.
+target=instant[blue]|mylibrary
+auto=moveTo(myhand)
+#Does not reveal but the AI don't care
+rarity=U
+[/card]
+[card]
+id=3021
+name=Mesa Falcon
+mana={1}{W}
+type=Creature
+subtype=Bird
+power=1
+toughness=1
+text=Flying {1}{W}: Mesa Falcon gets +0/+1 until end of turn.
+abilities=flying
+auto={1}{W}:0/1
+rarity=C
+[/card]
+[card]
+id=3022
+name=Mesa Falcon
+mana={1}{W}
+type=Creature
+subtype=Bird
+power=1
+toughness=1
+text=Flying {1}{W}: Mesa Falcon gets +0/+1 until end of turn.
+abilities=flying
+auto={1}{W}:0/1
+rarity=C
+[/card]
+[card]
+id=2952
+name=Mystic Decree
+mana={2}{U}{U}
+type=Enchantment
+subtype=World
+text=All creatures lose flying and islandwalk.
+auto=lord(creature) -islandwalk
+auto=lord(creature) -flying
+rarity=R
+[/card]
+[card]
+id=2953
+name=Narwhal
+mana={2}{U}{U}
+type=Creature
+subtype=Whale
+power=2
+toughness=2
+text=First strike, protection from red
+abilities=first strike,protection from red
+rarity=U
+[/card]
+[card]
+id=2974
+name=Primal Order
+mana={2}{G}{G}
+type=Enchantment
+text=At the beginning of each player's upkeep, Primal Order deals damage to that player equal to the number of nonbasic lands he or she controls.
+auto=@each my upkeep:foreach(land[-basic]|myBattlefield):damage:1 controller
+auto=@each opponent upkeep:foreach(land[-basic]|opponentBattlefield):damage:1 opponent
+rarity=R
+[/card]
+[card]
+id=2954
+name=Reef Pirates
+mana={1}{U}{U}
+type=Creature
+subtype=Zombie Pirate
+power=2
+toughness=2
+text=Whenever Reef Pirates deals damage to an opponent, that player puts the top card of his or her library into his or her graveyard.
+auto=@damaged(player) from(this):deplete:1 opponent
+rarity=C
+[/card]
+[card]
+id=2955
+name=Reef Pirates
+mana={1}{U}{U}
+type=Creature
+subtype=Zombie Pirate
+power=2
+toughness=2
+text=Whenever Reef Pirates deals damage to an opponent, that player puts the top card of his or her library into his or her graveyard.
+auto=@damaged(player) from(this):deplete:1 opponent
+rarity=C
+[/card]
+[card]
+id=2977
+name=Roots
+mana={3}{G}
+type=Enchantment
+subtype=Aura
+text=Enchant creature without flying When Roots enters the battlefield, tap enchanted creature. Enchanted creature doesn't untap during its controller's untap step.
+target=creature[-flying]
+auto=tap
+auto=doesnotuntap
+rarity=U
+[/card]
+[card]
+id=2908
+name=Roterothopter
+mana={1}
+type=Artifact Creature
+subtype=Thopter
+power=0
+toughness=2
+text=Flying {2}: Roterothopter gets +1/+0 until end of turn. Activate this ability no more than twice each turn.
+abilities=flying
+auto={2}:2/0 limit:2
+rarity=C
+[/card]
+[card]
+id=2957
+name=Sea Sprite
+mana={1}{U}
+type=Creature
+subtype=Faerie
+power=1
+toughness=1
+text=Flying, protection from red
+abilities=flying,protection from red
+rarity=U
+[/card]
+[card]
+id=2928
+name=Sengir Autocrat
+mana={3}{B}
+type=Creature
+subtype=Human
+power=2
+toughness=2
+text=When Sengir Autocrat enters the battlefield, put three 0/1 black Serf creature tokens onto the battlefield. When Sengir Autocrat leaves the battlefield, exile all Serf tokens.
+auto=token(Serf,creature serf,0/1,black)*3
+auto=@movedTo(this|graveyard):moveTo(exile) all(serf)
+auto=@movedTo(this|exile):moveTo(exile) all(serf)
+auto=@movedTo(this|ownerhand:moveTo(exile) all(serf)
+rarity=U
+[/card]
+[card]
+id=3027
+name=Serra Aviary
+mana={3}{W}
+type=Enchantment
+subtype=World
+text=Creatures with flying get +1/+1.
+auto=lord(creature[flying]) 1/1
+rarity=R
+[/card]
+[card]
+id=2979
+name=Shrink
+mana={G}
+type=Instant
+text=Target creature gets -5/-0 until end of turn.
+target=creature
+auto=-5/0
+rarity=C
+[/card]
+[card]
+id=2980
+name=Shrink
+mana={G}
+type=Instant
+text=Target creature gets -5/-0 until end of turn.
+target=creature
+auto=-5/0
+rarity=C
+[/card]
+[card]
+id=2932
+name=Torture
+mana={B}
+type=Enchantment
+subtype=Aura
+text=Enchant creature {1}{B}: Put a -1/-1 counter on enchanted creature.
+target=creature
+auto={1}{B}:counter(-1/-1)
+rarity=C
+[/card]
+[card]
+id=2933
+name=Torture
+mana={B}
+type=Enchantment
+subtype=Aura
+text=Enchant creature {1}{B}: Put a -1/-1 counter on enchanted creature.
+target=creature
+auto={1}{B}:counter(-1/-1)
+rarity=C
+[/card]
+[card]
+id=2934
+name=Veldrane of Sengir
+mana={5}{B}{B}
+type=Legendary Creature
+subtype=Human Rogue
+power=5
+toughness=5
+text={1}{B}{B}: Veldrane of Sengir gets -3/-0 and gains forestwalk until end of turn.
+abilities=legendary
+auto={1}{B}{B}:-3/0 && forestwalk
+rarity=R
+[/card]
+[card]
+id=2959
+name=Wall of Kelp
+mana={U}{U}
+type=Creature
+subtype=Plant Wall
+power=0
+toughness=3
+text=Defender (This creature can't attack.) {U}{U}, {T}: Put a 0/1 blue Plant Wall creature token with defender named Kelp onto the battlefield.
+abilities=defender
+auto={U}{U}{T}:token(Kelp,creature plant wall,0/1,defender blue)
+rarity=R
+[/card]
+[card]
+id=2982
+name=Willow Faerie
+mana={1}{G}
+type=Creature
+subtype=Faerie
+power=1
+toughness=2
+text=Flying
+abilities=flying
+rarity=C
+[/card]
+[card]
+id=2983
+name=Willow Faerie
+mana={1}{G}
+type=Creature
+subtype=Faerie
+power=1
+toughness=2
+text=Flying
+abilities=flying
+rarity=C
+[/card]
+[card]
+id=2984
+name=Willow Priestess
+mana={2}{G}{G}
+type=Creature
+subtype=Faerie Druid
+power=2
+toughness=2
+text={T}: You may put a Faerie permanent card from your hand onto the battlefield. {2}{G}: Target green creature gains protection from black until end of turn.
+auto={T}:moveTo(myBattlefield) target(faerie|myhand)
+auto={2}{G}:protection from black target(creature[green])
+rarity=U
+[/card]
+[card]
+id=3039
+name=Wizards' School
+type=Land
+text={T}: Add {1} to your mana pool.  {1}, {T}: Add {U} to your mana pool.  {2}, {T}: Add {W} or {B} to your mana pool.
+auto={T}:add {1}
+auto={1}{T}:add {U}
+auto={2}{T}:add {W}
+auto={2}{T}:add {B}
+rarity=U
+[/card]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/sets/HML/todo.dat b/projects/mtg/bin/Res/sets/HML/todo.dat
index 57ec91511..0865ef9c3 100644
--- a/projects/mtg/bin/Res/sets/HML/todo.dat
+++ b/projects/mtg/bin/Res/sets/HML/todo.dat
@@ -1,119 +1,9 @@
-
-[card]
-id=3012
-name=Abbey Matron
-mana={2}{W}
-type=Creature
-subtype=Human Cleric
-power=1
-toughness=3
-text={W}, {T}: Abbey Matron gets +0/+3 until end of turn.
-rarity=C
-[/card]
-[card]
+[card]
 id=2935
-name=ÁEher Storm
+name=Aether Storm
 mana={3}{U}
 type=Enchantment
-text=Creature spells can't be cast. Pay 4 life: Destroy ÁEher Storm. It can't be regenerated. Any player may activate this ability.
-rarity=U
-[/card]
-[card]
-id=2986
-name=Aliban's Tower
-mana={1}{R}
-type=Instant
-text=Target blocking creature gets +3/+1 until end of turn.
-rarity=C
-[/card]
-[card]
-id=2987
-name=Ambush
-mana={3}{R}
-type=Instant
-text=Blocking creatures gain first strike until end of turn.
-rarity=C
-[/card]
-[card]
-id=2989
-name=Ambush Party
-mana={4}{R}
-type=Creature
-subtype=Human Rogue
-power=3
-toughness=1
-text=First strike, haste
-rarity=C
-[/card]
-[card]
-id=2991
-name=Anaba Ancestor
-mana={1}{R}
-type=Creature
-subtype=Minotaur Spirit
-power=1
-toughness=1
-text={T}: Another target Minotaur creature gets +1/+1 until end of turn.
-rarity=R
-[/card]
-[card]
-id=2993
-name=Anaba Bodyguard
-mana={3}{R}
-type=Creature
-subtype=Minotaur
-power=2
-toughness=3
-text=First strike (This creature deals combat damage before creatures without first strike.)
-rarity=C
-[/card]
-[card]
-id=2995
-name=Anaba Shaman
-mana={3}{R}
-type=Creature
-subtype=Minotaur Shaman
-power=2
-toughness=2
-text={R}, {T}: Anaba Shaman deals 1 damage to target creature or player.
-rarity=C
-[/card]
-[card]
-id=2996
-name=Anaba Spirit Crafter
-mana={2}{R}{R}
-type=Creature
-subtype=Minotaur Shaman
-power=1
-toughness=3
-text=Minotaur creatures get +1/+0.
-rarity=R
-[/card]
-[card]
-id=2960
-name=An-Havva Constable
-mana={1}{G}{G}
-type=Creature
-subtype=Human
-power=2
-toughness=1+*
-text=An-Havva Constable's toughness is equal to 1 plus the number of green creatures on the battlefield.
-rarity=R
-[/card]
-[card]
-id=2961
-name=An-Havva Inn
-mana={1}{G}{G}
-type=Sorcery
-text=You gain X plus 1 life, where X is the number of green creatures on the battlefield.
-rarity=U
-[/card]
-[card]
-id=3035
-name=An-Havva Township
-mana=
-type=Land
-text={T}: Add {1} to your mana pool.  {1}, {T}: Add {G} to your mana pool.  {2}, {T}: Add {R} or {W} to your mana pool.
+text=Creature spells can't be cast. Pay 4 life: Destroy Aether Storm. It can't be regenerated. Any player may activate this ability.
 rarity=U
 [/card]
 [card]
@@ -133,25 +23,6 @@ text={2}, {T}, Sacrifice Apocalypse Chime: Destroy all nontoken permanents from
 rarity=R
 [/card]
 [card]
-id=2962
-name=Autumn Willow
-mana={4}{G}{G}
-type=Legendary Creature
-subtype=Avatar
-power=4
-toughness=4
-text=Shroud {G}: Until end of turn, Autumn Willow can be the target of spells and abilities controlled by target player as though it didn't have shroud.
-rarity=R
-[/card]
-[card]
-id=3036
-name=Aysen Abbey
-mana=
-type=Land
-text={T}: Add {1} to your mana pool.  {1}, {T}: Add {W} to your mana pool.  {2}, {T}: Add {G} or {U} to your mana pool.
-rarity=U
-[/card]
-[card]
 id=3014
 name=Aysen Bureaucrats
 mana={1}{W}
@@ -163,25 +34,6 @@ text={T}: Tap target creature with power 2 or less.
 rarity=C
 [/card]
 [card]
-id=3015
-name=Aysen Crusader
-mana={2}{W}{W}
-type=Creature
-subtype=Human Knight
-power=2+*
-toughness=2+*
-text=Aysen Crusader's power and toughness are each equal to 2 plus the number of Soldiers and Warriors you control.
-rarity=U
-[/card]
-[card]
-id=3016
-name=Aysen Highway
-mana={3}{W}{W}{W}
-type=Enchantment
-text=White creatures have plainswalk.
-rarity=R
-[/card]
-[card]
 id=2936
 name=Baki's Curse
 mana={2}{U}{U}
@@ -211,54 +63,21 @@ 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]
-id=2911
-name=Black Carriage
-mana={3}{B}{B}
-type=Creature
-subtype=Horse
-power=4
-toughness=4
-text=Trample Black Carriage doesn't untap during your untap step. Sacrifice a creature: Untap Black Carriage. Activate this ability only during your upkeep.
-rarity=R
-[/card]
-[card]
+#require testing
 id=2912
 name=Broken Visage
 mana={4}{B}
 type=Instant
 text=Destroy target nonartifact attacking creature. It can't be regenerated. Put a black Spirit creature token with that creature's power and toughness onto the battlefield. Sacrifice the token at the beginning of the next end step.
+target=creature[attacking,-artifact]
+auto=bury
+auto=token(Spirit,Creature Spirit ofielskdh,p/t,black)
+auto=@next end:destroy all(ofielskdh)
 rarity=U
 [/card]
 [card]
-id=2964
-name=Carapace
-mana={G}
-type=Enchantment
-subtype=Aura
-text=Enchant creature Enchanted creature gets +0/+2. Sacrifice Carapace: Regenerate enchanted creature.
-rarity=C
-[/card]
-[card]
-id=3037
-name=Castle Sengir
-mana=
-type=Land
-text={T}: Add {1} to your mana pool.  {1}, {T}: Add {B} to your mana pool.  {2}, {T}: Add {U} or {R} to your mana pool.
-rarity=U
-[/card]
-[card]
-id=2914
-name=Cemetery Gate
-mana={2}{B}
-type=Creature
-subtype=Wall
-power=0
-toughness=5
-text=Defender (This creature can't attack.) Protection from black
-rarity=C
-[/card]
-[card]
 id=2937
 name=Chain Stasis
 mana={U}
@@ -267,28 +86,6 @@ text=You may tap or untap target creature. Then that creature's controller may p
 rarity=R
 [/card]
 [card]
-id=2997
-name=Chandler
-mana={4}{R}
-type=Legendary Creature
-subtype=Human Rogue
-power=3
-toughness=3
-text={R}{R}{R}, {T}: Destroy target artifact creature.
-rarity=C
-[/card]
-[card]
-id=2901
-name=Clockwork Gnomes
-mana={4}
-type=Artifact Creature
-subtype=Gnome
-power=2
-toughness=2
-text={3}, {T}: Regenerate target artifact creature.
-rarity=C
-[/card]
-[card]
 id=2902
 name=Clockwork Steed
 mana={4}
@@ -297,6 +94,9 @@ subtype=Horse
 power=0
 toughness=3
 text=Clockwork Steed enters the battlefield with four +1/+0 counters on it. Clockwork Steed can't be blocked by artifact creatures. At end of combat, if Clockwork Steed attacked or blocked this combat, remove a +1/+0 counter from it. {X}, {T}: Put up to X +1/+0 counters on Clockwork Steed. This ability can't cause the total number of +1/+0 counters on Clockwork Steed to be greater than four. Activate this ability only during your upkeep.
+#not 100% correct all this Clockwork cards could be hardcoded
+auto=counter(1/0,-3)
+alias=1101
 rarity=U
 [/card]
 [card]
@@ -319,6 +119,19 @@ text=Coral Reef enters the battlefield with four polyp counters on it. Sacrifice
 rarity=C
 [/card]
 [card]
+id=2939
+name=Dark Maze
+mana={4}{U}
+type=Creature
+subtype=Wall
+power=4
+toughness=5
+text=Defender (This creature can't attack.) {0}: Dark Maze can attack this turn as though it didn't have defender.  Exile it at the beginning of the next end step.
+abilities=defender
+auto={0}:defender && @next end:moveto(exile)
+rarity=C
+[/card]
+[card]
 id=2940
 name=Dark Maze
 mana={4}{U}
@@ -327,39 +140,23 @@ subtype=Wall
 power=4
 toughness=5
 text=Defender (This creature can't attack.) {0}: Dark Maze can attack this turn as though it didn't have defender.  Exile it at the beginning of the next end step.
+abilities=defender
+auto={0}:defender && @next end:moveto(exile)
 rarity=C
 [/card]
 [card]
 id=2965
 name=Daughter of Autumn
 mana={2}{G}{G}
-type=Legendary Creature
+type=Creature
 subtype=Avatar
 power=2
 toughness=4
 text={W}: The next 1 damage that would be dealt to target white creature this turn is dealt to Daughter of Autumn instead.
+abilities=legendary
 rarity=R
 [/card]
 [card]
-id=3018
-name=Death Speakers
-mana={W}
-type=Creature
-subtype=Human Cleric
-power=1
-toughness=1
-text=Protection from black
-rarity=U
-[/card]
-[card]
-id=2904
-name=Didgeridoo
-mana={1}
-type=Artifact
-text={3}: You may put a Minotaur permanent card from your hand onto the battlefield.
-rarity=U
-[/card]
-[card]
 id=2915
 name=Drudge Spell
 mana={B}{B}
@@ -368,25 +165,6 @@ text={B}, Exile two creature cards from your graveyard: Put a 1/1 black Skeleton
 rarity=U
 [/card]
 [card]
-id=2917
-name=Dry Spell
-mana={1}{B}
-type=Sorcery
-text=Dry Spell deals 1 damage to each creature and each player.
-rarity=U
-[/card]
-[card]
-id=2998
-name=Dwarven Pony
-mana={R}
-type=Creature
-subtype=Horse
-power=1
-toughness=1
-text={1}{R}, {T}: Target Dwarf creature gains mountainwalk until end of turn.
-rarity=R
-[/card]
-[card]
 id=2999
 name=Dwarven Sea Clan
 mana={2}{R}
@@ -398,66 +176,6 @@ text={T}: Choose target attacking or blocking creature whose controller controls
 rarity=R
 [/card]
 [card]
-id=3001
-name=Dwarven Trader
-mana={R}
-type=Creature
-subtype=Dwarf
-power=1
-toughness=1
-rarity=C
-[/card]
-[card]
-id=2905
-name=Ebony Rhino
-mana={7}
-type=Artifact Creature
-subtype=Rhino
-power=4
-toughness=5
-text=Trample
-rarity=C
-[/card]
-[card]
-id=3002
-name=Eron the Relentless
-mana={3}{R}{R}
-type=Legendary Creature
-subtype=Human Rogue
-power=5
-toughness=2
-text=Haste {R}{R}{R}: Regenerate Eron the Relentless.
-rarity=U
-[/card]
-[card]
-id=3003
-name=Evaporate
-mana={2}{R}
-type=Sorcery
-text=Evaporate deals 1 damage to each creature that's white or blue.
-rarity=U
-[/card]
-[card]
-id=2966
-name=Faerie Noble
-mana={2}{G}
-type=Creature
-subtype=Faerie
-power=1
-toughness=2
-text=Flying Other Faerie creatures you control get +0/+1. {T}: Other Faerie creatures you control get +1/+0 until end of turn.
-rarity=U
-[/card]
-[card]
-id=2919
-name=Feast of the Unicorn
-mana={3}{B}
-type=Enchantment
-subtype=Aura
-text=Enchant creature Enchanted creature gets +4/+0.
-rarity=C
-[/card]
-[card]
 id=2906
 name=Feroz's Ban
 mana={6}
@@ -466,6 +184,20 @@ 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}
@@ -474,6 +206,9 @@ 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]
@@ -482,6 +217,9 @@ name=Forget
 mana={U}{U}
 type=Sorcery
 text=Target player discards two cards, then draws as many cards as he or she discarded this way.
+target=player
+auto=discard:2
+auto=draw:2
 rarity=R
 [/card]
 [card]
@@ -491,6 +229,7 @@ mana={1}{B}{B}
 type=Enchantment
 subtype=Aura
 text=Enchant creature When enchanted creature leaves the battlefield, its controller sacrifices a creature.
+target=creature
 rarity=C
 [/card]
 [card]
@@ -502,9 +241,23 @@ subtype=Hound Spirit
 power=1
 toughness=1
 text=Vigilance Whenever Ghost Hounds blocks or becomes blocked by a white creature, Ghost Hounds gains first strike until end of turn.
+auto=@blocked(this) from(creature[white]):first strike
+auto=@blocked(creature[white]) from(this):first strike
 rarity=U
 [/card]
 [card]
+id=2942
+name=Giant Albatross
+mana={1}{U}
+type=Creature
+subtype=Bird
+power=1
+toughness=1
+text=Flying When Giant Albatross is put into a graveyard from the battlefield, you may pay {1}{U}. If you do, for each creature that dealt damage to Giant Albatross this turn, destroy that creature unless its controller pays 2 life. A creature destroyed this way can't be regenerated.
+auto=@movedto(this|graveyard) from(battlefield):may 
+rarity=C
+[/card]
+[card]
 id=2943
 name=Giant Albatross
 mana={1}{U}
@@ -513,6 +266,7 @@ subtype=Bird
 power=1
 toughness=1
 text=Flying When Giant Albatross is put into a graveyard from the battlefield, you may pay {1}{U}. If you do, for each creature that dealt damage to Giant Albatross this turn, destroy that creature unless its controller pays 2 life. A creature destroyed this way can't be regenerated.
+auto=@movedto(this|graveyard) from(battlefield):may 
 rarity=C
 [/card]
 [card]
@@ -527,17 +281,6 @@ text=You may choose not to untap Giant Oyster during your untap step. {T}: For a
 rarity=U
 [/card]
 [card]
-id=2922
-name=Grandmother Sengir
-mana={4}{B}
-type=Legendary Creature
-subtype=Human Wizard
-power=3
-toughness=3
-text={1}{B}, {T}: Target creature gets -1/-1 until end of turn.
-rarity=R
-[/card]
-[card]
 id=2923
 name=Greater Werewolf
 mana={4}{B}
@@ -560,14 +303,6 @@ text={X}, {T}: The next X damage that would be dealt this turn to target white c
 rarity=R
 [/card]
 [card]
-id=2924
-name=Headstone
-mana={1}{B}
-type=Instant
-text=Exile target card from a graveyard. Draw a card at the beginning of the next turn's upkeep.
-rarity=C
-[/card]
-[card]
 id=3004
 name=Heart Wolf
 mana={3}{R}
@@ -579,6 +314,17 @@ text=First strike {T}: Target Dwarf creature gets +2/+0 and gains first strike u
 rarity=R
 [/card]
 [card]
+id=2969
+name=Hungry Mist
+mana={2}{G}{G}
+type=Creature
+subtype=Elemental
+power=6
+toughness=2
+text=At the beginning of your upkeep, sacrifice Hungry Mist unless you pay {G}{G}.
+rarity=C
+[/card]
+[card]
 id=2970
 name=Hungry Mist
 mana={2}{G}{G}
@@ -590,25 +336,15 @@ text=At the beginning of your upkeep, sacrifice Hungry Mist unless you pay {G}{G
 rarity=C
 [/card]
 [card]
-id=2925
-name=Ihsan's Shade
-mana={3}{B}{B}{B}
-type=Legendary Creature
-subtype=Shade Knight
-power=5
-toughness=5
-text=Protection from white
-rarity=U
-[/card]
-[card]
 id=2926
 name=Irini Sengir
 mana={2}{B}{B}
-type=Legendary Creature
+type=Creature
 subtype=Vampire Dwarf
 power=2
 toughness=2
 text=White enchantment spells and green enchantment spells cost {2} more to cast.
+abilities=legendary
 rarity=U
 [/card]
 [card]
@@ -626,17 +362,8 @@ name=Jinx
 mana={1}{U}
 type=Instant
 text=Target land becomes the basic land type of your choice until end of turn. Draw a card at the beginning of the next turn's upkeep.
-rarity=C
-[/card]
-[card]
-id=3006
-name=Joven
-mana={3}{R}{R}
-type=Legendary Creature
-subtype=Human Rogue
-power=3
-toughness=3
-text={R}{R}{R}, {T}: Destroy target noncreature artifact.
+target=land
+auto=@next upkeep:draw:1 controller
 rarity=C
 [/card]
 [card]
@@ -667,15 +394,7 @@ text=At the beginning of your upkeep, sacrifice Koskun Falls unless you tap an u
 rarity=R
 [/card]
 [card]
-id=3038
-name=Koskun Keep
-mana=
-type=Land
-text={T}: Add {1} to your mana pool.  {1}, {T}: Add {R} to your mana pool.  {2}, {T}: Add {B} or {G} to your mana pool.
-rarity=U
-[/card]
-[card]
-id=2947
+id=2946
 name=Labyrinth Minotaur
 mana={3}{U}
 type=Creature
@@ -686,14 +405,14 @@ text=Whenever Labyrinth Minotaur blocks a creature, that creature doesn't untap
 rarity=C
 [/card]
 [card]
-id=2972
-name=Leaping Lizard
-mana={1}{G}{G}
+id=2947
+name=Labyrinth Minotaur
+mana={3}{U}
 type=Creature
-subtype=Lizard
-power=2
-toughness=3
-text={1}{G}: Leaping Lizard gains flying and gets -0/-1 until end of turn.
+subtype=Minotaur
+power=1
+toughness=4
+text=Whenever Labyrinth Minotaur blocks a creature, that creature doesn't untap during its controller's next untap step.
 rarity=C
 [/card]
 [card]
@@ -711,9 +430,12 @@ mana={3}{G}
 type=Enchantment
 subtype=Aura
 text=Enchant creature Enchanted creature loses flying. Whenever enchanted creature blocks or becomes blocked by a creature, the other creature gains first strike until end of turn.
+target=creature
+auto=-flying
 rarity=R
 [/card]
 [card]
+#REquire testing
 id=2948
 name=Marjhan
 mana={5}{U}{U}
@@ -722,55 +444,36 @@ subtype=Leviathan
 power=8
 toughness=8
 text=Marjhan doesn't untap during your untap step. Marjhan can't attack unless defending player controls an Island. When you control no Islands, sacrifice Marjhan. {U}{U}, Sacrifice a creature: Untap Marjhan. Activate this ability only during your upkeep. {U}{U}: Marjhan gets -1/-0 until end of turn and deals 1 damage to target attacking creature without flying.
+abilities=islandhome,doesnotuntap
+auto={U}{U}{S(creature|myBattlefield)}:untap myturnonly
+auto={U}{U}:damage:1 target(creature[attacking;-flying]) && -1/0 all(this)
 rarity=R
 [/card]
 [card]
+#Require testing
+id=2949
+name=Memory Lapse
+mana={1}{U}
+type=Instant
+text=Counter target spell. If that spell is countered this way, put it on top of its owner's library instead of into that player's graveyard.
+target=*|stack
+auto=fizzle
+auto=moveTo(ownerlibrary)
+rarity=C
+[/card]
+[card]
+#Require testing
 id=2950
 name=Memory Lapse
 mana={1}{U}
 type=Instant
 text=Counter target spell. If that spell is countered this way, put it on top of its owner's library instead of into that player's graveyard.
+target=*|stack
+auto=fizzle
+auto=moveTo(ownerlibrary)
 rarity=C
 [/card]
 [card]
-id=2951
-name=Merchant Scroll
-mana={1}{U}
-type=Sorcery
-text=Search your library for a blue instant card, reveal that card, and put it into your hand. Then shuffle your library.
-rarity=U
-[/card]
-[card]
-id=3022
-name=Mesa Falcon
-mana={1}{W}
-type=Creature
-subtype=Bird
-power=1
-toughness=1
-text=Flying {1}{W}: Mesa Falcon gets +0/+1 until end of turn.
-rarity=C
-[/card]
-[card]
-id=2952
-name=Mystic Decree
-mana={2}{U}{U}
-type=World Enchantment
-text=All creatures lose flying and islandwalk.
-rarity=R
-[/card]
-[card]
-id=2953
-name=Narwhal
-mana={2}{U}{U}
-type=Creature
-subtype=Whale
-power=2
-toughness=2
-text=First strike, protection from red
-rarity=U
-[/card]
-[card]
 id=3007
 name=Orcish Mine
 mana={1}{R}{R}
@@ -780,14 +483,6 @@ text=Enchant land Orcish Mine enters the battlefield with three ore counters on
 rarity=U
 [/card]
 [card]
-id=2974
-name=Primal Order
-mana={2}{G}{G}
-type=Enchantment
-text=At the beginning of each player's upkeep, Primal Order deals damage to that player equal to the number of nonbasic lands he or she controls.
-rarity=R
-[/card]
-[card]
 id=3023
 name=Prophecy
 mana={W}
@@ -799,30 +494,23 @@ rarity=C
 id=3024
 name=Rashka the Slayer
 mana={3}{W}{W}
-type=Legendary Creature
+type=Creature
 subtype=Human Archer
 power=3
 toughness=3
 text=Reach (This creature can block creatures with flying.) Whenever Rashka blocks one or more black creatures, Rashka gets +1/+2 until end of turn.
+abilities=legendary,reach
+auto=@blocked(creature[black]) from(this):1/2
 rarity=U
 [/card]
 [card]
-id=2955
-name=Reef Pirates
-mana={1}{U}{U}
-type=Creature
-subtype=Zombie Pirate
-power=2
-toughness=2
-text=Whenever Reef Pirates deals damage to an opponent, that player puts the top card of his or her library into his or her graveyard.
-rarity=C
-[/card]
-[card]
 id=2975
 name=Renewal
 mana={2}{G}
 type=Sorcery
 text=As an additional cost to cast Renewal, sacrifice a land. Search your library for a basic land card and put that card onto the battlefield. Then shuffle your library. Draw a card at the beginning of the next turn's upkeep.
+auto={s(land|myinplay)}:moveTo(myHand) target(land[basic]|myLibrary)
+auto=@next upkeep:draw:1
 rarity=C
 [/card]
 [card]
@@ -842,6 +530,7 @@ subtype=Dwarf Wizard
 power=0
 toughness=1
 text={T}: Reveka, Wizard Savant deals 2 damage to target creature or player and doesn't untap during your next untap step.
+auto={T}:damage:2 target(creature,player) && doesnotuntap
 rarity=U
 [/card]
 [card]
@@ -853,29 +542,10 @@ 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=2977
-name=Roots
-mana={3}{G}
-type=Enchantment
-subtype=Aura
-text=Enchant creature without flying When Roots enters the battlefield, tap enchanted creature. Enchanted creature doesn't untap during its controller's untap step.
-rarity=U
-[/card]
-[card]
-id=2908
-name=Roterothopter
-mana={1}
-type=Artifact Creature
-subtype=Thopter
-power=0
-toughness=2
-text=Flying {2}: Roterothopter gets +1/+0 until end of turn. Activate this ability no more than twice each turn.
-rarity=C
-[/card]
-[card]
 id=2978
 name=Rysorian Badger
 mana={2}{G}
@@ -887,7 +557,7 @@ text=Whenever Rysorian Badger attacks and isn't blocked, you may exile up to two
 rarity=R
 [/card]
 [card]
-id=3026
+id=3025
 name=Samite Alchemist
 mana={3}{W}
 type=Creature
@@ -898,15 +568,15 @@ text={W}{W}, {T}: Prevent the next 4 damage that would be dealt this turn to tar
 rarity=C
 [/card]
 [card]
-id=2957
-name=Sea Sprite
-mana={1}{U}
+id=3026
+name=Samite Alchemist
+mana={3}{W}
 type=Creature
-subtype=Faerie
-power=1
-toughness=1
-text=Flying, protection from red
-rarity=U
+subtype=Human Cleric
+power=0
+toughness=2
+text={W}{W}, {T}: Prevent the next 4 damage that would be dealt this turn to target creature you control. Tap that creature. It doesn't untap during your next untap step.
+rarity=C
 [/card]
 [card]
 id=2958
@@ -920,15 +590,15 @@ text={U}: Regenerate Sea Troll. Activate this ability only if Sea Troll blocked
 rarity=U
 [/card]
 [card]
-id=2928
-name=Sengir Autocrat
-mana={3}{B}
+id=2929
+name=Sengir Bats
+mana={1}{B}{B}
 type=Creature
-subtype=Human
-power=2
+subtype=Bat
+power=1
 toughness=2
-text=When Sengir Autocrat enters the battlefield, put three 0/1 black Serf creature tokens onto the battlefield. When Sengir Autocrat leaves the battlefield, exile all Serf tokens.
-rarity=U
+text=Flying Whenever a creature dealt damage by Sengir Bats this turn is put into a graveyard, put a +1/+1 counter on Sengir Bats.
+rarity=C
 [/card]
 [card]
 id=2930
@@ -942,14 +612,6 @@ text=Flying Whenever a creature dealt damage by Sengir Bats this turn is put int
 rarity=C
 [/card]
 [card]
-id=3027
-name=Serra Aviary
-mana={3}{W}
-type=World Enchantment
-text=Creatures with flying get +1/+1.
-rarity=R
-[/card]
-[card]
 id=3028
 name=Serra Bestiary
 mana={W}{W}
@@ -967,6 +629,8 @@ subtype=Human Cleric
 power=3
 toughness=3
 text=Whenever Serra Inquisitors blocks or becomes blocked by one or more black creatures, Serra Inquisitors gets +2/+0 until end of turn.
+auto=@blocked(this) from(creature[black]):2/0
+auto=@blocked(creature[black]) from(this):2/0
 rarity=U
 [/card]
 [card]
@@ -989,22 +653,17 @@ text=Serrated Arrows enters the battlefield with three arrowhead counters on it.
 rarity=C
 [/card]
 [card]
-id=2980
-name=Shrink
-mana={G}
-type=Instant
-text=Target creature gets -5/-0 until end of turn.
-rarity=C
-[/card]
-[card]
 id=3031
 name=Soraya the Falconer
 mana={1}{W}{W}
-type=Legendary Creature
+type=Creature
 subtype=Human
 power=2
 toughness=2
 text=Bird creatures get +1/+1. {1}{W}: Target Bird creature 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 a player controls are blocking or being blocked by a creature, that player divides that creature's combat damage, not its controller, among any of the creatures it's being blocked by or is blocking.)
+abilities=legendary
+auto=lord(bird) 1/1
+auto={1}{W}:target(bird) banding
 rarity=R
 [/card]
 [card]
@@ -1030,12 +689,14 @@ text=Remove Timmerian Fiends from your deck before playing if you're not playing
 rarity=R
 [/card]
 [card]
-id=2933
-name=Torture
-mana={B}
-type=Enchantment
-subtype=Aura
-text=Enchant creature {1}{B}: Put a -1/-1 counter on enchanted creature.
+id=3032
+name=Trade Caravan
+mana={W}
+type=Creature
+subtype=Human Nomad
+power=1
+toughness=1
+text=At the beginning of your upkeep, put a currency counter on Trade Caravan. Remove two currency counters from Trade Caravan: Untap target basic land. Activate this ability only during an opponent's upkeep.
 rarity=C
 [/card]
 [card]
@@ -1058,50 +719,6 @@ text=Each player may draw up to two cards. For each card less than two a player
 rarity=R
 [/card]
 [card]
-id=2934
-name=Veldrane of Sengir
-mana={5}{B}{B}
-type=Legendary Creature
-subtype=Human Rogue
-power=5
-toughness=5
-text={1}{B}{B}: Veldrane of Sengir gets -3/-0 and gains forestwalk until end of turn.
-rarity=R
-[/card]
-[card]
-id=2959
-name=Wall of Kelp
-mana={U}{U}
-type=Creature
-subtype=Plant Wall
-power=0
-toughness=3
-text=Defender (This creature can't attack.) {U}{U}, {T}: Put a 0/1 blue Plant Wall creature token with defender named Kelp onto the battlefield.
-rarity=R
-[/card]
-[card]
-id=2983
-name=Willow Faerie
-mana={1}{G}
-type=Creature
-subtype=Faerie
-power=1
-toughness=2
-text=Flying
-rarity=C
-[/card]
-[card]
-id=2984
-name=Willow Priestess
-mana={2}{G}{G}
-type=Creature
-subtype=Faerie Druid
-power=2
-toughness=2
-text={T}: You may put a Faerie permanent card from your hand onto the battlefield. {2}{G}: Target green creature gains protection from black until end of turn.
-rarity=U
-[/card]
-[card]
 id=3009
 name=Winter Sky
 mana={R}
@@ -1109,11 +726,4 @@ type=Sorcery
 text=Flip a coin. If you win the flip, Winter Sky deals 1 damage to each creature and each player. If you lose the flip, each player draws a card.
 rarity=R
 [/card]
-[card]
-id=3039
-name=Wizards' School
-mana=
-type=Land
-text={T}: Add {1} to your mana pool.  {1}, {T}: Add {U} to your mana pool.  {2}, {T}: Add {W} or {B} to your mana pool.
-rarity=U
-[/card]
+