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

Adds integration tests to construction, fixes some wrong stack prototypes in construction graphs

Browse Source 
🆑
- fix: Fixes a bug where many constructions failed due to a recent material refactor.
This commit is contained in:
Vera Aguilera Puerto
2021-02-28 17:16:41 +01:00
parent c3c9f2bbc1
commit 71e6effd48
19 changed files with 144 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
Content.IntegrationTests/Tests/Construction/ConstructionActionValid.cs Normal file
View File

@@ -0,0 +1,108 @@
using System.Text;
using System.Threading.Tasks;
using Content.Server.Construction.Completions;
using Content.Shared.Construction;
using NUnit.Framework;
using Robust.Shared.Prototypes;
namespace Content.IntegrationTests.Tests.Construction
{
[TestFixture]
public class ConstructionActionValid : ContentIntegrationTest
{
[Test]
public async Task ConstructionGraphSpawnPrototypeValid()
{
var server = StartServerDummyTicker();
await server.WaitIdleAsync();
var protoMan = server.ResolveDependency<IPrototypeManager>();
var valid = true;
var message = new StringBuilder();
foreach (var graph in protoMan.EnumeratePrototypes<ConstructionGraphPrototype>())
{
foreach (var (_, node) in graph.Nodes)
{
foreach (var action in node.Actions)
{
if (action is not SpawnPrototype spawn || protoMan.TryIndex(spawn.Prototype, out EntityPrototype _)) continue;
valid = false;
message.Append($"Invalid entity prototype \"{spawn.Prototype}\" on graph action in node \"{node.Name}\" of graph \"{graph.ID}\"\n");
}
foreach (var edge in node.Edges)
{
foreach (var action in edge.Completed)
{
if (action is not SpawnPrototype spawn || protoMan.TryIndex(spawn.Prototype, out EntityPrototype _)) continue;
valid = false;
message.Append($"Invalid entity prototype \"{spawn.Prototype}\" on graph action in edge \"{edge.Target}\" of node \"{node.Name}\" of graph \"{graph.ID}\"\n");
}
}
}
}
Assert.That(valid, Is.True, $"One or more SpawnPrototype actions specified invalid entity prototypes!\n{message}");
}
[Test]
public async Task ConstructionGraphNodeEntityPrototypeValid()
{
var server = StartServerDummyTicker();
await server.WaitIdleAsync();
var protoMan = server.ResolveDependency<IPrototypeManager>();
var valid = true;
var message = new StringBuilder();
foreach (var graph in protoMan.EnumeratePrototypes<ConstructionGraphPrototype>())
{
foreach (var (_, node) in graph.Nodes)
{
if (string.IsNullOrEmpty(node.Entity) || protoMan.TryIndex(node.Entity, out EntityPrototype _)) continue;
valid = false;
message.Append($"Invalid entity prototype \"{node.Entity}\" on node \"{node.Name}\" of graph \"{graph.ID}\"\n");
}
}
Assert.That(valid, Is.True, $"One or more nodes specified invalid entity prototypes!\n{message}");
}
[Test]
public async Task ConstructionGraphEdgeValid()
{
var server = StartServerDummyTicker();
await server.WaitIdleAsync();
var protoMan = server.ResolveDependency<IPrototypeManager>();
var valid = true;
var message = new StringBuilder();
foreach (var graph in protoMan.EnumeratePrototypes<ConstructionGraphPrototype>())
{
foreach (var (_, node) in graph.Nodes)
{
foreach (var edge in node.Edges)
{
if (graph.Nodes.ContainsKey(edge.Target)) continue;
valid = false;
message.Append($"Invalid target \"{edge.Target}\" in edge on node \"{node.Name}\" of graph \"{graph.ID}\"\n");
}
}
}
Assert.That(valid, Is.True, $"One or more edges specified invalid node targets!\n{message}");
}
}
}

4
Resources/Prototypes/Catalog/LatheRecipes/sheet.yml
View File

@@ -3,7 +3,7 @@
icon:
sprite: Objects/Materials/sheets.rsi
state: metal
result: SteelSheet1
result: SheetSteel1
completetime: 500
materials:
steel: 100
@@ -13,7 +13,7 @@
icon:
sprite: Objects/Materials/sheets.rsi
state: glass
result: GlassSheet1
result: SheetGlass1
completetime: 500
materials:
glass: 100

4
Resources/Prototypes/Entities/Constructible/Furniture/storage.yml
View File

