From 40a000be92f1cc6a02908d830973964a3d4edef3 Mon Sep 17 00:00:00 2001 From: dingo Date: Mon, 9 Feb 2026 08:32:09 -0500 Subject: [PATCH] Spatial config --- Game/Dungeon/DungeonHandler.Dungeons.cs | 2 + Game/Dungeon/DungeonHandler.cs | 26 +++++++++++- Game/Dungeon/DungeonPlayerSession.cs | 1 + Services/Admin/Pages/Server/Index.cshtml | 31 ++++++++++++++ Services/Admin/Pages/Server/Index.cshtml.cs | 45 ++++++++++++++++++++- 5 files changed, 103 insertions(+), 2 deletions(-) diff --git a/Game/Dungeon/DungeonHandler.Dungeons.cs b/Game/Dungeon/DungeonHandler.Dungeons.cs index fb2b4f1..f8ffae3 100644 --- a/Game/Dungeon/DungeonHandler.Dungeons.cs +++ b/Game/Dungeon/DungeonHandler.Dungeons.cs @@ -337,6 +337,7 @@ public sealed partial class DungeonHandler session.State = PlayerState.InDungeon; session.CurrentDungeonId = instance.Id; session.PlayerInstance = player; + session.InitialMobCatalogDungeonId = null; // Build visual tile data if V2 layout available object? tileSheets = null; @@ -414,6 +415,7 @@ public sealed partial class DungeonHandler mobs = instance.Simulation.Mobs.Values.Where(m => m.IsAlive).Select(m => new { id = m.Id, + definitionId = m.DefinitionId, name = m.Name, x = m.X, y = m.Y, diff --git a/Game/Dungeon/DungeonHandler.cs b/Game/Dungeon/DungeonHandler.cs index 9d3a47b..c3a95a8 100644 --- a/Game/Dungeon/DungeonHandler.cs +++ b/Game/Dungeon/DungeonHandler.cs @@ -742,6 +742,7 @@ public sealed partial class DungeonHandler : IClientMessageHandler session.State = PlayerState.InDungeon; session.CurrentDungeonId = dungeonId; session.PlayerInstance = player; + session.InitialMobCatalogDungeonId = null; // Build visual tile data if V2 layout available object? tileSheets = null; @@ -822,11 +823,16 @@ public sealed partial class DungeonHandler : IClientMessageHandler mobs = instance.Simulation.Mobs.Values.Select(m => new { id = m.Id, + definitionId = m.DefinitionId, name = m.Name, x = m.X, y = m.Y, health = m.Health, - maxHealth = m.MaxHealth + maxHealth = m.MaxHealth, + spriteConfig = string.IsNullOrEmpty(m.SpriteConfigJson) ? null : + System.Text.Json.JsonSerializer.Deserialize(m.SpriteConfigJson), + tintColor = m.TintColor, + scale = m.Scale }), chests = instance.Simulation.Chests.Values.Select(c => new { @@ -2792,6 +2798,8 @@ public sealed partial class DungeonHandler : IClientMessageHandler ? nearbyOrRelevantMobs : nearbyOrRelevantMobs.Where(m => m.TargetId == session.CharacterId).ToList(); var visibleMobIds = visibleMobs.Select(m => m.Id).ToHashSet(); + bool sendMobCatalog = session.CurrentDungeonId.HasValue && + session.InitialMobCatalogDungeonId != session.CurrentDungeonId; bool IsSelfPlayerEvent(EntityType type, int id) { @@ -2835,6 +2843,7 @@ public sealed partial class DungeonHandler : IClientMessageHandler mobs = visibleMobs.Select(m => new { id = m.Id, + definitionId = m.DefinitionId, name = m.Name, x = m.X, y = m.Y, @@ -2847,6 +2856,16 @@ public sealed partial class DungeonHandler : IClientMessageHandler tintColor = m.TintColor, scale = m.Scale }), + mobCatalog = sendMobCatalog ? sim.Mobs.Values.Select(m => new + { + id = m.Id, + definitionId = m.DefinitionId, + name = m.Name, + spriteConfig = string.IsNullOrEmpty(m.SpriteConfigJson) ? null : + System.Text.Json.JsonSerializer.Deserialize(m.SpriteConfigJson), + tintColor = m.TintColor, + scale = m.Scale + }) : null, chests = (sendSpatialThisTick ? sim.Chests.Values.Where(c => !spatialFiltering || IsNearby(c.X, c.Y)) : Enumerable.Empty()) .Select(c => new @@ -2979,6 +2998,10 @@ public sealed partial class DungeonHandler : IClientMessageHandler }; await SendAsync(session.Connection, DungeonOpCodes.DUNGEON_STATE, state, CancellationToken.None); + if (sendMobCatalog && session.CurrentDungeonId.HasValue) + { + session.InitialMobCatalogDungeonId = session.CurrentDungeonId.Value; + } } private async Task CompleteEscapeAsync(DungeonPlayerSession session) @@ -3041,6 +3064,7 @@ public sealed partial class DungeonHandler : IClientMessageHandler session.State = PlayerState.InHub; session.CurrentDungeonId = null; session.PlayerInstance = null; + session.InitialMobCatalogDungeonId = null; session.IsEscaping = false; } diff --git a/Game/Dungeon/DungeonPlayerSession.cs b/Game/Dungeon/DungeonPlayerSession.cs index c61726e..c4d1dd5 100644 --- a/Game/Dungeon/DungeonPlayerSession.cs +++ b/Game/Dungeon/DungeonPlayerSession.cs @@ -18,6 +18,7 @@ public class DungeonPlayerSession public PlayerState State { get; set; } = PlayerState.InHub; public Guid? CurrentDungeonId { get; set; } public PlayerInstance? PlayerInstance { get; set; } + public Guid? InitialMobCatalogDungeonId { get; set; } public bool IsEscaping { get; set; } public long EscapeStartTick { get; set; } diff --git a/Services/Admin/Pages/Server/Index.cshtml b/Services/Admin/Pages/Server/Index.cshtml index c262755..7a310b2 100644 --- a/Services/Admin/Pages/Server/Index.cshtml +++ b/Services/Admin/Pages/Server/Index.cshtml @@ -114,6 +114,37 @@ + +
+

