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

corrected an issue where morphing a creature would overwrite basic abilities granted by lords. it was because i was not ADDING the new basic abilities it gained to the end result of face upping the creature.

Browse Source 
also forgot to mention in my big patch
i added a new test suite tool, its a goto command
if you start on draw and want to get to second main,
goto secondmain

instead of 
next
next
next
next
next

"next" is still valid and still needed
you can not for exsample 
goto attackers
if you are ALREADY currently in "attackers" so if you wanted to go from YOUR attackers to opponents attackers

from draw step
goto attackers
next
goto attackers

this replaces about 12 "next" commands which would have been needed in preivous test suite.
This commit is contained in:
omegablast2002@yahoo.com
2011-01-22 02:35:11 +00:00
parent 299bb4f9fa
commit 094c97dec8
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2631,7 +2631,7 @@ public:
if(ability->aType == MTGAbility::STANDARD_PREVENT)
aType = MTGAbility::STANDARD_PREVENT;
}
int canBeInList(Player *p)
{
if (tc->canTarget(p)) return 1;
@@ -2642,7 +2642,8 @@ public:
{
if(card->isPhased || source->isPhased)
return 0;
if ((includeSelf || card != source) && tc->canTarget(card)) return 1;
if ((includeSelf || card != source) && tc->canTarget(card))
return 1;
return 0;
}

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

@@ -2901,7 +2901,11 @@ int AbilityFactory::getAbilities(vector<MTGAbility *> * v, Spell * spell, MTGCar
card->types = card->model->data->types;
for (int i = 0; i < Constants::MTG_NB_COLORS; ++i)
card->colors[i] = card->model->data->colors[i];
card->basicAbilities = card->model->data->basicAbilities;
for (map<int, int>::const_iterator it = card->model->data->basicAbilities.begin(); it != card->model->data->basicAbilities.end(); ++it)
{
int i = it->first;
card->basicAbilities[i] += card->model->data->basicAbilities[i];
}
ManaCost * copyCost = card->model->data->getManaCost();
card->getManaCost()->copy(copyCost);
magicText = card->model->data->magicText;