Merge pull request #30 from WagicProject/master

getting master

projects/mtg/src/MTGAbility.cpp

@@ -3982,6 +3982,8 @@ int AbilityFactory::abilityEfficiency(MTGAbility * a, Player * p, int mode, Targ
     badAbilities[(int)Constants::WEAK] = true;
     badAbilities[(int)Constants::NOLIFEGAIN] = true;
     badAbilities[(int)Constants::NOLIFEGAINOPPONENT] = true;
+    badAbilities[(int)Constants::MUSTBLOCK] = true;
+    badAbilities[(int)Constants::FLYERSONLY] = true;
 
     if (AInstantBasicAbilityModifierUntilEOT * abi = dynamic_cast<AInstantBasicAbilityModifierUntilEOT *>(a))
     {

projects/mtg/src/MTGCardInstance.cpp

@@ -637,6 +637,8 @@ int MTGCardInstance::canAttack()
 {
     if (basicAbilities[(int)Constants::CANTATTACK])
         return 0;
+    if (basicAbilities[(int)Constants::FLYERSONLY] && !basicAbilities[(int)Constants::FLYING])
+        return 0;
     if (tapped)
         return 0;
     if (hasSummoningSickness())

projects/mtg/src/MTGDefinitions.cpp

@@ -165,7 +165,8 @@ const char* Constants::MTGBasicAbilities[] = {
     "mustblock",
     "dethrone",
     "overload",
-    "shackler"
+    "shackler",
+    "flyersonly"
 };
 
 map<string,int> Constants::MTGBasicAbilitiesMap;