Core/Conditions: implement CONDITION_DAILY_QUEST_DONE to check whethe…

…r or not a daily quest has been completed by a player in that day.

Also use it to fix two quest chains broken in commit 7905651. Should be the only ones of their kind.
This commit is contained in:
Aokromes committed 2016-07-20 19:40:21 +02:00
1 parent 9643f2033a
commit 79c5d21d36
4 files changed
+33 -2

No files matched your search

+12 -1
View File
@@ -103,7 +103,8 @@ ConditionMgr::ConditionTypeInfo const ConditionMgr::StaticConditionTypeData[COND
{ "Realm Achievement", true, false, false },
{ "In Water", false, false, false },
{ "Terrain Swap", true, false, false },
{ "Sit/stand state", true, true, false }
{ "Sit/stand state", true, true, false },
{ "Daily Quest Completed",true, false, false }
};
// Checks if object meets the condition
@@ -453,6 +454,12 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) const
}
break;
}
case CONDITION_DAILY_QUEST_DONE:
{
if (Player* player = object->ToPlayer())
condMeets = player->IsDailyQuestDone(ConditionValue1);
break;
}
default:
condMeets = false;
break;
@@ -634,6 +641,9 @@ uint32 Condition::GetSearcherTypeMaskForCondition() const
case CONDITION_STAND_STATE:
mask |= GRID_MAP_TYPE_MASK_CREATURE | GRID_MAP_TYPE_MASK_PLAYER;
break;
case CONDITION_DAILY_QUEST_DONE:
mask |= GRID_MAP_TYPE_MASK_PLAYER;
break;
default:
ASSERT(false && "Condition::GetSearcherTypeMaskForCondition - missing condition handling!");
break;
@@ -1868,6 +1878,7 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond) const
case CONDITION_QUESTTAKEN:
case CONDITION_QUEST_NONE:
case CONDITION_QUEST_COMPLETE:
case CONDITION_DAILY_QUEST_DONE:
{
if (!sObjectMgr->GetQuestTemplate(cond->ConditionValue1))
{
+2 -1
View File
@@ -73,7 +73,8 @@ enum ConditionTypes
CONDITION_IN_WATER = 40, // 0 0 0 true if unit in water
CONDITION_TERRAIN_SWAP = 41, // terrainSwap 0 0 true if object is in terrainswap
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_MAX = 43 // MAX
CONDITION_DAILY_QUEST_DONE = 43, // quest id 0 0 true if daily quest has been completed for the day
CONDITION_MAX = 44 // MAX
};
/*! Documentation on implementing a new ConditionSourceType:
@@ -23527,6 +23527,24 @@ void Player::SetDailyQuestStatus(uint32 quest_id)
}
}
bool Player::IsDailyQuestDone(uint32 quest_id)
{
bool found = false;
if (Quest const* qQuest = sObjectMgr->GetQuestTemplate(quest_id))
{
for (uint32 quest_daily_idx = 0; quest_daily_idx < PLAYER_MAX_DAILY_QUESTS; ++quest_daily_idx)
{
if (GetUInt32Value(PLAYER_FIELD_DAILY_QUESTS_1 + quest_daily_idx) == quest_id)
{
found = true;
break;
}
}
}
return found;
}
void Player::SetWeeklyQuestStatus(uint32 quest_id)
{
m_weeklyquests.insert(quest_id);
+1
View File
@@ -1568,6 +1568,7 @@ class Player : public Unit, public GridObject<Player>
QuestGiverStatus GetQuestDialogStatus(Object* questGiver);
void SetDailyQuestStatus(uint32 quest_id);
bool IsDailyQuestDone(uint32 quest_id);
void SetWeeklyQuestStatus(uint32 quest_id);
void SetMonthlyQuestStatus(uint32 quest_id);
void SetSeasonalQuestStatus(uint32 quest_id);