Merge pull request #885 from kevlahnota/master

add custom name for generic reveal ability
This commit is contained in:
Anthony Calosa
2016-08-29 22:42:35 +08:00
committed by GitHub
3 changed files with 5 additions and 0 deletions
+1
View File
@@ -92,6 +92,7 @@ class GenericRevealAbility : public ActivatedAbility
public:
string howMany;
MTGRevealingCards * ability;
string named;
GenericRevealAbility(GameObserver* observer, int id, MTGCardInstance * source, Targetable * target, string _howMany);
int resolve();
const string getMenuText();
+3
View File
@@ -49,6 +49,7 @@ GenericRevealAbility::GenericRevealAbility(GameObserver* observer, int id, MTGCa
ActivatedAbility(observer, id, source, NULL), howMany(_howMany)
{
this->GetId();
named = "";
}
int GenericRevealAbility::resolve()
@@ -60,6 +61,8 @@ int GenericRevealAbility::resolve()
const string GenericRevealAbility::getMenuText()
{
if(named.size())
return named.c_str();
return "Reveal Cards";
}
+1
View File
@@ -3486,6 +3486,7 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
GenericRevealAbility * a = NEW GenericRevealAbility(observer, id, card, target, backup);
a->oneShot = 1;
a->canBeInterrupted = false;
a->named = newName;
return a;
}