From b4380a97e68374206ae14af42830fad94fdb5d40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=8B=E6=B0=B4?= <1123993881@qq.com> Date: Wed, 4 Oct 2023 11:52:52 +0800 Subject: [PATCH] fix: add an option for hiding in quest event. --- ActionTimelineEx/Configurations/Settings.cs | 1 + ActionTimelineEx/Plugin.cs | 10 +++++++++- ActionTimelineEx/Windows/SettingsWindow.cs | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ActionTimelineEx/Configurations/Settings.cs b/ActionTimelineEx/Configurations/Settings.cs index d281c05..cf914c1 100644 --- a/ActionTimelineEx/Configurations/Settings.cs +++ b/ActionTimelineEx/Configurations/Settings.cs @@ -10,6 +10,7 @@ public class Settings : IPluginConfiguration public bool ShowTimelineOnlyInDuty = false; public bool ShowTimelineOnlyInCombat = false; public bool HideTimelineInCutscene = true; + public bool HideTimelineInQuestEvent = true; public bool Record = true; public bool RecordTargetStatus = true; public List TimelineSettings = new(); diff --git a/ActionTimelineEx/Plugin.cs b/ActionTimelineEx/Plugin.cs index 4e92cc3..47c07dc 100644 --- a/ActionTimelineEx/Plugin.cs +++ b/ActionTimelineEx/Plugin.cs @@ -156,7 +156,15 @@ private bool ShowTimeline() } if (Settings.HideTimelineInCutscene - && (Svc.Condition[ConditionFlag.WatchingCutscene] || Svc.Condition[ConditionFlag.WatchingCutscene78])) + && (Svc.Condition[ConditionFlag.WatchingCutscene] + || Svc.Condition[ConditionFlag.WatchingCutscene78] + || Svc.Condition[ConditionFlag.OccupiedInCutSceneEvent])) + { + return false; + } + + if (Settings.HideTimelineInQuestEvent + && (Svc.Condition[ConditionFlag.OccupiedInQuestEvent])) { return false; } diff --git a/ActionTimelineEx/Windows/SettingsWindow.cs b/ActionTimelineEx/Windows/SettingsWindow.cs index c79d264..97b5e4c 100644 --- a/ActionTimelineEx/Windows/SettingsWindow.cs +++ b/ActionTimelineEx/Windows/SettingsWindow.cs @@ -121,6 +121,7 @@ private void DrawGeneralSetting() ImGui.Checkbox("Show Only In Duty", ref Settings.ShowTimelineOnlyInDuty); ImGui.Checkbox("Show Only In Combat", ref Settings.ShowTimelineOnlyInCombat); ImGui.Checkbox("Hide In Cutscene", ref Settings.HideTimelineInCutscene); + ImGui.Checkbox("Hide In Quest Event", ref Settings.HideTimelineInQuestEvent); ImGui.Checkbox("Print Clipping Time On Chat", ref Settings.PrintClipping); if (Settings.PrintClipping) {