Convert more script texts, add missing sounds

sql/migrations/20250312171132_world.sql

@@ -0,0 +1,113 @@
+DROP PROCEDURE IF EXISTS add_migration;
+DELIMITER ??
+CREATE PROCEDURE `add_migration`()
+BEGIN
+DECLARE v INT DEFAULT 1;
+SET v = (SELECT COUNT(*) FROM `migrations` WHERE `id`='20250312171132');
+IF v = 0 THEN
+INSERT INTO `migrations` VALUES ('20250312171132');
+-- Add your query below.
+
+-- Naxxramas
+-- Your petty magics are no challenge to the might of the Scourge!
+UPDATE `broadcast_text` SET `sound_id` = 9088 WHERE `entry` = 13492;
+-- Fix wrong sound/text assignment
+-- Come, Zeliek, do not drive them out. Not before we've had our fun!
+UPDATE `broadcast_text` SET `sound_id` = 8896 WHERE `entry` = 13014;
+-- Who's next?
+UPDATE `broadcast_text` SET `sound_id` = 8894 WHERE `entry` = 13012;
+
+-- Blackwing Lair
+-- None of your kind should be here!  You've doomed only yourselves!
+UPDATE `broadcast_text` SET `sound_id` = 8286 WHERE `entry` = 9967;
+-- Clever, mortals - but I am not so easily lured away from my sanctum!
+UPDATE `broadcast_text` SET `sound_id` = 8287 WHERE `entry` = 9968;
+-- If I fall into the abyss, I'll take all of you mortals with me!
+UPDATE `broadcast_text` SET `sound_id` = 8278 WHERE `entry` = 9591;
+
+-- AQ 40
+-- Are you so eager to die? I would be happy to accomodate you.
+DELETE FROM `script_texts` WHERE `entry` = -1531000;
+UPDATE `broadcast_text` SET `sound_id` = 8615 WHERE `entry` = 11445;
+-- Let your death serve as an example!
+DELETE FROM `script_texts` WHERE `entry` = -1531003;
+UPDATE `broadcast_text` SET `sound_id` = 8617 WHERE `entry` = 11446;
+-- You only delay the inevitable!
+DELETE FROM `script_texts` WHERE `entry` = -1531007;
+UPDATE `broadcast_text` SET `sound_id` = 8622 WHERE `entry` = 11447;
+-- You will not escape death!
+DELETE FROM `script_texts` WHERE `entry` = -1531023; 
+UPDATE `broadcast_text` SET `sound_id` = 8629 WHERE `entry` = 11453;
+-- Your fate is sealed!
+DELETE FROM `script_texts` WHERE `entry` = -1531030;
+UPDATE `broadcast_text` SET `sound_id` = 8635 WHERE `entry` = 11455;
+
+-- AQ 20
+DELETE FROM `script_texts` WHERE `entry` = -1509025; -- Sands of the desert rise and block out the sun!
+DELETE FROM `script_texts` WHERE `entry` = -1509026; -- You are terminated.
+DELETE FROM `script_texts` WHERE `entry` = -1509027; -- I...have...failed.
+DELETE FROM `script_texts` WHERE `entry` = -1509000; -- %s senses your fear.
+DELETE FROM `script_texts` WHERE `entry` = -1509001; -- %s bristles with energy!
+DELETE FROM `script_texts` WHERE `entry` = -1509028; -- %s drains your mana and turns to stone.
+DELETE FROM `script_texts` WHERE `entry` = -1900117; -- Kill $n!
+-- Sands of the desert, rise and block out the sun!
+UPDATE `broadcast_text` SET `sound_id` = 8598, `chat_type` = 6 WHERE `entry` = 11449;
+-- You are terminated.
+UPDATE `broadcast_text` SET `sound_id` = 8602, `chat_type` = 6 WHERE `entry` = 11450;
+-- I...have...failed.
+UPDATE `broadcast_text` SET `sound_id` = 8594, `chat_type` = 6 WHERE `entry` = 11451;
+
+-- Molten Core
+-- BY FIRE BE PURGED!
+UPDATE `broadcast_text` SET `sound_id` = 8046 WHERE `entry` = 9426;
+-- YOU CANNOT DEFEAT THE LIVING FLAME! COME YOU MINIONS OF FIRE! COME FORTH YOU CREATURES OF HATE! YOUR MASTER CALLS!
+UPDATE `broadcast_text` SET `chat_type` = 6 WHERE `entry` = 8573;
+-- %s performs one last service for Ragnaros.
+DELETE FROM `script_texts` WHERE `entry` = -1409000;
+-- 8253
+
+-- Zul'Gurub
+-- Bethekk, your priestess calls upon your might!
+UPDATE `broadcast_text` SET `sound_id` = 8416 WHERE `entry` = 10461;
+-- At last, I am free of the Soulflayer!
+UPDATE `broadcast_text` SET `sound_id` = 8412 WHERE `entry` = 10450;
+
+-- Sunken Temple
+-- The walls of the chamber tremble. Something is happening...
+UPDATE `broadcast_text` SET `chat_type`= 2 WHERE `entry`= 11191;
+
+-- Stratholme
+UPDATE `broadcast_text` SET `chat_type` = 6 WHERE `entry` = 6442;  -- Damn you mortals! All my plans of revenge, all my hate... all burned to ash...
+UPDATE `broadcast_text` SET `chat_type` = 6 WHERE `entry` = 13162; -- The shadow of the Scourge yet remains on this land, fools! You will never prevail!
+DELETE FROM `script_texts` WHERE `entry` = -1900161; -- Prepare to be Malowned!
+ UPDATE `broadcast_text` SET `chat_type` = 6 WHERE `entry` = 6504;
+DELETE FROM `script_texts` WHERE `entry` = -1900162; -- You've been MALOWNED!
+UPDATE `broadcast_text` SET `chat_type` = 6 WHERE `entry` = 6530;
+DELETE FROM `script_texts` WHERE `entry` = -1900160; -- TIMMY!
+UPDATE `broadcast_text` SET `chat_type` = 6 WHERE `entry` = 6150;
+DELETE FROM `script_texts` WHERE `entry` = -1900116; -- An Ash'ari Crystal has been toppled! Restore the ziggurat before the Slaughterhouse is vulnerable!
+UPDATE `broadcast_text` SET `chat_type` = 6 WHERE `entry` = 6527;
+DELETE FROM `script_texts` WHERE `entry` = -1900115; -- The Ash'ari Crystals have been destroyed! The Slaughterhouse is vulnerable!
+UPDATE `broadcast_text` SET `chat_type` = 6 WHERE `entry` = 6289;
+DELETE FROM `script_texts` WHERE `entry` = -1329000; -- Praise be to Egan!
+-- 6453
+DELETE FROM `script_texts` WHERE `entry` = -1329001; -- Rivendare must be destroyed!
+-- 6455
+DELETE FROM `script_texts` WHERE `entry` = -1329002; -- The curse ends!
+-- 6452
+DELETE FROM `script_texts` WHERE `entry` = -1329003; -- May Kel'Thuzad one day feel our vengeance.
+-- 6454
+
+-- Misc Texts
+DELETE FROM `script_texts` WHERE `entry` = -1900169; -- %s marches around, roaring and making a ruckus.
+DELETE FROM `script_texts` WHERE `entry` = -1900170; -- Raaaaaaaaaaaaarrrr!
+DELETE FROM `script_texts` WHERE `entry` = -1900171; -- Oh!!! Get that thing away from me!
+DELETE FROM `script_texts` WHERE `entry` = -1900172; -- %s jumps in fright!
+DELETE FROM `script_texts` WHERE `entry` = -1900173; -- %s jumps in fright!
+
+-- End of migration.
+END IF;
+END??
+DELIMITER ;
+CALL add_migration();
+DROP PROCEDURE IF EXISTS add_migration;

