Merge pull request #53 from LannyE/Resolve-Conflicts-2-18-26

Resolve conflicts 2-18-26

Author: LannyE

data/sql/updates/db_world/2026_01_24_00.sql

@@ -0,0 +1,17 @@
+-- DB update 2026_02_16_00 -> 2026_02_18_00
+-- Update gameobject 'Valentine Arch (x2.00)' with sniffed values
+-- updated spawns
+DELETE FROM `gameobject` WHERE (`id` IN (201940)) AND (`guid` IN (242244, 242245, 242246, 242247, 242248, 242249, 242250, 242251));
+INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `ScriptName`, `VerifiedBuild`, `Comment`) VALUES
+(242244, 201940, 1, 0, 0, 1, 1, 1653.5625, -4435.20654296875, 17.64115524291992187, 1.48352813720703125, 0, 0, 0.675589561462402343, 0.737277925014495849, 120, 255, 1, "", 47966, NULL),
+(242245, 201940, 1, 0, 0, 1, 1, -1217.9444580078125, 62.78819656372070312, 129.7745819091796875, 3.508116960525512695, 0, 0, -0.98325443267822265, 0.182238012552261352, 120, 255, 1, "", 47966, NULL),
+(242246, 201940, 0, 0, 0, 1, 1, 1629.0191650390625, 239.795135498046875, 63.8515167236328125, 6.265733242034912109, 0, 0, -0.00872611999511718, 0.999961912631988525, 120, 255, 1, "", 47966, NULL),
+(242247, 201940, 530, 0, 0, 1, 1, 9611.6396484375, -7183.14404296875, 14.28471183776855468, 1.745326757431030273, 0, 0, 0.766043663024902343, 0.642788589000701904, 120, 255, 1, "", 47966, NULL),
+(242248, 201940, 1, 0, 0, 1, 1, 9870.7138671875, 2493.632080078125, 1315.87548828125, 5.986480236053466796, 0, 0, -0.14780902862548828, 0.989015936851501464, 120, 255, 1, "", 52237, NULL),
+(242249, 201940, 0, 0, 0, 1, 1, -8868.98828125, 637.1007080078125, 95.787139892578125, 0.837757468223571777, 0, 0, 0.406736373901367187, 0.913545548915863037, 120, 255, 1, "", 47966, NULL),
+(242250, 201940, 0, 0, 0, 1, 1, -4918.39404296875, -983.5625, 501.45306396484375, 2.268925428390502929, 0, 0, 0.906307220458984375, 0.422619491815567016, 120, 255, 1, "", 48120, NULL),
+(242251, 201940, 530, 0, 0, 1, 1, -4005.6494140625, -11844.5849609375, 0.186078995466232299, 4.520402908325195312, 0, 0, -0.77162456512451171, 0.636078238487243652, 120, 255, 1, "", 52237, NULL);
+
+-- enable all spawns for eventEntry 8
+DELETE FROM `game_event_gameobject` WHERE (`eventEntry` = 8) AND (`guid` IN (SELECT `guid` FROM `gameobject` WHERE `id` IN (201940)));
+INSERT INTO `game_event_gameobject` (SELECT 8, `guid` FROM `gameobject` WHERE `id` IN (201940));

data/sql/updates/db_world/2026_02_18_00.sql

