Laurent - Few addition, all tested and worked (exception Disciple of Vault (MRD) & Mercadia's downfall (MRQ) not tested yet...)

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

@@ -1588,6 +1588,7 @@ subtype=Aura
 text=Destroy target Wall. It can't be regenerated. Word of Blasting deals damage equal to that Wall's converted mana cost to the Wall's controller.
 id=2660
 target=Wall
+auto=bury
 name=Word of Blasting
 rarity=U
 type=Instant

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

@@ -21,6 +21,8 @@ subtype=Aura
 [card]
 text=As an additional cost to play Altar of Bone, sacrifice a creature.       Search your library for a creature card, reveal that card, and put it into your hand. Then shuffle your library.
 id=2717
+target=creature|mylibrary
+auto=moveto(myhand) && destroy target(creature)
 name=Altar of Bone
 rarity=R
 type=Sorcery

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

@@ -1264,6 +1264,9 @@ mana={3}{R}{R}
 [card]
 text=Counter target artifact or enchantment spell. Its controller gains life equal to its converted mana cost.
 id=3496
+target=artifact,enchantment|stack
+auto=fizzle
+alias=1240
 name=Illumination
 rarity=U
 type=Instant

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

@@ -217,6 +217,18 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
+text=Whenever an artifact is put into a graveyard from play, you may have target opponent lose 1 life.
+id=49090
+auto=@movedTo(artifact|graveyard) from(inplay):may life:-1 opponent
+name=Disciple of the Vault
+rarity=C
+type=Creature
+mana={B}
+power=1
+subtype=Human Cleric
+toughness=1
+[/card]
+[card]
 text={3}, {T}: Put a +1/+1 counter on target creature.
 auto={3}{T}:counter(1/1) target(creature)
 id=48325

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

@@ -6,9 +6,6 @@ rarity=R
 type=Artifact
 mana={7}
 [/card]
-
-
-
 [card]
 text={R}, Remove the top ten cards of your library from the game: Arc-Slogger deals 2 damage to target creature or player.
 id=48436
@@ -306,18 +303,6 @@ rarity=C
 type=Instant
 mana={U}
 [/card]
-[card]
-text=Whenever an artifact is put into a graveyard from play, you may have target opponent lose 1 life.
-id=49090
-name=Disciple of the Vault
-rarity=C
-type=Creature
-mana={B}
-power=1
-subtype=Human Cleric
-toughness=1
-[/card]
-
 [card]
 text=Choose one - Tap target permanent; or untap target permanent.     Entwine {1} (Choose both if you pay the entwine cost.)
 id=48159
@@ -461,6 +446,12 @@ mana={6}
 text=At end of turn, if you control no artifacts, sacrifice Glimmervoid.     {T}: Add one mana of any color to your mana pool.
 id=48132
 name=Glimmervoid
+auto=@each endofturn:aslongas(-artifact|myinplay)destroy
+auto={T}: add {G}
+auto={T}: add {B}
+auto={T}: add {U}
+auto={T}: add {W}
+auto={T}: add {R}
 rarity=R
 type=Land
 [/card]
@@ -486,6 +477,8 @@ mana={4}
 [card]
 text=Flying     Goblin Dirigible doesn't untap during your untap step.     At the beginning of your upkeep, you may pay {4}. If you do, untap Goblin Dirigible.
 id=48077
+abilities=doesnotuntap,flying
+auto={4}:untap
 name=Goblin Dirigible
 rarity=U
 type=Artifact Creature
@@ -499,6 +492,8 @@ text=Goblin War Wagon doesn't untap during your untap step.     At the beginning
 id=46044
 name=Goblin War Wagon
 rarity=C
+abilities=doesnotuntap
+auto={2}:untap
 type=Artifact Creature
 mana={4}
 power=3
@@ -544,6 +539,7 @@ mana={2}{B}
 [/card]
 [card]
 text=Whenever Groffskithur becomes blocked, you may return target card named Groffskithur from your graveyard to your hand.
+auto=lord(Groffskithur[blocking]|myinplay):may moveto(myhand) target(Groffskithur|mygraveyard)
 id=48600
 name=Groffskithur
 rarity=C
@@ -758,6 +754,7 @@ mana={2}
 text=Whenever an opponent draws a card, you may pay {1}. If you do, draw a card.
 id=48919
 name=Mind's Eye
+auto=@movedTo(*|opponenthand) from(opponentlibrary):may {1}:draw:1 controller
 rarity=R
 type=Artifact
 mana={5}
@@ -773,6 +770,8 @@ mana={6}
 [card]
 text=At the beginning of your upkeep, draw a card if you had no cards in hand at the beginning of this turn. If you had a card in hand, Mindstorm Crown deals 1 damage to you.
 id=46715
+auto=@each my upkeep:aslongas(*|myhand):damage:1 controller
+auto=@each my upleep:aslongas(-*|myhand):draw:1 controller
 name=Mindstorm Crown
 rarity=U
 type=Artifact
@@ -803,13 +802,13 @@ toughness=6
 [card]
 text=Destroy target land. If that land was nonbasic, Molten Rain deals 2 damage to the land's controller.
 id=46000
+target=land
+auto=destroy && aslongas(-basic):damage:2 targetcontroller
 name=Molten Rain
 rarity=C
 type=Sorcery
 mana={1}{R}{R}
 [/card]
-
-
 [card]
 text=Imprint - When Mourner's Shield comes into play, you may remove target card in a graveyard from the game. (The removed card is imprinted on this artifact.)  {2}, {T}: Prevent all damage that would be dealt this turn by a source of your choice that shares a color with the imprinted card.
 id=50538
@@ -849,7 +848,7 @@ type=Artifact
 mana={6}
 [/card]
 [card]
-text={2}, {T}: Shuffle your library.
+text={2}{T}: Shuffle your library.
 id=48925
 name=Myr Mindservant
 rarity=U
@@ -941,7 +940,20 @@ power=4
 subtype=Zombie
 toughness=1
 [/card]
-
+[card]
+text=Pentavus comes into play with five +1/+1 counters on it.     {1}, Remove a +1/+1 counter from Pentavus: Put a 1/1 Pentavite artifact creature token with flying into play.     {1}, Sacrifice a Pentavite: Put a +1/+1 counter on Pentavus.
+id=46703
+auto=counter(1/1,5)
+auto={1}:counter(1/1,-1) && token(Pentavite,artifact creature Pentavite,1/1,flying)
+auto={1}{S(Pentavite|myinplay)}:counter(1/1,1)
+name=Pentavus
+rarity=R
+type=Artifact Creature
+mana={7}
+power=0
+subtype=Construct
+toughness=0
+[/card]
 [card]
 text={4}, {T}: Put a fate counter on target permanent.     {5}, {T}, Sacrifice Oblivion Stone: Destroy each nonland permanent without a fate counter on it, then remove all fate counters from all permanents.
 id=34901
@@ -985,18 +997,6 @@ rarity=U
 type=Artifact
 mana={3}
 [/card]
-[card]
-text=Pentavus comes into play with five +1/+1 counters on it.     {1}, Remove a +1/+1 counter from Pentavus: Put a 1/1 Pentavite artifact creature token with flying into play.     {1}, Sacrifice a Pentavite: Put a +1/+1 counter on Pentavus.
-id=46703
-name=Pentavus
-rarity=R
-type=Artifact Creature
-mana={7}
-power=0
-subtype=Construct
-toughness=0
-[/card]
-
 [card]
 text=Flying (This creature can't be blocked except by creatures with flying or reach.)  You can't lose the game and your opponents can't win the game.
 id=48580
@@ -1093,7 +1093,7 @@ toughness=6
 [card]
 text=Enchant artifact     Enchanted artifact has "At the beginning of your upkeep, you lose 2 life."
 target=artifact
-auto=@each my upkeep:life:-2
+auto=@each opponent upkeep:life:-2 targetcontroller
 id=48329
 name=Relic Bane
 rarity=U
@@ -1420,6 +1420,8 @@ toughness=3
 [card]
 text=Whenever a player plays a creature spell, that player adds {G} to his or her mana pool.
 id=49767
+auto=@movedto(creature|mystack):add {G}
+auto=@movedto(creature|opponentstack): add {G} opponent
 name=Tangleroot
 rarity=R
 type=Artifact
@@ -1431,6 +1433,7 @@ id=46004
 name=Tel-Jilad Archers
 rarity=C
 type=Creature
+abilities=reach,protection from artifact
 mana={4}{G}
 power=2
 subtype=Elf Archer
@@ -1538,6 +1541,9 @@ toughness=1
 [card]
 text=Destroy target Equipment. Then add {G} to your mana pool.
 id=48594
+target=equipment
+auto=destroy
+auto=add:{G}
 name=Turn to Dust
 rarity=C
 type=Instant

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

@@ -11,6 +11,15 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
+text={3}{W}{W}: You draw a card and target opponent gains 3 life.
+id=19661
+auto={3}{W}{W}:draw:1 controller && life:3 opponent
+name=Armistice
+rarity=R
+type=Enchantment
+mana={2}{W}
+[/card]
+[card]
 text={1}{R}, Sacrifice a Goblin: Arms Dealer deals 4 damage to target creature.
 id=19861
 name=Arms Dealer
@@ -140,6 +149,15 @@ mana={1}{G}{G}
 type=Enchantment
 [/card]
 [card]
+text=Whenever a creature attacks you, it gets -1/-0 until end of turn.
+id=19745
+name=Briar Patch
+auto=lord(creature[attacking]|opponentinplay) -1/0
+rarity=U
+type=Enchantment
+mana={1}{G}{G}
+[/card]
+[card]
 text=Search target opponent's library for a creature card and put that card into play under your control. Then that player shuffles his or her library.
 target=creature|opponentLibrary
 auto=moveTo(myInplay)
@@ -715,6 +733,7 @@ power=3
 toughness=3
 abilities=trample
 [/card]
+
 [card]
 text={R}{T}, Discard a card: Kris Mage deals 1 damage to target creature or player.
 id=19836
@@ -741,6 +760,18 @@ subtype=Goblin
 toughness=1
 [/card]
 [card]
+text=At the beginning of your upkeep, you may have Kyren Sniper deal 1 damage to target player.
+id=19606
+auto=@each my upkeep:may damage:1 target(player)
+name=Kyren Sniper
+rarity=C
+type=Creature
+mana={2}{R}
+power=1
+subtype=Goblin
+toughness=1
+[/card]
+[card]
 text=Whenever a nontoken permanent is put into a player's graveyard from play, that player loses 1 life.
 auto=@movedTo(land,enchantment,creature,artifact|opponentGraveyard):life:-1 opponent
 auto=@movedTo(land,enchantment,creature,artifact|myGraveyard):life:-1 controller
@@ -799,6 +830,16 @@ type=Enchantment
 mana={2}{R}
 [/card]
 [card]
+text=Attacking creatures get +X/+0 until end of turn, where X is the number of nonbasic lands defending player controls.
+id=19850
+auto=lord(creature[attacking]|myinplay) foreach(land[-basic]|opponentinplay) 1/0
+auto=lord(creature[attacking]|opponentinplay) foreach(land[-basic]|myinplay) 1/0
+name=Mercadia's Downfall
+rarity=U
+type=Instant
+mana={2}{R}
+[/card]
+[card]
 text=Flying
 id=19581
 name=Misshapen Fiend
@@ -812,6 +853,15 @@ toughness=1
 abilities=flying
 [/card]
 [card]
+text=Whenever a creature is put into a graveyard from play, you gain 1 life.
+id=136514
+auto=@movedTo(creature|graveyard) from(inplay):life:1 controller
+name=Moonlit Wake
+rarity=U
+type=Enchantment
+mana={2}{W}
+[/card]
+[card]
 text={T}: Add {R} to your mana pool.
 auto={T}: Add {R}
 id=20893
@@ -1052,6 +1102,17 @@ power=1
 toughness=1
 [/card]
 [card]
+text=Destroy target nonblack creature. It can't be regenerated. You gain life equal to its toughness.
+id=19591
+target=creature[-black]
+auto=bury
+alias=3194
+name=Sever Soul
+rarity=C
+type=Sorcery
+mana={3}{B}{B}
+[/card]
+[card]
 text=Sacrifice Shock Troops: Shock Troops deals 2 damage to target creature or player.
 id=19609
 name=Shock Troops
@@ -1098,6 +1159,15 @@ subtype=Dryad Spellshaper
 toughness=1
 [/card]
 [card]
+text=Sizzle deals 3 damage to each opponent.
+id=19611
+name=Sizzle
+auto=damage:3 opponent
+rarity=C
+type=Sorcery
+mana={2}{R}
+[/card]
+[card]
 text={T}: Add {B} to your mana pool.     Sacrifice Skull of Ramos: Add {B} to your mana pool.
 id=19764
 name=Skull of Ramos
@@ -1118,6 +1188,16 @@ type=Enchantment
 mana={3}{G}
 [/card]
 [card]
+text=Target player gains 5 life.
+id=19550
+target=player
+auto=life:5
+name=Soothing Balm
+rarity=C
+type=Instant
+mana={1}{W}
+[/card]
+[card]
 text=Target player discards a card at random.
 id=19597
 target=player
@@ -1427,3 +1507,24 @@ subtype=Cat
 power=3
 toughness=3
 [/card]
+[card]
+text=Destroy target Wall. It can't be regenerated. Word of Blasting deals damage equal to that Wall's converted mana cost to the Wall's controller.
+id=19852
+target=wall
+auto=bury
+alias=2660
+name=Word of Blasting
+rarity=U
+type=Instant
+mana={1}{R}
+[/card]
+[card]
+text=At the beginning of each player's upkeep, that player puts the top card of his or her library into his or her graveyard.
+id=19747
+auto=@each my upkeep:deplete:1 controller
+auto=@each opponent upkeep:deplete:1 opponent
+name=Worry Beads
+rarity=R
+type=Artifact
+mana={3}
+[/card]

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

@@ -40,14 +40,6 @@ subtype=Human Mercenary
 toughness=2
 [/card]
 [card]
-text={3}{W}{W}: You draw a card and target opponent gains 3 life.
-id=19661
-name=Armistice
-rarity=R
-type=Enchantment
-mana={2}{W}
-[/card]
-[card]
 text=Enchant creature     Enchanted creature can't attack or block, and its activated abilities can't be played.
 id=19789
 name=Arrest
@@ -142,15 +134,6 @@ rarity=R
 type=Instant
 mana={3}{R}{R}
 [/card]
-[card]
-text=Whenever a creature attacks you, it gets -1/-0 until end of turn.
-id=19745
-name=Briar Patch
-rarity=U
-type=Enchantment
-mana={1}{G}{G}
-[/card]
-
 [card]
 text={X}{B}, {T}, Discard a card: Target creature gets +X/+0 until end of turn.
 id=19815
@@ -615,6 +598,7 @@ text={U}, {T}, Discard a card: Counter target spell or ability that targets a cr
 id=19794
 name=Diplomatic Escort
 rarity=U
+auto={U}{S(*|myhand)}{T}:fizzle target(*|stack)
 type=Creature
 mana={1}{U}
 power=1
@@ -633,6 +617,8 @@ mana={2}
 text=Nonland permanents don't untap during their controllers' untap steps.       At the beginning of your upkeep, you lose 2 life.
 id=19679
 name=Embargo
+auto=lord(-land)doesnotuntap
+auto=@each my upkeep:life:-2 controller
 rarity=R
 type=Enchantment
 mana={3}{U}
@@ -771,6 +757,7 @@ type=Land
 [card]
 text=Whenever you play a creature spell, Furious Assault deals 1 damage to target player.
 id=19848
+auto=@movedTo(creature|mystack):damage:1 target(player)
 name=Furious Assault
 rarity=C
 type=Enchantment
@@ -990,17 +977,7 @@ rarity=U
 type=Enchantment
 mana={2}{R}{R}
 [/card]
-[card]
+
-text=At the beginning of your upkeep, you may have Kyren Sniper deal 1 damage to target player.
-id=19606
-name=Kyren Sniper
-rarity=C
-type=Creature
-mana={2}{R}
-power=1
-subtype=Goblin
-toughness=1
-[/card]
 [card]
 text={1}, {T}: Put a charge counter on Kyren Toy.       {T}, Remove X charge counters from Kyren Toy: Add {1}{X} to your mana pool.
 id=19759
@@ -1065,10 +1042,11 @@ power=7
 subtype=Insect
 toughness=7
 [/card]
-
 [card]
 text=Lunge deals 2 damage to target creature and 2 damage to target player.
 id=19617
+target=creature
+auto=damage:2 && damage:2 targetController
 name=Lunge
 rarity=C
 type=Instant
@@ -1127,15 +1105,7 @@ rarity=R
 type=Artifact
 mana={2}
 [/card]
-[card]
+
-text=Attacking creatures get +X/+0 until end of turn, where X is the number of nonbasic lands defending player controls.
-id=19850
-auto=lord(creature[attacking]) foreach(land[-basic]|opponentinplay) 1/0
-name=Mercadia's Downfall
-rarity=U
-type=Instant
-mana={2}{R}
-[/card]
 [card]
 text=Remove X target creature cards in your graveyard from the game. For each creature card removed this way, put a 2/2 black Zombie creature token into play.
 id=19707
@@ -1188,14 +1158,7 @@ rarity=R
 type=Artifact
 mana={5}
 [/card]
-[card]
+
-text=Whenever a creature is put into a graveyard from play, you gain 1 life.
-id=136514
-name=Moonlit Wake
-rarity=U
-type=Enchantment
-mana={2}{W}
-[/card]
 
 [card]
 text=Enchant creature     Prevent all damage that would be dealt by enchanted creature.
@@ -1227,7 +1190,7 @@ toughness=2
 [/card]
 [card]
 text=Whenever a creature you control deals combat damage, you gain that much life.
-auto=lord(creature|myinplay) lifelink other
+auto=lord(creature|myinplay)lifelink
 id=19786
 name=Noble Purpose
 rarity=U
@@ -1295,6 +1258,7 @@ toughness=2
 [card]
 text={T}: Target creature gets +1/+1 and gains flying, first strike, and trample until end of turn.
 id=19888
+auto={T}:1/1 && flying && first strike && trample target(creature)
 name=Power Matrix
 rarity=R
 type=Artifact
@@ -1736,14 +1700,7 @@ type=Enchantment
 mana={3}{W}
 [/card]
 
-[card]
+
-text=Destroy target nonblack creature. It can't be regenerated. You gain life equal to its toughness.
-id=19591
-name=Sever Soul
-rarity=C
-type=Sorcery
-mana={3}{B}{B}
-[/card]
 
 
 [card]
@@ -1759,14 +1716,7 @@ toughness=1
 [/card]
 
 
-[card]
+
-text=Sizzle deals 3 damage to each opponent.
-id=19611
-name=Sizzle
-rarity=C
-type=Sorcery
-mana={2}{R}
-[/card]
 [card]
 text=When Skulking Fugitive becomes the target of a spell or ability, sacrifice it.
 id=19588
@@ -1800,14 +1750,6 @@ type=Instant
 mana={3}{B}
 [/card]
 [card]
-text=Target player gains 5 life.
-id=19550
-name=Soothing Balm
-rarity=C
-type=Instant
-mana={1}{W}
-[/card]
-[card]
 text={3}{U}{U}: Shuffle your library.       {X}: Look at the top X cards of your library and put them back in any order.
 id=19807
 name=Soothsaying
@@ -1868,6 +1810,9 @@ mana={3}{U}
 text=Enchant creature     Enchanted creature has vigilance.     Sacrifice Stamina: Regenerate enchanted creature.
 id=19868
 name=Stamina
+target=creature
+auto=vigilance
+auto={S(Stamina)}:regenerate
 rarity=U
 type=Enchantment
 mana={2}{G}
@@ -1969,6 +1914,7 @@ mana={1}{U}
 text=Flying     When another creature comes into play, return Timid Drake to its owner's hand.
 id=19560
 name=Timid Drake
+auto=@movedto(creature|inplay):moveto(ownerhand) all(Timid Drake)
 rarity=U
 type=Creature
 mana={2}{U}
@@ -2040,6 +1986,7 @@ subtype=Aura
 [card]
 text=Creatures your opponents play come into play tapped.
 id=20786
+auto=lord(creature|opponentinplay)tap
 name=Uphill Battle
 rarity=U
 type=Enchantment
@@ -2065,6 +2012,7 @@ mana={3}{G}
 text=Any player may play creature and enchantment cards as though they had flash.
 id=19736
 name=Vernal Equinox
+auto=lord(enchantment,creature|hand)flash
 rarity=R
 type=Enchantment
 mana={3}{G}
@@ -2153,19 +2101,5 @@ power=3
 subtype=Unicorn Monger
 toughness=3
 [/card]
-[card]
+
-text=Destroy target Wall. It can't be regenerated. Word of Blasting deals damage equal to that Wall's converted mana cost to the Wall's controller.
+
-id=19852
-name=Word of Blasting
-rarity=U
-type=Instant
-mana={1}{R}
-[/card]
-[card]
-text=At the beginning of each player's upkeep, that player puts the top card of his or her library into his or her graveyard.
-id=19747
-name=Worry Beads
-rarity=R
-type=Artifact
-mana={3}
-[/card]

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

@@ -445,6 +445,7 @@ subtype=Aura
 [card]
 text=Destroy target artifact. It can't be regenerated. That artifact's controller gains life equal to its converted mana cost.
 target=artifact
+auto=bury
 id=1240
 name=Crumble
 rarity=U

projects/mtg/src/MTGAbility.cpp

@@ -1283,7 +1283,6 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){
     }
   case 1240: //Crumble
     {
-      card->target->controller()->game->putInGraveyard(card->target);
       card->target->controller()->life+= card->target->getManaCost()->getConvertedCost();
       break;
     }
@@ -1517,7 +1516,6 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){
 
   case 2660: //Word of Blasting
     {
-      card->target->controller()->game->putInGraveyard(card->target);
       card->target->controller()->life-= card->target->getManaCost()->getConvertedCost();
       break;
     }
@@ -1558,8 +1556,6 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){
 	
     case 3194: // Exile
     {
-	Player * p = card->target->controller();
-    p->game->putInZone(card->target,p->game->inPlay,card->owner->game->removedFromGame);
 	game->currentlyActing()->life+=  card->target->toughness;
 	  break;
     }