diff --git a/Content.Server/Construction/Completions/ConditionalAction.cs b/Content.Server/Construction/Completions/ConditionalAction.cs index 37b612de04..9884eb7ecf 100644 --- a/Content.Server/Construction/Completions/ConditionalAction.cs +++ b/Content.Server/Construction/Completions/ConditionalAction.cs @@ -13,7 +13,7 @@ namespace Content.Server.Construction.Completions { [field: DataField("passUser")] public bool PassUser { get; } = false; - [field: DataField("condition", required:true)] public IEdgeCondition? Condition { get; } = null; + [field: DataField("condition", required:true)] public IGraphCondition? Condition { get; } = null; [field: DataField("action", required:true)] public IGraphAction? Action { get; } = null; diff --git a/Content.Server/Construction/Conditions/AirlockBolted.cs b/Content.Server/Construction/Conditions/AirlockBolted.cs index d39f3fad02..dcfdac85ec 100644 --- a/Content.Server/Construction/Conditions/AirlockBolted.cs +++ b/Content.Server/Construction/Conditions/AirlockBolted.cs @@ -12,7 +12,7 @@ namespace Content.Server.Construction.Conditions { [UsedImplicitly] [DataDefinition] - public class AirlockBolted : IEdgeCondition + public class AirlockBolted : IGraphCondition { [DataField("value")] public bool Value { get; private set; } = true; diff --git a/Content.Server/Construction/Conditions/AllConditions.cs b/Content.Server/Construction/Conditions/AllConditions.cs index ccba846da1..a39f4fc5ef 100644 --- a/Content.Server/Construction/Conditions/AllConditions.cs +++ b/Content.Server/Construction/Conditions/AllConditions.cs @@ -9,10 +9,10 @@ namespace Content.Server.Construction.Conditions { [UsedImplicitly] [DataDefinition] - public class AllConditions : IEdgeCondition + public class AllConditions : IGraphCondition { [field: DataField("conditions")] - public IEdgeCondition[] Conditions { get; } = Array.Empty(); + public IGraphCondition[] Conditions { get; } = Array.Empty(); public async Task Condition(IEntity entity) { diff --git a/Content.Server/Construction/Conditions/AllWiresCut.cs b/Content.Server/Construction/Conditions/AllWiresCut.cs index 3a3cffc687..10a85255df 100644 --- a/Content.Server/Construction/Conditions/AllWiresCut.cs +++ b/Content.Server/Construction/Conditions/AllWiresCut.cs @@ -13,7 +13,7 @@ namespace Content.Server.Construction.Conditions /// [UsedImplicitly] [DataDefinition] - public class AllWiresCut : IEdgeCondition + public class AllWiresCut : IGraphCondition { [DataField("value")] public bool Value { get; private set; } = true; diff --git a/Content.Server/Construction/Conditions/AnyConditions.cs b/Content.Server/Construction/Conditions/AnyConditions.cs index 2b1eec22c3..d9cc373fe1 100644 --- a/Content.Server/Construction/Conditions/AnyConditions.cs +++ b/Content.Server/Construction/Conditions/AnyConditions.cs @@ -9,10 +9,10 @@ namespace Content.Server.Construction.Conditions { [UsedImplicitly] [DataDefinition] - public class AnyConditions : IEdgeCondition + public class AnyConditions : IGraphCondition { [field: DataField("conditions")] - public IEdgeCondition[] Conditions { get; } = Array.Empty(); + public IGraphCondition[] Conditions { get; } = Array.Empty(); public async Task Condition(IEntity entity) { diff --git a/Content.Server/Construction/Conditions/ComponentInTile.cs b/Content.Server/Construction/Conditions/ComponentInTile.cs index 83e04cc6c5..32820744c1 100644 --- a/Content.Server/Construction/Conditions/ComponentInTile.cs +++ b/Content.Server/Construction/Conditions/ComponentInTile.cs @@ -14,7 +14,7 @@ namespace Content.Server.Construction.Conditions /// [UsedImplicitly] [DataDefinition] - public class ComponentInTile : IEdgeCondition + public class ComponentInTile : IGraphCondition { [Dependency] private readonly IComponentFactory _componentFactory = default!; [Dependency] private readonly IMapManager _mapManager = default!; diff --git a/Content.Server/Construction/Conditions/ContainerEmpty.cs b/Content.Server/Construction/Conditions/ContainerEmpty.cs index 89e6de21f3..8b0518ab5f 100644 --- a/Content.Server/Construction/Conditions/ContainerEmpty.cs +++ b/Content.Server/Construction/Conditions/ContainerEmpty.cs @@ -11,7 +11,7 @@ namespace Content.Server.Construction.Conditions { [UsedImplicitly] [DataDefinition] - public class ContainerEmpty : IEdgeCondition + public class ContainerEmpty : IGraphCondition { [DataField("container")] public string Container { get; private set; } = string.Empty; [DataField("text")] public string Text { get; private set; } = string.Empty; diff --git a/Content.Server/Construction/Conditions/ContainerNotEmpty.cs b/Content.Server/Construction/Conditions/ContainerNotEmpty.cs index b3957b7ee3..9224b977dd 100644 --- a/Content.Server/Construction/Conditions/ContainerNotEmpty.cs +++ b/Content.Server/Construction/Conditions/ContainerNotEmpty.cs @@ -11,7 +11,7 @@ namespace Content.Server.Construction.Conditions { [UsedImplicitly] [DataDefinition] - public class ContainerNotEmpty : IEdgeCondition + public class ContainerNotEmpty : IGraphCondition { [DataField("container")] public string Container { get; private set; } = string.Empty; [DataField("text")] public string Text { get; private set; } = string.Empty; diff --git a/Content.Server/Construction/Conditions/DoorWelded.cs b/Content.Server/Construction/Conditions/DoorWelded.cs index b7b0661721..ffee0a2f1a 100644 --- a/Content.Server/Construction/Conditions/DoorWelded.cs +++ b/Content.Server/Construction/Conditions/DoorWelded.cs @@ -13,7 +13,7 @@ namespace Content.Server.Construction.Conditions { [UsedImplicitly] [DataDefinition] - public class DoorWelded : IEdgeCondition + public class DoorWelded : IGraphCondition { [DataField("welded")] public bool Welded { get; private set; } = true; diff --git a/Content.Server/Construction/Conditions/EntityAnchored.cs b/Content.Server/Construction/Conditions/EntityAnchored.cs index 1a35e45076..74128dc611 100644 --- a/Content.Server/Construction/Conditions/EntityAnchored.cs +++ b/Content.Server/Construction/Conditions/EntityAnchored.cs @@ -10,7 +10,7 @@ namespace Content.Server.Construction.Conditions { [UsedImplicitly] [DataDefinition] - public class EntityAnchored : IEdgeCondition + public class EntityAnchored : IGraphCondition { [DataField("anchored")] public bool Anchored { get; private set; } = true; diff --git a/Content.Server/Construction/Conditions/MachineFrameComplete.cs b/Content.Server/Construction/Conditions/MachineFrameComplete.cs index 42c5998a67..77a3fa3731 100644 --- a/Content.Server/Construction/Conditions/MachineFrameComplete.cs +++ b/Content.Server/Construction/Conditions/MachineFrameComplete.cs @@ -14,7 +14,7 @@ namespace Content.Server.Construction.Conditions /// [UsedImplicitly] [DataDefinition] - public class MachineFrameComplete : IEdgeCondition + public class MachineFrameComplete : IGraphCondition { public async Task Condition(IEntity entity) { diff --git a/Content.Server/Construction/Conditions/ToiletLidClosed.cs b/Content.Server/Construction/Conditions/ToiletLidClosed.cs index 2fb7043279..0c45e4c8b8 100644 --- a/Content.Server/Construction/Conditions/ToiletLidClosed.cs +++ b/Content.Server/Construction/Conditions/ToiletLidClosed.cs @@ -12,7 +12,7 @@ namespace Content.Server.Construction.Conditions { [UsedImplicitly] [DataDefinition] - public class ToiletLidClosed : IEdgeCondition + public class ToiletLidClosed : IGraphCondition { public async Task Condition(IEntity entity) { diff --git a/Content.Server/Construction/Conditions/WirePanel.cs b/Content.Server/Construction/Conditions/WirePanel.cs index 06fe6814ba..02890a0ce7 100644 --- a/Content.Server/Construction/Conditions/WirePanel.cs +++ b/Content.Server/Construction/Conditions/WirePanel.cs @@ -11,7 +11,7 @@ namespace Content.Server.Construction.Conditions { [UsedImplicitly] [DataDefinition] - public class WirePanel : IEdgeCondition + public class WirePanel : IGraphCondition { [DataField("open")] public bool Open { get; private set; } = true; diff --git a/Content.Shared/Construction/ConstructionGraphEdge.cs b/Content.Shared/Construction/ConstructionGraphEdge.cs index 353ea65485..87289a95fd 100644 --- a/Content.Shared/Construction/ConstructionGraphEdge.cs +++ b/Content.Shared/Construction/ConstructionGraphEdge.cs @@ -14,7 +14,7 @@ namespace Content.Shared.Construction private List _steps = new(); [DataField("conditions", serverOnly: true)] - private List _conditions = new(); + private List _conditions = new(); [DataField("completed", serverOnly: true)] private List _completed = new(); @@ -24,7 +24,7 @@ namespace Content.Shared.Construction public string Target { get; private set; } = string.Empty; [ViewVariables] - public IReadOnlyList Conditions => _conditions; + public IReadOnlyList Conditions => _conditions; [ViewVariables] public IReadOnlyList Completed => _completed; diff --git a/Content.Shared/Construction/IEdgeCondition.cs b/Content.Shared/Construction/IGraphCondition.cs similarity index 89% rename from Content.Shared/Construction/IEdgeCondition.cs rename to Content.Shared/Construction/IGraphCondition.cs index 9aa08ace13..ec29bba2a7 100644 --- a/Content.Shared/Construction/IEdgeCondition.cs +++ b/Content.Shared/Construction/IGraphCondition.cs @@ -5,7 +5,7 @@ using Robust.Shared.Utility; namespace Content.Shared.Construction { - public interface IEdgeCondition + public interface IGraphCondition { Task Condition(IEntity entity); bool DoExamine(IEntity entity, FormattedMessage message, bool inExamineRange) { return false; }