src/game/Spells/SpellEffects.cpp

@@ -3297,16 +3297,16 @@ void Spell::EffectSummonGuardian(SpellEffectIndex effIdx)
         {
             case 17166: // Release Umi's Yeti - Quest Are We There, Yeti? Part 3
             {
-                spawnCreature->MonsterTextEmote(-1900169);
-                spawnCreature->MonsterSay(-1900170);
+                spawnCreature->MonsterTextEmote(6327);
+                spawnCreature->MonsterSay(9055);
 
                 switch (spawnCreature->GetAreaId())
                 {
                     case 541: // Un'Goro Crater
                         if (Creature* pCreature = spawnCreature->FindNearestCreature(10977, 30.0f, true)) // NPC_QUIXXIL
                         {
                             spawnCreature->GetMotionMaster()->MoveFollow(pCreature, 0.6f, M_PI_F);
-                            pCreature->MonsterSay(-1900171);
+                            pCreature->MonsterSay(6314);
                             pCreature->SetWalk(false);
                             pCreature->GetMotionMaster()->MoveWaypoint(0, 0, 0, 0, 0, false);
                         }
@@ -3315,7 +3315,7 @@ void Spell::EffectSummonGuardian(SpellEffectIndex effIdx)
                         if (Creature* pCreature = spawnCreature->FindNearestCreature(7583, 30.0f, true)) // NPC_SPRINKLE
                         {
                             spawnCreature->GetMotionMaster()->MoveFollow(pCreature, 0.6f, M_PI_F);
-                            pCreature->MonsterTextEmote(-1900172);
+                            pCreature->MonsterTextEmote(6301);
                             pCreature->SetWalk(false);
                             pCreature->GetMotionMaster()->MoveWaypoint(0, 0, 0, 0, 0, false);
                         }
@@ -3324,7 +3324,7 @@ void Spell::EffectSummonGuardian(SpellEffectIndex effIdx)
                         if (Creature* pCreature = spawnCreature->FindNearestCreature(10978, 30.0f, true)) // NPC_LEGACKI
                         {
                             spawnCreature->GetMotionMaster()->MoveFollow(pCreature, 0.6f, M_PI_F);
-                            pCreature->MonsterTextEmote(-1900173);
+                            pCreature->MonsterTextEmote(6306);
                             pCreature->SetWalk(false);
                             pCreature->GetMotionMaster()->MoveWaypoint(0, 0, 0, 0, 0, false);
                         }

src/scripts/eastern_kingdoms/burning_steppes/molten_core/boss_baron_geddon.cpp

@@ -24,7 +24,7 @@ EndScriptData */
 #include "scriptPCH.h"
 #include "molten_core.h"
 
-#define EMOTE_SERVICE               -1409000
+#define EMOTE_SERVICE               8253
 
 #define SPELL_INFERNO               19695
 #define SPELL_IGNITEMANA            19659

src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/boss_dathrohan_balnazzar.cpp

@@ -45,7 +45,11 @@ enum
     NPC_BALNAZZAR                   = 10813,
     //NPC_ZOMBIE                      = 10698                 //probably incorrect
     NPC_SKEL_BERSERKER              = 10391,
-    NPC_SKEL_GUARDIAN               = 10390
+    NPC_SKEL_GUARDIAN               = 10390,
+
+    SAY_DATHROHAN_AGGRO     = 6441,
+    SAY_DATHROHAN_TRANSFORM = 6447,
+    SAY_DATHROHAN_DEATH     = 6442
 };
 
 struct SummonDef
@@ -144,7 +148,7 @@ struct boss_dathrohan_balnazzarAI : public ScriptedAI
 
     void JustDied(Unit* Victim) override
     {
-        m_creature->MonsterSay("Damn you mortals! All my plans of revenge, all my hate... all burned to ash...");
+        DoScriptText(SAY_DATHROHAN_DEATH, m_creature);
 
         static uint32 uiCount = sizeof(m_aSummonPoint) / sizeof(SummonDef);
 
@@ -168,7 +172,7 @@ struct boss_dathrohan_balnazzarAI : public ScriptedAI
 
     void Aggro(Unit* /*pWho*/) override
     {
-        m_creature->MonsterYell("Today you have unmade what took me years to create! For this you shall all die by my hand!");
+        DoScriptText(SAY_DATHROHAN_AGGRO, m_creature);
     }
 
     void UpdateAI(uint32 const uiDiff) override
@@ -231,7 +235,7 @@ struct boss_dathrohan_balnazzarAI : public ScriptedAI
             {
                 if (m_uiTransform_Timer <= uiDiff)
                 {
-                    m_creature->MonsterYell("You fools think you can defeat me so easily? Face the true might of the Nathrezim!");
+                    DoScriptText(SAY_DATHROHAN_TRANSFORM, m_creature);
                     m_uiTransform_Timer = 0;
                 }
                 else

src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/boss_postmaster_malown.cpp

@@ -26,14 +26,17 @@ EndScriptData */
 //Spell ID to summon this guy is 24627 "Summon Postmaster Malown"
 //He should be spawned along with three other elites once the third postbox has been opened
 
-#define SAY_AGGRO   -1900161
-#define SAY_KILLED  -1900162
-
-#define SPELL_WAILINGDEAD    7713
-#define SPELL_BACKHAND    6253
-#define SPELL_CURSEOFWEAKNESS    8552
-#define SPELL_CURSEOFTONGUES    12889
-#define SPELL_CALLOFTHEGRAVE    17831
+enum : uint32
+{
+    SAY_AGGRO  = 6504,
+    SAY_KILLED = 6530,
+
+    SPELL_WAILINGDEAD     = 7713,
+    SPELL_BACKHAND        = 6253,
+    SPELL_CURSEOFWEAKNESS = 8552,
+    SPELL_CURSEOFTONGUES  = 12889,
+    SPELL_CALLOFTHEGRAVE  = 17831
+};
 
 struct boss_postmaster_malownAI : public ScriptedAI
 {

src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/boss_timmy_the_cruel.cpp

@@ -23,12 +23,13 @@ EndScriptData */
 
 #include "scriptPCH.h"
 
-#define SAY_SPAWN               -1900160
-
-#define SPELL_RAVENOUSCLAW      17470
-#define SPELL_ENRAGE            8599
-
-#define TIMMY_ENTRY             10808
+enum : uint32
+{
+    SAY_SPAWN          = 6150,
+    SPELL_RAVENOUSCLAW = 17470,
+    SPELL_ENRAGE       = 8599,
+    TIMMY_ENTRY        = 10808
+};
 
 struct boss_timmy_the_cruelAI : public ScriptedAI
 {

src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/stratholme.cpp

@@ -8,8 +8,11 @@ EndContentData */
 #include "scriptPCH.h"
 #include "stratholme.h"
 
-#define SAY_CRYSTAL_DESTROYED         -1900116
-#define SAY_ALL_CRYSTALS_DESTROYED    -1900115
+enum : uint32
+{
+    SAY_CRYSTAL_DESTROYED      = 6527,
+    SAY_ALL_CRYSTALS_DESTROYED = 6289
+};
 
 /*######
 ## go_gauntlet_gate (this is the _first_ of the gauntlet gates, two exist)
@@ -67,12 +70,6 @@ bool GOOpen_go_stratholme_postbox(Player* pPlayer, GameObject* pGo)
 ## mob_freed_soul
 ######*/
 
-//Possibly more of these quotes around.
-#define SAY_ZAPPED0 -1329000
-#define SAY_ZAPPED1 -1329001
-#define SAY_ZAPPED2 -1329002
-#define SAY_ZAPPED3 -1329003
-
 struct mob_freed_soulAI : public ScriptedAI
 {
     mob_freed_soulAI(Creature* pCreature) : ScriptedAI(pCreature)
@@ -82,21 +79,9 @@ struct mob_freed_soulAI : public ScriptedAI
 
     void Reset() override
     {
-        switch (urand(0, 3))
-        {
-            case 0:
-                DoScriptText(SAY_ZAPPED0, m_creature);
-                break;
-            case 1:
-                DoScriptText(SAY_ZAPPED1, m_creature);
-                break;
-            case 2:
-                DoScriptText(SAY_ZAPPED2, m_creature);
-                break;
-            case 3:
-                DoScriptText(SAY_ZAPPED3, m_creature);
-                break;
-        }
+        // Possibly more of these quotes around.
+        const uint32 randomText = PickRandomValue(6451, 6452, 6453, 6454, 6455);
+        DoScriptText(randomText, m_creature);
     }
 };
 

src/scripts/kalimdor/silithus/ruins_of_ahnqiraj/boss_ossirian.cpp

@@ -28,14 +28,14 @@ EndScriptData */
 
 enum
 {
-    SAY_SURPREME1               =    -1509018,
-    SAY_SURPREME2               =    -1509019,
-    SAY_SURPREME3               =    -1509020,
-
-    SAY_AGGRO                   =    -1509025,
-
-    SAY_SLAY                    =    -1509026,
-    SAY_DEATH                   =    -1509027,
+    // TODO: UNUSED TEXTS
+    // SAY_SURPREME1 = -1509018, // I am rejuvinated! Sound: 8593
+    // SAY_SURPREME2 = -1509019, // My powers are renewed! Sound: 8595
+    // SAY_SURPREME3 = -1509020, // My powers return! Sound: 8596
+
+    SAY_AGGRO = 11449,
+    SAY_SLAY  = 11450,
+    SAY_DEATH = 11451,
 
     SPELL_CURSE_OF_TONGUES      =  25195,
     SPELL_STRENGTH_OF_OSSIRIAN  =  25176,

src/scripts/kalimdor/silithus/temple_of_ahnqiraj/boss_skeram.cpp

@@ -6,14 +6,17 @@ EndScriptData */
 #include "scriptPCH.h"
 #include "temple_of_ahnqiraj.h"
 
-#define SAY_AGGRO_1                 -1531000
-#define SAY_AGGRO_2                 -1531001
-#define SAY_AGGRO_3                 -1531002
-#define SAY_SLAY_1                  -1531003
-#define SAY_SLAY_2                  -1531004
-#define SAY_SLAY_3                  -1531005
-#define SAY_SPLIT                   -1531006
-#define SAY_DEATH                   -1531007
+enum
+{
+    SAY_AGGRO_1 = 11445,
+    SAY_AGGRO_2 = -1531001,
+    SAY_AGGRO_3 = -1531002,
+    SAY_SLAY_1  = 11446,
+    SAY_SLAY_2  = -1531004,
+    SAY_SLAY_3  = -1531005,
+    SAY_SPLIT   = -1531006,
+    SAY_DEATH   = 11447
+};
 
 #define SPELL_ARCANE_EXPLOSION      26192
 #define SPELL_EARTH_SHOCK           26194