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

Fix being able to do most verbs from within a container (#1613)

Browse Source 
* Fix being able to do most verbs from within a container

* Fix missing container check when using global verbs
This commit is contained in:
DrSmugleaf
2020-08-15 20:38:37 +02:00
committed by GitHub
parent f37d6343ce
commit add4986001
7 changed files with 77 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Content.Shared/GameObjects/EntitySystems/ExamineSystemShared.cs
View File

@@ -1,5 +1,7 @@
using Content.Shared.GameObjects.Components.Mobs;
using System;
using Content.Shared.GameObjects.Components.Mobs;
using JetBrains.Annotations;
using Robust.Shared.Containers;
using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Maths;
@@ -22,6 +24,15 @@ namespace Content.Shared.GameObjects.EntitySystems
public const float ExamineRangeSquared = ExamineRange * ExamineRange;
protected const float ExamineDetailsRange = 3f;
private static bool IsInDetailsRange(IEntity examiner, IEntity entity)
{
return Get<SharedInteractionSystem>()
.InRangeUnobstructed(examiner.Transform.MapPosition, entity.Transform.MapPosition,
ExamineDetailsRange, predicate: entity0 => entity0 == examiner || entity0 == entity,
ignoreInsideBlocker: true) &&
examiner.IsInSameOrNoContainer(entity);
}
[Pure]
protected static bool CanExamine(IEntity examiner, IEntity examined)
{
@@ -40,9 +51,16 @@ namespace Content.Shared.GameObjects.EntitySystems
return false;
}
Func<IEntity, bool> predicate = entity => entity == examiner || entity == examined;
if (ContainerHelpers.TryGetContainer(examiner, out var container))
{
predicate += entity => entity == container.Owner;
}
return Get<SharedInteractionSystem>()
.InRangeUnobstructed(examiner.Transform.MapPosition, examined.Transform.MapPosition,
ExamineRange, predicate: entity => entity == examiner || entity == examined, ignoreInsideBlocker:true);
ExamineRange, predicate: predicate, ignoreInsideBlocker:true);
}
public static FormattedMessage GetExamineText(IEntity entity, IEntity examiner)
@@ -60,15 +78,11 @@ namespace Content.Shared.GameObjects.EntitySystems
message.PushColor(Color.DarkGray);
var inDetailsRange = Get<SharedInteractionSystem>()
.InRangeUnobstructed(examiner.Transform.MapPosition, entity.Transform.MapPosition,
ExamineDetailsRange, predicate: entity0 => entity0 == examiner || entity0 == entity, ignoreInsideBlocker: true);
//Add component statuses from components that report one
foreach (var examineComponent in entity.GetAllComponents<IExamine>())
{
var subMessage = new FormattedMessage();
examineComponent.Examine(subMessage, inDetailsRange);
examineComponent.Examine(subMessage, IsInDetailsRange(examiner, entity));
if (subMessage.Tags.Count == 0)
continue;