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

Fix targeting logic picking the furthest away enemy in some cases

Browse Source
This commit is contained in:
Liza 2024-07-27 23:10:08 +02:00
parent 377b5501b6
commit 1e1efcd35f
Signed by: liza
GPG Key ID: 7199F8D727D55F67
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Questionable/Controller/CombatController.cs
View File

@ -21,6 +21,7 @@ namespace Questionable.Controller;
internal sealed class CombatController : IDisposable internal sealed class CombatController : IDisposable
{ {
private readonly List<ICombatModule> _combatModules; private readonly List<ICombatModule> _combatModules;
private readonly MovementController _movementController;
private readonly ITargetManager _targetManager; private readonly ITargetManager _targetManager;
private readonly IObjectTable _objectTable; private readonly IObjectTable _objectTable;
private readonly ICondition _condition; private readonly ICondition _condition;
@ -30,11 +31,18 @@ internal sealed class CombatController : IDisposable
private CurrentFight? _currentFight; private CurrentFight? _currentFight;
public CombatController(IEnumerable<ICombatModule> combatModules, ITargetManager targetManager, public CombatController(
IObjectTable objectTable, ICondition condition, IClientState clientState, GameFunctions gameFunctions, IEnumerable<ICombatModule> combatModules,
MovementController movementController,
ITargetManager targetManager,
IObjectTable objectTable,
ICondition condition,
IClientState clientState,
GameFunctions gameFunctions,
ILogger<CombatController> logger) ILogger<CombatController> logger)
{ {
_combatModules = combatModules.ToList(); _combatModules = combatModules.ToList();
_movementController = movementController;
_targetManager = targetManager; _targetManager = targetManager;
_objectTable = objectTable; _objectTable = objectTable;
_condition = condition; _condition = condition;
@ -71,7 +79,7 @@ internal sealed class CombatController : IDisposable
/// <returns>true if still in combat, false otherwise</returns> /// <returns>true if still in combat, false otherwise</returns>
public bool Update() public bool Update()
{ {
if (_currentFight == null) if (_currentFight == null || _movementController.IsPathfinding || _movementController.IsPathRunning)
return false; return false;
var target = _targetManager.Target; var target = _targetManager.Target;
@ -104,7 +112,7 @@ internal sealed class CombatController : IDisposable
else else
{ {
var nextTarget = FindNextTarget(); var nextTarget = FindNextTarget();
if (nextTarget != null) if (nextTarget is { IsDead: false })
{ {
_logger.LogInformation("Setting next target to {TargetName} ({TargetId:X8})", _logger.LogInformation("Setting next target to {TargetName} ({TargetId:X8})",
nextTarget.Name.ToString(), nextTarget.GameObjectId); nextTarget.Name.ToString(), nextTarget.GameObjectId);
@ -163,10 +171,15 @@ internal sealed class CombatController : IDisposable
} }
} }
return _objectTable.Select(x => (GameObject: x, Priority: GetKillPriority(x))) return _objectTable.Select(x => new
{
GameObject = x,
Priority = GetKillPriority(x),
Distance = Vector3.Distance(x.Position, _clientState.LocalPlayer!.Position),
})
.Where(x => x.Priority > 0) .Where(x => x.Priority > 0)
.OrderByDescending(x => x.Priority) .OrderByDescending(x => x.Priority)
.ThenByDescending(x => Vector3.Distance(x.GameObject.Position, _clientState.LocalPlayer!.Position)) .ThenBy(x => x.Distance)
.Select(x => x.GameObject) .Select(x => x.GameObject)
.FirstOrDefault(); .FirstOrDefault();
} }

1
Questionable/Controller/MovementController.cs
View File

@ -313,6 +313,7 @@ internal sealed class MovementController : IDisposable
{ {
_navmeshIpc.Stop(); _navmeshIpc.Stop();
ResetPathfinding(); ResetPathfinding();
Destination = null;
if (InputManager.IsAutoRunning()) if (InputManager.IsAutoRunning())
{ {