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

add andAbility support for AACopier

Browse Source 
the granted ability must exists only if you copy a card, if you don't
copy any card, the source doesn't have any granted abillities.
This commit is contained in:
Anthony Calosa
2016-08-07 10:15:11 +08:00
parent dfd0761506
commit 807874ce5d
5 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
projects/mtg/src/AllAbilities.cpp
View File

@@ -1453,6 +1453,7 @@ AACopier::AACopier(GameObserver* observer, int _id, MTGCardInstance * _source, M
ActivatedAbility(observer, _id, _source, _cost, 0)
{
target = _target;
andAbility = NULL;
}
int AACopier::resolve()
@@ -1505,9 +1506,23 @@ int AACopier::resolve()
}
if(_target->TokenAndAbility)
{//the source copied a token with andAbility
MTGAbility * andAbilityClone = _target->TokenAndAbility->clone();
andAbilityClone->target = source;
MTGAbility * TokenandAbilityClone = _target->TokenAndAbility->clone();
TokenandAbilityClone->target = source;
if(_target->TokenAndAbility->oneShot)
{
TokenandAbilityClone->resolve();
SAFE_DELETE(TokenandAbilityClone);
}
else
{
TokenandAbilityClone->addToGame();
}
}
if(andAbility)
{
MTGAbility * andAbilityClone = andAbility->clone();
andAbilityClone->target = source;
if(andAbility->oneShot)
{
andAbilityClone->resolve();
SAFE_DELETE(andAbilityClone);
@@ -3968,10 +3983,10 @@ int AACloner::resolve()
}
}
list<int>::iterator it;
for (it = awith.begin(); it != awith.end(); it++)
/*for (it = awith.begin(); it != awith.end(); it++)
{//there must be a layer of temporary abilities and original abilities
spell->source->basicAbilities[*it] = 1;
}
}*/
for (it = colors.begin(); it != colors.end(); it++)
{
spell->source->setColor(*it);