From 32ea14a305a2900a1827e744dede6a45046fbf77 Mon Sep 17 00:00:00 2001 From: Andrew <47818697+Nyeriah@users.noreply.github.com> Date: Mon, 16 Feb 2026 15:13:43 -0300 Subject: [PATCH] Add Naxxramas bracket (80_1_3) and clean up WotLK raid bracket SQL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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> --- .gitignore | 1 + conf/progression_system.conf.dist | 2 ++ src/Bracket_80_1_3/Bracket_80_1_3_loader.cpp | 11 +++++++++++ .../sql/world/progression_80_1_3_disables.sql | 3 +++ .../sql/world/progression_80_2_disables.sql | 6 ++---- .../sql/world/progression_80_3_raids_disables.sql | 2 -- src/ProgressionSystem.h | 3 ++- src/ProgressionSystem_loader.cpp | 2 ++ 8 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 src/Bracket_80_1_3/Bracket_80_1_3_loader.cpp create mode 100644 src/Bracket_80_1_3/sql/world/progression_80_1_3_disables.sql delete mode 100644 src/Bracket_80_3/sql/world/progression_80_3_raids_disables.sql diff --git a/.gitignore b/.gitignore index 47ee2af..bd91ccc 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ #Generic # +_codeql_detected_source_root .directory .mailmap *.orig diff --git a/conf/progression_system.conf.dist b/conf/progression_system.conf.dist index 18bf7af..7b7086c 100644 --- a/conf/progression_system.conf.dist +++ b/conf/progression_system.conf.dist @@ -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 diff --git a/src/Bracket_80_1_3/Bracket_80_1_3_loader.cpp b/src/Bracket_80_1_3/Bracket_80_1_3_loader.cpp new file mode 100644 index 0000000..c2bc797 --- /dev/null +++ b/src/Bracket_80_1_3/Bracket_80_1_3_loader.cpp @@ -0,0 +1,11 @@ +/* + * Copyright (C) 2016+ AzerothCore , 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("ProgressionSystem.Bracket_80_1_3", false))) + return; +} diff --git a/src/Bracket_80_1_3/sql/world/progression_80_1_3_disables.sql b/src/Bracket_80_1_3/sql/world/progression_80_1_3_disables.sql new file mode 100644 index 0000000..d6bd437 --- /dev/null +++ b/src/Bracket_80_1_3/sql/world/progression_80_1_3_disables.sql @@ -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); diff --git a/src/Bracket_80_2/sql/world/progression_80_2_disables.sql b/src/Bracket_80_2/sql/world/progression_80_2_disables.sql index 1afe50d..6748fb6 100644 --- a/src/Bracket_80_2/sql/world/progression_80_2_disables.sql +++ b/src/Bracket_80_2/sql/world/progression_80_2_disables.sql @@ -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); diff --git a/src/Bracket_80_3/sql/world/progression_80_3_raids_disables.sql b/src/Bracket_80_3/sql/world/progression_80_3_raids_disables.sql deleted file mode 100644 index 28e8528..0000000 --- a/src/Bracket_80_3/sql/world/progression_80_3_raids_disables.sql +++ /dev/null @@ -1,2 +0,0 @@ --- Makes instances Naxxramas, EoE, OS, VOA available -DELETE FROM `disables` WHERE `sourceType` = 2 AND `entry` IN (533, 616, 615, 624); diff --git a/src/ProgressionSystem.h b/src/ProgressionSystem.h index 549de71..7f92b7c 100644 --- a/src/ProgressionSystem.h +++ b/src/ProgressionSystem.h @@ -8,7 +8,7 @@ #include "Config.h" #include "ScriptMgr.h" -#define PROGRESSION_BRACKET_MAX 38 +#define PROGRESSION_BRACKET_MAX 39 std::array const ProgressionBracketsNames = { "0", @@ -44,6 +44,7 @@ std::array const ProgressionBracketsNames "75_79", "80_1_1", "80_1_2", + "80_1_3", "80_2", "80_3", "80_4_1", diff --git a/src/ProgressionSystem_loader.cpp b/src/ProgressionSystem_loader.cpp index 3b9fac0..ffc527b 100644 --- a/src/ProgressionSystem_loader.cpp +++ b/src/ProgressionSystem_loader.cpp @@ -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();