removed alias for overload

projects/mtg/bin/Res/sets/primitives/mtg.txt

@@ -11945,7 +11945,7 @@ toughness=1
 [/card]
 [card]
 name=Blustersquall
-alias=11000
+abilities=overload
 other={3}{U} name(Overload)
 target=creature|opponentbattlefield
 auto=overload tap all(creature|opponentbattlefield)
@@ -17740,7 +17740,7 @@ type=Sorcery
 [/card]
 [card]
 name=Chemister's Trick
-alias=11000
+abilities=overload
 other={3}{U}{R} name(Overload)
 target=creature|opponentbattlefield
 auto=paidmana -2/0
@@ -21242,7 +21242,7 @@ type=Instant
 [/card]
 [card]
 name=Counterflux
-alias=11000
+abilities=overload
 other={1}{U}{U}{R} name(Overload)
 abilities=nofizzle
 target=*|opponentstack
@@ -23234,7 +23234,7 @@ toughness=4
 [/card]
 [card]
 name=Cyclonic Rift
-alias=11000
+abilities=overload
 other={6}{U} name(Overload)
 target=*[-land]|opponentbattlefield
 auto=overload moveto(ownerhand) all(*[-land]|opponentbattlefield)
@@ -28428,7 +28428,7 @@ type=Instant
 [/card]
 [card]
 name=Downsize
-alias=11000
+abilities=overload
 other={2}{U} name(Overload)
 target=creature|opponentbattlefield
 auto=overload -4/0 all(creature|opponentbattlefield)
@@ -30857,7 +30857,7 @@ subtype=Aura
 [/card]
 [card]
 name=Dynacharge
-alias=11000
+abilities=overload
 other={2}{R} name(Overload)
 target=creature|mybattlefield
 auto=paidmana 2/0
@@ -31703,7 +31703,7 @@ toughness=1
 [/card]
 [card]
 name=Electrickery
-alias=11000
+abilities=overload
 other={1}{R} name(Overload)
 target=creature|opponentbattlefield
 auto=paidmana damage:1
@@ -69425,7 +69425,7 @@ toughness=4
 [/card]
 [card]
 name=Mizzium Mortars
-alias=11000
+abilities=overload
 other={3}{R}{R}{R} name(Overload)
 target=creature|opponentbattlefield
 auto=paidmana damage:4
@@ -69436,7 +69436,7 @@ type=Sorcery
 [/card]
 [card]
 name=Mizzium Skin
-alias=11000
+abilities=overload
 other={1}{U} name(Overload)
 target=creature|mybattlefield
 auto=paidmana 0/1
@@ -106157,7 +106157,7 @@ toughness=3
 [/card]
 [card]
 name=Street Spasm
-alias=11000
+abilities=overload
 other={X}{X}{R}{R} name(Overload)
 target=creature[-flying]|opponentbattlefield
 auto=paidmana damage:X
@@ -109796,7 +109796,7 @@ toughness=2
 [/card]
 [card]
 name=Teleportal
-alias=11000
+abilities=overload
 other={3}{U}{R} name(Overload)
 target=creature|mybattlefield
 auto=paidmana 1/0
@@ -118030,7 +118030,7 @@ subtype=Aura
 [/card]
 [card]
 name=Vandalblast
-alias=11000
+abilities=overload
 other={4}{R} name(Overload)
 target=artifact|opponentbattlefield
 auto=overload destroy all(artifact|opponentbattlefield)
@@ -123077,7 +123077,7 @@ type=Artifact
 [/card]
 [card]
 name=Weapon Surge
-alias=11000
+abilities=overload
 other={1}{R} name(Overload)
 target=creature|mybattlefield
 auto=paidmana 1/0

projects/mtg/include/MTGDefinitions.h

@@ -248,11 +248,12 @@ class Constants
       CANTPAYLIFE = 126,
       CANTBESACRIFIED = 127,
       SKULK = 128,
-	  MENACE = 129,
-	  NOSOLO = 130,//cant attack alone
-	  MUSTBLOCK = 131,//blocks each turn
-	  DETHRONE = 132,
-	  NB_BASIC_ABILITIES = 133,
+      MENACE = 129,
+      NOSOLO = 130,//cant attack alone
+      MUSTBLOCK = 131,//blocks each turn
+      DETHRONE = 132,
+      OVERLOAD = 133,
+      NB_BASIC_ABILITIES = 134,
 
     RARITY_S = 'S',   //Special Rarity
     RARITY_M = 'M',   //Mythics

projects/mtg/src/MTGDefinitions.cpp

@@ -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;

projects/mtg/src/MTGRules.cpp

@@ -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());