manifest support

also fix guiplay
2017-03-09 07:44:06 +08:00
parent 01d46615a7
commit 53f0c2421d
9 changed files with 230 additions and 67 deletions
--- a/projects/mtg/src/ManaCost.cpp
+++ b/projects/mtg/src/ManaCost.cpp
@@ -217,7 +217,17 @@ ManaCost * ManaCost::parseManaCost(string s, ManaCost * _manaCost, MTGCardInstan
                        }
                        break;
                    case 'm': //Mill yourself as a cost
-                        manaCost->addExtraCost(NEW MillCost(tc));
+                        {
+                            if (value == "mycost")
+                            {
+                                if(c && c->model)
+                                    manaCost->add(c->model->data->getManaCost());
+                                else
+                                    break;
+                            }
+                            else
+                                manaCost->addExtraCost(NEW MillCost(tc));
+                        }
                        break;
                    case 'n': //return unblocked attacker cost
                        {