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

Merge pull request #788 from zethfoxster/master

Browse Source 
pushing to master
This commit is contained in:
zethfoxster
2016-07-24 11:09:18 -04:00
committed by GitHub
parent 4495e1649f 6a71bf5653
commit bdce25cb8c
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
projects/mtg/include/AllAbilities.h
View File

@@ -596,6 +596,10 @@ private:
if(card->playerTarget)
intValue = card->playerTarget->curses.size();
}
else if (s == "oplifetotal")
{
intValue = target->controller()->opponent()->life;
}
else if (s == "lifetotal")
{
intValue = target->controller()->life;
@@ -3296,6 +3300,7 @@ public:
game->removeObserver(abilities[card]);
abilities.erase(card);
}
resolve();
return 1;
}

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

@@ -635,15 +635,15 @@ Player * MTGCardInstance::controller()
int MTGCardInstance::canAttack()
{
if (basicAbilities[(int)Constants::CANTATTACK])
if (has(Constants::CANTATTACK))
return 0;
if (basicAbilities[(int)Constants::FLYERSONLY] && !basicAbilities[(int)Constants::FLYING])
if (has(Constants::FLYERSONLY) && !has(Constants::FLYING))
return 0;
if (tapped)
return 0;
if (hasSummoningSickness())
return 0;
if (basicAbilities[(int)Constants::DEFENSER] && !basicAbilities[(int)Constants::CANATTACK])
if (has(Constants::DEFENSER) && !has(Constants::CANATTACK))
return 0;
if (!isCreature())
return 0;

2
projects/mtg/src/MTGRules.cpp
View File

@@ -760,7 +760,7 @@ int MTGAlternativeCostRule::isReactingToClick(MTGCardInstance * card, ManaCost *
ManaCost * cost = card->getManaCost();
cost->Dump();
#endif
if (alternateManaCost->extraCosts)
if (alternateManaCost->extraCosts && !playerMana->canAfford(card->getManaCost()))
{
//offerings handle thier own casting and cost payments.
//we add this condiational here because offering can also have a completely different