Merge pull request #4932 from kandera/fix_seasonl_quest_reset
Core/Quests&GameEvents: fix seasonal quest check
This commit is contained in:
@@ -2398,7 +2398,10 @@ enum QuestSort
|
||||
QUEST_SORT_BREWFEST = 370,
|
||||
QUEST_SORT_INSCRIPTION = 371,
|
||||
QUEST_SORT_DEATH_KNIGHT = 372,
|
||||
QUEST_SORT_JEWELCRAFTING = 373
|
||||
QUEST_SORT_JEWELCRAFTING = 373,
|
||||
QUEST_SORT_NOBLEGARDEN = 374,
|
||||
QUEST_SORT_PILGRIMS_BOUNTY = 375,
|
||||
QUEST_SORT_LOVE_IS_IN_THE_AIR = 376,
|
||||
};
|
||||
|
||||
inline uint8 ClassByQuestSort(int32 QuestSort)
|
||||
|
||||
@@ -251,7 +251,7 @@ class Quest
|
||||
uint32 GetFlags() const { return Flags; }
|
||||
bool IsDaily() const { return Flags & QUEST_FLAGS_DAILY; }
|
||||
bool IsWeekly() const { return Flags & QUEST_FLAGS_WEEKLY; }
|
||||
bool IsSeasonal() const { return ZoneOrSort == -QUEST_SORT_SEASONAL; }
|
||||
bool IsSeasonal() const { return (ZoneOrSort == -QUEST_SORT_SEASONAL || ZoneOrSort == -QUEST_SORT_SPECIAL || ZoneOrSort == -QUEST_SORT_LUNAR_FESTIVAL || ZoneOrSort == -QUEST_SORT_MIDSUMMER || ZoneOrSort == -QUEST_SORT_BREWFEST || ZoneOrSort == -QUEST_SORT_LOVE_IS_IN_THE_AIR || ZoneOrSort == -QUEST_SORT_NOBLEGARDEN); }
|
||||
bool IsDailyOrWeekly() const { return Flags & (QUEST_FLAGS_DAILY | QUEST_FLAGS_WEEKLY); }
|
||||
bool IsAutoAccept() const { return Flags & QUEST_FLAGS_AUTO_ACCEPT; }
|
||||
bool IsRaidQuest() const { return Type == QUEST_TYPE_RAID || Type == QUEST_TYPE_RAID_10 || Type == QUEST_TYPE_RAID_25; }
|
||||
|
||||
Reference in New Issue
Block a user