[10169] New config option Quests.IgnoreRaid

It allow if enabled (disbled by default) do non-raids quests in raid.
This commit is contained in:
VladimirMangos 2010-07-09 17:16:56 +04:00
parent 617dd4391a
commit ff1259b30f
6 changed files with 19 additions and 2 deletions

View file

@ -262,3 +262,11 @@ int32 Quest::GetRewOrReqMoney() const
return int32(RewOrReqMoney * sWorld.getConfig(CONFIG_FLOAT_RATE_DROP_MONEY));
}
bool Quest::IsAllowedInRaid() const
{
if (QUEST_TYPE_RAID || Type == QUEST_TYPE_RAID_10 || Type == QUEST_TYPE_RAID_25)
return true;
return sWorld.getConfig(CONFIG_BOOL_QUEST_IGNORE_RAID);
}

View file

@ -258,7 +258,7 @@ class Quest
bool IsWeekly() const { return QuestFlags & QUEST_FLAGS_WEEKLY; }
bool IsDailyOrWeekly() const { return QuestFlags & (QUEST_FLAGS_DAILY | QUEST_FLAGS_WEEKLY); }
bool IsAutoAccept() const { return QuestFlags & QUEST_FLAGS_AUTO_ACCEPT; }
bool IsAllowedInRaid() const { return Type == QUEST_TYPE_RAID || Type == QUEST_TYPE_RAID_10 || Type == QUEST_TYPE_RAID_25; }
bool IsAllowedInRaid() const;
// multiple values
std::string ObjectiveText[QUEST_OBJECTIVES_COUNT];

View file

@ -681,6 +681,8 @@ void World::LoadConfigSettings(bool reload)
setConfigMinMax(CONFIG_UINT32_QUEST_WEEKLY_RESET_WEEK_DAY, "Quests.Weekly.ResetWeekDay", 3, 0, 6);
setConfigMinMax(CONFIG_UINT32_QUEST_WEEKLY_RESET_HOUR, "Quests.Weekly.ResetHour", 6, 0 , 23);
setConfig(CONFIG_BOOL_QUEST_IGNORE_RAID, "Quests.IgnoreRaid", false);
setConfig(CONFIG_BOOL_DETECT_POS_COLLISION, "DetectPosCollision", true);
setConfig(CONFIG_BOOL_RESTRICTED_LFG_CHANNEL, "Channel.RestrictedLfg", true);

View file

@ -290,6 +290,7 @@ enum eConfigBoolValues
CONFIG_BOOL_ALWAYS_MAX_SKILL_FOR_LEVEL,
CONFIG_BOOL_WEATHER,
CONFIG_BOOL_EVENT_ANNOUNCE,
CONFIG_BOOL_QUEST_IGNORE_RAID,
CONFIG_BOOL_DETECT_POS_COLLISION,
CONFIG_BOOL_RESTRICTED_LFG_CHANNEL,
CONFIG_BOOL_SILENTLY_GM_JOIN_TO_CHANNEL,

View file

@ -609,6 +609,11 @@ LogColors = ""
# Hour in one from weekly days when weekly quests reset (0..23)
# Default: 6
#
# Quests.IgnoreRaid
# Non-raid quests allowed in raids
# Default: 0 (not allowed)
# 1 (allowed)
#
# Guild.EventLogRecordsCount
# Count of guild event log records stored in guild_eventlog table
# Increase to store more guild events in table, minimum is 100
@ -745,6 +750,7 @@ Quests.HighLevelHideDiff = 7
Quests.Daily.ResetHour = 6
Quests.Weekly.ResetWeekDay = 3
Quests.Weekly.ResetHour = 6
Quests.IgnoreRaid = 0
Guild.EventLogRecordsCount = 100
Guild.BankEventLogRecordsCount = 25
TimerBar.Fatigue.GMLevel = 4

View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "10168"
#define REVISION_NR "10169"
#endif // __REVISION_NR_H__