From d8c329a37bd2952878987ebd6ba0308240227ac0 Mon Sep 17 00:00:00 2001 From: Taurenkey Date: Mon, 25 Nov 2024 08:59:03 +0000 Subject: [PATCH] Autorot update --- XIVSlothCombo/AutoRotation/AutoRotationController.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/XIVSlothCombo/AutoRotation/AutoRotationController.cs b/XIVSlothCombo/AutoRotation/AutoRotationController.cs index bec5088e5..03c75f4f0 100644 --- a/XIVSlothCombo/AutoRotation/AutoRotationController.cs +++ b/XIVSlothCombo/AutoRotation/AutoRotationController.cs @@ -485,12 +485,12 @@ public static uint InvokeCombo(CustomComboPreset preset, Presets.PresetAttribute public class DPSTargeting { - public static System.Collections.Generic.IEnumerable BaseSelection => Svc.Objects.Any(x => x is IBattleChara chara && chara.IsHostile() && CustomComboFunctions.IsInRange(chara) && !chara.IsDead && CustomComboFunctions.IsInLineOfSight(chara) && IsPriority(chara)) ? Svc.Objects.Where(x => x is IBattleChara chara && chara.IsHostile() && CustomComboFunctions.IsInRange(chara) && !chara.IsDead && chara.IsTargetable && CustomComboFunctions.IsInLineOfSight(chara) && IsPriority(chara)) : - Svc.Objects.Where(x => x is IBattleChara chara && chara.IsHostile() && CustomComboFunctions.IsInRange(chara) && !chara.IsDead && chara.IsTargetable && CustomComboFunctions.IsInLineOfSight(chara)); + public static System.Collections.Generic.IEnumerable BaseSelection => Svc.Objects.Any(x => x is IBattleChara chara && chara.IsHostile() && CustomComboFunctions.IsInRange(chara) && !chara.IsDead && chara.IsTargetable && CustomComboFunctions.IsInLineOfSight(chara) && IsPriority(chara)) ? + Svc.Objects.Where(x => x is IBattleChara chara && chara.IsHostile() && CustomComboFunctions.IsInRange(chara) && !chara.IsDead && chara.IsTargetable && CustomComboFunctions.IsInLineOfSight(chara) && IsPriority(chara)) : + Svc.Objects.Where(x => x is IBattleChara chara && chara.IsHostile() && CustomComboFunctions.IsInRange(chara) && !chara.IsDead && chara.IsTargetable && CustomComboFunctions.IsInLineOfSight(chara)); private static bool IsPriority(IGameObject x) { - if (!x.IsTargetable() || !x.IsHostile()) return false; bool isFate = Service.Configuration.RotationConfig.DPSSettings.FATEPriority && x.Struct()->FateId != 0 && CustomComboFunctions.InFATE(); bool isQuest = Service.Configuration.RotationConfig.DPSSettings.QuestPriority && CustomComboFunctions.IsQuestMob(x); if (Player.Object.GetRole() is CombatRole.Tank && x.TargetObjectId != Player.Object.GameObjectId)