games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-21 00:19:29 +02:00
Code Issues Releases Activity

MetaString refactor to eliminate integer usage for identifiers

Browse Source 
- entity names are now stored and serialized as text ID's
- added helper methods for convenience to get entities names to
metastring
This commit is contained in:
Ivan Savenko
2023-11-02 22:01:49 +02:00
parent f4feaea177
commit 86a3806bec
22 changed files with 185 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

165
lib/MetaString.cpp
View File

@ -112,74 +112,29 @@ std::string MetaString::getLocalString(const std::pair<EMetaText, ui32> & txt) c
switch(type)
{
case EMetaText::ART_NAMES:
{
const auto * art = ArtifactID(ser).toEntity(VLC);
if(art)
return art->getNameTranslated();
return "#!#";
}
case EMetaText::ART_DESCR:
{
const auto * art = ArtifactID(ser).toEntity(VLC);
if(art)
return art->getDescriptionTranslated();
return "#!#";
}
case EMetaText::ART_EVNTS:
{
const auto * art = ArtifactID(ser).toEntity(VLC);
if(art)
return art->getEventTranslated();
return "#!#";
}
case EMetaText::CRE_PL_NAMES:
{
const auto * cre = CreatureID(ser).toEntity(VLC);
if(cre)
return cre->getNamePluralTranslated();
return "#!#";
}
case EMetaText::CRE_SING_NAMES:
{
const auto * cre = CreatureID(ser).toEntity(VLC);
if(cre)
return cre->getNameSingularTranslated();
return "#!#";
}
case EMetaText::MINE_NAMES:
{
return VLC->generaltexth->translate("core.minename", ser);
}
case EMetaText::MINE_EVNTS:
{
return VLC->generaltexth->translate("core.mineevnt", ser);
}
case EMetaText::SPELL_NAME:
{
const auto * spell = SpellID(ser).toEntity(VLC);
if(spell)
return spell->getNameTranslated();
return "#!#";
}
case EMetaText::OBJ_NAMES:
return VLC->objtypeh->getObjectName(ser, 0);
case EMetaText::SEC_SKILL_NAME:
return VLC->skillh->getByIndex(ser)->getNameTranslated();
// case EMetaText::ART_DESCR:
// {
// const auto * art = ArtifactID(ser).toArtifact(VLC->artifacts());
// if(art)
// return art->getDescriptionTranslated();
// return "#!#";
// }
// case EMetaText::MINE_NAMES:
// {
// return VLC->generaltexth->translate("core.minename", ser);
// }
// case EMetaText::MINE_EVNTS:
// {
// return VLC->generaltexth->translate(, ser);
// }
case EMetaText::GENERAL_TXT:
return VLC->generaltexth->translate("core.genrltxt", ser);
case EMetaText::RES_NAMES:
return VLC->generaltexth->translate("core.restypes", ser);
case EMetaText::ARRAY_TXT:
return VLC->generaltexth->translate("core.arraytxt", ser);
case EMetaText::CREGENS:
return VLC->objtypeh->getObjectName(Obj::CREATURE_GENERATOR1, ser);
case EMetaText::CREGENS4:
return VLC->objtypeh->getObjectName(Obj::CREATURE_GENERATOR4, ser);
case EMetaText::ADVOB_TXT:
return VLC->generaltexth->translate("core.advevent", ser);
case EMetaText::COLOR:
return VLC->generaltexth->translate("vcmi.capitalColors", ser);
case EMetaText::JK_TXT:
return VLC->generaltexth->translate("core.jktext", ser);
default:
@ -287,20 +242,6 @@ DLL_LINKAGE std::string MetaString::buildList() const
return lista;
}
void MetaString::replaceCreatureName(const CreatureID & id, TQuantity count) //adds sing or plural name;
{
if (count == 1)
replaceLocalString (EMetaText::CRE_SING_NAMES, id);
else
replaceLocalString (EMetaText::CRE_PL_NAMES, id);
}
void MetaString::replaceCreatureName(const CStackBasicDescriptor & stack)
{
assert(stack.type); //valid type
replaceCreatureName(stack.type->getId(), stack.count);
}
bool MetaString::operator == (const MetaString & other) const
{
return message == other.message && localStrings == other.localStrings && exactStrings == other.exactStrings && stringsTextID == other.stringsTextID && numbers == other.numbers;
@ -395,4 +336,80 @@ void MetaString::serializeJson(JsonSerializeFormat & handler)
jsonDeserialize(handler.getCurrent());
}
void MetaString::appendName(const SpellID & id)
{
appendTextID(id.toSpell(VLC->spells())->getNameTextID());
}
void MetaString::appendName(const PlayerColor & id)
{
appendTextID(TextIdentifier("vcmi.capitalColors", id.getNum()).get());
}
void MetaString::appendName(const CreatureID & id, TQuantity count)
{
if(count == 1)
appendNameSingular(id);
else
appendNamePlural(id);
}
void MetaString::appendNameSingular(const CreatureID & id)
{
appendTextID(id.toCreature(VLC->creatures())->getNameSingularTextID());
}
void MetaString::appendNamePlural(const CreatureID & id)
{
appendTextID(id.toCreature(VLC->creatures())->getNamePluralTextID());
}
void MetaString::replaceName(const ArtifactID & id)
{
replaceTextID(id.toArtifact(VLC->artifacts())->getNameTextID());
}
void MetaString::replaceName(const MapObjectID& id)
{
replaceTextID(VLC->objtypeh->getObjectName(id, 0));
}
void MetaString::replaceName(const PlayerColor & id)
{
replaceTextID(TextIdentifier("vcmi.capitalColors", id.getNum()).get());
}
void MetaString::replaceName(const SecondarySkill & id)
{
replaceTextID(VLC->skillh->getById(id)->getNameTextID());
}
void MetaString::replaceName(const SpellID & id)
{
replaceTextID(id.toSpell(VLC->spells())->getNameTextID());
}
void MetaString::replaceNameSingular(const CreatureID & id)
{
replaceTextID(id.toCreature(VLC->creatures())->getNameSingularTextID());
}
void MetaString::replaceNamePlural(const CreatureID & id)
{
replaceTextID(id.toCreature(VLC->creatures())->getNamePluralTextID());
}
void MetaString::replaceName(const CreatureID & id, TQuantity count) //adds sing or plural name;
{
if(count == 1)
replaceNameSingular(id);
else
replaceNamePlural(id);
}
void MetaString::replaceName(const CStackBasicDescriptor & stack)
{
replaceName(stack.type->getId(), stack.count);
}
VCMI_LIB_NAMESPACE_END