games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-21 17:17:06 +02:00
Code Issues Releases Activity

Banned skills known by hero now have non-zero selection chance

Browse Source
This commit is contained in:
Ivan Savenko 2024-11-17 17:55:09 +00:00
parent 251155d913
commit 51c5536b50
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/entities/hero/CHeroClass.cpp
View File

@ -23,29 +23,20 @@ SecondarySkill CHeroClass::chooseSecSkill(const std::set<SecondarySkill> & possi
{
assert(!possibles.empty());
if (possibles.size() == 1)
return *possibles.begin();
std::vector<int> weights;
std::vector<SecondarySkill> skills;
int totalProb = 0;
for(const auto & possible : possibles)
if (secSkillProbability.count(possible) != 0)
totalProb += secSkillProbability.at(possible);
if (totalProb == 0) // may trigger if set contains only banned skills (0 probability)
return *RandomGeneratorUtil::nextItem(possibles, rand);
auto ran = rand.nextInt(totalProb - 1);
for(const auto & possible : possibles)
{
skills.push_back(possible);
if (secSkillProbability.count(possible) != 0)
ran -= secSkillProbability.at(possible);
if(ran < 0)
return possible;
weights.push_back(secSkillProbability.at(possible));
else
weights.push_back(1); // H3 behavior - banned skills have minimal (1) chance to be picked
}
assert(0); // should not be possible
return *possibles.begin();
int selectedIndex = RandomGeneratorUtil::nextItemWeighted(weights, rand);
return skills.at(selectedIndex);
}
bool CHeroClass::isMagicHero() const