From 0aba0d2ec216da311d88e54c03973739dd3aa8b7 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sun, 5 Mar 2023 12:19:50 +1100 Subject: [PATCH] Content tile edge support (#13168) --- Content.Shared/Maps/ContentTileDefinition.cs | 4 +--- Resources/Prototypes/Tiles/planet.yml | 13 +++++++++---- .../Textures/Tiles/Planet/Grass/attributions.yml | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Content.Shared/Maps/ContentTileDefinition.cs b/Content.Shared/Maps/ContentTileDefinition.cs index e0b37f4dc6..4a4555c560 100644 --- a/Content.Shared/Maps/ContentTileDefinition.cs +++ b/Content.Shared/Maps/ContentTileDefinition.cs @@ -29,9 +29,7 @@ namespace Content.Shared.Maps public string Name { get; private set; } = ""; [DataField("sprite")] public ResourcePath? Sprite { get; } - [DataField("cornerSprites")] public List CornerSprites { get; } = new(); - - [DataField("cardinalSprites")] public List CardinalSprites { get; } = new(); + [DataField("edgeSprites")] public Dictionary EdgeSprites { get; } = new(); [DataField("isSubfloor")] public bool IsSubFloor { get; private set; } diff --git a/Resources/Prototypes/Tiles/planet.yml b/Resources/Prototypes/Tiles/planet.yml index dab33732ab..7bee466496 100644 --- a/Resources/Prototypes/Tiles/planet.yml +++ b/Resources/Prototypes/Tiles/planet.yml @@ -45,10 +45,15 @@ sprite: /Textures/Tiles/Planet/Grass/grass.png variants: 4 placementVariants: [0, 1, 2, 3] - cornerSprites: - - /Textures/Tiles/Planet/Grass/single_edge.png - cardinalSprites: - - /Textures/Tiles/Planet/Grass/double_edge.png + edgeSprites: + SouthEast: /Textures/Tiles/Planet/Grass/single_edge.png + NorthEast: /Textures/Tiles/Planet/Grass/single_edge.png + NorthWest: /Textures/Tiles/Planet/Grass/single_edge.png + SouthWest: /Textures/Tiles/Planet/Grass/single_edge.png + South: /Textures/Tiles/Planet/Grass/double_edge.png + East: /Textures/Tiles/Planet/Grass/double_edge.png + North: /Textures/Tiles/Planet/Grass/double_edge.png + West: /Textures/Tiles/Planet/Grass/double_edge.png baseTurfs: - FloorPlanetDirt isSubfloor: true diff --git a/Resources/Textures/Tiles/Planet/Grass/attributions.yml b/Resources/Textures/Tiles/Planet/Grass/attributions.yml index 3cb803a9ab..e7d9481b8a 100644 --- a/Resources/Textures/Tiles/Planet/Grass/attributions.yml +++ b/Resources/Textures/Tiles/Planet/Grass/attributions.yml @@ -4,4 +4,4 @@ - single_edge.png license: "CC-BY-SA-3.0" copyright: "https://github.com/discordia-space/CEV-Eris/commit/026ee3250ac1de938b503e3eb46ad73dd9c3ca82" - source: "https://github.com/discordia-space/CEV-Eris/commit/026ee3250ac1de938b503e3eb46ad73dd9c3ca82" \ No newline at end of file + source: "https://github.com/discordia-space/CEV-Eris/commit/026ee3250ac1de938b503e3eb46ad73dd9c3ca82" -- 2.52.0