From 1b320d532581fa9ae45c732685a3f234abe7fb82 Mon Sep 17 00:00:00 2001 From: valfieri Date: Thu, 1 Oct 2020 18:29:20 +0200 Subject: [PATCH] Fixed party counter routine and removed tabbed chars from cpp file. --- projects/mtg/include/AllAbilities.h | 13 ++++++++++--- projects/mtg/src/Rules.cpp | 6 +++--- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/projects/mtg/include/AllAbilities.h b/projects/mtg/include/AllAbilities.h index 2dd637de4..1e97a459b 100644 --- a/projects/mtg/include/AllAbilities.h +++ b/projects/mtg/include/AllAbilities.h @@ -1044,15 +1044,22 @@ private: if (card->controller()->game->inPlay->cards[j]->hasType("Cleric") && !found_cleric){ intValue += 1; found_cleric = true; - } else if (card->controller()->game->inPlay->cards[j]->hasType("Rogue") && !found_rogue){ + continue; + } + if (card->controller()->game->inPlay->cards[j]->hasType("Rogue") && !found_rogue){ intValue += 1; found_rogue = true; - } else if (card->controller()->game->inPlay->cards[j]->hasType("Wizard") && !found_wizard){ + continue; + } + if (card->controller()->game->inPlay->cards[j]->hasType("Wizard") && !found_wizard){ intValue += 1; found_wizard = true; - } else if (card->controller()->game->inPlay->cards[j]->hasType("Warrior") && !found_warrior){ + continue; + } + if (card->controller()->game->inPlay->cards[j]->hasType("Warrior") && !found_warrior){ intValue += 1; found_warrior = true; + continue; } } } diff --git a/projects/mtg/src/Rules.cpp b/projects/mtg/src/Rules.cpp index dd4a97e72..d9f9c8d0b 100644 --- a/projects/mtg/src/Rules.cpp +++ b/projects/mtg/src/Rules.cpp @@ -380,8 +380,8 @@ Player * Rules::loadPlayerRandomThree(GameObserver* observer, int isAI) tempDeck->addRandomCards(1, 0, 0, 'R', "creature", colors, nbcolors); tempDeck->addRandomCards(1, 0, 0, 'M', "creature", colors, nbcolors); tempDeck->addRandomCards(3, 0, 0, -1, "enchantment", colors, nbcolors); - tempDeck->addRandomCards(3, 0, 0, -1, "instant", colors, nbcolors); - tempDeck->addRandomCards(3, 0, 0, -1, "sorcery", colors, nbcolors); + tempDeck->addRandomCards(3, 0, 0, -1, "instant", colors, nbcolors); + tempDeck->addRandomCards(3, 0, 0, -1, "sorcery", colors, nbcolors); tempDeck->addRandomCards(4, 0, 0, -1, "artifact", colors, nbcolors); tempDeck->addRandomCards(1, 0, 0, -1, "planeswalker", colors, nbcolors); @@ -426,7 +426,7 @@ Player * Rules::loadPlayerHorde(GameObserver* observer, int isAI) string lands[] = { "land", "forest", "island", "mountain", "swamp", "plains" }; const char* const multicolorTribes[] = { "Ally", "Construct", "Drone", "Eldrazi", "Elemental", "Golem", "Human", "Myr", - "Sliver", "Spellshaper", "Spirit", "Wizard" }; + "Sliver", "Spellshaper", "Spirit", "Wizard" }; const char* const whiteTribes[] = { "Angel", "Archer", "Bird", "Cat", "Cleric", "Griffin", "Kithkin", "Knight", "Kor", "Monk", "Rebel", "Samurai", "Scout", "Soldier", "Spirit" }; const char* const blueTribes[] = { "Artificer", "Bird", "Drake", "Faerie", "Illusion", "Merfolk", "Mutant", "Nightmare", "Pirate", "Shapeshifter", "Sphinx", "Spirit", "Vedalken", "Wizard" }; const char* const blackTribes[] = { "Assassin", "Cleric", "Demon", "Faerie", "Horror", "Insect", "Knight", "Nightmare", "Orc", "Pirate", "Rat", "Rogue", "Shade", "Skeleton", "Spirit", "Vampire", "Wizard", "Zombie" };