-
Notifications
You must be signed in to change notification settings - Fork 3.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
NPC steering tweaks #26351
Merged
metalgearsloth
merged 1 commit into
space-wizards:master
from
metalgearsloth:2024-03-23-steering
Mar 23, 2024
Merged
NPC steering tweaks #26351
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -58,7 +58,7 @@ private bool IsFreeSpace( | |
|
||
// TODO: Ideally for "FreeSpace" we check all entities on the tile and build flags dynamically (pathfinder refactor in future). | ||
var ents = _entSetPool.Get(); | ||
_lookup.GetLocalEntitiesIntersecting(node.GraphUid, node.ChunkOrigin, ents, flags: LookupFlags.Static); | ||
_lookup.GetLocalEntitiesIntersecting(node.GraphUid, node.Box.Enlarged(-0.04f), ents, flags: LookupFlags.Static); | ||
var result = true; | ||
|
||
if (ents.Count > 0) | ||
|
@@ -158,42 +158,42 @@ private bool TrySeek( | |
} | ||
} | ||
|
||
// Check if mapids match. | ||
var targetMap = targetCoordinates.ToMap(EntityManager, _transform); | ||
var ourMap = ourCoordinates.ToMap(EntityManager, _transform); | ||
|
||
if (targetMap.MapId != ourMap.MapId) | ||
{ | ||
steering.Status = SteeringStatus.NoPath; | ||
return false; | ||
} | ||
|
||
var direction = targetMap.Position - ourMap.Position; | ||
|
||
// Need to be pretty close if it's just a node to make sure LOS for door bashes or the likes. | ||
float arrivalDistance; | ||
bool arrived; | ||
|
||
if (targetCoordinates.Equals(steering.Coordinates)) | ||
{ | ||
// What's our tolerance for arrival. | ||
// If it's a pathfinding node it might be different to the destination. | ||
arrivalDistance = steering.Range; | ||
arrived = direction.Length() <= steering.Range; | ||
} | ||
// If next node is a free tile then get within its bounds. | ||
// This is to avoid popping it too early | ||
else if (steering.CurrentPath.TryPeek(out var node) && IsFreeSpace(uid, steering, node)) | ||
{ | ||
arrivalDistance = MathF.Max(0.05f, MathF.Min(node.Box.Width / 2f, node.Box.Height / 2f) - 0.05f); | ||
arrived = node.Box.Contains(ourCoordinates.Position); | ||
} | ||
// Try getting into blocked range I guess? | ||
// TODO: Consider melee range or the likes. | ||
else | ||
{ | ||
arrivalDistance = SharedInteractionSystem.InteractionRange - 0.05f; | ||
arrived = direction.Length() <= SharedInteractionSystem.InteractionRange - 0.05f; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same here |
||
} | ||
|
||
// Check if mapids match. | ||
var targetMap = targetCoordinates.ToMap(EntityManager, _transform); | ||
var ourMap = ourCoordinates.ToMap(EntityManager, _transform); | ||
|
||
if (targetMap.MapId != ourMap.MapId) | ||
{ | ||
steering.Status = SteeringStatus.NoPath; | ||
return false; | ||
} | ||
|
||
var direction = targetMap.Position - ourMap.Position; | ||
|
||
// Are we in range | ||
if (direction.Length() <= arrivalDistance) | ||
if (arrived) | ||
{ | ||
// Node needs some kind of special handling like access or smashing. | ||
if (steering.CurrentPath.TryPeek(out var node) && !IsFreeSpace(uid, steering, node)) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.