Erwan

-Added a few cards

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

@@ -32,6 +32,15 @@ toughness=3
 abilities=swampwalk
 [/card]
 [card]
+text=Whenever a creature comes into play under your control, you gain life equal to its toughness.
+id=5714
+alias=129710
+name=Angelic Chorus
+rarity=R
+type=Enchantment
+mana={3}{W}{W}
+[/card]
+[card]
 text=Flying    {T}: Target attacking or blocking creature gets +1/+1 until end of turn.
 id=5781
 name=Angelic Page
@@ -128,6 +137,16 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
+id=5747
+name=Blanchwood Treefolk
+rarity=C
+mana={4}{G}
+type=Creature
+subtype=Treefolk
+power=4
+toughness=5
+[/card]
+[card]
 text=Sacrifice Blood Vassal: Add {B}{B} to your mana pool.
 id=5737
 name=Blood Vassal
@@ -141,17 +160,6 @@ power=2
 toughness=2
 [/card]
 [card]
-id=5747
-name=Blanchwood Treefolk
-color=Green
-rarity=C
-mana={4}{G}
-type=Creature
-subtype=Treefolk
-power=4
-toughness=5
-[/card]
-[card]
 text=Swampwalk
 id=5597
 name=Bog Raiders
@@ -203,6 +211,18 @@ toughness=3
 abilities=islandwalk
 [/card]
 [card]
+text=When Cathodion is put into a graveyard from play, add {3} to your mana pool.
+auto=@movedTo(this|graveyard):Add{3}
+id=10659
+name=Cathodion
+rarity=U
+type=Artifact Creature
+mana={3}
+power=3
+subtype=Construct
+toughness=3
+[/card]
+[card]
 text=Whenever Cave Tiger becomes blocked, it gets +1/+1 until end of turn for each creature blocking it.
 id=5762
 name=Cave Tiger
@@ -216,6 +236,18 @@ power=2
 toughness=2
 [/card]
 [card]
+text=Creatures you control have "{T}: Add {G} to your mana pool."
+id=5724
+name=Citanul Hierophants
+rarity=R
+type=Creature
+mana={3}{G}
+power=3
+subtype=Human Druid
+toughness=2
+auto=lord(creature|myinplay) {T}:Add{G}
+[/card]
+[card]
 text={1}, Sacrifice a permanent: You gain 1 life.
 auto={S(*|myinplay)}:life:1
 id=8890
@@ -297,6 +329,15 @@ toughness=2
 abilities=flying,haste
 [/card]
 [card]
+text={3}, {T}, Sacrifice Crystal Chimes: Return all enchantment cards from your graveyard to your hand.
+auto={3}{T}{S}:moveTo(myHand) all(enchantment|mygraveyard)
+id=5742
+name=Crystal Chimes
+rarity=U
+type=Artifact
+mana={3}
+[/card]
+[card]
 text=Creatures with flying get -2/-0.
 auto=lord(creature[flying]) -2/0
 id=5668
@@ -409,6 +450,18 @@ mana={X}{R}{R}
 type=Instant
 [/card]
 [card]
+text={T}: Fire Ants deals 1 damage to each other creature without flying.
+auto={T}:damage:1 all(creature[-flying]) other
+id=5568
+name=Fire Ants
+rarity=U
+type=Creature
+mana={2}{R}
+power=2
+subtype=Insect
+toughness=1
+[/card]
+[card]
 text={T}: Add {G} to your mana pool.
 auto={T}: Add {G}
 id=8340
@@ -550,6 +603,16 @@ power=3
 toughness=2
 [/card]
 [card]
+text=At the beginning of your draw step, draw an additional card.     At the end of your turn, discard your hand.
+auto=@each my draw:draw:1
+auto=@each my end:moveTo(graveyard) all(*|myhand)
+id=7169
+name=Grafted Skullcap
+rarity=R
+type=Artifact
+mana={4}
+[/card]
+[card]
 text=Protection from blue
 id=8806
 name=Guma
@@ -621,6 +684,18 @@ power=1
 toughness=3
 [/card]
 [card]
