Core/Conversation: Added ChatType field to conversation_line_template
Port From (https://github.com/TrinityCore/TrinityCore/commit/ee2577dde63a8bf25198d6658fbf65c0c21e39dd)
This commit is contained in:
@@ -20,7 +20,7 @@ namespace Game.DataStorage
|
|||||||
|
|
||||||
Dictionary<uint, List<ConversationActorTemplate>> actorsByConversation = new();
|
Dictionary<uint, List<ConversationActorTemplate>> 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())
|
if (!lineTemplates.IsEmpty())
|
||||||
{
|
{
|
||||||
uint oldMSTime = Time.GetMSTime();
|
uint oldMSTime = Time.GetMSTime();
|
||||||
@@ -40,6 +40,7 @@ namespace Game.DataStorage
|
|||||||
conversationLine.UiCameraID = lineTemplates.Read<uint>(1);
|
conversationLine.UiCameraID = lineTemplates.Read<uint>(1);
|
||||||
conversationLine.ActorIdx = lineTemplates.Read<byte>(2);
|
conversationLine.ActorIdx = lineTemplates.Read<byte>(2);
|
||||||
conversationLine.Flags = lineTemplates.Read<byte>(3);
|
conversationLine.Flags = lineTemplates.Read<byte>(3);
|
||||||
|
conversationLine.ChatType = lineTemplates.Read<byte>(4);
|
||||||
|
|
||||||
_conversationLineTemplateStorage[id] = conversationLine;
|
_conversationLineTemplateStorage[id] = conversationLine;
|
||||||
}
|
}
|
||||||
@@ -318,6 +319,7 @@ namespace Game.DataStorage
|
|||||||
public uint UiCameraID; // Link to UiCamera.db2
|
public uint UiCameraID; // Link to UiCamera.db2
|
||||||
public byte ActorIdx; // Index from conversation_actors
|
public byte ActorIdx; // Index from conversation_actors
|
||||||
public byte Flags;
|
public byte Flags;
|
||||||
|
public byte ChatType;
|
||||||
}
|
}
|
||||||
|
|
||||||
public class ConversationTemplate
|
public class ConversationTemplate
|
||||||
|
|||||||
@@ -132,6 +132,7 @@ namespace Game.Entities
|
|||||||
lineField.UiCameraID = line.UiCameraID;
|
lineField.UiCameraID = line.UiCameraID;
|
||||||
lineField.ActorIndex = line.ActorIdx;
|
lineField.ActorIndex = line.ActorIdx;
|
||||||
lineField.Flags = line.Flags;
|
lineField.Flags = line.Flags;
|
||||||
|
lineField.ChatType = line.ChatType;
|
||||||
|
|
||||||
ConversationLineRecord convoLine = CliDB.ConversationLineStorage.LookupByKey(line.Id); // never null for conversationTemplate->Lines
|
ConversationLineRecord convoLine = CliDB.ConversationLineStorage.LookupByKey(line.Id); // never null for conversationTemplate->Lines
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user