fix: removed the one watching cutscene.

ArchiDog1998 · Jul 15, 2023 · 9d5cec0 · 9d5cec0
1 parent c488244
commit 9d5cec0
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 12 deletions.
diff --git a/Resources/AnimationLockTime.json b/Resources/AnimationLockTime.json
@@ -224,7 +224,7 @@
   "7510": 0.1,
   "7511": 0.1,
   "7513": 0.6,
-  "7514": 0.6,
+  "7514": 0.1,
   "7517": 0.6,
   "7518": 0.6,
   "7519": 0.6,
@@ -389,6 +389,7 @@
   "20304": 0.6,
   "20542": 2.1,
   "20710": 0.1,
+  "20715": 0.6,
   "20727": 0.6,
   "21052": 2.1,
   "21054": 2.1,
@@ -458,6 +459,7 @@
   "24393": 0.6,
   "24405": 0.6,
   "24628": 2.1,
+  "24955": 0.1,
   "25063": 2.1,
   "25064": 2.1,
   "25065": 2.1,
@@ -541,6 +543,8 @@
   "29709": 0.1,
   "31323": 2.1,
   "33041": 2.1,
+  "33336": 0.1,
+  "33337": 0.1,
   "33341": 0.1,
   "33708": 2.1,
   "33907": 2.1

diff --git a/Resources/HostileCastingArea.json b/Resources/HostileCastingArea.json
@@ -158,6 +158,7 @@
   23671,
   23703,
   23710,
+  24220,
   24239,
   24241,
   24245,

diff --git a/RotationSolver/Localization/Localization.json b/RotationSolver/Localization/Localization.json
@@ -80,7 +80,7 @@
   "ConfigWindow_Param_Display": "Display",
   "ConfigWindow_Param_Advanced": "Advanced",
   "ConfigWindow_Param_PoslockCasting": "Lock the movement when casting or some actions.",
-  "ConfigWindow_Param_UseStopCasting": "Stops casting when target is dead.",
+  "ConfigWindow_Param_UseStopCasting": "Stops casting when hostile target is dead.",
   "ConfigWindow_Param_ShowTooltips": "Show tooltips",
   "ConfigWindow_Param_InDebug": "Debug Mode",
   "ConfigWindow_Param_ShowHealthRatio": "Show the health ratio for the check of Boss, Dying, Dot.",

diff --git a/RotationSolver/UI/RotationConfigWindow_Debug.cs b/RotationSolver/UI/RotationConfigWindow_Debug.cs
@@ -97,12 +97,6 @@ private unsafe void DrawTargetData()
             {
                 ImGui.Text("Owner: " + owner.Name.ToString());
             }
-            if( Svc.Targets.Target is Character c)
-            {
-                var s = c.Struct();
-                ImGui.Text($"Character Mode: {s->Mode}.");
-                ImGui.Text($"Character Status: {s->StatusFlags}, {s->StatusFlags2}, {s->StatusFlags3}, {s->StatusFlags4}.");
-            }
         }
         if (Svc.Targets.Target is BattleChara b)
         {

diff --git a/RotationSolver/Updaters/MajorUpdater.cs b/RotationSolver/Updaters/MajorUpdater.cs
@@ -3,6 +3,7 @@
 using Dalamud.Logging;
 using ECommons.DalamudServices;
 using ECommons.GameHelpers;
+using ECommons.GameFunctions;
 using RotationSolver.Commands;
 using RotationSolver.UI;
 
@@ -27,7 +28,7 @@ internal static class MajorUpdater
 
     static bool _showed;
     static Exception _threadException;
-    private static void FrameworkUpdate(Framework framework)
+    private unsafe static void FrameworkUpdate(Framework framework)
     {
         PainterManager.ActionIds.Clear();
         RotationSolverPlugin.UpdateDisplayWindow();

diff --git a/RotationSolver/Updaters/TargetUpdater.cs b/RotationSolver/Updaters/TargetUpdater.cs
@@ -14,12 +14,15 @@ namespace RotationSolver.Updaters;
 
 internal static partial class TargetUpdater
 {
-    internal static void UpdateTarget()
+    internal unsafe static void UpdateTarget()
     {
         DataCenter.AllTargets = Svc.Objects.GetObjectInRadius(30);
-        var battles = DataCenter.AllTargets.OfType<BattleChara>();
+        var battles = DataCenter.AllTargets.OfType<BattleChara>(); 
         UpdateHostileTargets(battles);
-        UpdateFriends(battles);
+        UpdateFriends(battles
+            .Where(b => b.Character()->CharacterData.OnlineStatus != 15 //Removed the one watching cutscene.
+            && b.IsTargetable() //Removed the one can't target.
+            ));
         UpdateNamePlate(Svc.Objects.OfType<BattleChara>());
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -158,6 +158,7 @@ @@
 ,
 ,
 ,
+,
 ,
 ,
 ,
@@ Expand Down @@