Content tile edge support (#13168)

diff --git a/Content.Shared/Maps/ContentTileDefinition.cs b/Content.Shared/Maps/ContentTileDefinition.cs
index e0b37f4dc603ac031b98fbdd9800ca27a772fe8f..4a4555c560972cf98de46c56ee8e50474d8e75a5 100644 (file)
--- 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<ResourcePath> CornerSprites { get; } = new();
-
-        [DataField("cardinalSprites")] public List<ResourcePath> CardinalSprites { get; } = new();
+        [DataField("edgeSprites")] public Dictionary<Direction, ResourcePath> 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 dab33732ab4681ba0e06bcc71784d35bdefc0ce9..7bee466496d5fd522425bbe7a9670b245e089e55 100644 (file)
--- 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 3cb803a9abfaa8350898a671eb0828a55d055768..e7d9481b8acc0e6b8571c99a624b1b7d7efbe8d9 100644 (file)
--- 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"