fix: the mob targeting your campanion will be your hostile target.

ArchiDog1998 · Feb 25, 2023 · 3136a80 · 3136a80
1 parent a0ea03b
commit 3136a80
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 35 deletions.
diff --git a/RotationSolver/Commands/RSCommands_Actions.cs b/RotationSolver/Commands/RSCommands_Actions.cs
@@ -28,8 +28,8 @@ internal static unsafe void DoAnAction(bool isGCD)
             //Do Action
             var nextAction = ActionUpdater.NextAction;
 #if DEBUG
-            //if(nextAction is BaseAction acti)
-            //Service.ChatGui.Print($"Will Do {acti} {ActionUpdater.WeaponElapsed}");
+            if (nextAction is BaseAction acti)
+                Service.ChatGui.Print($"Will Do {acti} {ActionUpdater.WeaponElapsed}");
 #endif
             if (nextAction == null) return;
             if (!isGCD && nextAction is BaseAction act1 && act1.IsRealGCD) return;
@@ -40,7 +40,7 @@ internal static unsafe void DoAnAction(bool isGCD)
                 if (nextAction is BaseAction act)
                 {
 #if DEBUG
-                    //Service.ChatGui.Print($"{act}, {act.Target.Name}, {ActionUpdater.AbilityRemainCount}, {ActionUpdater.WeaponElapsed}");
+                    Service.ChatGui.Print($"{act}, {act.Target.Name}, {ActionUpdater.AbilityRemainCount}, {ActionUpdater.WeaponElapsed}");
 #endif
                     //Change Target
                     if ((Service.TargetManager.Target?.IsNPCEnemy() ?? true) 

diff --git a/RotationSolver/Configuration/PluginConfiguration.cs b/RotationSolver/Configuration/PluginConfiguration.cs
@@ -111,9 +111,8 @@ public class PluginConfiguration : IPluginConfiguration
     public float HostileDelayMin = 0;
     public float HostileDelayMax = 0;
 
-    public float HealDelayMin = 0.5f;
-    public float HealDelayMax = 1;
-
+    public float HealDelayMin = 0;
+    public float HealDelayMax = 0;
     public float StopCastingDelayMin = 0.5f;
     public float StopCastingDelayMax = 1;
 

diff --git a/RotationSolver/Rotations/Basic/BLU_Base.cs b/RotationSolver/Rotations/Basic/BLU_Base.cs
@@ -1,5 +1,6 @@
 using RotationSolver.Actions;
 using RotationSolver.Actions.BaseAction;
+using RotationSolver.Commands;
 using RotationSolver.Configuration.RotationConfig;
 using RotationSolver.Data;
 using RotationSolver.Helpers;
@@ -764,13 +765,22 @@ private protected override bool MoveForwardGCD(out IAction act)
 
     private protected override bool EmergencyGCD(out IAction act)
     {
+        if (BlueId == BLUID.Healer)
+        {
+            //有某些非常危险的状态。
+            if (RSCommands.SpecialType == SpecialCommandType.EsunaStanceNorth && TargetUpdater.WeakenPeople.Any() || TargetUpdater.DyingPeople.Any())
+            {
+                if (Exuviation.CanUse(out act, mustUse: true)) return true;
+            }
+        }
         if (AetherialMimicry.CanUse(out act)) return true;
         if (BasicInstinct.CanUse(out _))
         {
             if (MightyGuard.CanUse(out act)) return true;
             act = BasicInstinct;
             return true;
         }
+
         return base.EmergencyGCD(out act);
     }
 
@@ -813,8 +823,6 @@ private protected override bool HealAreaGCD(out IAction act)
     {
         if (BlueId == BLUID.Healer)
         {
-            //if (Exuviation.CanUse(out act, mustUse: true)) return true;
-
             if (AngelsSnack.CanUse(out act)) return true;
             if (Stotram.CanUse(out act)) return true;
             if (Stotram.CanUse(out act)) return true;

diff --git a/RotationSolver/Updaters/ActionUpdater.cs b/RotationSolver/Updaters/ActionUpdater.cs
@@ -180,7 +180,7 @@ internal unsafe static void DoAction()
             || Service.Conditions[ConditionFlag.BetweenAreas]
             || Service.Conditions[ConditionFlag.BetweenAreas51]
             || Service.Conditions[ConditionFlag.Mounted]
-            || Service.Conditions[ConditionFlag.SufferingStatusAffliction]
+            //|| Service.Conditions[ConditionFlag.SufferingStatusAffliction] //Because of BLU30!
             || Service.Conditions[ConditionFlag.SufferingStatusAffliction2]
             || Service.Conditions[ConditionFlag.RolePlaying]
             || Service.Conditions[ConditionFlag.InFlight]

diff --git a/RotationSolver/Updaters/MajorUpdater.cs b/RotationSolver/Updaters/MajorUpdater.cs
@@ -11,31 +11,31 @@ internal static class MajorUpdater
 {
     private static bool IsValid => Service.Conditions.Any() && Service.ClientState.LocalPlayer != null;
 
-//#if DEBUG
-//    private static readonly Dictionary<int, bool> _valus = new Dictionary<int, bool>();
-//#endif
+#if DEBUG
+    private static readonly Dictionary<int, bool> _valus = new Dictionary<int, bool>();
+#endif
     private static void FrameworkUpdate(Framework framework)
     {
         if (!IsValid) return;
 
-//#if DEBUG
-//        //Get changed condition.
-//        string[] enumNames = Enum.GetNames(typeof(Dalamud.Game.ClientState.Conditions.ConditionFlag));
-//        int[] indexs = (int[])Enum.GetValues(typeof(Dalamud.Game.ClientState.Conditions.ConditionFlag));
-//        if (enumNames.Length == indexs.Length)
-//        {
-//            for (int i = 0; i < enumNames.Length; i++)
-//            {
-//                string key = enumNames[i];
-//                bool newValue = Service.Conditions[(Dalamud.Game.ClientState.Conditions.ConditionFlag)indexs[i]];
-//                if (_valus.ContainsKey(i) && _valus[i] != newValue && indexs[i] != 48 && indexs[i] != 27)
-//                {
-//                    Service.ToastGui.ShowQuest(indexs[i].ToString() + " " + key + ": " + newValue.ToString());
-//                }
-//                _valus[i] = newValue;
-//            }
-//        }
-//#endif
+#if DEBUG
+        //Get changed condition.
+        string[] enumNames = Enum.GetNames(typeof(Dalamud.Game.ClientState.Conditions.ConditionFlag));
+        int[] indexs = (int[])Enum.GetValues(typeof(Dalamud.Game.ClientState.Conditions.ConditionFlag));
+        if (enumNames.Length == indexs.Length)
+        {
+            for (int i = 0; i < enumNames.Length; i++)
+            {
+                string key = enumNames[i];
+                bool newValue = Service.Conditions[(Dalamud.Game.ClientState.Conditions.ConditionFlag)indexs[i]];
+                if (_valus.ContainsKey(i) && _valus[i] != newValue && indexs[i] != 48 && indexs[i] != 27)
+                {
+                    Service.ToastGui.ShowQuest(indexs[i].ToString() + " " + key + ": " + newValue.ToString());
+                }
+                _valus[i] = newValue;
+            }
+        }
+#endif
 
         if (!Service.Configuration.UseWorkTask)
         {

diff --git a/RotationSolver/Updaters/SocialUpdater.cs b/RotationSolver/Updaters/SocialUpdater.cs
@@ -30,6 +30,7 @@ internal class SocialUpdater
 
     public static bool CanSaying { get; set; } = false;
 
+    static RandomDelay _canSocial = new RandomDelay(() => (3, 5));
     static bool CanSocial
     {
         get
@@ -81,12 +82,9 @@ internal static void Disable()
     internal static async void UpdateSocial()
     {
         if (ActionUpdater.InCombat) return;
-        if (CanSaying && CanSocial)
+        if (_canSocial.Delay(CanSaying && CanSocial))
         {
             CanSaying = false;
-
-            await Task.Delay(new Random().Next(3000, 5000));
-
 #if DEBUG
             Service.ChatGui.PrintError("Macro now.");
 #endif

diff --git a/RotationSolver/Updaters/TargetUpdater_Hostile.cs b/RotationSolver/Updaters/TargetUpdater_Hostile.cs
@@ -129,7 +129,8 @@ private static IEnumerable<BattleChara> GetHostileTargets(IEnumerable<BattleChar
         var hostiles = allattackableTargets.Where(t =>
         {
             if (ids.Contains(t.ObjectId)) return true;
-            if (t.TargetObject == Service.ClientState.LocalPlayer) return true;
+            if (t.TargetObject == Service.ClientState.LocalPlayer
+            || t.TargetObject?.OwnerId == Service.ClientState.LocalPlayer.ObjectId) return true;
 
             //Remove other's treasure.
             if (t.IsOthersPlayers()) return false;