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

Upgradeable machines. (#2675)

Browse Source 
* Start work on upgradeable machines.

* Upgradeable machines work

* Component requirements for upgradeable machines

* Better container handling

* Remember to not push submodule updates in your PRs, kids!

* Refresh parts after building a machine.

* NetSync false

* Address some reviews, fix some bugs

* Nullable stackhelpers dependencies

* Use container helper method to delete all entities in containers

* Nullable string in AddContainer

* Better examine for machine frame and construction in general

* Machine breakage

* Nullable node

* nullable GraphPrototype

* Re-save saltern for autolathe parts

* Fix SaveLoadSave
This commit is contained in:
Vera Aguilera Puerto
2020-12-03 22:49:00 +01:00
committed by GitHub
parent ba2bdec13b
commit c3341132c5
36 changed files with 5270 additions and 3703 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
Content.Server/Construction/Conditions/AllWiresCut.cs Normal file
View File

@@ -0,0 +1,46 @@
using System.Threading.Tasks;
using Content.Server.GameObjects.Components;
using Content.Server.GameObjects.Components.Power;
using Content.Shared.Construction;
using JetBrains.Annotations;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Serialization;
namespace Content.Server.Construction.Conditions
{
/// <summary>
/// A condition that requires all wires to be cut (or intact)
/// Returns true if the entity doesn't have a wires component.
/// </summary>
[UsedImplicitly]
public class AllWiresCut : IEdgeCondition
{
public void ExposeData(ObjectSerializer serializer)
{
serializer.DataField(this, x => x.Value, "value", true);
}
public bool Value { get; private set; } = true;
public async Task<bool> Condition(IEntity entity)
{
if (entity.Deleted)
return false;
if (!entity.TryGetComponent<WiresComponent>(out var wires))
return true;
foreach (var wire in wires.WiresList)
{
switch (Value)
{
case true when !wire.IsCut:
case false when wire.IsCut:
return false;
}
}
return true;
}
}
}

12
Content.Server/Construction/Conditions/ContainerEmpty.cs
View File

@@ -29,13 +29,17 @@ namespace Content.Server.Construction.Conditions
return container.ContainedEntities.Count == 0;
}
public void DoExamine(IEntity entity, FormattedMessage message, bool inDetailsRange)
public bool DoExamine(IEntity entity, FormattedMessage message, bool inDetailsRange)
{
if (!entity.TryGetComponent(out ContainerManagerComponent? containerManager) ||
!containerManager.TryGetContainer(Container, out var container)) return;
!containerManager.TryGetContainer(Container, out var container)) return false;
if (container.ContainedEntities.Count == 0)
return false;
message.AddMarkup(Text);
return true;
if (container.ContainedEntities.Count != 0)
message.AddMarkup(Text);
}
}
}

15
Content.Server/Construction/Conditions/DoorWelded.cs
View File

@@ -27,16 +27,21 @@ namespace Content.Server.Construction.Conditions
return doorComponent.IsWeldedShut == Welded;
}
public void DoExamine(IEntity entity, FormattedMessage message, bool inDetailsRange)
public bool DoExamine(IEntity entity, FormattedMessage message, bool inDetailsRange)
{
if (!entity.TryGetComponent(out ServerDoorComponent doorComponent)) return;
if (!entity.TryGetComponent(out ServerDoorComponent doorComponent)) return false;
if (doorComponent.State == ServerDoorComponent.DoorState.Closed && Welded)
message.AddMarkup(Loc.GetString("First, weld the door.\n"));
else if (doorComponent.IsWeldedShut && !Welded)
{
message.AddMarkup(Loc.GetString("First, unweld the door.\n"));
message.AddMarkup(Loc.GetString("First, weld the door.\n"));
return true;
}
if (!doorComponent.IsWeldedShut || Welded) return false;
message.AddMarkup(Loc.GetString("First, unweld the door.\n"));
return true;
}
}
}

18
Content.Server/Construction/Conditions/EntityAnchored.cs
View File

