From ae65d8a3a5732a9e7b9b8722c739868eb6c333a2 Mon Sep 17 00:00:00 2001 From: AzureGem Date: Thu, 31 Aug 2023 01:03:52 -0400 Subject: [PATCH 1/6] [WIP] Add missing XivChatTypeInfo to XivChatType I noticed some `XivChatType` doesn't have an associated `[XivChatTypeInfo]` attribute, therefore this PR aims in adding those missing attributes. This PR currently contain placeholders and therefore its not ready for merge. I currently do not know the exact default hex colors of the channels and whether the slugs would be okay/correct. --- Dalamud/Game/Text/XivChatType.cs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Dalamud/Game/Text/XivChatType.cs b/Dalamud/Game/Text/XivChatType.cs index 1a41a5eff..135f7103f 100644 --- a/Dalamud/Game/Text/XivChatType.cs +++ b/Dalamud/Game/Text/XivChatType.cs @@ -13,6 +13,7 @@ public enum XivChatType : ushort /// /// The debug chat type. /// + [XivChatTypeInfo("Debug", "debug", 0x????????)] Debug = 1, /// @@ -42,6 +43,7 @@ public enum XivChatType : ushort /// /// The outgoing tell chat type. /// + [XivChatTypeInfo("Tell (Outgoing)", "tell_outgoing", 0x ????????)] // Do we want this? TellOutgoing = 12, /// @@ -167,31 +169,37 @@ public enum XivChatType : ushort /// /// The system error chat type. /// + [XivChatTypeInfo("SystemError", "system_error", 0x????????)] SystemError = 58, /// /// The system message chat type. /// + [XivChatTypeInfo("SystemError", "system_message", 0x????????)] SystemMessage = 57, /// /// The system message (gathering) chat type. /// + [XivChatTypeInfo("SystemError", "gathering", 0x ????????)] GatheringSystemMessage = 59, /// /// The error message chat type. /// + [XivChatTypeInfo("SystemError", "error", 0x ????????)] ErrorMessage = 60, /// /// The NPC Dialogue chat type. /// + [XivChatTypeInfo("SystemError", "npc", 0x ????????)] NPCDialogue = 61, /// /// The NPC Dialogue (Announcements) chat type. /// + [XivChatTypeInfo("SystemError", "npc_dialog", 0x ????????)] NPCDialogueAnnouncements = 68, /// @@ -200,6 +208,7 @@ public enum XivChatType : ushort /// /// This might be used for other purposes. /// + [XivChatTypeInfo("SystemError", "retainer", 0x ????????)] RetainerSale = 71, /// From 97a40d692951fc4b70e53d8a4941206916b6f1ec Mon Sep 17 00:00:00 2001 From: AzureGem Date: Thu, 31 Aug 2023 10:47:34 -0400 Subject: [PATCH 2/6] "Tell (Incoming)" and Tell (Outgoing) color --- Dalamud/Game/Text/XivChatType.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dalamud/Game/Text/XivChatType.cs b/Dalamud/Game/Text/XivChatType.cs index 135f7103f..de46d2c44 100644 --- a/Dalamud/Game/Text/XivChatType.cs +++ b/Dalamud/Game/Text/XivChatType.cs @@ -43,13 +43,13 @@ public enum XivChatType : ushort /// /// The outgoing tell chat type. /// - [XivChatTypeInfo("Tell (Outgoing)", "tell_outgoing", 0x ????????)] // Do we want this? + [XivChatTypeInfo("Tell (Outgoing)", "tell_outgoing", 0xFFFF69B4)] // Do we want this? TellOutgoing = 12, /// /// The incoming tell chat type. /// - [XivChatTypeInfo("Tell", "tell", 0xFFFF69B4)] + [XivChatTypeInfo("Tell (Incoming)", "tell", 0xFFFF69B4)] TellIncoming = 13, /// From f48c206508c67c19357bc04d222e086ccc940ecd Mon Sep 17 00:00:00 2001 From: AzureGem Date: Sun, 3 Sep 2023 14:36:29 -0400 Subject: [PATCH 3/6] Tell (Incoming) and more colors --- Dalamud/Game/Text/XivChatType.cs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Dalamud/Game/Text/XivChatType.cs b/Dalamud/Game/Text/XivChatType.cs index de46d2c44..3476afb7c 100644 --- a/Dalamud/Game/Text/XivChatType.cs +++ b/Dalamud/Game/Text/XivChatType.cs @@ -43,13 +43,13 @@ public enum XivChatType : ushort /// /// The outgoing tell chat type. /// - [XivChatTypeInfo("Tell (Outgoing)", "tell_outgoing", 0xFFFF69B4)] // Do we want this? + [XivChatTypeInfo("Tell (Outgoing)", "tell_outgoing", 0xFFFF69B4)] TellOutgoing = 12, /// /// The incoming tell chat type. /// - [XivChatTypeInfo("Tell (Incoming)", "tell", 0xFFFF69B4)] + [XivChatTypeInfo("Tell (Incoming)", "tell_incoming", 0xFFFF69B4)] TellIncoming = 13, /// @@ -169,37 +169,37 @@ public enum XivChatType : ushort /// /// The system error chat type. /// - [XivChatTypeInfo("SystemError", "system_error", 0x????????)] + [XivChatTypeInfo("System Error", "system_error", 0xFFFF4A4A)] SystemError = 58, /// /// The system message chat type. /// - [XivChatTypeInfo("SystemError", "system_message", 0x????????)] + [XivChatTypeInfo("System Message", "system_message", 0xFFCCCCCC)] SystemMessage = 57, /// /// The system message (gathering) chat type. /// - [XivChatTypeInfo("SystemError", "gathering", 0x ????????)] + [XivChatTypeInfo("Gathering", "gathering", 0xFFCCCCCC)] GatheringSystemMessage = 59, /// /// The error message chat type. /// - [XivChatTypeInfo("SystemError", "error", 0x ????????)] + [XivChatTypeInfo("Error", "error", 0xFFFF4A4A)] ErrorMessage = 60, /// /// The NPC Dialogue chat type. /// - [XivChatTypeInfo("SystemError", "npc", 0x ????????)] + [XivChatTypeInfo("NPC", "npc", 0x ????????)] NPCDialogue = 61, /// /// The NPC Dialogue (Announcements) chat type. /// - [XivChatTypeInfo("SystemError", "npc_dialog", 0x ????????)] + [XivChatTypeInfo("NPC Dialog", "npc_dialog", 0xFFABD647)] NPCDialogueAnnouncements = 68, /// @@ -208,7 +208,7 @@ public enum XivChatType : ushort /// /// This might be used for other purposes. /// - [XivChatTypeInfo("SystemError", "retainer", 0x ????????)] + [XivChatTypeInfo("Retainer", "retainer", 0x ????????)] RetainerSale = 71, /// From f618dd4871f7c94ddd733750d62a3007fa2137a5 Mon Sep 17 00:00:00 2001 From: AzureGem Date: Sun, 3 Sep 2023 17:42:25 -0400 Subject: [PATCH 4/6] NPC Dialogue fix --- Dalamud/Game/Text/XivChatType.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dalamud/Game/Text/XivChatType.cs b/Dalamud/Game/Text/XivChatType.cs index 3476afb7c..ef56a4528 100644 --- a/Dalamud/Game/Text/XivChatType.cs +++ b/Dalamud/Game/Text/XivChatType.cs @@ -193,13 +193,13 @@ public enum XivChatType : ushort /// /// The NPC Dialogue chat type. /// - [XivChatTypeInfo("NPC", "npc", 0x ????????)] + [XivChatTypeInfo("NPC Dialogue", "npc_dialogue", 0x ????????)] NPCDialogue = 61, /// /// The NPC Dialogue (Announcements) chat type. /// - [XivChatTypeInfo("NPC Dialog", "npc_dialog", 0xFFABD647)] + [XivChatTypeInfo("NPC Dialogue Announcements", "npc_dialogue_announcements", 0xFFABD647)] NPCDialogueAnnouncements = 68, /// From 2feae711e188e095b61fcb4f6c8e06e59bdcd3b4 Mon Sep 17 00:00:00 2001 From: AzureGem Date: Sun, 3 Sep 2023 19:45:48 -0400 Subject: [PATCH 5/6] Retainer Sale color --- Dalamud/Game/Text/XivChatType.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dalamud/Game/Text/XivChatType.cs b/Dalamud/Game/Text/XivChatType.cs index ef56a4528..9d5dcc900 100644 --- a/Dalamud/Game/Text/XivChatType.cs +++ b/Dalamud/Game/Text/XivChatType.cs @@ -208,7 +208,7 @@ public enum XivChatType : ushort /// /// This might be used for other purposes. /// - [XivChatTypeInfo("Retainer", "retainer", 0x ????????)] + [XivChatTypeInfo("Retainer", "retainer", 0xFF808080)] RetainerSale = 71, /// From 474ef1f5b6773df862c523affb8a055177827c25 Mon Sep 17 00:00:00 2001 From: AzureGem Date: Mon, 4 Sep 2023 15:06:23 -0400 Subject: [PATCH 6/6] More colors --- Dalamud/Game/Text/XivChatType.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dalamud/Game/Text/XivChatType.cs b/Dalamud/Game/Text/XivChatType.cs index 9d5dcc900..7e38c02ef 100644 --- a/Dalamud/Game/Text/XivChatType.cs +++ b/Dalamud/Game/Text/XivChatType.cs @@ -13,7 +13,7 @@ public enum XivChatType : ushort /// /// The debug chat type. /// - [XivChatTypeInfo("Debug", "debug", 0x????????)] + [XivChatTypeInfo("Debug", "debug", 0xFF808080)] Debug = 1, /// @@ -169,13 +169,13 @@ public enum XivChatType : ushort /// /// The system error chat type. /// - [XivChatTypeInfo("System Error", "system_error", 0xFFFF4A4A)] + [XivChatTypeInfo("System Error", "system_error", 0xFF808080)] SystemError = 58, /// /// The system message chat type. /// - [XivChatTypeInfo("System Message", "system_message", 0xFFCCCCCC)] + [XivChatTypeInfo("System Message", "system_message", 0xFF808080)] SystemMessage = 57, /// @@ -193,7 +193,7 @@ public enum XivChatType : ushort /// /// The NPC Dialogue chat type. /// - [XivChatTypeInfo("NPC Dialogue", "npc_dialogue", 0x ????????)] + [XivChatTypeInfo("NPC Dialogue", "npc_dialogue", 0xFFABD647)] NPCDialogue = 61, ///