games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-24 03:47:18 +02:00
Code Issues Releases Activity

Implement placeholders for creature banks messages

Browse Source
This commit is contained in:
Ivan Savenko 2024-09-02 19:15:12 +00:00
parent 525ae72f8e
commit 2ee4e42348
4 changed files with 54 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/objects/creatureBanks.json
View File

@ -477,7 +477,7 @@
}, },
{ {
"message" : 34, "message" : 34,
"appearChance" : { "min" : 30, "max" : 60 }, "appearChance" : { "min" : 60, "max" : 90 },
"guards" : [ "guards" : [
{ "amount" : 4, "type" : "naga" }, { "amount" : 4, "type" : "naga" },
{ "amount" : 4, "type" : "naga" }, { "amount" : 4, "type" : "naga" },

2
lib/battle/BattleInfo.cpp
View File

@ -481,11 +481,11 @@ BattleInfo::BattleInfo(const BattleLayout & layout):
} }
BattleInfo::BattleInfo(): BattleInfo::BattleInfo():
layout(std::make_unique<BattleLayout>()),
round(-1), round(-1),
activeStack(-1), activeStack(-1),
town(nullptr), town(nullptr),
tile(-1,-1,-1), tile(-1,-1,-1),
layout(std::make_unique<BattleLayout>()),
battlefieldType(BattleField::NONE), battlefieldType(BattleField::NONE),
tacticsSide(BattleSide::NONE), tacticsSide(BattleSide::NONE),
tacticDistance(0) tacticDistance(0)

5
lib/mapObjects/CRewardableObject.cpp
View File

@ -508,6 +508,11 @@ void CRewardableObject::initializeGuards()
{ {
clearSlots(); clearSlots();
// Workaround for default creature banks strings that has placeholder for object name
// TODO: find better location for this code
for (auto & visitInfo : configuration.info)
visitInfo.message.replaceRawString(getObjectName());
for (auto const & visitInfo : configuration.info) for (auto const & visitInfo : configuration.info)
{ {
for (auto const & guard : visitInfo.reward.guards) for (auto const & guard : visitInfo.reward.guards)

53
lib/rewardable/Info.cpp
View File

@ -266,14 +266,55 @@ void Rewardable::Info::replaceTextPlaceholders(MetaString & target, const Variab
void Rewardable::Info::replaceTextPlaceholders(MetaString & target, const Variables & variables, const VisitInfo & info) const void Rewardable::Info::replaceTextPlaceholders(MetaString & target, const Variables & variables, const VisitInfo & info) const
{ {
for (const auto & artifact : info.reward.artifacts ) if (!info.reward.guards.empty())
target.replaceName(artifact); {
CreatureID strongest = info.reward.guards.at(0).getId();
for (const auto & spell : info.reward.spells ) for (const auto & guard : info.reward.guards )
target.replaceName(spell); {
if (strongest.toEntity(VLC)->getFightValue() < guard.getId().toEntity(VLC)->getFightValue())
strongest = guard.getId();
}
target.replaceNamePlural(strongest); // FIXME: use singular if only 1 such unit is in guards
for (const auto & secondary : info.reward.secondary ) MetaString loot;
target.replaceName(secondary.first);
for (GameResID it : GameResID::ALL_RESOURCES())
{
if (info.reward.resources[it] != 0)
{
loot.appendRawString("%d %s");
loot.replaceNumber(info.reward.resources[it]);
loot.replaceName(it);
}
}
for (const auto & artifact : info.reward.artifacts )
{
loot.appendRawString("%s");
loot.replaceName(artifact);
}
for (const auto & spell : info.reward.spells )
{
target.replaceName(spell);
}
for (const auto & secondary : info.reward.secondary )
target.replaceName(secondary.first);
}
else
{
for (const auto & artifact : info.reward.artifacts )
target.replaceName(artifact);
for (const auto & spell : info.reward.spells )
target.replaceName(spell);
for (const auto & secondary : info.reward.secondary )
target.replaceName(secondary.first);
}
replaceTextPlaceholders(target, variables); replaceTextPlaceholders(target, variables);
} }