From 8257fec1f281236b3a084af6e1fab83cdac0712c Mon Sep 17 00:00:00 2001 From: "omegablast2002@yahoo.com" Date: Mon, 28 Mar 2011 14:20:16 +0000 Subject: [PATCH] changed the order of the aslongas tags so they can act more like manual over-rides. --- projects/mtg/src/MTGAbility.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/projects/mtg/src/MTGAbility.cpp b/projects/mtg/src/MTGAbility.cpp index 1d77f0c78..0f9803c7e 100644 --- a/projects/mtg/src/MTGAbility.cpp +++ b/projects/mtg/src/MTGAbility.cpp @@ -1280,20 +1280,20 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG } MTGAbility * result = NULL; int oneShot = 0; - found = s.find(" oneshot"); - if (found != string::npos) - oneShot = 1; if (activated) oneShot = 1; - if (card->hasType("sorcery") || card->hasType("instant")) - oneShot = 1; if (i == 4) oneShot = 1; if (a->oneShot) oneShot = 1; + if (card->hasType("sorcery") || card->hasType("instant")) + oneShot = 1; found = s.find("while "); if (found != string::npos) oneShot = 0; + found = s.find(" oneshot"); + if (found != string::npos) + oneShot = 1; Damageable * _target = NULL; if (spell) _target = spell->getNextDamageableTarget();