@@ -41,7 +41,7 @@
sound: /Audio/Effects/metalbreak.ogg
- !type:SpawnEntitiesBehavior
spawn:
SteelSheet1:
SheetSteel1:
min: 1
max: 1
- !type:DoActsBehavior
@@ -90,7 +90,7 @@
sound: /Audio/Effects/metalbreak.ogg
- !type:SpawnEntitiesBehavior
spawn:
SteelSheet1:
SheetSteel1:
min: 1
max: 1
- !type:DoActsBehavior

10
Resources/Prototypes/Entities/Constructible/Furniture/tables.yml
View File

@@ -48,7 +48,7 @@
sound: /Audio/Effects/metalbreak.ogg
- !type:SpawnEntitiesBehavior
spawn:
SteelSheet1:
SheetSteel1:
min: 1
max: 1
- !type:DoActsBehavior
@@ -76,7 +76,7 @@
sound: /Audio/Effects/metalbreak.ogg
- !type:SpawnEntitiesBehavior
spawn:
SteelSheet1:
SheetSteel1:
min: 1
max: 1
- !type:DoActsBehavior
@@ -107,7 +107,7 @@
sound: /Audio/Effects/metalbreak.ogg
- !type:SpawnEntitiesBehavior
spawn:
SteelSheet1:
SheetSteel1:
min: 1
max: 1
- !type:DoActsBehavior
@@ -135,7 +135,7 @@
sound: /Audio/Effects/metalbreak.ogg
- !type:SpawnEntitiesBehavior
spawn:
SteelSheet1:
SheetSteel1:
min: 1
max: 1
- !type:DoActsBehavior
@@ -166,7 +166,7 @@
sound: /Audio/Effects/metalbreak.ogg
- !type:SpawnEntitiesBehavior
spawn:
SteelSheet1:
SheetSteel1:
min: 1
max: 1
- !type:DoActsBehavior

2
Resources/Prototypes/Entities/Constructible/Specific/Engines/AME/controller.yml
View File

@@ -32,7 +32,7 @@
behaviors:
- !type:SpawnEntitiesBehavior
spawn:
SteelSheet1:
SheetSteel1:
min: 1
max: 1
- !type:DoActsBehavior

2
Resources/Prototypes/Entities/Constructible/Specific/Engines/AME/shielding.yml
View File

@@ -31,7 +31,7 @@
behaviors:
- !type:SpawnEntitiesBehavior
spawn:
SteelSheet1:
SheetSteel1:
min: 1
max: 2
- !type:DoActsBehavior

2
Resources/Prototypes/Entities/Constructible/Specific/chem_master.yml
View File

@@ -94,7 +94,7 @@
behaviors:
- !type:SpawnEntitiesBehavior
spawn:
SteelSheet1:
SheetSteel1:
min: 1
max: 1
- !type:DoActsBehavior

2
Resources/Prototypes/Entities/Constructible/Walls/girder.yml
View File

@@ -39,7 +39,7 @@
behaviors:
- !type:SpawnEntitiesBehavior
spawn:
SteelSheet1:
SheetSteel1:
min: 1
max: 1
- !type:DoActsBehavior

4
Resources/Prototypes/Entities/Constructible/Walls/lighting.yml
View File

@@ -38,7 +38,7 @@
- !type:EmptyAllContainersBehaviour
- !type:SpawnEntitiesBehavior
spawn:
SteelSheet1:
SheetSteel1:
min: 2
max: 2
- !type:DoActsBehavior
@@ -100,7 +100,7 @@
- !type:EmptyAllContainersBehaviour
- !type:SpawnEntitiesBehavior
spawn:
SteelSheet1:
SheetSteel1:
min: 1
max: 1
- !type:DoActsBehavior

2
Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
View File

@@ -144,7 +144,7 @@
sound: /Audio/Effects/metalbreak.ogg
- !type:SpawnEntitiesBehavior
spawn:
SteelSheet1:
SheetSteel1:
min: 1
max: 1
- !type:DoActsBehavior

8
Resources/Prototypes/Recipes/Construction/Graphs/computer.yml
View File

