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

Correction

Browse Source
This commit is contained in:
Anthony Calosa
2016-08-01 11:44:07 +08:00
parent 0b0368ffcc
commit 223e2e04b0
4 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4117,8 +4117,11 @@ int AAMover::resolve()
//inplay is a special zone !
for (int i = 0; i < 2; i++)
{
if (!_target->hasSubtype(Subtypes::TYPE_INSTANT) && !_target->hasSubtype(Subtypes::TYPE_SORCERY) && !_target->hasSubtype(Subtypes::TYPE_AURA) && destZone == game->players[i]->game->inPlay && fromZone != game->players[i]->game->inPlay && fromZone
!= game->players[i]->opponent()->game->inPlay)
if (!_target->isSorceryorInstant() &&
!_target->hasSubtype(Subtypes::TYPE_AURA) &&
destZone == game->players[i]->game->inPlay &&
fromZone != game->players[i]->game->inPlay &&
fromZone != game->players[i]->opponent()->game->inPlay)
{
MTGCardInstance * copy = game->players[i]->game->putInZone(_target, fromZone, game->players[i]->game->temp);
Spell * spell = NEW Spell(game, copy);
@@ -4177,8 +4180,7 @@ int AAMover::resolve()
}
else
{
if((_target->hasSubtype(Subtypes::TYPE_INSTANT) || _target->hasSubtype(Subtypes::TYPE_SORCERY)) &&
(destZone == game->players[0]->game->inPlay || destZone == game->players[1]->game->inPlay))
if(_target->isSorceryorInstant() && (destZone == game->players[0]->game->inPlay || destZone == game->players[1]->game->inPlay))
{
if(andAbility)
{