From 086a1e15bb2ff8b8a497ba3934e76a24da7eeb63 Mon Sep 17 00:00:00 2001 From: dingo Date: Tue, 16 Dec 2025 15:51:56 -0500 Subject: [PATCH] Fixing Escape --- Game/Dungeon/DungeonHandler.cs | 25 ++++++++++++++++++++++++- Networking/Messages/DungeonOpCodes.cs | 1 + 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/Game/Dungeon/DungeonHandler.cs b/Game/Dungeon/DungeonHandler.cs index f34a8da..ecc2302 100644 --- a/Game/Dungeon/DungeonHandler.cs +++ b/Game/Dungeon/DungeonHandler.cs @@ -646,7 +646,7 @@ public sealed class DungeonHandler : IClientMessageHandler foreach (var session in playersInDungeon) { // Check escape completion (5 seconds = 100 ticks) - if (session.IsEscaping && _currentTick - session.EscapeStartTick >= 100) + if (session.IsEscaping && _currentTick - session.EscapeStartTick >= 400) { _ = CompleteEscapeAsync(session); continue; @@ -1199,6 +1199,29 @@ public sealed class DungeonHandler : IClientMessageHandler await RemoveFromDungeonAsync(session, true, CancellationToken.None); await SendAsync(session.Connection, DungeonOpCodes.HUB_STATE, GetHubState(session.Character), CancellationToken.None); } + /// + /// Handle dungeon cleared - return player to hub with all loot + /// + private async Task HandleDungeonClearedAsync(DungeonPlayerSession session) + { + _log.LogInformation("Dungeon cleared! Returning player {Name} to hub", session.Character.Name); + + // Send dungeon cleared notification + await SendAsync(session.Connection, DungeonOpCodes.DUNGEON_STATE, new + { + phase = "cleared", + message = "Dungeon cleared! All enemies defeated." + }, CancellationToken.None); + + // Small delay to let client see the message + await Task.Delay(2000); + + // Remove from dungeon (extracted = true, so they keep XP and loot) + await RemoveFromDungeonAsync(session, true, CancellationToken.None); + + // Send hub state + await SendAsync(session.Connection, DungeonOpCodes.HUB_STATE, GetHubState(session.Character), CancellationToken.None); + } private async Task HandlePlayerDeathAsync(DungeonPlayerSession session) { diff --git a/Networking/Messages/DungeonOpCodes.cs b/Networking/Messages/DungeonOpCodes.cs index d872df0..0b5fd19 100644 --- a/Networking/Messages/DungeonOpCodes.cs +++ b/Networking/Messages/DungeonOpCodes.cs @@ -33,6 +33,7 @@ public static class DungeonOpCodes public const int EVENT_LEVELUP = 502; public const int EVENT_LOOT = 503; public const int LOOT_RECEIVED = 160; + public const int DUNGEON_CLEARED = 304; // Inventory (250-259) public const int INVENTORY_REQUEST = 250;