From e71ac94438ef44952662fe76ba69bf734b70aefa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=8B=E6=B0=B4?= <1123993881@qq.com> Date: Wed, 19 Jul 2023 16:50:02 +0800 Subject: [PATCH] fix: new feature for record status target. --- ActionTimelineEx/Configurations/Settings.cs | 1 + ActionTimelineEx/Plugin.cs | 3 --- ActionTimelineEx/Timeline/TimelineManager.cs | 7 +++---- ActionTimelineEx/Windows/SettingsWindow.cs | 1 + 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/ActionTimelineEx/Configurations/Settings.cs b/ActionTimelineEx/Configurations/Settings.cs index 49f3feb..ed5cf83 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 Record = true; + public bool RecordTargetStatus = true; public List TimelineSettings = new(); public HashSet HideStatusIds = new HashSet(); public bool PrintClipping = false; diff --git a/ActionTimelineEx/Plugin.cs b/ActionTimelineEx/Plugin.cs index 048ae4f..3f8fa36 100644 --- a/ActionTimelineEx/Plugin.cs +++ b/ActionTimelineEx/Plugin.cs @@ -3,14 +3,11 @@ using ActionTimeline.Windows; using Dalamud.Game.ClientState.Conditions; using Dalamud.Interface.Windowing; -using Dalamud.Logging; using Dalamud.Plugin; using ECommons; using ECommons.Commands; using ECommons.DalamudServices; using ECommons.GameHelpers; -using ImGuiNET; -using System.Numerics; namespace ActionTimeline; diff --git a/ActionTimelineEx/Timeline/TimelineManager.cs b/ActionTimelineEx/Timeline/TimelineManager.cs index e05f8b5..9c9ff00 100644 --- a/ActionTimelineEx/Timeline/TimelineManager.cs +++ b/ActionTimelineEx/Timeline/TimelineManager.cs @@ -241,14 +241,13 @@ private void ActionFromSelf(ActionEffectSet set) { switch (x.type) { - case ActionEffectType.ApplyStatusEffectTarget: - case ActionEffectType.ApplyStatusEffectSource: - case ActionEffectType.GpGain: + case (ActionEffectType)14 when Plugin.Settings.RecordTargetStatus: // ApplyStatusEffectTarget + case (ActionEffectType)15: // ApplyStatusEffectSource var icon = GetStatusIcon(x.value, true); if (icon != 0) statusGain.Add(icon); break; - case ActionEffectType.LoseStatusEffectTarget: + case ActionEffectType.LoseStatusEffectTarget when Plugin.Settings.RecordTargetStatus: case ActionEffectType.LoseStatusEffectSource: icon = GetStatusIcon(x.value, false); if (icon != 0) statusLose.Add(icon); diff --git a/ActionTimelineEx/Windows/SettingsWindow.cs b/ActionTimelineEx/Windows/SettingsWindow.cs index 3225d5e..703f864 100644 --- a/ActionTimelineEx/Windows/SettingsWindow.cs +++ b/ActionTimelineEx/Windows/SettingsWindow.cs @@ -128,6 +128,7 @@ private void DrawGeneralSetting() } ImGui.NewLine(); + ImGui.Checkbox("Record Target Status", ref Settings.RecordTargetStatus); var index = 0;