Spatial Update Controls

+

Tune live dungeon state filtering to reduce client movement packet load.

+ +
+ @Html.AntiForgeryToken() + +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ +
+
+
diff --git a/Services/Admin/Pages/Server/Index.cshtml.cs b/Services/Admin/Pages/Server/Index.cshtml.cs index 87e4b00..bfd6e4c 100644 --- a/Services/Admin/Pages/Server/Index.cshtml.cs +++ b/Services/Admin/Pages/Server/Index.cshtml.cs @@ -3,6 +3,7 @@ using Microsoft.EntityFrameworkCore; using DataServer.Data; using Server.Redis; using System.Text.Json; +using GameServer.Dungeon; namespace GameServices.Admin.Pages.Server; @@ -10,15 +11,17 @@ public class IndexModel : AdminPageModel { private readonly GameDbContext _db; private readonly IRedisManager _redis; + private readonly DungeonHandler? _dungeonHandler; private readonly ILogger _logger; private static readonly List _recentBroadcasts = new(); private static readonly object _lock = new(); - public IndexModel(GameDbContext db, IRedisManager redis, ILogger logger) + public IndexModel(GameDbContext db, IRedisManager redis, ILogger logger, DungeonHandler? dungeonHandler = null) { _db = db; _redis = redis; _logger = logger; + _dungeonHandler = dungeonHandler; } public int ActiveConnections { get; set; } @@ -28,6 +31,9 @@ public class IndexModel : AdminPageModel public int TrackedAssets { get; set; } public List RecentBroadcasts { get; set; } = new(); + public bool SpatialFilterEnabled { get; set; } = true; + public float SpatialRadiusPx { get; set; } = 896f; + public int SpatialIntervalTicks { get; set; } = 1; [TempData] public string? Message { get; set; } @@ -60,6 +66,43 @@ public class IndexModel : AdminPageModel { RecentBroadcasts = _recentBroadcasts.OrderByDescending(b => b.SentAt).Take(10).ToList(); } + + if (_dungeonHandler != null) + { + var tuning = _dungeonHandler.GetSpatialUpdateTuning(); + SpatialFilterEnabled = tuning.enabled; + SpatialRadiusPx = tuning.radiusPx; + SpatialIntervalTicks = tuning.intervalTicks; + } + } + + public IActionResult OnPostUpdateSpatialAsync(bool spatialFilterEnabled, float spatialRadiusPx, int spatialIntervalTicks) + { + if (_dungeonHandler == null) + { + Message = "DungeonHandler is not available on this pod."; + IsError = true; + return RedirectToPage(); + } + + try + { + _dungeonHandler.SetSpatialFilterEnabled(spatialFilterEnabled); + _dungeonHandler.SetSpatialUpdateRangePx(spatialRadiusPx); + _dungeonHandler.SetSpatialUpdateIntervalTicks(spatialIntervalTicks); + + var updated = _dungeonHandler.GetSpatialUpdateTuning(); + Message = $"Spatial tuning updated: enabled={updated.enabled}, radius={updated.radiusPx:0}px, interval={updated.intervalTicks} tick(s)"; + IsError = false; + } + catch (Exception ex) + { + _logger.LogError(ex, "Failed to update spatial tuning"); + Message = $"Failed to update spatial tuning: {ex.Message}"; + IsError = true; + } + + return RedirectToPage(); } public async Task OnPostBroadcastAsync(string message, string messageType)