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

Revert "multi tokens images on same source"

Browse Source 
This reverts commit 8c9d2d6f1d.
This commit is contained in:
Anthony Calosa
2016-08-08 11:20:25 +08:00
parent 8c9d2d6f1d
commit 9807ca99f9
2 changed files with 5 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2420,21 +2420,15 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
string sname = tokenParameters[0];
string stypes = tokenParameters[1];
string spt = tokenParameters[2];
string cID = "";
//reconstructing string abilities from the split version,
// then we re-split it again in the token constructor,
// this needs to be improved
string sabilities = (tokenParameters.size() > 3)? tokenParameters[3] : "";
for (size_t i = 4; i < tokenParameters.size(); ++i)
{
string tnum = tokenParameters[i];
if(tnum.find("tnum:"))
cID = cReplaceString(tnum,"tnum:","");
else
{
sabilities.append(",");
sabilities.append(tokenParameters[i]);
}
sabilities.append(",");
sabilities.append(tokenParameters[i]);
}
int value = 0;
if (spt.find("xx/xx") != string::npos)
@@ -2447,7 +2441,7 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
ATokenCreator * tok = NEW ATokenCreator(
observer, id, card,target, NULL, sname, stypes, power + value, toughness + value,
sabilities, starfound, multiplier, who, aLivingWeapon, spt, cID);
sabilities, starfound, multiplier, who, aLivingWeapon, spt);
tok->oneShot = 1;
if(aLivingWeapon)
tok->forceDestroy = 1;