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

Merge branch 'master' into master

Browse Source
This commit is contained in:
Vitty85
2019-09-06 08:38:04 +02:00
committed by GitHub
parent 2c62cfd487 a27216c317
commit 7a529bac6d
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
projects/mtg/bin/Res/test/_tests.txt
View File

@@ -264,7 +264,6 @@ dauntless_escort.txt
dauthi_embrace.txt
dawn_of_the_dead.txt
deadshot.txt
death_grasp.txt
death_ward.txt
decree_of_justice.txt
defense_of_the_heart.txt
@@ -739,5 +738,4 @@ momir/overcost.txt
########################
#AI Tests
########################
ai/goblin_artillery.txt
ai/proliferate_simple.txt

6
projects/mtg/src/MTGAbility.cpp
View File

@@ -4574,11 +4574,11 @@ int AbilityFactory::abilityEfficiency(MTGAbility * a, Player * p, int mode, Targ
if (AAMover * aam = dynamic_cast<AAMover *>(a))
{
MTGGameZone * z = aam->destinationZone(target);
if ((tc && tc->targetsZone(p->game->library)) || (tc && tc->targetsZone(p->game->graveyard)) || (tc && tc->targetsZone(p->game->hand)))
{
if ((tc && tc->targetsZone(p->game->library)) || (tc && tc->targetsZone(p->game->graveyard)) || (tc && tc->targetsZone(p->game->hand)))
{
if (z == p->game->hand || z == p->game->inPlay)
return BAKA_EFFECT_GOOD;
}
}
return BAKA_EFFECT_BAD; //TODO
}