fix: add provoke target list.

ArchiDog1998 · Aug 30, 2023 · 27ec7d5 · 27ec7d5
1 parent cd363ec
commit 27ec7d5
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 4 deletions.
diff --git a/RotationSolver.Basic/Configuration/OtherConfiguration.cs b/RotationSolver.Basic/Configuration/OtherConfiguration.cs
@@ -13,6 +13,7 @@ public class OtherConfiguration
     public static SortedList<uint, float> AnimationLockTime = new();
 
     public static Dictionary<uint, string[]> NoHostileNames = new();
+    public static Dictionary<uint, string[]> NoProvokeNames = new();
     public static Dictionary<uint, Vector3[]> BeneficialPositions = new();
 
     public static HashSet<uint> DangerousStatus = new();
@@ -34,6 +35,8 @@ public static void Init()
 
         Task.Run(() => InitOne(ref NoHostileNames, nameof(NoHostileNames)));
 
+        Task.Run(() => InitOne(ref NoProvokeNames, nameof(NoProvokeNames)));
+
         Task.Run(() => InitOne(ref AnimationLockTime, nameof(AnimationLockTime)));
 
         Task.Run(() => InitOne(ref HostileCastingArea, nameof(HostileCastingArea)));
@@ -55,12 +58,16 @@ public static void Save()
         SaveHostileCastingTank();
         SaveBeneficialPositions();
         SaveRotationSolverRecord();
+        SaveNoProvokeNames();
     }
-
     public static void SaveRotationSolverRecord()
     {
         Task.Run(() => Save(RotationSolverRecord, nameof(RotationSolverRecord)));
     }
