games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-13 01:20:34 +02:00
Code Issues Releases Activity

Fixed #1176.

Browse Source
This commit is contained in:
Michał W. Urbańczyk
2013-01-20 12:06:18 +00:00
parent 14909444b5
commit 0e826915ed
4 changed files with 74 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/CObjectHandler.cpp
View File

@ -956,6 +956,7 @@ void CGHeroInstance::initObj() //TODO: use bonus system
}
}
bonus->additionalInfo = spec.additionalinfo; //creature id
bonus->limiter.reset(new CCreatureTypeLimiter (specCreature, true)); //with upgrades
bonus->type = Bonus::PRIMARY_SKILL;
bonus->valType = Bonus::ADDITIVE_VALUE;
@ -1024,6 +1025,7 @@ void CGHeroInstance::initObj() //TODO: use bonus system
default:
continue;
}
bonus->additionalInfo = spec.additionalinfo; //creature id
bonus->valType = Bonus::ADDITIVE_VALUE;
bonus->limiter.reset(new CCreatureTypeLimiter (*VLC->creh->creatures[spec.additionalinfo], true));
hs->addNewBonus(bonus);
@ -1143,33 +1145,21 @@ void CGHeroInstance::Updatespecialty() //TODO: calculate special value of bonuse
break; //use only hero skills as bonuses to avoid feedback loop
case Bonus::PRIMARY_SKILL: //for creatures, that is
{
CCreatureTypeLimiter * foundLimiter = NULL;
CCreature * cre = NULL;
int creLevel = 0;
TLimiterPtr limiterNode (b);
while (limiterNode->limiter)
if (auto creatureLimiter = std::dynamic_pointer_cast<CCreatureTypeLimiter>(b->limiter)) //TODO: more general eveluation of bonuses?
{
limiterNode = limiterNode->limiter; //search list
if (foundLimiter = dynamic_cast<CCreatureTypeLimiter*>(limiterNode.get())) //TODO: more general eveluation of bonuses?
creLevel = creatureLimiter->creature->level;
if(!creLevel)
{
cre = const_cast<CCreature*>(foundLimiter->creature);
creLevel = cre->level;
break;
creLevel = 5; //treat ballista as tier 5
}
}
if (!foundLimiter)
else
{
tlog2 << "Primary skill specialty growth supported only with creature type limiters\n";
break;
}
if (cre)
{
creLevel = cre->level;
}
if(!creLevel)
{
creLevel = 5; //treat ballista as tier 5
}
double primSkillModifier = (int)(level / creLevel) / 20.0;
int param;
switch (b->subtype)