Add Naxxramas bracket (80_1_3) and clean up WotLK raid bracket SQL

* Initial plan

* 

- Create new Bracket_80_1_3 for Naxxramas (Tier 7: Naxx, EoE, OS, VoA)
- Add bracket directory, loader, and SQL disable file
- Update ProgressionSystem.h with new bracket entry (BRACKET_MAX 38→39)
- Update ProgressionSystem_loader.cpp with new AddBracket_80_1_C_Scripts
- Update progression_system.conf.dist with new config entry
- Move VoA enable from Ulduar bracket to Naxxramas bracket
- Remove raids_disables.sql from ToC bracket (now handled by Naxx bracket)

Co-authored-by: Nyeriah <47818697+Nyeriah@users.noreply.github.com>

* Final progress update

Co-authored-by: Nyeriah <47818697+Nyeriah@users.noreply.github.com>

* Remove accidentally committed codeql file and update .gitignore

Co-authored-by: Nyeriah <47818697+Nyeriah@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
This commit is contained in:
Andrew 2026-02-16 15:13:43 -03:00 committed by GitHub
parent 2c1014517a
commit 32ea14a305
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 23 additions and 7 deletions

1
.gitignore vendored
View file

@ -8,6 +8,7 @@
#Generic
#
_codeql_detected_source_root
.directory
.mailmap
*.orig

View file

@ -100,6 +100,8 @@ ProgressionSystem.Bracket_75_79 = 0
ProgressionSystem.Bracket_80_1_1 = 0
# Heroic WotLK Dungeons
ProgressionSystem.Bracket_80_1_2 = 0
# Naxxramas, Eye of Eternity, Obsidian Sanctum, Vault of Archavon
ProgressionSystem.Bracket_80_1_3 = 0
# Ulduar, Trial of the Champion, Arena Season 6
ProgressionSystem.Bracket_80_2 = 0
# Onyxia's Lair, Trial of The Crusader, Arena Season 7

View file

@ -0,0 +1,11 @@
/*
* Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3
*/
#include "ProgressionSystem.h"
void AddBracket_80_1_C_Scripts()
{
if (!(sConfigMgr->GetOption<bool>("ProgressionSystem.Bracket_80_1_3", false)))
return;
}

View file

@ -0,0 +1,3 @@
-- 80 level range - Tier 7 (Naxxramas)
-- Makes instances Naxxramas, Eye of Eternity, Obsidian Sanctum and Vault of Archavon available again.
DELETE FROM `disables` WHERE `sourceType` IN (2, 8) AND `entry` IN (533, 615, 616, 624);

View file

@ -1,5 +1,3 @@
-- 80 level range - Tier 8 (Secrets of Ulduar) & Furious Gladiator
-- Makes instances (and RDF) Ulduar and Vault of Archavon available again.
DELETE FROM `disables` WHERE `sourceType` IN (2, 8) AND `entry` IN (603, 624);
-- ^ This needs to be added alongside with nax or re-worked / splitted ^
-- Makes instance (and RDF) Ulduar available again.
DELETE FROM `disables` WHERE `sourceType` IN (2, 8) AND `entry` IN (603);

View file

@ -1,2 +0,0 @@
-- Makes instances Naxxramas, EoE, OS, VOA available
DELETE FROM `disables` WHERE `sourceType` = 2 AND `entry` IN (533, 616, 615, 624);

View file

@ -8,7 +8,7 @@
#include "Config.h"
#include "ScriptMgr.h"
#define PROGRESSION_BRACKET_MAX 38
#define PROGRESSION_BRACKET_MAX 39
std::array<std::string, PROGRESSION_BRACKET_MAX> const ProgressionBracketsNames =
{
"0",
@ -44,6 +44,7 @@ std::array<std::string, PROGRESSION_BRACKET_MAX> const ProgressionBracketsNames
"75_79",
"80_1_1",
"80_1_2",
"80_1_3",
"80_2",
"80_3",
"80_4_1",

View file

@ -38,6 +38,7 @@ void AddBracket_71_74_Scripts();
void AddBracket_75_79_Scripts();
void AddBracket_80_1_A_Scripts();
void AddBracket_80_1_B_Scripts();
void AddBracket_80_1_C_Scripts();
void AddBracket_80_2_Scripts();
void AddBracket_80_3_Scripts();
void AddBracket_80_4_A_Scripts();
@ -86,6 +87,7 @@ void Addmod_progression_systemScripts()
AddBracket_75_79_Scripts();
AddBracket_80_1_A_Scripts();
AddBracket_80_1_B_Scripts();
AddBracket_80_1_C_Scripts();
AddBracket_80_2_Scripts();
AddBracket_80_3_Scripts();
AddBracket_80_4_A_Scripts();