diff --git a/projects/mtg/include/AllAbilities.h b/projects/mtg/include/AllAbilities.h index 6bcbca24a..348e9aef6 100644 --- a/projects/mtg/include/AllAbilities.h +++ b/projects/mtg/include/AllAbilities.h @@ -3354,7 +3354,7 @@ public: int resolve() { //TODO check if ability is oneShot ? - int matches; + unsigned int matches; matches = td->match(source); if (matches > 0) { @@ -3362,7 +3362,10 @@ public: { removeAbilityFromGame(); } - for (int i = 0; i < matches - (int) (abilities.size()); i++) + // i will equal abilities size, then we increment from there + //abilities size was previously being subtracted from matches + //tho since it was a nonstatic number, it would stop adding abilities prematurely. + for (unsigned int i = abilities.size(); i < matches; i++) { addAbilityToGame(); } diff --git a/projects/mtg/src/MTGAbility.cpp b/projects/mtg/src/MTGAbility.cpp index fe930e4ed..6188f6adc 100644 --- a/projects/mtg/src/MTGAbility.cpp +++ b/projects/mtg/src/MTGAbility.cpp @@ -3073,6 +3073,13 @@ int AbilityFactory::getAbilities(vector * v, Spell * spell, MTGCar magicText.append(faceupC); } + else if(card && card->hasType("equipment") && card->target) + { + magicText = card->model->data->magicText; + string equipText = card->magicTexts["skill"]; + magicText.append("\n"); + magicText.append(equipText); + } else { magicText = card->magicText;