diff --git a/Game/Dungeon/DungeonHandler.cs b/Game/Dungeon/DungeonHandler.cs index e9ee4be..cf6026e 100644 --- a/Game/Dungeon/DungeonHandler.cs +++ b/Game/Dungeon/DungeonHandler.cs @@ -10,7 +10,6 @@ using Server.Networking; using Server.Networking.Handling; using Server.Networking.Messages; using Server.Services.Auth; -using SystemRevivalServer.Networking.Messages; namespace Server.Game.Dungeon; @@ -330,7 +329,26 @@ public sealed class DungeonHandler : IClientMessageHandler tier, seed, width = layout.Width, - height = layout.Height + height = layout.Height, + tiles = layout.SerializeTiles(), + spawn = new { x = player.X, y = player.Y }, + mobs = simulation.Mobs.Values.Select(m => new + { + id = m.Id, + name = m.Name, + x = m.X, + y = m.Y, + health = m.Health, + maxHealth = m.MaxHealth + }), + chests = simulation.Chests.Values.Select(c => new + { + id = c.Id, + x = c.X, + y = c.Y, + type = c.Type.ToString().ToLower(), + opened = c.IsOpened + }) }, ct); } @@ -371,7 +389,7 @@ public sealed class DungeonHandler : IClientMessageHandler var input = _ser.Deserialize(payload); - if (dungeon.Simulation.DroppedItems.TryRemove((int)input.ItemId, out var item)) + if (dungeon.Simulation.DroppedItems.TryRemove(input.ItemId, out var item)) { // TODO: Add to player inventory _log.LogDebug("Player {Name} picked up item {ItemId}", session.Character.Name, item.ItemDefinitionId); @@ -385,7 +403,7 @@ public sealed class DungeonHandler : IClientMessageHandler var input = _ser.Deserialize(payload); - if (dungeon.Simulation.Chests.TryGetValue((int)input.ChestId, out var chest) && !chest.IsOpened) + if (dungeon.Simulation.Chests.TryGetValue(input.ChestId, out var chest) && !chest.IsOpened) { chest.IsOpened = true; // TODO: Generate loot