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

Refactored FizzleToZone

Browse Source 
Get rid of common code
Better naming of zone (where we put spell after countering)
More generic syntax: fizzleto(X) where X in [hand, exile, librarytop]
which will give more flexibility later
This commit is contained in:
pankdm
2013-10-08 23:18:42 +00:00
parent 4341e23210
commit 0c6d77daa0
6 changed files with 63 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/MTGAbility.cpp
+27 -32
View File
@@ -2015,6 +2015,33 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
return a;
}
// Fizzle (counterspell...) and put to zone
// This should always be above "fizzle" section
vector<string> splitFizzle = parseBetween(s, "fizzleto(", ")");
if (splitFizzle.size())
{
// currently only hand, exile and library are supported
string zone = splitFizzle[1];
ActionStack::FizzleMode fizzleMode = ActionStack::PUT_IN_GRAVEARD;
if (zone == "hand")
{
fizzleMode = ActionStack::PUT_IN_HAND;
} else if (zone == "exile")
{
fizzleMode = ActionStack::PUT_IN_EXILE;
} else if (zone == "librarytop")
{
fizzleMode = ActionStack::PUT_IN_LIBRARY_TOP;
}
Spell * starget = NULL;
if (spell)
starget = spell->getNextSpellTarget();
AAFizzler * a = NEW AAFizzler(observer, id, card, starget);
a->fizzleMode = fizzleMode;
a->oneShot = 1;
return a;
}
//Fizzle (counterspell...)
found = s.find("fizzle");
if (found != string::npos)
@@ -2026,38 +2053,6 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
a->oneShot = 1;
return a;
}
found = s.find("fizhand");
if (found != string::npos)
{
Spell * starget = NULL;
if (spell)
starget = spell->getNextSpellTarget();
MTGAbility * a = NEW AAOFizzler( observer, id, card, starget, 1, NULL );
a->oneShot = 1;
return a;
}
//Fizzle to exile
found = s.find("fizexile");
if (found != string::npos)
{
Spell * starget = NULL;
if (spell)
starget = spell->getNextSpellTarget();
MTGAbility * a = NEW AAOFizzler( observer, id, card, starget, 2, NULL );
a->oneShot = 1;
return a;
}
//Fizzle to top of library
found = s.find("fizlibrary");
if (found != string::npos)
{
Spell * starget = NULL;
if (spell)
starget = spell->getNextSpellTarget();
MTGAbility * a = NEW AAOFizzler( observer, id, card, starget, 3, NULL );
a->oneShot = 1;
return a;
}
//Describes a player target in many abilities
int who = TargetChooser::UNSET;