From 3d1205ea5f14d31f911838d7354246d99bba4185 Mon Sep 17 00:00:00 2001 From: Killyana Date: Sun, 2 Feb 2020 10:56:03 +0100 Subject: [PATCH] Core/Misc: rename npc_text emote related fields to reflect broadcast text column names and updates emote data to the correct format --- .../custom/custom_2020_02_02_01_world.sql | 130 ++++++++++++++++++ src/server/game/Globals/ObjectMgr.cpp | 17 ++- 2 files changed, 138 insertions(+), 9 deletions(-) create mode 100644 sql/updates/world/custom/custom_2020_02_02_01_world.sql diff --git a/sql/updates/world/custom/custom_2020_02_02_01_world.sql b/sql/updates/world/custom/custom_2020_02_02_01_world.sql new file mode 100644 index 0000000000..96b3cd00b2 --- /dev/null +++ b/sql/updates/world/custom/custom_2020_02_02_01_world.sql @@ -0,0 +1,130 @@ +-- +ALTER TABLE `npc_text` +CHANGE COLUMN `em0_0` `EmoteDelay0_0` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `Probability0`, +CHANGE COLUMN `em0_1` `Emote0_0` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `EmoteDelay0_0`, +CHANGE COLUMN `em0_2` `EmoteDelay0_1` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `Emote0_0`, +CHANGE COLUMN `em0_3` `Emote0_1` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `EmoteDelay0_1`, +CHANGE COLUMN `em0_4` `EmoteDelay0_2` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `Emote0_1`, +CHANGE COLUMN `em0_5` `Emote0_2` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `EmoteDelay0_2`, +CHANGE COLUMN `em1_0` `EmoteDelay1_0` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `Probability1`, +CHANGE COLUMN `em1_1` `Emote1_0` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `EmoteDelay1_0`, +CHANGE COLUMN `em1_2` `EmoteDelay1_1` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `Emote1_0`, +CHANGE COLUMN `em1_3` `Emote1_1` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `EmoteDelay1_1`, +CHANGE COLUMN `em1_4` `EmoteDelay1_2` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `Emote1_1`, +CHANGE COLUMN `em1_5` `Emote1_2` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `EmoteDelay1_2`, +CHANGE COLUMN `em2_0` `EmoteDelay2_0` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `Probability2`, +CHANGE COLUMN `em2_1` `Emote2_0` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `EmoteDelay2_0`, +CHANGE COLUMN `em2_2` `EmoteDelay2_1` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `Emote2_0`, +CHANGE COLUMN `em2_3` `Emote2_1` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `EmoteDelay2_1`, +CHANGE COLUMN `em2_4` `EmoteDelay2_2` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `Emote2_1`, +CHANGE COLUMN `em2_5` `Emote2_2` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `EmoteDelay2_2`, +CHANGE COLUMN `em3_0` `EmoteDelay3_0` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `Probability3`, +CHANGE COLUMN `em3_1` `Emote3_0` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `EmoteDelay3_0`, +CHANGE COLUMN `em3_2` `EmoteDelay3_1` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `Emote3_0`, +CHANGE COLUMN `em3_3` `Emote3_1` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `EmoteDelay3_1`, +CHANGE COLUMN `em3_4` `EmoteDelay3_2` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `Emote3_1`, +CHANGE COLUMN `em3_5` `Emote3_2` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `EmoteDelay3_2`, +CHANGE COLUMN `em4_0` `EmoteDelay4_0` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `Probability4`, +CHANGE COLUMN `em4_1` `Emote4_0` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `EmoteDelay4_0`, +CHANGE COLUMN `em4_2` `EmoteDelay4_1` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `Emote4_0`, +CHANGE COLUMN `em4_3` `Emote4_1` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `EmoteDelay4_1`, +CHANGE COLUMN `em4_4` `EmoteDelay4_2` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `Emote4_1`, +CHANGE COLUMN `em4_5` `Emote4_2` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `EmoteDelay4_2`, +CHANGE COLUMN `em5_0` `EmoteDelay5_0` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `Probability5`, +CHANGE COLUMN `em5_1` `Emote5_0` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `EmoteDelay5_0`, +CHANGE COLUMN `em5_2` `EmoteDelay5_1` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `Emote5_0`, +CHANGE COLUMN `em5_3` `Emote5_1` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `EmoteDelay5_1`, +CHANGE COLUMN `em5_4` `EmoteDelay5_2` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `Emote5_1`, +CHANGE COLUMN `em5_5` `Emote5_2` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `EmoteDelay5_2`, +CHANGE COLUMN `em6_0` `EmoteDelay6_0` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `Probability6`, +CHANGE COLUMN `em6_1` `Emote6_0` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `EmoteDelay6_0`, +CHANGE COLUMN `em6_2` `EmoteDelay6_1` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `Emote6_0`, +CHANGE COLUMN `em6_3` `Emote6_1` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `EmoteDelay6_1`, +CHANGE COLUMN `em6_4` `EmoteDelay6_2` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `Emote6_1`, +CHANGE COLUMN `em6_5` `Emote6_2` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `EmoteDelay6_2`, +CHANGE COLUMN `em7_0` `EmoteDelay7_0` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `Probability7`, +CHANGE COLUMN `em7_1` `Emote7_0` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `EmoteDelay7_0`, +CHANGE COLUMN `em7_2` `EmoteDelay7_1` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `Emote7_0`, +CHANGE COLUMN `em7_3` `Emote7_1` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `EmoteDelay7_1`, +CHANGE COLUMN `em7_4` `EmoteDelay7_2` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `Emote7_1`, +CHANGE COLUMN `em7_5` `Emote7_2` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `EmoteDelay7_2`; + +UPDATE `npc_text` AS a +INNER JOIN `broadcast_text` AS b ON a.`BroadcastTextID0`= b.`ID` +SET +a.`EmoteDelay0_0`= b.`EmoteDelay1`, +a.`Emote0_0`= b.`EmoteID1`, +a.`EmoteDelay0_1`= b.`EmoteDelay2`, +a.`Emote0_1`= b.`EmoteID2`, +a.`EmoteDelay0_2`= b.`EmoteDelay3`, +a.`Emote0_2`= b.`EmoteID3`; + +UPDATE `npc_text` AS a +INNER JOIN `broadcast_text` AS b ON a.`BroadcastTextID1`= b.`ID` +SET +a.`EmoteDelay1_0`= b.`EmoteDelay1`, +a.`Emote1_0`= b.`EmoteID1`, +a.`EmoteDelay1_1`= b.`EmoteDelay2`, +a.`Emote1_1`= b.`EmoteID2`, +a.`EmoteDelay1_2`= b.`EmoteDelay3`, +a.`Emote1_2`= b.`EmoteID3`; + +UPDATE `npc_text` AS a +INNER JOIN `broadcast_text` AS b ON a.`BroadcastTextID2`= b.`ID` +SET +a.`EmoteDelay2_0`= b.`EmoteDelay1`, +a.`Emote2_0`= b.`EmoteID1`, +a.`EmoteDelay2_1`= b.`EmoteDelay2`, +a.`Emote2_1`= b.`EmoteID2`, +a.`EmoteDelay2_2`= b.`EmoteDelay3`, +a.`Emote2_2`= b.`EmoteID3`; + +UPDATE `npc_text` AS a +INNER JOIN `broadcast_text` AS b ON a.`BroadcastTextID3`= b.`ID` +SET +a.`EmoteDelay3_0`= b.`EmoteDelay1`, +a.`Emote3_0`= b.`EmoteID1`, +a.`EmoteDelay3_1`= b.`EmoteDelay2`, +a.`Emote3_1`= b.`EmoteID2`, +a.`EmoteDelay3_2`= b.`EmoteDelay3`, +a.`Emote3_2`= b.`EmoteID3`; + +UPDATE `npc_text` AS a +INNER JOIN `broadcast_text` AS b ON a.`BroadcastTextID4`= b.`ID` +SET +a.`EmoteDelay4_0`= b.`EmoteDelay1`, +a.`Emote4_0`= b.`EmoteID1`, +a.`EmoteDelay4_1`= b.`EmoteDelay2`, +a.`Emote4_1`= b.`EmoteID2`, +a.`EmoteDelay4_2`= b.`EmoteDelay3`, +a.`Emote4_2`= b.`EmoteID3`; + +UPDATE `npc_text` AS a +INNER JOIN `broadcast_text` AS b ON a.`BroadcastTextID5`= b.`ID` +SET +a.`EmoteDelay5_0`= b.`EmoteDelay1`, +a.`Emote5_0`= b.`EmoteID1`, +a.`EmoteDelay5_1`= b.`EmoteDelay2`, +a.`Emote5_1`= b.`EmoteID2`, +a.`EmoteDelay5_2`= b.`EmoteDelay3`, +a.`Emote5_2`= b.`EmoteID3`; + +UPDATE `npc_text` AS a +INNER JOIN `broadcast_text` AS b ON a.`BroadcastTextID6`= b.`ID` +SET +a.`EmoteDelay6_0`= b.`EmoteDelay1`, +a.`Emote6_0`= b.`EmoteID1`, +a.`EmoteDelay6_1`= b.`EmoteDelay2`, +a.`Emote6_1`= b.`EmoteID2`, +a.`EmoteDelay6_2`= b.`EmoteDelay3`, +a.`Emote6_2`= b.`EmoteID3`; + +UPDATE `npc_text` AS a +INNER JOIN `broadcast_text` AS b ON a.`BroadcastTextID7`= b.`ID` +SET +a.`EmoteDelay7_0`= b.`EmoteDelay1`, +a.`Emote7_0`= b.`EmoteID1`, +a.`EmoteDelay7_1`= b.`EmoteDelay2`, +a.`Emote7_1`= b.`EmoteID2`, +a.`EmoteDelay7_2`= b.`EmoteDelay3`, +a.`Emote7_2`= b.`EmoteID3`; diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 2ed5210b46..f7ae569a11 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -5931,17 +5931,16 @@ void ObjectMgr::LoadGossipText() uint32 oldMSTime = getMSTime(); QueryResult result = WorldDatabase.Query("SELECT ID, " - "text0_0, text0_1, BroadcastTextID0, lang0, Probability0, em0_0, em0_1, em0_2, em0_3, em0_4, em0_5, " - "text1_0, text1_1, BroadcastTextID1, lang1, Probability1, em1_0, em1_1, em1_2, em1_3, em1_4, em1_5, " - "text2_0, text2_1, BroadcastTextID2, lang2, Probability2, em2_0, em2_1, em2_2, em2_3, em2_4, em2_5, " - "text3_0, text3_1, BroadcastTextID3, lang3, Probability3, em3_0, em3_1, em3_2, em3_3, em3_4, em3_5, " - "text4_0, text4_1, BroadcastTextID4, lang4, Probability4, em4_0, em4_1, em4_2, em4_3, em4_4, em4_5, " - "text5_0, text5_1, BroadcastTextID5, lang5, Probability5, em5_0, em5_1, em5_2, em5_3, em5_4, em5_5, " - "text6_0, text6_1, BroadcastTextID6, lang6, Probability6, em6_0, em6_1, em6_2, em6_3, em6_4, em6_5, " - "text7_0, text7_1, BroadcastTextID7, lang7, Probability7, em7_0, em7_1, em7_2, em7_3, em7_4, em7_5 " + "text0_0, text0_1, BroadcastTextID0, lang0, Probability0, EmoteDelay0_0, Emote0_0, EmoteDelay0_1, Emote0_1, EmoteDelay0_2, Emote0_2, " + "text1_0, text1_1, BroadcastTextID1, lang1, Probability1, EmoteDelay1_0, Emote1_0, EmoteDelay1_1, Emote1_1, EmoteDelay1_2, Emote1_2, " + "text2_0, text2_1, BroadcastTextID2, lang2, Probability2, EmoteDelay2_0, Emote2_0, EmoteDelay2_1, Emote2_1, EmoteDelay2_2, Emote2_2, " + "text3_0, text3_1, BroadcastTextID3, lang3, Probability3, EmoteDelay3_0, Emote3_0, EmoteDelay3_1, Emote3_1, EmoteDelay3_2, Emote3_2, " + "text4_0, text4_1, BroadcastTextID4, lang4, Probability4, EmoteDelay4_0, Emote4_0, EmoteDelay4_1, Emote4_1, EmoteDelay4_2, Emote4_2, " + "text5_0, text5_1, BroadcastTextID5, lang5, Probability5, EmoteDelay5_0, Emote5_0, EmoteDelay5_1, Emote5_1, EmoteDelay5_2, Emote5_2, " + "text6_0, text6_1, BroadcastTextID6, lang6, Probability6, EmoteDelay6_0, Emote6_0, EmoteDelay6_1, Emote6_1, EmoteDelay6_2, Emote6_2, " + "text7_0, text7_1, BroadcastTextID7, lang7, Probability7, EmoteDelay7_0, Emote7_0, EmoteDelay7_1, Emote7_1, EmoteDelay7_2, Emote7_2 " "FROM npc_text"); - if (!result) { TC_LOG_INFO("server.loading", ">> Loaded 0 npc texts, table is empty!");