Moves ExamineSystem to Shared & adds next step info to construction examine (#1567)
This commit is contained in:
@@ -1,14 +1,26 @@
|
||||
using Content.Shared.GameObjects.Components.Mobs;
|
||||
using Content.Shared.GameObjects.Components.Mobs;
|
||||
using JetBrains.Annotations;
|
||||
using Robust.Shared.GameObjects.Systems;
|
||||
using Robust.Shared.Interfaces.GameObjects;
|
||||
using Robust.Shared.Maths;
|
||||
using Robust.Shared.Utility;
|
||||
|
||||
namespace Content.Shared.GameObjects.EntitySystems
|
||||
{
|
||||
public interface IExamine
|
||||
{
|
||||
/// <summary>
|
||||
/// Returns a status examine value for components appended to the end of the description of the entity
|
||||
/// </summary>
|
||||
/// <param name="message">The message to append to which will be displayed.</param>
|
||||
/// <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 abstract class ExamineSystemShared : EntitySystem
|
||||
{
|
||||
public const float ExamineRange = 16f;
|
||||
public const float ExamineRangeSquared = ExamineRange * ExamineRange;
|
||||
protected const float ExamineDetailsRange = 3f;
|
||||
|
||||
[Pure]
|
||||
protected static bool CanExamine(IEntity examiner, IEntity examined)
|
||||
@@ -32,5 +44,44 @@ namespace Content.Shared.GameObjects.EntitySystems
|
||||
.InRangeUnobstructed(examiner.Transform.MapPosition, examined.Transform.MapPosition,
|
||||
ExamineRange, predicate: entity => entity == examiner || entity == examined, ignoreInsideBlocker:true);
|
||||
}
|
||||
|
||||
public static FormattedMessage GetExamineText(IEntity entity, IEntity examiner)
|
||||
{
|
||||
var message = new FormattedMessage();
|
||||
|
||||
var doNewline = false;
|
||||
|
||||
//Add an entity description if one is declared
|
||||
if (!string.IsNullOrEmpty(entity.Description))
|
||||
{
|
||||
message.AddText(entity.Description);
|
||||
doNewline = true;
|
||||
}
|
||||
|
||||
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);
|
||||
if (subMessage.Tags.Count == 0)
|
||||
continue;
|
||||
|
||||
if (doNewline)
|
||||
message.AddText("\n");
|
||||
|
||||
message.AddMessage(subMessage);
|
||||
doNewline = true;
|
||||
}
|
||||
|
||||
message.Pop();
|
||||
|
||||
return message;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,16 +1,22 @@
|
||||
using System;
|
||||
using Content.Shared.Construction;
|
||||
using JetBrains.Annotations;
|
||||
using Robust.Shared.GameObjects;
|
||||
using Robust.Shared.GameObjects.Systems;
|
||||
using Robust.Shared.IoC;
|
||||
using Robust.Shared.Localization;
|
||||
using Robust.Shared.Map;
|
||||
using Robust.Shared.Maths;
|
||||
using Robust.Shared.Serialization;
|
||||
using Robust.Shared.Utility;
|
||||
|
||||
namespace Content.Shared.GameObjects.EntitySystems
|
||||
{
|
||||
[UsedImplicitly]
|
||||
public class ConstructionSystem : EntitySystem
|
||||
public class SharedConstructionSystem : EntitySystem
|
||||
{
|
||||
#pragma warning disable 649
|
||||
[Dependency] private readonly ILocalizationManager _loc;
|
||||
#pragma warning restore 649
|
||||
/// <summary>
|
||||
/// Sent client -> server to to tell the server that we started building
|
||||
/// a structure-construction.
|
||||
@@ -75,5 +81,28 @@ namespace Content.Shared.GameObjects.EntitySystems
|
||||
GhostId = ghostId;
|
||||
}
|
||||
}
|
||||
|
||||
public void DoExamine(FormattedMessage message, ConstructionPrototype prototype, int stage, bool inDetailRange)
|
||||
{
|
||||
var stages = prototype.Stages;
|
||||
if (stage >= 0 && stage < stages.Count)
|
||||
{
|
||||
var curStage = stages[stage];
|
||||
if (curStage.Backward != null && curStage.Backward is ConstructionStepTool)
|
||||
{
|
||||
var backward = (ConstructionStepTool) curStage.Backward;
|
||||
message.AddText(_loc.GetString("To deconstruct: {0}x {1} Tool", backward.Amount, backward.ToolQuality));
|
||||
}
|
||||
if (curStage.Forward != null && curStage.Forward is ConstructionStepMaterial)
|
||||
{
|
||||
if (curStage.Backward != null)
|
||||
{
|
||||
message.AddText("\n");
|
||||
}
|
||||
var forward = (ConstructionStepMaterial) curStage.Forward;
|
||||
message.AddText(_loc.GetString("To construct: {0}x {1}", forward.Amount, forward.Material));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user