Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed: exile was not meaning both exiles

Browse Source 
and revised Crypt Incursion
This commit is contained in:
pankdm
2013-10-18 06:35:52 +00:00
parent 173f787fac
commit 9d2a2454b2
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
projects/mtg/bin/Res/sets/primitives/mtg.txt
View File

@@ -18343,8 +18343,9 @@ toughness=2
[/card] [/card]
[card] [card]
name=Crypt Incursion name=Crypt Incursion
auto=@movedto(creature|exile) from(graveyard):life:3 target=player
auto=choice target(player) moveTo(exile) all(creature|targetedpersonsgraveyard) auto=@movedto(creature|exile) from(targetedPersonsGraveyard):life:3
auto=moveTo(exile) all(creature|targetedPersonsGraveyard)
text=Exile all creature cards from target player's graveyard. -- You gain 3 life for each card exiled this way. text=Exile all creature cards from target player's graveyard. -- You gain 3 life for each card exiled this way.
mana={2}{B} mana={2}{B}
type=Instant type=Instant

3
projects/mtg/src/MTGAbility.cpp
View File

@@ -745,7 +745,8 @@ TriggeredAbility * AbilityFactory::parseTrigger(string s, string, int id, Spell
fromTc = tcf.createTargetChooser(starget, card); fromTc = tcf.createTargetChooser(starget, card);
fromTc->targetter = NULL; //avoid protection from 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) if(neverRemove)
{ {
mover->forcedAlive = 1; mover->forcedAlive = 1;

6
projects/mtg/src/TargetChooser.cpp
View File

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