games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

Merge pull request #3836 from vcmi/unpropagate_bonus

Browse Source 
Fixes issue of bonuses not correctly removed
This commit is contained in:
Ivan Savenko 2024-04-28 13:10:23 +03:00 committed by GitHub
commit b0effdbbf4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/bonuses/Bonus.cpp
View File

@ -147,6 +147,9 @@ std::string Bonus::Description(std::optional<si32> customValue) const
descriptionHelper.replaceRawString(std::to_string(valueToShow)); descriptionHelper.replaceRawString(std::to_string(valueToShow));
else else
descriptionHelper.replaceRawString("-" + std::to_string(valueToShow)); descriptionHelper.replaceRawString("-" + std::to_string(valueToShow));
if(type == BonusType::CREATURE_GROWTH_PERCENT)
descriptionHelper.appendRawString(" +" + std::to_string(valueToShow));
} }
return descriptionHelper.toString(); return descriptionHelper.toString();

16
lib/bonuses/CBonusSystemNode.cpp
View File

@ -414,8 +414,20 @@ void CBonusSystemNode::unpropagateBonus(const std::shared_ptr<Bonus> & b)
{ {
if(b->propagator->shouldBeAttached(this)) if(b->propagator->shouldBeAttached(this))
{ {
bonuses -= b; if (bonuses -= b)
logBonus->trace("#$# %s #is no longer propagated to# %s", b->Description(), nodeName()); logBonus->trace("#$# %s #is no longer propagated to# %s", b->Description(), nodeName());
else
logBonus->warn("Attempt to remove #$# %s, which is not propagated to %s", b->Description(), nodeName());
bonuses.remove_if([b](const auto & bonus)
{
if (bonus->propagationUpdater && bonus->propagationUpdater == b->propagationUpdater)
{
treeHasChanged();
return true;
}
return false;
});
} }
TNodes lchildren; TNodes lchildren;

5
lib/mapObjects/CGTownInstance.cpp
View File

@ -156,7 +156,10 @@ GrowthInfo CGTownInstance::getGrowthInfo(int level) const
for(const auto & b : *bonuses2) for(const auto & b : *bonuses2)
{ {
const auto growth = b->val * (base + castleBonus) / 100; const auto growth = b->val * (base + castleBonus) / 100;
ret.entries.emplace_back(growth, b->Description(growth)); if (growth)
{
ret.entries.emplace_back(growth, b->Description(growth));
}
} }
//other *-of-legion-like bonuses (%d to growth cumulative with grail) //other *-of-legion-like bonuses (%d to growth cumulative with grail)