diff options
Diffstat (limited to 'src/server/game/Conditions/ConditionMgr.cpp')
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.cpp | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 50726b91cad..bad5c195667 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -121,7 +121,8 @@ ConditionMgr::ConditionTypeInfo const ConditionMgr::StaticConditionTypeData[COND { "Pet type", true, false, false }, { "On Taxi", false, false, false }, { "Quest state mask", true, true, false }, - { "Objective Complete", true, false, false } + { "Objective Complete", true, false, false }, + { "Map Difficulty", true, false, false } }; // Checks if object meets the condition @@ -423,11 +424,6 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) const condMeets = player->HasTitle(ConditionValue1); break; } - case CONDITION_SPAWNMASK: - { - condMeets = ((UI64LIT(1) << object->GetMap()->GetSpawnMode()) & ConditionValue1) != 0; - break; - } case CONDITION_UNIT_STATE: { if (Unit* unit = object->ToUnit()) @@ -523,6 +519,11 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) const } break; } + case CONDITION_DIFFICULTY_ID: + { + condMeets = object->GetMap()->GetDifficultyID() == ConditionValue1; + break; + } default: condMeets = false; break; @@ -680,9 +681,6 @@ uint32 Condition::GetSearcherTypeMaskForCondition() const case CONDITION_TITLE: mask |= GRID_MAP_TYPE_MASK_PLAYER; break; - case CONDITION_SPAWNMASK: - mask |= GRID_MAP_TYPE_MASK_ALL; - break; case CONDITION_GENDER: mask |= GRID_MAP_TYPE_MASK_PLAYER; break; @@ -722,6 +720,9 @@ uint32 Condition::GetSearcherTypeMaskForCondition() const case CONDITION_QUEST_OBJECTIVE_COMPLETE: mask |= GRID_MAP_TYPE_MASK_PLAYER; break; + case CONDITION_DIFFICULTY_ID: + mask |= GRID_MAP_TYPE_MASK_ALL; + break; default: ASSERT(false && "Condition::GetSearcherTypeMaskForCondition - missing condition handling!"); break; @@ -2261,15 +2262,10 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond) const } break; } - case CONDITION_SPAWNMASK: + case CONDITION_SPAWNMASK_DEPRECATED: { - /// @todo: ConditionValue need to be extended to uint64 - if (uint64(cond->ConditionValue1) >= (UI64LIT(1) << MAX_DIFFICULTY)) - { - TC_LOG_ERROR("sql.sql", "%s has non existing SpawnMask in value1 (%u), skipped.", cond->ToString(true).c_str(), cond->ConditionValue1); - return false; - } - break; + TC_LOG_ERROR("sql.sql", "%s using deprecated condition type CONDITION_SPAWNMASK.", cond->ToString(true).c_str()); + return false; } case CONDITION_UNIT_STATE: { @@ -2346,6 +2342,13 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond) const case CONDITION_CHARMED: case CONDITION_TAXI: break; + case CONDITION_DIFFICULTY_ID: + if (!sDifficultyStore.LookupEntry(cond->ConditionValue1)) + { + TC_LOG_ERROR("sql.sql", "%s has non existing difficulty in value1 (%u), skipped.", cond->ToString(true).c_str(), cond->ConditionValue1); + return false; + } + break; default: TC_LOG_ERROR("sql.sql", "%s Invalid ConditionType in `condition` table, ignoring.", cond->ToString().c_str()); return false; |