This commit is contained in:
dingo
2025-12-09 18:49:23 -05:00
parent 2a814b1d83
commit 7b21b26d8a
2 changed files with 89 additions and 1 deletions
+85 -1
View File
@@ -70,7 +70,8 @@ public sealed class DungeonHandler : IClientMessageHandler
DungeonOpCodes.EQUIP_ITEM,
DungeonOpCodes.UNEQUIP_ITEM,
DungeonOpCodes.USE_ITEM,
DungeonOpCodes.DROP_ITEM
DungeonOpCodes.DROP_ITEM,
DungeonOpCodes.CHAT_SEND
};
public async Task InitializeAsync()
@@ -191,6 +192,9 @@ public sealed class DungeonHandler : IClientMessageHandler
case DungeonOpCodes.USE_ITEM:
await HandleUseItem(connection, session, payload, ct);
break;
case DungeonOpCodes.CHAT_SEND:
await HandleChatSend(connection, session, payload, ct);
break;
}
}
catch (Exception ex)
@@ -1241,7 +1245,83 @@ public sealed class DungeonHandler : IClientMessageHandler
_log.LogInformation("Dungeon session cleaned up for connection {Id}", connectionId);
}
}
/// <summary>
/// Handle chat message from player
/// </summary>
private async Task HandleChatSend(IConnection connection, DungeonPlayerSession session, ReadOnlyMemory<byte> payload, CancellationToken ct)
{
var json = System.Text.Encoding.UTF8.GetString(payload.Span);
var request = System.Text.Json.JsonSerializer.Deserialize<ChatSendRequest>(json);
if (request == null || string.IsNullOrWhiteSpace(request.Message)) return;
// Sanitize message (basic - remove excessive whitespace, limit length)
var message = request.Message.Trim();
if (message.Length > 200) message = message.Substring(0, 200);
var senderName = session.Character?.Name ?? "Unknown";
// Determine chat scope based on player state
if (session.CurrentDungeonId.HasValue && _dungeons.TryGetValue(session.CurrentDungeonId.Value, out var dungeon))
{
// In dungeon - broadcast to all players in same dungeon
foreach (var player in dungeon.Simulation.Players.Values)
{
await SendAsync(_playerSessions.Values.Where(p => p.CharacterId == player.CharacterId).FirstOrDefault().Connection, DungeonOpCodes.CHAT_MESSAGE, new
{
sender = senderName,
message = message,
type = "normal"
}, ct);
}
}
else
{
// In hub - broadcast to all connected players in hub
foreach (var playerSession in _playerSessions.Values.Where(p => !p.CurrentDungeonId.HasValue))
{
await SendAsync(playerSession.Connection, DungeonOpCodes.CHAT_MESSAGE, new
{
sender = senderName,
message = message,
type = "normal"
}, ct);
}
}
_log.LogDebug("Chat from {Player}: {Message}", senderName, message);
}
/// <summary>
/// Broadcast a system message to all players in a dungeon
/// </summary>
private async Task BroadcastSystemMessage(DungeonInstance dungeon, string message, CancellationToken ct)
{
foreach (var player in dungeon.Simulation.Players.Values)
{
await SendAsync(_playerSessions.Values.Where(p => p.CharacterId == player.CharacterId).FirstOrDefault().Connection, DungeonOpCodes.CHAT_MESSAGE, new
{
sender = "System",
message = message,
type = "system"
}, ct);
}
}
/// <summary>
/// Broadcast a system message to all connected players
/// </summary>
private async Task BroadcastGlobalSystemMessage(string message, CancellationToken ct)
{
foreach (var session in _playerSessions.Values)
{
await SendAsync(session.Connection, DungeonOpCodes.CHAT_MESSAGE, new
{
sender = "System",
message = message,
type = "system"
}, ct);
}
}
}
// Request/Input DTOs
@@ -1291,3 +1371,7 @@ public class UseItemRequest
{
public int SlotIndex { get; set; }
}
public class ChatSendRequest
{
public string Message { get; set; } = "";
}
+4
View File
@@ -41,4 +41,8 @@ public static class DungeonOpCodes
public const int UNEQUIP_ITEM = 253;
public const int USE_ITEM = 254;
public const int DROP_ITEM = 255;
// Chat (260-269)
public const int CHAT_SEND = 260;
public const int CHAT_MESSAGE = 261;
}