diff options
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.cpp | 14 | ||||
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.h | 3 |
2 files changed, 15 insertions, 2 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 8400e4cee00..25fbef2ca86 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -100,7 +100,8 @@ ConditionMgr::ConditionTypeInfo const ConditionMgr::StaticConditionTypeData[COND { "Alive", false, false, false }, { "Health Value", true, true, false }, { "Health Pct", true, true, false }, - { "Realm Achievement", true, false, false } + { "Realm Achievement", true, false, false }, + { "In Water", false, false, false } }; // Checks if object meets the condition @@ -424,6 +425,12 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) condMeets = true; break; } + case CONDITION_IN_WATER: + { + if (Unit* unit = object->ToUnit()) + condMeets = unit->IsInWater(); + break; + } default: condMeets = false; break; @@ -591,6 +598,9 @@ uint32 Condition::GetSearcherTypeMaskForCondition() case CONDITION_REALM_ACHIEVEMENT: mask |= GRID_MAP_TYPE_MASK_ALL; break; + case CONDITION_IN_WATER: + mask |= GRID_MAP_TYPE_MASK_CREATURE | GRID_MAP_TYPE_MASK_PLAYER; + break; default: ASSERT(false && "Condition::GetSearcherTypeMaskForCondition - missing condition handling!"); break; @@ -2077,6 +2087,8 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond) } break; } + case CONDITION_IN_WATER: + break; default: break; } diff --git a/src/server/game/Conditions/ConditionMgr.h b/src/server/game/Conditions/ConditionMgr.h index 1fdd011633e..27983782bdc 100644 --- a/src/server/game/Conditions/ConditionMgr.h +++ b/src/server/game/Conditions/ConditionMgr.h @@ -73,7 +73,8 @@ enum ConditionTypes CONDITION_HP_VAL = 37, // hpVal ComparisonType 0 true if unit's hp matches given value CONDITION_HP_PCT = 38, // hpPct ComparisonType 0 true if unit's hp matches given pct CONDITION_REALM_ACHIEVEMENT = 39, // achievement_id 0 0 true if realm achievement is complete - CONDITION_MAX = 40 // MAX + CONDITION_IN_WATER = 40, // 0 0 0 true if unit in water + CONDITION_MAX = 41 // MAX }; /*! Documentation on implementing a new ConditionSourceType: |