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

Fixes for exclusion/inclusion combinations of colors or abilities.

Browse Source
This commit is contained in:
wrenczes
2011-04-28 05:01:06 +00:00
parent 7e4364b484
commit 8610531bf3
6 changed files with 94 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -576,10 +576,9 @@ TargetChooser * TargetChooserFactory::createTargetChooser(string s, MTGCardInsta
{
attributefound = 1;
if (minus)
{
cd->mode = CD_NOT;
}
cd->setColor(cid);
cd->SetExclusionColor(cid);
else
cd->setColor(cid);
}
}
if (!attributefound)
@@ -591,10 +590,9 @@ TargetChooser * TargetChooserFactory::createTargetChooser(string s, MTGCardInsta
{
attributefound = 1;
if (minus)
{
cd->mode = CD_NOT;
}
cd->basicAbilities.set(j);
cd->mAbilityExclusions.set(j);
else
cd->basicAbilities.set(j);
}
}
}
@@ -613,7 +611,7 @@ TargetChooser * TargetChooserFactory::createTargetChooser(string s, MTGCardInsta
}
}
}
if (nbminuses && cd->mode != CD_NOT)
if (nbminuses)
cd->mode = CD_AND;
typeName = typeName.substr(0, found);
}