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

Fix for Aura's that are put into play

Browse Source
This commit is contained in:
Anthony Calosa
2016-06-18 12:31:23 +08:00
parent 07ad69c08f
commit cd645b33b2
1 changed files with 43 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/AllAbilities.cpp
+43 -19
View File
@@ -3013,28 +3013,52 @@ int AAMover::resolve()
if (destZone == game->players[i]->game->inPlay && fromZone != game->players[i]->game->inPlay && fromZone if (destZone == game->players[i]->game->inPlay && fromZone != game->players[i]->game->inPlay && fromZone
!= game->players[i]->opponent()->game->inPlay) != game->players[i]->opponent()->game->inPlay)
{ {
MTGCardInstance * copy = game->players[i]->game->putInZone(_target, fromZone, game->players[i]->game->temp); if(_target->hasSubtype(Subtypes::TYPE_AURA) && destZone == game->players[i]->game->inPlay)
Spell * spell = NEW Spell(game, copy); {//put into play aura if there is no valid targets then it will be in its current zone
spell->resolve(); MTGAbility *a = NEW AACastCard(game, game->mLayers->actionLayer()->getMaxId(), _target, _target,false,false,false,"","Put in play",false,true);
if(andAbility) a->oneShot = false;
{ a->canBeInterrupted = false;
MTGAbility * andAbilityClone = andAbility->clone(); a->addToGame();
andAbilityClone->target = spell->source; if(andAbility)
if(andAbility->oneShot)
{ {
andAbilityClone->resolve(); MTGAbility * andAbilityClone = andAbility->clone();
SAFE_DELETE(andAbilityClone); andAbilityClone->target = _target->next;
} if(andAbility->oneShot)
else {
{ andAbilityClone->resolve();
andAbilityClone->addToGame(); SAFE_DELETE(andAbilityClone);
}
else
{
andAbilityClone->addToGame();
}
} }
} }
if(persist) else
spell->source->counters->addCounter(-1,-1); {
if(undying) MTGCardInstance * copy = game->players[i]->game->putInZone(_target, fromZone, game->players[i]->game->temp);
spell->source->counters->addCounter(1,1); Spell * spell = NEW Spell(game, copy);
delete spell; spell->resolve();
if(andAbility)
{
MTGAbility * andAbilityClone = andAbility->clone();
andAbilityClone->target = spell->source;
if(andAbility->oneShot)
{
andAbilityClone->resolve();
SAFE_DELETE(andAbilityClone);
}
else
{
andAbilityClone->addToGame();
}
}
if(persist)
spell->source->counters->addCounter(-1,-1);
if(undying)
spell->source->counters->addCounter(1,1);
delete spell;
}
return 1; return 1;
} }
} }