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

Tiles Name->ID, DisplayName->Name (#5991)

Browse Source
This commit is contained in:
wrexbe
2022-01-04 16:26:07 -08:00
committed by GitHub
parent a153f76c5d
commit 4571dca1eb
9 changed files with 81 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,6 @@ using Robust.Shared.Map;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
using Robust.Shared.ViewVariables;
using System.Collections.Generic;
using Content.Shared.Atmos;
@@ -14,9 +13,6 @@ namespace Content.Shared.Maps
[Prototype("tile")]
public sealed class ContentTileDefinition : IPrototype, IInheritingPrototype, ITileDefinition
{
[ViewVariables]
string IPrototype.ID => Name;
[DataField("parent", customTypeSerializer:typeof(PrototypeIdSerializer<ContentTileDefinition>))]
public string? Parent { get; private set; }
@@ -26,11 +22,11 @@ namespace Content.Shared.Maps
public string Path => "/Textures/Tiles/";
[DataField("name", required: true)] public string Name { get; } = string.Empty;
[DataField("id", required: true)] public string ID { get; } = string.Empty;
public ushort TileId { get; private set; }
[DataField("display_name")] public string DisplayName { get; } = string.Empty;
[DataField("name")] public string Name { get; } = string.Empty;
[DataField("texture")] public string SpriteName { get; } = string.Empty;