-fix for issue 489 (protection prevents some triggers to happen)
This commit is contained in:
wagic.the.homebrew@gmail.com
2010-12-07 14:12:04 +00:00
parent 7676ad5e79
commit c28c14171f
4 changed files with 11 additions and 5 deletions
+4 -2
View File
@@ -137,9 +137,10 @@ TriggeredAbility * AbilityFactory::parseTrigger(string s, string magicText, int
found = end + 1;
}
toTcCard->setAllZones();
toTcCard->targetter = NULL; //avoid protection from
starget = starget.substr(found, end - found).insert(0, "*|");
toTc = tcf.createTargetChooser(starget, card);
toTc->targetter = NULL;
toTc->targetter = NULL; //avoid protection from
TargetChooser *fromTc = NULL;
TargetChooser * fromTcCard = NULL;
@@ -158,10 +159,11 @@ TriggeredAbility * AbilityFactory::parseTrigger(string s, string magicText, int
found = end + 1;
}
fromTcCard->setAllZones();
fromTcCard->targetter=NULL; //avoid protection from
end = s.find(")", found);
starget = s.substr(found, end - found).insert(0, "*|");
fromTc = tcf.createTargetChooser(starget, card);
fromTc->targetter = NULL;
fromTc->targetter = NULL; //avoid protection from
}
return NEW TrCardAddedToZone(id, card, (TargetZoneChooser *) toTc, toTcCard, (TargetZoneChooser *) fromTc, fromTcCard);
}