fix: boss identify.

ArchiDog1998 · Nov 5, 2023 · 3330ed9 · 3330ed9
1 parent 48b0430
commit 3330ed9
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/Resources/AnimationLockTime.json b/Resources/AnimationLockTime.json
@@ -623,5 +623,6 @@
   "33341": 0.1,
   "33708": 2.1,
   "33907": 2.1,
+  "34711": 0.1,
   "35663": 0.1
 }
diff --git a/Resources/HostileCastingArea.json b/Resources/HostileCastingArea.json
@@ -472,5 +472,7 @@
   7822,
   8915,
   13708,
-  12618
+  12618,
+  15728,
+  15743
 ]
diff --git a/Resources/RotationSolverRecord.json b/Resources/RotationSolverRecord.json
@@ -1,4 +1,4 @@
 {
-  "ClickingCount": 54988,
+  "ClickingCount": 56058,
   "SaidUsers": []
 }
diff --git a/RotationSolver.Basic/Data/ActionID.cs b/RotationSolver.Basic/Data/ActionID.cs
@@ -4556,7 +4556,7 @@ public enum ActionID : uint
 	/// <summary>
 	/// 
 	/// </summary>
-	PvP_RuinIII = 29664,
+	PvP_Ruin3 = 29664,
 
 	/// <summary>
 	/// 

diff --git a/RotationSolver.Basic/Helpers/ObjectHelper.cs b/RotationSolver.Basic/Helpers/ObjectHelper.cs
@@ -159,8 +159,12 @@ public static bool IsBoss(this BattleChara obj)
         if (obj == null) return false;
         if (obj.IsDummy() && !Service.Config.GetValue(Configuration.PluginConfigBool.ShowTargetTimeToKill)) return true;
 
-        return obj.GetTimeToKill(true) >= Service.Config.GetValue(Configuration.PluginConfigFloat.BossTimeToKill)
-            || obj.GetObjectNPC()?.Rank is 1 or 2 /*or 4*/ or 6;
+        //Icon
+        if (obj.GetObjectNPC()?.Rank is 1 or 2 /*or 4*/ or 6) return true;
+
+        //Fate
+        if (obj.FateId() != 0 && obj.GetTimeToKill(true) >= Service.Config.GetValue(Configuration.PluginConfigFloat.BossTimeToKill)) return true;
+        return false;
     }
 
     /// <summary>
-Original file line number
+Diff line change
@@ Expand Up / @@ -472,5 +472,7 @@ @@
 ,
 ,
 ,
+,
+,
     ]