diff options
| author | treeston <treeston.mmoc@gmail.com> | 2016-08-06 20:20:07 +0200 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2017-02-11 22:37:07 +0100 |
| commit | d2b5af3a524ee0eeeedfe29aa34d841f70612e7e (patch) | |
| tree | e97bb82967f550273ce19b6b70b41d684292483b | |
| parent | 12b58eae40d8fff432a28993e10da84551d3cc6a (diff) | |
Core/Conditions: Add new CONDITION_PET_TYPE (45). Matches target player's pet against specified (value1) bitmask.
(cherry picked from commit e9d4bbc74effad4b16de1a5514cea531f4e5e444)
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.cpp | 21 | ||||
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.h | 3 |
2 files changed, 22 insertions, 2 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 5a232b6add1..0629a5b1f5d 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -23,6 +23,7 @@ #include "InstanceScript.h" #include "ObjectMgr.h" #include "Player.h" +#include "Pet.h" #include "ReputationMgr.h" #include "ScriptedCreature.h" #include "ScriptMgr.h" @@ -106,7 +107,8 @@ ConditionMgr::ConditionTypeInfo const ConditionMgr::StaticConditionTypeData[COND { "Terrain Swap", true, false, false }, { "Sit/stand state", true, true, false }, { "Daily Quest Completed",true, false, false }, - { "Charmed", false, false, false } + { "Charmed", false, false, false }, + { "Pet type", true, false, false } }; // Checks if object meets the condition @@ -468,6 +470,13 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) const condMeets = unit->IsCharmed(); break; } + case CONDITION_PET_TYPE: + { + if (Player* player = object->ToPlayer()) + if (Pet* pet = player->GetPet()) + condMeets = (((1 << pet->getPetType()) & ConditionValue1) != 0); + break; + } default: condMeets = false; break; @@ -655,6 +664,9 @@ uint32 Condition::GetSearcherTypeMaskForCondition() const case CONDITION_CHARMED: mask |= GRID_MAP_TYPE_MASK_CREATURE | GRID_MAP_TYPE_MASK_PLAYER; break; + case CONDITION_PET_TYPE: + mask |= GRID_MAP_TYPE_MASK_PLAYER; + break; default: ASSERT(false && "Condition::GetSearcherTypeMaskForCondition - missing condition handling!"); break; @@ -2266,6 +2278,13 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond) const } break; } + case CONDITION_PET_TYPE: + if (cond->ConditionValue1 >= (1 << MAX_PET_TYPE)) + { + TC_LOG_ERROR("sql.sql", "%s has non-existing pet type %u, skipped.", cond->ToString(true).c_str(), cond->ConditionValue1); + return false; + } + break; case CONDITION_IN_WATER: case CONDITION_CHARMED: default: diff --git a/src/server/game/Conditions/ConditionMgr.h b/src/server/game/Conditions/ConditionMgr.h index 04c0e13ebec..01382599ceb 100644 --- a/src/server/game/Conditions/ConditionMgr.h +++ b/src/server/game/Conditions/ConditionMgr.h @@ -93,7 +93,8 @@ enum ConditionTypes CONDITION_STAND_STATE = 42, // stateType state 0 true if unit matches specified sitstate (0,x: has exactly state x; 1,0: any standing state; 1,1: any sitting state;) CONDITION_DAILY_QUEST_DONE = 43, // quest id 0 0 true if daily quest has been completed for the day CONDITION_CHARMED = 44, // 0 0 0 true if unit is currently charmed - CONDITION_MAX = 45 // MAX + CONDITION_PET_TYPE = 45, // mask 0 0 true if player has a pet of given type(s) + CONDITION_MAX = 46 // MAX }; /*! Documentation on implementing a new ConditionSourceType: |