Skip to content

Commit b2f4927

Browse files
HandyS11HandyS11
committed
feat(2a): scaffold Features.Events project + GridReference helper
1 parent ad250c9 commit b2f4927

5 files changed

Lines changed: 128 additions & 0 deletions

File tree

‎RustPlusBot.slnx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<Project Path="src/RustPlusBot.Features.Connections/RustPlusBot.Features.Connections.csproj" />
99
<Project Path="src/RustPlusBot.Features.Pairing/RustPlusBot.Features.Pairing.csproj" />
1010
<Project Path="src/RustPlusBot.Features.Chat/RustPlusBot.Features.Chat.csproj" />
11+
<Project Path="src/RustPlusBot.Features.Events/RustPlusBot.Features.Events.csproj" />
1112
<Project Path="src/RustPlusBot.Features.Workspace/RustPlusBot.Features.Workspace.csproj" />
1213
<Project Path="src/RustPlusBot.Persistence/RustPlusBot.Persistence.csproj" />
1314
</Folder>
@@ -18,6 +19,7 @@
1819
<Project Path="tests/RustPlusBot.Features.Pairing.Tests/RustPlusBot.Features.Pairing.Tests.csproj" />
1920
<Project Path="tests/RustPlusBot.Features.Workspace.Tests/RustPlusBot.Features.Workspace.Tests.csproj" />
2021
<Project Path="tests/RustPlusBot.Features.Chat.Tests/RustPlusBot.Features.Chat.Tests.csproj" />
22+
<Project Path="tests/RustPlusBot.Features.Events.Tests/RustPlusBot.Features.Events.Tests.csproj" />
2123
<Project Path="tests/RustPlusBot.Persistence.Tests/RustPlusBot.Persistence.Tests.csproj" />
2224
</Folder>
2325
</Solution>

‎src/RustPlusBot.Features.Events/Formatting/GridReference.cs‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
using System.Globalization;
2+
using System.Text;
3+
using RustPlusBot.Features.Connections.Listening;
4+
5+
namespace RustPlusBot.Features.Events.Formatting;
6+
7+
/// <summary>Converts world coordinates to a Rust map grid reference (e.g. "D7"), rustplusplus-compatible.</summary>
8+
public static class GridReference
9+
{
10+
private const float GridDiameter = 146.25f;
11+
12+
/// <summary>Formats a grid reference, or raw rounded coordinates when <paramref name="dims"/> is null.</summary>
13+
/// <param name="x">World X coordinate.</param>
14+
/// <param name="y">World Y coordinate.</param>
15+
/// <param name="dims">Map dimensions, or null when unavailable.</param>
16+
/// <returns>A grid reference like "D7", or "(x, y)" when dimensions are unavailable.</returns>
17+
public static string From(float x, float y, MapDimensions? dims)
18+
{
19+
if (dims is null)
20+
{
21+
return string.Create(
22+
CultureInfo.InvariantCulture,
23+
$"({Math.Round(x)}, {Math.Round(y)})");
24+
}
25+
26+
var mapSize = dims.Width;
27+
var columns = (int)Math.Ceiling(mapSize / GridDiameter);
28+
var col = (int)Math.Floor(Math.Clamp(x, 0f, mapSize - 1) / GridDiameter);
29+
// Rows are numbered from the TOP; world Y increases upward, so invert.
30+
var rowFromBottom = (int)Math.Floor(Math.Clamp(y, 0f, mapSize - 1) / GridDiameter);
31+
var row = Math.Max(0, columns - rowFromBottom - 1);
32+
33+
return string.Create(CultureInfo.InvariantCulture, $"{ColumnLetters(col)}{row}");
34+
}
35+
36+
private static string ColumnLetters(int index)
37+
{
38+
// 0->A .. 25->Z, 26->AA .. (spreadsheet-style, matching rustplusplus past Z).
39+
var sb = new StringBuilder();
40+
var n = index;
41+
do
42+
{
43+
sb.Insert(0, (char)('A' + (n % 26)));
44+
n = (n / 26) - 1;
45+
} while (n >= 0);
46+
47+
return sb.ToString();
48+
}
49+
}

