games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-29 23:07:48 +02:00
Code Issues Releases Activity

Merge branch 'develop' into creature-numeric-quantities

Browse Source
This commit is contained in:
Dydzio
2023-01-21 12:57:29 +01:00
parent 804b164c75 a19c9eccc4
commit 685d63603d
362 changed files with 10853 additions and 5367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/CCreatureSet.cpp
View File

@@ -391,7 +391,7 @@ std::string CCreatureSet::getArmyDescription() const
std::vector<std::string> guards;
for(auto & elem : stacks)
{
auto str = boost::str(boost::format("%s %s") % getRoughAmount(elem.first, 2) % getCreature(elem.first)->namePl);
auto str = boost::str(boost::format("%s %s") % getRoughAmount(elem.first, 2) % getCreature(elem.first)->getNamePluralTranslated());
guards.push_back(str);
}
if(guards.size())
@@ -855,7 +855,7 @@ std::string CStackInstance::nodeName() const
std::ostringstream oss;
oss << "Stack of " << count << " of ";
if(type)
oss << type->namePl;
oss << type->getNamePluralTextID();
else if(idRand >= 0)
oss << "[no type, idRand=" << idRand << "]";
else
@@ -887,7 +887,7 @@ CreatureID CStackInstance::getCreatureID() const
std::string CStackInstance::getName() const
{
return (count > 1) ? type->namePl : type->nameSing;
return (count > 1) ? type->getNamePluralTranslated() : type->getNameSingularTranslated();
}
ui64 CStackInstance::getPower() const
@@ -1056,7 +1056,7 @@ void CStackBasicDescriptor::serializeJson(JsonSerializeFormat & handler)
{
if(type)
{
std::string typeName = type->identifier;
std::string typeName = type->getJsonKey();
handler.serializeString("type", typeName);
}
}