revised "colorless" attribute in targetchooser

also fix worldly tutor
2016-09-04 13:14:19 +08:00
parent 5101ac9d8e
commit f11cc41df8
5 changed files with 23 additions and 6 deletions
--- a/projects/mtg/src/TargetChooser.cpp
+++ b/projects/mtg/src/TargetChooser.cpp
@@ -790,11 +790,15 @@ TargetChooser * TargetChooserFactory::createTargetChooser(string s, MTGCardInsta
                    if (attribute.find("colorless") != string::npos)
                    {
                        attributefound = 1;
-                        for (int cid = 1; cid < Constants::NB_Colors; cid++)
+                        /*for (int cid = 1; cid < Constants::NB_Colors; cid++)
                        {
                            cd->SetExclusionColor(cid);
                        }
-                        cd->mode = CardDescriptor::CD_OR;
+                        cd->mode = CardDescriptor::CD_OR;*/
+                        if (minus)
+                            cd->CDnocolor = -1;
+                        else
+                            cd->CDnocolor = 1;
                    }

                    if (attribute.find("chosencolor") != string::npos)