Erwan

-Added a few cards

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

@@ -1,4 +1,15 @@
 [card]
+text={U}, Sacrifice AEther Spellbomb: Return target creature to its owner's hand.     {1}, Sacrifice AEther Spellbomb: Draw a card.
+auto={U}{S}:moveTo(ownerhand) target(creature)
+auto={1}{S}:draw:1
+id=48113
+name=AEther Spellbomb
+color=Artifact
+rarity=C
+mana={1}
+type=Artifact
+[/card]
+[card]
 id=49045
 name=Alpha Myr
 color=Artifact
@@ -21,6 +32,14 @@ mana={2}{W}{W}
 type=Instant
 [/card]
 [card]
+text=(Ancient Den isn't a spell.)  {T}: Add {W} to your mana pool.
+id=46063
+name=Ancient Den
+rarity=C
+type=Land
+subtype=artifact
+[/card]
+[card]
 text=Counter target artifact or enchantment spell.
 target=artifact,enchantment|stack
 auto=fizzle
@@ -57,17 +76,6 @@ power=1
 toughness=1
 [/card]
 [card]
-text={U}, Sacrifice AEther Spellbomb: Return target creature to its owner's hand.     {1}, Sacrifice AEther Spellbomb: Draw a card.
-auto={U}{S}:moveTo(ownerhand) target(creature)
-auto={1}{S}:draw:1
-id=48113
-name=AEther Spellbomb
-color=Artifact
-rarity=C
-mana={1}
-type=Artifact
-[/card]
-[card]
 text={T}: Add {1} to your mana pool.    {2}, {T}: Tap target noncreature artifact.
 auto={T}: Add {1}
 auto={2}{T}:Tap target(artifact[-creature])
@@ -103,6 +111,19 @@ subtype=Construct
 toughness=3
 [/card]
 [card]
+text={1}, {T}, Sacrifice Chromatic Sphere: Add one mana of any color to your mana pool. Draw a card.
+auto={1}{T}{S}:Add{G} && Draw:1
+auto={1}{T}{S}:Add{R} && Draw:1
+auto={1}{T}{S}:Add{U} && Draw:1
+auto={1}{T}{S}:Add{B} && Draw:1
+auto={1}{T}{S}:Add{W} && Draw:1
+id=46046
+name=Chromatic Sphere
+rarity=C
+type=Artifact
+mana={1}
+[/card]
+[card]
 text=Cloudpost comes into play tapped.     {T}: Add {1} to your mana pool for each Locus in play.
 auto=tap
 auto={T}:foreach(Locus)add:{1}
@@ -186,6 +207,20 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
+text=Protection from white At the end of your turn, you lose 4 life. Whenever a creature is put into a graveyard from play, you gain 2 life.
+abilities=protection from white
+auto=@movedTo(creature|graveyard) from(battlefield):life:2
+auto=@each my end:life:-4
+id=50537
+name=Dross Harvester
+rarity=R
+type=Creature
+mana={1}{B}{B}
+power=4
+subtype=Horror
+toughness=4
+[/card]
+[card]
 text=Fear
 id=48570
 name=Dross Prowler
@@ -212,6 +247,16 @@ power=2
 toughness=2
 [/card]
 [card]
+text=Search your library for an artifact card, reveal it, and put it into your hand. Then shuffle your library.
+target=artifact|mylibrary
+auto=moveTo(myhand)
+id=48568
+name=Fabricate
+rarity=U
+type=Sorcery
+mana={2}{U}
+[/card]
+[card]
 text=Trample
 id=46115
 name=Fangren Hunter
@@ -346,6 +391,15 @@ mana={3}
 type=Artifact
 [/card]
 [card]
+text=(Great Furnace isn't a spell.)  {T}: Add {R} to your mana pool.
+auto={T}:Add{R}
+id=46066
+name=Great Furnace
+rarity=C
+type=Land
+subtype=Artifact
+[/card]
+[card]
 text={3}, {T} or {G}, {T}:Target creature gains trample until end of turn.
 auto={3}{T}:trample target(creature)
 auto={G}{T}:trample target(creature)
@@ -380,6 +434,17 @@ mana={4}
 type=Artifact
 [/card]
 [card]
+text=Enchant artifact     Enchanted artifact doesn't untap during its controller's untap step.
+target=artifact
+auto=doesnotuntap
+id=49443
+name=Inertia Bubble
+rarity=C
+type=Enchantment
+mana={1}{U}
+subtype=Aura
+[/card]
+[card]
 text={T}: Add {R} to your mana pool.
 id=46048
 auto={T}:Add {R}
@@ -393,6 +458,16 @@ power=1
 toughness=1
 [/card]
 [card]
+text=Target creature gets -1/-1 until end of turn for each artifact you control.
+id=48585
+target=creature
+auto=foreach(artifact|myinplay) -1/-1
+name=Irradiate
+rarity=C
+type=Instant
+mana={3}{B}
+[/card]
+[card]
 text={U}
 id=48410
 auto={T}:Add {U}
@@ -429,6 +504,30 @@ rarity=L
 subtype=Island
 [/card]
 [card]
+text=Sacrifice an artifact: Krark-Clan Grunt gets +1/+0 and gains first strike until end of turn.
+auto={S(artifact|myInPlay)}:1/0 && fisrt strike
+id=45992
+name=Krark-Clan Grunt
+rarity=C
+type=Creature
+mana={2}{R}
+power=2
+subtype=Goblin Warrior
+toughness=2
+[/card]
+[card]
+text=Sacrifice an artifact: Krark-Clan Shaman deals 1 damage to each creature without flying.
+auto={S(artifact|myinplay)}:damage:1 all(creature[-flying])
+id=45994
+name=Krark-Clan Shaman
+rarity=C
+type=Creature
+mana={R}
+power=1
+subtype=Goblin Shaman
+toughness=1
+[/card]
+[card]
 text={T}: Add {B} to your mana pool.
 id=46040
 auto={T}:Add {B}
@@ -454,6 +553,28 @@ subtype=Cat Cleric
 toughness=5
 [/card]
 [card]
+text=Flash     {2}, Sacrifice Leonin Bladetrap: Leonin Bladetrap deals 2 damage to each attacking creature without flying.
+abilities=flash
+auto={S}:damage:2 all(creature[attacking;-flying])
+id=48378
+name=Leonin Bladetrap
+rarity=U
+type=Artifact
+mana={3}
+[/card]
+[card]
+text=Whenever an artifact comes into play, you may gain 1 life.
+auto=@movedTo(artifact|battlefield):may life:1
+id=46072
+name=Leonin Elder
+rarity=C
+type=Creature
+mana={W}
+power=1
+subtype=Cat Cleric
+toughness=1
+[/card]
+[card]
 text=Flying
 id=45960
 name=Leonin Skyhunter
@@ -467,6 +588,15 @@ toughness=2
 abilities=flying
 [/card]
 [card]
+text={1}{W}: Creatures you control get +1/+1 until end of turn.
+auto={1}{W}:lord(creature|mybattlefield) 1/1
+id=49768
+name=Leonin Sun Standard
+rarity=R
+type=Artifact
+mana={2}
+[/card]
+[card]
 text=When Leveler comes into play, remove all cards in your library from the game.
 auto=moveTo(myremovedfromgame) all(*|mylibrary)
 id=46708
@@ -492,7 +622,31 @@ abilities=flying
 auto=may moveTo(ownerlibrary) target(artifact)
 [/card]
 [card]
-text=
+text={W}, {T}: Regenerate target artifact.
+auto={W}{T}:regenerate target(artifact)
+id=46071
+name=Loxodon Mender
+rarity=C
+type=Creature
+mana={5}{W}
+power=3
+subtype=Elephant Cleric
+toughness=3
+[/card]
+[card]
+text=Flying     Whenever an artifact comes into play under your control, you may tap target permanent.
+abilities=flying
+auto=@movedTo(artifact|mybattlefield):may tap target(*)
+id=45972
+name=Lumengrid Sentinel
+rarity=U
+type=Creature
+mana={2}{U}
+power=1
+subtype=Human Wizard
+toughness=2
+[/card]
+[card]
 id=48438
 name=Lumengrid Warden
 color=Blue
@@ -504,6 +658,19 @@ power=1
 toughness=3
 [/card]
 [card]
+text=Flying At the beginning of your upkeep, you may put a 1/1 white Spirit creature token with flying into play.
+abilities=flying
+auto=@each my upkeep:may token(Spirit,Creature Spirit,1/1,white flying)
+id=46546
+name=Luminous Angel
+rarity=R
+type=Creature
+mana={4}{W}{W}{W}
+power=4
+subtype=Angel
+toughness=4
+[/card]
+[card]
 text={1}{G}: Malachite Golem gains trample until end of turn.
 id=48056
 auto={1}{G}:trample
@@ -527,6 +694,30 @@ mana={R}
 type=Enchantment
 [/card]
 [card]
+text=Sacrifice an artifact: Megatog gets +3/+3 and gains trample until end of turn.
+auto={S(artifact|myinplay)}:3/3 && trample
+id=46579
+name=Megatog
+rarity=R
+type=Creature
+mana={4}{R}{R}
+power=3
+subtype=Atog
+toughness=4
+[/card]
+[card]
+text=When Moriok Scavenger comes into play, you may return target artifact creature card from your graveyard to your hand.
+auto=may moveTo(myhand) target(artifact|mygraveyard)
+id=45965
+name=Moriok Scavenger
+rarity=C
+type=Creature
+mana={3}{B}
+power=2
+subtype=Human Rogue
+toughness=3
+[/card]
+[card]
 text={R}
 id=48417
 auto={T}:Add {R}
@@ -775,6 +966,24 @@ mana={2}{U}
 type=Instant
 [/card]
 [card]
+text=As Sculpting Steel comes into play, you may choose an artifact in play. If you do, Sculpting Steel comes into play as a copy of that artifact.
+auto=may copy target(artifact)
+id=46720
+name=Sculpting Steel
+rarity=R
+type=Artifact
+mana={3}
+[/card]
+[card]
+text=(Seat of the Synod isn't a spell.)  {T}: Add {U} to your mana pool.
+auto={T}:Add{U}
+id=46064
+name=Seat of the Synod
+rarity=C
+type=Land
+subtype=Artifact
+[/card]
+[card]
 text=Add {R}{R}{R}{R}{R} to your mana pool.
 id=34945
 auto=Add:{R}{R}{R}{R}{R}
@@ -846,6 +1055,18 @@ power=1
 toughness=3
 [/card]
 [card]
+text=Defender (This creature can't attack.)
+id=48910
+name=Steel Wall
+rarity=C
+type=Artifact Creature
+mana={1}
+abilities=defender
+power=0
+subtype=Wall
+toughness=4
+[/card]
+[card]
 text={W}, Sacrifice Sunbeam Spellbomb: You gain 5 life.       {1}, Sacrifice Sunbeam Spellbomb: Draw a card.
 auto={W}{S}:life:5
 auto={1}{S}:draw:1
@@ -893,6 +1114,15 @@ rarity=L
 subtype=Swamp
 [/card]
 [card]
+text=Search your library for a land card, reveal it, and put it into your hand. Then shuffle your library.
+auto=moveTo(myhand) target(land|mylibrary)
+id=49529
+name=Sylvan Scrying
+rarity=U
+type=Sorcery
+mana={1}{G}
+[/card]
+[card]
 text={T}: Add {1} to your mana pool.     {T}: Add {U} or {B} to your mana pool. Talisman of Dominance deals 1 damage to you.
 id=39598
 name=Talisman of Dominance
@@ -1045,6 +1275,15 @@ type=Artifact
 mana={4}
 [/card]
 [card]
+text=(Tree of Tales isn't a spell.)  {T}: Add {G} to your mana pool.
+auto={T}:Add{G}
+id=46067
+name=Tree of Tales
+rarity=C
+type=Land
+subtype=Artifact
+[/card]
+[card]
 text=Troll Ascetic can't be the target of spells or abilities your opponents control.     {1}{G}: Regenerate Troll Ascetic. (The next time this creature would be destroyed this turn, it isn't. Instead tap it, remove all damage from it, and remove it from combat.)
 auto={1}{G}:regenerate
 abilities=opponentshroud
@@ -1058,6 +1297,51 @@ subtype=Troll Shaman
 toughness=2
 [/card]
 [card]
+text={1}{G}: Regenerate target green creature.
+auto={1}{G}:regenerate target(creature[green])
+id=46117
+name=Trolls of Tel-Jilad
+rarity=U
+type=Creature
+mana={5}{G}{G}
+power=5
+subtype=Troll Shaman
+toughness=6
+[/card]
+[card]
+text=(Vault of Whispers isn't a spell.)  {T}: Add {B} to your mana pool.
+auto={T}:Add{B}
+id=46065
+name=Vault of Whispers
+rarity=C
+type=Land
+subtype=Artifact
+[/card]
+[card]
+text=Whenever you play an artifact spell, draw a card.
+auto=@movedTo(artifact|mystack):draw:1
+id=46557
+name=Vedalken Archmage
+rarity=R
+type=Creature
+mana={2}{U}{U}
+power=0
+subtype=Vedalken Wizard
+toughness=2
+[/card]
+[card]
+text=Whenever an artifact comes into play, Vermiculos gets +4/+4 until end of turn.
+auto=@movedTo(artifact|mybattlefield):4/4
+id=47936
+name=Vermiculos
+rarity=R
+type=Creature
+mana={4}{B}
+power=1
+subtype=Horror
+toughness=1
+[/card]
+[card]
 text=Haste
 id=5585
 abilities=haste
@@ -1084,6 +1368,15 @@ subtype=Wall
 toughness=2
 [/card]
 [card]
+text=Sacrifice Welding Jar: Regenerate target artifact.
+auto={S}:regenerate target(artifact)
+id=48328
+name=Welding Jar
+rarity=C
+type=Artifact
+mana={0}
+[/card]
+[card]
 text=Vigilance
 id=46026
 name=Yotian Soldier

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

@@ -248,6 +248,16 @@ subtype=Spirit Avatar
 toughness=4
 [/card]
 [card]
+text=You may put a green creature card from your hand into play.
+id=154003
+target=creature[green]|myhand
+auto=moveto(myinplay)
+name=Dramatic Entrance
+rarity=R
+type=Instant
+mana={3}{G}{G}
+[/card]
+[card]
 text=Drove of Elves's power and toughness are each equal to the number of green permanents you control.     Drove of Elves can't be the target of spells or abilities your opponents control.
 id=157878
 name=Drove of Elves
@@ -283,6 +293,19 @@ type=Sorcery
 mana={3}{R}
 [/card]
 [card]
+text=Whenever you play a black spell, Emberstrike Duo gets +1/+1 until end of turn.     Whenever you play a red spell, Emberstrike Duo gains first strike until end of turn.
+auto=@movedTo(*[red]|mystack):1/1
+auto=@movedTo(*[red]|mystack):first strike
+id=153307
+name=Emberstrike Duo
+rarity=C
+type=Creature
+mana={1}{BR}
+power=1
+subtype=Elemental Warrior Shaman
+toughness=1
+[/card]
+[card]
 text=Flying     Faerie Swarm's power and toughness are each equal to the number of blue permanents you control.
 auto=foreach(*[blue]|myinplay) 1/1
 abilities=flying
@@ -394,6 +417,19 @@ subtype=Elemental Shaman
 toughness=2
 [/card]
 [card]
+text=When Furystoke Giant comes into play, other creatures you control gain "{T}: This creature deals 2 damage to target creature or player" until end of turn.     Persist (When this creature is put into a graveyard from play, if it had no -1/-1 counters on it, return it to play under its owner's control with a -1/-1 counter on it.)
+abilities=persist
+auto=all(creature) other {T}:damage:2 target(creature,player)
+id=152069
+name=Furystoke Giant
+rarity=R
+type=Creature
+mana={3}{R}{R}
+power=3
+subtype=Giant Warrior
+toughness=3
+[/card]
+[card]
 text=Flying     Other blue creatures you control get +1/+1.     Other black creatures you control get +1/+1.
 abilities=flying
 auto=lord(creature[blue]|myinplay) 1/1 other
@@ -408,6 +444,18 @@ subtype=Faerie Knight
 toughness=3
 [/card]
 [card]
+text=Reach     Gloomwidow can't block creatures without flying.
+abilities=reach,cloud
+id=147375
+name=Gloomwidow
+rarity=U
+type=Creature
+mana={2}{G}
+power=3
+subtype=Spider
+toughness=3
+[/card]
+[card]
 text=Persist (When this creature is put into a graveyard from play, if it had no -1/-1 counters on it, return it to play under its owner's control with a -1/-1 counter on it.)
 abilities=persist
 id=141935
@@ -420,6 +468,19 @@ subtype=Merfolk Soldier
 toughness=3
 [/card]
 [card]
+text=Whenever you play a blue spell, Gravelgill Duo gets +1/+1 until end of turn.     Whenever you play a black spell, Gravelgill Duo gains fear until end of turn.
+auto=@movedTo(*[blue]|mystack):1/1
+auto=@movedTo(*[blue]|mystack):fear
+id=153308
+name=Gravelgill Duo
+rarity=C
+type=Creature
+mana={2}{UB}
+power=2
+subtype=Merfolk Rogue Warrior
+toughness=1
+[/card]
+[card]
 text={T}: Add {1} to your mana pool.     {BR}, {T}: Add {B}{B}, {B}{R}, or {R}{R} to your mana pool.
 auto={T}:Add{1}
 auto={RB}{T}:Add{B}{B}
@@ -836,6 +897,32 @@ type=Instant
 mana={1}{GW}
 [/card]
 [card]
+text=White creatures you control have "{T}: You gain 1 life."
+auto=lord(creature[white]|mybattlefield) {T}:life:1
+id=141930
+name=Resplendent Mentor
+rarity=U
+type=Creature
+mana={4}{W}
+power=2
+subtype=Kithkin Cleric
+toughness=2
+[/card]
+[card]
+text=Whenever River Kelpie or another permanent is put into play from a graveyard, draw a card.     Whenever a spell is played from a graveyard, draw a card.     Persist (When this creature is put into a graveyard from play, if it had no -1/-1 counters on it, return it to play under its owner's control with a -1/-1 counter on it.)
+auto=@movedTo(*|graveyard) from(inPlay):draw:1
+auto=@movedTo(*|stack) from(graveyard):draw:1
+abilities=persist
+id=146094
+name=River Kelpie
+rarity=R
+type=Creature
+mana={3}{U}{U}
+power=3
+subtype=Beast
+toughness=3
+[/card]
+[card]
 text=Flying     {GW}{GW}: Rune-Cervin Rider gets +1/+1 until end of turn.
 abilities=flying
 auto={GW}{GW}:1/1
@@ -861,6 +948,19 @@ subtype=Goblin Warrior
 toughness=2
 [/card]
 [card]
+text=Whenever you play a green spell, Safehold Duo gets +1/+1 until end of turn.     Whenever you play a white spell, Safehold Duo gains vigilance until end of turn.
+auto=@movedTo(*[green]|mystack):1/1
+auto=@movedTo(*[white]|mystack):vigilance
+id=153963
+name=Safehold Duo
+rarity=C
+type=Creature
+mana={3}{GW}
+power=2
+subtype=Elf Warrior Shaman
+toughness=4
+[/card]
+[card]
 text=Persist (When this creature is put into a graveyard from play, if it had no -1/-1 counters on it, return it to play under its owner's control with a -1/-1 counter on it.)
 abilities=persist
 id=146077
@@ -883,6 +983,29 @@ type=Sorcery
 mana={GW}
 [/card]
 [card]
+text=Put a -1/-1 counter on target creature.
+id=142049
+abilities=wither
+auto=damage:1
+target=creature
+name=Scar
+rarity=C
+type=Instant
+mana={BR}
+[/card]
+[card]
+text={2}{G}{W}: Target creature gets +3/+3 until end of turn. Untap that creature.
+auto={2}{G}{W}:3/3 && untap target(creature)
+id=157872
+name=Seedcradle Witch
+rarity=U
+type=Creature
+mana={GW}
+power=1
+subtype=Elf Shaman
+toughness=1
+[/card]
+[card]
 text=Trample     Persist (When this creature is put into a graveyard from play, if it had no -1/-1 counters on it, return it to play under its owner's control with a -1/-1 counter on it.)
 abilities=trample,persist
 id=152078
@@ -919,6 +1042,18 @@ subtype=Elemental Warrior
 toughness=1
 [/card]
 [card]
+text=When Somnomancer comes into play, you may tap target creature.
+auto=may tap target(creature)
+id=147399
+name=Somnomancer
+rarity=C
+type=Creature
+mana={1}{WU}
+power=2
+subtype=Kithkin Wizard
+toughness=1
+[/card]
+[card]
 text=Haste     {T}: Target black or red creature gains haste until end of turn.
 abilities=haste
 auto={T}:haste target(creature[black;red])
@@ -1013,6 +1148,18 @@ subtype=Goblin Warrior
 toughness=1
 [/card]
 [card]
+text={R}{G}: Each blocked creature gets +1/+0 and gains trample until end of turn.
+auto={R}{G}:all(creature[blocked]) 1/0 && all(creature[blocked]) trample
+id=157884
+name=Tattermunge Witch
+rarity=U
+type=Creature
+mana={1}{RG}
+power=2
+subtype=Goblin Shaman
+toughness=1
+[/card]
+[card]
 text=Whenever you play a white spell, Thistledown Duo gets +1/+1 until end of turn.     Whenever you play a blue spell, Thistledown Duo gains flying until end of turn.
 auto=@movedTo(*[white]|mystack):1/1
 auto=@movedTo(*[blue]|mystack):flying

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

@@ -70,6 +70,7 @@ doomed_necromancer.txt
 dragon_fodder.txt
 drain_life.txt
 drift_of_the_dead.txt
+dross_harvester.txt
 elvish_piper.txt
 elvish_promenade.txt
 fastbond.txt

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

@@ -0,0 +1,28 @@
+#text=At the end of your turn, you lose 4 life. Whenever a creature is put into a graveyard from play, you gain 2 life.
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+inplay:swamp,plains,dross harvester,grizzly bears
+hand:terror
+[PLAYER2]
+[DO]
+eot
+eot
+next
+#upkeep
+next
+#draw
+next
+#main
+swamp
+plains
+terror
+grizzly bears
+[ASSERT]
+FIRSTMAIN
+[PLAYER1]
+graveyard:terror,grizzly bears
+inplay:swamp,plains,dross harvester
+life:18
+[PLAYER2]
+[END]

projects/mtg/include/MTGAbility.h

@@ -162,7 +162,8 @@ class ListMaintainerAbility:public MTGAbility{
 class TriggerAtPhase:public TriggeredAbility{
  public:
   int phaseId;
-  TriggerAtPhase(int id, MTGCardInstance * source, Targetable * target,int _phaseId);
+  int who;
+  TriggerAtPhase(int id, MTGCardInstance * source, Targetable * target,int _phaseId, int who = 0);
   virtual int trigger();
   int resolve(){return 0;};
   virtual TriggerAtPhase* clone() const;
@@ -171,7 +172,7 @@ class TriggerAtPhase:public TriggeredAbility{
 class TriggerNextPhase:public TriggerAtPhase{
  public:
   int destroyActivated;
-  TriggerNextPhase(int id, MTGCardInstance * source, Targetable * target,int _phaseId);
+  TriggerNextPhase(int id, MTGCardInstance * source, Targetable * target,int _phaseId, int who = 0);
   virtual TriggerNextPhase* clone() const;
   virtual int testDestroy();
 

projects/mtg/src/MTGAbility.cpp

@@ -71,24 +71,42 @@ TriggeredAbility * AbilityFactory::parseTrigger(string magicText, int id, Spell
   size_t found = magicText.find("@");
   if (found == string::npos) return NULL;
 
+  found = magicText.find(":");
+  if (found == string::npos) return NULL;
+  string s = magicText.substr(0,found);
+
   //Card Changed Zone
-  found = magicText.find("movedto(");
+  found = s.find("movedto(");
   if (found != string::npos){
-    size_t end = magicText.find (")");
+    size_t end = s.find (")");
-    string starget = magicText.substr(found+8,end - found - 8);
+    string starget = s.substr(found+8,end - found - 8);
     TargetChooserFactory tcf;
     TargetChooser *toTc = tcf.createTargetChooser(starget,card);
     toTc->targetter = NULL;
-    return NEW TrCardAddedToZone(id,card,toTc);
+
+    TargetChooser *fromTc = NULL;
+    found = s.find("from(");
+    if (found != string::npos){
+      end = s.find (")", found);
+      starget = s.substr(found+5,end - found - 5);
+      if (starget.find("|") == string::npos) starget.insert(0,"*|");
+      fromTc = tcf.createTargetChooser(starget,card);
+      fromTc->targetter = NULL;
+    }
+    return NEW TrCardAddedToZone(id,card,toTc,(TargetZoneChooser *)fromTc);
   }
 
+  int who = 0;
+  if (s.find("my") != string::npos) who = 1;
+  if (s.find("opponent") != string::npos) who = -1;
+
   //Next Time...
-  found = magicText.find("next");
+  found = s.find("next");
   if (found != string::npos){
     for (int i = 0; i < Constants::NB_MTG_PHASES; i++){
-      found = magicText.find(Constants::MTGPhaseCodeNames[i]);
+      found = s.find(Constants::MTGPhaseCodeNames[i]);
       if (found != string::npos){
-	      return NEW TriggerNextPhase(id, card,target,i);
+	      return NEW TriggerNextPhase(id, card,target,i,who);
       }
     }
   }
@@ -99,7 +117,7 @@ TriggeredAbility * AbilityFactory::parseTrigger(string magicText, int id, Spell
     for (int i = 0; i < Constants::NB_MTG_PHASES; i++){
       found = magicText.find(Constants::MTGPhaseCodeNames[i]);
       if (found != string::npos){
-	      return NEW TriggerAtPhase(id, card,target,i);
+	      return NEW TriggerAtPhase(id, card,target,i,who);
       }
     }
   }
@@ -2332,16 +2350,28 @@ ostream& ListMaintainerAbility::toString(ostream& out) const
 
 
 
-TriggerAtPhase::TriggerAtPhase(int id, MTGCardInstance * source, Targetable * target,int _phaseId):TriggeredAbility(id, source,target),phaseId(_phaseId){
+TriggerAtPhase::TriggerAtPhase(int id, MTGCardInstance * source, Targetable * target,int _phaseId, int who):TriggeredAbility(id, source,target),phaseId(_phaseId),who(who){
   GameObserver * g = GameObserver::GetInstance();
   newPhase = g->getCurrentGamePhase();
   currentPhase = newPhase;
 }
 
 int TriggerAtPhase::trigger(){
+  GameObserver * g = GameObserver::GetInstance();
   int result = 0;
   if (currentPhase != newPhase && newPhase == phaseId){
-    result = 1;
+    result = 0;
+    switch(who){
+      case 1:
+        if(g->currentPlayer == source->controller()) result = 1;
+        break;
+      case -1:
+        if(g->currentPlayer != source->controller()) result = 1;
+        break;
+      default:
+        result = 1;
+        break;
+    }
   }
   return result;
 }
@@ -2352,7 +2382,7 @@ TriggerAtPhase* TriggerAtPhase::clone() const{
     return a;
 }
 
-TriggerNextPhase::TriggerNextPhase(int id, MTGCardInstance * source, Targetable * target,int _phaseId):TriggerAtPhase(id, source,target,_phaseId){
+TriggerNextPhase::TriggerNextPhase(int id, MTGCardInstance * source, Targetable * target,int _phaseId,int who):TriggerAtPhase(id, source,target,_phaseId, who){
   destroyActivated = 0;
 }