ok this is the last commit but i had massive issues after chopping it all up, hopefully it doesn't hilight everything that was already commited...if it does i apologize my own patch started giving me conflicts....

im like 7 tries into commiting this part....
2012-03-13 17:54:24 +00:00
parent b20b75df33
commit 0210ecf28c
15 changed files with 1269 additions and 126 deletions
@@ -574,6 +574,29 @@ TargetChooser * TargetChooserFactory::createTargetChooser(string s, MTGCardInsta
                                cd->setColor(cid);
                        }
                    }
+
+                    if (attribute.find("chosencolor") != string::npos)
+                    {
+                        attributefound = 1;
+                        if (minus)
+                            cd->SetExclusionColor(card->chooseacolor);
+                        else
+                            cd->setColor(card->chooseacolor);
+                    }
+
+                    if (attribute.find("chosentype") != string::npos)
+                    {
+                        attributefound = 1;
+                        if (minus)
+                        {
+                            cd->setNegativeSubtype(card->chooseasubtype);
+                        }
+                        else
+                        {
+                            cd->setSubtype(card->chooseasubtype);
+                        }
+                    }
+
                    if (!attributefound)
                    {
                        //Abilities