games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Code Issues Releases Activity

NKAI: evaluate speciality correctly

Browse Source 
With removal of SECONDARY_SKILL_PREMY, we need to
evaluate speciality by using TargetSourceType.
Just do it.
This commit is contained in:
Konstantin 2023-03-05 03:27:04 +03:00
parent 930955f268
commit c4a3216288
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
AI/Nullkiller/Analyzers/HeroManager.cpp
View File

@ -71,17 +71,23 @@ float HeroManager::evaluateSecSkill(SecondarySkill skill, const CGHeroInstance *
float HeroManager::evaluateSpeciality(const CGHeroInstance * hero) const
{
auto heroSpecial = Selector::source(Bonus::HERO_SPECIAL, hero->type->getIndex());
auto secondarySkillBonus = Selector::type()(Bonus::SECONDARY_SKILL_PREMY);
auto secondarySkillBonus = Selector::targetSourceType()(Bonus::SECONDARY_SKILL);
auto specialSecondarySkillBonuses = hero->getBonuses(heroSpecial.And(secondarySkillBonus));
auto secondarySkillBonuses = hero->getBonuses(Selector::sourceTypeSel(Bonus::SECONDARY_SKILL));
float specialityScore = 0.0f;
for(auto bonus : *specialSecondarySkillBonuses)
for(auto bonus : *secondarySkillBonuses)
{
SecondarySkill bonusSkill = SecondarySkill(bonus->subtype);
float bonusScore = wariorSkillsScores.evaluateSecSkill(hero, bonusSkill);
auto hasBonus = !!specialSecondarySkillBonuses->getFirst(Selector::typeSubtype(bonus->type, bonus->subtype));
if(bonusScore > 0)
specialityScore += bonusScore * bonusScore * bonusScore;
if(hasBonus)
{
SecondarySkill bonusSkill = SecondarySkill(bonus->sid);
float bonusScore = wariorSkillsScores.evaluateSecSkill(hero, bonusSkill);
if(bonusScore > 0)
specialityScore += bonusScore * bonusScore * bonusScore;
}
}
return specialityScore;