From 3bda36262639cc3f4061e9a56c1928319e3c166a Mon Sep 17 00:00:00 2001 From: Kyle Belanger Date: Sat, 13 Apr 2024 02:30:53 -0400 Subject: [PATCH] MailDeleteRequest stub to prevent mail deletion softlock And a bunch of TODOs. --- AscNet.GameServer/Handlers/AccountModule.cs | 3 ++- AscNet.GameServer/Handlers/BossModule.cs | 2 ++ AscNet.GameServer/Handlers/CoopModule.cs | 2 ++ AscNet.GameServer/Handlers/DormModule.cs | 2 ++ AscNet.GameServer/Handlers/EquipModule.cs | 1 + AscNet.GameServer/Handlers/GuildModule.cs | 1 + AscNet.GameServer/Handlers/ItemModule.cs | 1 + AscNet.GameServer/Handlers/MailModule.cs | 23 +++++++++++++++++++-- AscNet.GameServer/Handlers/PartnerModule.cs | 1 + AscNet.GameServer/Handlers/PlayerModule.cs | 4 +++- AscNet.GameServer/Handlers/ShopModule.cs | 1 + AscNet.GameServer/Handlers/TaskModule.cs | 3 ++- 12 files changed, 39 insertions(+), 5 deletions(-) diff --git a/AscNet.GameServer/Handlers/AccountModule.cs b/AscNet.GameServer/Handlers/AccountModule.cs index 816e9ccb..3e1695bc 100644 --- a/AscNet.GameServer/Handlers/AccountModule.cs +++ b/AscNet.GameServer/Handlers/AccountModule.cs @@ -133,13 +133,14 @@ namespace AscNet.GameServer.Handlers }, packet.Id); } - /* TODO + /* TODO Reconnection state resumption? [RequestPacketHandler("ReconnectAck")] public static void ReconnectAckHandler(Session session, Packet.Request packet) { } */ + // TODO: Promo code [RequestPacketHandler("UseCdKeyRequest")] public static void UseCdKeyRequestHandler(Session session, Packet.Request packet) { diff --git a/AscNet.GameServer/Handlers/BossModule.cs b/AscNet.GameServer/Handlers/BossModule.cs index 14b6864a..bc130660 100644 --- a/AscNet.GameServer/Handlers/BossModule.cs +++ b/AscNet.GameServer/Handlers/BossModule.cs @@ -31,12 +31,14 @@ namespace AscNet.GameServer.Handlers internal class BossModule { + // TODO: Pain Cage entry [RequestPacketHandler("BossSingleRankInfoRequest")] public static void BossSingleRankInfoRequestHandler(Session session, Packet.Request packet) { session.SendResponse(new BossSingleRankInfoResponse() { Code = 1 }, packet.Id); } + // TODO: Co-op entry [RequestPacketHandler("GetActivityBossDataRequest")] public static void GetActivityBossDataRequestHandler(Session session, Packet.Request packet) { diff --git a/AscNet.GameServer/Handlers/CoopModule.cs b/AscNet.GameServer/Handlers/CoopModule.cs index 0a6bd496..feac361f 100644 --- a/AscNet.GameServer/Handlers/CoopModule.cs +++ b/AscNet.GameServer/Handlers/CoopModule.cs @@ -35,12 +35,14 @@ namespace AscNet.GameServer.Handlers internal class CoopModule { + // TODO: Co-op room creation [RequestPacketHandler("CreateRoomRequest")] public static void CreateRoomRequestHandler(Session session, Packet.Request packet) { session.SendResponse(new CreateRoomResponse() { Code = 1 }, packet.Id); } + // TODO: Co-op room matchmaking [RequestPacketHandler("MatchRoomRequest")] public static void MatchRoomRequestHandler(Session session, Packet.Request packet) { diff --git a/AscNet.GameServer/Handlers/DormModule.cs b/AscNet.GameServer/Handlers/DormModule.cs index ede5ecba..b919e702 100644 --- a/AscNet.GameServer/Handlers/DormModule.cs +++ b/AscNet.GameServer/Handlers/DormModule.cs @@ -31,12 +31,14 @@ namespace AscNet.GameServer.Handlers internal class DormModule { + // TODO: Dorm entry [RequestPacketHandler("DormEnterRequest")] public static void DormEnterRequestHandler(Session session, Packet.Request packet) { session.SendResponse(new DormEnterResponse(), packet.Id); } + // TODO: Dorm list (called from Details section within account info menu) [RequestPacketHandler("DormitoryListRequest")] public static void DormitoryListRequestHandler(Session session, Packet.Request packet) { diff --git a/AscNet.GameServer/Handlers/EquipModule.cs b/AscNet.GameServer/Handlers/EquipModule.cs index 4813cdad..5f59e545 100644 --- a/AscNet.GameServer/Handlers/EquipModule.cs +++ b/AscNet.GameServer/Handlers/EquipModule.cs @@ -346,6 +346,7 @@ namespace AscNet.GameServer.Handlers session.SendResponse(new EquipResonanceResponse() { ResonanceData = resonance }, packet.Id); } + // TODO: Equipment scrapping [RequestPacketHandler("EquipDecomposeRequest")] public static void EquipDecomposeRequestHandler(Session session, Packet.Request packet) { diff --git a/AscNet.GameServer/Handlers/GuildModule.cs b/AscNet.GameServer/Handlers/GuildModule.cs index def91622..2a689a9b 100644 --- a/AscNet.GameServer/Handlers/GuildModule.cs +++ b/AscNet.GameServer/Handlers/GuildModule.cs @@ -22,6 +22,7 @@ namespace AscNet.GameServer.Handlers internal class GuildModule { + // TODO: Guild listing [RequestPacketHandler("GuildListRecommendRequest")] public static void GuildListRecommendRequestHandler(Session session, Packet.Request packet) { diff --git a/AscNet.GameServer/Handlers/ItemModule.cs b/AscNet.GameServer/Handlers/ItemModule.cs index 86ba7a48..8cb9e8d9 100644 --- a/AscNet.GameServer/Handlers/ItemModule.cs +++ b/AscNet.GameServer/Handlers/ItemModule.cs @@ -40,6 +40,7 @@ namespace AscNet.GameServer.Handlers }, packet.Id); } + // TODO: Consumable item usage [RequestPacketHandler("ItemUseRequest")] public static void ItemUseRequestHandler(Session session, Packet.Request packet) { diff --git a/AscNet.GameServer/Handlers/MailModule.cs b/AscNet.GameServer/Handlers/MailModule.cs index 1ee8bfe2..198bb2dd 100644 --- a/AscNet.GameServer/Handlers/MailModule.cs +++ b/AscNet.GameServer/Handlers/MailModule.cs @@ -4,26 +4,45 @@ namespace AscNet.GameServer.Handlers { #region MsgPackScheme #pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. + [MessagePackObject(true)] + public class MailReadRequest + { + public string Id; + } + [MessagePackObject(true)] public class MailReadResponse { public int Code; } + + [MessagePackObject(true)] + public class MailDeleteRequest + { + } [MessagePackObject(true)] - public class MailReadRequest + public class MailDeleteResponse { - public string Id; + public int Code; } #pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. #endregion internal class MailModule { + // TODO: Read mail [RequestPacketHandler("MailReadRequest")] public static void MailReadRequestHandler(Session session, Packet.Request packet) { session.SendResponse(new MailReadResponse(), packet.Id); } + + // TODO: Delete mail + [RequestPacketHandler("MailDeleteRequest")] + public static void MailDeleteRequestHandler(Session session, Packet.Request packet) + { + session.SendResponse(new MailDeleteResponse(), packet.Id); + } } } diff --git a/AscNet.GameServer/Handlers/PartnerModule.cs b/AscNet.GameServer/Handlers/PartnerModule.cs index e9579d16..d3596f07 100644 --- a/AscNet.GameServer/Handlers/PartnerModule.cs +++ b/AscNet.GameServer/Handlers/PartnerModule.cs @@ -22,6 +22,7 @@ namespace AscNet.GameServer.Handlers internal class PartnerModule { + // TODO: CUB combining [RequestPacketHandler("PartnerComposeRequest")] public static void PartnerComposeRequestHandler(Session session, Packet.Request packet) { diff --git a/AscNet.GameServer/Handlers/PlayerModule.cs b/AscNet.GameServer/Handlers/PlayerModule.cs index 372b066f..e21de6b6 100644 --- a/AscNet.GameServer/Handlers/PlayerModule.cs +++ b/AscNet.GameServer/Handlers/PlayerModule.cs @@ -261,12 +261,14 @@ namespace AscNet.GameServer.Handlers session.SendResponse(new SetDisplayCharIdFirstResponse() { DisplayCharIdList = session.player.PlayerData.DisplayCharIdList }, packet.Id); } + // TODO: "Display Preview" button in Details section of account info menu [RequestPacketHandler("QueryPlayerDetailRequest")] public static void QueryPlayerDetailRequestHandler(Session session, Packet.Request packet) { session.SendResponse(new QueryPlayerDetailResponse() { Code = 1 }, packet.Id); } - + + // TODO: "Save" button in Details section of account info menu [RequestPacketHandler("SetAppearanceRequest")] public static void SetAppearanceRequestHandler(Session session, Packet.Request packet) { diff --git a/AscNet.GameServer/Handlers/ShopModule.cs b/AscNet.GameServer/Handlers/ShopModule.cs index c857e887..a8216f48 100644 --- a/AscNet.GameServer/Handlers/ShopModule.cs +++ b/AscNet.GameServer/Handlers/ShopModule.cs @@ -45,6 +45,7 @@ namespace AscNet.GameServer.Handlers session.SendResponse(rsp, packet.Id); } + // TODO: Dorm shop [RequestPacketHandler("GetShopBaseInfoRequest")] public static void GetShopBaseInfoRequestHandler(Session session, Packet.Request packet) { diff --git a/AscNet.GameServer/Handlers/TaskModule.cs b/AscNet.GameServer/Handlers/TaskModule.cs index a47fe2f8..73eb607d 100644 --- a/AscNet.GameServer/Handlers/TaskModule.cs +++ b/AscNet.GameServer/Handlers/TaskModule.cs @@ -27,7 +27,8 @@ namespace AscNet.GameServer.Handlers { session.SendResponse(new DoClientTaskEventResponse(), packet.Id); } - + + // TODO: Reward acquisition from course reward line in Tasks menu [RequestPacketHandler("GetCourseRewardRequest")] public static void GetCourseRewardRequestHandler(Session session, Packet.Request packet) {