From 53d73416453177d721ab88aae002ae8cec293644 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefano=20Borz=C3=AC?= Date: Sun, 7 Mar 2021 13:13:06 +0100 Subject: [PATCH] fix(DB/Text): chicken text for CLUCK special quest (#4714) --- .../updates/pending_db_world/rev_1614901038211344456.sql | 7 +++++++ src/server/scripts/World/npcs_special.cpp | 5 ++--- 2 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 data/sql/updates/pending_db_world/rev_1614901038211344456.sql diff --git a/data/sql/updates/pending_db_world/rev_1614901038211344456.sql b/data/sql/updates/pending_db_world/rev_1614901038211344456.sql new file mode 100644 index 000000000..2afd6e3f7 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1614901038211344456.sql @@ -0,0 +1,7 @@ +INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1614901038211344456'); + +DELETE FROM `broadcast_text` WHERE `ID`=5140; +DELETE FROM `broadcast_text_locale` WHERE `ID`=5140; +DELETE FROM `creature_text` WHERE `CreatureID`=620 AND `GroupID`=1 AND `BroadcastTextId`=5140; +UPDATE `creature_text` SET `comment`='cluck EMOTE_HELLO' WHERE `CreatureID`=620 AND `GroupID`=0; + diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index ddb95ec96..b159197f1 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -678,8 +678,7 @@ public: enum ChickenCluck { - EMOTE_HELLO_A = 0, - EMOTE_HELLO_H = 1, + EMOTE_HELLO = 0, EMOTE_CLUCK_TEXT = 2, QUEST_CLUCK = 3861, @@ -734,7 +733,7 @@ public: { me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); me->setFaction(FACTION_FRIENDLY); - Talk(player->GetTeamId() == TEAM_HORDE ? EMOTE_HELLO_H : EMOTE_HELLO_A); + Talk(EMOTE_HELLO); } break; case TEXT_EMOTE_CHEER: