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

Merge branch 'master' of https://github.com/kevlahnota/wagic

Browse Source
This commit is contained in:
Anthony Calosa
2016-07-12 21:40:16 +08:00
parent 21db8852d6 f61ce2884a
commit 992178eb9a
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1681,10 +1681,16 @@ int AIPlayerBaka::selectMenuOption()
} }
} }
if(currentMenu) if(currentMenu)
for(unsigned int mk = 0;mk < currentMenu->abilities.size();mk++) for (unsigned int mk = 0; mk < currentMenu->abilities.size(); mk++)
{ {
if (dynamic_cast<AAWhatsX*>(currentMenu->abilities[0]))
{
int potent = manaPool->getConvertedCost();
int aftercost = potent - currentMenu->abilities[0]->source->getManaCost()->getConvertedCost();
return aftercost;
}
int checked = getEfficiency(currentMenu->abilities[mk]); int checked = getEfficiency(currentMenu->abilities[mk]);
if(checked > 60 && checked > checkedLast) if (checked > 60 && checked > checkedLast)
{ {
doThis = mk; doThis = mk;
checkedLast = checked; checkedLast = checked;

3
projects/mtg/src/Damage.cpp
View File

@@ -52,7 +52,10 @@ int Damage::resolve()
damage = ev->damage->damage; damage = ev->damage->damage;
target = ev->damage->target; target = ev->damage->target;
if (!damage) if (!damage)
{
delete (e);
return 0; return 0;
}
//asorbing effects for cards controller----------- //asorbing effects for cards controller-----------