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

Adds YAML linter validators for content tiles.

Browse Source 
- Removes invalid floor drops.
This commit is contained in:
Vera Aguilera Puerto
2021-05-27 11:39:30 +02:00
parent 9b402acfa3
commit 0c68f2973e
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/GameObjects/Components/Items/FloorTileItemComponent.cs
View File

@@ -14,6 +14,7 @@ using Robust.Shared.Maths;
using Robust.Shared.Audio; using Robust.Shared.Audio;
using Robust.Shared.Player; using Robust.Shared.Player;
using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
namespace Content.Server.GameObjects.Components.Items namespace Content.Server.GameObjects.Components.Items
{ {
@@ -23,7 +24,7 @@ namespace Content.Server.GameObjects.Components.Items
[Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!; [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!;
public override string Name => "FloorTile"; public override string Name => "FloorTile";
[DataField("outputs")] [DataField("outputs", customTypeSerializer:typeof(PrototypeIdListSerializer<ContentTileDefinition>))]
private List<string>? _outputTiles; private List<string>? _outputTiles;
public override void Initialize() public override void Initialize()

4
Content.Shared/Maps/ContentTileDefinition.cs
View File

@@ -4,6 +4,7 @@ using JetBrains.Annotations;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Prototypes; using Robust.Shared.Prototypes;
using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
using Robust.Shared.ViewVariables; using Robust.Shared.ViewVariables;
namespace Content.Shared.Maps namespace Content.Shared.Maps
@@ -35,7 +36,8 @@ namespace Content.Shared.Maps
[DataField("thermalConductivity")] public float ThermalConductivity { get; set; } = 0.05f; [DataField("thermalConductivity")] public float ThermalConductivity { get; set; } = 0.05f;
[DataField("item_drop")] public string ItemDropPrototypeName { get; } = "FloorTileItemSteel"; [DataField("item_drop", customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
public string ItemDropPrototypeName { get; } = "FloorTileItemSteel";
[DataField("is_space")] public bool IsSpace { get; private set; } [DataField("is_space")] public bool IsSpace { get; private set; }

2
Resources/Prototypes/Tiles/floors.yml
View File

@@ -102,7 +102,6 @@
can_crowbar: true can_crowbar: true
footstep_sounds: footstep_floor footstep_sounds: footstep_floor
friction: 0.30 friction: 0.30
item_drop: FloorTileItemRock
- type: tile - type: tile
name: floor_showroom name: floor_showroom
@@ -185,7 +184,6 @@
can_crowbar: true can_crowbar: true
footstep_sounds: footstep_asteroid footstep_sounds: footstep_asteroid
friction: 0.30 friction: 0.30
item_drop: FloorTileItemAsteroid
- type: tile - type: tile
name: floor_asteroid_coarse_sand0 name: floor_asteroid_coarse_sand0