@@ -0,0 +1,106 @@
+-- DB update 2026_02_18_01 -> 2026_02_18_02
+-- Lock and Load - Add spell_proc entry with correct SpellPhaseMask for periodic damage procs
+-- SpellPhaseMask changed from 4 (PROC_SPELL_PHASE_FINISH) to 2 (PROC_SPELL_PHASE_HIT)
+-- This allows Black Arrow, Explosive Trap, and Immolation Trap periodic damage to trigger Lock and Load
+DELETE FROM `spell_proc` WHERE `SpellId` = -56342;
+INSERT INTO `spell_proc` (`SpellId`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `ProcFlags`, `SpellTypeMask`, `SpellPhaseMask`, `HitMask`, `AttributesMask`, `DisableEffectsMask`, `ProcsPerMinute`, `Chance`, `Cooldown`, `Charges`) VALUES
+(-56342, 0, 9, 24, 134217728, 147456, 0, 0, 2, 0, 2, 0, 0, 0, 22000, 0);
+
+-- Killing Machine - register spell script
+DELETE FROM `spell_script_names` WHERE `ScriptName` = 'spell_dk_killing_machine';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(51124, 'spell_dk_killing_machine');
+
+-- Elemental Focus - register spell script to prevent weapon imbue attacks from proccing Clearcasting
+DELETE FROM `spell_script_names` WHERE `spell_id` = 16164 AND `ScriptName` = 'spell_sha_elemental_focus';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(16164, 'spell_sha_elemental_focus');
+
+-- Light's Beacon (53651) - Beacon of Light heal transfer script
+DELETE FROM `spell_script_names` WHERE `spell_id` = 53651;
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(53651, 'spell_pal_light_s_beacon');
+
+-- Mage spell scripts from TrinityCore proc system port
+DELETE FROM `spell_script_names` WHERE `spell_id` IN (-5143, -31661, -44614, 45438, 44401);
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(-5143, 'spell_mage_arcane_missiles'),
+(-31661, 'spell_mage_dragon_breath'),
+(-44614, 'spell_mage_frostfire_bolt'),
+(45438, 'spell_mage_ice_block'),
+(44401, 'spell_mage_missile_barrage_proc');
+
+-- Paladin scripts refactored from hardcoded SpellAuras.cpp and Spell.cpp to proper scripts
+-- Aura Mastery (31821) - Applies/removes Aura Mastery Immune aura
+DELETE FROM `spell_script_names` WHERE `spell_id` = 31821;
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(31821, 'spell_pal_aura_mastery');
+
+-- Aura Mastery Immune (64364) - Area target check to filter immunity to only Concentration Aura targets
+DELETE FROM `spell_script_names` WHERE `spell_id` = 64364;
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(64364, 'spell_pal_aura_mastery_immune');
+
+-- Beacon of Light (53563) - Periodic tick handler to ensure correct caster GUID propagation
+DELETE FROM `spell_script_names` WHERE `spell_id` = 53563 AND `ScriptName` = 'spell_pal_beacon_of_light';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(53563, 'spell_pal_beacon_of_light');
+
+-- Sacred Shield (58597) - Absorb amount calculation with ICC buff support
+DELETE FROM `spell_script_names` WHERE `spell_id` = 58597 AND `ScriptName` = 'spell_pal_sacred_shield';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(58597, 'spell_pal_sacred_shield');
+
+-- Divine Protection (498), Divine Shield (642), Hand of Protection (-1022)
+-- Applies Forbearance, Avenging Wrath marker, and Immune Shield marker
+DELETE FROM `spell_script_names` WHERE `ScriptName` = 'spell_pal_immunities';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(498, 'spell_pal_immunities'),
+(642, 'spell_pal_immunities'),
+(-1022, 'spell_pal_immunities');
+
+-- Improved Concentration Aura (-20254), Improved Devotion Aura (-20138)
+-- Sanctified Retribution (31869), Swift Retribution (-53379)
+-- Handles applying/removing the improved aura buff effects
+DELETE FROM `spell_script_names` WHERE `ScriptName` IN ('spell_pal_improved_concentraction_aura', 'spell_pal_improved_devotion_aura', 'spell_pal_sanctified_retribution', 'spell_pal_swift_retribution');
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(-20254, 'spell_pal_improved_concentraction_aura'),
+(-20138, 'spell_pal_improved_devotion_aura'),
+(31869, 'spell_pal_sanctified_retribution'),
+(-53379, 'spell_pal_swift_retribution');
+
+-- Warrior scripts - Vigilance redirect threat and Warrior's Wrath (T2 5P)
+DELETE FROM `spell_script_names` WHERE `spell_id` IN (59665, 21977);
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(59665, 'spell_warr_vigilance_redirect_threat'),
+(21977, 'spell_warr_warriors_wrath');
+
+-- Druid Forms Trinket (37336) - SpellPhaseMask required for proc system
+-- ProcFlags=0 uses DBC flags (0x15414), Chance=0 uses DBC chance (3%)
+DELETE FROM `spell_proc` WHERE `SpellId` = 37336;
+INSERT INTO `spell_proc` (`SpellId`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `ProcFlags`, `SpellTypeMask`, `SpellPhaseMask`, `HitMask`, `AttributesMask`, `DisableEffectsMask`, `ProcsPerMinute`, `Chance`, `Cooldown`, `Charges`) VALUES
+(37336, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0);
+
+-- Living Root of the Wildheart (37336) - Item trinket script
+DELETE FROM `spell_script_names` WHERE `spell_id` = 37336;
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(37336, 'spell_item_living_root_of_the_wildheart');
+
+-- Druid scripts ported from TrinityCore
+-- Frenzied Regeneration (22842) - Converts rage to health
+-- Nourish (50464) - Glyph of Nourish support
+-- Insect Swarm (-5570) - T8 Balance Relic support
+-- T9 Feral Relic (67353) - Idol of Mutilation form-specific procs
+DELETE FROM `spell_script_names` WHERE `ScriptName` IN ('spell_dru_frenzied_regeneration', 'spell_dru_nourish', 'spell_dru_insect_swarm', 'spell_dru_t9_feral_relic');
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(22842, 'spell_dru_frenzied_regeneration'),
+(50464, 'spell_dru_nourish'),
+(-5570, 'spell_dru_insect_swarm'),
+(67353, 'spell_dru_t9_feral_relic');
+
+-- Priest scripts ported from TrinityCore
+-- Pain and Suffering (-47580) - Prevents EFFECT_1 DUMMY from proccing
+DELETE FROM `spell_script_names` WHERE `ScriptName` = 'spell_pri_pain_and_suffering_dummy';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(47580, 'spell_pri_pain_and_suffering_dummy'),
+(47581, 'spell_pri_pain_and_suffering_dummy');

