From a8f1cb7fd9601f93898652f3008b91b093d76880 Mon Sep 17 00:00:00 2001 From: Jay Date: Fri, 11 Oct 2024 21:56:13 -0400 Subject: [PATCH] Correct comments and adjust inside corner tile automap sort order (#87) --- src/Murder/Assets/Graphics/TilesetAsset.cs | 8 ++++---- src/Murder/Services/TileServices.cs | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Murder/Assets/Graphics/TilesetAsset.cs b/src/Murder/Assets/Graphics/TilesetAsset.cs index 59beb7ce8..e32a7a339 100644 --- a/src/Murder/Assets/Graphics/TilesetAsset.cs +++ b/src/Murder/Assets/Graphics/TilesetAsset.cs @@ -98,17 +98,17 @@ public void CalculateAndDrawAutoTile(RenderContext render, int x, int y, bool to // Top Left Inside Corner if (topLeft && topRight && botLeft && !botRight) - DrawTile(batch, x, y, 1, 3, alpha, color, blend, -1); + DrawTile(batch, x, y, 1, 3, alpha, color, blend, 1); // Top Right Inside Corner if (topLeft && topRight && !botLeft && botRight) - DrawTile(batch, x, y, 2, 3, alpha, color, blend, -1); + DrawTile(batch, x, y, 2, 3, alpha, color, blend, 1); - // Top Left Inside Corner + // Bottom Left Inside Corner if (topLeft && !topRight && botLeft && botRight) DrawTile(batch, x, y, 1, 4, alpha, color, blend, 1); - // Top Right Inside Corner + // Bottom Right Inside Corner if (!topLeft && topRight && botLeft && botRight) DrawTile(batch, x, y, 2, 4, alpha, color, blend, 1); diff --git a/src/Murder/Services/TileServices.cs b/src/Murder/Services/TileServices.cs index 5ee14c5f2..731d80eee 100644 --- a/src/Murder/Services/TileServices.cs +++ b/src/Murder/Services/TileServices.cs @@ -76,17 +76,17 @@ public static (int tile, int sortAdjust) GetAutoTile(bool topLeft, bool topRight // Top Left Inside Corner if (topLeft && topRight && botLeft && !botRight) - return (Calculator.OneD(1, 3, 3), -1); + return (Calculator.OneD(1, 3, 3), 1); // Top Right Inside Corner if (topLeft && topRight && !botLeft && botRight) - return (Calculator.OneD(2, 3, 3), -1); + return (Calculator.OneD(2, 3, 3), 1); - // Top Left Inside Corner + // Bottom Left Inside Corner if (topLeft && !topRight && botLeft && botRight) return (Calculator.OneD(1, 4, 3), 1); - // Top Right Inside Corner + // Bottom Right Inside Corner if (!topLeft && topRight && botLeft && botRight) return (Calculator.OneD(2, 4, 3), 1);