From cd3ef428e1152caedebe0931810d0668401eaded Mon Sep 17 00:00:00 2001 From: hondacrx Date: Wed, 3 Nov 2021 17:11:24 -0400 Subject: [PATCH] Core/DB: Rename SoundEntriesID to SoundKitID in BroadcastText Port From (https://github.com/TrinityCore/TrinityCore/commit/a54c51c362426613be658e4a471b8fc866e82d57) --- Source/Framework/Database/Databases/HotfixDatabase.cs | 4 ++-- Source/Game/DataStorage/Structs/B_Records.cs | 2 +- Source/Game/Text/CreatureTextManager.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Framework/Database/Databases/HotfixDatabase.cs b/Source/Framework/Database/Databases/HotfixDatabase.cs index 730de5e9a..7ed14110d 100644 --- a/Source/Framework/Database/Databases/HotfixDatabase.cs +++ b/Source/Framework/Database/Databases/HotfixDatabase.cs @@ -187,8 +187,8 @@ namespace Framework.Database " FROM battlemaster_list_locale WHERE locale = ?"); // BroadcastText.db2 - PrepareStatement(HotfixStatements.SEL_BROADCAST_TEXT, "SELECT Text, Text1, ID, LanguageID, ConditionID, EmotesID, Flags, ChatBubbleDurationMs, " + - "SoundEntriesID1, SoundEntriesID2, EmoteID1, EmoteID2, EmoteID3, EmoteDelay1, EmoteDelay2, EmoteDelay3 FROM broadcast_text"); + PrepareStatement(HotfixStatements.SEL_BROADCAST_TEXT, "SELECT Text, Text1, ID, LanguageID, ConditionID, EmotesID, Flags, ChatBubbleDurationMs, " + + "SoundKitID1, SoundKitID2, EmoteID1, EmoteID2, EmoteID3, EmoteDelay1, EmoteDelay2, EmoteDelay3 FROM broadcast_text"); PrepareStatement(HotfixStatements.SEL_BROADCAST_TEXT_LOCALE, "SELECT ID, Text_lang, Text1_lang FROM broadcast_text_locale WHERE locale = ?"); // BroadcastTextDuration.db2 diff --git a/Source/Game/DataStorage/Structs/B_Records.cs b/Source/Game/DataStorage/Structs/B_Records.cs index d0b771307..5c4ab3898 100644 --- a/Source/Game/DataStorage/Structs/B_Records.cs +++ b/Source/Game/DataStorage/Structs/B_Records.cs @@ -117,7 +117,7 @@ namespace Game.DataStorage public ushort EmotesID; public byte Flags; public uint ChatBubbleDurationMs; - public uint[] SoundEntriesID = new uint[2]; + public uint[] SoundKitID = new uint[2]; public ushort[] EmoteID = new ushort[3]; public ushort[] EmoteDelay = new ushort[3]; } diff --git a/Source/Game/Text/CreatureTextManager.cs b/Source/Game/Text/CreatureTextManager.cs index 61138e431..8fb2de1e9 100644 --- a/Source/Game/Text/CreatureTextManager.cs +++ b/Source/Game/Text/CreatureTextManager.cs @@ -213,7 +213,7 @@ namespace Game BroadcastTextRecord bct = CliDB.BroadcastTextStorage.LookupByKey(textEntry.BroadcastTextId); if (bct != null) { - uint broadcastTextSoundId = bct.SoundEntriesID[source.GetGender() == Gender.Female ? 1 : 0]; + uint broadcastTextSoundId = bct.SoundKitID[source.GetGender() == Gender.Female ? 1 : 0]; if (broadcastTextSoundId != 0) finalSound = broadcastTextSoundId; }