+text=At the beginning of your upkeep, if you have a card in hand, return Imaginary Pet to its owner's hand.
+auto=@each my upkeep:aslongas(*|myhand) moveTo(myHand)
+id=5772
+name=Imaginary Pet
+rarity=R
+type=Creature
+mana={1}{U}
+power=4
+subtype=Illusion
+toughness=4
+[/card]
+[card]
 text={T}: Add {U} to your mana pool.
 auto={T}:add {U}
 id=8326
@@ -670,6 +745,19 @@ power=1
 toughness=1
 [/card]
 [card]
+text=Defender (This creature can't attack.)  {3}: Mobile Fort gets +3/-1 until end of turn and can attack this turn as though it didn't have defender. Play this ability only once each turn.
+abilities=defender
+auto={3}:3/-1 && -defender limit:1
+id=5550
+name=Mobile Fort
+rarity=U
+type=Artifact Creature
+mana={4}
+power=0
+subtype=Wall
+toughness=6
+[/card]
+[card]
 text=When Monk Idealist comes into play, return target enchantment card from your graveyard to your hand.
 auto=may moveTo(myhand) target(enchantment|mygraveyard)
 id=5706
@@ -857,6 +945,15 @@ type=Basic Land
 subtype=Plains
 [/card]
 [card]
+text=Whenever a player plays an enchantment spell, counter it.
+auto=@movedTo(enchantment|stack):fizzle all(enchantment|stack)
+id=8811
+name=Presence of the Master
+rarity=U
+type=Enchantment
+mana={3}{W}
+[/card]
+[card]
 text=When Priest of Gix comes into play, add {B}{B}{B} to your mana pool.
 auto=Add: {B}{B}{B}
 id=9724
@@ -882,6 +979,27 @@ subtype=Elf Druid
 toughness=1
 [/card]
 [card]
+text=Until end of turn, lands you control gain "Sacrifice this land: Add {B} to your mana pool."
+auto=lord(land|mybattlefield) {S}:Add{B}
+id=5831
+name=Rain of Filth
+rarity=U
+type=Instant
+mana={B}
+[/card]
+[card]
+text=At the beginning of your upkeep, if you control another nonland permanent, sacrifice Reclusive Wight.
+@each my upkeep:aslongas(*[-land]|mybattlefield) other bury
+id=8803
+name=Reclusive Wight
+rarity=U
+type=Creature
+mana={3}{B}
+power=4
+subtype=Zombie Minion
+toughness=4
+[/card]
+[card]
 text=Enchant creature      Enchanted creature has first strike.
 target=creature
 auto=first strike
@@ -894,6 +1012,15 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
+text=Creatures you control have "Whenever this creature becomes blocked, it gets +1/+1 until end of turn for each creature blocking it."
+auto=lord(creature|myinplay) rampage(1/1,0)
+id=10408
+name=Retaliation
+rarity=U
+type=Enchantment
+mana={2}{G}
+[/card]
+[card]
 text=First strike    {1}{B}: Regenerate Sanguine Guard.
 auto={1}{B}:regenerate
 id=5627
@@ -998,6 +1125,32 @@ toughness=2
 abilities=flying
 [/card]
 [card]
+text=Flying     When you play a creature spell, sacrifice Skittering Skirge.
+abilities=flying
+auto=@movedTo(creature|mystack):bury
+id=5573
+name=Skittering Skirge
+rarity=C
+type=Creature
+mana={B}{B}
+power=3
+subtype=Imp
+toughness=2
+[/card]
+[card]
+text=When Sleeper Agent comes into play, target opponent gains control of it.      At the beginning of your upkeep, Sleeper Agent deals 2 damage to you.
+auto=moveTo(opponentinplay)
+auto=@each my upkeep:Damage:2 controller
+id=5751
+name=Sleeper Agent
+rarity=R
+type=Creature
+mana={B}
+power=3
+subtype=Minion
+toughness=3
+[/card]
+[card]
 text={1}{W}: Prevent all combat damage that would be dealt this turn by target attacking creature with flying.
 auto={1}{W}:-99/0 target(creature[attacking;flying])
 id=5669
@@ -1225,6 +1378,19 @@ power=4
 toughness=3
 [/card]
 [card]
+text=Swampwalk     {T}: Add {B}{B}{B}{B} to your mana pool. Target opponent gains control of Witch Engine. (Play this ability only any time you could play an instant.)
+abilities=swampwalk
+auto={T}:Add{B}{B}{B}{B} && moveTo(opponentinplay)
+id=5836
+name=Witch Engine
+rarity=R
+type=Creature
+mana={5}{B}
+power=4
+subtype=Horror
+toughness=4
+[/card]
+[card]
 text=Worn Powerstone comes into play tapped.    {T}: Add 2 Mana to your mana pool.
 auto=tap
 auto={T}:Add {2}

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

@@ -58,14 +58,7 @@ power=3
 subtype=Troll
 toughness=3
 [/card]
-[card]
+
-text=Whenever a creature comes into play under your control, you gain life equal to its toughness.
-id=5714
-name=Angelic Chorus
-rarity=R
-type=Enchantment
-mana={3}{W}{W}
-[/card]
 [card]
 text=At the end of each player's turn, Antagonism deals 2 damage to that player unless one of his or her opponents was dealt damage that turn.
 id=5572
@@ -150,17 +143,7 @@ rarity=U
 type=Enchantment
 mana={1}{B}
 [/card]
-[card]
+
-text=
-id=5747
-name=Blanchwood Treefolk
-rarity=C
-type=Creature
-mana={4}{G}
-power=4
-subtype=Treefolk
-toughness=5
-[/card]
 [card]
 text={T}: Add {1} to your mana pool.     Cycling {2} ({2}, Discard this card: Draw a card.)
 id=5612
@@ -206,6 +189,7 @@ toughness=1
 [/card]
 [card]
 text=At the beginning of your precombat main phase, you may add up to X mana of any one color to your mana pool, where X is the number of Islands target opponent controls.
+auto=@each my firstmain:may foreach(island|opponentbattlefield) Add{*}
 id=5858
 name=Carpet of Flowers
 rarity=U
@@ -239,17 +223,7 @@ rarity=R
 type=Sorcery
 mana={4}{W}{W}
 [/card]
-[card]
+
-text=When Cathodion is put into a graveyard from play, add {3} to your mana pool.
-id=10659
-name=Cathodion
-rarity=U
-type=Artifact Creature
-mana={3}
-power=3
-subtype=Construct
-toughness=3
-[/card]
 [card]
 text=Trample     At the beginning of your upkeep, sacrifice Child of Gaea unless you pay {G}{G}.     {1}{G}: Regenerate Child of Gaea.
 id=9678
@@ -288,17 +262,7 @@ rarity=R
 type=Artifact
 mana={5}
 [/card]
-[card]
+
-text=Creatures you control have "{T}: Add {G} to your mana pool."
-id=5724
-name=Citanul Hierophants
-rarity=R
-type=Creature
-mana={3}{G}
-power=3
-subtype=Human Druid
-toughness=2
-[/card]
 [card]
 text=Destroy target enchantment.     Cycling {2} ({2}, Discard this card: Draw a card.)
 id=5692
@@ -345,14 +309,7 @@ power=6
 subtype=Hellion Beast
 toughness=6
 [/card]
-[card]
+
-text={3}, {T}, Sacrifice Crystal Chimes: Return all enchantment cards from your graveyard to your hand.
-id=5742
-name=Crystal Chimes
-rarity=U
-type=Artifact
-mana={3}
-[/card]
 [card]
 text=Each player returns a creature he or she controls to its owner's hand.
 id=7817
@@ -626,17 +583,7 @@ type=Enchantment
 mana={1}{R}
 subtype=Aura
 [/card]
-[card]
+
-text={T}: Fire Ants deals 1 damage to each other creature without flying.
-id=5568
-name=Fire Ants
-rarity=U
-type=Creature
-mana={2}{R}
-power=2
-subtype=Insect
-toughness=1
-[/card]
 [card]
 text=Whenever Flesh Reaver deals damage to a creature or opponent, Flesh Reaver deals that much damage to you.
 id=5654
@@ -739,14 +686,7 @@ power=2
 subtype=Goblin
 toughness=2
 [/card]
-[card]
+
-text=At the beginning of your draw step, draw an additional card.     At the end of your turn, discard your hand.
-id=7169
-name=Grafted Skullcap
-rarity=R
-type=Artifact
-mana={4}
-[/card]
 [card]
 text=When Great Whale comes into play, untap up to seven lands.
 id=10682
@@ -896,17 +836,7 @@ rarity=R
 type=Sorcery
 mana={2}{B}{B}
 [/card]
-[card]
+
-text=At the beginning of your upkeep, if you have a card in hand, return Imaginary Pet to its owner's hand.
-id=5772
-name=Imaginary Pet
-rarity=R
-type=Creature
-mana={1}{U}
-power=4
-subtype=Illusion
-toughness=4
-[/card]
 [card]
 text={T}: Destroy target creature with power 4 or greater.
 id=5678
@@ -1057,17 +987,7 @@ rarity=R
 type=Artifact
 mana={5}
 [/card]
-[card]
+
-text=Defender (This creature can't attack.)  {3}: Mobile Fort gets +3/-1 until end of turn and can attack this turn as though it didn't have defender. Play this ability only once each turn.
-id=5550
-name=Mobile Fort
-rarity=U
-type=Artifact Creature
-mana={4}
-power=0
-subtype=Wall
-toughness=6
-[/card]
 [card]
 text=When Monk Realist comes into play, destroy target enchantment.
 auto=may destroy target(enchantment)
@@ -1261,6 +1181,7 @@ mana={1}{W}
 [/card]
 [card]
 text=Whenever another card is put into a graveyard from anywhere, remove that card from the game.
+auto=@movedTo(*|graveyard):moveTo(Exile) ???
 id=5608
 name=Planar Void
 rarity=U
@@ -1302,14 +1223,7 @@ type=Enchantment
 mana={1}{U}
 subtype=Aura
 [/card]
-[card]
+
-text=Whenever a player plays an enchantment spell, counter it.
-id=8811
-name=Presence of the Master
-rarity=U
-type=Enchantment
-mana={3}{W}
-[/card]
 
 [card]
 text=At the beginning of your upkeep, Purging Scythe deals 2 damage to the creature with the least toughness. If two or more creatures are tied for least toughness, you choose one.
@@ -1319,14 +1233,7 @@ rarity=R
 type=Artifact
 mana={5}
 [/card]
-[card]
+
-text=Until end of turn, lands you control gain "Sacrifice this land: Add {B} to your mana pool."
-id=5831
-name=Rain of Filth
-rarity=U
-type=Instant
-mana={B}
-[/card]
 [card]
 text=Destroy two target lands.
 id=5761
@@ -1362,17 +1269,7 @@ rarity=R
 type=Enchantment
 mana={3}{U}{U}
 [/card]
-[card]
+
-text=At the beginning of your upkeep, if you control another nonland permanent, sacrifice Reclusive Wight.
-id=8803
-name=Reclusive Wight
-rarity=U
-type=Creature
-mana={3}{B}
-power=4
-subtype=Zombie Minion
-toughness=4
-[/card]
 [card]
 text=Prevent all damage that would be dealt this turn to up to two target creatures.
 id=9716
@@ -1420,14 +1317,7 @@ rarity=C
 type=Instant
 mana={1}{U}{U}
 [/card]
-[card]
+
-text=Creatures you control have "Whenever this creature becomes blocked, it gets +1/+1 until end of turn for each creature blocking it."
-id=10408
-name=Retaliation
-rarity=U
-type=Enchantment
-mana={2}{G}
-[/card]
 [card]
 text=Whenever Retromancer becomes the target of a spell or ability, Retromancer deals 3 damage to that spell or ability's controller.
 id=5826
@@ -1677,28 +1567,8 @@ type=Enchantment
 mana={B}
 subtype=Aura
 [/card]
-[card]
+
-text=Flying     When you play a creature spell, sacrifice Skittering Skirge.
+
-id=5573
-name=Skittering Skirge
-rarity=C
-type=Creature
-mana={B}{B}
-power=3
-subtype=Imp
-toughness=2
-[/card]
-[card]
-text=When Sleeper Agent comes into play, target opponent gains control of it.      At the beginning of your upkeep, Sleeper Agent deals 2 damage to you.
-id=5751
-name=Sleeper Agent
-rarity=R
-type=Creature
-mana={B}
-power=3
-subtype=Minion
-toughness=3
-[/card]
 [card]
 text=Slippery Karst comes into play tapped.     {T}: Add {G} to your mana pool.     Cycling {2} ({2}, Discard this card: Draw a card.)
 id=5803
@@ -2154,17 +2024,7 @@ power=6
 subtype=Wurm
 toughness=6
 [/card]
-[card]
+
-text=Swampwalk     {T}: Add {B}{B}{B}{B} to your mana pool. Target opponent gains control of Witch Engine. (Play this ability only any time you could play an instant.)
-id=5836
-name=Witch Engine
-rarity=R
-type=Creature
-mana={5}{B}
-power=4
-subtype=Horror
-toughness=4
-[/card]
 [card]
 text={T}: Return Wizard Mentor and target creature you control to their owner's hand.
 id=8907

projects/mtg/bin/Res/test/_tests.txt

@@ -135,6 +135,7 @@ siege_gang_commander.txt
 shivan_hellkite.txt
 shock.txt
 slate_of_ancestry.txt
+sleeper_agent.txt
 soulblast.txt
 sphinx_summoner.txt
 spitting_earth.txt

projects/mtg/bin/Res/test/sleeper_agent.txt

@@ -0,0 +1,25 @@
+#Testing sleeper agent
+[INIT]
+SECONDMAIN
+[PLAYER1]
+hand:sleeper agent
+manapool:{B}
+[PLAYER2]
+[DO]
+sleeper agent
+eot
+eot
+next
+#upkeep
+next
+#draw
+next
+#first
+[ASSERT]
+FIRSTMAIN
+[PLAYER1]
+manapool:{0}
+[PLAYER2]
+life:18
+inplay:sleeper agent
+[END]

projects/mtg/include/AllAbilities.h

@@ -439,7 +439,7 @@ public:
 
         //inplay is a special zone !
         for (int i=0; i < 2; i++){
-          if (destZone == g->players[i]->game->inPlay){
+          if (destZone == g->players[i]->game->inPlay && fromZone != g->players[i]->game->inPlay && fromZone != g->players[i]->opponent()->game->inPlay){
               MTGCardInstance * copy = g->players[i]->game->putInZone(_target,  fromZone, g->players[i]->game->stack);
               Spell * spell = NEW Spell(copy);
 
@@ -1589,7 +1589,8 @@ class AForeach:public ListMaintainerAbility{
 class AADamager:public ActivatedAbility{
 public:
   int damage;
-AADamager(int _id, MTGCardInstance * _source, Damageable * _target, int _damage = 0, ManaCost * _cost=NULL):ActivatedAbility(_id,_source,_cost),damage(_damage){
+  int who;
+AADamager(int _id, MTGCardInstance * _source, Damageable * _target, int _damage = 0, ManaCost * _cost=NULL, int who=0):ActivatedAbility(_id,_source,_cost),damage(_damage),who(who){
     if (_target) target = _target; 
     aType = MTGAbility::DAMAGER;
  }
@@ -1597,6 +1598,9 @@ AADamager(int _id, MTGCardInstance * _source, Damageable * _target, int _damage
   int resolve(){
     if(target){
       Damageable * _target = (Damageable *)target;
+      if (who ==1){
+        _target = ((MTGCardInstance *) target)->controller();
+      }      
       game->mLayers->stackLayer()->addDamage(source,_target, damage);
       game->mLayers->stackLayer()->resolve();
       return 1;

projects/mtg/src/MTGAbility.cpp

@@ -389,8 +389,9 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
 
     Damageable * d = NULL;
     if (spell) d = spell->getNextDamageableTarget();
-    if (s.find("controller") != string::npos) d = card->controller();
+    int who = 0;
-    MTGAbility * a =  NEW AADamager(id,card,d, damage);
+    if (s.find("controller") != string::npos) who=1;
+    MTGAbility * a =  NEW AADamager(id,card,d, damage, NULL, who);
     a->oneShot = 1;
     return a;
   }