From b861e65090d57259ee229df2a8e01762e4fcefce Mon Sep 17 00:00:00 2001 From: dingo Date: Mon, 26 Jan 2026 11:40:49 -0500 Subject: [PATCH] HotBar Fix and DTO Splitting --- Game/Dungeon/DungeonHandler.cs | 161 +------------------- Networking/DTOs/AttackInput.cs | 7 + Networking/DTOs/ChatSendRequest.cs | 7 + Networking/DTOs/ChestInput.cs | 7 + Networking/DTOs/CraftingAttemptRequest.cs | 17 +++ Networking/DTOs/CraftingIngredientInput.cs | 11 ++ Networking/DTOs/DungeonCreateRequest.cs | 8 + Networking/DTOs/DungeonEnterRequest.cs | 7 + Networking/DTOs/DungeonJoinRequest.cs | 7 + Networking/DTOs/EquipItemRequest.cs | 7 + Networking/DTOs/FireProjectileInput.cs | 8 + Networking/DTOs/LootChestCloseRequest.cs | 7 + Networking/DTOs/LootChestOpenRequest.cs | 7 + Networking/DTOs/LootChestTakeAllRequest.cs | 7 + Networking/DTOs/LootChestTakeItemRequest.cs | 9 ++ Networking/DTOs/MobLootRequest.cs | 8 + Networking/DTOs/MobLootTakeAllRequest.cs | 8 + Networking/DTOs/MobLootTakeItemRequest.cs | 11 ++ Networking/DTOs/MoveInput.cs | 9 ++ Networking/DTOs/PickupInput.cs | 7 + Networking/DTOs/PortalUseRequest.cs | 7 + Networking/DTOs/StashDepositRequest.cs | 14 ++ Networking/DTOs/StashWithdrawRequest.cs | 11 ++ Networking/DTOs/StatAllocateRequest.cs | 7 + Networking/DTOs/UnequipItemRequest.cs | 7 + Networking/DTOs/UseItemRequest.cs | 7 + 26 files changed, 213 insertions(+), 160 deletions(-) create mode 100644 Networking/DTOs/AttackInput.cs create mode 100644 Networking/DTOs/ChatSendRequest.cs create mode 100644 Networking/DTOs/ChestInput.cs create mode 100644 Networking/DTOs/CraftingAttemptRequest.cs create mode 100644 Networking/DTOs/CraftingIngredientInput.cs create mode 100644 Networking/DTOs/DungeonCreateRequest.cs create mode 100644 Networking/DTOs/DungeonEnterRequest.cs create mode 100644 Networking/DTOs/DungeonJoinRequest.cs create mode 100644 Networking/DTOs/EquipItemRequest.cs create mode 100644 Networking/DTOs/FireProjectileInput.cs create mode 100644 Networking/DTOs/LootChestCloseRequest.cs create mode 100644 Networking/DTOs/LootChestOpenRequest.cs create mode 100644 Networking/DTOs/LootChestTakeAllRequest.cs create mode 100644 Networking/DTOs/LootChestTakeItemRequest.cs create mode 100644 Networking/DTOs/MobLootRequest.cs create mode 100644 Networking/DTOs/MobLootTakeAllRequest.cs create mode 100644 Networking/DTOs/MobLootTakeItemRequest.cs create mode 100644 Networking/DTOs/MoveInput.cs create mode 100644 Networking/DTOs/PickupInput.cs create mode 100644 Networking/DTOs/PortalUseRequest.cs create mode 100644 Networking/DTOs/StashDepositRequest.cs create mode 100644 Networking/DTOs/StashWithdrawRequest.cs create mode 100644 Networking/DTOs/StatAllocateRequest.cs create mode 100644 Networking/DTOs/UnequipItemRequest.cs create mode 100644 Networking/DTOs/UseItemRequest.cs diff --git a/Game/Dungeon/DungeonHandler.cs b/Game/Dungeon/DungeonHandler.cs index ca83926..a0dc15a 100644 --- a/Game/Dungeon/DungeonHandler.cs +++ b/Game/Dungeon/DungeonHandler.cs @@ -12,6 +12,7 @@ using Server.Networking.Messages; using Server.Redis; using GameServices; using GameServices.Auth; +using GameServer.Networking.DTOs; namespace GameServer.Dungeon; @@ -4462,117 +4463,6 @@ public sealed partial class DungeonHandler : IClientMessageHandler // Request/Input DTOs -public class StatAllocateRequest -{ - public string Stat { get; set; } = ""; -} - -public class DungeonEnterRequest -{ - public int Tier { get; set; } = 1; -} - -public class MoveInput -{ - public float Dx { get; set; } - public float Dy { get; set; } - public float AimAngle { get; set; } -} - -public class AttackInput -{ - public float AimAngle { get; set; } -} - -public class PickupInput -{ - public ulong ItemId { get; set; } -} - -public class ChestInput -{ - public ulong ChestId { get; set; } -} -public class EquipItemRequest -{ - public int SlotIndex { get; set; } -} - -public class UnequipItemRequest -{ - public string Slot { get; set; } = ""; -} - -public class UseItemRequest -{ - public int SlotIndex { get; set; } -} -public class ChatSendRequest -{ - public string Message { get; set; } = ""; -} - -public class PortalUseRequest -{ - public int PortalId { get; set; } -} - -public class LootChestOpenRequest -{ - public int ChestId { get; set; } -} - -public class LootChestTakeItemRequest -{ - public int ChestId { get; set; } - public int SlotIndex { get; set; } - public int TargetSlotIndex { get; set; } // Where to put it in player inventory (-1 for auto) -} - -public class LootChestTakeAllRequest -{ - public int ChestId { get; set; } -} - -public class LootChestCloseRequest -{ - public int ChestId { get; set; } -} - -public class DungeonCreateRequest -{ - public int Tier { get; set; } - public int BracketMin { get; set; } // 0 = use player's natural bracket, otherwise specify bracket start level -} - -public class DungeonJoinRequest -{ - public string DungeonId { get; set; } = ""; -} - -public class CraftingAttemptRequest -{ - [System.Text.Json.Serialization.JsonPropertyName("RecipeId")] - public int RecipeId { get; set; } - - [System.Text.Json.Serialization.JsonPropertyName("Ingredients")] - public List? Ingredients { get; set; } - - [System.Text.Json.Serialization.JsonPropertyName("Discover")] - public bool Discover { get; set; } - - [System.Text.Json.Serialization.JsonPropertyName("SkillType")] - public int? SkillType { get; set; } -} - -public class CraftingIngredientInput -{ - [System.Text.Json.Serialization.JsonPropertyName("itemDefinitionId")] - public int ItemDefinitionId { get; set; } - - [System.Text.Json.Serialization.JsonPropertyName("quantity")] - public int Quantity { get; set; } -} #region Stash System (VIP Feature) @@ -5083,54 +4973,5 @@ public partial class DungeonHandler #endregion } -// Request DTOs for stash operations -public class StashDepositRequest -{ - [System.Text.Json.Serialization.JsonPropertyName("inventorySlot")] - public int InventorySlot { get; set; } - - [System.Text.Json.Serialization.JsonPropertyName("quantity")] - public int Quantity { get; set; } = 1; - - [System.Text.Json.Serialization.JsonPropertyName("targetSlot")] - public int TargetSlot { get; set; } = -1; -} - -public class StashWithdrawRequest -{ - [System.Text.Json.Serialization.JsonPropertyName("stashSlot")] - public int StashSlot { get; set; } - - [System.Text.Json.Serialization.JsonPropertyName("quantity")] - public int Quantity { get; set; } = 1; -} - -public class FireProjectileInput -{ - public float DirectionX { get; set; } - public float DirectionY { get; set; } -} - -// Mob loot request DTOs -public class MobLootRequest -{ - [System.Text.Json.Serialization.JsonPropertyName("mobId")] - public int MobId { get; set; } -} - -public class MobLootTakeItemRequest -{ - [System.Text.Json.Serialization.JsonPropertyName("mobId")] - public int MobId { get; set; } - - [System.Text.Json.Serialization.JsonPropertyName("itemIndex")] - public int ItemIndex { get; set; } -} - -public class MobLootTakeAllRequest -{ - [System.Text.Json.Serialization.JsonPropertyName("mobId")] - public int MobId { get; set; } -} #endregion diff --git a/Networking/DTOs/AttackInput.cs b/Networking/DTOs/AttackInput.cs new file mode 100644 index 0000000..15a69ff --- /dev/null +++ b/Networking/DTOs/AttackInput.cs @@ -0,0 +1,7 @@ +namespace GameServer.Networking.DTOs +{ + public class AttackInput + { + public float AimAngle { get; set; } + } +} diff --git a/Networking/DTOs/ChatSendRequest.cs b/Networking/DTOs/ChatSendRequest.cs new file mode 100644 index 0000000..df51cd5 --- /dev/null +++ b/Networking/DTOs/ChatSendRequest.cs @@ -0,0 +1,7 @@ +namespace GameServer.Networking.DTOs +{ + public class ChatSendRequest + { + public string Message { get; set; } = ""; + } +} diff --git a/Networking/DTOs/ChestInput.cs b/Networking/DTOs/ChestInput.cs new file mode 100644 index 0000000..3b34af9 --- /dev/null +++ b/Networking/DTOs/ChestInput.cs @@ -0,0 +1,7 @@ +namespace GameServer.Networking.DTOs +{ + public class ChestInput + { + public ulong ChestId { get; set; } + } +} diff --git a/Networking/DTOs/CraftingAttemptRequest.cs b/Networking/DTOs/CraftingAttemptRequest.cs new file mode 100644 index 0000000..eaf508f --- /dev/null +++ b/Networking/DTOs/CraftingAttemptRequest.cs @@ -0,0 +1,17 @@ +namespace GameServer.Networking.DTOs +{ + public class CraftingAttemptRequest + { + [System.Text.Json.Serialization.JsonPropertyName("RecipeId")] + public int RecipeId { get; set; } + + [System.Text.Json.Serialization.JsonPropertyName("Ingredients")] + public List? Ingredients { get; set; } + + [System.Text.Json.Serialization.JsonPropertyName("Discover")] + public bool Discover { get; set; } + + [System.Text.Json.Serialization.JsonPropertyName("SkillType")] + public int? SkillType { get; set; } + } +} diff --git a/Networking/DTOs/CraftingIngredientInput.cs b/Networking/DTOs/CraftingIngredientInput.cs new file mode 100644 index 0000000..c2290c2 --- /dev/null +++ b/Networking/DTOs/CraftingIngredientInput.cs @@ -0,0 +1,11 @@ +namespace GameServer.Networking.DTOs +{ + public class CraftingIngredientInput + { + [System.Text.Json.Serialization.JsonPropertyName("itemDefinitionId")] + public int ItemDefinitionId { get; set; } + + [System.Text.Json.Serialization.JsonPropertyName("quantity")] + public int Quantity { get; set; } + } +} diff --git a/Networking/DTOs/DungeonCreateRequest.cs b/Networking/DTOs/DungeonCreateRequest.cs new file mode 100644 index 0000000..e11393e --- /dev/null +++ b/Networking/DTOs/DungeonCreateRequest.cs @@ -0,0 +1,8 @@ +namespace GameServer.Networking.DTOs +{ + public class DungeonCreateRequest + { + public int Tier { get; set; } + public int BracketMin { get; set; } // 0 = use player's natural bracket, otherwise specify bracket start level + } +} diff --git a/Networking/DTOs/DungeonEnterRequest.cs b/Networking/DTOs/DungeonEnterRequest.cs new file mode 100644 index 0000000..4cc35fc --- /dev/null +++ b/Networking/DTOs/DungeonEnterRequest.cs @@ -0,0 +1,7 @@ +namespace GameServer.Networking.DTOs +{ + public class DungeonEnterRequest + { + public int Tier { get; set; } = 1; + } +} diff --git a/Networking/DTOs/DungeonJoinRequest.cs b/Networking/DTOs/DungeonJoinRequest.cs new file mode 100644 index 0000000..1626252 --- /dev/null +++ b/Networking/DTOs/DungeonJoinRequest.cs @@ -0,0 +1,7 @@ +namespace GameServer.Networking.DTOs +{ + public class DungeonJoinRequest + { + public string DungeonId { get; set; } = ""; + } +} diff --git a/Networking/DTOs/EquipItemRequest.cs b/Networking/DTOs/EquipItemRequest.cs new file mode 100644 index 0000000..8db2f73 --- /dev/null +++ b/Networking/DTOs/EquipItemRequest.cs @@ -0,0 +1,7 @@ +namespace GameServer.Networking.DTOs +{ + public class EquipItemRequest + { + public int SlotIndex { get; set; } + } +} diff --git a/Networking/DTOs/FireProjectileInput.cs b/Networking/DTOs/FireProjectileInput.cs new file mode 100644 index 0000000..1904e87 --- /dev/null +++ b/Networking/DTOs/FireProjectileInput.cs @@ -0,0 +1,8 @@ +namespace GameServer.Networking.DTOs +{ + public class FireProjectileInput + { + public float DirectionX { get; set; } + public float DirectionY { get; set; } + } +} diff --git a/Networking/DTOs/LootChestCloseRequest.cs b/Networking/DTOs/LootChestCloseRequest.cs new file mode 100644 index 0000000..ce9659b --- /dev/null +++ b/Networking/DTOs/LootChestCloseRequest.cs @@ -0,0 +1,7 @@ +namespace GameServer.Networking.DTOs +{ + public class LootChestCloseRequest + { + public int ChestId { get; set; } + } +} diff --git a/Networking/DTOs/LootChestOpenRequest.cs b/Networking/DTOs/LootChestOpenRequest.cs new file mode 100644 index 0000000..b42c2e2 --- /dev/null +++ b/Networking/DTOs/LootChestOpenRequest.cs @@ -0,0 +1,7 @@ +namespace GameServer.Networking.DTOs +{ + public class LootChestOpenRequest + { + public int ChestId { get; set; } + } +} diff --git a/Networking/DTOs/LootChestTakeAllRequest.cs b/Networking/DTOs/LootChestTakeAllRequest.cs new file mode 100644 index 0000000..a82472a --- /dev/null +++ b/Networking/DTOs/LootChestTakeAllRequest.cs @@ -0,0 +1,7 @@ +namespace GameServer.Networking.DTOs +{ + public class LootChestTakeAllRequest + { + public int ChestId { get; set; } + } +} diff --git a/Networking/DTOs/LootChestTakeItemRequest.cs b/Networking/DTOs/LootChestTakeItemRequest.cs new file mode 100644 index 0000000..1fd029f --- /dev/null +++ b/Networking/DTOs/LootChestTakeItemRequest.cs @@ -0,0 +1,9 @@ +namespace GameServer.Networking.DTOs +{ + public class LootChestTakeItemRequest + { + public int ChestId { get; set; } + public int SlotIndex { get; set; } + public int TargetSlotIndex { get; set; } // Where to put it in player inventory (-1 for auto) + } +} diff --git a/Networking/DTOs/MobLootRequest.cs b/Networking/DTOs/MobLootRequest.cs new file mode 100644 index 0000000..5037aa4 --- /dev/null +++ b/Networking/DTOs/MobLootRequest.cs @@ -0,0 +1,8 @@ +namespace GameServer.Networking.DTOs +{ + public class MobLootRequest + { + [System.Text.Json.Serialization.JsonPropertyName("mobId")] + public int MobId { get; set; } + } +} diff --git a/Networking/DTOs/MobLootTakeAllRequest.cs b/Networking/DTOs/MobLootTakeAllRequest.cs new file mode 100644 index 0000000..588ad4f --- /dev/null +++ b/Networking/DTOs/MobLootTakeAllRequest.cs @@ -0,0 +1,8 @@ +namespace GameServer.Networking.DTOs +{ + public class MobLootTakeAllRequest + { + [System.Text.Json.Serialization.JsonPropertyName("mobId")] + public int MobId { get; set; } + } +} diff --git a/Networking/DTOs/MobLootTakeItemRequest.cs b/Networking/DTOs/MobLootTakeItemRequest.cs new file mode 100644 index 0000000..e6cb042 --- /dev/null +++ b/Networking/DTOs/MobLootTakeItemRequest.cs @@ -0,0 +1,11 @@ +namespace GameServer.Networking.DTOs +{ + public class MobLootTakeItemRequest + { + [System.Text.Json.Serialization.JsonPropertyName("mobId")] + public int MobId { get; set; } + + [System.Text.Json.Serialization.JsonPropertyName("itemIndex")] + public int ItemIndex { get; set; } + } +} diff --git a/Networking/DTOs/MoveInput.cs b/Networking/DTOs/MoveInput.cs new file mode 100644 index 0000000..cfdfc60 --- /dev/null +++ b/Networking/DTOs/MoveInput.cs @@ -0,0 +1,9 @@ +namespace GameServer.Networking.DTOs +{ + public class MoveInput + { + public float Dx { get; set; } + public float Dy { get; set; } + public float AimAngle { get; set; } + } +} diff --git a/Networking/DTOs/PickupInput.cs b/Networking/DTOs/PickupInput.cs new file mode 100644 index 0000000..9a89228 --- /dev/null +++ b/Networking/DTOs/PickupInput.cs @@ -0,0 +1,7 @@ +namespace GameServer.Networking.DTOs +{ + public class PickupInput + { + public ulong ItemId { get; set; } + } +} diff --git a/Networking/DTOs/PortalUseRequest.cs b/Networking/DTOs/PortalUseRequest.cs new file mode 100644 index 0000000..8e28424 --- /dev/null +++ b/Networking/DTOs/PortalUseRequest.cs @@ -0,0 +1,7 @@ +namespace GameServer.Networking.DTOs +{ + public class PortalUseRequest + { + public int PortalId { get; set; } + } +} diff --git a/Networking/DTOs/StashDepositRequest.cs b/Networking/DTOs/StashDepositRequest.cs new file mode 100644 index 0000000..e8f800d --- /dev/null +++ b/Networking/DTOs/StashDepositRequest.cs @@ -0,0 +1,14 @@ +namespace GameServer.Networking.DTOs +{ + public class StashDepositRequest + { + [System.Text.Json.Serialization.JsonPropertyName("inventorySlot")] + public int InventorySlot { get; set; } + + [System.Text.Json.Serialization.JsonPropertyName("quantity")] + public int Quantity { get; set; } = 1; + + [System.Text.Json.Serialization.JsonPropertyName("targetSlot")] + public int TargetSlot { get; set; } = -1; + } +} diff --git a/Networking/DTOs/StashWithdrawRequest.cs b/Networking/DTOs/StashWithdrawRequest.cs new file mode 100644 index 0000000..b7a0eb3 --- /dev/null +++ b/Networking/DTOs/StashWithdrawRequest.cs @@ -0,0 +1,11 @@ +namespace GameServer.Networking.DTOs +{ + public class StashWithdrawRequest + { + [System.Text.Json.Serialization.JsonPropertyName("stashSlot")] + public int StashSlot { get; set; } + + [System.Text.Json.Serialization.JsonPropertyName("quantity")] + public int Quantity { get; set; } = 1; + } +} diff --git a/Networking/DTOs/StatAllocateRequest.cs b/Networking/DTOs/StatAllocateRequest.cs new file mode 100644 index 0000000..7fa5843 --- /dev/null +++ b/Networking/DTOs/StatAllocateRequest.cs @@ -0,0 +1,7 @@ +namespace GameServer.Networking.DTOs +{ + public class StatAllocateRequest + { + public string Stat { get; set; } = ""; + } +} diff --git a/Networking/DTOs/UnequipItemRequest.cs b/Networking/DTOs/UnequipItemRequest.cs new file mode 100644 index 0000000..06ad0b7 --- /dev/null +++ b/Networking/DTOs/UnequipItemRequest.cs @@ -0,0 +1,7 @@ +namespace GameServer.Networking.DTOs +{ + public class UnequipItemRequest + { + public string Slot { get; set; } = ""; + } +} diff --git a/Networking/DTOs/UseItemRequest.cs b/Networking/DTOs/UseItemRequest.cs new file mode 100644 index 0000000..3d1f34b --- /dev/null +++ b/Networking/DTOs/UseItemRequest.cs @@ -0,0 +1,7 @@ +namespace GameServer.Networking.DTOs +{ + public class UseItemRequest + { + public int SlotIndex { get; set; } + } +}