From a17700bebccbe6fb81fef07d84bc61e4062bede1 Mon Sep 17 00:00:00 2001 From: ratkosrb Date: Thu, 16 Jul 2020 07:36:43 +0300 Subject: [PATCH] Move random emotes to datalong fields. --- sql/migrations/20200716042525_world.sql | 33 +++++++++++++++++++++++++ src/game/Maps/ScriptCommands.cpp | 5 ++-- src/game/ScriptMgr.cpp | 12 +++++++-- src/game/ScriptMgr.h | 9 ++----- 4 files changed, 47 insertions(+), 12 deletions(-) create mode 100644 sql/migrations/20200716042525_world.sql diff --git a/sql/migrations/20200716042525_world.sql b/sql/migrations/20200716042525_world.sql new file mode 100644 index 000000000..1507349e7 --- /dev/null +++ b/sql/migrations/20200716042525_world.sql @@ -0,0 +1,33 @@ +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`='20200716042525'); +IF v=0 THEN +INSERT INTO `migrations` VALUES ('20200716042525'); +-- Add your query below. + + +-- Move random emotes to datalong fields. +UPDATE `creature_movement_scripts` SET `dataint2`=`datalong` WHERE `id`=1614602 && `delay`=1 && `command`=1; +UPDATE `creature_movement_scripts` SET `dataint2`=`datalong` WHERE `id`=1614602 && `delay`=3 && `command`=1; +UPDATE `creature_movement_scripts` SET `dataint2`=`datalong` WHERE `id`=1614602 && `delay`=20 && `command`=1; +UPDATE `creature_movement_scripts` SET `dataint2`=`datalong` WHERE `id`=1614603 && `delay`=3 && `command`=1; +UPDATE `creature_movement_scripts` SET `dataint2`=`datalong` WHERE `id`=1614603 && `delay`=10 && `command`=1; +UPDATE `creature_movement_scripts` SET `dataint2`=`datalong` WHERE `id`=1614603 && `delay`=20 && `command`=1; +UPDATE `creature_movement_scripts` SET `dataint2`=`datalong` WHERE `id`=1614604 && `delay`=2 && `command`=1; +UPDATE `creature_movement_scripts` SET `dataint2`=`datalong` WHERE `id`=1614604 && `delay`=16 && `command`=1; +UPDATE `creature_movement_scripts` SET `dataint2`=`datalong` WHERE `id`=1614604 && `delay`=18 && `command`=1; +UPDATE `creature_movement_scripts` SET `datalong`=`dataint`, `datalong2`=`dataint2`, `datalong3`=`dataint3`, `datalong4`=`dataint4` WHERE `command`=1 && `dataint`!=0; +UPDATE `creature_movement_scripts` SET `dataint`=0, `dataint2`=0, `dataint3`=0, `dataint4`=0 WHERE `command`=1 && `dataint`!=0; +UPDATE `creature_ai_scripts` SET `datalong2`=`dataint`, `datalong3`=`dataint2` WHERE `command`=1 && `dataint`!=0; +UPDATE `creature_ai_scripts` SET `dataint`=0, `dataint2`=0, `dataint3`=0, `dataint4`=0 WHERE `command`=1 && `dataint`!=0; + + +-- End of migration. +END IF; +END?? +delimiter ; +CALL add_migration(); +DROP PROCEDURE IF EXISTS add_migration; diff --git a/src/game/Maps/ScriptCommands.cpp b/src/game/Maps/ScriptCommands.cpp index bd257296f..0b20aa01f 100644 --- a/src/game/Maps/ScriptCommands.cpp +++ b/src/game/Maps/ScriptCommands.cpp @@ -79,12 +79,11 @@ bool Map::ScriptCommand_Emote(ScriptInfo const& script, WorldObject* source, Wor // find the emote std::vector emotes; - emotes.push_back(script.emote.emoteId); - for (uint32 emoteId : script.emote.randomEmotes) + for (uint32 emoteId : script.emote.emoteId) { if (!emoteId) continue; - emotes.push_back(uint32(emoteId)); + emotes.push_back(emoteId); } pSource->HandleEmote(emotes[urand(0, emotes.size() - 1)]); diff --git a/src/game/ScriptMgr.cpp b/src/game/ScriptMgr.cpp index c7b2f68e2..0bab1758b 100644 --- a/src/game/ScriptMgr.cpp +++ b/src/game/ScriptMgr.cpp @@ -249,11 +249,19 @@ void ScriptMgr::LoadScripts(ScriptMapMap& scripts, char const* tablename) } case SCRIPT_COMMAND_EMOTE: { - if (!sEmotesStore.LookupEntry(tmp.emote.emoteId)) + if (!sEmotesStore.LookupEntry(tmp.emote.emoteId[0])) { - sLog.outErrorDb("Table `%s` has invalid emote id (datalong = %u) in SCRIPT_COMMAND_EMOTE for script id %u", tablename, tmp.emote.emoteId, tmp.id); + sLog.outErrorDb("Table `%s` has invalid emote id (datalong = %u) in SCRIPT_COMMAND_EMOTE for script id %u", tablename, tmp.emote.emoteId[0], tmp.id); continue; } + for (uint32 i = 1; i < MAX_EMOTE_ID; i++) + { + if (tmp.emote.emoteId[i] && !sEmotesStore.LookupEntry(tmp.emote.emoteId[i])) + { + sLog.outErrorDb("Table `%s` has invalid emote id (datalong%u = %u) in SCRIPT_COMMAND_EMOTE for script id %u", tablename, i, tmp.emote.emoteId[i], tmp.id); + tmp.emote.emoteId[i] = 0; + } + } break; } case SCRIPT_COMMAND_FIELD_SET: diff --git a/src/game/ScriptMgr.h b/src/game/ScriptMgr.h index 4e7df2369..36a320704 100644 --- a/src/game/ScriptMgr.h +++ b/src/game/ScriptMgr.h @@ -62,7 +62,7 @@ enum eScriptCommand // datalong = chat_type (see enum ChatType) // dataint = broadcast_text id. dataint2-4 optional for random selected text. SCRIPT_COMMAND_EMOTE = 1, // source = Unit - // datalong = emote_id + // datalong1-4 = emote_id SCRIPT_COMMAND_FIELD_SET = 2, // source = Object // datalong = field_id // datalong2 = value @@ -524,12 +524,7 @@ struct ScriptInfo struct // SCRIPT_COMMAND_EMOTE (1) { - uint32 emoteId; // datalong - uint32 unused1; // datalong2 - uint32 unused2; // datalong3 - uint32 unused3; // datalong4 - uint32 unused4; // data_flags - uint32 randomEmotes[MAX_EMOTE_ID]; // dataint to dataint4 + uint32 emoteId[MAX_EMOTE_ID]; // datalong to datalong4 } emote; struct // SCRIPT_COMMAND_FIELD_SET (2)