From 783f5296d285309cf174c2a87b45bf7817fba431 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Tue, 18 Jul 2023 07:45:51 -0400 Subject: [PATCH] Core/Conversation: Added ChatType field to conversation_line_template Port From (https://github.com/TrinityCore/TrinityCore/commit/ee2577dde63a8bf25198d6658fbf65c0c21e39dd) --- Source/Game/DataStorage/ConversationDataStorage.cs | 4 +++- Source/Game/Entities/Conversation.cs | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Source/Game/DataStorage/ConversationDataStorage.cs b/Source/Game/DataStorage/ConversationDataStorage.cs index 93e888b9d..d107e5578 100644 --- a/Source/Game/DataStorage/ConversationDataStorage.cs +++ b/Source/Game/DataStorage/ConversationDataStorage.cs @@ -20,7 +20,7 @@ namespace Game.DataStorage Dictionary> actorsByConversation = new(); - SQLResult lineTemplates = DB.World.Query("SELECT Id, UiCameraID, ActorIdx, Flags FROM conversation_line_template"); + SQLResult lineTemplates = DB.World.Query("SELECT Id, UiCameraID, ActorIdx, Flags, ChatType FROM conversation_line_template"); if (!lineTemplates.IsEmpty()) { uint oldMSTime = Time.GetMSTime(); @@ -40,6 +40,7 @@ namespace Game.DataStorage conversationLine.UiCameraID = lineTemplates.Read(1); conversationLine.ActorIdx = lineTemplates.Read(2); conversationLine.Flags = lineTemplates.Read(3); + conversationLine.ChatType = lineTemplates.Read(4); _conversationLineTemplateStorage[id] = conversationLine; } @@ -318,6 +319,7 @@ namespace Game.DataStorage public uint UiCameraID; // Link to UiCamera.db2 public byte ActorIdx; // Index from conversation_actors public byte Flags; + public byte ChatType; } public class ConversationTemplate diff --git a/Source/Game/Entities/Conversation.cs b/Source/Game/Entities/Conversation.cs index 2d3443d6f..a51ca3212 100644 --- a/Source/Game/Entities/Conversation.cs +++ b/Source/Game/Entities/Conversation.cs @@ -132,6 +132,7 @@ namespace Game.Entities lineField.UiCameraID = line.UiCameraID; lineField.ActorIndex = line.ActorIdx; lineField.Flags = line.Flags; + lineField.ChatType = line.ChatType; ConversationLineRecord convoLine = CliDB.ConversationLineStorage.LookupByKey(line.Id); // never null for conversationTemplate->Lines