removed alias for overload

2016-07-06 05:23:25 +08:00
parent 16f7ae54b8
commit 51d06d8234
4 changed files with 27 additions and 25 deletions
@@ -159,11 +159,12 @@ const char* Constants::MTGBasicAbilities[] = {
    "combattoughness",
    "cantpaylife",
    "cantbesacrified",
-	"skulk",
-	"menace",
-	"nosolo",
-	"mustblock",
-	"dethrone",
+    "skulk",
+    "menace",
+    "nosolo",
+    "mustblock",
+    "dethrone",
+    "overload",
 };

 map<string,int> Constants::MTGBasicAbilitiesMap;
@@ -687,7 +687,7 @@ PermanentAbility(observer, _id)

 int MTGAlternativeCostRule::isReactingToClick(MTGCardInstance * card, ManaCost * mana)
 {
-    if (card->alias == 11000)
+    if (card->has(Constants::OVERLOAD))
        return 0;//overload has its own rule
    if(!card->getManaCost()->getAlternative())
        return 0;
@@ -1410,7 +1410,7 @@ MTGAlternativeCostRule(observer, _id)

 int MTGOverloadRule::isReactingToClick(MTGCardInstance * card, ManaCost * mana)
 {
-    if (card->alias != 11000)
+    if (!card->has(Constants::OVERLOAD))
        return 0;
    Player * player = game->currentlyActing();
    ManaCost * cost = NEW ManaCost(card->model->data->getManaCost()->getAlternative());