Map visual overhaul: event-icon rotors, subtle trails, tunnels layer, player crosses + legend (#47)

* feat(map): composite event icons with correctly-placed rotors

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

* feat(map): soften motion trails to a faint dashed hint

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

* feat(map): persist a Tunnels layer toggle (defaults on)

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

* feat(map): render train tunnels as a separate toggleable layer

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

* test(map): isolate the tunnel-routing composer test (fix confounded layers)

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

* feat(map): add the Tunnels layer toggle button + localization

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

* feat(map): draw players as stable palette-colored crosses, drop name labels

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

* feat(map): build a player legend alongside the rendered PNG

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

* feat(map): attach the player legend as an embed on the map image

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Author: HandyS11

src/RustPlusBot.Domain/Map/ServerMapSettings.cs

@@ -29,6 +29,9 @@ public sealed class ServerMapSettings
     /// <summary>Whether oil rigs are styled by activation state.</summary>
     public bool ShowRigs { get; set; } = true;
 
+    /// <summary>Whether train-tunnel entrance icons are drawn (separate from monuments).</summary>
+    public bool ShowTunnels { get; set; } = true;
+
     /// <summary>Which grid convention the rendered map and event grid references use.</summary>
     public MapGridStyle GridStyle { get; set; } = MapGridStyle.InGame;
 }

src/RustPlusBot.Features.Map/Assets/MapIcons.cs

@@ -27,7 +27,7 @@ public static class MapIcons
     public static Image<Rgba32>? Marker(MarkerKind kind)
     {
         var key = KeyFor(kind);
-        return key is null ? null : Load(key);
+        return key is null ? null : Native(key);
     }
 
     /// <summary>Gets the marker icon scaled to fit a square box, or null when the kind has no icon.</summary>
@@ -38,16 +38,7 @@ public static class MapIcons
 
     /// <summary>Gets the travelling vendor icon.</summary>
     /// <returns>The cached vendor icon image, or null.</returns>
-    public static Image<Rgba32>? Vendor() => Load("vendor");
-
-    /// <summary>Gets the player position icon, or null when the asset is missing.</summary>
-    /// <returns>The player icon, or null.</returns>
-    public static Image<Rgba32>? Player() => Load("player");
-
-    /// <summary>Gets the player icon scaled to fit a square box, or null when the asset is missing.</summary>
-    /// <param name="size">The box edge length in pixels.</param>
-    /// <returns>The cached scaled icon, or null.</returns>
-    public static Image<Rgba32>? Player(int size) => Scaled("player", size);
+    public static Image<Rgba32>? Vendor() => Native("vendor");
 
     private static string? KeyFor(MarkerKind kind) => kind switch
     {
@@ -58,18 +49,27 @@ public static class MapIcons
         _ => null,
     };
 
-    private static Image<Rgba32>? Load(string key) => Cache.GetOrAdd(key, static k =>
+    private static Image<Rgba32>? Native(string? key) => key is null
+        ? null
+        : Cache.GetOrAdd(key, static k => k switch
+        {
+            "patrol" => MarkerIconComposer.Heli(),
+            "ch47" => MarkerIconComposer.Chinook(),
+            _ => LoadPng(k),
+        });
+
+    private static Image<Rgba32>? LoadPng(string key)
     {
         var asm = typeof(MapIcons).Assembly;
-        using var stream = asm.GetManifestResourceStream(ResourcePrefix + k + ".png");
+        using var stream = asm.GetManifestResourceStream(ResourcePrefix + key + ".png");
         return stream is null ? null : Image.Load<Rgba32>(stream);
-    });
+    }
 
     private static Image<Rgba32>? Scaled(string? key, int size) => key is null
         ? null
         : Cache.GetOrAdd($"{key}@{size}", _ =>
         {
-            var native = Load(key);
+            var native = Native(key);
             return native?.Clone(ctx => ctx.Resize(new ResizeOptions
             {
                 Mode = ResizeMode.Max, Size = new Size(size, size),

src/RustPlusBot.Features.Map/Assets/MarkerIconComposer.cs

@@ -0,0 +1,87 @@
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing;
+
+namespace RustPlusBot.Features.Map.Assets;
+
+/// <summary>
+/// Builds the patrol-heli and CH47 marker icons by compositing a grey body with rotor blade(s):
+/// the heli gets one blade on its hub, the CH47 gets two at its tandem-rotor positions. Blades are
+/// drawn into a copy of the body canvas, so the composite keeps the body's dimensions and rotates
+/// cleanly about its centre in <see cref="MapRenderer"/>. Offsets/scale are tuned against the
+/// reference art (verify visually on a rendered tile).
+/// </summary>
+internal static class MarkerIconComposer
+{
+    private const string ResourcePrefix = "RustPlusBot.Features.Map.Assets.icons.";
+
+    /// <summary>Main-rotor blade edge as a fraction of the body's shorter edge; spans past the fuselage.</summary>
+    private const float HeliBladeScale = 1.15f;
+
+    /// <summary>Each tandem-rotor blade edge as a fraction of the body's shorter edge; smaller than the body.</summary>
+    private const float ChinookBladeScale = 0.62f;
+
+    /// <summary>The single main-rotor hub offset, in body pixels (populated on first access).</summary>
+    internal static IReadOnlyList<PointF> HeliRotorOffsets { get; } = HeliOffsets();
+
+    /// <summary>The two tandem-rotor offsets (front, rear), in body pixels.</summary>
+    internal static IReadOnlyList<PointF> ChinookRotorOffsets { get; } = ChinookOffsets();
+
+    /// <summary>Builds the patrol-heli composite (body + one rotor blade on the hub).</summary>
+    /// <returns>The composited heli icon; caller owns disposal.</returns>
+    internal static Image<Rgba32> Heli() =>
+        Compose("heli", HeliRotorOffsets, HeliBladeScale);
+
+    /// <summary>Builds the CH47 composite (body + two rotor blades at the tandem positions).</summary>
+    /// <returns>The composited chinook icon; caller owns disposal.</returns>
+    internal static Image<Rgba32> Chinook() =>
+        Compose("chinook", ChinookRotorOffsets, ChinookBladeScale);
+
+    private static IReadOnlyList<PointF> HeliOffsets()
+    {
+        using var body = Load("heli");
+
+        // Hub sits slightly forward of centre.
+        return [new PointF(body.Width / 2f, body.Height * 0.44f)];
+    }
+
+    private static IReadOnlyList<PointF> ChinookOffsets()
+    {
+        using var body = Load("chinook");
+        var cx = body.Width / 2f;
+        return
+        [
+            new PointF(cx, body.Height * 0.20f), // front rotor
+            new PointF(cx, body.Height * 0.80f), // rear rotor
+        ];
+    }
+
+    private static Image<Rgba32> Compose(string bodyKey, IReadOnlyList<PointF> offsets, float bladeScale)
+    {
+        var canvas = Load(bodyKey); // returned to caller (cached by MapIcons); not disposed here
+        using var blade = Load("blade");
+        var edge = (int)(Math.Min(canvas.Width, canvas.Height) * bladeScale);
+        using var scaledBlade = blade.Clone(c => c.Resize(edge, edge));
+
+        canvas.Mutate(ctx =>
+        {
+            foreach (var offset in offsets)
+            {
+                var topLeft = new Point(
+                    (int)(offset.X - (scaledBlade.Width / 2f)),
+                    (int)(offset.Y - (scaledBlade.Height / 2f)));
+                ctx.DrawImage(scaledBlade, topLeft, 1f);
+            }
+        });
+
+        return canvas;
+    }
+
+    private static Image<Rgba32> Load(string key)
+    {
+        var asm = typeof(MarkerIconComposer).Assembly;
+        using var stream = asm.GetManifestResourceStream(ResourcePrefix + key + ".png")
+                           ?? throw new InvalidOperationException($"Embedded marker asset '{key}.png' not found.");
+        return Image.Load<Rgba32>(stream);
+    }
+}

src/RustPlusBot.Features.Map/Assets/TunnelTokens.cs

@@ -0,0 +1,14 @@
+namespace RustPlusBot.Features.Map.Assets;
+
+/// <summary>
+/// The Rust+ monument tokens that belong to the separately-toggleable Tunnels layer rather than the
+/// general Monuments layer. Trainyard and Military Tunnels stay ordinary monuments.
+/// </summary>
+public static class TunnelTokens
+{
+    /// <summary>The train-tunnel entrance and link tokens.</summary>
+    public static IReadOnlySet<string> All { get; } = new HashSet<string>(StringComparer.Ordinal)
+    {
+        "train_tunnel_display_name", "train_tunnel_link_display_name",
+    };
+}