diff options
Diffstat (limited to 'src/server/game/Conditions/ConditionMgr.cpp')
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.cpp | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 2aa97eb2d48..3eb9ffeed35 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -116,6 +116,7 @@ ConditionMgr::ConditionTypeInfo const ConditionMgr::StaticConditionTypeData[COND { "On Taxi", false, false, false }, { "Quest state mask", true, true, false }, { "Quest objective progress", true, true, true }, + { "Map difficulty", true, false, false }, { "Is Gamemaster", true, false, false } }; @@ -514,7 +515,11 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) const } break; } - + case CONDITION_DIFFICULTY_ID: + { + condMeets = object->GetMap()->GetDifficulty() == ConditionValue1; + break; + } case CONDITION_GAMEMASTER: { if (Player* player = object->ToPlayer()) @@ -716,6 +721,9 @@ uint32 Condition::GetSearcherTypeMaskForCondition() const case CONDITION_QUEST_OBJECTIVE_PROGRESS: mask |= GRID_MAP_TYPE_MASK_PLAYER; break; + case CONDITION_DIFFICULTY_ID: + mask |= GRID_MAP_TYPE_MASK_ALL; + break; case CONDITION_GAMEMASTER: mask |= GRID_MAP_TYPE_MASK_PLAYER; break; @@ -2326,6 +2334,13 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond) const } break; } + case CONDITION_DIFFICULTY_ID: + if (cond->ConditionValue1 >= MAX_DIFFICULTY) + { + TC_LOG_ERROR("sql.sql", "%s has non existing difficulty in value1 (%u), skipped.", cond->ToString(true).c_str(), cond->ConditionValue1); + return false; + } + break; case CONDITION_IN_WATER: case CONDITION_CHARMED: case CONDITION_TAXI: |