Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor AAMover getmenu text

Browse Source
This commit is contained in:
Anthony Calosa
2017-02-13 09:35:05 +08:00
parent 13f590c6a2
commit 21710ddfb3
2 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
projects/mtg/include/AllAbilities.h
View File

@@ -2119,6 +2119,7 @@ public:
AAMover(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target, string dest,string _name, ManaCost * _cost = NULL, bool undying = false, bool persist = false); AAMover(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target, string dest,string _name, ManaCost * _cost = NULL, bool undying = false, bool persist = false);
MTGGameZone * destinationZone(Targetable * target = NULL); MTGGameZone * destinationZone(Targetable * target = NULL);
int resolve(); int resolve();
string overrideNamed(string destination = "");
const string getMenuText(); const string getMenuText();
const char * getMenuText(TargetChooser * fromTc); const char * getMenuText(TargetChooser * fromTc);
AAMover * clone() const; AAMover * clone() const;

50
projects/mtg/src/AllAbilities.cpp
View File

@@ -4389,25 +4389,8 @@ AAMover::AAMover(GameObserver* observer, int _id, MTGCardInstance * _source, MTG
if (_target) if (_target)
target = _target; target = _target;
andAbility = NULL; andAbility = NULL;
if(destination.size() && !named.size()) if(!named.size() && source->controller()->isAI())
{ named = overrideNamed(destination);
if(destination.find("library") != string::npos)
named = "Put in Library";
else if(destination.find("hand") != string::npos)
named = "Put in Hand";
else if(destination.find("exile") != string::npos)
named = "Put in Exile";
else if(destination.find("removedfromgame") != string::npos)
named = "Put in Exile";
else if(destination.find("graveyard") != string::npos)
named = "Put in Graveyard";
else if(destination.find("previous") != string::npos)
named = "Previous Zone";
else if(destination.find("inplay") != string::npos)
named = "Put in Play";
else if(destination.find("battlefield") != string::npos)
named = "Put in Play";
}
} }
MTGGameZone * AAMover::destinationZone(Targetable * target) MTGGameZone * AAMover::destinationZone(Targetable * target)
@@ -4534,11 +4517,36 @@ int AAMover::resolve()
return 0; return 0;
} }
string AAMover::overrideNamed(string destination)
{
string name = "Move";
if(destination.size())
{
if(destination.find("library") != string::npos)
name = "Put in Library";
else if(destination.find("hand") != string::npos)
name = "Put in Hand";
else if(destination.find("exile") != string::npos)
name = "Put in Exile";
else if(destination.find("removedfromgame") != string::npos)
name = "Put in Exile";
else if(destination.find("graveyard") != string::npos)
name = "Put in Graveyard";
else if(destination.find("previous") != string::npos)
name = "Previous Zone";
else if(destination.find("inplay") != string::npos)
name = "Put in Play";
else if(destination.find("battlefield") != string::npos)
name = "Put in Play";
}
return name;
}
const string AAMover::getMenuText() const string AAMover::getMenuText()
{ {
if(named.size()) if(named.size())
return named.c_str(); return named.c_str();
return "Put in Zone"; return "Move";
} }
const char* AAMover::getMenuText(TargetChooser * tc) const char* AAMover::getMenuText(TargetChooser * tc)
@@ -4600,7 +4608,7 @@ const char* AAMover::getMenuText(TargetChooser * tc)
} }
} }
return "Put in Zone"; return "Move";
} }
AAMover * AAMover::clone() const AAMover * AAMover::clone() const