Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 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

2
Content.Shared/Construction/Conditions/TileType.cs
View File

@@ -34,7 +34,7 @@ namespace Content.Shared.Construction.Conditions
var tile = tileFound.Value.Tile.GetContentTileDefinition();
foreach (var targetTile in TargetTiles)
{
if (tile.Name == targetTile) {
if (tile.ID == targetTile) {
return true;
}
}

4
Content.Shared/Entry/EntryPoint.cs
View File

@@ -76,7 +76,7 @@ namespace Content.Shared.Entry
var prototypeList = new List<ContentTileDefinition>();
foreach (var tileDef in _prototypeManager.EnumeratePrototypes<ContentTileDefinition>())
{
if (tileDef.Name == "space")
if (tileDef.ID == "space")
{
continue;
}
@@ -86,7 +86,7 @@ namespace Content.Shared.Entry
// Sort ordinal to ensure it's consistent client and server.
// So that tile IDs match up.
prototypeList.Sort((a, b) => string.Compare(a.Name, b.Name, StringComparison.Ordinal));
prototypeList.Sort((a, b) => string.Compare(a.ID, b.ID, StringComparison.Ordinal));
foreach (var tileDef in prototypeList)
{

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;