Laurent - fixed a bug with @damaged.
Without this quick and dirty fix if you have 2 thieving magpie in play you get twice the bonus if only 1 deals damage (also you draw 2 cards instead of 1).
This commit is contained in:
@@ -116,16 +116,18 @@ TriggeredAbility * AbilityFactory::parseTrigger(string magicText, int id, Spell
|
|||||||
TargetChooserFactory tcf;
|
TargetChooserFactory tcf;
|
||||||
TargetChooser *tc = tcf.createTargetChooser(starget,card);
|
TargetChooser *tc = tcf.createTargetChooser(starget,card);
|
||||||
tc->targetter = NULL;
|
tc->targetter = NULL;
|
||||||
|
|
||||||
TargetChooser *fromTc = NULL;
|
|
||||||
found = s.find("from(");
|
found = s.find("from(");
|
||||||
if (found != string::npos){
|
|
||||||
|
TargetChooser *fromTc = NULL;
|
||||||
|
if (found != string::npos){
|
||||||
end = s.find (")", found);
|
end = s.find (")", found);
|
||||||
starget = s.substr(found+5,end - found - 5);
|
starget = s.substr(found+5,end - found - 5);
|
||||||
TargetChooser * fromTc = tcf.createTargetChooser(starget,card);
|
TargetChooser * fromTc = tcf.createTargetChooser(starget,card);
|
||||||
fromTc->targetter = NULL;
|
fromTc->targetter = NULL;
|
||||||
}
|
|
||||||
return NEW TrDamaged(id,card,tc,fromTc);
|
return NEW TrDamaged(id,card,tc,fromTc);
|
||||||
|
}else{
|
||||||
|
return NEW TrDamaged(id,card,tc,fromTc);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int who = 0;
|
int who = 0;
|
||||||
|
|||||||
Reference in New Issue
Block a user