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

Hnadling of Shrine messages now matches H3

Browse Source
This commit is contained in:
Ivan Savenko
2023-10-17 16:35:34 +03:00
parent 927ce4e60e
commit eedaa63f5f
5 changed files with 66 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
lib/mapObjects/CRewardableObject.cpp
View File

@ -242,8 +242,8 @@ std::string CRewardableObject::getHoverText(PlayerColor player) const
{
std::string result = getObjectName();
if (!configuration.description.empty())
result += "\n" + configuration.description.toString();
if (!getDescriptionMessage(player).empty())
result += "\n" + getDescriptionMessage(player);
if(configuration.visitMode == Rewardable::VISIT_PLAYER || configuration.visitMode == Rewardable::VISIT_ONCE)
{
@ -259,8 +259,8 @@ std::string CRewardableObject::getHoverText(const CGHeroInstance * hero) const
{
std::string result = getObjectName();
if (!configuration.description.empty())
result += "\n" + configuration.description.toString();
if (!getDescriptionMessage(hero).empty())
result += "\n" + getDescriptionMessage(hero);
if(configuration.visitMode != Rewardable::VISIT_UNLIMITED)
{
@ -272,13 +272,36 @@ std::string CRewardableObject::getHoverText(const CGHeroInstance * hero) const
return result;
}
std::string CRewardableObject::getDescriptionMessage(PlayerColor player) const
{
if (!wasScouted(player) || configuration.info.empty())
return configuration.description.toString();
auto rewardIndices = getAvailableRewards(nullptr, Rewardable::EEventType::EVENT_FIRST_VISIT);
if (rewardIndices.empty())
return configuration.info[0].description.toString();
return configuration.info[rewardIndices.front()].description.toString();
}
std::string CRewardableObject::getDescriptionMessage(const CGHeroInstance * hero) const
{
if (!wasScouted(hero->getOwner()) || configuration.info.empty())
return configuration.description.toString();
auto rewardIndices = getAvailableRewards(hero, Rewardable::EEventType::EVENT_FIRST_VISIT);
if (rewardIndices.empty())
return configuration.info[0].description.toString();
return configuration.info[rewardIndices.front()].description.toString();
}
std::vector<Component> CRewardableObject::getPopupComponents(PlayerColor player) const
{
if (!wasScouted(player))
return {};
auto rewardIndices = getAvailableRewards(nullptr, Rewardable::EEventType::EVENT_FIRST_VISIT);
if (rewardIndices.empty() && !configuration.info.empty())
rewardIndices.push_back(0);
@ -294,7 +317,6 @@ std::vector<Component> CRewardableObject::getPopupComponents(const CGHeroInstanc
return {};
auto rewardIndices = getAvailableRewards(hero, Rewardable::EEventType::EVENT_FIRST_VISIT);
if (rewardIndices.empty() && !configuration.info.empty())
rewardIndices.push_back(0);