diff options
| author | Shauren <shauren.trinity@gmail.com> | 2019-07-21 20:06:32 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2019-07-21 20:06:32 +0200 |
| commit | 211b2fa3540ccae50d2cd7e37996efa3b9e624d5 (patch) | |
| tree | b0fcd65470e7a73e4e0af0bdb5603ec9bbc29740 | |
| parent | c8278cddeb49bd3cf6beeb4acbca1258c07cf131 (diff) | |
Core/Conditions: Reserve master branch condition types
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 3eb9ffeed35..4505e4c37c3 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -117,7 +117,9 @@ ConditionMgr::ConditionTypeInfo const ConditionMgr::StaticConditionTypeData[COND { "Quest state mask", true, true, false }, { "Quest objective progress", true, true, true }, { "Map difficulty", true, false, false }, - { "Is Gamemaster", true, false, false } + { "Is Gamemaster", true, false, false }, + { "Object Entry or Guid", true, true, true }, + { "Object TypeMask", true, false, false } }; // Checks if object meets the condition diff --git a/src/server/game/Conditions/ConditionMgr.h b/src/server/game/Conditions/ConditionMgr.h index a658573c57b..82088dd1355 100644 --- a/src/server/game/Conditions/ConditionMgr.h +++ b/src/server/game/Conditions/ConditionMgr.h @@ -86,6 +86,8 @@ enum ConditionTypes CONDITION_QUEST_OBJECTIVE_PROGRESS = 48, // quest_id objectiveIndex objectiveCount true if player has reached the specified objectiveCount quest progress for the objectiveIndex for the specified quest CONDITION_DIFFICULTY_ID = 49, // Difficulty 0 0 true is map has difficulty id CONDITION_GAMEMASTER = 50, // canBeGM 0 0 true if player is gamemaster (or can be gamemaster) + CONDITION_OBJECT_ENTRY_GUID_MASTER = 51, // TypeID entry guid true if object is type TypeID and the entry is 0 or matches entry of the object or matches guid of the object using master branch TypeID + CONDITION_TYPE_MASK_MASTER = 52, // TypeMask 0 0 true if object is type object's TypeMask matches provided TypeMask using master branch TypeMask CONDITION_MAX }; |