final fix for affinity, thanks mike for pointing it out.

This commit is contained in:
omegablast2002@yahoo.com
2010-11-06 09:19:07 +00:00
parent ce1a079646
commit f5d7f03086

View File

@@ -1470,7 +1470,7 @@ int MTGAffinityRule::receiveEvent(WEvent * event){
if (card && card->hasSubtype("creature") && card->hasColor(1)){etype.append("cre"); colored = 1;}
for (int j = 0; j < nbcards; ++j){
MTGCardInstance * c = z->cards[j];
if ((c->has(Constants::AFFINITYARTIFACTS) && !etype.find("art")) || ( c->has(Constants::AFFINITYSWAMP) && !etype.find("swa")) || ( c->has(Constants::AFFINITYMOUNTAIN) && !etype.find("mou")) ||( c->has(Constants::AFFINITYPLAINS) && !etype.find("pla")) || ( c->has(Constants::AFFINITYISLAND) && !etype.find("isl")) || ( c->has(Constants::AFFINITYFOREST) && !etype.find("for")) || ( c->has(Constants::AFFINITYGREENCREATURES) && !etype.find("cre"))){
if ((c->has(Constants::AFFINITYARTIFACTS) && etype.find("art") != string::npos) || ( c->has(Constants::AFFINITYSWAMP) && etype.find("swa")!= string::npos) || ( c->has(Constants::AFFINITYMOUNTAIN) && etype.find("mou")!= string::npos) ||( c->has(Constants::AFFINITYPLAINS) && etype.find("pla")!= string::npos) || ( c->has(Constants::AFFINITYISLAND) && etype.find("isl")!= string::npos) || ( c->has(Constants::AFFINITYFOREST) && etype.find("for")!= string::npos) || ( c->has(Constants::AFFINITYGREENCREATURES) && etype.find("cre")!= string::npos)){
if(c->getManaCost()->getConvertedCost() > 0){
c->getManaCost()->remove(colored,1);//one less colorless to cast
}else{
@@ -1499,7 +1499,7 @@ int MTGAffinityRule::receiveEvent(WEvent * event){
if (card && card->hasSubtype("creature") && card->hasColor(1)){etype.append("cre"); colored = 1;}
for (int j = 0; j < nbcards; ++j){
MTGCardInstance * c = z->cards[j];
if (c && ((c->has(Constants::AFFINITYARTIFACTS) && !etype.find("art")) || ( c->has(Constants::AFFINITYSWAMP) && !etype.find("swa")) || ( c->has(Constants::AFFINITYMOUNTAIN) && !etype.find("mou")) ||( c->has(Constants::AFFINITYPLAINS) && !etype.find("pla")) || ( c->has(Constants::AFFINITYISLAND) && !etype.find("isl")) || ( c->has(Constants::AFFINITYFOREST) && !etype.find("for")) || ( c->has(Constants::AFFINITYGREENCREATURES) && !etype.find("cre")))){
if (c && ((c->has(Constants::AFFINITYARTIFACTS) && etype.find("art")!= string::npos) || ( c->has(Constants::AFFINITYSWAMP) && etype.find("swa")!= string::npos) || ( c->has(Constants::AFFINITYMOUNTAIN) && etype.find("mou")!= string::npos) ||( c->has(Constants::AFFINITYPLAINS) && etype.find("pla")!= string::npos) || ( c->has(Constants::AFFINITYISLAND) && etype.find("isl")!= string::npos) || ( c->has(Constants::AFFINITYFOREST) && etype.find("for")!= string::npos) || ( c->has(Constants::AFFINITYGREENCREATURES) && etype.find("cre")!= string::npos))){
if(c->reduxamount > 0){
c->reduxamount -= 1;
}else{