chore: 3.3.0 released

ArchiDog1998 · Sep 10, 2023 · 5b7ee68 · 5b7ee68
1 parent 610972a
commit 5b7ee68
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -3,7 +3,7 @@
 		<TargetFramework>net7.0-windows</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Authors>ArchiTed</Authors>
-		<Version>3.2.11</Version>
+		<Version>3.3.0</Version>
 		<PlatformTarget>x64</PlatformTarget>
 		<Platforms>AnyCPU</Platforms>
 

diff --git a/Resources/IncompatiblePlugins.json b/Resources/IncompatiblePlugins.json
@@ -39,7 +39,7 @@
     "Icon": "https://raw.githubusercontent.com/Penumbra-Sync/repo/main/MareSynchronos/images/icon.png",
     "Url": "https://github.com/Penumbra-Sync/client",
     "Features": "It takes a lot of resources about Task, which may effect the usage.",
-    "Type": 1
+    "Type": 3
   },
   {
     "Name": "Simple Tweaks",

diff --git a/RotationSolver.Basic/Actions/BaseAction_ActionInfo.cs b/RotationSolver.Basic/Actions/BaseAction_ActionInfo.cs
@@ -109,6 +109,8 @@ public unsafe virtual bool CanUse(out IAction act, CanUseOption option = CanUseO
                 if (DataCenter.PartyMembersAverHP >= AutoHealRatio) return false;
             }
         }
+
+        if (IsFriendly && DataCenter.AverageTimeToKill < TimeToKill) return false;
 
         if (DataCenter.DisabledActionSequencer != null && DataCenter.DisabledActionSequencer.Contains(ID)) return false;
 

diff --git a/RotationSolver/UI/RotationConfigWindow.cs b/RotationSolver/UI/RotationConfigWindow.cs
@@ -1233,6 +1233,16 @@ private static unsafe void DrawActions()
 
                 if(_activeAction is IBaseAction action)
                 {
+                    ImGui.Separator();
+
+                    var ttk = action.TimeToKill;
+                    ImGui.SetNextItemWidth(_scale * 150);
+                    if (ImGui.DragFloat($"{LocalizationManager.RightLang.ConfigWindow_Actions_TTK}##{action}",
+                        ref ttk, 0.1f, 0, 120))
+                    {
+                        action.TimeToKill = ttk;
+                    }
+
                     if (!action.IsSingleTarget)
                     {
                         var aoeCount = (int)action.AOECount;
@@ -1244,16 +1254,6 @@ private static unsafe void DrawActions()
                         }
                     }
 
-                    if (!action.IsFriendly)
-                    {
-                        var ttk = action.TimeToKill;
-                        ImGui.SetNextItemWidth(_scale * 150);
-                        if (ImGui.DragFloat($"{LocalizationManager.RightLang.ConfigWindow_Actions_TTK}##{action}",
-                            ref ttk, 0.1f, 0, 120))
-                        {
-                            action.TimeToKill = ttk;
-                        }
-                    }
                     if (action.IsHeal)
                     {
                         var ratio = action.AutoHealRatio;
-Original file line number
+Diff line change
@@ Expand Up @@
                     if (DataCenter.PartyMembersAverHP >= AutoHealRatio) return false;
                 }
             }
+            if (IsFriendly && DataCenter.AverageTimeToKill < TimeToKill) return false;
             if (DataCenter.DisabledActionSequencer != null && DataCenter.DisabledActionSequencer.Contains(ID)) return false;
@@ Expand Down @@