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

Merge pull request #775 from zethfoxster/master

Browse Source 
pushing to master
This commit is contained in:
zethfoxster
2016-07-20 19:01:10 -04:00
committed by GitHub
parent 0fd0c5ecc1 9a60a8838f
commit a35ccbbe5b
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
projects/mtg/src/AIPlayerBaka.cpp
View File

@@ -62,9 +62,9 @@ int OrderedAIAction::getEfficiency(AADamager * aad)
// I can't remember as I type this in which condition we use one or the other for this function, if you find out please replace this comment // I can't remember as I type this in which condition we use one or the other for this function, if you find out please replace this comment
int OrderedAIAction::getEfficiency() int OrderedAIAction::getEfficiency()
{ {
//commented out the below becuase I noticed it prevented ai from updating the given abilities with new eff %. //the below is required for CMPAbilities operator override, without it the effs trip a debug assert. we need to find a better way to do it.
//if (efficiency > -1) if (efficiency > -1)
// return efficiency; return efficiency;
if (!ability) if (!ability)
return 0; return 0;
GameObserver * g = owner->getObserver(); GameObserver * g = owner->getObserver();
@@ -2684,6 +2684,7 @@ int AIPlayerBaka::computeActions()
{ {
if(observer->currentPlayer != this)//only on my opponents turns. if(observer->currentPlayer != this)//only on my opponents turns.
chooseBlockers(); chooseBlockers();
selectAbility();
break; break;
} }
case MTG_PHASE_COMBATDAMAGE: case MTG_PHASE_COMBATDAMAGE: