Station AI (#30944)
* Station AI overlay * implement * Bunch of ports * Fix a heap of bugs and basic scouting * helldivers * Shuffle interactions a bit * navmap stuff * Revert "navmap stuff" This reverts commit d1f89dd4be83233e22cf5dd062b2581f3c6da062. * AI wires implemented * Fix examines * Optimise the overlay significantly * Back to old static * BUI radial working * lots of work * Saving work * thanks fork * alright * pc * AI upload console * AI upload * stuff * Fix copy-paste shitcode * AI actions * navmap work * Fixes * first impressions * a * reh * Revert "navmap work" This reverts commit 6f63fea6e9245e189f368f97be3e32e9b210580e. # Conflicts: # Content.Client/Silicons/StationAi/StationAiOverlay.cs * OD * radar * weh * Fix examines * scoop mine eyes * fixes * reh * Optimise * Final round of optimisations * Fixes * fixes
This commit is contained in:
@@ -117,12 +117,25 @@ namespace Content.Shared.Examine
|
||||
if (EntityManager.GetComponent<TransformComponent>(examiner).MapID != target.MapId)
|
||||
return false;
|
||||
|
||||
return InRangeUnOccluded(
|
||||
_transform.GetMapCoordinates(examiner),
|
||||
target,
|
||||
GetExaminerRange(examiner),
|
||||
predicate: predicate,
|
||||
ignoreInsideBlocker: true);
|
||||
// Do target InRangeUnoccluded which has different checks.
|
||||
if (examined != null)
|
||||
{
|
||||
return InRangeUnOccluded(
|
||||
examiner,
|
||||
examined.Value,
|
||||
GetExaminerRange(examiner),
|
||||
predicate: predicate,
|
||||
ignoreInsideBlocker: true);
|
||||
}
|
||||
else
|
||||
{
|
||||
return InRangeUnOccluded(
|
||||
examiner,
|
||||
target,
|
||||
GetExaminerRange(examiner),
|
||||
predicate: predicate,
|
||||
ignoreInsideBlocker: true);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -214,6 +227,14 @@ namespace Content.Shared.Examine
|
||||
|
||||
public bool InRangeUnOccluded(EntityUid origin, EntityUid other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true)
|
||||
{
|
||||
var ev = new InRangeOverrideEvent(origin, other);
|
||||
RaiseLocalEvent(origin, ref ev);
|
||||
|
||||
if (ev.Handled)
|
||||
{
|
||||
return ev.InRange;
|
||||
}
|
||||
|
||||
var originPos = _transform.GetMapCoordinates(origin);
|
||||
var otherPos = _transform.GetMapCoordinates(other);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user