games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Introduced string identifiers for H3 texts, still WIP

Browse Source
This commit is contained in:
Ivan Savenko
2022-12-27 22:19:05 +02:00
parent 71bedf130f
commit bdb8e0ee5c
24 changed files with 387 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/mapObjects/MiscObjects.cpp
View File

@@ -147,9 +147,8 @@ std::string CGCreature::getHoverText(const CGHeroInstance * hero) const
hoverName = getHoverText(hero->tempOwner);
}
const JsonNode & texts = VLC->generaltexth->localizedTexts["adventureMap"]["monsterThreat"];
hoverName += VLC->generaltexth->translate("vcmi.adventureMap.monsterThreat.title");
hoverName += texts["title"].String();
int choice;
double ratio = ((double)getArmyStrength() / hero->getTotalStrength());
if (ratio < 0.1) choice = 0;
@@ -164,7 +163,8 @@ std::string CGCreature::getHoverText(const CGHeroInstance * hero) const
else if (ratio < 8) choice = 9;
else if (ratio < 20) choice = 10;
else choice = 11;
hoverName += texts["levels"].Vector()[choice].String();
hoverName += VLC->generaltexth->translate("vcmi.adventureMap.monsterThreat.levels." + std::to_string(choice));
return hoverName;
}
@@ -710,7 +710,7 @@ bool CGMine::isAbandoned() const
std::string CGMine::getObjectName() const
{
return VLC->generaltexth->mines.at(subID).first;
return VLC->generaltexth->translate("core.minename", subID);
}
std::string CGMine::getHoverText(PlayerColor player) const
@@ -1686,7 +1686,8 @@ void CGSignBottle::initObj(CRandomGenerator & rand)
//if no text is set than we pick random from the predefined ones
if(message.empty())
{
message = *RandomGeneratorUtil::nextItem(VLC->generaltexth->randsign, rand);
auto vector = VLC->generaltexth->findStringsWithPrefix("core.randsign");
message = *RandomGeneratorUtil::nextItem(vector, rand);
}
if(ID == Obj::OCEAN_BOTTLE)