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

Implemented selectable messages for visited & empty state

Browse Source
This commit is contained in:
Ivan Savenko
2023-01-24 23:31:07 +02:00
parent ca6947b2cc
commit 44bdd2cbf3
9 changed files with 173 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
lib/mapObjects/CRewardableObject.h
View File

@@ -207,12 +207,23 @@ public:
class DLL_LINKAGE CRewardVisitInfo
{
public:
enum ERewardEventType
{
EVENT_INVALID,
EVENT_FIRST_VISIT,
EVENT_ALREADY_VISITED,
EVENT_NOT_AVAILABLE
};
CRewardLimiter limiter;
CRewardInfo reward;
/// Message that will be displayed on granting of this reward, if not empty
MetaString message;
/// Event to which this reward is assigned
ERewardEventType visitType;
CRewardVisitInfo() = default;
template <typename Handler> void serialize(Handler &h, const int version)
@@ -220,6 +231,7 @@ public:
h & limiter;
h & reward;
h & message;
h & visitType;
}
};
@@ -258,26 +270,24 @@ protected:
};
/// filters list of visit info and returns rewards that can be granted to current hero
virtual std::vector<ui32> getAvailableRewards(const CGHeroInstance * hero) const;
virtual std::vector<ui32> getAvailableRewards(const CGHeroInstance * hero, CRewardVisitInfo::ERewardEventType event ) const;
virtual void grantReward(ui32 rewardID, const CGHeroInstance * hero) const;
virtual CRewardVisitInfo getVisitInfo(int index, const CGHeroInstance *h) const;
virtual void grantReward(ui32 rewardID, const CGHeroInstance * hero, bool markVisited) const;
virtual void triggerReset() const;
/// Rewards that can be granted by an object
std::vector<CRewardVisitInfo> info;
/// MetaString's that contain text for messages for specific situations
/// Message that will be shown if player needs to select one of multiple rewards
MetaString onSelect;
MetaString onVisited;
MetaString onEmpty;
/// Rewards that can be applied by an object
std::vector<CRewardVisitInfo> info;
/// how reward will be selected, uses ESelectMode enum
ui8 selectMode;
/// contols who can visit an object, uses EVisitMode enum
ui8 visitMode;
/// reward selected by player
ui16 selectedReward;
@@ -287,6 +297,12 @@ protected:
/// if true - player can refuse visiting an object (e.g. Tomb)
bool canRefuse;
/// return true if this object was "cleared" before and no longer has rewards applicable to selected hero
/// unlike wasVisited, this method uses information not available to player owner, for example, if object was cleared by another player before
bool wasVisitedBefore(const CGHeroInstance * contextHero) const;
bool onceVisitableObjectCleared;
public:
EVisitMode getVisitMode() const;
ui16 getResetDuration() const;
@@ -311,9 +327,6 @@ public:
/// applies player selection of reward
void blockingDialogAnswered(const CGHeroInstance *hero, ui32 answer) const override;
/// function that will be called once reward is fully granted to hero
virtual void onRewardGiven(const CGHeroInstance * hero) const;
void initObj(CRandomGenerator & rand) override;
CRewardableObject();
@@ -325,11 +338,10 @@ public:
h & canRefuse;
h & resetParameters;
h & onSelect;
h & onVisited;
h & onEmpty;
h & visitMode;
h & selectMode;
h & selectedReward;
h & onceVisitableObjectCleared;
}
// for configuration/object setup