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

cleaned up secondary skill bonus merging

Browse Source
This commit is contained in:
Henning Koehler
2017-08-27 15:35:04 +12:00
parent 06d2507371
commit 9bbfb57b93
4 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/mapObjects/CGHeroInstance.cpp
View File

@@ -769,15 +769,14 @@ void CGHeroInstance::updateSkill(SecondarySkill which, int val)
auto skillBonus = (*VLC->skillh)[which]->getBonus(val);
for (auto b : skillBonus)
{
// TODO: add standard method for joining bonuses, should match on valType as well
std::shared_ptr<Bonus> existing = getBonusLocalFirst(Selector::typeSubtype(b->type,b->subtype).And(Selector::source(Bonus::SECONDARY_SKILL, b->sid)));
// bonuses provided by different levels of a secondary skill are aggregated via max (not + as usual)
// different secondary skills providing the same bonus (e.g. ballistics might improve archery as well) are kept separate
std::shared_ptr<Bonus> existing = getBonusLocalFirst(
Selector::typeSubtype(b->type, b->subtype).And(
Selector::source(Bonus::SECONDARY_SKILL, b->sid).And(
Selector::valueType(b->valType))));
if(existing)
{
if(b->valType == Bonus::INDEPENDENT_MIN || b->valType == Bonus::BASE_NUMBER)
existing->val = b->val;
else
existing->val += b->val;
}
vstd::amax(existing->val, b->val);
else
addNewBonus(std::make_shared<Bonus>(*b));
}