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

Merge pull request #974 from kevlahnota/master

Browse Source 
Fix morbid
This commit is contained in:
Anthony Calosa
2017-08-03 19:54:35 +08:00
committed by GitHub
parent 8e919aeeb1 c5a3310103
commit 521b505543
2 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
projects/mtg/bin/Res/sets/primitives/mtg.txt
View File

@@ -106336,7 +106336,8 @@ toughness=6
[/card]
[card]
name=Simoon
auto=damage:1 all(creature|opponentBattlefield)
target=opponent
auto=damage:1 all(creature|targetedpersonsbattlefield)
text=Simoon deals 1 damage to each creature target opponent controls.
mana={R}{G}
type=Instant

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

@@ -386,7 +386,10 @@ int AbilityFactory::parseCastRestrictions(MTGCardInstance * card, Player * playe
for(unsigned int gy = 0;gy < grave->cardsSeenThisTurn.size();gy++)
{
MTGCardInstance * checkCard = grave->cardsSeenThisTurn[gy];
if(checkCard->isCreature())
if(checkCard->isCreature() &&
((checkCard->previousZone == checkCurrent->game->battlefield)||
(checkCard->previousZone == checkCurrent->opponent()->game->battlefield))//died from battlefield
)
{
isMorbid = true;
break;
@@ -398,7 +401,26 @@ int AbilityFactory::parseCastRestrictions(MTGCardInstance * card, Player * playe
if(!isMorbid)
return 0;
}
check = restriction[i].find("zerodead");
if(check != string::npos)//returns true if zero
{
bool hasDeadCreature = false;
Player * checkCurrent = card->controller();
MTGGameZone * grave = checkCurrent->game->graveyard;
for(unsigned int gy = 0;gy < grave->cardsSeenThisTurn.size();gy++)
{
MTGCardInstance * checkCard = grave->cardsSeenThisTurn[gy];
if(checkCard->isCreature() &&
((checkCard->previousZone == checkCurrent->game->battlefield))//died from your battlefield
)
{
hasDeadCreature = true;
break;
}
}
if(hasDeadCreature)
return 0;
}
//Ensnaring Bridge
check = restriction[i].find("powermorethanopponenthand");
if (check != string::npos)//for opponent creatures