Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed party counter routine and removed tabbed chars from cpp file.

Browse Source
This commit is contained in:
valfieri
2020-10-01 18:29:20 +02:00
parent 6d872ed176
commit 1b320d5325
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/include/AllAbilities.h
+10 -3
View File
@@ -1044,15 +1044,22 @@ private:
if (card->controller()->game->inPlay->cards[j]->hasType("Cleric") && !found_cleric){ if (card->controller()->game->inPlay->cards[j]->hasType("Cleric") && !found_cleric){
intValue += 1; intValue += 1;
found_cleric = true; 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; intValue += 1;
found_rogue = true; 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; intValue += 1;
found_wizard = true; 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; intValue += 1;
found_warrior = true; found_warrior = true;
continue;
} }
} }
} }
projects/mtg/src/Rules.cpp
+3 -3
View File
@@ -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, 'R', "creature", colors, nbcolors);
tempDeck->addRandomCards(1, 0, 0, 'M', "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, "enchantment", colors, nbcolors);
tempDeck->addRandomCards(3, 0, 0, -1, "instant", 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, "sorcery", colors, nbcolors);
tempDeck->addRandomCards(4, 0, 0, -1, "artifact", colors, nbcolors); tempDeck->addRandomCards(4, 0, 0, -1, "artifact", colors, nbcolors);
tempDeck->addRandomCards(1, 0, 0, -1, "planeswalker", 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" }; string lands[] = { "land", "forest", "island", "mountain", "swamp", "plains" };
const char* const multicolorTribes[] = { "Ally", "Construct", "Drone", "Eldrazi", "Elemental", "Golem", "Human", "Myr", 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 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 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" }; const char* const blackTribes[] = { "Assassin", "Cleric", "Demon", "Faerie", "Horror", "Insect", "Knight", "Nightmare", "Orc", "Pirate", "Rat", "Rogue", "Shade", "Skeleton", "Spirit", "Vampire", "Wizard", "Zombie" };