From 937898e404e9e25d9a7f0db2e3d651cd8b26b66d Mon Sep 17 00:00:00 2001 From: pohky Date: Sat, 8 Aug 2020 06:42:43 +0200 Subject: [PATCH] Config to disable the Duty Pop message --- Dalamud/Configuration/DalamudConfiguration.cs | 1 + Dalamud/Game/Network/NetworkHandlers.cs | 3 ++- Dalamud/Interface/DalamudSettingsWindow.cs | 7 +++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Dalamud/Configuration/DalamudConfiguration.cs b/Dalamud/Configuration/DalamudConfiguration.cs index 03aeeb414..a5a700cef 100644 --- a/Dalamud/Configuration/DalamudConfiguration.cs +++ b/Dalamud/Configuration/DalamudConfiguration.cs @@ -30,6 +30,7 @@ namespace Dalamud public Dictionary PreferredRoleReminders { get; set; } public bool DutyFinderTaskbarFlash { get; set; } = true; + public bool DutyFinderChatMessage { get; set; } = true; public string LanguageOverride { get; set; } diff --git a/Dalamud/Game/Network/NetworkHandlers.cs b/Dalamud/Game/Network/NetworkHandlers.cs index 2a1b89a4e..5cc8b9adc 100644 --- a/Dalamud/Game/Network/NetworkHandlers.cs +++ b/Dalamud/Game/Network/NetworkHandlers.cs @@ -81,7 +81,8 @@ namespace Dalamud.Game.Network { } Task.Run(async () => { - this.dalamud.Framework.Gui.Chat.Print("Duty pop: " + contentFinderCondition.Name); + if(this.dalamud.Configuration.DutyFinderChatMessage) + this.dalamud.Framework.Gui.Chat.Print("Duty pop: " + contentFinderCondition.Name); await this.ProcessCfPop?.Invoke(contentFinderCondition); }); diff --git a/Dalamud/Interface/DalamudSettingsWindow.cs b/Dalamud/Interface/DalamudSettingsWindow.cs index 6a4e3478d..acdffcbdb 100644 --- a/Dalamud/Interface/DalamudSettingsWindow.cs +++ b/Dalamud/Interface/DalamudSettingsWindow.cs @@ -27,6 +27,7 @@ namespace Dalamud.Interface this.dalamudMessagesChatType = (int) this.dalamud.Configuration.GeneralChatType; this.doCfTaskBarFlash = this.dalamud.Configuration.DutyFinderTaskbarFlash; + this.doCfChatMessage = this.dalamud.Configuration.DutyFinderChatMessage; this.globalUiScale = this.dalamud.Configuration.GlobalUiScale; @@ -47,6 +48,7 @@ namespace Dalamud.Interface private int dalamudMessagesChatType; private bool doCfTaskBarFlash; + private bool doCfChatMessage; private const float MinScale = 0.3f; private const float MaxScale = 2.0f; @@ -90,6 +92,10 @@ namespace Dalamud.Interface ImGui.Checkbox(Loc.Localize("DalamudSettingsFlash", "Flash FFXIV window on duty pop"), ref this.doCfTaskBarFlash); ImGui.TextColored(this.hintTextColor, Loc.Localize("DalamudSettingsFlashHint", "Select, if the FFXIV window should be flashed in your task bar when a duty is ready.")); + ImGui.Checkbox(Loc.Localize("DalamudSettingsDutyFinderMessage", "Chatlog message on duty pop"), ref this.doCfChatMessage); + ImGui.TextColored(this.hintTextColor, Loc.Localize("DalamudSettingsDutyFinderMessageHint", "Select, if a message should be sent in the FFXIV chat when a duty is ready.")); + + ImGui.EndTabItem(); } @@ -143,6 +149,7 @@ namespace Dalamud.Interface this.dalamud.Configuration.GeneralChatType = (XivChatType) this.dalamudMessagesChatType; this.dalamud.Configuration.DutyFinderTaskbarFlash = this.doCfTaskBarFlash; + this.dalamud.Configuration.DutyFinderChatMessage = this.doCfChatMessage; this.dalamud.Configuration.GlobalUiScale = this.globalUiScale;