data/sql/updates/db_world/2026_02_18_01.sql

@@ -0,0 +1,19 @@
+-- DB update 2026_02_18_02 -> 2026_02_18_03
+--
+DELETE FROM `spell_script_names` WHERE `spell_id` IN (52179, 16246, 16191, -30881, 55278, 55328, 55329, 55330, 55332, 55333, 55335, 58589, 58590, 58591, 28820);
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(52179, 'spell_sha_astral_shift_visual_dummy'),
+(16246, 'spell_sha_clearcasting'),
+(16191, 'spell_sha_mana_tide'),
+(-30881, 'spell_sha_nature_guardian'),
+(55278, 'spell_sha_stoneclaw_totem'),
+(55328, 'spell_sha_stoneclaw_totem'),
+(55329, 'spell_sha_stoneclaw_totem'),
+(55330, 'spell_sha_stoneclaw_totem'),
+(55332, 'spell_sha_stoneclaw_totem'),
+(55333, 'spell_sha_stoneclaw_totem'),
+(55335, 'spell_sha_stoneclaw_totem'),
+(58589, 'spell_sha_stoneclaw_totem'),
+(58590, 'spell_sha_stoneclaw_totem'),
+(58591, 'spell_sha_stoneclaw_totem'),
+(28820, 'spell_sha_t3_8p_bonus');

data/sql/updates/db_world/2026_02_18_02.sql

@@ -0,0 +1,32 @@
+-- DB update 2026_02_18_03 -> 2026_02_18_04
+-- Register Nether Protection spell script
+DELETE FROM `spell_script_names` WHERE `spell_id` = -30299;
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(-30299, 'spell_warl_nether_protection');
+
+-- Register Curse of Agony spell script
+DELETE FROM `spell_script_names` WHERE `spell_id` = -980;
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(-980, 'spell_warl_curse_of_agony');
+
+-- Fix Nightfall and Glyph of Corruption registrations
+DELETE FROM `spell_script_names` WHERE `spell_id` = -18094;
+DELETE FROM `spell_script_names` WHERE `spell_id` = 56218;
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(-18094, 'spell_warl_nightfall'),
+(56218, 'spell_warl_glyph_of_corruption_nightfall');
+
+-- Register Acclimation spell script (DK)
+DELETE FROM `spell_script_names` WHERE `spell_id` = -49200;
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(-49200, 'spell_dk_acclimation');
+
+-- Register Advantage T10 4P spell script (DK)
+DELETE FROM `spell_script_names` WHERE `spell_id` = 70656;
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(70656, 'spell_dk_advantage_t10_4p');
+
+-- Register Glyph of Barkskin spell script (Druid)
+DELETE FROM `spell_script_names` WHERE `spell_id` = 63057;
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(63057, 'spell_dru_glyph_of_barkskin');

data/sql/updates/db_world/2026_02_18_03.sql

@@ -0,0 +1,5 @@
+-- DB update 2026_02_18_04 -> 2026_02_18_05
+-- Hunter T9 4P Bonus - spell script registration
+DELETE FROM `spell_script_names` WHERE `spell_id` = 67151;
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(67151, 'spell_hun_t9_4p_bonus');

data/sql/updates/db_world/2026_02_18_04.sql

@@ -0,0 +1,3 @@
+-- DB update 2026_02_18_05 -> 2026_02_18_06
+-- Omen of Clarity should only proc from damage and healing spells, not utility spells like Furor
+UPDATE `spell_proc` SET `SpellTypeMask` = 3 WHERE `SpellId` = 16864;

data/sql/updates/db_world/2026_02_18_05.sql

@@ -0,0 +1,9 @@
+-- DB update 2026_02_18_06 -> 2026_02_18_07
+--
+-- The Lightning Capacitor, Thunder Capacitor, Reign of the Dead/Unliving trinkets
+DELETE FROM `spell_script_names` WHERE `spell_id` IN (37657, 54841, 67712, 67758);
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(37657, 'spell_item_lightning_capacitor'),
+(54841, 'spell_item_thunder_capacitor'),
+(67712, 'spell_item_toc25_caster_trinket_normal'),
+(67758, 'spell_item_toc25_caster_trinket_heroic');