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

IExamine can now limit certain details behind a 'details' range check. (#1039)

Browse Source 
* IExamine can now limit certain details behind a 'details' range check.

* Comic's Review fixes.
- colour -> color. My ancestors are saddened by this.
- Can see wire panel opened/closed at any distance again.
This commit is contained in:
Remie Richards
2020-05-31 19:29:06 +01:00
committed by GitHub
parent a9a43f25ce
commit 2e38c194f7
15 changed files with 73 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Content.Server/GameObjects/EntitySystems/Click/ExamineSystem.cs
View File

@@ -1,7 +1,9 @@
using Content.Shared.GameObjects.EntitySystemMessages;
using Content.Server.Utility;
using Content.Shared.GameObjects.EntitySystemMessages;
using Content.Shared.GameObjects.EntitySystems;
using Robust.Server.Interfaces.Player;
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Maths;
@@ -12,9 +14,10 @@ namespace Content.Server.GameObjects.EntitySystems
public interface IExamine
{
/// <summary>
/// Returns an status examine value for components appended to the end of the description of the entity
/// Returns a status examine value for components appended to the end of the description of the entity
/// </summary>
void Examine(FormattedMessage message);
/// <param name="inDetailsRange">Whether the examiner is within the 'Details' range, allowing you to show information logically only availabe when close to the examined entity.</param>
void Examine(FormattedMessage message, bool inDetailsRange);
}
public class ExamineSystem : ExamineSystemShared
@@ -25,6 +28,8 @@ namespace Content.Server.GameObjects.EntitySystems
private static readonly FormattedMessage _entityNotFoundMessage;
private const float ExamineDetailsRange = 3f;
static ExamineSystem()
{
_entityNotFoundMessage = new FormattedMessage();
@@ -40,7 +45,7 @@ namespace Content.Server.GameObjects.EntitySystems
IoCManager.InjectDependencies(this);
}
private static FormattedMessage GetExamineText(IEntity entity)
private static FormattedMessage GetExamineText(IEntity entity, IEntity examiner)
{
var message = new FormattedMessage();
@@ -55,11 +60,15 @@ namespace Content.Server.GameObjects.EntitySystems
message.PushColor(Color.DarkGray);
var inDetailsRange = Get<SharedInteractionSystem>()
.InRangeUnobstructed(examiner.Transform.MapPosition, entity.Transform.MapPosition,
ExamineDetailsRange, predicate: entity0 => entity0 == examiner || entity0 == entity, insideBlockerValid: true);
//Add component statuses from components that report one
foreach (var examineComponents in entity.GetAllComponents<IExamine>())
foreach (var examineComponent in entity.GetAllComponents<IExamine>())
{
var subMessage = new FormattedMessage();
examineComponents.Examine(subMessage);
examineComponent.Examine(subMessage, inDetailsRange);
if (subMessage.Tags.Count == 0)
continue;
@@ -91,7 +100,7 @@ namespace Content.Server.GameObjects.EntitySystems
return;
}
var text = GetExamineText(entity);
var text = GetExamineText(entity, player.AttachedEntity);
RaiseNetworkEvent(new ExamineSystemMessages.ExamineInfoResponseMessage(request.EntityUid, text), channel);
}
}