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.Server/Construction/Commands/TileWallsCommand.cs
View File

@@ -100,7 +100,7 @@ namespace Content.Server.Construction.Commands
var tile = grid.GetTileRef(childTransform.Coordinates);
var tileDef = (ContentTileDefinition) tileDefinitionManager[tile.Tile.TypeId];
if (tileDef.Name == "underplating")
if (tileDef.ID == "underplating")
{
continue;
}

4
Content.Server/Pointing/EntitySystems/PointingSystem.cs
View File

@@ -178,9 +178,9 @@ namespace Content.Server.Pointing.EntitySystems
var tileDef = _tileDefinitionManager[tileRef?.Tile.TypeId ?? 0];
selfMessage = Loc.GetString("pointing-system-point-at-tile", ("tileName", tileDef.DisplayName));
selfMessage = Loc.GetString("pointing-system-point-at-tile", ("tileName", tileDef.Name));
viewerMessage = Loc.GetString("pointing-system-other-point-at-tile", ("otherName", playerName), ("tileName", tileDef.DisplayName));
viewerMessage = Loc.GetString("pointing-system-other-point-at-tile", ("otherName", playerName), ("tileName", tileDef.Name));
}
_pointers[session] = _gameTiming.CurTime;

2
Content.Server/Tiles/FloorTileItemComponent.cs
View File

@@ -82,7 +82,7 @@ namespace Content.Server.Tiles
var tile = mapGrid.GetTileRef(location);
var baseTurf = (ContentTileDefinition) _tileDefinitionManager[tile.Tile.TypeId];
if (HasBaseTurf(currentTileDefinition, baseTurf.Name))
if (HasBaseTurf(currentTileDefinition, baseTurf.ID))
{
if (!EntitySystem.Get<StackSystem>().Use(Owner, 1, stack))
continue;