Improved implementation for isCommander and RingBearer card status (now they are no longer basic abilities but inner card properties in order to avoid conflicts with abilitiy modificators), added a white border on commanders to highlight them during match in the various game zones.
This commit is contained in:
@@ -6165,12 +6165,8 @@ int AbilityFactory::getAbilities(vector<MTGAbility *> * v, Spell * spell, MTGCar
|
||||
card->types.clear();
|
||||
string cre = "Creature";
|
||||
card->setType(cre.c_str());
|
||||
if(card->has(Constants::ISCOMMANDER)){
|
||||
card->basicAbilities[Constants::WASCOMMANDER] = 1;
|
||||
card->basicAbilities[Constants::ISCOMMANDER] = 0;
|
||||
}
|
||||
for(size_t i = 0; i < card->basicAbilities.size(); i++) {
|
||||
if(i != Constants::WASCOMMANDER && i != Constants::GAINEDEXILEDEATH && i != Constants::GAINEDHANDDEATH && i != Constants::GAINEDDOUBLEFACEDEATH &&
|
||||
if(i != Constants::GAINEDEXILEDEATH && i != Constants::GAINEDHANDDEATH && i != Constants::GAINEDDOUBLEFACEDEATH &&
|
||||
i != Constants::DUNGEONCOMPLETED && i != Constants::PERPETUALDEATHTOUCH && i != Constants::PERPETUALLIFELINK)
|
||||
card->basicAbilities[i] = 0; // Try to keep the original special abilities on card morph.
|
||||
}
|
||||
@@ -6186,8 +6182,6 @@ int AbilityFactory::getAbilities(vector<MTGAbility *> * v, Spell * spell, MTGCar
|
||||
card->types = card->model->data->types;
|
||||
card->colors = card->model->data->colors;
|
||||
card->basicAbilities |= card->model->data->basicAbilities;
|
||||
card->basicAbilities[Constants::ISCOMMANDER] = card->basicAbilities[Constants::WASCOMMANDER];
|
||||
card->basicAbilities[Constants::WASCOMMANDER] = 0;
|
||||
ManaCost * copyCost = card->model->data->getManaCost();
|
||||
card->getManaCost()->copy(copyCost);
|
||||
magicText = card->model->data->magicText;
|
||||
|
||||
Reference in New Issue
Block a user