fix: add Isdead to check is plaer dead.

ArchiDog1998 · Feb 17, 2023 · f4f2e59 · f4f2e59
1 parent 5b23bbb
commit f4f2e59
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/RotationSolver/Helpers/TargetFilter.cs b/RotationSolver/Helpers/TargetFilter.cs
@@ -239,11 +239,11 @@ internal static BattleChara GetDeathPeople(IEnumerable<BattleChara> deathAll, IE
 
     internal unsafe static IEnumerable<BattleChara> GetDeath(this IEnumerable<BattleChara> charas) => charas.Where(item =>
         {
-            if (!item.IsTargetable()) return false;
-
-            //如果还有血，就算了。
+            if (!item.IsDead) return false;
             if (item.CurrentHp != 0) return false;
 
+            if (!item.IsTargetable()) return false;
+
             //如果已经有复活的Buff了，那就算了。
             if (item.HasStatus(false, StatusID.Raise)) return false;
 

diff --git a/RotationSolver/Rotations/RangedMagicial/BLU/BLU_25.cs b/RotationSolver/Rotations/RangedMagicial/BLU/BLU_25.cs
@@ -26,7 +26,7 @@ private protected override bool GeneralGCD(out IAction act)
 
         if (TripleTrident.OnSlot && TripleTrident.RightType && TripleTrident.WillHaveOneChargeGCD(OnSlotCount(Whistle, Tingle), 0))
         {
-            if (Whistle.CanUse(out act)) return true;
+            if ((TripleTrident.CanUse(out _, mustUse: true) || !HasHostilesInRange) &&Whistle.CanUse(out act)) return true;
 
             if (!Player.HasStatus(true, StatusID.Tingling)
                 && Tingle.CanUse(out act, mustUse: true)) return true;

diff --git a/RotationSolver/Updaters/TargetUpdater_Friends.cs b/RotationSolver/Updaters/TargetUpdater_Friends.cs
@@ -100,7 +100,6 @@ private static IEnumerable<BattleChara> GetPartyMembers(IEnumerable<BattleChara>
 
     private unsafe static void UpdateFriends(IEnumerable<BattleChara> allTargets)
     {
-        #region Friend
         PartyMembers = GetPartyMembers(allTargets);
         AllianceMembers = allTargets.OfType<PlayerCharacter>();
 
@@ -118,11 +117,9 @@ private unsafe static void UpdateFriends(IEnumerable<BattleChara> allTargets)
         DeathPeopleParty.Delay(deathParty);
 
         WeakenPeople.Delay(PartyMembers.Where(p => p.StatusList.Any(StatusHelper.CanDispel)));
-
         DyingPeople.Delay(WeakenPeople.Where(p => p.StatusList.Any(StatusHelper.IsDangerous)));
 
         SayHelloToAuthor();
-        #endregion
 
         PartyMembersHP = PartyMembers.Select(ObjectHelper.GetHealthRatio).Where(r => r > 0);
         if (PartyMembersHP.Any())