Completed STX set, fixed/added primitives, improved Android downloader, implemented the usage of ^ instead of , char (e.g. target multiple zones within transforms keyword), improved the code to avoid the multiple triggers in case of abilities gained from other cards (e.g. Kasmina, Enigma Sage).
This commit is contained in:
@@ -6219,11 +6219,18 @@ int ActivatedAbility::isReactingToClick(MTGCardInstance * card, ManaCost * mana)
|
||||
return 1;
|
||||
if(card->hasType(Subtypes::TYPE_PLANESWALKER))
|
||||
{
|
||||
for(unsigned int k = 0;k < card->cardsAbilities.size();++k)
|
||||
/*for(unsigned int k = 0;k < card->cardsAbilities.size();++k)
|
||||
{
|
||||
ActivatedAbility * check = dynamic_cast<ActivatedAbility*>(card->cardsAbilities[k]);
|
||||
if(check && check->counters)
|
||||
return 0;
|
||||
}*/
|
||||
// Improved the check to avoid the multiple triggers in case of abilities gained from other cards (e.g. Kasmina, Enigma Sage)
|
||||
for(unsigned int k = 0;k < card->getObserver()->mLayers->actionLayer()->mObjects.size();++k)
|
||||
{
|
||||
ActivatedAbility * check = dynamic_cast<ActivatedAbility*>(card->getObserver()->mLayers->actionLayer()->mObjects[k]);
|
||||
if(check && check->source == card && check->counters)
|
||||
return 0;
|
||||
}
|
||||
if (player != game->currentPlayer)
|
||||
return 0;
|
||||
|
||||
@@ -171,6 +171,7 @@ TargetChooser * TargetChooserFactory::createTargetChooser(string s, MTGCardInsta
|
||||
s2 = s.substr(found + 1);
|
||||
while (s2.size())
|
||||
{
|
||||
replace(s2.begin(), s2.end(), '^', ','); // To allow the usage of ^ instead of , char (e.g. target multiple zones within transforms keyword)
|
||||
found = s2.find(",");
|
||||
string zoneName;
|
||||
if (found != string::npos)
|
||||
|
||||
Reference in New Issue
Block a user