[wagic] r4883 committed - Fixed: exile was not meaning both exiles...

[wa...@googlecode.com]

Revision: 4883
Author: pankdm
Date: Fri Oct 18 06:35:52 2013 UTC
Log: Fixed: exile was not meaning both exiles

and revised Crypt Incursion
http://code.google.com/p/wagic/source/detail?r=4883

Modified:
/trunk/projects/mtg/bin/Res/sets/primitives/mtg.txt
/trunk/projects/mtg/src/MTGAbility.cpp
/trunk/projects/mtg/src/TargetChooser.cpp

=======================================
--- /trunk/projects/mtg/bin/Res/sets/primitives/mtg.txt Fri Oct 18 06:35:02
2013 UTC
+++ /trunk/projects/mtg/bin/Res/sets/primitives/mtg.txt Fri Oct 18 06:35:52
2013 UTC
File is too large to display a diff.
=======================================
--- /trunk/projects/mtg/src/MTGAbility.cpp Fri Oct 18 06:34:23 2013 UTC
+++ /trunk/projects/mtg/src/MTGAbility.cpp Fri Oct 18 06:35:52 2013 UTC
@@ -745,7 +745,8 @@
fromTc = tcf.createTargetChooser(starget, card);
fromTc->targetter = NULL; //avoid protection from
}
- TriggeredAbility * mover = NEW TrCardAddedToZone(observer, id,
card, (TargetZoneChooser *) toTc, toTcCard, (TargetZoneChooser *) fromTc,
fromTcCard,once,sourceUntapped,isSuspended);
+ TriggeredAbility * mover = NEW TrCardAddedToZone(observer, id,
card, (TargetZoneChooser *) toTc,
+ toTcCard, (TargetZoneChooser *) fromTc, fromTcCard, once,
sourceUntapped, isSuspended);
if(neverRemove)
{
mover->forcedAlive = 1;
=======================================
--- /trunk/projects/mtg/src/TargetChooser.cpp Sun Sep 15 02:57:29 2013 UTC
+++ /trunk/projects/mtg/src/TargetChooser.cpp Fri Oct 18 06:35:52 2013 UTC
@@ -151,6 +151,7 @@
}
zones[nbzones] = MTGGameZone::MY_BATTLEFIELD;

+ // First, check if it defines multiple zones
if (zoneName.compare("*") == 0)
{
zones[nbzones++] = MTGGameZone::ALL_ZONES;
@@ -191,6 +192,11 @@
zones[nbzones++] = MTGGameZone::MY_STACK;
zones[nbzones++] = MTGGameZone::OPPONENT_STACK;
}
+ else if (zoneName.compare("exile") == 0)
+ {
+ zones[nbzones++] = MTGGameZone::MY_EXILE;
+ zones[nbzones++] = MTGGameZone::OPPONENT_EXILE;
+ }
else
{
int zone = MTGGameZone::zoneStringToId(zoneName);