feat: add timeline ui stuff.

ArchiDog1998 · Feb 28, 2024 · 4cda9b1 · 4cda9b1
1 parent 635cf32
commit 4cda9b1
Show file tree

Hide file tree

Showing 15 changed files with 379 additions and 20 deletions.
diff --git a/RotationSolver.Basic/Configuration/Conditions/IConditionConverter.cs b/RotationSolver.Basic/Configuration/Conditions/IConditionConverter.cs
@@ -39,11 +39,6 @@ internal class IConditionConverter : JsonCreationConverter<ICondition>
             return null;
         }
     }
-
-    private static bool FieldExists(string fieldName, JObject jObject)
-    {
-        return jObject[fieldName] != null;
-    }
 }
 
 internal abstract class JsonCreationConverter<T> : JsonConverter
@@ -77,4 +72,9 @@ public override void WriteJson(JsonWriter writer, object? value, JsonSerializer
 
         return target;
     }
+
+    protected static bool FieldExists(string fieldName, JObject jObject)
+    {
+        return jObject[fieldName] != null;
+    }
 }
diff --git a/RotationSolver.Basic/Configuration/Configs.cs b/RotationSolver.Basic/Configuration/Configs.cs
@@ -1,6 +1,7 @@
 using Dalamud.Configuration;
 using ECommons.DalamudServices;
 using ECommons.ExcelServices;
+using RotationSolver.Basic.Configuration.Timeline;
 
 namespace RotationSolver.Basic.Configuration;
 
@@ -748,6 +749,8 @@ public const string
 
     public Dictionary<uint, string> DutyRotationChoice { get; set; } = [];
 
+    public Dictionary<uint, Dictionary<string, List<ITimelineItem>>> Timeline { get; set; } = [];
+
     public void Save()
     {
 #if DEBUG

diff --git a/RotationSolver.Basic/Configuration/Timeline/ActionTimelineItem.cs b/RotationSolver.Basic/Configuration/Timeline/ActionTimelineItem.cs
@@ -0,0 +1,17 @@
+namespace RotationSolver.Basic.Configuration.Timeline;
+internal class ActionTimelineItem : ITimelineItem
+{
+    public ActionID ID { get; set; } = ActionID.None;
+    public float Time { get; set; } = 3;
+    public float Duration { get; set; } = 3;
+
+    public bool InPeriod(TimelineItem item)
+    {
+        var time = item.Time - DataCenter.RaidTimeRaw;
+
+        if (time < 0) return false;
+
+        if (time > Time || Time - time > 3) return false;
+        return true;
+    }
+}
diff --git a/RotationSolver.Basic/Configuration/Timeline/ITimelineItem.cs b/RotationSolver.Basic/Configuration/Timeline/ITimelineItem.cs
@@ -0,0 +1,8 @@
+namespace RotationSolver.Basic.Configuration.Timeline;
+
+internal interface ITimelineItem
+{
+    public float Time { get; set; }
+    public float Duration { get; set; }
+    public bool InPeriod(TimelineItem item);
+}
diff --git a/RotationSolver.Basic/Configuration/Timeline/ITimelineItemConverter.cs b/RotationSolver.Basic/Configuration/Timeline/ITimelineItemConverter.cs
@@ -0,0 +1,20 @@
+using Newtonsoft.Json.Linq;
+using RotationSolver.Basic.Configuration.Conditions;
+
+namespace RotationSolver.Basic.Configuration.Timeline;
+
+internal class ITimelineItemConverter : JsonCreationConverter<ITimelineItem>
+{
+    protected override ITimelineItem? Create(JObject jObject)
+    {
+        if (FieldExists(nameof(ActionTimelineItem.ID), jObject))
+        {
+            return new ActionTimelineItem();
+        }
+        else if (FieldExists(nameof(StateTimelineItem.State), jObject))
+        {
+            return new StateTimelineItem();
+        }
+        return null;
+    }
+}
diff --git a/RotationSolver.Basic/Configuration/Timeline/StateTimelineItem.cs b/RotationSolver.Basic/Configuration/Timeline/StateTimelineItem.cs
@@ -0,0 +1,18 @@
+namespace RotationSolver.Basic.Configuration.Timeline;
+
+internal class StateTimelineItem : ITimelineItem
+{
+    public AutoStatus State { get; set; }
+    public float Time { get; set; } = 3;
+    public float Duration { get; set; } = 3;
+
+    public bool InPeriod(TimelineItem item)
+    {
+        var time = item.Time - DataCenter.RaidTimeRaw;
+
+        if (time < 0) return false;
+
+        if (time > Time || Time - time > Duration) return false;
+        return true;
+    }
+}
diff --git a/RotationSolver.Basic/DataCenter.cs b/RotationSolver.Basic/DataCenter.cs
@@ -1,5 +1,4 @@
 using Dalamud.Game.ClientState.Conditions;
-using Dalamud.Game.ClientState.Objects.SubKinds;
 using ECommons.DalamudServices;
 using ECommons.ExcelServices;
 using ECommons.GameHelpers;
@@ -117,16 +116,14 @@ public static IAction? CommandNextAction
     {
         get
         {
-            if (ActionSequencerAction != null) return ActionSequencerAction;
-
             var next = NextActs.FirstOrDefault();
 
             while (next != null && NextActs.Count > 0 && (next.DeadTime < DateTime.Now || IActionHelper.IsLastAction(true, next.Act)))
             {
                 NextActs.RemoveAt(0);
                 next = NextActs.FirstOrDefault();
             }
-            return next?.Act;
+            return next?.Act ?? ActionSequencerAction;
         }
     }
     public static Job Job { get; set; }

diff --git a/RotationSolver.Basic/RotationSolver.Basic.csproj b/RotationSolver.Basic/RotationSolver.Basic.csproj
@@ -67,8 +67,7 @@
 		  <PrivateAssets>all</PrivateAssets>
 	  </ProjectReference>
 
-	  <ProjectReference Include="..\RotationSolver.SourceGenerators\RotationSolver.SourceGenerators.csproj" OutputItemType="Analyzer"
-						ExcludeAssets="All" />
+	  <ProjectReference Include="..\RotationSolver.SourceGenerators\RotationSolver.SourceGenerators.csproj" OutputItemType="Analyzer" ExcludeAssets="All" />
 
 	  <None Include="..\COPYING.LESSER">
 		<Pack>True</Pack>

diff --git a/RotationSolver/RotationSolverPlugin.cs b/RotationSolver/RotationSolverPlugin.cs
@@ -8,6 +8,7 @@
 using ECommons.GameHelpers;
 using ECommons.ImGuiMethods;
 using RotationSolver.Basic.Configuration;
+using RotationSolver.Basic.Configuration.Timeline;
 using RotationSolver.Commands;
 using RotationSolver.Data;
 using RotationSolver.Helpers;
@@ -44,7 +45,7 @@ public RotationSolverPlugin(DalamudPluginInterface pluginInterface)
         try
         {
             Service.Config = JsonConvert.DeserializeObject<Configs>(
-                File.ReadAllText(Svc.PluginInterface.ConfigFile.FullName))
+                File.ReadAllText(Svc.PluginInterface.ConfigFile.FullName), new ITimelineItemConverter())
                 ?? new Configs();
         }
         catch (Exception ex)

