From: Liza Carvelli <liza@carvel.li>
Date: Sun, 13 Apr 2025 06:44:56 +0000 (+0200)
Subject: Ignore far-away enemies in combat when they don't have a nameplate icon + are only... 
X-Git-Tag: v5.7~7
X-Git-Url: https://git.jacobcasper.com/?a=commitdiff_plain;h=5e5fb07de48d4353a7eb7b2d6545b47175f15b6c;p=Questionable.git

Ignore far-away enemies in combat when they don't have a nameplate icon + are only spawned after an interaction
---

diff --git a/Questionable/Controller/CombatController.cs b/Questionable/Controller/CombatController.cs
index 9306788d..a00bafcb 100644
--- a/Questionable/Controller/CombatController.cs
+++ b/Questionable/Controller/CombatController.cs
@@ -308,9 +308,16 @@ internal sealed class CombatController : IDisposable
             if (gameObjectStruct->FateId != 0)
                 return (null, "FATE mob");
 
-            bool expectQuestMarker =
-                Vector3.Distance(_clientState.LocalPlayer?.Position ?? Vector3.Zero, battleNpc.Position) <
-                MaxNameplateRange;
+            var ownPosition = _clientState.LocalPlayer?.Position ?? Vector3.Zero;
+            bool expectQuestMarker;
+            if (_currentFight.Data.SpawnType == EEnemySpawnType.FinishCombatIfAny)
+                expectQuestMarker = false;
+            else if (_currentFight.Data.SpawnType == EEnemySpawnType.OverworldEnemies &&
+                     Vector3.Distance(ownPosition, battleNpc.Position) >= MaxNameplateRange)
+                expectQuestMarker = false;
+            else
+                expectQuestMarker = true;
+
             if (complexCombatData.Count > 0)
             {
                 for (int i = 0; i < complexCombatData.Count; ++i)