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

Finally Fixed... :)

Browse Source 
The issue last commit was the toughness is refreshed and the damage is
not reflected. This commit fixes the bug. Yey...
This commit is contained in:
Anthony Calosa
2015-09-16 10:45:43 +08:00
parent db649ddc96
commit 8e057379ce
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2345,7 +2345,7 @@ public:
wppt = NEW WParsedPT(PT,NULL,(MTGCardInstance *) source);
}
((MTGCardInstance *) target)->origpower = wppt->power.getValue();
((MTGCardInstance *) target)->origtoughness = wppt->toughness.getValue();
((MTGCardInstance *) target)->origtoughness = (wppt->toughness.getValue() + ((MTGCardInstance *) target)->life)-((MTGCardInstance *) target)->life;//what?
}
}
int addToGame()
@@ -2359,9 +2359,7 @@ public:
if(cda)
{//Characteristic-defining abilities
_target->origpower = wppt->power.getValue();//set orig pt
_target->origtoughness = wppt->toughness.getValue();
_target->power -= _target->pbonus;//remove current bonuses
_target->addToToughness(-_target->tbonus);
_target->origtoughness = wppt->toughness.getValue();
_target->setPower(_target->origpower);//update PT
_target->setToughness(_target->origtoughness);
_target->power += _target->pbonus;//add new bonus
@@ -2386,16 +2384,16 @@ public:
{
if(cda)
{
;
/*??Do Nothing??*/;
}
else
{
((MTGCardInstance *) target)->power -= ((MTGCardInstance *) target)->pbonus;
((MTGCardInstance *) target)->addToToughness(-((MTGCardInstance *) target)->tbonus);
((MTGCardInstance *) target)->pbonus -= wppt->power.getValue();
((MTGCardInstance *) target)->tbonus -= wppt->toughness.getValue();
((MTGCardInstance *) target)->power += ((MTGCardInstance *) target)->pbonus;
((MTGCardInstance *) target)->addToToughness(((MTGCardInstance *) target)->tbonus);
((MTGCardInstance *) target)->power -= ((MTGCardInstance *) target)->pbonus;
((MTGCardInstance *) target)->addToToughness(-((MTGCardInstance *) target)->tbonus);
((MTGCardInstance *) target)->pbonus -= wppt->power.getValue();
((MTGCardInstance *) target)->tbonus -= wppt->toughness.getValue();
((MTGCardInstance *) target)->power += ((MTGCardInstance *) target)->pbonus;
((MTGCardInstance *) target)->addToToughness(((MTGCardInstance *) target)->tbonus);
}
return 1;
}