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

Implemented playerGlobal visit mode for objects like cartographer

Browse Source
This commit is contained in:
Ivan Savenko
2025-05-06 18:53:43 +03:00
parent 1b5d00cc99
commit 4b77140f4a
11 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/mapObjects/CRewardableObject.cpp
View File

@@ -137,7 +137,9 @@ bool CRewardableObject::wasVisitedBefore(const CGHeroInstance * contextHero) con
case Rewardable::VISIT_ONCE:
return onceVisitableObjectCleared;
case Rewardable::VISIT_PLAYER:
return vstd::contains(cb->getPlayerState(contextHero->getOwner())->visitedObjects, ObjectInstanceID(id));
return cb->getPlayerState(contextHero->getOwner())->visitedObjects.count(ObjectInstanceID(id)) != 0;
case Rewardable::VISIT_PLAYER_GLOBAL:
return cb->getPlayerState(contextHero->getOwner())->visitedObjectsGlobal.count({ID, subID}) != 0;
case Rewardable::VISIT_BONUS:
return contextHero->hasBonusFrom(BonusSource::OBJECT_TYPE, BonusSourceID(ID));
case Rewardable::VISIT_HERO:
@@ -160,7 +162,9 @@ bool CRewardableObject::wasVisited(PlayerColor player) const
return false;
case Rewardable::VISIT_ONCE:
case Rewardable::VISIT_PLAYER:
return vstd::contains(cb->getPlayerState(player)->visitedObjects, ObjectInstanceID(id));
return cb->getPlayerState(player)->visitedObjects.count(ObjectInstanceID(id)) != 0;
case Rewardable::VISIT_PLAYER_GLOBAL:
return cb->getPlayerState(player)->visitedObjectsGlobal.count({ID, subID}) != 0;
default:
return false;
}
@@ -205,7 +209,7 @@ std::string CRewardableObject::getDisplayTextImpl(PlayerColor player, const CGHe
}
else
{
if(configuration.visitMode == Rewardable::VISIT_PLAYER || configuration.visitMode == Rewardable::VISIT_ONCE)
if(configuration.visitMode == Rewardable::VISIT_PLAYER || configuration.visitMode == Rewardable::VISIT_ONCE || configuration.visitMode == Rewardable::VISIT_PLAYER_GLOBAL)
{
if (wasVisited(player))
result += "\n" + configuration.visitedTooltip.toString();