Merge pull request #426 from FFXIV-CombatReborn/moredebug

Add targetQuestThings config and improve UI text labels
FFXIV-CombatReborn · Oct 5, 2024 · 6ac8746 · 6ac8746
2 parents ced10a8 + af145e6
commit 6ac8746
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/RotationSolver.Basic/Configuration/Configs.cs b/RotationSolver.Basic/Configuration/Configs.cs
@@ -267,9 +267,12 @@ public const string
 
     [ConditionBool, UI("Target quest priority.",
         Filter = TargetConfig, Section = 1)]
-
     private static readonly bool _targetQuestPriority = true;
 
+    [ConditionBool, UI("Block targetting quest mobs belonging to other players (Broken).",
+        Filter = TargetConfig, Section = 1)]
+    private static readonly bool targetQuestThings = true;
+
     [ConditionBool, UI("Ignore target dummies",
                Filter = TargetConfig, Section = 1)]
     private static readonly bool _disableTargetDummys = false;

diff --git a/RotationSolver.Basic/Helpers/ObjectHelper.cs b/RotationSolver.Basic/Helpers/ObjectHelper.cs
@@ -97,8 +97,8 @@ internal static bool IsAttackable(this IBattleChara battleChara)
             var tarFateId = battleChara.FateId();
             if (tarFateId != 0 && tarFateId != DataCenter.FateId) return false;
         }
-
-        if (battleChara.IsOthersPlayers()) return false;
+        
+        if (Service.Config.TargetQuestThings && battleChara.IsOthersPlayers()) return false;
 
         if (battleChara.IsTopPriorityHostile()) return true;
 

diff --git a/RotationSolver/UI/RotationConfigWindow.cs b/RotationSolver/UI/RotationConfigWindow.cs
@@ -2786,10 +2786,11 @@ private static unsafe void DrawTargetData()
             ImGui.Text($"InView: {Svc.GameGui.WorldToScreen(battleChara.Position, out _)}");
             ImGui.Text($"Name Id: {battleChara.NameId}");
             ImGui.Text($"Data Id: {battleChara.DataId}");
-            ImGui.Text($"EnemyPositional: {battleChara.FindEnemyPositional()}");
+            ImGui.Text($"Enemy Positional: {battleChara.FindEnemyPositional()}");
             ImGui.Text($"NameplateKind: {battleChara.GetNameplateKind()}");
             ImGui.Text($"BattleNPCSubKind: {battleChara.GetBattleNPCSubKind()}");
-            ImGui.Text($"IsTopPriorityHostile: {battleChara.IsTopPriorityHostile()}");
+            ImGui.Text($"Is Top Priority Hostile: {battleChara.IsTopPriorityHostile()}");
+            ImGui.Text($"Is Others Players: {battleChara.IsOthersPlayers()}");
             ImGui.Text($"Targetable: {battleChara.Struct()->Character.GameObject.TargetableStatus}");
 
             var npc = battleChara.GetObjectNPC();