‎src/RustPlusBot.Features.Events/RustPlusBot.Features.Events.csproj‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<ItemGroup>
4+
<InternalsVisibleTo Include="RustPlusBot.Features.Events.Tests" />
5+
<InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
6+
</ItemGroup>
7+
8+
<ItemGroup>
9+
<ProjectReference Include="..\RustPlusBot.Abstractions\RustPlusBot.Abstractions.csproj" />
10+
<ProjectReference Include="..\RustPlusBot.Persistence\RustPlusBot.Persistence.csproj" />
11+
<ProjectReference Include="..\RustPlusBot.Discord\RustPlusBot.Discord.csproj" />
12+
<ProjectReference Include="..\RustPlusBot.Domain\RustPlusBot.Domain.csproj" />
13+
<ProjectReference Include="..\RustPlusBot.Features.Workspace\RustPlusBot.Features.Workspace.csproj" />
14+
<ProjectReference Include="..\RustPlusBot.Features.Connections\RustPlusBot.Features.Connections.csproj" />
15+
</ItemGroup>
16+
17+
<ItemGroup>
18+
<PackageReference Include="Discord.Net" />
19+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
20+
</ItemGroup>
21+
22+
</Project>

‎tests/RustPlusBot.Features.Events.Tests/Formatting/GridReferenceTests.cs‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
using RustPlusBot.Features.Connections.Listening;
2+
using RustPlusBot.Features.Events.Formatting;
3+
4+
namespace RustPlusBot.Features.Events.Tests.Formatting;
5+
6+
public sealed class GridReferenceTests
7+
{
8+
[Fact]
9+
public void Origin_is_top_left_cell()
10+
{
11+
// x near 0, y near top => column A, top row.
12+
var dims = new MapDimensions(4000u, 4000u, 500);
13+
var grid = GridReference.From(10f, 3990f, dims);
14+
15+
Assert.StartsWith("A", grid, StringComparison.Ordinal);
16+
}
17+
18+
[Fact]
19+
public void Null_dimensions_fall_back_to_raw_coordinates()
20+
{
21+
var grid = GridReference.From(1234.6f, 5678.4f, dims: null);
22+
23+
Assert.Equal("(1235, 5678)", grid);
24+
}
25+
26+
[Theory]
27+
[InlineData(0f, 4000f, "A")]
28+
[InlineData(150f, 4000f, "B")]
29+
public void Column_letter_advances_every_cell(float x, float y, string expectedColumnPrefix)
30+
{
31+
var dims = new MapDimensions(4000u, 4000u, 500);
32+
var grid = GridReference.From(x, y, dims);
33+
Assert.StartsWith(expectedColumnPrefix, grid, StringComparison.Ordinal);
34+
}
35+
}

‎tests/RustPlusBot.Features.Events.Tests/RustPlusBot.Features.Events.Tests.csproj‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<ItemGroup>
4+
<PackageReference Include="coverlet.collector" />
5+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
6+
<PackageReference Include="NSubstitute" />
7+
<PackageReference Include="xunit" />
8+
<PackageReference Include="xunit.runner.visualstudio" />
9+
</ItemGroup>
10+
11+
<ItemGroup>
12+
<Using Include="Xunit" />
13+
</ItemGroup>
14+
15+
<ItemGroup>
16+
<ProjectReference Include="..\..\src\RustPlusBot.Features.Events\RustPlusBot.Features.Events.csproj" />
17+
<ProjectReference Include="..\..\src\RustPlusBot.Features.Connections\RustPlusBot.Features.Connections.csproj" />
18+
</ItemGroup>
19+
20+
</Project>

0 commit comments

Comments
 (0)