fix: changed the order of target conditions.

ArchiDog1998 · Nov 4, 2023 · 3f8b454 · 3f8b454
1 parent 38f0dfa
commit 3f8b454
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 16 deletions.
diff --git a/Resources/RotationSolverRecord.json b/Resources/RotationSolverRecord.json
@@ -1,4 +1,4 @@
 {
-  "ClickingCount": 54513,
+  "ClickingCount": 54546,
   "SaidUsers": []
 }
diff --git a/RotationSolver.Basic/Configuration/Conditions/TargetCondition.cs b/RotationSolver.Basic/Configuration/Conditions/TargetCondition.cs
@@ -148,7 +148,7 @@ protected override bool IsTrueInside(ICustomRotation rotation)
                 break;
 
             case TargetConditionType.Vfx:
-                foreach (var effect in DataCenter.VfxNewDatas.Reverse())
+                foreach (var effect in DataCenter.VfxNewData.Reverse())
                 {
                     var time = effect.TimeDuration.TotalSeconds;
                     if (time > DistanceOrTime && time < TimeEnd
@@ -170,9 +170,9 @@ protected override bool IsTrueInside(ICustomRotation rotation)
 
 internal enum TargetType : byte
 {
-    Target,
     HostileTarget,
-    Player
+    Player,
+    Target,
 }
 
 internal enum TargetConditionType : byte

diff --git a/RotationSolver.Basic/DataCenter.cs b/RotationSolver.Basic/DataCenter.cs
@@ -30,7 +30,7 @@ internal static BattleChara HostileTarget
 
     internal static Queue<MapEffectData> MapEffects { get; } = new(64);
     internal static Queue<ObjectEffectData> ObjectEffects { get; } = new(64);
-    internal static Queue<VfxNewData> VfxNewDatas { get; } = new(64);
+    internal static Queue<VfxNewData> VfxNewData { get; } = new(64);
 
     /// <summary>
     /// This one never be null.
@@ -476,7 +476,7 @@ internal static void ResetAllRecords()
 
         MapEffects.Clear();
         ObjectEffects.Clear();
-        VfxNewDatas.Clear();
+        VfxNewData.Clear();
     }
 
     internal static void AddDamageRec(float damageRatio)

diff --git a/RotationSolver/UI/ConditionDrawer.cs b/RotationSolver/UI/ConditionDrawer.cs
@@ -747,19 +747,18 @@ private static void DrawAfter(this TargetCondition targetCondition, ICustomRotat
 
         ActionSelectorPopUp(popUpKey, _actionsList, rotation, item => targetCondition.ID = (ActionID)item.ID, () =>
         {
-            if (ImGui.Selectable(LocalizationManager.RightLang.ActionSequencer_Target))
+            if (ImGui.Selectable(LocalizationManager.RightLang.ActionSequencer_HostileTarget))
             {
                 targetCondition._action = null;
                 targetCondition.ID = ActionID.None;
-                targetCondition.TargetType = TargetType.Target;
+                targetCondition.TargetType = TargetType.HostileTarget;
             }
 
-
-            if (ImGui.Selectable(LocalizationManager.RightLang.ActionSequencer_HostileTarget))
+            if (ImGui.Selectable(LocalizationManager.RightLang.ActionSequencer_Target))
             {
                 targetCondition._action = null;
                 targetCondition.ID = ActionID.None;
-                targetCondition.TargetType = TargetType.HostileTarget;
+                targetCondition.TargetType = TargetType.Target;
             }
 
             if (ImGui.Selectable(LocalizationManager.RightLang.ActionSequencer_Player))
@@ -768,7 +767,6 @@ private static void DrawAfter(this TargetCondition targetCondition, ICustomRotat
                 targetCondition.ID = ActionID.None;
                 targetCondition.TargetType = TargetType.Player;
             }
-
         });
 
         if (targetCondition._action != null ? targetCondition._action.GetTexture(out var icon) || IconSet.GetTexture(4, out icon)

diff --git a/RotationSolver/Updaters/TargetUpdater.cs b/RotationSolver/Updaters/TargetUpdater.cs
@@ -231,7 +231,7 @@ private static bool IsCastingAreaVfx()
     private static bool IsCastingVfx(Func<string, bool> isVfx)
     {
         if (isVfx == null) return false;
-        foreach (var item in DataCenter.VfxNewDatas.Reverse())
+        foreach (var item in DataCenter.VfxNewData.Reverse())
         {
             if (item.TimeDuration.TotalSeconds is > 1 and < 5)
             {

diff --git a/RotationSolver/Watcher.cs b/RotationSolver/Watcher.cs
@@ -82,14 +82,14 @@ private static IntPtr ActorVfxNewHandler(string path, IntPtr a2, IntPtr a3, floa
         {
             if (!path.StartsWith("vfx/common/eff/", StringComparison.OrdinalIgnoreCase))
             {
-                if (DataCenter.VfxNewDatas.Count >= 64)
+                if (DataCenter.VfxNewData.Count >= 64)
                 {
-                    DataCenter.VfxNewDatas.TryDequeue(out _);
+                    DataCenter.VfxNewData.TryDequeue(out _);
                 }
 
                 var obj = Svc.Objects.CreateObjectReference(a2);
                 var effect = new VfxNewData(obj?.ObjectId ?? Dalamud.Game.ClientState.Objects.Types.GameObject.InvalidGameObjectId, path);
-                DataCenter.VfxNewDatas.Enqueue(effect);
+                DataCenter.VfxNewData.Enqueue(effect);
 #if DEBUG
                 Svc.Log.Debug(effect.ToString());
 #endif