@@ -25,15 +25,21 @@ namespace Content.Server.Construction.Conditions
return physics.Anchored == Anchored;
}
public void DoExamine(IEntity entity, FormattedMessage message, bool inDetailsRange)
public bool DoExamine(IEntity entity, FormattedMessage message, bool inDetailsRange)
{
if (!entity.TryGetComponent(out IPhysicsComponent physics)) return;
if (!entity.TryGetComponent(out IPhysicsComponent physics)) return false;
if(Anchored && !physics.Anchored)
message.AddMarkup("First, anchor it.\n");
switch (Anchored)
{
case true when !physics.Anchored:
message.AddMarkup("First, anchor it.\n");
return true;
case false when physics.Anchored:
message.AddMarkup("First, unanchor it.\n");
return true;
}
if(!Anchored && physics.Anchored)
message.AddMarkup("First, unanchor it.\n");
return false;
}
}
}

72
Content.Server/Construction/Conditions/MachineFrameComplete.cs Normal file
View File

@@ -0,0 +1,72 @@
using System.Threading.Tasks;
using Content.Server.GameObjects.Components.Construction;
using Content.Shared.Construction;
using JetBrains.Annotations;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Localization;
using Robust.Shared.Serialization;
using Robust.Shared.Utility;
namespace Content.Server.Construction.Conditions
{
/// <summary>
/// Checks that the entity has all parts needed in the machine frame component.
/// </summary>
[UsedImplicitly]
public class MachineFrameComplete : IEdgeCondition
{
public void ExposeData(ObjectSerializer serializer) { }
public async Task<bool> Condition(IEntity entity)
{
if (entity.Deleted || !entity.TryGetComponent<MachineFrameComponent>(out var machineFrame))
return false;
return machineFrame.IsComplete;
}
public bool DoExamine(IEntity entity, FormattedMessage message, bool inDetailsRange)
{
if (!entity.TryGetComponent<MachineFrameComponent>(out var machineFrame))
return false;
if (!machineFrame.HasBoard)
{
message.AddMarkup(Loc.GetString("Insert [color=cyan]any machine circuit board[/color]."));
return true;
}
if (machineFrame.IsComplete) return false;
message.AddMarkup(Loc.GetString("Requires:\n"));
foreach (var (part, required) in machineFrame.Requirements)
{
var amount = required - machineFrame.Progress[part];
if(amount == 0) continue;
message.AddMarkup(Loc.GetString("[color=yellow]{0}x[/color] [color=green]{1}[/color]\n", amount, Loc.GetString(part.ToString())));
}
foreach (var (material, required) in machineFrame.MaterialRequirements)
{
var amount = required - machineFrame.MaterialProgress[material];
if(amount == 0) continue;
message.AddMarkup(Loc.GetString("[color=yellow]{0}x[/color] [color=green]{1}[/color]\n", amount, Loc.GetString(material.ToString())));
}
foreach (var (compName, info) in machineFrame.ComponentRequirements)
{
var amount = info.Amount - machineFrame.ComponentProgress[compName];
if(amount == 0) continue;
message.AddMarkup(Loc.GetString("[color=yellow]{0}x[/color] [color=green]{1}[/color]\n", info.Amount, Loc.GetString(info.ExamineName)));
}
return true;
}
}
}

18
Content.Server/Construction/Conditions/WirePanel.cs
View File

@@ -26,15 +26,21 @@ namespace Content.Server.Construction.Conditions
return wires.IsPanelOpen == Open;
}
public void DoExamine(IEntity entity, FormattedMessage message, bool inDetailsRange)
public bool DoExamine(IEntity entity, FormattedMessage message, bool inDetailsRange)
{
if (!entity.TryGetComponent(out WiresComponent wires)) return;
if (!entity.TryGetComponent(out WiresComponent wires)) return false;
if(Open && !wires.IsPanelOpen)
message.AddMarkup(Loc.GetString("First, open the maintenance panel.\n"));
switch (Open)
{
case true when !wires.IsPanelOpen:
message.AddMarkup(Loc.GetString("First, open the maintenance panel.\n"));
return true;
case false when wires.IsPanelOpen:
message.AddMarkup(Loc.GetString("First, close the maintenance panel.\n"));
return true;
}
if(!Open && wires.IsPanelOpen)
message.AddMarkup(Loc.GetString("First, close the maintenance panel.\n"));
return false;
}
}
}