Merge pull request #418 from FFXIV-CombatReborn/targetting-update

Add new enum value and update targeting conditions
FFXIV-CombatReborn · Sep 28, 2024 · 4aac445 · 4aac445
2 parents 52acb5a + 06531ef
commit 4aac445
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/RotationSolver.Basic/Data/TargetHostileType.cs b/RotationSolver.Basic/Data/TargetHostileType.cs
@@ -34,10 +34,16 @@ public enum TargetHostileType : byte
     /// </summary>
     [Description("Only attack targets in your parties enemy list")]
     TargetIsInEnemiesList,
-
+    
     /// <summary>
     /// All targets when solo, or only attack targets in your parties enemy list.
     /// </summary>
     [Description("All targets when solo, or only attack targets in your parties enemy list")]
     AllTargetsWhenSoloTargetIsInEnemiesList,
+
+    /// <summary>
+    /// All targets when solo in duty, or only attack targets in your parties enemy list.
+    /// </summary>
+    [Description("All targets when solo in duty, or only attack targets in your parties enemy list")]
+    AllTargetsWhenSoloInDutyTargetIsInEnemiesList,
 }
diff --git a/RotationSolver.Basic/Helpers/ObjectHelper.cs b/RotationSolver.Basic/Helpers/ObjectHelper.cs
@@ -113,10 +113,11 @@ internal static bool IsAttackable(this IBattleChara battleChara)
             TargetHostileType.AllTargetsCanAttack => true,
             TargetHostileType.TargetsHaveTarget => battleChara.TargetObject is IBattleChara,
             TargetHostileType.AllTargetsWhenSolo => DataCenter.PartyMembers.Length < 2 || battleChara.TargetObject is IBattleChara,
-            TargetHostileType.AllTargetsWhenSoloInDuty => (DataCenter.PartyMembers.Length < 2 && Svc.Condition[ConditionFlag.BoundByDuty])
+            TargetHostileType.AllTargetsWhenSoloInDuty => (DataCenter.PartyMembers.Length < 2 && (Svc.Condition[ConditionFlag.BoundByDuty] || Svc.Condition[ConditionFlag.BoundByDuty56]))
                 || battleChara.TargetObject is IBattleChara,
             TargetHostileType.TargetIsInEnemiesList => battleChara.TargetObject is IBattleChara target && target.IsInEnemiesList(),
-            TargetHostileType.AllTargetsWhenSoloTargetIsInEnemiesList => DataCenter.PartyMembers.Length < 2 || battleChara.TargetObject is IBattleChara target && target.IsInEnemiesList(),
+            TargetHostileType.AllTargetsWhenSoloTargetIsInEnemiesList => (DataCenter.PartyMembers.Length < 2 && (Svc.Condition[ConditionFlag.BoundByDuty] || Svc.Condition[ConditionFlag.BoundByDuty56])) || battleChara.TargetObject is IBattleChara target && target.IsInEnemiesList(),
+            TargetHostileType.AllTargetsWhenSoloInDutyTargetIsInEnemiesList => DataCenter.PartyMembers.Length < 2 || battleChara.TargetObject is IBattleChara target && target.IsInEnemiesList(),
             _ => true,
         };
     }