nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-23 05:36:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(DB/Core): Quest "The Great Hunter's Challenge"; add new condition CONDITION_QUEST_OBJECTIVE_PROGRESS (#2342)

Browse Source
This commit is contained in:
Stoabrogga
2019-10-21 08:57:41 +02:00
committed by GitHub
parent 9e4b3cea3d
commit c769fb9006
3 changed files with 324 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/server/game/Conditions/ConditionMgr.cpp
View File

@@ -361,6 +361,19 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo)
condMeets = unit->IsInWater();
break;
}
case CONDITION_QUEST_OBJECTIVE_PROGRESS:
{
if (Player* player = object->ToPlayer())
{
const Quest* quest = ASSERT_NOTNULL(sObjectMgr->GetQuestTemplate(ConditionValue1));
uint16 log_slot = player->FindQuestSlot(quest->GetQuestId());
if (log_slot >= MAX_QUEST_LOG_SIZE)
break;
if (player->GetQuestSlotCounter(log_slot, ConditionValue2) == ConditionValue3)
condMeets = true;
}
break;
}
case CONDITION_HAS_AURA_TYPE:
{
if (Unit* unit = object->ToUnit())
@@ -540,6 +553,9 @@ uint32 Condition::GetSearcherTypeMaskForCondition()
case CONDITION_IN_WATER:
mask |= GRID_MAP_TYPE_MASK_CREATURE | GRID_MAP_TYPE_MASK_PLAYER;
break;
case CONDITION_QUEST_OBJECTIVE_PROGRESS:
mask |= GRID_MAP_TYPE_MASK_PLAYER;
break;
case CONDITION_HAS_AURA_TYPE:
mask |= GRID_MAP_TYPE_MASK_CREATURE | GRID_MAP_TYPE_MASK_PLAYER;
break;
@@ -1607,7 +1623,6 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond)
}
switch (cond->ConditionType) {
case CONDITION_TERRAIN_SWAP:
case CONDITION_QUEST_OBJECTIVE_COMPLETE:
case CONDITION_DIFFICULTY_ID:
sLog->outErrorDb("SourceEntry %u in `condition` table has a ConditionType that is not supported on 3.3.5a (%u), ignoring.",
cond->SourceEntry, uint32(cond->ConditionType));
@@ -2157,6 +2172,34 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond)
{
break;
}
case CONDITION_QUEST_OBJECTIVE_PROGRESS:
{
const Quest* quest = sObjectMgr->GetQuestTemplate(cond->ConditionValue1);
if (!quest)
{
sLog->outErrorDb("CONDITION_QUEST_OBJECTIVE_PROGRESS points to non-existing quest (%u), skipped.", cond->ConditionValue1);
return false;
}
if (cond->ConditionValue2 > 3)
{
sLog->outErrorDb("CONDITION_QUEST_OBJECTIVE_PROGRESS has out-of-range quest objective index specified (%u), it must be a number between 0 and 3. skipped.", cond->ConditionValue2);
return false;
}
if (quest->RequiredNpcOrGo[cond->ConditionValue2] == 0)
{
sLog->outErrorDb("CONDITION_QUEST_OBJECTIVE_PROGRESS has quest objective %u for quest %u, but the field RequiredNPCOrGo%u is 0, skipped.", cond->ConditionValue2, cond->ConditionValue1, cond->ConditionValue2);
return false;
}
if (cond->ConditionValue3 > quest->RequiredNpcOrGoCount[cond->ConditionValue2])
{
sLog->outErrorDb("CONDITION_QUEST_OBJECTIVE_PROGRESS has quest objective count %u in value3, but quest %u has a maximum objective count of %u in RequiredNPCOrGOCount%u, skipped.", cond->ConditionValue3, cond->ConditionValue2, quest->RequiredNpcOrGoCount[cond->ConditionValue2], cond->ConditionValue2);
return false;
}
break;
}
case CONDITION_HAS_AURA_TYPE:
{
if (cond->ConditionValue1 == SPELL_AURA_NONE || cond->ConditionValue1 >= TOTAL_AURAS)

2
src/server/game/Conditions/ConditionMgr.h
View File

@@ -69,7 +69,7 @@ enum ConditionTypes
CONDITION_PET_TYPE = 45, // TODO: NOT SUPPORTED YET
CONDITION_TAXI = 46, // TODO: NOT SUPPORTED YET
CONDITION_QUESTSTATE = 47, // TODO: NOT SUPPORTED YET
CONDITION_QUEST_OBJECTIVE_COMPLETE = 48, // don't use on 3.3.5a
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, // don't use on 3.3.5a
CONDITION_TC_END = 50, // placeholder