From be4496c034e4b5bdb7cba1993361e1285ae46862 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E4=BD=A9=E8=8C=B9?= Date: Fri, 29 Sep 2023 08:10:44 -0600 Subject: [PATCH] Disable LFG when SimpleConfigOverride is enabled --- conf/individualProgression.conf.dist | 4 +++- src/IndividualProgression.cpp | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/conf/individualProgression.conf.dist b/conf/individualProgression.conf.dist index 39fd4e9..f45250b 100644 --- a/conf/individualProgression.conf.dist +++ b/conf/individualProgression.conf.dist @@ -184,6 +184,7 @@ IndividualProgression.FishingFix = 1 # Water Breath Timer to 1 Minute (Vanilla value, changed to 3 Minutes in WotLK) # Disable Quest Object sparkle and object quest markers (added in patch 2.3) # Enable PlayerSettings (required by Individual Progression module) +# Disable the LFG tool, aside from special Holiday events otherwise inaccessible # # Default: 1 - Enabled # 0 - Disabled @@ -331,7 +332,8 @@ IndividualProgression.PvPGearRequirements = 1 # # IndividualProgression.DisableRDF # Description: Enable or disable the Random Dungeon Finder feature within the context of Individual Progression. -# Queing for specific dungeons and Holiday Events will still be possible. (See worldserver.conf for total LFG removal). +# Queuing for specific dungeons and Holiday Events will still be possible. (Use DungeonFinder.OptionsMask in worldserver.conf to completely disable the LFG tool.) +# Please note that the LFG tool is disabled (except for Holiday events) by default if SimpleConfigOverride is enabled. # Default: 0 - Enabled # 1 - Disabled # diff --git a/src/IndividualProgression.cpp b/src/IndividualProgression.cpp index 41f91f3..2dba5a4 100644 --- a/src/IndividualProgression.cpp +++ b/src/IndividualProgression.cpp @@ -352,6 +352,7 @@ public: if (sIndividualProgression->simpleConfigOverride) { sWorld->setIntConfig(CONFIG_WATER_BREATH_TIMER, 60000); + sWorld->setIntConfig(CONFIG_LFG_OPTIONSMASK, 4); sWorld->setBoolConfig(CONFIG_OBJECT_QUEST_MARKERS, false); sWorld->setBoolConfig(CONFIG_OBJECT_SPARKLES, false); sWorld->setBoolConfig(CONFIG_PLAYER_SETTINGS_ENABLED, true);