diff --git a/RotationSolver/UI/ConditionDrawer.cs b/RotationSolver/UI/ConditionDrawer.cs
@@ -88,7 +88,7 @@ private static IEnumerable<MemberInfo> GetAllMethods(this Type? type, Func<Type,
         return methods.Union(type.BaseType.GetAllMethods(getFunc));
     }
 
-    public static void DrawByteEnum<T>(string name, ref T value) where T : struct, Enum
+    public static bool DrawByteEnum<T>(string name, ref T value) where T : struct, Enum
     {
         var values = Enum.GetValues<T>().Where(i => i.GetAttribute<ObsoleteAttribute>() == null).ToHashSet().ToArray();
         var index = Array.IndexOf(values, value);
@@ -97,7 +97,9 @@ public static void DrawByteEnum<T>(string name, ref T value) where T : struct, E
         if (ImGuiHelper.SelectableCombo(name, names, ref index))
         {
             value = values[index];
+            return true;
         }
+        return false;
     }
 
     public static bool DrawDragFloat(ConfigUnitType type, string name, ref float value)
@@ -401,7 +403,7 @@ private static void DrawAfter(this ActionCondition actionCondition, ICustomRotat
 
         ActionSelectorPopUp(popUpKey, _actionsList, rotation, item => actionCondition.ID = (ActionID)item.ID);
 
-        if (actionCondition._action?.GetTexture(out var icon) ?? false || IconSet.GetTexture(4, out icon))
+        if ((actionCondition._action?.GetTexture(out var icon) ?? false) || IconSet.GetTexture(4, out icon))
         {
             var cursor = ImGui.GetCursorPos();
             if (ImGuiHelper.NoPaddingNoColorImageButton(icon.ImGuiHandle, Vector2.One * IconSize, actionCondition.GetHashCode().ToString()))