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

28
projects/mtg/src/ActionStack.cpp
View File

@@ -1150,7 +1150,8 @@ int ActionStack::garbageCollect()
return 1;
}
void ActionStack::Fizzle(Interruptible * action)
// Fizzle action and put it in targetZone
void ActionStack::Fizzle(Interruptible * action, FizzleMode fizzleMode)
{
if (!action)
{
@@ -1160,32 +1161,17 @@ void ActionStack::Fizzle(Interruptible * action)
if (action->type == ACTION_SPELL)
{
Spell * spell = (Spell *) action;
spell->source->controller()->game->putInGraveyard(spell->source);
}
action->state = RESOLVED_NOK;
}
void ActionStack::Fizzle(Interruptible * action,int targetZone)
{
if (!action)
{
DebugTrace("ACTIONSTACK ==ERROR==: action is NULL in ActionStack::Fizzle");
return;
}
if (action->type == ACTION_SPELL)
{
Spell * spell = (Spell *) action;
switch ( targetZone ) {
case 0:
switch (fizzleMode) {
case PUT_IN_GRAVEARD:
spell->source->controller()->game->putInGraveyard(spell->source);
break;
case 1:
case PUT_IN_HAND:
spell->source->controller()->game->putInHand(spell->source);
break;
case 2:
case PUT_IN_EXILE:
spell->source->controller()->game->putInExile(spell->source);
break;
case 3:
case PUT_IN_LIBRARY_TOP:
spell->source->controller()->game->putInLibrary(spell->source);
break;
}