@@ -35,7 +35,7 @@
anchored: false
completed:
- !type:SpawnPrototype
prototype: SteelSheet1
prototype: SheetSteel1
amount: 5
- !type:DeleteEntity {}
steps:
@@ -125,7 +125,7 @@
- !type:EntityAnchored { }
completed:
- !type:SpawnPrototype
prototype: GlassSheet1
prototype: SheetGlass1
amount: 2
steps:
- tool: Prying
@@ -144,8 +144,8 @@
- !type:EntityAnchored {}
completed:
- !type:SpawnPrototype
prototype: GlassSheet1 # TODO: Replace with glass shard.
amount: 1
prototype: ShardBase
amount: 2
steps:
- tool: Prying
doAfter: 2

2
Resources/Prototypes/Recipes/Construction/Graphs/conveyor.yml
View File

@@ -37,7 +37,7 @@
- node: start
actions:
- !type:SpawnPrototype
prototype: SteelSheet1
prototype: SheetSteel1
amount: 2
- !type:DeleteEntity {}
edges:

4
Resources/Prototypes/Recipes/Construction/Graphs/firelock.yml
View File

@@ -30,7 +30,7 @@
- to: start
completed:
- !type:SpawnPrototype
prototype: SteelSheet1
prototype: SheetSteel1
amount: 3
- !type:DeleteEntity {}
conditions:
@@ -146,7 +146,7 @@
- to: frame4
completed:
- !type:SpawnPrototype
prototype: GlassSheet1
prototype: SheetGlass1
amount: 2
steps:
- tool: Screwing

4
Resources/Prototypes/Recipes/Construction/Graphs/girder.yml
View File

@@ -24,7 +24,7 @@
- to: start
completed:
- !type:SpawnPrototype
prototype: SteelSheet1
prototype: SheetSteel1
amount: 2
- !type:DeleteEntity {}
conditions:
@@ -60,7 +60,7 @@
- to: girder
completed:
- !type:SpawnPrototype
prototype: SteelSheet1
prototype: SheetSteel1
amount: 2
steps:
- tool: Welding

4
Resources/Prototypes/Recipes/Construction/Graphs/lighting.yml
View File

@@ -26,7 +26,7 @@
doAfter: 2.0
completed:
- !type:SpawnPrototype
prototype: SteelSheet1
prototype: SheetSteel1
amount: 2
- !type:DeleteEntity {}
- node: bulbLight
@@ -41,6 +41,6 @@
doAfter: 2.0
completed:
- !type:SpawnPrototype
prototype: SteelSheet1
prototype: SheetSteel1
amount: 1
- !type:DeleteEntity {}

2
Resources/Prototypes/Recipes/Construction/Graphs/low_wall.yml
View File

@@ -9,7 +9,7 @@
component: Window
actions:
- !type:SpawnPrototype
prototype: SteelSheet1
prototype: SheetSteel1
amount: 3
- !type:DeleteEntity { }
edges:

4
Resources/Prototypes/Recipes/Construction/Graphs/machine.yml
View File

@@ -5,7 +5,7 @@
- node: start
actions:
- !type:SpawnPrototype
prototype: SteelSheet1
prototype: SheetSteel1
- !type:DeleteEntity {}
edges:
- to: missingWires
@@ -35,7 +35,7 @@
anchored: false
completed:
- !type:SpawnPrototype
prototype: SteelSheet1
prototype: SheetSteel1
amount: 5
- !type:DeleteEntity {}
steps:

2
Resources/Prototypes/Recipes/Construction/Graphs/toilet.yml
View File

@@ -16,7 +16,7 @@
- to: start
completed:
- !type:SpawnPrototype
prototype: SteelSheet1
prototype: SheetSteel1
amount: 5
- !type:EmptyAllContainers {}
- !type:DeleteEntity {}

10
Resources/Prototypes/Recipes/Construction/Graphs/window.yml
View File

@@ -33,7 +33,7 @@
- to: start
completed:
- !type:SpawnPrototype
prototype: GlassSheet1
prototype: SheetGlass1
amount: 2
- !type:DeleteEntity {}
steps:
@@ -48,7 +48,7 @@
- to: start
completed:
- !type:SpawnPrototype
prototype: RGlassSheet1
prototype: SheetRGlass1
amount: 2
- !type:DeleteEntity {}
steps:
@@ -67,13 +67,13 @@
- to: start
completed:
- !type:SpawnPrototype
prototype: GlassSheet1
prototype: SheetGlass1
amount: 2
- !type:SpawnPrototype
prototype: MetalSheet1
prototype: SheetSteel1
amount: 2
- !type:SpawnPrototype
prototype: PlasmaSheet1
prototype: SheetPlasma1
amount: 2
- !type:DeleteEntity {}
steps: