Hs096/Questionable
1
0
Fork 0
forked from liza/Questionable
Code Pull Requests Activity

Combat: Pathfind to enemies outside of nameplate render range (for overworld enemies)

Browse Source
This commit is contained in:
Liza 2024-08-13 23:24:47 +02:00
parent 007a4a5a56
commit d8cf9616c0
Signed by: liza
GPG Key ID: 7199F8D727D55F67
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Questionable/Controller/CombatController.cs
View File

@ -169,10 +169,12 @@ internal sealed class CombatController : IDisposable
} }
} }
if (QuestWorkUtils.HasCompletionFlags(condition.CompletionQuestVariablesFlags) && _currentFight.Data.ElementId is QuestId questId) if (QuestWorkUtils.HasCompletionFlags(condition.CompletionQuestVariablesFlags) &&
_currentFight.Data.ElementId is QuestId questId)
{ {
var questWork = _questFunctions.GetQuestProgressInfo(questId); var questWork = _questFunctions.GetQuestProgressInfo(questId);
if (questWork != null && QuestWorkUtils.MatchesQuestWork(condition.CompletionQuestVariablesFlags, questWork)) if (questWork != null &&
QuestWorkUtils.MatchesQuestWork(condition.CompletionQuestVariablesFlags, questWork))
{ {
_logger.LogInformation("Complex combat condition fulfilled: QuestWork matches"); _logger.LogInformation("Complex combat condition fulfilled: QuestWork matches");
_currentFight.Data.CompletedComplexDatas.Add(i); _currentFight.Data.CompletedComplexDatas.Add(i);
@ -248,10 +250,15 @@ internal sealed class CombatController : IDisposable
if (battleNpc.StatusFlags.HasFlag(StatusFlags.InCombat)) if (battleNpc.StatusFlags.HasFlag(StatusFlags.InCombat))
return 20; return 20;
} }
else else if (enemyData != null)
{ {
if (gameObjectStruct->NamePlateIconId != 0) if (gameObjectStruct->NamePlateIconId != 0)
return 30; return 30;
// for enemies that are very far away, their nameplate doesn't render but they're in the object table
if (_currentFight?.Data.SpawnType == EEnemySpawnType.OverworldEnemies &&
Vector3.Distance(_clientState.LocalPlayer?.Position ?? Vector3.Zero, battleNpc.Position) > 50)
return 25;
} }
} }