Remove RDF from SimpleConfigOverride config option (#561)

removed RDF from the SimpleConfigOverride
including it in the SimpleConfigOverride complicates things
because if you wanted to enable the RDF you were forced to change several other settings as well.

it's all very confusing
I'm trying to make it simple.

With disableRDF in the Individual Progression config file you can now enable/disable the RDF.
that's it. no need to edit the worldserver.conf file for this any more.

it's also very clear now when it's disabled. can't even select dungeons anymore.
This commit is contained in:
Grimfeather
2025-07-20 06:27:43 +02:00
committed by GitHub
parent b21b0358f0
commit 115d0546d2
4 changed files with 9 additions and 37 deletions

View File

@@ -1019,37 +1019,6 @@ public:
}
}
void OnPlayerQueueRandomDungeon(Player* player, uint32& rDungeonId) override
{
// List of exceptions for seasonal event dungeons
std::set<uint32> seasonalEventDungeons = { 285, 286, 287, 288 };
if (seasonalEventDungeons.find(rDungeonId) != seasonalEventDungeons.end())
{
return;
}
// Check if RDF is disabled in the context of Individual Progression
if (sConfigMgr->GetOption<bool>("IndividualProgression.DisableRDF", false))
{
ChatHandler(player->GetSession()).SendNotification("The Random Dungeon feature is currently disabled by the Individual Progression module.");
rDungeonId = 1000; // Set dungeon ID to an invalid value to cancel the queuing
return;
}
if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC) || (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC) && (player->GetLevel() <= IP_LEVEL_VANILLA)))
{
rDungeonId = RDF_CLASSIC;
}
else if ((rDungeonId == RDF_WRATH_OF_THE_LICH_KING && !sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5)) || (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5) && (player->GetLevel() <= IP_LEVEL_TBC)))
{
rDungeonId = RDF_THE_BURNING_CRUSADE;
}
else if ((rDungeonId == RDF_WRATH_OF_THE_LICH_KING_HEROIC && !sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5)) || (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5) && (player->GetLevel() <= IP_LEVEL_TBC)))
{
rDungeonId = RDF_THE_BURNING_CRUSADE_HEROIC;
}
}
bool OnPlayerCanEquipItem(Player* player, uint8 /*slot*/, uint16& /*dest*/, Item* pItem, bool /*swap*/, bool /*not_loading*/) override
{
if (sIndividualProgression->pvpGearRequirements)