chillcog/SPT-Server-Build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Comment improvements

Browse Source 
Made various variables static / readonly
This commit is contained in:
Chomp
2025-03-04 11:47:14 +00:00
parent 1041fc3ca1
commit e3664d3614
50 changed files with 427 additions and 573 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libraries/Core/Callbacks/AchievementCallbacks.cs
+2 -8
View File
@@ -14,11 +14,8 @@ public class AchievementCallbacks(
/// <summary>
/// Handle client/achievement/list
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle client/achievement/statistic
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
public string Statistic(string url, EmptyRequestData info, string sessionID)
public string Statistic(string url, EmptyRequestData _, string sessionID)
{
return _httpResponseUtil.GetBody(_achievementController.GetAchievementStatics(sessionID));
}
Libraries/Core/Callbacks/BotCallbacks.cs
+4 -16
View File
@@ -19,11 +19,8 @@ public class BotCallbacks(
/// Handle singleplayer/settings/bot/limit
/// Is called by client to define each bot roles wave limit
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle singleplayer/settings/bot/difficulty
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle singleplayer/settings/bot/difficulties
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle client/game/bot/generate
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
public string GenerateBots(string url, GenerateBotsRequestData info, string sessionID)
{
@@ -81,7 +69,7 @@ public class BotCallbacks(
/// Handle singleplayer/settings/bot/maxCap
/// </summary>
/// <returns></returns>
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];
Libraries/Core/Callbacks/BuildsCallbacks.cs
+10 -22
View File
@@ -16,11 +16,8 @@ public class BuildsCallbacks(
/// <summary>
/// Handle client/builds/list
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="request"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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();
}
/// <summary>
/// Handle client/builds/weapon/save
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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();
}
/// <summary>
/// Handle client/builds/equipment/save
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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();
}
/// <summary>
/// Handle client/builds/delete
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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();
}
}
Libraries/Core/Callbacks/BundleCallbacks.cs
+5 -4
View File
@@ -13,15 +13,16 @@ public class BundleCallbacks(
/// <summary>
/// Handle singleplayer/bundles
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
public string GetBundles(string url, EmptyRequestData info, string sessionID)
public string GetBundles(string url, EmptyRequestData _, string sessionID)
{
return _httpResponseUtil.NoBody(_bundleLoader.GetBundles());
}
/// <summary>
/// TODO: what does it do
/// </summary>
/// <returns></returns>
public string GetBundle(string url, object info, string sessionID)
{
return "BUNDLE";
Libraries/Core/Callbacks/ClientLogCallbacks.cs
+2 -5
View File
@@ -21,13 +21,10 @@ public class ClientLogCallbacks(
/// <summary>
/// Handle /singleplayer/log
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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();
}
Libraries/Core/Callbacks/CustomizationCallbacks.cs
+10 -28
View File
@@ -18,11 +18,8 @@ public class CustomizationCallbacks(
/// <summary>
/// Handle client/trading/customization/storage
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle client/trading/customization
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle CustomizationBuy event
/// </summary>
/// <param name="pmcData">Players PMC profile</param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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);
}
/// <summary>
/// Handle client/hideout/customization/offer/list
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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));
}
/// <summary>
/// Handle client/customization/storage
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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));
}
/// <summary>
/// Handle CustomizationSet
/// </summary>
/// <param name="pmcData">Players PMC profile</param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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);
}
}
Libraries/Core/Callbacks/DataCallbacks.cs
+14 -56
View File
@@ -17,11 +17,8 @@ public class DataCallbacks(
/// <summary>
/// Handle client/settings
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle client/globals
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle client/items
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle client/handbook/templates
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle client/customization
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle client/account/customization
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle client/hideout/settings
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle client/hideout/areas
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle client/hideout/production/recipes
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle client/languages
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle client/menu/locale
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle client/locale
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle client/hideout/qte/list
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle client/items/prices/
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
public string GetItemPrices(string url, EmptyRequestData info, string sessionID)
public string GetItemPrices(string url, EmptyRequestData _, string sessionID)
{
var traderId = url.Replace("/client/items/prices/", "");
Libraries/Core/Callbacks/DialogueCallbacks.cs
+38 -96
View File
@@ -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(
/// <summary>
/// Handle client/friend/list
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle client/chatServer/list
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
public virtual string GetChatServerList(string url, GetChatServerListRequestData info, string sessionID)
public virtual string GetChatServerList(string url, GetChatServerListRequestData request, string sessionID)
{
var chatServer = new List<ChatServer>
{
@@ -78,12 +73,10 @@ public class DialogueCallbacks(
/// <summary>
/// Handle client/mail/dialog/list
/// TODO: request properties are not handled
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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);
}
/// <summary>
/// Handle client/mail/dialog/info
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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));
}
/// <summary>
/// Handle client/mail/dialog/remove
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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();
}
/// <summary>
/// Handle client/mail/dialog/pin
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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();
}
/// <summary>
/// Handle client/mail/dialog/unpin
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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();
}
/// <summary>
/// Handle client/mail/dialog/read
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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();
}
/// <summary>
/// Handle client/mail/dialog/getAllAttachments
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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));
}
/// <summary>
/// Handle client/mail/msg/send
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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));
}
/// <summary>
/// Handle client/friend/request/list/outbox
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle client/friend/request/list/inbox
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle client/friend/request/send
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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));
}
/// <summary>
/// Handle client/friend/request/accept-all
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle client/friend/request/accept
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle client/friend/request/decline
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle client/friend/request/cancel
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle client/friend/delete
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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();
}
/// <summary>
/// Handle client/friend/ignore/set
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle client/friend/ignore/remove
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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
}
Libraries/Core/Callbacks/GameCallbacks.cs
+14 -59
View File
@@ -33,9 +33,6 @@ public class GameCallbacks(
/// <summary>
/// Handle client/game/version/validate
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
public string VersionValidate(string url, VersionValidateRequestData info, string sessionID)
{
@@ -45,14 +42,11 @@ public class GameCallbacks(
/// <summary>
/// Handle client/game/start
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle client/game/config
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
public string GetGameConfig(string url, GameEmptyCrcRequestData info, string sessionID)
{
@@ -95,9 +83,6 @@ public class GameCallbacks(
/// <summary>
/// Handle client/game/mode
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
public string GetGameMode(string url, GameModeRequestData info, string sessionID)
{
@@ -107,11 +92,8 @@ public class GameCallbacks(
/// <summary>
/// Handle client/server/list
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle client/match/group/current
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle client/checkVersion
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle client/game/keepalive
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle singleplayer/settings/version
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle /client/report/send & /client/reports/lobby/send
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle singleplayer/settings/getRaidTime
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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));
}
/// <summary>
/// Handle /client/survey
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle client/survey/view
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle client/survey/opinion
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
public string SendSurveyOpinion(string url, SendSurveyOpinionRequest info, string sessionID)
public string SendSurveyOpinion(string url, SendSurveyOpinionRequest request, string sessionID)
{
return _httpResponseUtil.NullResponse();
}
Libraries/Core/Callbacks/InraidCallbacks.cs
+10 -2
View File
@@ -48,12 +48,20 @@ public class InraidCallbacks(
return _httpResponseUtil.NoBody(_inRaidController.GetInRaidConfig().RaidMenuSettings);
}
public string GetTraitorScavHostileChance(string url, EmptyRequestData info, string sessionID)
/// <summary>
/// Handle singleplayer/scav/traitorscavhostile
/// </summary>
/// <returns></returns>
public string GetTraitorScavHostileChance(string url, EmptyRequestData _, string sessionID)
{
return _httpResponseUtil.NoBody(_inRaidController.GetTraitorScavHostileChance(url, sessionID));
}
public string GetBossTypes(string url, EmptyRequestData info, string sessionID)
/// <summary>
/// Handle singleplayer/bosstypes
/// </summary>
/// <returns></returns>
public string GetBossTypes(string url, EmptyRequestData _, string sessionID)
{
return _httpResponseUtil.NoBody(_inRaidController.GetBossTypes(url, sessionID));
}
Libraries/Core/Callbacks/LauncherCallbacks.cs
+2 -2
View File
@@ -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));
}
Libraries/Core/Callbacks/LocationCallbacks.cs
+1 -7
View File
@@ -15,11 +15,8 @@ public class LocationCallbacks(
/// <summary>
/// Handle client/locations
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle client/airdrop/loot
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
public string GetAirdropLoot(string url, GetAirdropLootRequest info, string sessionID)
{
Libraries/Core/Callbacks/MatchCallbacks.cs
+11 -71
View File
@@ -34,7 +34,7 @@ public class MatchCallbacks(
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle client/match/group/exit_from_menu
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle client/match/group/current
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle client/match/group/looking/start
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle client/match/group/looking/stop
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle client/match/group/invite/send
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
public string SendGroupInvite(string url, MatchGroupInviteSendRequest info, string sessionID)
{
@@ -107,9 +92,6 @@ public class MatchCallbacks(
/// <summary>
/// Handle client/match/group/invite/accept
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
public string AcceptGroupInvite(string url, RequestIdRequest info, string sessionID)
{
@@ -160,11 +142,8 @@ public class MatchCallbacks(
/// <summary>
/// Handle client/match/group/invite/cancel-all
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle client/putMetrics
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
public string PutMetrics(string url, PutMetricsRequestData info, string sessionID)
{
@@ -184,9 +160,6 @@ public class MatchCallbacks(
/// <summary>
/// Handle client/analytics/event-disconnect
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
public string EventDisconnect(string url, PutMetricsRequestData info, string sessionID)
{
@@ -196,11 +169,8 @@ public class MatchCallbacks(
/// <summary>
/// Handle client/match/available
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle match/group/start_game
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
public string JoinMatch(string url, MatchGroupStartGameRequest info, string sessionID)
{
@@ -220,11 +187,8 @@ public class MatchCallbacks(
/// <summary>
/// Handle client/getMetricsConfig
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
public string GetGroupStatus(string url, MatchGroupStatusRequest info, string sessionID)
{
@@ -245,9 +206,6 @@ public class MatchCallbacks(
/// <summary>
/// Handle client/match/group/delete
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
public string DeleteGroup(string url, DeleteGroupRequest info, string sessionID)
{
@@ -258,11 +216,8 @@ public class MatchCallbacks(
/// <summary>
/// Handle client/match/group/leave
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <summary>
/// Handle client/match/group/player/remove
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
public string RemovePlayerFromGroup(string url, MatchGroupPlayerRemoveRequest info, string sessionID)
{
@@ -282,9 +234,6 @@ public class MatchCallbacks(
/// <summary>
/// Handle client/match/local/start
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
public string StartLocalRaid(string url, StartLocalRaidRequestData info, string sessionID)
{
@@ -294,9 +243,6 @@ public class MatchCallbacks(
/// <summary>
/// Handle client/match/local/end
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
public string EndLocalRaid(string url, EndLocalRaidRequestData info, string sessionID)
{
@@ -307,9 +253,6 @@ public class MatchCallbacks(
/// <summary>
/// Handle client/raid/configuration
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
public string GetRaidConfiguration(string url, GetRaidConfigurationRequestData info, string sessionID)
{
@@ -332,11 +275,8 @@ public class MatchCallbacks(
/// <summary>
/// Handle client/match/group/raid/ready
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
public string NotRaidReady(string url, EmptyRequestData info, string sessionID)
public string NotRaidReady(string url, EmptyRequestData _, string sessionID)
{
return _httpResponseUtil.GetBody(true);
}
Libraries/Core/Callbacks/NoteCallbacks.cs
+12 -12
View File
@@ -13,35 +13,35 @@ public class NoteCallbacks(NoteController _noteController)
/// Handle AddNote event
/// </summary>
/// <param name="pmcData">Players PMC profile</param>
/// <param name="info"></param>
/// <param name="request">Add note request</param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
public ItemEventRouterResponse AddNote(PmcData pmcData, NoteActionData info, string sessionID)
/// <returns>ItemEventRouterResponse</returns>
public ItemEventRouterResponse AddNote(PmcData pmcData, NoteActionRequest request, string sessionID)
{
return _noteController.AddNote(pmcData, info, sessionID);
return _noteController.AddNote(pmcData, request, sessionID);
}
/// <summary>
/// Handle EditNote event
/// </summary>
/// <param name="pmcData">Players PMC profile</param>
/// <param name="info"></param>
/// <param name="request">Edit note request</param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
public ItemEventRouterResponse EditNote(PmcData pmcData, NoteActionData info, string sessionID)
/// <returns>ItemEventRouterResponse</returns>
public ItemEventRouterResponse EditNote(PmcData pmcData, NoteActionRequest request, string sessionID)
{
return _noteController.EditNote(pmcData, info, sessionID);
return _noteController.EditNote(pmcData, request, sessionID);
}
/// <summary>
/// Handle DeleteNote event
/// </summary>
/// <param name="pmcData">Players PMC profile</param>
/// <param name="info"></param>
/// <param name="request">Delete note request</param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
public ItemEventRouterResponse DeleteNote(PmcData pmcData, NoteActionData info, string sessionID)
/// <returns>ItemEventRouterResponse</returns>
public ItemEventRouterResponse DeleteNote(PmcData pmcData, NoteActionRequest request, string sessionID)
{
return _noteController.DeleteNote(pmcData, info, sessionID);
return _noteController.DeleteNote(pmcData, request, sessionID);
}
}
Libraries/Core/Callbacks/NotifierCallbacks.cs
+1 -1
View File
@@ -53,7 +53,7 @@ public class NotifierCallbacks(
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
public string CreateNotifierChannel(string url, EmptyRequestData info, string sessionID)
public string CreateNotifierChannel(string url, EmptyRequestData _, string sessionID)
{
return _httpResponseUtil.GetBody(_notifierController.GetChannel(sessionID));
}
Libraries/Core/Callbacks/PrestigeCallbacks.cs
+2 -2
View File
@@ -19,9 +19,9 @@ public class PrestigeCallbacks(
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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));
}
/// <summary>
Libraries/Core/Callbacks/ProfileCallbacks.cs
+5 -5
View File
@@ -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<PmcData>
@@ -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());
}
Libraries/Core/Callbacks/QuestCallbacks.cs
+2 -2
View File
@@ -76,7 +76,7 @@ public class QuestCallbacks(
/// <returns></returns>
public string ListQuests(string url, ListQuestsRequestData info, string sessionID)
{
return _httpResponseUtil.GetBody(_questController.GetClientQuest(sessionID));
return _httpResponseUtil.GetBody(_questController.GetClientQuests(sessionID));
}
/// <summary>
@@ -86,7 +86,7 @@ public class QuestCallbacks(
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
public string ActivityPeriods(string url, EmptyRequestData info, string sessionID)
public string ActivityPeriods(string url, EmptyRequestData _, string sessionID)
{
return _httpResponseUtil.GetBody(_repeatableQuestController.GetClientRepeatableQuests(sessionID));
}
Libraries/Core/Callbacks/RagfairCallbacks.cs
+1 -1
View File
@@ -125,7 +125,7 @@ public class RagfairCallbacks(
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
public string GetFleaPrices(string url, EmptyRequestData info, string sessionID)
public string GetFleaPrices(string url, EmptyRequestData _, string sessionID)
{
return _httpResponseUtil.GetBody(_ragfairController.GetAllFleaPrices());
}
Libraries/Core/Callbacks/TraderCallbacks.cs
+4 -4
View File
@@ -42,7 +42,7 @@ public class TraderCallbacks(
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
public string GetModdedTraderData(string url, EmptyRequestData info, string sessionID)
public string GetModdedTraderData(string url, EmptyRequestData _, string sessionID)
{
return _httpResponseUtil.NoBody(_traderConfig.ModdedTraders);
}
Libraries/Core/Callbacks/WeatherCallbacks.cs
+2 -2
View File
@@ -18,7 +18,7 @@ public class WeatherCallbacks(
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
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(
/// <param name="info"></param>
/// <param name="sessionID">Session/player id</param>
/// <returns></returns>
public string GetLocalWeather(string url, EmptyRequestData info, string sessionID)
public string GetLocalWeather(string url, EmptyRequestData _, string sessionID)
{
return _httpResponseUtil.GetBody(_weatherController.GenerateLocal(sessionID));
}
Libraries/Core/Controllers/CustomizationController.cs
+2 -5
View File
@@ -220,9 +220,8 @@ public class CustomizationController(
/// Handle client/hideout/customization/offer/list
/// </summary>
/// <param name="sessionId">Session/Player id</param>
/// <param name="info"></param>
/// <returns></returns>
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
/// </summary>
/// <param name="sessionId">Session/Player id</param>
/// <param name="info"></param>
/// <returns></returns>
public List<CustomisationStorage> GetCustomisationStorage(
string sessionId,
EmptyRequestData info)
string sessionId)
{
var customisationResultsClone = _cloner.Clone(_databaseService.GetTemplates().CustomisationStorage);
Libraries/Core/Controllers/GameController.cs
+1 -2
View File
@@ -56,10 +56,9 @@ public class GameController(
/// Handle client/game/start
/// </summary>
/// <param name="url"></param>
/// <param name="info"></param>
/// <param name="sessionId">Session/Player id</param>
/// <param name="startTimeStampMs"></param>
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}");
Libraries/Core/Controllers/HideoutController.cs
+12 -12
View File
@@ -253,7 +253,7 @@ public class HideoutController(
/// Add a stash upgrade to profile
/// </summary>
/// <param name="output">Client response</param>
/// <param name="sessionID"></param>
/// <param name="sessionID">Session/Player id</param>
/// <param name="pmcData">Players PMC profile</param>
/// <param name="profileParentHideoutArea"></param>
/// <param name="dbHideoutArea"></param>
@@ -340,7 +340,7 @@ public class HideoutController(
/// <summary>
/// Include container upgrade in client response
/// </summary>
/// <param name="sessionID"></param>
/// <param name="sessionID">Session/Player id</param>
/// <param name="areaType"></param>
/// <param name="hideoutDbData"></param>
/// <param name="hideoutStage"></param>
@@ -367,7 +367,7 @@ public class HideoutController(
/// </summary>
/// <param name="pmcData">Players PMC profile</param>
/// <param name="addItemToHideoutRequest">request from client to place item in area slot</param>
/// <param name="sessionID"></param>
/// <param name="sessionID">Session/Player id</param>
/// <returns>ItemEventRouterResponse</returns>
public ItemEventRouterResponse PutItemsInAreaSlots(PmcData pmcData, HideoutPutItemInRequestData addItemToHideoutRequest, string sessionID)
{
@@ -453,7 +453,7 @@ public class HideoutController(
/// </summary>
/// <param name="pmcData">Players PMC profile</param>
/// <param name="request">Take item out of area request</param>
/// <param name="sessionID"></param>
/// <param name="sessionID">Session/Player id</param>
/// <returns>ItemEventRouterResponse</returns>
public ItemEventRouterResponse TakeItemsFromAreaSlots(PmcData pmcData, HideoutTakeItemOutRequestData request, string sessionID)
{
@@ -494,7 +494,7 @@ public class HideoutController(
/// <summary>
/// Find resource item in hideout area, add copy to player inventory, remove Item from hideout slot
/// </summary>
/// <param name="sessionID"></param>
/// <param name="sessionID">Session/Player id</param>
/// <param name="pmcData">Players PMC profile</param>
/// <param name="removeResourceRequest">client request</param>
/// <param name="output">Client response</param>
@@ -550,7 +550,7 @@ public class HideoutController(
/// </summary>
/// <param name="pmcData">Players PMC profile</param>
/// <param name="request">Toggle area request</param>
/// <param name="sessionID"></param>
/// <param name="sessionID">Session/Player id</param>
/// <returns>ItemEventRouterResponse</returns>
public ItemEventRouterResponse ToggleArea(PmcData pmcData, HideoutToggleAreaRequestData request, string sessionID)
{
@@ -576,7 +576,7 @@ public class HideoutController(
/// </summary>
/// <param name="pmcData">Players PMC profile</param>
/// <param name="request"></param>
/// <param name="sessionID"></param>
/// <param name="sessionID">Session/Player id</param>
/// <returns>ItemEventRouterResponse</returns>
public ItemEventRouterResponse SingleProductionStart(PmcData pmcData, HideoutSingleProductionStartRequestData request, string sessionID)
{
@@ -630,7 +630,7 @@ public class HideoutController(
/// </summary>
/// <param name="pmcData">Players PMC profile</param>
/// <param name="request"></param>
/// <param name="sessionID"></param>
/// <param name="sessionID">Session/Player id</param>
/// <returns>ItemEventRouterResponse</returns>
public ItemEventRouterResponse ScavCaseProductionStart(PmcData pmcData, HideoutScavCaseStartRequestData request, string sessionID)
{
@@ -731,7 +731,7 @@ public class HideoutController(
/// </summary>
/// <param name="pmcData">Players PMC profile</param>
/// <param name="request">Continuous production request</param>
/// <param name="sessionID"></param>
/// <param name="sessionID">Session/Player id</param>
/// <returns>ItemEventRouterResponse</returns>
public ItemEventRouterResponse ContinuousProductionStart(PmcData pmcData, HideoutContinuousProductionStartRequestData request, string sessionID)
{
@@ -746,7 +746,7 @@ public class HideoutController(
/// </summary>
/// <param name="pmcData">Players PMC profile</param>
/// <param name="request">Remove production from area request</param>
/// <param name="sessionID"></param>
/// <param name="sessionID">Session/Player id</param>
/// <returns></returns>
public ItemEventRouterResponse TakeProduction(PmcData pmcData, HideoutTakeProductionRequestData request, string sessionID)
{
@@ -791,7 +791,7 @@ public class HideoutController(
/// <summary>
/// Take recipe-type production out of hideout area and place into player inventory
/// </summary>
/// <param name="sessionID"></param>
/// <param name="sessionID">Session/Player id</param>
/// <param name="recipe">Completed recipe of item</param>
/// <param name="pmcData">Players PMC profile</param>
/// <param name="request">Remove production from area request</param>
@@ -1099,7 +1099,7 @@ public class HideoutController(
/// <summary>
/// Handles generating scav case rewards and sending to player inventory
/// </summary>
/// <param name="sessionID"></param>
/// <param name="sessionID">Session/Player id</param>
/// <param name="pmcData">Players PMC profile</param>
/// <param name="request">Get rewards from scavcase craft request</param>
/// <param name="output">Client response</param>
Libraries/Core/Controllers/InRaidController.cs
+2 -1
View File
@@ -57,11 +57,12 @@ public class InRaidController(
}
/// <summary>
/// Handle singleplayer/scav/traitorscavhostile
/// Get a % chance a scav will be hostile to the player when they're also a scav
/// </summary>
/// <param name="url"></param>
/// <param name="sessionId">Session/Player id</param>
/// <returns></returns>
/// <returns>% chance scav is hostile to player</returns>
public double GetTraitorScavHostileChance(string url, string sessionId)
{
return _inRaidConfig.PlayerScavHostileChancePercent;
Libraries/Core/Controllers/InventoryController.cs
+2 -2
View File
@@ -888,7 +888,7 @@ public class InventoryController(
/// </summary>
/// <param name="pmcData">Players PMC profile</param>
/// <param name="request">Merge stacks request</param>
/// <param name="sessionID"></param>
/// <param name="sessionID">Session/Player id</param>
/// <param name="output">Client response</param>
public void MergeItem(PmcData pmcData, InventoryMergeRequestData request, string sessionID,
ItemEventRouterResponse output)
@@ -978,7 +978,7 @@ public class InventoryController(
/// </summary>
/// <param name="pmcData">(unused, getOwnerInventoryItems() gets profile)</param>
/// <param name="request">Split stack request</param>
/// <param name="sessionID"></param>
/// <param name="sessionID">Session/Player id</param>
/// <param name="output">Client response</param>
public void SplitItem(PmcData pmcData, InventorySplitRequestData request, string sessionID,
ItemEventRouterResponse output)
Libraries/Core/Controllers/LauncherController.cs
+3 -3
View File
@@ -33,9 +33,9 @@ public class LauncherController(
protected CoreConfig _coreConfig = _configServer.GetConfig<CoreConfig>();
/// <summary>
///
/// Handle launcher connecting to server
/// </summary>
/// <returns></returns>
/// <returns>ConnectResponse</returns>
public ConnectResponse Connect()
{
// Get all possible profile types + filter out any that are blacklisted
@@ -82,7 +82,7 @@ public class LauncherController(
/// <summary>
///
/// </summary>
/// <param name="sessionId"></param>
/// <param name="sessionId">Session/Player id</param>
/// <returns></returns>
public Info? Find(string? sessionId)
{
Libraries/Core/Controllers/MatchController.cs
+15 -14
View File
@@ -25,8 +25,9 @@ public class MatchController(
protected PmcConfig _pmcConfig = _configServer.GetConfig<PmcConfig>();
/// <summary>
/// Handle client/match/available
/// </summary>
/// <returns></returns>
/// <returns>True if server should be available</returns>
public bool GetEnabled()
{
return _matchConfig.Enabled;
@@ -35,19 +36,19 @@ public class MatchController(
/// <summary>
/// Handle client/match/group/delete
/// </summary>
/// <param name="info"></param>
public void DeleteGroup(DeleteGroupRequest info)
/// <param name="request">Delete group request</param>
public void DeleteGroup(DeleteGroupRequest request)
{
_matchLocationService.DeleteGroup(info);
_matchLocationService.DeleteGroup(request);
}
/// <summary>
/// Handle match/group/start_game
/// </summary>
/// <param name="info"></param>
/// <param name="request">Start game request</param>
/// <param name="sessionId">Session/Player id</param>
/// <returns></returns>
public ProfileStatusResponse JoinMatch(MatchGroupStartGameRequest info, string sessionId)
/// <returns>ProfileStatusResponse</returns>
public ProfileStatusResponse JoinMatch(MatchGroupStartGameRequest request, string sessionId)
{
var output = new ProfileStatusResponse
{
@@ -79,9 +80,9 @@ public class MatchController(
/// <summary>
/// Handle client/match/group/status
/// </summary>
/// <param name="info"></param>
/// <returns></returns>
public MatchGroupStatusResponse GetGroupStatus(MatchGroupStatusRequest info)
/// <param name="request">Group status request</param>
/// <returns>MatchGroupStatusResponse</returns>
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
/// </summary>
/// <param name="botDifficulty">dropdown difficulty value</param>
/// <returns>bot difficulty</returns>
/// <returns>Bot difficulty</returns>
protected string ConvertDifficultyDropdownIntoBotDifficulty(string botDifficulty)
{
// Edge case medium - must be altered
@@ -131,8 +132,8 @@ public class MatchController(
/// Handle client/match/local/start
/// </summary>
/// <param name="sessionId">Session/Player id</param>
/// <param name="request"></param>
/// <returns></returns>
/// <param name="request">Start raid request</param>
/// <returns>StartLocalRaidResponseData</returns>
public StartLocalRaidResponseData StartLocalRaid(string sessionId, StartLocalRaidRequestData request)
{
return _locationLifecycleService.StartLocalRaid(sessionId, request);
@@ -142,7 +143,7 @@ public class MatchController(
/// Handle client/match/local/end
/// </summary>
/// <param name="sessionId">Session/Player id</param>
/// <param name="request"></param>
/// <param name="request">Emd local raid request</param>
public void EndLocalRaid(string sessionId, EndLocalRaidRequestData request)
{
_locationLifecycleService.EndLocalRaid(sessionId, request);
Libraries/Core/Controllers/NoteController.cs
+15 -15
View File
@@ -14,18 +14,18 @@ public class NoteController(
/// <summary>
/// </summary>
/// <param name="pmcData">Players PMC profile</param>
/// <param name="body"></param>
/// <param name="request">Add note request</param>
/// <param name="sessionId">Session/Player id</param>
/// <returns></returns>
/// <returns>ItemEventRouterResponse</returns>
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(
/// <summary>
/// </summary>
/// <param name="pmcData">Players PMC profile</param>
/// <param name="body"></param>
/// <param name="request">Edit note request</param>
/// <param name="sessionId">Session/Player id</param>
/// <returns></returns>
/// <returns>ItemEventRouterResponse</returns>
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(
/// <summary>
/// </summary>
/// <param name="pmcData">Players PMC profile</param>
/// <param name="body"></param>
/// <param name="request">Delete note request</param>
/// <param name="sessionId">Session/Player id</param>
/// <returns></returns>
/// <returns>ItemEventRouterResponse</returns>
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);
}
Libraries/Core/Controllers/NotifierController.cs
+3 -2
View File
@@ -53,7 +53,7 @@ public class NotifierController(
/// Handle client/notifier/channel/create
/// </summary>
/// <param name="sessionId">Session/Player id</param>
/// <returns></returns>
/// <returns>NotifierChannel</returns>
public NotifierChannel GetChannel(string sessionId)
{
return new NotifierChannel
@@ -67,9 +67,10 @@ public class NotifierController(
}
/// <summary>
/// Get the notifier server url
/// </summary>
/// <param name="sessionId">Session/Player id</param>
/// <returns></returns>
/// <returns>Notification server url</returns>
public string GetServer(string sessionId)
{
return $"{_httpServerHelper.GetBackendUrl()}/notifierServer/get/{sessionId}";
Libraries/Core/Controllers/PrestigeController.cs
+8 -10
View File
@@ -20,13 +20,12 @@ public class PrestigeController(
{
/// <summary>
/// Handle /client/prestige/list
/// Get a collection of all possible prestiges
/// </summary>
/// <param name="sessionId">Session/Player id</param>
/// <param name="info"></param>
/// <returns></returns>
/// <returns>Prestige</returns>
public Prestige GetPrestige(
string sessionId,
EmptyRequestData info)
string sessionId)
{
return _databaseService.GetTemplates().Prestige;
}
@@ -35,11 +34,11 @@ public class PrestigeController(
/// <para>Handle /client/prestige/obtain</para>
/// Going to Prestige 1 grants the below
/// <list type="bullet">
/// <item>5% of skills should be transfered over</item>
/// <item>5% of mastering should be transfered over</item>
/// <item>Earned achievements should be transfered over</item>
/// <item>Profile stats should be transfered over</item>
/// <item>Prestige progress should be transfered over</item>
/// <item>5% of skills should be transferred over</item>
/// <item>5% of mastering should be transferred over</item>
/// <item>Earned achievements should be transferred over</item>
/// <item>Profile stats should be transferred over</item>
/// <item>Prestige progress should be transferred over</item>
/// <item>Items and rewards for Prestige 1</item>
/// </list>
/// 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
Libraries/Core/Controllers/ProfileController.cs
+60 -44
View File
@@ -42,7 +42,7 @@ public class ProfileController(
*/
public virtual List<MiniProfile> 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<PmcData> 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
*/
/// <summary>
/// Handle client/game/profile/create
/// </summary>
/// <param name="request">Create profile request</param>
/// <param name="sessionID">Player id</param>
/// <returns>Player id</returns>
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
*/
/// <summary>
/// Generate a player scav object
/// PMC profile MUST exist first before player-scav can be generated
/// </summary>
/// <param name="sessionID">Player id</param>
/// <returns>PmcData</returns>
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)
/// <summary>
/// Handle client/game/profile/nickname/change event
/// Client allows player to adjust their profile name
/// </summary>
/// <param name="request">Change nickname request</param>
/// <param name="sessionID">Player id</param>
/// <returns></returns>
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)
/// <summary>
/// Handle client/game/profile/voice/change event
/// </summary>
/// <param name="request">Change voice request</param>
/// <param name="sessionID">Player id</param>
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<SearchFriendResponse> SearchProfiles(SearchProfilesRequestData info, string sessionID)
/// <summary>
/// Handle client/game/profile/search
/// </summary>
/// <param name="request">Search profiles request</param>
/// <param name="sessionID">Player id</param>
/// <returns>Found profiles</returns>
public virtual List<SearchFriendResponse> SearchProfiles(SearchProfilesRequestData request, string sessionID)
{
var result = new List<SearchFriendResponse>();
@@ -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
*/
/// <summary>
/// Handle client/profile/status
/// </summary>
/// <param name="sessionId">Session/Player id</param>
/// <returns></returns>
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
*/
/// <summary>
/// Handle client/profile/view
/// </summary>
/// <param name="sessionId">Session/Player id</param>
/// <param name="request">Get other profile request</param>
/// <returns>GetOtherProfileResponse</returns>
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
*/
/// <summary>
/// Handle client/profile/settings
/// </summary>
/// <param name="sessionId">Session/Player id</param>
/// <param name="request">Get profile settings request</param>
/// <returns></returns>
public virtual bool SetChosenProfileIcon(string sessionId, GetProfileSettingsRequest request)
{
var profileToUpdate = _profileHelper.GetPmcProfile(sessionId);
Libraries/Core/Controllers/QuestController.cs
+110 -23
View File
@@ -40,13 +40,30 @@ public class QuestController(
)
{
protected QuestConfig _questConfig = _configServer.GetConfig<QuestConfig>();
protected List<string> _questTypes = ["PickUp", "Exploration", "Elimination"];
protected static readonly List<string> _questTypes = ["PickUp", "Exploration", "Elimination"];
public List<Quest> GetClientQuest(string sessionId)
/// <summary>
/// Handle client/quest/list
/// Get all quests visible to player
/// Exclude quests with incomplete preconditions (level/loyalty)
/// </summary>
/// <param name="sessionId">Session/Player id</param>
/// <returns>Collection of Quest</returns>
public List<Quest> GetClientQuests(string sessionId)
{
return _questHelper.GetClientQuests(sessionId);
}
/// <summary>
/// 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
/// </summary>
/// <param name="pmcData">Players PMC profile</param>
/// <param name="acceptedQuest">Quest accepted</param>
/// <param name="sessionID">Session/Player id</param>
/// <returns>ItemEventRouterResponse</returns>
public ItemEventRouterResponse AcceptQuest(PmcData pmcData, AcceptQuestRequestData acceptedQuest, string sessionID)
{
var acceptQuestResponse = _eventOutputHolder.GetOutput(sessionID);
@@ -113,6 +130,12 @@ public class QuestController(
return acceptQuestResponse;
}
/// <summary>
/// Add a quests condition counters to chosen profile
/// </summary>
/// <param name="questConditions">Conditions to iterate over and possibly add to profile</param>
/// <param name="pmcData">Players PMC profile</param>
/// <param name="questId">Quest where conditions originated</param>
protected void AddTaskConditionCountersToProfile(List<QuestCondition>? 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(
}
}
/// <summary>
/// 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
/// </summary>
/// <param name="pmcData">Players PMC profile</param>
/// <param name="acceptedQuest">Repeatable quest accepted</param>
/// <param name="sessionID">Session/Player id</param>
/// <returns>ItemEventRouterResponse</returns>
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)
/// <summary>
/// Look for an accepted quest inside player profile, return quest that matches
/// </summary>
/// <param name="pmcData">Players PMC profile</param>
/// <param name="questId">Quest id to return</param>
/// <returns>RepeatableQuest</returns>
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)
/// <summary>
/// Handle QuestComplete event
/// Update completed quest in profile
/// Add newly unlocked quests to profile
/// Also recalculate their level due to exp rewards
/// </summary>
/// <param name="pmcData">Players PMC profile</param>
/// <param name="request">Complete quest request</param>
/// <param name="sessionId">Session/Player id</param>
/// <returns>ItemEventRouterResponse</returns>
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)
/// <summary>
/// Handle QuestHandover event
/// Player hands over an item to trader to complete/partially complete quest
/// </summary>
/// <param name="pmcData">Players PMC profile</param>
/// <param name="request">Handover request</param>
/// <param name="sessionID">Session/Player id</param>
/// <returns>ItemEventRouterResponse</returns>
public ItemEventRouterResponse HandoverQuest(PmcData pmcData, HandoverQuestRequestData request, string sessionID)
{
var quest = _questHelper.GetQuestFromDb(handoverQuestRequest.QuestId, pmcData);
var quest = _questHelper.GetQuestFromDb(request.QuestId, pmcData);
List<string> 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)
/// <summary>
/// Show warning to user and write to log that repeatable quest failed a condition check
/// </summary>
/// <param name="questId">Quest id that failed</param>
/// <param name="conditionId">Relevant condition id that failed</param>
/// <param name="output">Client response</param>
/// <returns>ItemEventRouterResponse</returns>
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);
}
/// <summary>
/// Show warning to user and write to log quest item handed over did not match what is required
/// </summary>
/// <param name="handoverQuestRequest">Handover request</param>
/// <param name="itemHandedOver">Non-matching item found</param>
/// <param name="handoverRequirements">Quest handover requirements</param>
/// <param name="output">Response to send to user</param>
/// <returns>ItemEventRouterResponse</returns>
protected ItemEventRouterResponse ShowQuestItemHandoverMatchError(HandoverQuestRequestData handoverQuestRequest, Item? itemHandedOver,
QuestCondition? handoverRequirements, ItemEventRouterResponse output)
{
@@ -382,6 +453,14 @@ public class QuestController(
return _httpResponseUtil.AppendErrorToOutput(output, errorMessage);
}
/// <summary>
/// Increment a backend counter stored value by an amount
/// Create counter if it does not exist
/// </summary>
/// <param name="pmcData">Players PMC profile</param>
/// <param name="conditionId">Backend counter id to update</param>
/// <param name="questId">Quest id counter is associated with</param>
/// <param name="counterValue">Value to increment the backend counter with</param>
protected void UpdateProfileTaskConditionCounterValue(PmcData pmcData, string conditionId, string questId, double counterValue)
{
if (pmcData.TaskConditionCounters.GetValueOrDefault(conditionId) != null)
@@ -400,6 +479,14 @@ public class QuestController(
});
}
/// <summary>
/// Handle /client/game/profile/items/moving - QuestFail
/// </summary>
/// <param name="pmcData">Players PMC profile</param>
/// <param name="request">Fail quest request</param>
/// <param name="sessionID">Session/Player id</param>
/// <param name="output"></param>
/// <returns>ItemEventRouterResponse</returns>
public ItemEventRouterResponse FailQuest(PmcData pmcData, FailQuestRequestData request, string sessionID, ItemEventRouterResponse output)
{
_questHelper.FailQuest(pmcData, request, sessionID, output);
Libraries/Core/Generators/BotEquipmentModGenerator.cs
+12 -7
View File
@@ -41,8 +41,10 @@ public class BotEquipmentModGenerator(
{
protected BotConfig _botConfig = _configServer.GetConfig<BotConfig>();
protected HashSet<string> _modSightIds = ["mod_sight_front", "mod_sight_rear"];
protected HashSet<string> _scopeIds =
protected static HashSet<string> _modSightIds = ["mod_sight_front", "mod_sight_rear"];
// Slots that hold scopes
protected static HashSet<string> _scopeIds =
[
"mod_scope",
"mod_mount",
@@ -53,6 +55,12 @@ public class BotEquipmentModGenerator(
"mod_scope_003"
];
// Slots that hold muzzles
protected static HashSet<string> _muzzleIds = ["mod_muzzle", "mod_muzzle_000", "mod_muzzle_001"];
// Slots a weapon can store its stock in
protected static HashSet<string> _stockSlots = ["mod_stock", "mod_stock_000", "mod_stock_001", "mod_stock_akms"];
/// <summary>
/// Check mods are compatible and add to array
/// </summary>
@@ -719,13 +727,10 @@ public class BotEquipmentModGenerator(
/// <returns>True if it should</returns>
public bool ShouldForceSubStockSlots(string modSlot, EquipmentFilters botEquipConfig, TemplateItem modToAddTemplate)
{
// Slots a weapon can store its stock in
HashSet<string> 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);
}
/// <summary>
@@ -793,7 +798,7 @@ public class BotEquipmentModGenerator(
/// <returns>True if modSlot can have muzzle-related items</returns>
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());
}
/// <summary>
Libraries/Core/Generators/BotInventoryGenerator.cs
+1 -1
View File
@@ -40,7 +40,7 @@ public class BotInventoryGenerator(
private readonly BotConfig _botConfig = _configServer.GetConfig<BotConfig>();
// Slots handled individually inside `GenerateAndAddEquipmentToBot`
private readonly HashSet<EquipmentSlots> _excludedEquipmentSlots =
private static readonly HashSet<EquipmentSlots> _excludedEquipmentSlots =
[
EquipmentSlots.Pockets,
EquipmentSlots.FirstPrimaryWeapon,
Libraries/Core/Helpers/BotGeneratorHelper.cs
+4 -2
View File
@@ -29,6 +29,9 @@ public class BotGeneratorHelper(
protected BotConfig _botConfig = _configServer.GetConfig<BotConfig>();
protected PmcConfig _pmcConfig = _configServer.GetConfig<PmcConfig>();
// Equipment slot ids that do not conflict with other slots
protected static readonly HashSet<string> _slotsWithNoCompatIssues = ["Scabbard", "Backpack", "SecureContainer", "Holster", "ArmBand"];
/// <summary>
/// Adds properties to an item
/// e.g. Repairable / HasHinge / Foldable / MaxDurability
@@ -331,8 +334,7 @@ public class BotGeneratorHelper(
public ChooseRandomCompatibleModResult IsItemIncompatibleWithCurrentItems(List<Item> itemsEquipped, string tplToCheck, string equipmentSlot)
{
// Skip slots that have no incompatibilities
HashSet<string> slotsToCheck = ["Scabbard", "Backpack", "SecureContainer", "Holster", "ArmBand"];
if (slotsToCheck.Contains(equipmentSlot))
if (_slotsWithNoCompatIssues.Contains(equipmentSlot))
{
return new ChooseRandomCompatibleModResult
{
Libraries/Core/Helpers/BotHelper.cs
+2 -3
View File
@@ -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<BotConfig>();
protected PmcConfig _pmcConfig = _configServer.GetConfig<PmcConfig>();
protected HashSet<string?> _pmcNames = ["usec", "bear", "pmc", "pmcbear", "pmcusec"];
protected static readonly HashSet<string?> _pmcTypeIds = ["usec", "bear", "pmc", "pmcbear", "pmcusec"];
protected Dictionary<string, List<string>> _pmcNameCache = new();
/// <summary>
@@ -46,7 +45,7 @@ public class BotHelper(
/// <returns>true if is pmc</returns>
public bool IsBotPmc(string? botRole)
{
return _pmcNames.Contains(botRole?.ToLower());
return _pmcTypeIds.Contains(botRole?.ToLower());
}
public bool IsBotBoss(string botRole)
Libraries/Core/Helpers/BotWeaponGeneratorHelper.cs
+1 -1
View File
@@ -20,7 +20,7 @@ public class BotWeaponGeneratorHelper(
LocalisationService _localisationService
)
{
private readonly HashSet<string> _magCheck = ["CylinderMagazine", "SpringDrivenCylinder"];
private static readonly HashSet<string> _magCheck = ["CylinderMagazine", "SpringDrivenCylinder"];
/// <summary>
/// Get a randomized number of bullets for a specific magazine
Libraries/Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.cs
+1 -1
View File
@@ -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<string> _excludedPresetItems =
protected static readonly HashSet<string> _excludedPresetItems =
[
ItemTpl.FLARE_RSP30_REACTIVE_SIGNAL_CARTRIDGE_RED,
ItemTpl.FLARE_RSP30_REACTIVE_SIGNAL_CARTRIDGE_GREEN,
Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/HelloMessageHandler.cs
+1 -1
View File
@@ -12,7 +12,7 @@ public class HelloMessageHandler(
MailSendService _mailSendService,
RandomUtil _randomUtil) : IChatMessageHandler
{
protected HashSet<string> _listOfGreetings = ["hello", "hi", "sup", "yo", "hey", "bonjour"];
protected static readonly HashSet<string> _listOfGreetings = ["hello", "hi", "sup", "yo", "hey", "bonjour"];
public int GetPriority()
Libraries/Core/Helpers/InRaidHelper.cs
+1 -1
View File
@@ -20,7 +20,7 @@ public class InRaidHelper(
{
protected InRaidConfig _inRaidConfig = _configServer.GetConfig<InRaidConfig>();
protected LostOnDeathConfig _lostOnDeathConfig = _configServer.GetConfig<LostOnDeathConfig>();
protected List<string> _pocketSlots = ["pocket1", "pocket2", "pocket3", "pocket4"];
protected static readonly List<string> _pocketSlots = ["pocket1", "pocket2", "pocket3", "pocket4"];
/// <summary>
/// Deprecated. Reset the skill points earned in a raid to 0, ready for next raid.
Libraries/Core/Helpers/InventoryHelper.cs
+1 -1
View File
@@ -36,7 +36,7 @@ public class InventoryHelper(
)
{
protected InventoryConfig _inventoryConfig = _configServer.GetConfig<InventoryConfig>();
private readonly HashSet<string> _variableSizeItemTypes = [BaseClasses.WEAPON, BaseClasses.FUNCTIONAL_MOD];
private static readonly HashSet<string> _variableSizeItemTypes = [BaseClasses.WEAPON, BaseClasses.FUNCTIONAL_MOD];
/// <summary>
/// Add multiple items to player stash (assuming they all fit)
Libraries/Core/Helpers/ItemHelper.cs
+5 -5
View File
@@ -27,7 +27,7 @@ public class ItemHelper(
ICloner _cloner
)
{
protected readonly HashSet<string> _defaultInvalidBaseTypes =
protected static readonly HashSet<string> _defaultInvalidBaseTypes =
[
BaseClasses.LOOT_CONTAINER,
BaseClasses.MOB_CONTAINER,
@@ -38,7 +38,7 @@ public class ItemHelper(
BaseClasses.POCKETS
];
protected readonly HashSet<string> _slotsAsStrings =
protected static readonly HashSet<string> _slotsAsStrings =
[
EquipmentSlots.Headwear.ToString(),
EquipmentSlots.Earpiece.ToString(),
@@ -56,7 +56,7 @@ public class ItemHelper(
EquipmentSlots.Scabbard.ToString()
];
protected readonly HashSet<string> _dogTagTpls =
protected static readonly HashSet<string> _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<string> _softInsertIds =
protected static readonly HashSet<string> _softInsertIds =
[
"groin",
"groin_back",
@@ -88,7 +88,7 @@ public class ItemHelper(
"helmet_ears"
];
protected readonly HashSet<string> _removablePlateSlotIds =
protected static readonly HashSet<string> _removablePlateSlotIds =
[
"front_plate",
"back_plate",
Libraries/Core/Helpers/ProfileHelper.cs
+2 -2
View File
@@ -27,7 +27,7 @@ public class ProfileHelper(
ConfigServer _configServer
)
{
protected readonly List<string> gameEditions = ["edge_of_darkness", "unheard_edition"];
protected static readonly HashSet<string> gameEditionsWithFreeRefresh = ["edge_of_darkness", "unheard_edition"];
protected InventoryConfig _inventoryConfig = _configServer.GetConfig<InventoryConfig>();
/// <summary>
@@ -608,7 +608,7 @@ public class ProfileHelper(
public bool HasAccessToRepeatableFreeRefreshSystem(PmcData pmcProfile)
{
return gameEditions.Contains(pmcProfile.Info.GameVersion);
return gameEditionsWithFreeRefresh.Contains(pmcProfile.Info.GameVersion);
}
/// <summary>
Libraries/Core/Helpers/RagfairOfferHelper.cs
+3 -2
View File
@@ -43,6 +43,8 @@ public class RagfairOfferHelper(
protected BotConfig _botConfig = _configServer.GetConfig<BotConfig>();
protected RagfairConfig _ragfairConfig = _configServer.GetConfig<RagfairConfig>();
protected static readonly HashSet<string> _currencies = ["all", "RUB", "USD", "EUR"];
/// <summary>
/// Passthrough to ragfairOfferService.getOffers(), get flea offers a player should see
/// </summary>
@@ -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;
Libraries/Core/Models/Eft/Notes/NoteActionData.cs → Libraries/Core/Models/Eft/Notes/NoteActionRequest.cs
+1 -1
View File
@@ -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
Libraries/Core/Models/Spt/Server/Locations.cs
+1 -1
View File
@@ -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<string, string> _locationMappings = new()
private static readonly Dictionary<string, string> _locationMappings = new()
{
// EFT
{ "factory4_day", "Factory4Day" },
Libraries/Core/Routers/ItemEvents/NoteItemEventRouter.cs
+3 -3
View File
@@ -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}");
}
Libraries/Core/Utils/Json/Converters/BaseInteractionRequestDataConverter.cs
+1 -1
View File
@@ -121,7 +121,7 @@ public class BaseInteractionRequestDataConverter : JsonConverter<BaseInteraction
case ItemEventActions.ADD_NOTE:
case ItemEventActions.EDIT_NOTE:
case ItemEventActions.DELETE_NOTE:
return JsonSerializer.Deserialize<NoteActionData>(jsonText);
return JsonSerializer.Deserialize<NoteActionRequest>(jsonText);
case ItemEventActions.MOVE:
return JsonSerializer.Deserialize<InventoryMoveRequestData>(jsonText);
case ItemEventActions.REMOVE:
Tools/HideoutCraftQuestIdGenerator/HideoutCraftQuestIdGenerator.cs
+2 -2
View File
@@ -23,7 +23,7 @@ public class HideoutCraftQuestIdGenerator(
IEnumerable<IOnLoad> _onLoadComponents
)
{
private readonly HashSet<string> _blacklistedProductions =
private static readonly HashSet<string> _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<string, string> _forcedQuestToProductionAssociations = new()
private static readonly Dictionary<string, string> _forcedQuestToProductionAssociations = new()
{
// KEY = PRODUCTION, VALUE = QUEST
{ "63a571802116d261d2336cd1", "625d6ffaf7308432be1d44c5" } // Network Provider - Part 2