+    public static void SaveNoProvokeNames()
+    {
+        Task.Run(() => Save(NoProvokeNames, nameof(NoProvokeNames)));
+    }
 
     public static void SaveBeneficialPositions()
     {

diff --git a/RotationSolver.Basic/Helpers/TargetFilter.cs b/RotationSolver.Basic/Helpers/TargetFilter.cs
@@ -2,7 +2,9 @@
 using ECommons.GameFunctions;
 using ECommons.GameHelpers;
 using Lumina.Excel.GeneratedSheets;
+using RotationSolver.Basic.Configuration;
 using System.Data;
+using System.Text.RegularExpressions;
 
 namespace RotationSolver.Basic.Helpers;
 
@@ -175,6 +177,13 @@ internal static IEnumerable<BattleChara> ProvokeTarget(IEnumerable<BattleChara>
 
         var targets = inputCharas.Where(target =>
         {
+            //Removed the listed names.
+            IEnumerable<string> names = Array.Empty<string>();
+            if (OtherConfiguration.NoProvokeNames.TryGetValue(Svc.ClientState.TerritoryType, out var ns1))
+                names = names.Union(ns1);
+
+            if (names.Any(n => !string.IsNullOrEmpty(n) && new Regex(n).Match(target.Name.ToString()).Success)) return false;
+
             //Target can move or two big and has a target
             if ((target.GetObjectNPC()?.Unknown12 == 0 || target.HitboxRadius >= 5)
             && (target.TargetObject?.IsValid() ?? false))

diff --git a/RotationSolver/Localization/Strings.cs b/RotationSolver/Localization/Strings.cs
@@ -285,6 +285,7 @@ internal partial class Strings
 
     public string ConfigWindow_List_NoHostile { get; set; } = "No Hostile";
     public string ConfigWindow_List_NoHostileDesc { get; set; } = "Add names of targets that will never be attacked.";
+    public string ConfigWindow_List_NoProvokeDesc { get; set; } = "Add names of targets that will never be provoked.";
 
     #endregion
 
@@ -664,6 +665,7 @@ internal partial class Strings
 
     public string ConfigWindow_List_BeneficialPositions { get; set; } = "Beneficial positions";
     public string ConfigWindow_List_NoHostilesName { get; set; } = "The name of object that you don't want to attack";
+    public string ConfigWindow_List_NoProvokeName { get; set; } = "The name of object that you don't want to provoke";
 
     public string ConfigWindow_Basic_AutoSwitch { get; set; } = "Auto Switch";
 

diff --git a/RotationSolver/UI/RotationConfigWindow.cs b/RotationSolver/UI/RotationConfigWindow.cs
@@ -1875,7 +1875,7 @@ private static void DrawListTerritories()
         ImGui.PopStyleColor();
         ImGui.PopFont();
 
-        if (ImGui.BeginTable("Rotation Solver List Territories", 2, ImGuiTableFlags.BordersInner | ImGuiTableFlags.Resizable | ImGuiTableFlags.SizingStretchSame))
+        if (ImGui.BeginTable("Rotation Solver List Territories", 3, ImGuiTableFlags.BordersInner | ImGuiTableFlags.Resizable | ImGuiTableFlags.SizingStretchSame))
         {
             ImGui.TableSetupScrollFreeze(0, 1);
             ImGui.TableNextRow(ImGuiTableRowFlags.Headers);
@@ -1909,14 +1909,14 @@ private static void DrawListTerritories()
             for (int i = 0; i < libs.Length; i++)
             {
                 ImGui.SetNextItemWidth(width);
-                if(ImGui.InputTextWithHint($"##Rotation Solver Territory Name {i}", LocalizationManager.RightLang.ConfigWindow_List_NoHostilesName, ref libs[i], 1024))
+                if(ImGui.InputTextWithHint($"##Rotation Solver Territory Target Name {i}", LocalizationManager.RightLang.ConfigWindow_List_NoHostilesName, ref libs[i], 1024))
                 {
                     OtherConfiguration.NoHostileNames[territoryId] = libs;
                     OtherConfiguration.SaveNoHostileNames();
                 }
                 ImGui.SameLine();
 
-                if (ImGuiEx.IconButton(FontAwesomeIcon.Ban, $"##Rotation Solver Remove Territory Name {i}"))
+                if (ImGuiEx.IconButton(FontAwesomeIcon.Ban, $"##Rotation Solver Remove Territory Target Name {i}"))
                 {
                     removeIndex = i;
                 }
@@ -1930,6 +1930,45 @@ private static void DrawListTerritories()
             }
             ImGui.TableNextColumn();
 
+            ImGui.TextWrapped(LocalizationManager.RightLang.ConfigWindow_List_NoProvokeDesc);
+
+            width = ImGui.GetColumnWidth() - ImGuiEx.CalcIconSize(FontAwesomeIcon.Ban).X - ImGui.GetStyle().ItemSpacing.X - 10 * _scale;
+
+            if (!OtherConfiguration.NoProvokeNames.TryGetValue(territoryId, out libs))
+            {
+                OtherConfiguration.NoProvokeNames[territoryId] = libs = Array.Empty<string>();
+            }
+            //Add one.
+            if (!libs.Any(string.IsNullOrEmpty))
+            {
+                OtherConfiguration.NoHostileNames[territoryId] = libs.Append(string.Empty).ToArray();
+            }
+            removeIndex = -1;
+            for (int i = 0; i < libs.Length; i++)
+            {
+                ImGui.SetNextItemWidth(width);
+                if (ImGui.InputTextWithHint($"##Rotation Solver Territory Provoke Name {i}", LocalizationManager.RightLang.ConfigWindow_List_NoProvokeName, ref libs[i], 1024))
+                {
+                    OtherConfiguration.NoProvokeNames[territoryId] = libs;
+                    OtherConfiguration.SaveNoProvokeNames();
+                }
+                ImGui.SameLine();
+
+                if (ImGuiEx.IconButton(FontAwesomeIcon.Ban, $"##Rotation Solver Remove Territory Provoke Name {i}"))
+                {
+                    removeIndex = i;
+                }
+            }
+            if (removeIndex > -1)
+            {
+                var list = libs.ToList();
+                list.RemoveAt(removeIndex);
+                OtherConfiguration.NoProvokeNames[territoryId] = list.ToArray();
+                OtherConfiguration.SaveNoProvokeNames();
+            }
+
+            ImGui.TableNextColumn();
+
             if (!OtherConfiguration.BeneficialPositions.TryGetValue(territoryId, out var pts))
             {
                 OtherConfiguration.BeneficialPositions[territoryId] = pts = Array.Empty<Vector3>();