tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Include container ents in examine (#32267)

Browse Source 
Mainly for closets but if it's like a mouse in a bag they can see what's in the bag type deal.
This commit is contained in:
metalgearsloth
2024-09-23 14:55:30 +10:00
committed by GitHub
parent dd7884ed40
commit b2cb813f54
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Content.Client/Verbs/VerbSystem.cs
View File

@@ -13,6 +13,7 @@ using Robust.Client.GameObjects;
using Robust.Client.Graphics; using Robust.Client.Graphics;
using Robust.Client.Player; using Robust.Client.Player;
using Robust.Client.State; using Robust.Client.State;
using Robust.Shared.Containers;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Utility; using Robust.Shared.Utility;
@@ -28,6 +29,7 @@ namespace Content.Client.Verbs
[Dependency] private readonly IStateManager _stateManager = default!; [Dependency] private readonly IStateManager _stateManager = default!;
[Dependency] private readonly IEyeManager _eyeManager = default!; [Dependency] private readonly IEyeManager _eyeManager = default!;
[Dependency] private readonly IPlayerManager _playerManager = default!; [Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private readonly SharedContainerSystem _containers = default!;
/// <summary> /// <summary>
/// When a user right clicks somewhere, how large is the box we use to get entities for the context menu? /// When a user right clicks somewhere, how large is the box we use to get entities for the context menu?
@@ -81,12 +83,11 @@ namespace Content.Client.Verbs
// Get entities // Get entities
_entities.Clear(); _entities.Clear();
var entitiesUnderMouse = _tree.QueryAabb(targetPos.MapId, Box2.CenteredAround(targetPos.Position, new Vector2(EntityMenuLookupSize, EntityMenuLookupSize))); var entitiesUnderMouse = _tree.QueryAabb(targetPos.MapId, Box2.CenteredAround(targetPos.Position, new Vector2(EntityMenuLookupSize, EntityMenuLookupSize)));
bool Predicate(EntityUid e) => e == player;
// Do we have to do FoV checks? // Do we have to do FoV checks?
if ((visibility & MenuVisibility.NoFov) == 0) if ((visibility & MenuVisibility.NoFov) == 0)
{ {
bool Predicate(EntityUid e) => e == player;
TryComp(player.Value, out ExaminerComponent? examiner); TryComp(player.Value, out ExaminerComponent? examiner);
foreach (var ent in entitiesUnderMouse) foreach (var ent in entitiesUnderMouse)
@@ -103,6 +104,21 @@ namespace Content.Client.Verbs
} }
} }
// If we're in a container list all other entities in it.
if (_containers.TryGetContainingContainer(player.Value, out var container))
{
foreach (var ent in container.ContainedEntities)
{
if (ent == player.Value || _entities.Contains(ent))
continue;
if ((visibility & MenuVisibility.NoFov) == 0x0 || _examine.CanExamine(player.Value, targetPos, examined: ent))
{
_entities.Add(ent);
}
}
}
if (_entities.Count == 0) if (_entities.Count == 0)
return false; return false;