From f0054bd197d24e22c9104bfd4d5f4c250b4441d9 Mon Sep 17 00:00:00 2001
From: Tereneckla <Tereneckla@pm.me>
Date: Tue, 29 Jul 2025 13:04:35 +0000
Subject: [PATCH] fix(DB/Spells): add various spells to spell_groups (#22075)

---
 .../rev_1746620573935826954.sql               | 35 +++++++++++++++++++
 .../game/Spells/SpellInfoCorrections.cpp      |  6 ++++
 2 files changed, 41 insertions(+)
 create mode 100644 data/sql/updates/pending_db_world/rev_1746620573935826954.sql

diff --git a/data/sql/updates/pending_db_world/rev_1746620573935826954.sql b/data/sql/updates/pending_db_world/rev_1746620573935826954.sql
new file mode 100644
index 000000000..61f9d2be7
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1746620573935826954.sql
@@ -0,0 +1,35 @@
+-- improved shadow bolt into spell crit debuff
+DELETE FROM `spell_group` WHERE `id` = 1010 AND `spell_id` IN (17800);
+INSERT INTO `spell_group` VALUES (1010, 17800, 0);
+
+-- curse of weakness and spore cloud into low armor% debuff, remove curse of recklessness
+-- combine low armor% and attack power debuff because of curse of weakness
+-- add vindication and demoralizing screech
+DELETE FROM `spell_group` WHERE `id` = 1004 AND `spell_id` IN (702, 50274, 16231, 99, 1160, 67, 24423);
+INSERT INTO `spell_group` VALUES (1004, 702, 0), (1004, 50274, 0), (1004, 99, 0), (1004, 1160, 0), (1004, 67, 0), (1004, 24423, 0);
+
+-- rename
+UPDATE `spell_group_stack_rules` SET `description` = 'Group of minor Armor reducing, hit increase and AP reducing debuffs, effect exclusive' WHERE `group_id` = 1004;
+
+-- remove old ap debuff group
+DELETE FROM `spell_group` WHERE `id` = 1017;
+DELETE FROM `spell_group_stack_rules` WHERE `group_id` = 1017;
+
+-- stampede into bleed debuff
+DELETE FROM `spell_group` WHERE `id` = 1008 AND `spell_id` IN (57386);
+INSERT INTO `spell_group` VALUES (1008, 57386, 0);
+
+-- poison spit, lava breath into spell haste debuff
+DELETE FROM `spell_group` WHERE `id` = 1022 AND `spell_id` IN (35387, 58604);
+INSERT INTO `spell_group` VALUES (1022, 35387, 0), (1022, 58604, 0);
+
+-- master poisoner into crit taken debuff (untested)
+DELETE FROM `spell_group` WHERE `id` = 1013 AND `spell_id` IN (45176);
+INSERT INTO `spell_group` VALUES (1013, 45176, 0);
+
+-- physical damage taken group with savage combat and blood frenzy
+DELETE FROM `spell_group_stack_rules` WHERE `group_id` = 1024;
+INSERT INTO `spell_group_stack_rules` VALUES (1024, 17, 'Group of physical damage taken increasing debuffs');
+
+DELETE FROM `spell_group` WHERE `id` = 1024 AND `spell_id` IN (30069, 58684);
+INSERT INTO `spell_group` VALUES (1024, 30069, 0), (1024, 58684, 0);
diff --git a/src/server/game/Spells/SpellInfoCorrections.cpp b/src/server/game/Spells/SpellInfoCorrections.cpp
index a61c81b02..4ba8f62c6 100644
--- a/src/server/game/Spells/SpellInfoCorrections.cpp
+++ b/src/server/game/Spells/SpellInfoCorrections.cpp
@@ -592,6 +592,12 @@ void SpellMgr::LoadSpellInfoCorrections()
         spellInfo->AttributesEx3 &= ~SPELL_ATTR3_SUPPRESS_CASTER_PROCS;
     });
 
+    // Vindication
+    ApplySpellFix({ 67, 26017}, [](SpellInfo* spellInfo)
+    {
+        spellInfo->Effects[EFFECT_0].MiscValue = 0;
+    });
+
     // Arcane Missiles
     ApplySpellFix({ 5143, 5144, 5145, 8416, 8417, 10211, 10212, 25345, 27075, 38699, 38704, 42843, 42846 }, [](SpellInfo* spellInfo)
     {