fix: stop casting only effects on hostile targets.

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

Hide file tree

Showing 7 changed files with 24 additions and 11 deletions.
diff --git a/Resources/AnimationLockTime.json b/Resources/AnimationLockTime.json
@@ -9,6 +9,7 @@
   "23": 0.6,
   "24": 0.6,
   "28": 0.6,
+  "29": 0.6,
   "31": 0.6,
   "37": 0.6,
   "40": 0.6,
@@ -100,6 +101,8 @@
   "3176": 0.1,
   "3538": 0.6,
   "3539": 0.6,
+  "3541": 0.1,
+  "3542": 0.6,
   "3543": 0.6,
   "3545": 0.6,
   "3546": 0.6,
@@ -159,7 +162,7 @@
   "6993": 2.1,
   "7381": 0.6,
   "7383": 0.6,
-  "7384": 0.1,
+  "7384": 0.6,
   "7385": 0.6,
   "7386": 0.6,
   "7387": 0.6,
@@ -221,7 +224,7 @@
   "7510": 0.1,
   "7511": 0.1,
   "7513": 0.6,
-  "7514": 0.1,
+  "7514": 0.6,
   "7517": 0.6,
   "7518": 0.6,
   "7519": 0.6,
@@ -248,7 +251,7 @@
   "7560": 0.6,
   "7561": 0.6,
   "7562": 0.6,
-  "7568": 0.6,
+  "7568": 0.1,
   "7863": 0.6,
   "8341": 0.1,
   "8570": 0.1,
@@ -322,6 +325,7 @@
   "16457": 0.6,
   "16458": 0.6,
   "16459": 0.6,
+  "16460": 0.6,
   "16461": 0.6,
   "16462": 0.6,
   "16464": 0.6,
@@ -384,6 +388,7 @@
   "20250": 0.1,
   "20304": 0.6,
   "20542": 2.1,
+  "20710": 0.1,
   "20727": 0.6,
   "21052": 2.1,
   "21054": 2.1,
@@ -484,7 +489,7 @@
   "25788": 0.6,
   "25793": 0.1,
   "25796": 0.6,
-  "25797": 0.1,
+  "25797": 0.6,
   "25798": 0.1,
   "25799": 0.6,
   "25801": 0.6,

diff --git a/Resources/HostileCastingArea.json b/Resources/HostileCastingArea.json
@@ -147,6 +147,7 @@
   23367,
   23381,
   23383,
+  23470,
   23517,
   23538,
   23541,
@@ -241,8 +242,10 @@
   31780,
   31835,
   31885,
+  31900,
   31910,
   31925,
+  31926,
   31956,
   31978,
   32059,
@@ -256,6 +259,7 @@
   32785,
   32868,
   32944,
+  33024,
   33335,
   33338,
   33343,

diff --git a/RotationSolver/Localization/Strings.cs b/RotationSolver/Localization/Strings.cs
@@ -134,7 +134,7 @@ internal partial class Strings
     public string ConfigWindow_Param_Display { get; set; } = "Display";
     public string ConfigWindow_Param_Advanced { get; set; } = "Advanced";
     public string ConfigWindow_Param_PoslockCasting { get; set; } = "Lock the movement when casting or some actions.";
-    public string ConfigWindow_Param_UseStopCasting { get; set; } = "Stops casting when target is dead.";
+    public string ConfigWindow_Param_UseStopCasting { get; set; } = "Stops casting when hostile target is dead.";
     public string ConfigWindow_Param_ShowTooltips { get; set; } = "Show tooltips";
     public string ConfigWindow_Param_InDebug { get; set; } = "Debug Mode";
 

diff --git a/RotationSolver/UI/RotationConfigWindow_Debug.cs b/RotationSolver/UI/RotationConfigWindow_Debug.cs
@@ -97,6 +97,12 @@ 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
@@ -27,10 +27,9 @@ internal static class MajorUpdater
 
     static bool _showed;
     static Exception _threadException;
-    //static int count = 0;
     private static void FrameworkUpdate(Framework framework)
     {
-        //if (count++ > 10) return;
+        PainterManager.ActionIds.Clear();
         RotationSolverPlugin.UpdateDisplayWindow();
         if (!IsValid)
         {
@@ -71,7 +70,6 @@ private static void FrameworkUpdate(Framework framework)
         {
             SocialUpdater.UpdateSocial();
             PreviewUpdater.UpdatePreview();
-            PainterManager.ActionIds.Clear();
             if (Service.Config.TeachingMode && ActionUpdater.NextAction!= null)
             {
                 //Sprint action id is 3 however the id in hot bar is 4.

diff --git a/RotationSolver/Updaters/PreviewUpdater.cs b/RotationSolver/Updaters/PreviewUpdater.cs
@@ -57,9 +57,9 @@ private static void UpdateEntry()
     static readonly ByteColor _greenColor = new() { A = 255, R = 60, G = 120, B = 30 };
     private static unsafe void UpdateCastBar()
     {
-        var tardead = Service.Config.UseStopCasting && Svc.Objects.SearchById(Player.Object.CastTargetObjectId) is BattleChara b
-            && (b is PlayerCharacter ? b.HasStatus(false, StatusID.Raise) : b.CurrentHp == 0);
-
+        var tardead = Service.Config.UseStopCasting 
+            && Svc.Objects.SearchById(Player.Object.CastTargetObjectId) is BattleChara b
+            && b.IsNPCEnemy() && b.CurrentHp == 0;
 
         if (_tarStopCastDelay.Delay(tardead))
         {

diff --git a/RotationSolver/bin/Release/net7.0-windows/RotationSolver/latest.zip b/RotationSolver/bin/Release/net7.0-windows/RotationSolver/latest.zip
-Original file line number
+Diff line change
@@ Expand Up / @@ -147,6 +147,7 @@ @@
 ,
 ,
 ,
+,
 ,
 ,
 ,
@@ Expand Down Expand Up / @@ -241,8 +242,10 @@ @@
 ,
 ,
 ,
+,
 ,
 ,
+,
 ,
 ,
 ,
@@ Expand All / @@ -256,6 +259,7 @@ @@
 ,
 ,
 ,
+,
 ,
 ,
 ,
@@ Expand Down @@