Browse Source

fix displaying growth bonus from Statue of Legion

Andrey Filipenkov 2 năm trước cách đây
mục cha
commit
90cb0cdc9b
3 tập tin đã thay đổi với 8 bổ sung5 xóa
  1. 3 3
      lib/HeroBonus.cpp
  2. 1 1
      lib/HeroBonus.h
  3. 4 1
      lib/mapObjects/CGTownInstance.cpp

+ 3 - 3
lib/HeroBonus.cpp

@@ -1576,7 +1576,7 @@ bool NBonus::hasOfType(const CBonusSystemNode *obj, Bonus::BonusType type, int s
 	return false;
 }
 
-std::string Bonus::Description() const
+std::string Bonus::Description(boost::optional<si32> customValue) const
 {
 	std::ostringstream str;
 
@@ -1615,8 +1615,8 @@ std::string Bonus::Description() const
 		str << description;
 	}
 
-	if(val != 0)
-		str << " " << std::showpos << val;
+	if(auto value = customValue.value_or(val))
+		str << " " << std::showpos << value;
 
 	return str.str();
 }

+ 1 - 1
lib/HeroBonus.h

@@ -510,7 +510,7 @@ struct DLL_LINKAGE Bonus : public std::enable_shared_from_this<Bonus>
 		return (high << 16) + low;
 	}
 
-	std::string Description() const;
+	std::string Description(boost::optional<si32> customValue = {}) const;
 	JsonNode toJsonNode() const;
 	std::string nameForBonus() const; // generate suitable name for bonus - e.g. for storing in json struct
 

+ 4 - 1
lib/mapObjects/CGTownInstance.cpp

@@ -556,7 +556,10 @@ GrowthInfo CGTownInstance::getGrowthInfo(int level) const
 	//statue-of-legion-like bonus: % to base+castle
 	TConstBonusListPtr bonuses2 = getBonuses(Selector::type()(Bonus::CREATURE_GROWTH_PERCENT));
 	for(const auto & b : *bonuses2)
-		ret.entries.push_back(GrowthInfo::Entry(b->val * (base + castleBonus) / 100, b->Description()));
+	{
+		const auto growth = b->val * (base + castleBonus) / 100;
+		ret.entries.push_back(GrowthInfo::Entry(growth, b->Description(growth)));
+	}
 
 	//other *-of-legion-like bonuses (%d to growth cumulative with grail)
 	TConstBonusListPtr bonuses = getBonuses(Selector::type()(Bonus::CREATURE_GROWTH).And(Selector::subtype()(level)));