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

revised token id (tnum:num parameter)

Browse Source 
this should not conflict like earlier version.
ex:
[card]
name=Fable of Wolf and Owl
auto=@movedTo(*[green]|mystack):may token(Wolf,Creature
Wolf,2/2,green,tnum:11)
auto=@movedTo(*[blue]|mystack):may token(Bird,Creature
Bird,1/1,flying,blue,tnum:12)
text=Whenever you cast a green spell, you may put a 2/2 green Wolf
creature token onto the battlefield. -- Whenever you cast a blue spell,
you may put a 1/1 blue Bird creature token with flying onto the
battlefield.
mana={3}{GU}{GU}{GU}
type=Enchantment
[/card]
tnum uses -source id  & tnum (concatenated)
This commit is contained in:
Anthony Calosa
2016-08-08 13:49:24 +08:00
parent de44abd529
commit eb0ecedecf
4 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2394,7 +2394,7 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
string tokenDesc = splitToken[1];
vector<string> tokenParameters = split(tokenDesc, ',');
//lets try finding a token by card name.
if (splitToken[1].size() && tokenParameters.size() ==1)
if (splitToken[1].size() && tokenParameters.size() <3)
{
string cardName = splitToken[1];
MTGCard * safetycard = MTGCollection()->getCardByName(cardName);
@@ -2420,7 +2420,7 @@ 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
@@ -2430,6 +2430,12 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
sabilities.append(",");
sabilities.append(tokenParameters[i]);
}
if(sabilities.find(",tnum:") != string::npos)
{
size_t begins = sabilities.find(",tnum:");
cID = sabilities.substr(begins+6);
sabilities = cReplaceString(sabilities,",tnum:"+cID,"");
}
int value = 0;
if (spt.find("xx/xx") != string::npos)
value = card->X / 2;
@@ -2441,7 +2447,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);
sabilities, starfound, multiplier, who, aLivingWeapon, spt, cID);
tok->oneShot = 1;
if(aLivingWeapon)
tok->forceDestroy = 1;