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

Base Power/Toughness Template as of M15

Browse Source 
208.4. Effects that set a creature’s power and/or toughness to specific
values may refer to that creature’s
“base power,” “base toughness,” or “base power and toughness.” Other
continuous effects may
further modify the creature’s power and toughness. See rule 613,
“Interaction of Continuous
Effects.”
This commit is contained in:
Anthony Calosa
2015-09-09 22:18:13 +08:00
parent 93ed2b3bff
commit 62dd54c886
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/bin/Res/test/_tests.txt
+1
View File
@@ -534,6 +534,7 @@ prowess_of_the_fair.txt
prowess_of_the_fair2.txt prowess_of_the_fair2.txt
prowess_of_the_fair3.txt prowess_of_the_fair3.txt
PTInstant.txt PTInstant.txt
PT_M15_errata.txt
pygmy_troll.txt pygmy_troll.txt
pyknite_i426.txt pyknite_i426.txt
pyroclasm.txt pyroclasm.txt
projects/mtg/include/AllAbilities.h
+2 -2
View File
@@ -4307,10 +4307,10 @@ public:
string newpower; string newpower;
bool newpowerfound; bool newpowerfound;
int oldpower; int oldpowerbonus;
string newtoughness; string newtoughness;
bool newtoughnessfound; bool newtoughnessfound;
int oldtoughness; int oldtoughnessbonus;
map<Damageable *, vector<MTGAbility *> > newAbilities; map<Damageable *, vector<MTGAbility *> > newAbilities;
vector<string> newAbilitiesList; vector<string> newAbilitiesList;
bool newAbilityFound; bool newAbilityFound;
projects/mtg/src/AllAbilities.cpp
+8 -10
View File
@@ -4181,20 +4181,18 @@ for (it = types.begin(); it != types.end(); it++)
} }
} }
if(newpowerfound ) if(newpowerfound )
{ {//setting p/t only overrides base p/t as of M15 changes
WParsedInt * val = NEW WParsedInt(newpower,NULL, source); WParsedInt * val = NEW WParsedInt(newpower,NULL, source);
oldpower = _target->power; oldpowerbonus = _target->power - _target->origpower;//keep bonus if any
_target->power += val->getValue(); _target->setPower(oldpowerbonus + val->getValue());
_target->power -= oldpower;
_target->power += reapplyCountersBonus(_target,false,true); _target->power += reapplyCountersBonus(_target,false,true);
delete val; delete val;
} }
if(newtoughnessfound ) if(newtoughnessfound )
{ {//setting p/t only overrides base p/t as of M15 changes
WParsedInt * val = NEW WParsedInt(newtoughness,NULL, source); WParsedInt * val = NEW WParsedInt(newtoughness,NULL, source);
oldtoughness = _target->toughness; oldtoughnessbonus = _target->toughness - _target->origtoughness;// keep bonus if any
_target->addToToughness(val->getValue()); _target->setToughness(oldtoughnessbonus + val->getValue());
_target->addToToughness(-oldtoughness);
_target->addToToughness(reapplyCountersBonus(_target,true,false)); _target->addToToughness(reapplyCountersBonus(_target,true,false));
_target->life = _target->toughness; _target->life = _target->toughness;
delete val; delete val;
@@ -4283,11 +4281,11 @@ int ATransformer::destroy()
if(newpowerfound ) if(newpowerfound )
{ {
_target->power = oldpower; _target->setPower(oldpowerbonus + _target->origpower);
} }
if(newtoughnessfound ) if(newtoughnessfound )
{ {
_target->setToughness(oldtoughness); _target->setToughness(oldtoughnessbonus + _target->origtoughness);
} }
if(newAbilityFound) if(newAbilityFound)
{ {