changed the order of the aslongas tags so they can act more like manual over-rides.

This commit is contained in:
omegablast2002@yahoo.com
2011-03-28 14:20:16 +00:00
parent 3178fb96fa
commit 8257fec1f2
+5 -5
View File
@@ -1280,20 +1280,20 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
} }
MTGAbility * result = NULL; MTGAbility * result = NULL;
int oneShot = 0; int oneShot = 0;
found = s.find(" oneshot");
if (found != string::npos)
oneShot = 1;
if (activated) if (activated)
oneShot = 1; oneShot = 1;
if (card->hasType("sorcery") || card->hasType("instant"))
oneShot = 1;
if (i == 4) if (i == 4)
oneShot = 1; oneShot = 1;
if (a->oneShot) if (a->oneShot)
oneShot = 1; oneShot = 1;
if (card->hasType("sorcery") || card->hasType("instant"))
oneShot = 1;
found = s.find("while "); found = s.find("while ");
if (found != string::npos) if (found != string::npos)
oneShot = 0; oneShot = 0;
found = s.find(" oneshot");
if (found != string::npos)
oneShot = 1;
Damageable * _target = NULL; Damageable * _target = NULL;
if (spell) if (spell)
_target = spell->getNextDamageableTarget(); _target = spell->getNextDamageableTarget();