fix: fixed target choice!

ArchiDog1998 · Nov 5, 2023 · f659191 · f659191
1 parent 589ee68
commit f659191
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/Resources/RotationSolverRecord.json b/Resources/RotationSolverRecord.json
@@ -1,4 +1,4 @@
 {
-  "ClickingCount": 56810,
+  "ClickingCount": 56826,
   "SaidUsers": []
 }
diff --git a/RotationSolver.Basic/Helpers/TargetFilter.cs b/RotationSolver.Basic/Helpers/TargetFilter.cs
@@ -78,9 +78,7 @@ internal static BattleChara DefaultFindHostile(IEnumerable<BattleChara> availabl
             availableCharas = DefaultTargetingType(availableCharas);
         }
 
-        float radius = availableCharas.FirstOrDefault()?.HitboxRadius ?? 0.5f;
-        return availableCharas.Where(c => c.HitboxRadius == radius)
-            .OrderBy(ObjectHelper.DistanceToPlayer).FirstOrDefault();
+        return availableCharas.FirstOrDefault();
     }
 
     internal static T FindTargetForMoving<T>(this IEnumerable<T> charas, bool mustUse) where T : GameObject
@@ -368,7 +366,7 @@ public static IEnumerable<T> GetObjectInRadius<T>(this IEnumerable<T> objects, f
 
     private static IEnumerable<BattleChara> DefaultTargetingType(IEnumerable<BattleChara> charas)
     {
-        if(DataCenter.Territory?.IsPvpZone ?? false)
+        if (DataCenter.Territory?.IsPvpZone ?? false)
         {
             return charas.OrderBy(p => p.CurrentHp);
         }

diff --git a/RotationSolver.Basic/Rotations/Basic/BRD_Base.cs b/RotationSolver.Basic/Rotations/Basic/BRD_Base.cs
@@ -375,7 +375,7 @@ protected static bool SongEndAfterGCD(uint gctCount = 0, float offset = 0)
     /// <summary>
     /// 
     /// </summary>
-    public static IBaseAction PvP_TheWardensPaean { get; } = new BaseAction(ActionID.PvP_TheWardensPaean)
+    public static IBaseAction PvP_TheWardensPaean { get; } = new BaseAction(ActionID.PvP_TheWardensPaean, ActionOption.Friendly)
     {
         StatusProvide = PvP_PitchPerfect.StatusNeed,
     };

diff --git a/RotationSolver/Commands/RSCommands_Actions.cs b/RotationSolver/Commands/RSCommands_Actions.cs
@@ -51,15 +51,15 @@ public static void DoAction()
             }
 
             if (nextAction is BaseAction act1 && act1.IsPvP && !act1.IsFriendly
-                && act1.Target is PlayerCharacter p)
+                && act1.Target is PlayerCharacter p/* && p != Player.Object*/)
             {
                 var hash = SocialUpdater.EncryptString(p);
 
                 //Don't attack authors and contributors!!
                 if (RotationUpdater.AuthorHashes.ContainsKey(hash)
                     || DownloadHelper.ContributorsHash.Contains(hash))
                 {
-                    Svc.Chat.PrintError("Please don't attack RS developers with RS!");
+                    Svc.Chat.PrintError($"Please don't attack RS developers with RS by {act1}!");
                     return;
                 }
             }