From e3664d361422db66a92bf8f40d2854a02a8b41d6 Mon Sep 17 00:00:00 2001 From: Chomp Date: Tue, 4 Mar 2025 11:47:14 +0000 Subject: [PATCH] Comment improvements Made various variables static / readonly --- .../Core/Callbacks/AchievementCallbacks.cs | 10 +- Libraries/Core/Callbacks/BotCallbacks.cs | 20 +-- Libraries/Core/Callbacks/BuildsCallbacks.cs | 32 ++--- Libraries/Core/Callbacks/BundleCallbacks.cs | 9 +- .../Core/Callbacks/ClientLogCallbacks.cs | 7 +- .../Core/Callbacks/CustomizationCallbacks.cs | 38 ++--- Libraries/Core/Callbacks/DataCallbacks.cs | 70 ++------- Libraries/Core/Callbacks/DialogueCallbacks.cs | 134 +++++------------- Libraries/Core/Callbacks/GameCallbacks.cs | 73 ++-------- Libraries/Core/Callbacks/InraidCallbacks.cs | 12 +- Libraries/Core/Callbacks/LauncherCallbacks.cs | 4 +- Libraries/Core/Callbacks/LocationCallbacks.cs | 8 +- Libraries/Core/Callbacks/MatchCallbacks.cs | 82 ++--------- Libraries/Core/Callbacks/NoteCallbacks.cs | 24 ++-- Libraries/Core/Callbacks/NotifierCallbacks.cs | 2 +- Libraries/Core/Callbacks/PrestigeCallbacks.cs | 4 +- Libraries/Core/Callbacks/ProfileCallbacks.cs | 10 +- Libraries/Core/Callbacks/QuestCallbacks.cs | 4 +- Libraries/Core/Callbacks/RagfairCallbacks.cs | 2 +- Libraries/Core/Callbacks/TraderCallbacks.cs | 8 +- Libraries/Core/Callbacks/WeatherCallbacks.cs | 4 +- .../Controllers/CustomizationController.cs | 7 +- Libraries/Core/Controllers/GameController.cs | 3 +- .../Core/Controllers/HideoutController.cs | 24 ++-- .../Core/Controllers/InRaidController.cs | 3 +- .../Core/Controllers/InventoryController.cs | 4 +- .../Core/Controllers/LauncherController.cs | 6 +- Libraries/Core/Controllers/MatchController.cs | 29 ++-- Libraries/Core/Controllers/NoteController.cs | 30 ++-- .../Core/Controllers/NotifierController.cs | 5 +- .../Core/Controllers/PrestigeController.cs | 18 ++- .../Core/Controllers/ProfileController.cs | 104 ++++++++------ Libraries/Core/Controllers/QuestController.cs | 133 ++++++++++++++--- .../Generators/BotEquipmentModGenerator.cs | 19 ++- .../Core/Generators/BotInventoryGenerator.cs | 2 +- Libraries/Core/Helpers/BotGeneratorHelper.cs | 6 +- Libraries/Core/Helpers/BotHelper.cs | 5 +- .../Core/Helpers/BotWeaponGeneratorHelper.cs | 2 +- .../SptCommands/GiveCommand/GiveSptCommand.cs | 2 +- .../SPTFriend/Commands/HelloMessageHandler.cs | 2 +- Libraries/Core/Helpers/InRaidHelper.cs | 2 +- Libraries/Core/Helpers/InventoryHelper.cs | 2 +- Libraries/Core/Helpers/ItemHelper.cs | 10 +- Libraries/Core/Helpers/ProfileHelper.cs | 4 +- Libraries/Core/Helpers/RagfairOfferHelper.cs | 5 +- ...NoteActionData.cs => NoteActionRequest.cs} | 2 +- Libraries/Core/Models/Spt/Server/Locations.cs | 2 +- .../Routers/ItemEvents/NoteItemEventRouter.cs | 6 +- .../BaseInteractionRequestDataConverter.cs | 2 +- .../HideoutCraftQuestIdGenerator.cs | 4 +- 50 files changed, 427 insertions(+), 573 deletions(-) rename Libraries/Core/Models/Eft/Notes/{NoteActionData.cs => NoteActionRequest.cs} (89%) diff --git a/Libraries/Core/Callbacks/AchievementCallbacks.cs b/Libraries/Core/Callbacks/AchievementCallbacks.cs index 6a65a474..5c4e8fea 100644 --- a/Libraries/Core/Callbacks/AchievementCallbacks.cs +++ b/Libraries/Core/Callbacks/AchievementCallbacks.cs @@ -14,11 +14,8 @@ public class AchievementCallbacks( /// /// Handle client/achievement/list /// - /// - /// - /// Session/player id /// - public string GetAchievements(string url, EmptyRequestData info, string sessionID) + public string GetAchievements(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.GetBody(_achievementController.GetAchievements(sessionID)); } @@ -26,11 +23,8 @@ public class AchievementCallbacks( /// /// Handle client/achievement/statistic /// - /// - /// - /// Session/player id /// - public string Statistic(string url, EmptyRequestData info, string sessionID) + public string Statistic(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.GetBody(_achievementController.GetAchievementStatics(sessionID)); } diff --git a/Libraries/Core/Callbacks/BotCallbacks.cs b/Libraries/Core/Callbacks/BotCallbacks.cs index 73fde8ab..00b6fc95 100644 --- a/Libraries/Core/Callbacks/BotCallbacks.cs +++ b/Libraries/Core/Callbacks/BotCallbacks.cs @@ -19,11 +19,8 @@ public class BotCallbacks( /// Handle singleplayer/settings/bot/limit /// Is called by client to define each bot roles wave limit /// - /// - /// - /// Session/player id /// - public string GetBotLimit(string url, EmptyRequestData info, string sessionID) + public string GetBotLimit(string url, EmptyRequestData _, string sessionID) { var splitUrl = url.Split('/'); var type = splitUrl[^1]; @@ -33,11 +30,8 @@ public class BotCallbacks( /// /// Handle singleplayer/settings/bot/difficulty /// - /// - /// - /// Session/player id /// - public string GetBotDifficulty(string url, EmptyRequestData info, string sessionID) + public string GetBotDifficulty(string url, EmptyRequestData _, string sessionID) { var splitUrl = url.Split('/'); var type = splitUrl[^2].ToLower(); @@ -56,11 +50,8 @@ public class BotCallbacks( /// /// Handle singleplayer/settings/bot/difficulties /// - /// - /// - /// Session/player id /// - public string GetAllBotDifficulties(string url, EmptyRequestData info, string sessionID) + public string GetAllBotDifficulties(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.NoBody(_botController.GetAllBotDifficulties()); } @@ -68,9 +59,6 @@ public class BotCallbacks( /// /// Handle client/game/bot/generate /// - /// - /// - /// Session/player id /// public string GenerateBots(string url, GenerateBotsRequestData info, string sessionID) { @@ -81,7 +69,7 @@ public class BotCallbacks( /// Handle singleplayer/settings/bot/maxCap /// /// - public string GetBotCap(string url, EmptyRequestData info, string sessionID) + public string GetBotCap(string url, EmptyRequestData _, string sessionID) { var splitUrl = url.Split('/'); var location = splitUrl[^1]; diff --git a/Libraries/Core/Callbacks/BuildsCallbacks.cs b/Libraries/Core/Callbacks/BuildsCallbacks.cs index d0c50efc..f9b9a2c4 100644 --- a/Libraries/Core/Callbacks/BuildsCallbacks.cs +++ b/Libraries/Core/Callbacks/BuildsCallbacks.cs @@ -16,11 +16,8 @@ public class BuildsCallbacks( /// /// Handle client/builds/list /// - /// - /// - /// Session/player id /// - public string GetBuilds(string url, EmptyRequestData info, string sessionID) + public string GetBuilds(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.GetBody(_buildController.GetUserBuilds(sessionID)); } @@ -29,51 +26,42 @@ public class BuildsCallbacks( /// Handle client/builds/magazine/save /// /// - /// + /// /// Session/player id /// - public string CreateMagazineTemplate(string url, SetMagazineRequest info, string sessionID) + public string CreateMagazineTemplate(string url, SetMagazineRequest request, string sessionID) { - _buildController.CreateMagazineTemplate(sessionID, info); + _buildController.CreateMagazineTemplate(sessionID, request); return _httpResponseUtil.NullResponse(); } /// /// Handle client/builds/weapon/save /// - /// - /// - /// Session/player id /// - public string SetWeapon(string url, PresetBuildActionRequestData info, string sessionID) + public string SetWeapon(string url, PresetBuildActionRequestData request, string sessionID) { - _buildController.SaveWeaponBuild(sessionID, info); + _buildController.SaveWeaponBuild(sessionID, request); return _httpResponseUtil.NullResponse(); } /// /// Handle client/builds/equipment/save /// - /// - /// - /// Session/player id /// - public string SetEquipment(string url, PresetBuildActionRequestData info, string sessionID) + public string SetEquipment(string url, PresetBuildActionRequestData request, string sessionID) { - _buildController.SaveEquipmentBuild(sessionID, info); + _buildController.SaveEquipmentBuild(sessionID, request); return _httpResponseUtil.NullResponse(); } /// /// Handle client/builds/delete /// - /// - /// - /// Session/player id /// - public string DeleteBuild(string url, RemoveBuildRequestData info, string sessionID) + public string DeleteBuild(string url, RemoveBuildRequestData request, string sessionID) { - _buildController.RemoveBuild(sessionID, info); + _buildController.RemoveBuild(sessionID, request); return _httpResponseUtil.NullResponse(); } } diff --git a/Libraries/Core/Callbacks/BundleCallbacks.cs b/Libraries/Core/Callbacks/BundleCallbacks.cs index 1476fe54..aa74082a 100644 --- a/Libraries/Core/Callbacks/BundleCallbacks.cs +++ b/Libraries/Core/Callbacks/BundleCallbacks.cs @@ -13,15 +13,16 @@ public class BundleCallbacks( /// /// Handle singleplayer/bundles /// - /// - /// - /// Session/player id /// - public string GetBundles(string url, EmptyRequestData info, string sessionID) + public string GetBundles(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.NoBody(_bundleLoader.GetBundles()); } + /// + /// TODO: what does it do + /// + /// public string GetBundle(string url, object info, string sessionID) { return "BUNDLE"; diff --git a/Libraries/Core/Callbacks/ClientLogCallbacks.cs b/Libraries/Core/Callbacks/ClientLogCallbacks.cs index e8a36e0d..fd8654ae 100644 --- a/Libraries/Core/Callbacks/ClientLogCallbacks.cs +++ b/Libraries/Core/Callbacks/ClientLogCallbacks.cs @@ -21,13 +21,10 @@ public class ClientLogCallbacks( /// /// Handle /singleplayer/log /// - /// - /// - /// Session/player id /// - public string ClientLog(string url, ClientLogRequest info, string sessionID) + public string ClientLog(string url, ClientLogRequest request, string sessionID) { - _clientLogController.ClientLog(info); + _clientLogController.ClientLog(request); return _httpResponseUtil.NullResponse(); } diff --git a/Libraries/Core/Callbacks/CustomizationCallbacks.cs b/Libraries/Core/Callbacks/CustomizationCallbacks.cs index bbfe113c..a8dc7cdf 100644 --- a/Libraries/Core/Callbacks/CustomizationCallbacks.cs +++ b/Libraries/Core/Callbacks/CustomizationCallbacks.cs @@ -18,11 +18,8 @@ public class CustomizationCallbacks( /// /// Handle client/trading/customization/storage /// - /// - /// - /// Session/player id /// - public string GetCustomisationUnlocks(string url, EmptyRequestData info, string sessionID) + public string GetCustomisationUnlocks(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.GetBody(_saveServer.GetProfile(sessionID).CustomisationUnlocks); } @@ -30,11 +27,8 @@ public class CustomizationCallbacks( /// /// Handle client/trading/customization /// - /// - /// - /// Session/player id /// - public string GetTraderSuits(string url, EmptyRequestData info, string sessionID) + public string GetTraderSuits(string url, EmptyRequestData _, string sessionID) { var splitUrl = url.Split('/'); var traderId = splitUrl[^3]; @@ -45,48 +39,36 @@ public class CustomizationCallbacks( /// /// Handle CustomizationBuy event /// - /// Players PMC profile - /// - /// Session/player id /// - public ItemEventRouterResponse BuyCustomisation(PmcData pmcData, BuyClothingRequestData info, string sessionID) + public ItemEventRouterResponse BuyCustomisation(PmcData pmcData, BuyClothingRequestData request, string sessionID) { - return _customizationController.BuyCustomisation(pmcData, info, sessionID); + return _customizationController.BuyCustomisation(pmcData, request, sessionID); } /// /// Handle client/hideout/customization/offer/list /// - /// - /// - /// Session/player id /// - public string GetHideoutCustomisation(string url, EmptyRequestData info, string sessionID) + public string GetHideoutCustomisation(string url, EmptyRequestData _, string sessionID) { - return _httpResponseUtil.GetBody(_customizationController.GetHideoutCustomisation(sessionID, info)); + return _httpResponseUtil.GetBody(_customizationController.GetHideoutCustomisation(sessionID)); } /// /// Handle client/customization/storage /// - /// - /// - /// Session/player id /// - public string GetStorage(string url, EmptyRequestData info, string sessionID) + public string GetStorage(string url, EmptyRequestData _, string sessionID) { - return _httpResponseUtil.GetBody(_customizationController.GetCustomisationStorage(sessionID, info)); + return _httpResponseUtil.GetBody(_customizationController.GetCustomisationStorage(sessionID)); } /// /// Handle CustomizationSet /// - /// Players PMC profile - /// - /// Session/player id /// - public ItemEventRouterResponse SetCustomisation(PmcData pmcData, CustomizationSetRequest info, string sessionID) + public ItemEventRouterResponse SetCustomisation(PmcData pmcData, CustomizationSetRequest request, string sessionID) { - return _customizationController.SetCustomisation(sessionID, info, pmcData); + return _customizationController.SetCustomisation(sessionID, request, pmcData); } } diff --git a/Libraries/Core/Callbacks/DataCallbacks.cs b/Libraries/Core/Callbacks/DataCallbacks.cs index 27bee53e..ef07a044 100644 --- a/Libraries/Core/Callbacks/DataCallbacks.cs +++ b/Libraries/Core/Callbacks/DataCallbacks.cs @@ -17,11 +17,8 @@ public class DataCallbacks( /// /// Handle client/settings /// - /// - /// - /// Session/player id /// - public string GetSettings(string url, EmptyRequestData info, string sessionID) + public string GetSettings(string url, EmptyRequestData _, string sessionID) { var returns = _httpResponseUtil.GetBody(_databaseService.GetSettings()); return returns; @@ -30,11 +27,8 @@ public class DataCallbacks( /// /// Handle client/globals /// - /// - /// - /// Session/player id /// - public string GetGlobals(string url, EmptyRequestData info, string sessionID) + public string GetGlobals(string url, EmptyRequestData _, string sessionID) { var globals = _databaseService.GetGlobals(); var returns = _httpResponseUtil.GetBody(globals); @@ -45,11 +39,8 @@ public class DataCallbacks( /// /// Handle client/items /// - /// - /// - /// Session/player id /// - public string GetTemplateItems(string url, EmptyRequestData info, string sessionID) + public string GetTemplateItems(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.GetUnclearedBody(_databaseService.GetItems()); } @@ -57,11 +48,8 @@ public class DataCallbacks( /// /// Handle client/handbook/templates /// - /// - /// - /// Session/player id /// - public string GetTemplateHandbook(string url, EmptyRequestData info, string sessionID) + public string GetTemplateHandbook(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.GetBody(_databaseService.GetHandbook()); } @@ -69,11 +57,8 @@ public class DataCallbacks( /// /// Handle client/customization /// - /// - /// - /// Session/player id /// - public string GetTemplateSuits(string url, EmptyRequestData info, string sessionID) + public string GetTemplateSuits(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.GetBody(_databaseService.GetTemplates().Customization); } @@ -81,11 +66,8 @@ public class DataCallbacks( /// /// Handle client/account/customization /// - /// - /// - /// Session/player id /// - public string GetTemplateCharacter(string url, EmptyRequestData info, string sessionID) + public string GetTemplateCharacter(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.GetBody(_databaseService.GetTemplates().Character); } @@ -93,11 +75,8 @@ public class DataCallbacks( /// /// Handle client/hideout/settings /// - /// - /// - /// Session/player id /// - public string GetHideoutSettings(string url, EmptyRequestData info, string sessionID) + public string GetHideoutSettings(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.GetBody(_databaseService.GetHideout().Settings); } @@ -105,11 +84,8 @@ public class DataCallbacks( /// /// Handle client/hideout/areas /// - /// - /// - /// Session/player id /// - public string GetHideoutAreas(string url, EmptyRequestData info, string sessionID) + public string GetHideoutAreas(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.GetBody(_databaseService.GetHideout().Areas); } @@ -117,11 +93,8 @@ public class DataCallbacks( /// /// Handle client/hideout/production/recipes /// - /// - /// - /// Session/player id /// - public string GetHideoutProduction(string url, EmptyRequestData info, string sessionID) + public string GetHideoutProduction(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.GetBody(_databaseService.GetHideout().Production); } @@ -129,11 +102,8 @@ public class DataCallbacks( /// /// Handle client/languages /// - /// - /// - /// Session/player id /// - public string GetLocalesLanguages(string url, EmptyRequestData info, string sessionID) + public string GetLocalesLanguages(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.GetBody(_databaseService.GetLocales().Languages); } @@ -141,11 +111,8 @@ public class DataCallbacks( /// /// Handle client/menu/locale /// - /// - /// - /// Session/player id /// - public string GetLocalesMenu(string url, EmptyRequestData info, string sessionID) + public string GetLocalesMenu(string url, EmptyRequestData _, string sessionID) { var localeId = url.Replace("/client/menu/locale/", ""); var locales = _databaseService.GetLocales(); @@ -162,11 +129,8 @@ public class DataCallbacks( /// /// Handle client/locale /// - /// - /// - /// Session/player id /// - public string GetLocalesGlobal(string url, EmptyRequestData info, string sessionID) + public string GetLocalesGlobal(string url, EmptyRequestData _, string sessionID) { var localeId = url.Replace("/client/locale/", ""); var locales = _databaseService.GetLocales(); @@ -178,11 +142,8 @@ public class DataCallbacks( /// /// Handle client/hideout/qte/list /// - /// - /// - /// Session/player id /// - public string GetQteList(string url, EmptyRequestData info, string sessionID) + public string GetQteList(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.GetUnclearedBody(_hideoutController.GetQteList(sessionID)); } @@ -190,11 +151,8 @@ public class DataCallbacks( /// /// Handle client/items/prices/ /// - /// - /// - /// Session/player id /// - public string GetItemPrices(string url, EmptyRequestData info, string sessionID) + public string GetItemPrices(string url, EmptyRequestData _, string sessionID) { var traderId = url.Replace("/client/items/prices/", ""); diff --git a/Libraries/Core/Callbacks/DialogueCallbacks.cs b/Libraries/Core/Callbacks/DialogueCallbacks.cs index f895e07f..5fdee242 100644 --- a/Libraries/Core/Callbacks/DialogueCallbacks.cs +++ b/Libraries/Core/Callbacks/DialogueCallbacks.cs @@ -2,6 +2,7 @@ using Core.Controllers; using Core.DI; using Core.Models.Eft.Common; using Core.Models.Eft.Common.Request; +using Core.Models.Eft.Common.Tables; using Core.Models.Eft.Dialog; using Core.Utils; using SptCommon.Annotations; @@ -32,11 +33,8 @@ public class DialogueCallbacks( /// /// Handle client/friend/list /// - /// - /// - /// Session/player id /// - public virtual string GetFriendList(string url, EmptyRequestData info, string sessionID) + public virtual string GetFriendList(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.GetBody(_dialogueController.GetFriendList(sessionID)); } @@ -44,11 +42,8 @@ public class DialogueCallbacks( /// /// Handle client/chatServer/list /// - /// - /// - /// Session/player id /// - public virtual string GetChatServerList(string url, GetChatServerListRequestData info, string sessionID) + public virtual string GetChatServerList(string url, GetChatServerListRequestData request, string sessionID) { var chatServer = new List { @@ -78,12 +73,10 @@ public class DialogueCallbacks( /// /// Handle client/mail/dialog/list + /// TODO: request properties are not handled /// - /// - /// - /// Session/player id /// - public virtual string GetMailDialogList(string url, GetMailDialogListRequestData info, string sessionID) + public virtual string GetMailDialogList(string url, GetMailDialogListRequestData request, string sessionID) { return _httpResponseUtil.GetBody(_dialogueController.GenerateDialogueList(sessionID), 0, null, false); } @@ -95,107 +88,83 @@ public class DialogueCallbacks( /// /// Session/player id /// - public virtual string GetMailDialogView(string url, GetMailDialogViewRequestData info, string sessionID) + public virtual string GetMailDialogView(string url, GetMailDialogViewRequestData request, string sessionID) { - return _httpResponseUtil.GetBody(_dialogueController.GenerateDialogueView(info, sessionID), 0, null, false); + return _httpResponseUtil.GetBody(_dialogueController.GenerateDialogueView(request, sessionID), 0, null, false); } /// /// Handle client/mail/dialog/info /// - /// - /// - /// Session/player id /// - public virtual string GetMailDialogInfo(string url, GetMailDialogInfoRequestData info, string sessionID) + public virtual string GetMailDialogInfo(string url, GetMailDialogInfoRequestData request, string sessionID) { - return _httpResponseUtil.GetBody(_dialogueController.GetDialogueInfo(info.DialogId, sessionID)); + return _httpResponseUtil.GetBody(_dialogueController.GetDialogueInfo(request.DialogId, sessionID)); } /// /// Handle client/mail/dialog/remove /// - /// - /// - /// Session/player id /// - public virtual string RemoveDialog(string url, RemoveDialogRequestData info, string sessionID) + public virtual string RemoveDialog(string url, RemoveDialogRequestData request, string sessionID) { - _dialogueController.RemoveDialogue(info.DialogId, sessionID); + _dialogueController.RemoveDialogue(request.DialogId, sessionID); return _httpResponseUtil.EmptyArrayResponse(); } /// /// Handle client/mail/dialog/pin /// - /// - /// - /// Session/player id /// - public virtual string PinDialog(string url, PinDialogRequestData info, string sessionID) + public virtual string PinDialog(string url, PinDialogRequestData request, string sessionID) { - _dialogueController.SetDialoguePin(info.DialogId, true, sessionID); + _dialogueController.SetDialoguePin(request.DialogId, true, sessionID); return _httpResponseUtil.EmptyArrayResponse(); } /// /// Handle client/mail/dialog/unpin /// - /// - /// - /// Session/player id /// - public virtual string UnpinDialog(string url, PinDialogRequestData info, string sessionID) + public virtual string UnpinDialog(string url, PinDialogRequestData request, string sessionID) { - _dialogueController.SetDialoguePin(info.DialogId, false, sessionID); + _dialogueController.SetDialoguePin(request.DialogId, false, sessionID); return _httpResponseUtil.EmptyArrayResponse(); } /// /// Handle client/mail/dialog/read /// - /// - /// - /// Session/player id /// - public virtual string SetRead(string url, SetDialogReadRequestData info, string sessionID) + public virtual string SetRead(string url, SetDialogReadRequestData request, string sessionID) { - _dialogueController.SetRead(info.Dialogs, sessionID); + _dialogueController.SetRead(request.Dialogs, sessionID); return _httpResponseUtil.EmptyArrayResponse(); } /// /// Handle client/mail/dialog/getAllAttachments /// - /// - /// - /// Session/player id /// - public virtual string GetAllAttachments(string url, GetAllAttachmentsRequestData info, string sessionID) + public virtual string GetAllAttachments(string url, GetAllAttachmentsRequestData request, string sessionID) { - return _httpResponseUtil.GetBody(_dialogueController.GetAllAttachments(info.DialogId, sessionID)); + return _httpResponseUtil.GetBody(_dialogueController.GetAllAttachments(request.DialogId, sessionID)); } /// /// Handle client/mail/msg/send /// - /// - /// - /// Session/player id /// - public virtual string SendMessage(string url, SendMessageRequest info, string sessionID) + public virtual string SendMessage(string url, SendMessageRequest request, string sessionID) { - return _httpResponseUtil.GetBody(_dialogueController.SendMessage(sessionID, info)); + return _httpResponseUtil.GetBody(_dialogueController.SendMessage(sessionID, request)); } /// /// Handle client/friend/request/list/outbox /// - /// - /// - /// Session/player id /// - public virtual string ListOutbox(string url, EmptyRequestData info, string sessionID) + public virtual string ListOutbox(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.EmptyArrayResponse(); } @@ -203,11 +172,8 @@ public class DialogueCallbacks( /// /// Handle client/friend/request/list/inbox /// - /// - /// - /// Session/player id /// - public virtual string ListInbox(string url, EmptyRequestData info, string sessionID) + public virtual string ListInbox(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.EmptyArrayResponse(); } @@ -215,23 +181,17 @@ public class DialogueCallbacks( /// /// Handle client/friend/request/send /// - /// - /// - /// Session/player id /// - public virtual string SendFriendRequest(string url, FriendRequestData info, string sessionID) + public virtual string SendFriendRequest(string url, FriendRequestData request, string sessionID) { - return _httpResponseUtil.GetBody(_dialogueController.SendFriendRequest(sessionID, info)); + return _httpResponseUtil.GetBody(_dialogueController.SendFriendRequest(sessionID, request)); } /// /// Handle client/friend/request/accept-all /// - /// - /// - /// Session/player id /// - public virtual string AcceptAllFriendRequests(string url, EmptyRequestData info, string sessionID) + public virtual string AcceptAllFriendRequests(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.NullResponse(); } @@ -239,11 +199,8 @@ public class DialogueCallbacks( /// /// Handle client/friend/request/accept /// - /// - /// - /// Session/player id /// - public virtual string AcceptFriendRequest(string url, AcceptFriendRequestData info, string sessionID) + public virtual string AcceptFriendRequest(string url, AcceptFriendRequestData request, string sessionID) { return _httpResponseUtil.GetBody(true); } @@ -251,11 +208,8 @@ public class DialogueCallbacks( /// /// Handle client/friend/request/decline /// - /// - /// - /// Session/player id /// - public virtual string DeclineFriendRequest(string url, DeclineFriendRequestData info, string sessionID) + public virtual string DeclineFriendRequest(string url, DeclineFriendRequestData request, string sessionID) { return _httpResponseUtil.GetBody(true); } @@ -263,11 +217,8 @@ public class DialogueCallbacks( /// /// Handle client/friend/request/cancel /// - /// - /// - /// Session/player id /// - public virtual string CancelFriendRequest(string url, CancelFriendRequestData info, string sessionID) + public virtual string CancelFriendRequest(string url, CancelFriendRequestData request, string sessionID) { return _httpResponseUtil.GetBody(true); } @@ -275,24 +226,18 @@ public class DialogueCallbacks( /// /// Handle client/friend/delete /// - /// - /// - /// Session/player id /// - public virtual string DeleteFriend(string url, DeleteFriendRequest info, string sessionID) + public virtual string DeleteFriend(string url, DeleteFriendRequest request, string sessionID) { - _dialogueController.DeleteFriend(sessionID, info); + _dialogueController.DeleteFriend(sessionID, request); return _httpResponseUtil.NullResponse(); } /// /// Handle client/friend/ignore/set /// - /// - /// - /// Session/player id /// - public virtual string IgnoreFriend(string url, UIDRequestData info, string sessionID) + public virtual string IgnoreFriend(string url, UIDRequestData request, string sessionID) { return _httpResponseUtil.NullResponse(); } @@ -300,36 +245,33 @@ public class DialogueCallbacks( /// /// Handle client/friend/ignore/remove /// - /// - /// - /// Session/player id /// - public virtual string UnIgnoreFriend(string url, UIDRequestData info, string sessionID) + public virtual string UnIgnoreFriend(string url, UIDRequestData request, string sessionID) { return _httpResponseUtil.NullResponse(); } - public virtual string ClearMail(string url, ClearMailMessageRequest info, string sessionID) + public virtual string ClearMail(string url, ClearMailMessageRequest request, string sessionID) { return _httpResponseUtil.EmptyArrayResponse(); } - public virtual string CreateGroupMail(string url, CreateGroupMailRequest info, string sessionID) + public virtual string CreateGroupMail(string url, CreateGroupMailRequest request, string sessionID) { return _httpResponseUtil.EmptyArrayResponse(); } - public virtual string ChangeMailGroupOwner(string url, ChangeGroupMailOwnerRequest info, string sessionID) + public virtual string ChangeMailGroupOwner(string url, ChangeGroupMailOwnerRequest request, string sessionID) { return "Not Implemented!"; // Not implemented in Node } - public virtual string AddUserToMail(string url, AddUserGroupMailRequest info, string sessionID) + public virtual string AddUserToMail(string url, AddUserGroupMailRequest request, string sessionID) { return "Not Implemented!"; // Not implemented in Node } - public virtual string RemoveUserFromMail(string url, RemoveUserGroupMailRequest info, string sessionID) + public virtual string RemoveUserFromMail(string url, RemoveUserGroupMailRequest request, string sessionID) { return "Not Implemented!"; // Not implemented in Node } diff --git a/Libraries/Core/Callbacks/GameCallbacks.cs b/Libraries/Core/Callbacks/GameCallbacks.cs index 2307f870..0d696d09 100644 --- a/Libraries/Core/Callbacks/GameCallbacks.cs +++ b/Libraries/Core/Callbacks/GameCallbacks.cs @@ -33,9 +33,6 @@ public class GameCallbacks( /// /// Handle client/game/version/validate /// - /// - /// - /// Session/player id /// public string VersionValidate(string url, VersionValidateRequestData info, string sessionID) { @@ -45,14 +42,11 @@ public class GameCallbacks( /// /// Handle client/game/start /// - /// - /// - /// Session/player id /// - public string GameStart(string url, EmptyRequestData info, string sessionID) + public string GameStart(string url, EmptyRequestData _, string sessionID) { var startTimestampSec = _timeUtil.GetTimeStamp(); - _gameController.GameStart(url, info, sessionID, startTimestampSec); + _gameController.GameStart(url, sessionID, startTimestampSec); return _httpResponseUtil.GetBody( new GameStartResponse { @@ -65,11 +59,8 @@ public class GameCallbacks( /// Handle client/game/logout /// Save profiles on game close /// - /// - /// - /// Session/player id /// - public string GameLogout(string url, EmptyRequestData info, string sessionID) + public string GameLogout(string url, EmptyRequestData _, string sessionID) { _saveServer.SaveProfile(sessionID); return _httpResponseUtil.GetBody( @@ -83,9 +74,6 @@ public class GameCallbacks( /// /// Handle client/game/config /// - /// - /// - /// Session/player id /// public string GetGameConfig(string url, GameEmptyCrcRequestData info, string sessionID) { @@ -95,9 +83,6 @@ public class GameCallbacks( /// /// Handle client/game/mode /// - /// - /// - /// Session/player id /// public string GetGameMode(string url, GameModeRequestData info, string sessionID) { @@ -107,11 +92,8 @@ public class GameCallbacks( /// /// Handle client/server/list /// - /// - /// - /// Session/player id /// - public string GetServer(string url, EmptyRequestData info, string sessionID) + public string GetServer(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.GetBody(_gameController.GetServer(sessionID)); } @@ -119,11 +101,8 @@ public class GameCallbacks( /// /// Handle client/match/group/current /// - /// - /// - /// Session/player id /// - public string GetCurrentGroup(string url, EmptyRequestData info, string sessionID) + public string GetCurrentGroup(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.GetBody(_gameController.GetCurrentGroup(sessionID)); } @@ -131,11 +110,8 @@ public class GameCallbacks( /// /// Handle client/checkVersion /// - /// - /// - /// Session/player id /// - public string ValidateGameVersion(string url, EmptyRequestData info, string sessionID) + public string ValidateGameVersion(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.GetBody(_gameController.GetValidGameVersion(sessionID)); } @@ -143,11 +119,8 @@ public class GameCallbacks( /// /// Handle client/game/keepalive /// - /// - /// - /// Session/player id /// - public string GameKeepalive(string url, EmptyRequestData info, string sessionID) + public string GameKeepalive(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.GetBody(_gameController.GetKeepAlive(sessionID)); } @@ -155,11 +128,8 @@ public class GameCallbacks( /// /// Handle singleplayer/settings/version /// - /// - /// - /// Session/player id /// - public string GetVersion(string url, EmptyRequestData info, string sessionID) + public string GetVersion(string url, EmptyRequestData _, string sessionID) { // change to be a proper type return _httpResponseUtil.NoBody( @@ -173,11 +143,8 @@ public class GameCallbacks( /// /// Handle /client/report/send & /client/reports/lobby/send /// - /// - /// - /// Session/player id /// - public string ReportNickname(string url, UIDRequestData info, string sessionID) + public string ReportNickname(string url, UIDRequestData request, string sessionID) { return _httpResponseUtil.NullResponse(); } @@ -185,23 +152,17 @@ public class GameCallbacks( /// /// Handle singleplayer/settings/getRaidTime /// - /// - /// - /// Session/player id /// - public string GetRaidTime(string url, GetRaidTimeRequest info, string sessionID) + public string GetRaidTime(string url, GetRaidTimeRequest request, string sessionID) { - return _httpResponseUtil.NoBody(_gameController.GetRaidTime(sessionID, info)); + return _httpResponseUtil.NoBody(_gameController.GetRaidTime(sessionID, request)); } /// /// Handle /client/survey /// - /// - /// - /// Session/player id /// - public string GetSurvey(string url, EmptyRequestData info, string sessionID) + public string GetSurvey(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.GetBody(_gameController.GetSurvey(sessionID)); } @@ -209,11 +170,8 @@ public class GameCallbacks( /// /// Handle client/survey/view /// - /// - /// - /// Session/player id /// - public string GetSurveyView(string url, SendSurveyOpinionRequest info, string sessionID) + public string GetSurveyView(string url, SendSurveyOpinionRequest request, string sessionID) { return _httpResponseUtil.NullResponse(); } @@ -221,11 +179,8 @@ public class GameCallbacks( /// /// Handle client/survey/opinion /// - /// - /// - /// Session/player id /// - public string SendSurveyOpinion(string url, SendSurveyOpinionRequest info, string sessionID) + public string SendSurveyOpinion(string url, SendSurveyOpinionRequest request, string sessionID) { return _httpResponseUtil.NullResponse(); } diff --git a/Libraries/Core/Callbacks/InraidCallbacks.cs b/Libraries/Core/Callbacks/InraidCallbacks.cs index 56669f00..7e6cd748 100644 --- a/Libraries/Core/Callbacks/InraidCallbacks.cs +++ b/Libraries/Core/Callbacks/InraidCallbacks.cs @@ -48,12 +48,20 @@ public class InraidCallbacks( return _httpResponseUtil.NoBody(_inRaidController.GetInRaidConfig().RaidMenuSettings); } - public string GetTraitorScavHostileChance(string url, EmptyRequestData info, string sessionID) + /// + /// Handle singleplayer/scav/traitorscavhostile + /// + /// + public string GetTraitorScavHostileChance(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.NoBody(_inRaidController.GetTraitorScavHostileChance(url, sessionID)); } - public string GetBossTypes(string url, EmptyRequestData info, string sessionID) + /// + /// Handle singleplayer/bosstypes + /// + /// + public string GetBossTypes(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.NoBody(_inRaidController.GetBossTypes(url, sessionID)); } diff --git a/Libraries/Core/Callbacks/LauncherCallbacks.cs b/Libraries/Core/Callbacks/LauncherCallbacks.cs index 2b9fc0d0..47c677b7 100644 --- a/Libraries/Core/Callbacks/LauncherCallbacks.cs +++ b/Libraries/Core/Callbacks/LauncherCallbacks.cs @@ -61,7 +61,7 @@ public class LauncherCallbacks( return _httpResponseUtil.NoBody(_watermark.GetVersionTag()); } - public string Ping(string url, EmptyRequestData info, string sessionID) + public string Ping(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.NoBody("pong!"); } @@ -81,7 +81,7 @@ public class LauncherCallbacks( return _httpResponseUtil.NoBody(_launcherController.GetLoadedServerMods()); } - public string GetServerModsProfileUsed(string url, EmptyRequestData info, string sessionID) + public string GetServerModsProfileUsed(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.NoBody(_launcherController.GetServerModsProfileUsed(sessionID)); } diff --git a/Libraries/Core/Callbacks/LocationCallbacks.cs b/Libraries/Core/Callbacks/LocationCallbacks.cs index 830c0ebd..e68eb369 100644 --- a/Libraries/Core/Callbacks/LocationCallbacks.cs +++ b/Libraries/Core/Callbacks/LocationCallbacks.cs @@ -15,11 +15,8 @@ public class LocationCallbacks( /// /// Handle client/locations /// - /// - /// - /// Session/player id /// - public string GetLocationData(string url, EmptyRequestData info, string sessionID) + public string GetLocationData(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.GetBody(_locationController.GenerateAll(sessionID)); } @@ -27,9 +24,6 @@ public class LocationCallbacks( /// /// Handle client/airdrop/loot /// - /// - /// - /// Session/player id /// public string GetAirdropLoot(string url, GetAirdropLootRequest info, string sessionID) { diff --git a/Libraries/Core/Callbacks/MatchCallbacks.cs b/Libraries/Core/Callbacks/MatchCallbacks.cs index 6b36183a..06ce807f 100644 --- a/Libraries/Core/Callbacks/MatchCallbacks.cs +++ b/Libraries/Core/Callbacks/MatchCallbacks.cs @@ -34,7 +34,7 @@ public class MatchCallbacks( /// /// Session/player id /// - public string ExitMatch(string url, EmptyRequestData info, string sessionID) + public string ExitMatch(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.NullResponse(); } @@ -42,11 +42,8 @@ public class MatchCallbacks( /// /// Handle client/match/group/exit_from_menu /// - /// - /// - /// Session/player id /// - public string ExitFromMenu(string url, EmptyRequestData info, string sessionID) + public string ExitFromMenu(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.NullResponse(); } @@ -54,11 +51,8 @@ public class MatchCallbacks( /// /// Handle client/match/group/current /// - /// - /// - /// Session/player id /// - public string GroupCurrent(string url, EmptyRequestData info, string sessionID) + public string GroupCurrent(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.GetBody( new MatchGroupCurrentResponse @@ -71,11 +65,8 @@ public class MatchCallbacks( /// /// Handle client/match/group/looking/start /// - /// - /// - /// Session/player id /// - public string StartGroupSearch(string url, EmptyRequestData info, string sessionID) + public string StartGroupSearch(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.NullResponse(); } @@ -83,11 +74,8 @@ public class MatchCallbacks( /// /// Handle client/match/group/looking/stop /// - /// - /// - /// Session/player id /// - public string StopGroupSearch(string url, EmptyRequestData info, string sessionID) + public string StopGroupSearch(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.NullResponse(); } @@ -95,9 +83,6 @@ public class MatchCallbacks( /// /// Handle client/match/group/invite/send /// - /// - /// - /// Session/player id /// public string SendGroupInvite(string url, MatchGroupInviteSendRequest info, string sessionID) { @@ -107,9 +92,6 @@ public class MatchCallbacks( /// /// Handle client/match/group/invite/accept /// - /// - /// - /// Session/player id /// public string AcceptGroupInvite(string url, RequestIdRequest info, string sessionID) { @@ -160,11 +142,8 @@ public class MatchCallbacks( /// /// Handle client/match/group/invite/cancel-all /// - /// - /// - /// Session/player id /// - public string CancelAllGroupInvite(string url, EmptyRequestData info, string sessionID) + public string CancelAllGroupInvite(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.GetBody(true); } @@ -172,9 +151,6 @@ public class MatchCallbacks( /// /// Handle client/putMetrics /// - /// - /// - /// Session/player id /// public string PutMetrics(string url, PutMetricsRequestData info, string sessionID) { @@ -184,9 +160,6 @@ public class MatchCallbacks( /// /// Handle client/analytics/event-disconnect /// - /// - /// - /// Session/player id /// public string EventDisconnect(string url, PutMetricsRequestData info, string sessionID) { @@ -196,11 +169,8 @@ public class MatchCallbacks( /// /// Handle client/match/available /// - /// - /// - /// Session/player id /// - public string ServerAvailable(string url, EmptyRequestData info, string sessionID) + public string ServerAvailable(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.GetBody(_matchController.GetEnabled()); } @@ -208,9 +178,6 @@ public class MatchCallbacks( /// /// Handle match/group/start_game /// - /// - /// - /// Session/player id /// public string JoinMatch(string url, MatchGroupStartGameRequest info, string sessionID) { @@ -220,11 +187,8 @@ public class MatchCallbacks( /// /// Handle client/getMetricsConfig /// - /// - /// - /// Session/player id /// - public string GetMetrics(string url, EmptyRequestData info, string sessionID) + public string GetMetrics(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.GetBody(_databaseService.GetMatch().Metrics); } @@ -233,9 +197,6 @@ public class MatchCallbacks( /// Called periodically while in a group /// Handle client/match/group/status /// - /// - /// - /// Session/player id /// public string GetGroupStatus(string url, MatchGroupStatusRequest info, string sessionID) { @@ -245,9 +206,6 @@ public class MatchCallbacks( /// /// Handle client/match/group/delete /// - /// - /// - /// Session/player id /// public string DeleteGroup(string url, DeleteGroupRequest info, string sessionID) { @@ -258,11 +216,8 @@ public class MatchCallbacks( /// /// Handle client/match/group/leave /// - /// - /// - /// Session/player id /// - public string LeaveGroup(string url, EmptyRequestData info, string sessionID) + public string LeaveGroup(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.GetBody(true); } @@ -270,9 +225,6 @@ public class MatchCallbacks( /// /// Handle client/match/group/player/remove /// - /// - /// - /// Session/player id /// public string RemovePlayerFromGroup(string url, MatchGroupPlayerRemoveRequest info, string sessionID) { @@ -282,9 +234,6 @@ public class MatchCallbacks( /// /// Handle client/match/local/start /// - /// - /// - /// Session/player id /// public string StartLocalRaid(string url, StartLocalRaidRequestData info, string sessionID) { @@ -294,9 +243,6 @@ public class MatchCallbacks( /// /// Handle client/match/local/end /// - /// - /// - /// Session/player id /// public string EndLocalRaid(string url, EndLocalRaidRequestData info, string sessionID) { @@ -307,9 +253,6 @@ public class MatchCallbacks( /// /// Handle client/raid/configuration /// - /// - /// - /// Session/player id /// public string GetRaidConfiguration(string url, GetRaidConfigurationRequestData info, string sessionID) { @@ -332,11 +275,8 @@ public class MatchCallbacks( /// /// Handle client/match/group/raid/ready /// - /// - /// - /// Session/player id /// - public string RaidReady(string url, EmptyRequestData info, string sessionID) + public string RaidReady(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.GetBody(true); } @@ -348,7 +288,7 @@ public class MatchCallbacks( /// /// Session/player id /// - public string NotRaidReady(string url, EmptyRequestData info, string sessionID) + public string NotRaidReady(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.GetBody(true); } diff --git a/Libraries/Core/Callbacks/NoteCallbacks.cs b/Libraries/Core/Callbacks/NoteCallbacks.cs index f4b874f3..389b0bb4 100644 --- a/Libraries/Core/Callbacks/NoteCallbacks.cs +++ b/Libraries/Core/Callbacks/NoteCallbacks.cs @@ -13,35 +13,35 @@ public class NoteCallbacks(NoteController _noteController) /// Handle AddNote event /// /// Players PMC profile - /// + /// Add note request /// Session/player id - /// - public ItemEventRouterResponse AddNote(PmcData pmcData, NoteActionData info, string sessionID) + /// ItemEventRouterResponse + public ItemEventRouterResponse AddNote(PmcData pmcData, NoteActionRequest request, string sessionID) { - return _noteController.AddNote(pmcData, info, sessionID); + return _noteController.AddNote(pmcData, request, sessionID); } /// /// Handle EditNote event /// /// Players PMC profile - /// + /// Edit note request /// Session/player id - /// - public ItemEventRouterResponse EditNote(PmcData pmcData, NoteActionData info, string sessionID) + /// ItemEventRouterResponse + public ItemEventRouterResponse EditNote(PmcData pmcData, NoteActionRequest request, string sessionID) { - return _noteController.EditNote(pmcData, info, sessionID); + return _noteController.EditNote(pmcData, request, sessionID); } /// /// Handle DeleteNote event /// /// Players PMC profile - /// + /// Delete note request /// Session/player id - /// - public ItemEventRouterResponse DeleteNote(PmcData pmcData, NoteActionData info, string sessionID) + /// ItemEventRouterResponse + public ItemEventRouterResponse DeleteNote(PmcData pmcData, NoteActionRequest request, string sessionID) { - return _noteController.DeleteNote(pmcData, info, sessionID); + return _noteController.DeleteNote(pmcData, request, sessionID); } } diff --git a/Libraries/Core/Callbacks/NotifierCallbacks.cs b/Libraries/Core/Callbacks/NotifierCallbacks.cs index 622f7ff3..580821a3 100644 --- a/Libraries/Core/Callbacks/NotifierCallbacks.cs +++ b/Libraries/Core/Callbacks/NotifierCallbacks.cs @@ -53,7 +53,7 @@ public class NotifierCallbacks( /// /// Session/player id /// - public string CreateNotifierChannel(string url, EmptyRequestData info, string sessionID) + public string CreateNotifierChannel(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.GetBody(_notifierController.GetChannel(sessionID)); } diff --git a/Libraries/Core/Callbacks/PrestigeCallbacks.cs b/Libraries/Core/Callbacks/PrestigeCallbacks.cs index 8ed889fb..c0f870f4 100644 --- a/Libraries/Core/Callbacks/PrestigeCallbacks.cs +++ b/Libraries/Core/Callbacks/PrestigeCallbacks.cs @@ -19,9 +19,9 @@ public class PrestigeCallbacks( /// /// Session/player id /// - public string GetPrestige(string url, EmptyRequestData info, string sessionID) + public string GetPrestige(string url, EmptyRequestData _, string sessionID) { - return _httpResponseUtil.GetBody(_prestigeController.GetPrestige(sessionID, info)); + return _httpResponseUtil.GetBody(_prestigeController.GetPrestige(sessionID)); } /// diff --git a/Libraries/Core/Callbacks/ProfileCallbacks.cs b/Libraries/Core/Callbacks/ProfileCallbacks.cs index 9b575892..00735f61 100644 --- a/Libraries/Core/Callbacks/ProfileCallbacks.cs +++ b/Libraries/Core/Callbacks/ProfileCallbacks.cs @@ -35,7 +35,7 @@ public class ProfileCallbacks( * Handle client/game/profile/list * Get the complete player profile (scav + pmc character) */ - public string GetProfileData(string url, EmptyRequestData info, string sessionID) + public string GetProfileData(string url, EmptyRequestData _, string sessionID) { return _httpResponse.GetBody(_profileController.GetCompleteProfile(sessionID)); } @@ -49,7 +49,7 @@ public class ProfileCallbacks( * @param sessionID Session id * @returns Profile object */ - public string RegenerateScav(string url, EmptyRequestData info, string sessionID) + public string RegenerateScav(string url, EmptyRequestData _, string sessionID) { return _httpResponse.GetBody( new List @@ -113,7 +113,7 @@ public class ProfileCallbacks( /** * Handle client/game/profile/nickname/reserved */ - public string GetReservedNickname(string url, EmptyRequestData info, string sessionID) + public string GetReservedNickname(string url, EmptyRequestData _, string sessionID) { var fullProfile = _profileHelper.GetFullProfile(sessionID); if (fullProfile?.ProfileInfo?.Username is not null) @@ -128,7 +128,7 @@ public class ProfileCallbacks( * Handle client/profile/status * Called when creating a character when choosing a character face/voice */ - public string GetProfileStatus(string url, EmptyRequestData info, string sessionID) + public string GetProfileStatus(string url, EmptyRequestData _, string sessionID) { return _httpResponse.GetBody(_profileController.GetProfileStatus(sessionID)); } @@ -169,7 +169,7 @@ public class ProfileCallbacks( /** * Handle /launcher/profiles */ - public string GetAllMiniProfiles(string url, EmptyRequestData info, string sessionID) + public string GetAllMiniProfiles(string url, EmptyRequestData _, string sessionID) { return _httpResponse.NoBody(_profileController.GetMiniProfiles()); } diff --git a/Libraries/Core/Callbacks/QuestCallbacks.cs b/Libraries/Core/Callbacks/QuestCallbacks.cs index f29263a5..c8f723de 100644 --- a/Libraries/Core/Callbacks/QuestCallbacks.cs +++ b/Libraries/Core/Callbacks/QuestCallbacks.cs @@ -76,7 +76,7 @@ public class QuestCallbacks( /// public string ListQuests(string url, ListQuestsRequestData info, string sessionID) { - return _httpResponseUtil.GetBody(_questController.GetClientQuest(sessionID)); + return _httpResponseUtil.GetBody(_questController.GetClientQuests(sessionID)); } /// @@ -86,7 +86,7 @@ public class QuestCallbacks( /// /// Session/player id /// - public string ActivityPeriods(string url, EmptyRequestData info, string sessionID) + public string ActivityPeriods(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.GetBody(_repeatableQuestController.GetClientRepeatableQuests(sessionID)); } diff --git a/Libraries/Core/Callbacks/RagfairCallbacks.cs b/Libraries/Core/Callbacks/RagfairCallbacks.cs index 2e3f1b03..145ba481 100644 --- a/Libraries/Core/Callbacks/RagfairCallbacks.cs +++ b/Libraries/Core/Callbacks/RagfairCallbacks.cs @@ -125,7 +125,7 @@ public class RagfairCallbacks( /// /// Session/player id /// - public string GetFleaPrices(string url, EmptyRequestData info, string sessionID) + public string GetFleaPrices(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.GetBody(_ragfairController.GetAllFleaPrices()); } diff --git a/Libraries/Core/Callbacks/TraderCallbacks.cs b/Libraries/Core/Callbacks/TraderCallbacks.cs index 5efb9571..467ceaca 100644 --- a/Libraries/Core/Callbacks/TraderCallbacks.cs +++ b/Libraries/Core/Callbacks/TraderCallbacks.cs @@ -42,7 +42,7 @@ public class TraderCallbacks( /// /// Session/player id /// - public string GetTraderSettings(string url, EmptyRequestData info, string sessionID) + public string GetTraderSettings(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.GetBody(_traderController.GetAllTraders(sessionID)); } @@ -54,7 +54,7 @@ public class TraderCallbacks( /// /// Session/player id /// - public string GetTrader(string url, EmptyRequestData info, string sessionID) + public string GetTrader(string url, EmptyRequestData _, string sessionID) { var traderID = url.Replace("/client/trading/api/getTrader/", ""); return _httpResponseUtil.GetBody(_traderController.GetTrader(sessionID, traderID)); @@ -67,7 +67,7 @@ public class TraderCallbacks( /// /// Session/player id /// - public string GetAssort(string url, EmptyRequestData info, string sessionID) + public string GetAssort(string url, EmptyRequestData _, string sessionID) { var traderID = url.Replace("/client/trading/api/getTraderAssort/", ""); return _httpResponseUtil.GetBody(_traderController.GetAssort(sessionID, traderID)); @@ -80,7 +80,7 @@ public class TraderCallbacks( /// /// Session/player id /// - public string GetModdedTraderData(string url, EmptyRequestData info, string sessionID) + public string GetModdedTraderData(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.NoBody(_traderConfig.ModdedTraders); } diff --git a/Libraries/Core/Callbacks/WeatherCallbacks.cs b/Libraries/Core/Callbacks/WeatherCallbacks.cs index 67b83916..e4b0ed5a 100644 --- a/Libraries/Core/Callbacks/WeatherCallbacks.cs +++ b/Libraries/Core/Callbacks/WeatherCallbacks.cs @@ -18,7 +18,7 @@ public class WeatherCallbacks( /// /// Session/player id /// - public string GetWeather(string url, EmptyRequestData info, string sessionID) + public string GetWeather(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.GetBody(_weatherController.Generate()); } @@ -30,7 +30,7 @@ public class WeatherCallbacks( /// /// Session/player id /// - public string GetLocalWeather(string url, EmptyRequestData info, string sessionID) + public string GetLocalWeather(string url, EmptyRequestData _, string sessionID) { return _httpResponseUtil.GetBody(_weatherController.GenerateLocal(sessionID)); } diff --git a/Libraries/Core/Controllers/CustomizationController.cs b/Libraries/Core/Controllers/CustomizationController.cs index 88fd13f9..29af8bbe 100644 --- a/Libraries/Core/Controllers/CustomizationController.cs +++ b/Libraries/Core/Controllers/CustomizationController.cs @@ -220,9 +220,8 @@ public class CustomizationController( /// Handle client/hideout/customization/offer/list /// /// Session/Player id - /// /// - public HideoutCustomisation GetHideoutCustomisation(string sessionId, EmptyRequestData info) + public HideoutCustomisation GetHideoutCustomisation(string sessionId) { return _databaseService.GetHideout().Customisation!; } @@ -231,11 +230,9 @@ public class CustomizationController( /// Handle client/customization/storage /// /// Session/Player id - /// /// public List GetCustomisationStorage( - string sessionId, - EmptyRequestData info) + string sessionId) { var customisationResultsClone = _cloner.Clone(_databaseService.GetTemplates().CustomisationStorage); diff --git a/Libraries/Core/Controllers/GameController.cs b/Libraries/Core/Controllers/GameController.cs index 3b2154c3..44c50a47 100644 --- a/Libraries/Core/Controllers/GameController.cs +++ b/Libraries/Core/Controllers/GameController.cs @@ -56,10 +56,9 @@ public class GameController( /// Handle client/game/start /// /// - /// /// Session/Player id /// - public void GameStart(string url, EmptyRequestData info, string? sessionId, long startTimeStampMs) + public void GameStart(string url, string? sessionId, long startTimeStampMs) { // Store client start time in app context _applicationContext.AddValue(ContextVariableType.CLIENT_START_TIMESTAMP, $"{sessionId}_{startTimeStampMs}"); diff --git a/Libraries/Core/Controllers/HideoutController.cs b/Libraries/Core/Controllers/HideoutController.cs index 8ade4843..296e7e07 100644 --- a/Libraries/Core/Controllers/HideoutController.cs +++ b/Libraries/Core/Controllers/HideoutController.cs @@ -253,7 +253,7 @@ public class HideoutController( /// Add a stash upgrade to profile /// /// Client response - /// + /// Session/Player id /// Players PMC profile /// /// @@ -340,7 +340,7 @@ public class HideoutController( /// /// Include container upgrade in client response /// - /// + /// Session/Player id /// /// /// @@ -367,7 +367,7 @@ public class HideoutController( /// /// Players PMC profile /// request from client to place item in area slot - /// + /// Session/Player id /// ItemEventRouterResponse public ItemEventRouterResponse PutItemsInAreaSlots(PmcData pmcData, HideoutPutItemInRequestData addItemToHideoutRequest, string sessionID) { @@ -453,7 +453,7 @@ public class HideoutController( /// /// Players PMC profile /// Take item out of area request - /// + /// Session/Player id /// ItemEventRouterResponse public ItemEventRouterResponse TakeItemsFromAreaSlots(PmcData pmcData, HideoutTakeItemOutRequestData request, string sessionID) { @@ -494,7 +494,7 @@ public class HideoutController( /// /// Find resource item in hideout area, add copy to player inventory, remove Item from hideout slot /// - /// + /// Session/Player id /// Players PMC profile /// client request /// Client response @@ -550,7 +550,7 @@ public class HideoutController( /// /// Players PMC profile /// Toggle area request - /// + /// Session/Player id /// ItemEventRouterResponse public ItemEventRouterResponse ToggleArea(PmcData pmcData, HideoutToggleAreaRequestData request, string sessionID) { @@ -576,7 +576,7 @@ public class HideoutController( /// /// Players PMC profile /// - /// + /// Session/Player id /// ItemEventRouterResponse public ItemEventRouterResponse SingleProductionStart(PmcData pmcData, HideoutSingleProductionStartRequestData request, string sessionID) { @@ -630,7 +630,7 @@ public class HideoutController( /// /// Players PMC profile /// - /// + /// Session/Player id /// ItemEventRouterResponse public ItemEventRouterResponse ScavCaseProductionStart(PmcData pmcData, HideoutScavCaseStartRequestData request, string sessionID) { @@ -731,7 +731,7 @@ public class HideoutController( /// /// Players PMC profile /// Continuous production request - /// + /// Session/Player id /// ItemEventRouterResponse public ItemEventRouterResponse ContinuousProductionStart(PmcData pmcData, HideoutContinuousProductionStartRequestData request, string sessionID) { @@ -746,7 +746,7 @@ public class HideoutController( /// /// Players PMC profile /// Remove production from area request - /// + /// Session/Player id /// public ItemEventRouterResponse TakeProduction(PmcData pmcData, HideoutTakeProductionRequestData request, string sessionID) { @@ -791,7 +791,7 @@ public class HideoutController( /// /// Take recipe-type production out of hideout area and place into player inventory /// - /// + /// Session/Player id /// Completed recipe of item /// Players PMC profile /// Remove production from area request @@ -1099,7 +1099,7 @@ public class HideoutController( /// /// Handles generating scav case rewards and sending to player inventory /// - /// + /// Session/Player id /// Players PMC profile /// Get rewards from scavcase craft request /// Client response diff --git a/Libraries/Core/Controllers/InRaidController.cs b/Libraries/Core/Controllers/InRaidController.cs index 10ac5cd1..da805879 100644 --- a/Libraries/Core/Controllers/InRaidController.cs +++ b/Libraries/Core/Controllers/InRaidController.cs @@ -57,11 +57,12 @@ public class InRaidController( } /// + /// Handle singleplayer/scav/traitorscavhostile /// Get a % chance a scav will be hostile to the player when they're also a scav /// /// /// Session/Player id - /// + /// % chance scav is hostile to player public double GetTraitorScavHostileChance(string url, string sessionId) { return _inRaidConfig.PlayerScavHostileChancePercent; diff --git a/Libraries/Core/Controllers/InventoryController.cs b/Libraries/Core/Controllers/InventoryController.cs index e41d5a70..ec1b0360 100644 --- a/Libraries/Core/Controllers/InventoryController.cs +++ b/Libraries/Core/Controllers/InventoryController.cs @@ -888,7 +888,7 @@ public class InventoryController( /// /// Players PMC profile /// Merge stacks request - /// + /// Session/Player id /// Client response public void MergeItem(PmcData pmcData, InventoryMergeRequestData request, string sessionID, ItemEventRouterResponse output) @@ -978,7 +978,7 @@ public class InventoryController( /// /// (unused, getOwnerInventoryItems() gets profile) /// Split stack request - /// + /// Session/Player id /// Client response public void SplitItem(PmcData pmcData, InventorySplitRequestData request, string sessionID, ItemEventRouterResponse output) diff --git a/Libraries/Core/Controllers/LauncherController.cs b/Libraries/Core/Controllers/LauncherController.cs index 6d1097c4..25d5da80 100644 --- a/Libraries/Core/Controllers/LauncherController.cs +++ b/Libraries/Core/Controllers/LauncherController.cs @@ -33,9 +33,9 @@ public class LauncherController( protected CoreConfig _coreConfig = _configServer.GetConfig(); /// - /// + /// Handle launcher connecting to server /// - /// + /// ConnectResponse public ConnectResponse Connect() { // Get all possible profile types + filter out any that are blacklisted @@ -82,7 +82,7 @@ public class LauncherController( /// /// /// - /// + /// Session/Player id /// public Info? Find(string? sessionId) { diff --git a/Libraries/Core/Controllers/MatchController.cs b/Libraries/Core/Controllers/MatchController.cs index ba625205..cd3374b3 100644 --- a/Libraries/Core/Controllers/MatchController.cs +++ b/Libraries/Core/Controllers/MatchController.cs @@ -25,8 +25,9 @@ public class MatchController( protected PmcConfig _pmcConfig = _configServer.GetConfig(); /// + /// Handle client/match/available /// - /// + /// True if server should be available public bool GetEnabled() { return _matchConfig.Enabled; @@ -35,19 +36,19 @@ public class MatchController( /// /// Handle client/match/group/delete /// - /// - public void DeleteGroup(DeleteGroupRequest info) + /// Delete group request + public void DeleteGroup(DeleteGroupRequest request) { - _matchLocationService.DeleteGroup(info); + _matchLocationService.DeleteGroup(request); } /// /// Handle match/group/start_game /// - /// + /// Start game request /// Session/Player id - /// - public ProfileStatusResponse JoinMatch(MatchGroupStartGameRequest info, string sessionId) + /// ProfileStatusResponse + public ProfileStatusResponse JoinMatch(MatchGroupStartGameRequest request, string sessionId) { var output = new ProfileStatusResponse { @@ -79,9 +80,9 @@ public class MatchController( /// /// Handle client/match/group/status /// - /// - /// - public MatchGroupStatusResponse GetGroupStatus(MatchGroupStatusRequest info) + /// Group status request + /// MatchGroupStatusResponse + public MatchGroupStatusResponse GetGroupStatus(MatchGroupStatusRequest request) { return new MatchGroupStatusResponse { @@ -115,7 +116,7 @@ public class MatchController( /// Convert a difficulty value from pre-raid screen to a bot difficulty /// /// dropdown difficulty value - /// bot difficulty + /// Bot difficulty protected string ConvertDifficultyDropdownIntoBotDifficulty(string botDifficulty) { // Edge case medium - must be altered @@ -131,8 +132,8 @@ public class MatchController( /// Handle client/match/local/start /// /// Session/Player id - /// - /// + /// Start raid request + /// StartLocalRaidResponseData public StartLocalRaidResponseData StartLocalRaid(string sessionId, StartLocalRaidRequestData request) { return _locationLifecycleService.StartLocalRaid(sessionId, request); @@ -142,7 +143,7 @@ public class MatchController( /// Handle client/match/local/end /// /// Session/Player id - /// + /// Emd local raid request public void EndLocalRaid(string sessionId, EndLocalRaidRequestData request) { _locationLifecycleService.EndLocalRaid(sessionId, request); diff --git a/Libraries/Core/Controllers/NoteController.cs b/Libraries/Core/Controllers/NoteController.cs index 126ad533..278ee990 100644 --- a/Libraries/Core/Controllers/NoteController.cs +++ b/Libraries/Core/Controllers/NoteController.cs @@ -14,18 +14,18 @@ public class NoteController( /// /// /// Players PMC profile - /// + /// Add note request /// Session/Player id - /// + /// ItemEventRouterResponse public ItemEventRouterResponse AddNote( PmcData pmcData, - NoteActionData body, + NoteActionRequest request, string sessionId) { var newNote = new Note { - Time = body.Note.Time, - Text = body.Note.Text + Time = request.Note.Time, + Text = request.Note.Text }; pmcData.Notes.DataNotes.Add(newNote); @@ -35,17 +35,17 @@ public class NoteController( /// /// /// Players PMC profile - /// + /// Edit note request /// Session/Player id - /// + /// ItemEventRouterResponse public ItemEventRouterResponse EditNote( PmcData pmcData, - NoteActionData body, + NoteActionRequest request, string sessionId) { - var noteToEdit = pmcData.Notes.DataNotes[body.Index!.Value]; - noteToEdit.Time = body.Note.Time; - noteToEdit.Text = body.Note.Text; + var noteToEdit = pmcData.Notes.DataNotes[request.Index!.Value]; + noteToEdit.Time = request.Note.Time; + noteToEdit.Text = request.Note.Text; return _eventOutputHolder.GetOutput(sessionId); } @@ -53,15 +53,15 @@ public class NoteController( /// /// /// Players PMC profile - /// + /// Delete note request /// Session/Player id - /// + /// ItemEventRouterResponse public ItemEventRouterResponse DeleteNote( PmcData pmcData, - NoteActionData body, + NoteActionRequest request, string sessionId) { - pmcData.Notes?.DataNotes?.RemoveAt(body.Index!.Value); + pmcData.Notes?.DataNotes?.RemoveAt(request.Index!.Value); return _eventOutputHolder.GetOutput(sessionId); } diff --git a/Libraries/Core/Controllers/NotifierController.cs b/Libraries/Core/Controllers/NotifierController.cs index 8515b798..f31ec000 100644 --- a/Libraries/Core/Controllers/NotifierController.cs +++ b/Libraries/Core/Controllers/NotifierController.cs @@ -53,7 +53,7 @@ public class NotifierController( /// Handle client/notifier/channel/create /// /// Session/Player id - /// + /// NotifierChannel public NotifierChannel GetChannel(string sessionId) { return new NotifierChannel @@ -67,9 +67,10 @@ public class NotifierController( } /// + /// Get the notifier server url /// /// Session/Player id - /// + /// Notification server url public string GetServer(string sessionId) { return $"{_httpServerHelper.GetBackendUrl()}/notifierServer/get/{sessionId}"; diff --git a/Libraries/Core/Controllers/PrestigeController.cs b/Libraries/Core/Controllers/PrestigeController.cs index b3a5ae5b..317b71c8 100644 --- a/Libraries/Core/Controllers/PrestigeController.cs +++ b/Libraries/Core/Controllers/PrestigeController.cs @@ -20,13 +20,12 @@ public class PrestigeController( { /// /// Handle /client/prestige/list + /// Get a collection of all possible prestiges /// /// Session/Player id - /// - /// + /// Prestige public Prestige GetPrestige( - string sessionId, - EmptyRequestData info) + string sessionId) { return _databaseService.GetTemplates().Prestige; } @@ -35,11 +34,11 @@ public class PrestigeController( /// Handle /client/prestige/obtain /// Going to Prestige 1 grants the below /// - /// 5% of skills should be transfered over - /// 5% of mastering should be transfered over - /// Earned achievements should be transfered over - /// Profile stats should be transfered over - /// Prestige progress should be transfered over + /// 5% of skills should be transferred over + /// 5% of mastering should be transferred over + /// Earned achievements should be transferred over + /// Profile stats should be transferred over + /// Prestige progress should be transferred over /// Items and rewards for Prestige 1 /// /// Going to Prestige 2 grants the below @@ -66,7 +65,6 @@ public class PrestigeController( ObtainPrestigeRequestList request) { var profile = _profileHelper.GetFullProfile(sessionId); - if (profile is not null) { var pendingPrestige = new PendingPrestige diff --git a/Libraries/Core/Controllers/ProfileController.cs b/Libraries/Core/Controllers/ProfileController.cs index 03345ae7..fd738726 100644 --- a/Libraries/Core/Controllers/ProfileController.cs +++ b/Libraries/Core/Controllers/ProfileController.cs @@ -42,7 +42,7 @@ public class ProfileController( */ public virtual List GetMiniProfiles() { - return _saveServer.GetProfiles().Select(kv => GetMiniProfile(kv.Key)).ToList(); + return _saveServer.GetProfiles().Select(kvp => GetMiniProfile(kvp.Key)).ToList(); } /** @@ -100,29 +100,30 @@ public class ProfileController( /** * Handle client/game/profile/list + * Return a full profile, scav and pmc profiles + meta data */ public virtual List GetCompleteProfile(string sessionID) { return _profileHelper.GetCompleteProfile(sessionID); } - /** - * Handle client/game/profile/create - * @param info Client reqeust object - * @param sessionID Player id - * @returns Profiles _id value - */ + /// + /// Handle client/game/profile/create + /// + /// Create profile request + /// Player id + /// Player id public virtual string CreateProfile(ProfileCreateRequestData request, string sessionID) { return _createProfileService.CreateProfile(sessionID, request); } - /** - * Generate a player scav object - * PMC profile MUST exist first before pscav can be generated - * @param sessionID - * @returns IPmcData object - */ + /// + /// Generate a player scav object + /// PMC profile MUST exist first before player-scav can be generated + /// + /// Player id + /// PmcData public virtual PmcData GeneratePlayerScav(string sessionID) { return _playerScavGenerator.Generate(sessionID); @@ -131,14 +132,14 @@ public class ProfileController( /** * Handle client/game/profile/nickname/validate */ - public virtual string ValidateNickname(ValidateNicknameRequestData info, string sessionID) + public virtual string ValidateNickname(ValidateNicknameRequestData request, string sessionID) { - if (info.Nickname.Length < 3) + if (request.Nickname.Length < 3) { return "tooshort"; } - if (_profileHelper.IsNicknameTaken(info, sessionID)) + if (_profileHelper.IsNicknameTaken(request, sessionID)) { return "taken"; } @@ -146,16 +147,19 @@ public class ProfileController( return "OK"; } - /** - * Handle client/game/profile/nickname/change event - * Client allows player to adjust their profile name - */ - public virtual string ChangeNickname(ProfileChangeNicknameRequestData info, string sessionID) + /// + /// Handle client/game/profile/nickname/change event + /// Client allows player to adjust their profile name + /// + /// Change nickname request + /// Player id + /// + public virtual string ChangeNickname(ProfileChangeNicknameRequestData request, string sessionID) { var output = ValidateNickname( new ValidateNicknameRequestData { - Nickname = info.Nickname + Nickname = request.Nickname }, sessionID ); @@ -164,26 +168,31 @@ public class ProfileController( { var pmcData = _profileHelper.GetPmcProfile(sessionID); - pmcData.Info.Nickname = info.Nickname; - pmcData.Info.LowerNickname = info.Nickname.ToLower(); + pmcData.Info.Nickname = request.Nickname; + pmcData.Info.LowerNickname = request.Nickname.ToLower(); } return output; } - /** - * Handle client/game/profile/voice/change event - */ - public virtual void ChangeVoice(ProfileChangeVoiceRequestData info, string sessionID) + /// + /// Handle client/game/profile/voice/change event + /// + /// Change voice request + /// Player id + public virtual void ChangeVoice(ProfileChangeVoiceRequestData request, string sessionID) { var pmcData = _profileHelper.GetPmcProfile(sessionID); - pmcData.Info.Voice = info.Voice; + pmcData.Info.Voice = request.Voice; } - /** - * Handle client/game/profile/search - */ - public virtual List SearchProfiles(SearchProfilesRequestData info, string sessionID) + /// + /// Handle client/game/profile/search + /// + /// Search profiles request + /// Player id + /// Found profiles + public virtual List SearchProfiles(SearchProfilesRequestData request, string sessionID) { var result = new List(); @@ -193,8 +202,7 @@ public class ProfileController( foreach (var profile in allProfiles) { var pmcProfile = profile?.CharacterData?.PmcData; - - if (!pmcProfile?.Info?.LowerNickname?.Contains(info.Nickname.ToLower()) ?? false) + if (!pmcProfile?.Info?.LowerNickname?.Contains(request.Nickname.ToLower()) ?? false) { continue; } @@ -205,9 +213,11 @@ public class ProfileController( return result; } - /** - * Handle client/profile/status - */ + /// + /// Handle client/profile/status + /// + /// Session/Player id + /// public virtual GetProfileStatusResponseData GetProfileStatus(string sessionId) { var account = _saveServer.GetProfile(sessionId).ProfileInfo; @@ -240,9 +250,12 @@ public class ProfileController( return response; } - /** - * Handle client/profile/view - */ + /// + /// Handle client/profile/view + /// + /// Session/Player id + /// Get other profile request + /// GetOtherProfileResponse public virtual GetOtherProfileResponse GetOtherProfile(string sessionId, GetOtherProfileRequest request) { // Find the profile by the account ID, fall back to the current player if we can't find the account @@ -324,9 +337,12 @@ public class ProfileController( }; } - /** - * Handle client/profile/settings - */ + /// + /// Handle client/profile/settings + /// + /// Session/Player id + /// Get profile settings request + /// public virtual bool SetChosenProfileIcon(string sessionId, GetProfileSettingsRequest request) { var profileToUpdate = _profileHelper.GetPmcProfile(sessionId); diff --git a/Libraries/Core/Controllers/QuestController.cs b/Libraries/Core/Controllers/QuestController.cs index bef72dff..154eafaa 100644 --- a/Libraries/Core/Controllers/QuestController.cs +++ b/Libraries/Core/Controllers/QuestController.cs @@ -40,13 +40,30 @@ public class QuestController( ) { protected QuestConfig _questConfig = _configServer.GetConfig(); - protected List _questTypes = ["PickUp", "Exploration", "Elimination"]; + protected static readonly List _questTypes = ["PickUp", "Exploration", "Elimination"]; - public List GetClientQuest(string sessionId) + /// + /// Handle client/quest/list + /// Get all quests visible to player + /// Exclude quests with incomplete preconditions (level/loyalty) + /// + /// Session/Player id + /// Collection of Quest + public List GetClientQuests(string sessionId) { return _questHelper.GetClientQuests(sessionId); } + /// + /// Handle QuestAccept event + /// Handle the client accepting a quest and starting it + /// Send starting rewards if any to player and + /// Send start notification if any to player + /// + /// Players PMC profile + /// Quest accepted + /// Session/Player id + /// ItemEventRouterResponse public ItemEventRouterResponse AcceptQuest(PmcData pmcData, AcceptQuestRequestData acceptedQuest, string sessionID) { var acceptQuestResponse = _eventOutputHolder.GetOutput(sessionID); @@ -113,6 +130,12 @@ public class QuestController( return acceptQuestResponse; } + /// + /// Add a quests condition counters to chosen profile + /// + /// Conditions to iterate over and possibly add to profile + /// Players PMC profile + /// Quest where conditions originated protected void AddTaskConditionCountersToProfile(List? questConditions, PmcData pmcData, string questId) { foreach (var condition in questConditions) @@ -120,7 +143,7 @@ public class QuestController( if (pmcData.TaskConditionCounters.TryGetValue(condition.Id, out var counter)) { _logger.Error( - $"Unable to add new task condition counter: {condition.ConditionType} for qeust: {questId} to profile: {pmcData.SessionId} as it already exists:" + $"Unable to add new task condition counter: {condition.ConditionType} for quest: {questId} to profile: {pmcData.SessionId} as it already exists:" ); } @@ -139,6 +162,16 @@ public class QuestController( } } + /// + /// TODO: Move this code into RepeatableQuestController + /// Handle the client accepting a repeatable quest and starting it + /// Send starting rewards if any to player and + /// Send start notification if any to player + /// + /// Players PMC profile + /// Repeatable quest accepted + /// Session/Player id + /// ItemEventRouterResponse public ItemEventRouterResponse AcceptRepeatableQuest(PmcData pmcData, AcceptQuestRequestData acceptedQuest, string sessionID) { // Create and store quest status object inside player profile @@ -150,7 +183,7 @@ public class QuestController( pmcData.Quests.Add(newRepeatableQuest); // Look for the generated quest cache in profile.RepeatableQuests - var repeatableQuestProfile = GetRepeatableQuestFromProfile(pmcData, acceptedQuest); + var repeatableQuestProfile = GetRepeatableQuestFromProfile(pmcData, acceptedQuest.QuestId); if (repeatableQuestProfile is null) { _logger.Error( @@ -177,16 +210,22 @@ public class QuestController( return response; } - protected RepeatableQuest GetRepeatableQuestFromProfile(PmcData pmcData, AcceptQuestRequestData acceptedQuest) + /// + /// Look for an accepted quest inside player profile, return quest that matches + /// + /// Players PMC profile + /// Quest id to return + /// RepeatableQuest + protected RepeatableQuest GetRepeatableQuestFromProfile(PmcData pmcData, string questId) { foreach (var repeatableQuest in pmcData.RepeatableQuests) { - var matchingQuest = repeatableQuest.ActiveQuests.FirstOrDefault(x => x.Id == acceptedQuest.QuestId); + var matchingQuest = repeatableQuest.ActiveQuests.FirstOrDefault(x => x.Id == questId); if (matchingQuest is not null) { if (_logger.IsLogEnabled(LogLevel.Debug)) { - _logger.Debug($"Accepted repeatable quest {acceptedQuest.QuestId} from {repeatableQuest.Name}"); + _logger.Debug($"Accepted repeatable quest: {questId} from: {repeatableQuest.Name}"); } matchingQuest.SptRepatableGroupName = repeatableQuest.Name; @@ -198,15 +237,32 @@ public class QuestController( return null; } - public ItemEventRouterResponse CompleteQuest(PmcData pmcData, CompleteQuestRequestData info, string sessionId) + /// + /// Handle QuestComplete event + /// Update completed quest in profile + /// Add newly unlocked quests to profile + /// Also recalculate their level due to exp rewards + /// + /// Players PMC profile + /// Complete quest request + /// Session/Player id + /// ItemEventRouterResponse + public ItemEventRouterResponse CompleteQuest(PmcData pmcData, CompleteQuestRequestData request, string sessionId) { - return _questHelper.CompleteQuest(pmcData, info, sessionId); + return _questHelper.CompleteQuest(pmcData, request, sessionId); } - - public ItemEventRouterResponse HandoverQuest(PmcData pmcData, HandoverQuestRequestData handoverQuestRequest, string sessionID) + /// + /// Handle QuestHandover event + /// Player hands over an item to trader to complete/partially complete quest + /// + /// Players PMC profile + /// Handover request + /// Session/Player id + /// ItemEventRouterResponse + public ItemEventRouterResponse HandoverQuest(PmcData pmcData, HandoverQuestRequestData request, string sessionID) { - var quest = _questHelper.GetQuestFromDb(handoverQuestRequest.QuestId, pmcData); + var quest = _questHelper.GetQuestFromDb(request.QuestId, pmcData); List handoverQuestTypes = ["HandoverItem", "WeaponAssembly"]; var output = _eventOutputHolder.GetOutput(sessionID); @@ -215,7 +271,7 @@ public class QuestController( // Decrement number of items handed in QuestCondition? handoverRequirements = null; - foreach (var condition in quest.Conditions.AvailableForFinish.Where(condition => condition.Id == handoverQuestRequest.ConditionId)) + foreach (var condition in quest.Conditions.AvailableForFinish.Where(condition => condition.Id == request.ConditionId)) { // Not a handover quest type, skip if (!handoverQuestTypes.Contains(condition.ConditionType)) @@ -238,8 +294,8 @@ public class QuestController( "repeatable-quest_handover_failed_condition_already_satisfied", new { - questId = handoverQuestRequest.QuestId, - conditionId = handoverQuestRequest.ConditionId, + questId = request.QuestId, + conditionId = request.ConditionId, profileCounter = counter.Value, value = handedInCount } @@ -255,18 +311,18 @@ public class QuestController( if (isItemHandoverQuest && handedInCount == 0) { - return ShowRepeatableQuestInvalidConditionError(handoverQuestRequest, output); + return ShowRepeatableQuestInvalidConditionError(request.QuestId, request.ConditionId, output); } var totalItemCountToRemove = 0d; - foreach (var itemHandover in handoverQuestRequest.Items) + foreach (var itemHandover in request.Items) { var matchingItemInProfile = pmcData.Inventory.Items.FirstOrDefault(item => item.Id == itemHandover.Id); if (!(matchingItemInProfile is not null && handoverRequirements.Target.List.Contains(matchingItemInProfile.Template))) // Item handed in by player doesn't match what was requested { return ShowQuestItemHandoverMatchError( - handoverQuestRequest, + request, matchingItemInProfile, handoverRequirements, output @@ -342,22 +398,29 @@ public class QuestController( UpdateProfileTaskConditionCounterValue( pmcData, - handoverQuestRequest.ConditionId, - handoverQuestRequest.QuestId, + request.ConditionId, + request.QuestId, totalItemCountToRemove ); return output; } - protected ItemEventRouterResponse ShowRepeatableQuestInvalidConditionError(HandoverQuestRequestData handoverQuestRequest, ItemEventRouterResponse output) + /// + /// Show warning to user and write to log that repeatable quest failed a condition check + /// + /// Quest id that failed + /// Relevant condition id that failed + /// Client response + /// ItemEventRouterResponse + protected ItemEventRouterResponse ShowRepeatableQuestInvalidConditionError(string questId, string conditionId, ItemEventRouterResponse output) { var errorMessage = _localisationService.GetText( "repeatable-quest_handover_failed_condition_invalid", new { - questId = handoverQuestRequest.QuestId, - conditionId = handoverQuestRequest.ConditionId + questId = questId, + conditionId = conditionId } ); _logger.Error(errorMessage); @@ -365,6 +428,14 @@ public class QuestController( return _httpResponseUtil.AppendErrorToOutput(output, errorMessage); } + /// + /// Show warning to user and write to log quest item handed over did not match what is required + /// + /// Handover request + /// Non-matching item found + /// Quest handover requirements + /// Response to send to user + /// ItemEventRouterResponse protected ItemEventRouterResponse ShowQuestItemHandoverMatchError(HandoverQuestRequestData handoverQuestRequest, Item? itemHandedOver, QuestCondition? handoverRequirements, ItemEventRouterResponse output) { @@ -382,6 +453,14 @@ public class QuestController( return _httpResponseUtil.AppendErrorToOutput(output, errorMessage); } + /// + /// Increment a backend counter stored value by an amount + /// Create counter if it does not exist + /// + /// Players PMC profile + /// Backend counter id to update + /// Quest id counter is associated with + /// Value to increment the backend counter with protected void UpdateProfileTaskConditionCounterValue(PmcData pmcData, string conditionId, string questId, double counterValue) { if (pmcData.TaskConditionCounters.GetValueOrDefault(conditionId) != null) @@ -400,6 +479,14 @@ public class QuestController( }); } + /// + /// Handle /client/game/profile/items/moving - QuestFail + /// + /// Players PMC profile + /// Fail quest request + /// Session/Player id + /// + /// ItemEventRouterResponse public ItemEventRouterResponse FailQuest(PmcData pmcData, FailQuestRequestData request, string sessionID, ItemEventRouterResponse output) { _questHelper.FailQuest(pmcData, request, sessionID, output); diff --git a/Libraries/Core/Generators/BotEquipmentModGenerator.cs b/Libraries/Core/Generators/BotEquipmentModGenerator.cs index 189377b1..01505f35 100644 --- a/Libraries/Core/Generators/BotEquipmentModGenerator.cs +++ b/Libraries/Core/Generators/BotEquipmentModGenerator.cs @@ -41,8 +41,10 @@ public class BotEquipmentModGenerator( { protected BotConfig _botConfig = _configServer.GetConfig(); - protected HashSet _modSightIds = ["mod_sight_front", "mod_sight_rear"]; - protected HashSet _scopeIds = + protected static HashSet _modSightIds = ["mod_sight_front", "mod_sight_rear"]; + + // Slots that hold scopes + protected static HashSet _scopeIds = [ "mod_scope", "mod_mount", @@ -53,6 +55,12 @@ public class BotEquipmentModGenerator( "mod_scope_003" ]; + // Slots that hold muzzles + protected static HashSet _muzzleIds = ["mod_muzzle", "mod_muzzle_000", "mod_muzzle_001"]; + + // Slots a weapon can store its stock in + protected static HashSet _stockSlots = ["mod_stock", "mod_stock_000", "mod_stock_001", "mod_stock_akms"]; + /// /// Check mods are compatible and add to array /// @@ -719,13 +727,10 @@ public class BotEquipmentModGenerator( /// True if it should public bool ShouldForceSubStockSlots(string modSlot, EquipmentFilters botEquipConfig, TemplateItem modToAddTemplate) { - // Slots a weapon can store its stock in - HashSet stockSlots = ["mod_stock", "mod_stock_000", "mod_stock_001", "mod_stock_akms"]; - // Can the stock hold child items var hasSubSlots = modToAddTemplate.Properties.Slots?.Count > 0; - return (stockSlots.Contains(modSlot) && hasSubSlots) || botEquipConfig.ForceStock.GetValueOrDefault(false); + return (_stockSlots.Contains(modSlot) && hasSubSlots) || botEquipConfig.ForceStock.GetValueOrDefault(false); } /// @@ -793,7 +798,7 @@ public class BotEquipmentModGenerator( /// True if modSlot can have muzzle-related items public bool ModSlotCanHoldMuzzleDevices(string modSlot, string? modsParentId) { - return ((string[]) ["mod_muzzle", "mod_muzzle_000", "mod_muzzle_001"]).Contains(modSlot.ToLower()); + return _muzzleIds.Contains(modSlot.ToLower()); } /// diff --git a/Libraries/Core/Generators/BotInventoryGenerator.cs b/Libraries/Core/Generators/BotInventoryGenerator.cs index 1e647b17..e7283c69 100644 --- a/Libraries/Core/Generators/BotInventoryGenerator.cs +++ b/Libraries/Core/Generators/BotInventoryGenerator.cs @@ -40,7 +40,7 @@ public class BotInventoryGenerator( private readonly BotConfig _botConfig = _configServer.GetConfig(); // Slots handled individually inside `GenerateAndAddEquipmentToBot` - private readonly HashSet _excludedEquipmentSlots = + private static readonly HashSet _excludedEquipmentSlots = [ EquipmentSlots.Pockets, EquipmentSlots.FirstPrimaryWeapon, diff --git a/Libraries/Core/Helpers/BotGeneratorHelper.cs b/Libraries/Core/Helpers/BotGeneratorHelper.cs index ba4622bf..991fd3fe 100644 --- a/Libraries/Core/Helpers/BotGeneratorHelper.cs +++ b/Libraries/Core/Helpers/BotGeneratorHelper.cs @@ -29,6 +29,9 @@ public class BotGeneratorHelper( protected BotConfig _botConfig = _configServer.GetConfig(); protected PmcConfig _pmcConfig = _configServer.GetConfig(); + // Equipment slot ids that do not conflict with other slots + protected static readonly HashSet _slotsWithNoCompatIssues = ["Scabbard", "Backpack", "SecureContainer", "Holster", "ArmBand"]; + /// /// Adds properties to an item /// e.g. Repairable / HasHinge / Foldable / MaxDurability @@ -331,8 +334,7 @@ public class BotGeneratorHelper( public ChooseRandomCompatibleModResult IsItemIncompatibleWithCurrentItems(List itemsEquipped, string tplToCheck, string equipmentSlot) { // Skip slots that have no incompatibilities - HashSet slotsToCheck = ["Scabbard", "Backpack", "SecureContainer", "Holster", "ArmBand"]; - if (slotsToCheck.Contains(equipmentSlot)) + if (_slotsWithNoCompatIssues.Contains(equipmentSlot)) { return new ChooseRandomCompatibleModResult { diff --git a/Libraries/Core/Helpers/BotHelper.cs b/Libraries/Core/Helpers/BotHelper.cs index 3786f771..658b421c 100644 --- a/Libraries/Core/Helpers/BotHelper.cs +++ b/Libraries/Core/Helpers/BotHelper.cs @@ -1,4 +1,3 @@ -using Core.Models.Common; using Core.Models.Eft.Common.Tables; using Core.Models.Spt.Config; using Core.Models.Utils; @@ -19,7 +18,7 @@ public class BotHelper( { protected BotConfig _botConfig = _configServer.GetConfig(); protected PmcConfig _pmcConfig = _configServer.GetConfig(); - protected HashSet _pmcNames = ["usec", "bear", "pmc", "pmcbear", "pmcusec"]; + protected static readonly HashSet _pmcTypeIds = ["usec", "bear", "pmc", "pmcbear", "pmcusec"]; protected Dictionary> _pmcNameCache = new(); /// @@ -46,7 +45,7 @@ public class BotHelper( /// true if is pmc public bool IsBotPmc(string? botRole) { - return _pmcNames.Contains(botRole?.ToLower()); + return _pmcTypeIds.Contains(botRole?.ToLower()); } public bool IsBotBoss(string botRole) diff --git a/Libraries/Core/Helpers/BotWeaponGeneratorHelper.cs b/Libraries/Core/Helpers/BotWeaponGeneratorHelper.cs index c9605d48..f90e2473 100644 --- a/Libraries/Core/Helpers/BotWeaponGeneratorHelper.cs +++ b/Libraries/Core/Helpers/BotWeaponGeneratorHelper.cs @@ -20,7 +20,7 @@ public class BotWeaponGeneratorHelper( LocalisationService _localisationService ) { - private readonly HashSet _magCheck = ["CylinderMagazine", "SpringDrivenCylinder"]; + private static readonly HashSet _magCheck = ["CylinderMagazine", "SpringDrivenCylinder"]; /// /// Get a randomized number of bullets for a specific magazine diff --git a/Libraries/Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.cs b/Libraries/Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.cs index 678d36b2..0556ec6b 100644 --- a/Libraries/Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.cs +++ b/Libraries/Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.cs @@ -29,7 +29,7 @@ public class GiveSptCommand( private static readonly Regex _commandRegex = new(@"^spt give (((([a-z]{2,5}) )?""(.+)""|\w+) )?([0-9]+)$"); // Exception for flares - protected readonly HashSet _excludedPresetItems = + protected static readonly HashSet _excludedPresetItems = [ ItemTpl.FLARE_RSP30_REACTIVE_SIGNAL_CARTRIDGE_RED, ItemTpl.FLARE_RSP30_REACTIVE_SIGNAL_CARTRIDGE_GREEN, diff --git a/Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/HelloMessageHandler.cs b/Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/HelloMessageHandler.cs index 1f24bb0f..82353c18 100644 --- a/Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/HelloMessageHandler.cs +++ b/Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/HelloMessageHandler.cs @@ -12,7 +12,7 @@ public class HelloMessageHandler( MailSendService _mailSendService, RandomUtil _randomUtil) : IChatMessageHandler { - protected HashSet _listOfGreetings = ["hello", "hi", "sup", "yo", "hey", "bonjour"]; + protected static readonly HashSet _listOfGreetings = ["hello", "hi", "sup", "yo", "hey", "bonjour"]; public int GetPriority() diff --git a/Libraries/Core/Helpers/InRaidHelper.cs b/Libraries/Core/Helpers/InRaidHelper.cs index f0dea61d..473db18a 100644 --- a/Libraries/Core/Helpers/InRaidHelper.cs +++ b/Libraries/Core/Helpers/InRaidHelper.cs @@ -20,7 +20,7 @@ public class InRaidHelper( { protected InRaidConfig _inRaidConfig = _configServer.GetConfig(); protected LostOnDeathConfig _lostOnDeathConfig = _configServer.GetConfig(); - protected List _pocketSlots = ["pocket1", "pocket2", "pocket3", "pocket4"]; + protected static readonly List _pocketSlots = ["pocket1", "pocket2", "pocket3", "pocket4"]; /// /// Deprecated. Reset the skill points earned in a raid to 0, ready for next raid. diff --git a/Libraries/Core/Helpers/InventoryHelper.cs b/Libraries/Core/Helpers/InventoryHelper.cs index d9d64f29..11e84236 100644 --- a/Libraries/Core/Helpers/InventoryHelper.cs +++ b/Libraries/Core/Helpers/InventoryHelper.cs @@ -36,7 +36,7 @@ public class InventoryHelper( ) { protected InventoryConfig _inventoryConfig = _configServer.GetConfig(); - private readonly HashSet _variableSizeItemTypes = [BaseClasses.WEAPON, BaseClasses.FUNCTIONAL_MOD]; + private static readonly HashSet _variableSizeItemTypes = [BaseClasses.WEAPON, BaseClasses.FUNCTIONAL_MOD]; /// /// Add multiple items to player stash (assuming they all fit) diff --git a/Libraries/Core/Helpers/ItemHelper.cs b/Libraries/Core/Helpers/ItemHelper.cs index 5ad10b65..be4d7027 100644 --- a/Libraries/Core/Helpers/ItemHelper.cs +++ b/Libraries/Core/Helpers/ItemHelper.cs @@ -27,7 +27,7 @@ public class ItemHelper( ICloner _cloner ) { - protected readonly HashSet _defaultInvalidBaseTypes = + protected static readonly HashSet _defaultInvalidBaseTypes = [ BaseClasses.LOOT_CONTAINER, BaseClasses.MOB_CONTAINER, @@ -38,7 +38,7 @@ public class ItemHelper( BaseClasses.POCKETS ]; - protected readonly HashSet _slotsAsStrings = + protected static readonly HashSet _slotsAsStrings = [ EquipmentSlots.Headwear.ToString(), EquipmentSlots.Earpiece.ToString(), @@ -56,7 +56,7 @@ public class ItemHelper( EquipmentSlots.Scabbard.ToString() ]; - protected readonly HashSet _dogTagTpls = + protected static readonly HashSet _dogTagTpls = [ ItemTpl.BARTER_DOGTAG_BEAR, ItemTpl.BARTER_DOGTAG_BEAR_EOD, @@ -70,7 +70,7 @@ public class ItemHelper( ItemTpl.BARTER_DOGTAG_USEC_PRESTIGE_2 ]; - protected readonly HashSet _softInsertIds = + protected static readonly HashSet _softInsertIds = [ "groin", "groin_back", @@ -88,7 +88,7 @@ public class ItemHelper( "helmet_ears" ]; - protected readonly HashSet _removablePlateSlotIds = + protected static readonly HashSet _removablePlateSlotIds = [ "front_plate", "back_plate", diff --git a/Libraries/Core/Helpers/ProfileHelper.cs b/Libraries/Core/Helpers/ProfileHelper.cs index 89691990..61411611 100644 --- a/Libraries/Core/Helpers/ProfileHelper.cs +++ b/Libraries/Core/Helpers/ProfileHelper.cs @@ -27,7 +27,7 @@ public class ProfileHelper( ConfigServer _configServer ) { - protected readonly List gameEditions = ["edge_of_darkness", "unheard_edition"]; + protected static readonly HashSet gameEditionsWithFreeRefresh = ["edge_of_darkness", "unheard_edition"]; protected InventoryConfig _inventoryConfig = _configServer.GetConfig(); /// @@ -608,7 +608,7 @@ public class ProfileHelper( public bool HasAccessToRepeatableFreeRefreshSystem(PmcData pmcProfile) { - return gameEditions.Contains(pmcProfile.Info.GameVersion); + return gameEditionsWithFreeRefresh.Contains(pmcProfile.Info.GameVersion); } /// diff --git a/Libraries/Core/Helpers/RagfairOfferHelper.cs b/Libraries/Core/Helpers/RagfairOfferHelper.cs index f7d29795..24b39132 100644 --- a/Libraries/Core/Helpers/RagfairOfferHelper.cs +++ b/Libraries/Core/Helpers/RagfairOfferHelper.cs @@ -43,6 +43,8 @@ public class RagfairOfferHelper( protected BotConfig _botConfig = _configServer.GetConfig(); protected RagfairConfig _ragfairConfig = _configServer.GetConfig(); + protected static readonly HashSet _currencies = ["all", "RUB", "USD", "EUR"]; + /// /// Passthrough to ragfairOfferService.getOffers(), get flea offers a player should see /// @@ -935,8 +937,7 @@ public class RagfairOfferHelper( if (searchRequest.Currency > 0 && _paymentHelper.IsMoneyTpl(offerMoneyTypeTpl)) { // Use 'currencies' as mapping for the money choice dropdown, e.g. 0 = all, 2 = "USD; - string[] currencies = ["all", "RUB", "USD", "EUR"]; - if (_ragfairHelper.GetCurrencyTag(offerMoneyTypeTpl) != currencies[searchRequest.Currency.Value]) + if(!_currencies.Contains(_ragfairHelper.GetCurrencyTag(offerMoneyTypeTpl))) // Don't include item paid in wrong currency { return false; diff --git a/Libraries/Core/Models/Eft/Notes/NoteActionData.cs b/Libraries/Core/Models/Eft/Notes/NoteActionRequest.cs similarity index 89% rename from Libraries/Core/Models/Eft/Notes/NoteActionData.cs rename to Libraries/Core/Models/Eft/Notes/NoteActionRequest.cs index 7004947e..074b80e0 100644 --- a/Libraries/Core/Models/Eft/Notes/NoteActionData.cs +++ b/Libraries/Core/Models/Eft/Notes/NoteActionRequest.cs @@ -3,7 +3,7 @@ using Core.Models.Eft.Common.Request; namespace Core.Models.Eft.Notes; -public record NoteActionData : BaseInteractionRequestData +public record NoteActionRequest : BaseInteractionRequestData { [JsonPropertyName("index")] public int? Index diff --git a/Libraries/Core/Models/Spt/Server/Locations.cs b/Libraries/Core/Models/Spt/Server/Locations.cs index a522633f..d4a8c93f 100644 --- a/Libraries/Core/Models/Spt/Server/Locations.cs +++ b/Libraries/Core/Models/Spt/Server/Locations.cs @@ -7,7 +7,7 @@ public record Locations { // sometimes we get the key or value given so save changing logic in each place // have it key both - private readonly Dictionary _locationMappings = new() + private static readonly Dictionary _locationMappings = new() { // EFT { "factory4_day", "Factory4Day" }, diff --git a/Libraries/Core/Routers/ItemEvents/NoteItemEventRouter.cs b/Libraries/Core/Routers/ItemEvents/NoteItemEventRouter.cs index 5181c80c..5a7d9f49 100644 --- a/Libraries/Core/Routers/ItemEvents/NoteItemEventRouter.cs +++ b/Libraries/Core/Routers/ItemEvents/NoteItemEventRouter.cs @@ -38,11 +38,11 @@ public class NoteItemEventRouter : ItemEventRouterDefinition switch (url) { case ItemEventActions.ADD_NOTE: - return _noteCallbacks.AddNote(pmcData, body as NoteActionData, sessionID); + return _noteCallbacks.AddNote(pmcData, body as NoteActionRequest, sessionID); case ItemEventActions.EDIT_NOTE: - return _noteCallbacks.EditNote(pmcData, body as NoteActionData, sessionID); + return _noteCallbacks.EditNote(pmcData, body as NoteActionRequest, sessionID); case ItemEventActions.DELETE_NOTE: - return _noteCallbacks.DeleteNote(pmcData, body as NoteActionData, sessionID); + return _noteCallbacks.DeleteNote(pmcData, body as NoteActionRequest, sessionID); default: throw new Exception($"NoteItemEventRouter being used when it cant handle route {url}"); } diff --git a/Libraries/Core/Utils/Json/Converters/BaseInteractionRequestDataConverter.cs b/Libraries/Core/Utils/Json/Converters/BaseInteractionRequestDataConverter.cs index a06f6252..d265be4c 100644 --- a/Libraries/Core/Utils/Json/Converters/BaseInteractionRequestDataConverter.cs +++ b/Libraries/Core/Utils/Json/Converters/BaseInteractionRequestDataConverter.cs @@ -121,7 +121,7 @@ public class BaseInteractionRequestDataConverter : JsonConverter(jsonText); + return JsonSerializer.Deserialize(jsonText); case ItemEventActions.MOVE: return JsonSerializer.Deserialize(jsonText); case ItemEventActions.REMOVE: diff --git a/Tools/HideoutCraftQuestIdGenerator/HideoutCraftQuestIdGenerator.cs b/Tools/HideoutCraftQuestIdGenerator/HideoutCraftQuestIdGenerator.cs index 8f035f73..b037cf40 100644 --- a/Tools/HideoutCraftQuestIdGenerator/HideoutCraftQuestIdGenerator.cs +++ b/Tools/HideoutCraftQuestIdGenerator/HideoutCraftQuestIdGenerator.cs @@ -23,7 +23,7 @@ public class HideoutCraftQuestIdGenerator( IEnumerable _onLoadComponents ) { - private readonly HashSet _blacklistedProductions = + private static readonly HashSet _blacklistedProductions = [ "6617cdb6b24b0ea24505f618", // Old event quest production "Radio Repeater" alt recipe "66140c4a9688754de10dac07", // Old event quest production "Documents with decrypted data" @@ -32,7 +32,7 @@ public class HideoutCraftQuestIdGenerator( "67093210d514d26f8408612b" // Old event quest production "TG-Vi-24 true vaccine" ]; - private readonly Dictionary _forcedQuestToProductionAssociations = new() + private static readonly Dictionary _forcedQuestToProductionAssociations = new() { // KEY = PRODUCTION, VALUE = QUEST { "63a571802116d261d2336cd1", "625d6ffaf7308432be1d44c5" } // Network Provider - Part 2