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

try to fix failed logic here

Browse Source
This commit is contained in:
Anthony Calosa
2016-07-12 02:27:06 +08:00
parent 37d2feeaa5
commit 2d763d106d
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1324,7 +1324,7 @@ int AACopier::resolve()
source->copiedID = _target->getMTGId(); source->copiedID = _target->getMTGId();
source->modifiedbAbi = _target->modifiedbAbi; source->modifiedbAbi = _target->modifiedbAbi;
source->origbasicAbilities = _target->origbasicAbilities; source->origbasicAbilities = _target->origbasicAbilities;
source->basicAbilities = _target->basicAbilities; source->basicAbilities = _target->origbasicAbilities;
if(_target->isMorphed) if(_target->isMorphed)
{ {
source->power = 2; source->power = 2;
@@ -3696,7 +3696,7 @@ int AACloner::resolve()
spell->source->addType(*it); spell->source->addType(*it);
} }
spell->source->modifiedbAbi = _target->modifiedbAbi; spell->source->modifiedbAbi = _target->modifiedbAbi;
spell->source->origbasicAbilities = _target->origbasicAbilities; spell->source->basicAbilities = _target->origbasicAbilities;
delete spell; delete spell;
} }
return 1; return 1;

4
projects/mtg/src/GameObserver.cpp
View File

@@ -941,12 +941,12 @@ void GameObserver::gameStateBasedEffects()
p->game->putInExile(c); p->game->putInExile(c);
} }
} }/*
if(c->modifiedbAbi > 0) if(c->modifiedbAbi > 0)
{ {
c->modifiedbAbi = 0; c->modifiedbAbi = 0;
c->basicAbilities = c->origbasicAbilities; c->basicAbilities = c->origbasicAbilities;
} }*///disabled this failed logic I introduce... when copying/cloning a card copy orig basic abilities...
if(nbcards > z->nb_cards) if(nbcards > z->nb_cards)
{ {
t = 0; t = 0;

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

@@ -88,7 +88,7 @@ void MTGCardInstance::copy(MTGCardInstance * card)
MTGCard * source = card->model; MTGCard * source = card->model;
CardPrimitive * data = source->data; CardPrimitive * data = source->data;
basicAbilities = card->basicAbilities; basicAbilities = card->origbasicAbilities;
origbasicAbilities = card->origbasicAbilities; origbasicAbilities = card->origbasicAbilities;
modifiedbAbi = card->modifiedbAbi; modifiedbAbi = card->modifiedbAbi;
for (size_t i = 0; i < data->types.size(); i++) for (size_t i = 0; i < data->types.size(); i++)