Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

ECS-ify Construction[Ghost]Component IExamine.

Browse Source
This commit is contained in:
Pieter-Jan Briers
2021-09-15 16:36:43 +02:00
parent 9733d35de7
commit ce6e37bdd8
12 changed files with 121 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Shared/Construction/Steps/ArbitraryInsertConstructionGraphStep.cs
View File

@@ -1,4 +1,5 @@
using Robust.Shared.Localization;
using Content.Shared.Examine;
using Robust.Shared.Localization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Utility;
@@ -10,10 +11,12 @@ namespace Content.Shared.Construction.Steps
[DataField("icon")] public SpriteSpecifier Icon { get; private set; } = SpriteSpecifier.Invalid;
public override void DoExamine(FormattedMessage message, bool inDetailsRange)
public override void DoExamine(ExaminedEvent examinedEvent)
{
if (string.IsNullOrEmpty(Name)) return;
message.AddMarkup(Loc.GetString("construction-insert-arbitrary-entity", ("stepName", Name)));
if (string.IsNullOrEmpty(Name))
return;
examinedEvent.Message.AddMarkup(Loc.GetString("construction-insert-arbitrary-entity", ("stepName", Name)));
}
}
}

8
Content.Shared/Construction/Steps/ComponentConstructionGraphStep.cs
View File

@@ -1,7 +1,7 @@
using Robust.Shared.GameObjects;
using Content.Shared.Examine;
using Robust.Shared.GameObjects;
using Robust.Shared.Localization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Utility;
namespace Content.Shared.Construction.Steps
{
@@ -21,9 +21,9 @@ namespace Content.Shared.Construction.Steps
return false;
}
public override void DoExamine(FormattedMessage message, bool inDetailsRange)
public override void DoExamine(ExaminedEvent examinedEvent)
{
message.AddMarkup(string.IsNullOrEmpty(Name)
examinedEvent.Message.AddMarkup(string.IsNullOrEmpty(Name)
? Loc.GetString(
"construction-insert-entity-with-component",
("componentName", Component))// Terrible.

4
Content.Shared/Construction/Steps/ConstructionGraphStep.cs
View File

@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
using Content.Shared.Examine;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Utility;
namespace Content.Shared.Construction.Steps
{
@@ -15,6 +15,6 @@ namespace Content.Shared.Construction.Steps
public IReadOnlyList<IGraphAction> Completed => _completed;
public abstract void DoExamine(FormattedMessage message, bool inDetailsRange);
public abstract void DoExamine(ExaminedEvent examinedEvent);
}
}

6
Content.Shared/Construction/Steps/MaterialConstructionGraphStep.cs
View File

@@ -1,11 +1,11 @@
using System.Diagnostics.CodeAnalysis;
using Content.Shared.Examine;
using Content.Shared.Stacks;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Utility;
namespace Content.Shared.Construction.Steps
{
@@ -21,9 +21,9 @@ namespace Content.Shared.Construction.Steps
public StackPrototype MaterialPrototype =>
IoCManager.Resolve<IPrototypeManager>().Index<StackPrototype>(MaterialPrototypeId);
public override void DoExamine(FormattedMessage message, bool inDetailsRange)
public override void DoExamine(ExaminedEvent examinedEvent)
{
message.AddMarkup(Loc.GetString("construction-insert-material-entity", ("amount", Amount), ("materialName", MaterialPrototype.Name)));
examinedEvent.Message.AddMarkup(Loc.GetString("construction-insert-material-entity", ("amount", Amount), ("materialName", MaterialPrototype.Name)));
}
public override bool EntityValid(IEntity entity)

4
Content.Shared/Construction/Steps/NestedConstructionGraphStep.cs
View File

@@ -1,9 +1,9 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
using Content.Shared.Examine;
using Robust.Shared.Serialization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Utility;
namespace Content.Shared.Construction.Steps
{
@@ -20,7 +20,7 @@ namespace Content.Shared.Construction.Steps
}
}
public override void DoExamine(FormattedMessage message, bool inDetailsRange)
public override void DoExamine(ExaminedEvent examinedEvent)
{
}
}

8
Content.Shared/Construction/Steps/PrototypeConstructionGraphStep.cs
View File

@@ -1,7 +1,7 @@
using Robust.Shared.GameObjects;
using Content.Shared.Examine;
using Robust.Shared.GameObjects;
using Robust.Shared.Localization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Utility;
namespace Content.Shared.Construction.Steps
{
@@ -15,9 +15,9 @@ namespace Content.Shared.Construction.Steps
return entity.Prototype?.ID == Prototype;
}
public override void DoExamine(FormattedMessage message, bool inDetailsRange)
public override void DoExamine(ExaminedEvent examinedEvent)
{
message.AddMarkup(string.IsNullOrEmpty(Name)
examinedEvent.Message.AddMarkup(string.IsNullOrEmpty(Name)
? Loc.GetString(
"construction-insert-prototype-no-name",
("prototypeName", Prototype) // Terrible.

7
Content.Shared/Construction/Steps/ToolConstructionGraphStep.cs
View File

@@ -1,3 +1,4 @@
using Content.Shared.Examine;
using Content.Shared.Tool;
using Robust.Shared.Localization;
using Robust.Shared.Serialization.Manager.Attributes;
@@ -14,15 +15,15 @@ namespace Content.Shared.Construction.Steps
[DataField("examine")] public string ExamineOverride { get; } = string.Empty;
public override void DoExamine(FormattedMessage message, bool inDetailsRange)
public override void DoExamine(ExaminedEvent examinedEvent)
{
if (!string.IsNullOrEmpty(ExamineOverride))
{
message.AddMarkup(Loc.GetString(ExamineOverride));
examinedEvent.Message.AddMarkup(Loc.GetString(ExamineOverride));
return;
}
message.AddMarkup(Loc.GetString("construction-use-tool-entity", ("toolName", Tool.GetToolName())));
examinedEvent.Message.AddMarkup(Loc.GetString("construction-use-tool-entity", ("toolName", Tool.GetToolName())));
}
}
}