Merge pull request #20 from CWXDEV/main

initial change of nullables and few more generators
This commit is contained in:
clodanSPT
2025-01-08 13:35:37 +00:00
committed by GitHub
138 changed files with 1374 additions and 1270 deletions
@@ -4,7 +4,7 @@ using Core.Models.Spt.Bots;
using Core.Models.Spt.Config; using Core.Models.Spt.Config;
using Equipment = Core.Models.Eft.Common.Tables.Equipment; using Equipment = Core.Models.Eft.Common.Tables.Equipment;
namespace Core.Generators.WeaponGen; namespace Core.Generators;
public class BotInventoryGenerator public class BotInventoryGenerator
{ {
@@ -0,0 +1,24 @@
namespace Core.Generators.WeaponGen.Implementations;
public class BarrelInvetoryMagGen : InventoryMagGen
{
public BarrelInvetoryMagGen()
{
}
public int GetPriority()
{
return 50;
}
public bool CanHandleInventoryMagGen(InventoryMagGen inventoryMagGen)
{
throw new NotImplementedException();
}
public void Process(InventoryMagGen inventoryMagGen)
{
throw new NotImplementedException();
}
}
@@ -0,0 +1,31 @@
using Core.Models.Eft.Common.Tables;
namespace Core.Generators.WeaponGen.Implementations;
public class ExternalInventoryMagGen : InventoryMagGen
{
public ExternalInventoryMagGen()
{
}
public int GetPriority()
{
return 99;
}
public bool CanHandleInventoryMagGen(InventoryMagGen inventoryMagGen)
{
throw new NotImplementedException();
}
public void Process(InventoryMagGen inventoryMagGen)
{
throw new NotImplementedException();
}
public TemplateItem? GetRandomExternalMagazineForInternalMagazineGun(string weaponTpl, List<string> magazineBlacklist)
{
throw new NotImplementedException();
}
}
@@ -0,0 +1,24 @@
namespace Core.Generators.WeaponGen.Implementations;
public class InternalMagazineInventoryMagGen : InventoryMagGen
{
public InternalMagazineInventoryMagGen()
{
}
public int GetPriority()
{
return 0;
}
public bool CanHandleInventoryMagGen(InventoryMagGen inventoryMagGen)
{
throw new NotImplementedException();
}
public void Process(InventoryMagGen inventoryMagGen)
{
throw new NotImplementedException();
}
}
@@ -0,0 +1,24 @@
namespace Core.Generators.WeaponGen.Implementations;
public class UbglExternalMagGen : InventoryMagGen
{
public UbglExternalMagGen()
{
}
public int GetPriority()
{
return 1;
}
public bool CanHandleInventoryMagGen(InventoryMagGen inventoryMagGen)
{
throw new NotImplementedException();
}
public void Process(InventoryMagGen inventoryMagGen)
{
throw new NotImplementedException();
}
}
@@ -1,6 +1,6 @@
using Core.Models.Eft.Common.Tables; using Core.Models.Eft.Common.Tables;
namespace Core.Generators.WeaponGen.Implementations; namespace Core.Generators.WeaponGen;
public class InventoryMagGen public class InventoryMagGen
{ {
+2 -2
View File
@@ -5,8 +5,8 @@ namespace Core.Models.Eft.Game;
public class CheckVersionResponse public class CheckVersionResponse
{ {
[JsonPropertyName("isvalid")] [JsonPropertyName("isvalid")]
public bool IsValid { get; set; } public bool? IsValid { get; set; }
[JsonPropertyName("latestVersion")] [JsonPropertyName("latestVersion")]
public string LatestVersion { get; set; } public string? LatestVersion { get; set; }
} }
+17 -17
View File
@@ -6,38 +6,38 @@ namespace Core.Models.Eft.Game;
public class CurrentGroupResponse public class CurrentGroupResponse
{ {
[JsonPropertyName("squad")] [JsonPropertyName("squad")]
public List<CurrentGroupSquadMember> Squad { get; set; } public List<CurrentGroupSquadMember>? Squad { get; set; }
} }
public class CurrentGroupSquadMember public class CurrentGroupSquadMember
{ {
[JsonPropertyName("_id")] [JsonPropertyName("_id")]
public string Id { get; set; } public string? Id { get; set; }
[JsonPropertyName("aid")] [JsonPropertyName("aid")]
public string Aid { get; set; } public string? Aid { get; set; }
[JsonPropertyName("info")] [JsonPropertyName("info")]
public CurrentGroupMemberInfo Info { get; set; } public CurrentGroupMemberInfo? Info { get; set; }
[JsonPropertyName("isLeader")] [JsonPropertyName("isLeader")]
public bool IsLeader { get; set; } public bool? IsLeader { get; set; }
[JsonPropertyName("isReady")] [JsonPropertyName("isReady")]
public bool IsReady { get; set; } public bool? IsReady { get; set; }
} }
public class CurrentGroupMemberInfo public class CurrentGroupMemberInfo
{ {
[JsonPropertyName("Nickname")] [JsonPropertyName("Nickname")]
public string Nickname { get; set; } public string? Nickname { get; set; }
[JsonPropertyName("Side")] [JsonPropertyName("Side")]
public string Side { get; set; } public string? Side { get; set; }
[JsonPropertyName("Level")] [JsonPropertyName("Level")]
public string Level { get; set; } public string? Level { get; set; }
[JsonPropertyName("MemberCategory")] [JsonPropertyName("MemberCategory")]
public MemberCategory MemberCategory { get; set; } public MemberCategory? MemberCategory { get; set; }
} }
+21 -21
View File
@@ -5,72 +5,72 @@ namespace Core.Models.Eft.Game;
public class GameConfigResponse public class GameConfigResponse
{ {
[JsonPropertyName("aid")] [JsonPropertyName("aid")]
public int Aid { get; set; } public int? Aid { get; set; }
[JsonPropertyName("lang")] [JsonPropertyName("lang")]
public string Language { get; set; } public string? Language { get; set; }
[JsonPropertyName("languages")] [JsonPropertyName("languages")]
public Dictionary<string, string> Languages { get; set; } public Dictionary<string, string>? Languages { get; set; }
[JsonPropertyName("ndaFree")] [JsonPropertyName("ndaFree")]
public bool IsNdaFree { get; set; } public bool? IsNdaFree { get; set; }
[JsonPropertyName("taxonomy")] [JsonPropertyName("taxonomy")]
public int Taxonomy { get; set; } public int? Taxonomy { get; set; }
[JsonPropertyName("activeProfileId")] [JsonPropertyName("activeProfileId")]
public string ActiveProfileId { get; set; } public string? ActiveProfileId { get; set; }
[JsonPropertyName("backend")] [JsonPropertyName("backend")]
public Backend Backend { get; set; } public Backend? Backend { get; set; }
[JsonPropertyName("useProtobuf")] [JsonPropertyName("useProtobuf")]
public bool UseProtobuf { get; set; } public bool? UseProtobuf { get; set; }
[JsonPropertyName("utc_time")] [JsonPropertyName("utc_time")]
public long UtcTime { get; set; } public long? UtcTime { get; set; }
/** Total in game time */ /** Total in game time */
[JsonPropertyName("totalInGame")] [JsonPropertyName("totalInGame")]
public int TotalInGame { get; set; } public int? TotalInGame { get; set; }
[JsonPropertyName("reportAvailable")] [JsonPropertyName("reportAvailable")]
public bool IsReportAvailable { get; set; } public bool? IsReportAvailable { get; set; }
[JsonPropertyName("twitchEventMember")] [JsonPropertyName("twitchEventMember")]
public bool IsTwitchEventMember { get; set; } public bool? IsTwitchEventMember { get; set; }
[JsonPropertyName("sessionMode")] [JsonPropertyName("sessionMode")]
public string SessionMode { get; set; } public string? SessionMode { get; set; }
[JsonPropertyName("purchasedGames")] [JsonPropertyName("purchasedGames")]
public PurchasedGames PurchasedGames { get; set; } public PurchasedGames? PurchasedGames { get; set; }
} }
public class PurchasedGames public class PurchasedGames
{ {
[JsonPropertyName("eft")] [JsonPropertyName("eft")]
public bool IsEftPurchased { get; set; } public bool? IsEftPurchased { get; set; }
[JsonPropertyName("arena")] [JsonPropertyName("arena")]
public bool IsArenaPurchased { get; set; } public bool? IsArenaPurchased { get; set; }
} }
public class Backend public class Backend
{ {
[JsonPropertyName("Lobby")] [JsonPropertyName("Lobby")]
public string Lobby { get; set; } public string? Lobby { get; set; }
[JsonPropertyName("Trading")] [JsonPropertyName("Trading")]
public string Trading { get; set; } public string? Trading { get; set; }
[JsonPropertyName("Messaging")] [JsonPropertyName("Messaging")]
public string Messaging { get; set; } public string? Messaging { get; set; }
[JsonPropertyName("Main")] [JsonPropertyName("Main")]
public string Main { get; set; } public string? Main { get; set; }
[JsonPropertyName("RagFair")] [JsonPropertyName("RagFair")]
public string RagFair { get; set; } public string? RagFair { get; set; }
} }
@@ -5,5 +5,5 @@ namespace Core.Models.Eft.Game;
public class GameEmptyCrcRequestData public class GameEmptyCrcRequestData
{ {
[JsonPropertyName("crc")] [JsonPropertyName("crc")]
public int Crc { get; set; } public int? Crc { get; set; }
} }
@@ -5,8 +5,8 @@ namespace Core.Models.Eft.Game;
public class GameKeepAliveResponse public class GameKeepAliveResponse
{ {
[JsonPropertyName("msg")] [JsonPropertyName("msg")]
public string Message { get; set; } public string? Message { get; set; }
[JsonPropertyName("utc_time")] [JsonPropertyName("utc_time")]
public double UtcTime { get; set; } public double? UtcTime { get; set; }
} }
@@ -5,5 +5,5 @@ namespace Core.Models.Eft.Game;
public class GameLogoutResponseData public class GameLogoutResponseData
{ {
[JsonPropertyName("status")] [JsonPropertyName("status")]
public string Status { get; set; } public string? Status { get; set; }
} }
+2 -2
View File
@@ -11,8 +11,8 @@ public enum SessionMode
public class GameModeResponse public class GameModeResponse
{ {
[JsonPropertyName("gameMode")] [JsonPropertyName("gameMode")]
public SessionMode GameMode { get; set; } public SessionMode? GameMode { get; set; }
[JsonPropertyName("backendUrl")] [JsonPropertyName("backendUrl")]
public string BackendUrl { get; set; } public string? BackendUrl { get; set; }
} }
+2 -2
View File
@@ -2,8 +2,8 @@
namespace Core.Models.Eft.Game; namespace Core.Models.Eft.Game;
public class GameStartResponse public class GameStartResponse
{ {
[JsonPropertyName("utc_time")] [JsonPropertyName("utc_time")]
public double UtcTime { get; set; } public double? UtcTime { get; set; }
} }
@@ -5,11 +5,11 @@ namespace Core.Models.Eft.Game;
public class GetItemPricesResponse public class GetItemPricesResponse
{ {
[JsonPropertyName("supplyNextTime")] [JsonPropertyName("supplyNextTime")]
public double SupplyNextTime { get; set; } public double? SupplyNextTime { get; set; }
[JsonPropertyName("prices")] [JsonPropertyName("prices")]
public Dictionary<string, double> Prices { get; set; } public Dictionary<string, double>? Prices { get; set; }
[JsonPropertyName("currencyCourses")] [JsonPropertyName("currencyCourses")]
public Dictionary<string, double> CurrencyCourses { get; set; } public Dictionary<string, double>? CurrencyCourses { get; set; }
} }
+2 -2
View File
@@ -5,8 +5,8 @@ namespace Core.Models.Eft.Game;
public class GetRaidTimeRequest public class GetRaidTimeRequest
{ {
[JsonPropertyName("Side")] [JsonPropertyName("Side")]
public string Side { get; set; } public string? Side { get; set; }
[JsonPropertyName("Location")] [JsonPropertyName("Location")]
public string Location { get; set; } public string? Location { get; set; }
} }
+4 -4
View File
@@ -5,22 +5,22 @@ namespace Core.Models.Eft.Game;
public class GetRaidTimeResponse public class GetRaidTimeResponse
{ {
[JsonPropertyName("RaidTimeMinutes")] [JsonPropertyName("RaidTimeMinutes")]
public int RaidTimeMinutes { get; set; } public int? RaidTimeMinutes { get; set; }
[JsonPropertyName("NewSurviveTimeSeconds")] [JsonPropertyName("NewSurviveTimeSeconds")]
public int? NewSurviveTimeSeconds { get; set; } public int? NewSurviveTimeSeconds { get; set; }
[JsonPropertyName("OriginalSurvivalTimeSeconds")] [JsonPropertyName("OriginalSurvivalTimeSeconds")]
public int OriginalSurvivalTimeSeconds { get; set; } public int? OriginalSurvivalTimeSeconds { get; set; }
[JsonPropertyName("ExitChanges")] [JsonPropertyName("ExitChanges")]
public List<ExtractChange> ExitChanges { get; set; } public List<ExtractChange>? ExitChanges { get; set; }
} }
public class ExtractChange public class ExtractChange
{ {
[JsonPropertyName("Name")] [JsonPropertyName("Name")]
public string Name { get; set; } public string? Name { get; set; }
[JsonPropertyName("MinTime")] [JsonPropertyName("MinTime")]
public int? MinTime { get; set; } public int? MinTime { get; set; }
@@ -5,20 +5,20 @@ namespace Core.Models.Eft.Game;
public class SendSurveyOpinionRequest public class SendSurveyOpinionRequest
{ {
[JsonPropertyName("surveyId")] [JsonPropertyName("surveyId")]
public int SurveyId { get; set; } public int? SurveyId { get; set; }
[JsonPropertyName("answers")] [JsonPropertyName("answers")]
public List<SurveyOpinionAnswer> Answers { get; set; } public List<SurveyOpinionAnswer>? Answers { get; set; }
} }
public class SurveyOpinionAnswer public class SurveyOpinionAnswer
{ {
[JsonPropertyName("questionId")] [JsonPropertyName("questionId")]
public int QuestionId { get; set; } public int? QuestionId { get; set; }
[JsonPropertyName("answerType")] [JsonPropertyName("answerType")]
public string AnswerType { get; set; } public string? AnswerType { get; set; }
[JsonPropertyName("answers")] [JsonPropertyName("answers")]
public object Answers { get; set; } public object? Answers { get; set; }
} }
+2 -2
View File
@@ -5,8 +5,8 @@ namespace Core.Models.Eft.Game;
public class ServerDetails public class ServerDetails
{ {
[JsonPropertyName("ip")] [JsonPropertyName("ip")]
public string Ip { get; set; } public string? Ip { get; set; }
[JsonPropertyName("port")] [JsonPropertyName("port")]
public int Port { get; set; } public int? Port { get; set; }
} }
+23 -23
View File
@@ -5,86 +5,86 @@ namespace Core.Models.Eft.Game;
public class SurveyResponseData public class SurveyResponseData
{ {
[JsonPropertyName("locale")] [JsonPropertyName("locale")]
public Dictionary<string, Dictionary<string, string>> Locale { get; set; } public Dictionary<string, Dictionary<string, string>>? Locale { get; set; }
[JsonPropertyName("survey")] [JsonPropertyName("survey")]
public Survey Survey { get; set; } public Survey? Survey { get; set; }
} }
public class Survey public class Survey
{ {
[JsonPropertyName("id")] [JsonPropertyName("id")]
public int Id { get; set; } public int? Id { get; set; }
[JsonPropertyName("welcomePageData")] [JsonPropertyName("welcomePageData")]
public WelcomePageData WelcomePageData { get; set; } public WelcomePageData? WelcomePageData { get; set; }
[JsonPropertyName("farewellPageData")] [JsonPropertyName("farewellPageData")]
public FarewellPageData FarewellPageData { get; set; } public FarewellPageData? FarewellPageData { get; set; }
[JsonPropertyName("pages")] [JsonPropertyName("pages")]
public List<List<int>> Pages { get; set; } public List<List<int>>? Pages { get; set; }
[JsonPropertyName("questions")] [JsonPropertyName("questions")]
public List<SurveyQuestion> Questions { get; set; } public List<SurveyQuestion>? Questions { get; set; }
[JsonPropertyName("isNew")] [JsonPropertyName("isNew")]
public bool IsNew { get; set; } public bool? IsNew { get; set; }
} }
public class WelcomePageData public class WelcomePageData
{ {
[JsonPropertyName("titleLocaleKey")] [JsonPropertyName("titleLocaleKey")]
public string TitleLocaleKey { get; set; } public string? TitleLocaleKey { get; set; }
[JsonPropertyName("timeLocaleKey")] [JsonPropertyName("timeLocaleKey")]
public string TimeLocaleKey { get; set; } public string? TimeLocaleKey { get; set; }
[JsonPropertyName("descriptionLocaleKey")] [JsonPropertyName("descriptionLocaleKey")]
public string DescriptionLocaleKey { get; set; } public string? DescriptionLocaleKey { get; set; }
} }
public class FarewellPageData public class FarewellPageData
{ {
[JsonPropertyName("textLocaleKey")] [JsonPropertyName("textLocaleKey")]
public string TextLocaleKey { get; set; } public string? TextLocaleKey { get; set; }
} }
public class SurveyQuestion public class SurveyQuestion
{ {
[JsonPropertyName("id")] [JsonPropertyName("id")]
public int Id { get; set; } public int? Id { get; set; }
[JsonPropertyName("sortIndex")] [JsonPropertyName("sortIndex")]
public int SortIndex { get; set; } public int? SortIndex { get; set; }
[JsonPropertyName("titleLocaleKey")] [JsonPropertyName("titleLocaleKey")]
public string TitleLocaleKey { get; set; } public string? TitleLocaleKey { get; set; }
[JsonPropertyName("hintLocaleKey")] [JsonPropertyName("hintLocaleKey")]
public string HintLocaleKey { get; set; } public string? HintLocaleKey { get; set; }
[JsonPropertyName("answerLimit")] [JsonPropertyName("answerLimit")]
public int AnswerLimit { get; set; } public int? AnswerLimit { get; set; }
[JsonPropertyName("answerType")] [JsonPropertyName("answerType")]
public string AnswerType { get; set; } public string? AnswerType { get; set; }
[JsonPropertyName("answers")] [JsonPropertyName("answers")]
public List<SurveyAnswer> Answers { get; set; } public List<SurveyAnswer>? Answers { get; set; }
} }
public class SurveyAnswer public class SurveyAnswer
{ {
[JsonPropertyName("id")] [JsonPropertyName("id")]
public int Id { get; set; } public int? Id { get; set; }
[JsonPropertyName("questionId")] [JsonPropertyName("questionId")]
public int QuestionId { get; set; } public int? QuestionId { get; set; }
[JsonPropertyName("sortIndex")] [JsonPropertyName("sortIndex")]
public int SortIndex { get; set; } public int? SortIndex { get; set; }
[JsonPropertyName("localeKey")] [JsonPropertyName("localeKey")]
public string LocaleKey { get; set; } public string? LocaleKey { get; set; }
} }
@@ -5,26 +5,26 @@ namespace Core.Models.Eft.Game;
public class VersionValidateRequestData public class VersionValidateRequestData
{ {
[JsonPropertyName("version")] [JsonPropertyName("version")]
public Version Version { get; set; } public Version? Version { get; set; }
[JsonPropertyName("develop")] [JsonPropertyName("develop")]
public bool Develop { get; set; } public bool? Develop { get; set; }
} }
public class Version public class Version
{ {
[JsonPropertyName("major")] [JsonPropertyName("major")]
public string Major { get; set; } public string? Major { get; set; }
[JsonPropertyName("minor")] [JsonPropertyName("minor")]
public string Minor { get; set; } public string? Minor { get; set; }
[JsonPropertyName("game")] [JsonPropertyName("game")]
public string Game { get; set; } public string? Game { get; set; }
[JsonPropertyName("backend")] [JsonPropertyName("backend")]
public string Backend { get; set; } public string? Backend { get; set; }
[JsonPropertyName("taxonomy")] [JsonPropertyName("taxonomy")]
public string Taxonomy { get; set; } public string? Taxonomy { get; set; }
} }
@@ -6,63 +6,63 @@ public class HealthTreatmentRequestData
{ {
[JsonPropertyName("Action")] [JsonPropertyName("Action")]
public string Action { get; set; } = "RestoreHealth"; public string Action { get; set; } = "RestoreHealth";
[JsonPropertyName("trader")] [JsonPropertyName("trader")]
public string Trader { get; set; } public string? Trader { get; set; }
[JsonPropertyName("items")] [JsonPropertyName("items")]
public List<ItemCost> Items { get; set; } public List<ItemCost>? Items { get; set; }
[JsonPropertyName("difference")] [JsonPropertyName("difference")]
public Difference Difference { get; set; } public Difference? Difference { get; set; }
[JsonPropertyName("timestamp")] [JsonPropertyName("timestamp")]
public long Timestamp { get; set; } public long? Timestamp { get; set; }
} }
public class ItemCost public class ItemCost
{ {
/** Id of stack to take money from */ /** Id of stack to take money from */
[JsonPropertyName("id")] [JsonPropertyName("id")]
public string Id { get; set; } public string? Id { get; set; }
/** Amount of money to take off player for treatment */ /** Amount of money to take off player for treatment */
[JsonPropertyName("count")] [JsonPropertyName("count")]
public int Count { get; set; } public int? Count { get; set; }
} }
public class Difference public class Difference
{ {
[JsonPropertyName("BodyParts")] [JsonPropertyName("BodyParts")]
public BodyParts BodyParts { get; set; } public BodyParts? BodyParts { get; set; }
[JsonPropertyName("Energy")] [JsonPropertyName("Energy")]
public int Energy { get; set; } public int? Energy { get; set; }
[JsonPropertyName("Hydration")] [JsonPropertyName("Hydration")]
public int Hydration { get; set; } public int? Hydration { get; set; }
} }
public class BodyParts public class BodyParts
{ {
[JsonPropertyName("Head")] [JsonPropertyName("Head")]
public BodyPart Head { get; set; } public BodyPart? Head { get; set; }
[JsonPropertyName("Chest")] [JsonPropertyName("Chest")]
public BodyPart Chest { get; set; } public BodyPart? Chest { get; set; }
[JsonPropertyName("Stomach")] [JsonPropertyName("Stomach")]
public BodyPart Stomach { get; set; } public BodyPart? Stomach { get; set; }
[JsonPropertyName("LeftArm")] [JsonPropertyName("LeftArm")]
public BodyPart LeftArm { get; set; } public BodyPart? LeftArm { get; set; }
[JsonPropertyName("RightArm")] [JsonPropertyName("RightArm")]
public BodyPart RightArm { get; set; } public BodyPart? RightArm { get; set; }
[JsonPropertyName("LeftLeg")] [JsonPropertyName("LeftLeg")]
public BodyPart LeftLeg { get; set; } public BodyPart? LeftLeg { get; set; }
[JsonPropertyName("RightLeg")] [JsonPropertyName("RightLeg")]
public BodyPart RightLeg { get; set; } public BodyPart? RightLeg { get; set; }
} }
@@ -6,14 +6,14 @@ namespace Core.Models.Eft.Health;
public class OffraidEatRequestData : BaseInteractionRequestData public class OffraidEatRequestData : BaseInteractionRequestData
{ {
[JsonPropertyName("Action")] [JsonPropertyName("Action")]
public string Action { get; set; } = "Eat"; public string? Action { get; set; } = "Eat";
[JsonPropertyName("item")] [JsonPropertyName("item")]
public string Item { get; set; } public string? Item { get; set; }
[JsonPropertyName("count")] [JsonPropertyName("count")]
public int Count { get; set; } public int? Count { get; set; }
[JsonPropertyName("time")] [JsonPropertyName("time")]
public int Time { get; set; } public int? Time { get; set; }
} }
@@ -4,11 +4,11 @@ namespace Core.Models.Eft.Health;
public class OffraidHealRequestData : BaseInteractionRequestData public class OffraidHealRequestData : BaseInteractionRequestData
{ {
public override string Action { get; set; } = "Heal"; public override string? Action { get; set; } = "Heal";
public string Item { get; set; } public string? Item { get; set; }
public BodyPart Part { get; set; } public BodyPart? Part { get; set; }
public int Count { get; set; } public int? Count { get; set; }
public int Time { get; set; } public int? Time { get; set; }
} }
public enum BodyPart public enum BodyPart
+40 -40
View File
@@ -5,86 +5,86 @@ using System.Text.Json.Serialization;
public class WorkoutData : Dictionary<string, object> public class WorkoutData : Dictionary<string, object>
{ {
[JsonPropertyName("skills")] [JsonPropertyName("skills")]
public WorkoutSkills Skills { get; set; } public WorkoutSkills? Skills { get; set; }
} }
public class WorkoutSkills public class WorkoutSkills
{ {
[JsonPropertyName("Common")] [JsonPropertyName("Common")]
public List<WorkoutSkillCommon> Common { get; set; } public List<WorkoutSkillCommon>? Common { get; set; }
[JsonPropertyName("Mastering")] [JsonPropertyName("Mastering")]
public List<object> Mastering { get; set; } public List<object>? Mastering { get; set; }
[JsonPropertyName("Bonuses")] [JsonPropertyName("Bonuses")]
public object Bonuses { get; set; } public object? Bonuses { get; set; }
[JsonPropertyName("Points")] [JsonPropertyName("Points")]
public int Points { get; set; } public int? Points { get; set; }
} }
public class WorkoutSkillCommon public class WorkoutSkillCommon
{ {
[JsonPropertyName("Id")] [JsonPropertyName("Id")]
public string Id { get; set; } public string? Id { get; set; }
[JsonPropertyName("Progress")] [JsonPropertyName("Progress")]
public int Progress { get; set; } public int? Progress { get; set; }
[JsonPropertyName("PointsEarnedDuringSession")] [JsonPropertyName("PointsEarnedDuringSession")]
public int PointsEarnedDuringSession { get; set; } public int? PointsEarnedDuringSession { get; set; }
[JsonPropertyName("LastAccess")] [JsonPropertyName("LastAccess")]
public long LastAccess { get; set; } public long? LastAccess { get; set; }
} }
public class WorkoutEffects public class WorkoutEffects
{ {
[JsonPropertyName("Effects")] [JsonPropertyName("Effects")]
public WorkoutEffectsParts Effects { get; set; } public WorkoutEffectsParts? Effects { get; set; }
[JsonPropertyName("Hydration")] [JsonPropertyName("Hydration")]
public int Hydration { get; set; } public int? Hydration { get; set; }
[JsonPropertyName("Energy")] [JsonPropertyName("Energy")]
public int Energy { get; set; } public int? Energy { get; set; }
} }
public class WorkoutEffectsParts public class WorkoutEffectsParts
{ {
[JsonPropertyName("Head")] [JsonPropertyName("Head")]
public WorkoutBodyPart Head { get; set; } public WorkoutBodyPart? Head { get; set; }
[JsonPropertyName("Chest")] [JsonPropertyName("Chest")]
public WorkoutBodyPart Chest { get; set; } public WorkoutBodyPart? Chest { get; set; }
[JsonPropertyName("Stomach")] [JsonPropertyName("Stomach")]
public WorkoutBodyPart Stomach { get; set; } public WorkoutBodyPart? Stomach { get; set; }
[JsonPropertyName("LeftArm")] [JsonPropertyName("LeftArm")]
public WorkoutBodyPart LeftArm { get; set; } public WorkoutBodyPart? LeftArm { get; set; }
[JsonPropertyName("RightArm")] [JsonPropertyName("RightArm")]
public WorkoutBodyPart RightArm { get; set; } public WorkoutBodyPart? RightArm { get; set; }
[JsonPropertyName("LeftLeg")] [JsonPropertyName("LeftLeg")]
public WorkoutBodyPart LeftLeg { get; set; } public WorkoutBodyPart? LeftLeg { get; set; }
[JsonPropertyName("RightLeg")] [JsonPropertyName("RightLeg")]
public WorkoutBodyPart RightLeg { get; set; } public WorkoutBodyPart? RightLeg { get; set; }
[JsonPropertyName("Common")] [JsonPropertyName("Common")]
public WorkoutBodyPart Common { get; set; } public WorkoutBodyPart? Common { get; set; }
} }
public class WorkoutBodyPart public class WorkoutBodyPart
{ {
[JsonPropertyName("Regeneration")] [JsonPropertyName("Regeneration")]
public int Regeneration { get; set; } public int? Regeneration { get; set; }
[JsonPropertyName("Fracture")] [JsonPropertyName("Fracture")]
public int Fracture { get; set; } public int? Fracture { get; set; }
[JsonPropertyName("MildMusclePain")] [JsonPropertyName("MildMusclePain")]
public int MildMusclePain { get; set; } public int? MildMusclePain { get; set; }
} }
@@ -5,16 +5,16 @@ namespace Core.Models.Eft.Hideout;
public class HandleQTEEventRequestData public class HandleQTEEventRequestData
{ {
[JsonPropertyName("Action")] [JsonPropertyName("Action")]
public string Action { get; set; } public string? Action { get; set; }
/** true if QTE was successful, otherwise false */ /** true if QTE was successful, otherwise false */
[JsonPropertyName("results")] [JsonPropertyName("results")]
public List<bool> Results { get; set; } public List<bool>? Results { get; set; }
/** Id of the QTE object used from db/hideout/qte.json */ /** Id of the QTE object used from db/hideout/qte.json */
[JsonPropertyName("id")] [JsonPropertyName("id")]
public string Id { get; set; } public string? Id { get; set; }
[JsonPropertyName("timestamp")] [JsonPropertyName("timestamp")]
public long Timestamp { get; set; } public long? Timestamp { get; set; }
} }
+58 -58
View File
@@ -6,144 +6,144 @@ namespace Core.Models.Eft.Hideout;
public class HideoutArea public class HideoutArea
{ {
[JsonPropertyName("_id")] [JsonPropertyName("_id")]
public string Id { get; set; } public string? Id { get; set; }
[JsonPropertyName("type")] [JsonPropertyName("type")]
public int Type { get; set; } public int? Type { get; set; }
[JsonPropertyName("enabled")] [JsonPropertyName("enabled")]
public bool IsEnabled { get; set; } public bool? IsEnabled { get; set; }
[JsonPropertyName("needsFuel")] [JsonPropertyName("needsFuel")]
public bool NeedsFuel { get; set; } public bool? NeedsFuel { get; set; }
[JsonPropertyName("requirements")] [JsonPropertyName("requirements")]
public List<HideoutAreaRequirement> Requirements { get; set; } public List<HideoutAreaRequirement>? Requirements { get; set; }
[JsonPropertyName("takeFromSlotLocked")] [JsonPropertyName("takeFromSlotLocked")]
public bool IsTakeFromSlotLocked { get; set; } public bool? IsTakeFromSlotLocked { get; set; }
[JsonPropertyName("craftGivesExp")] [JsonPropertyName("craftGivesExp")]
public bool CraftGivesExperience { get; set; } public bool? CraftGivesExperience { get; set; }
[JsonPropertyName("displayLevel")] [JsonPropertyName("displayLevel")]
public bool DisplayLevel { get; set; } public bool? DisplayLevel { get; set; }
[JsonPropertyName("enableAreaRequirements")] [JsonPropertyName("enableAreaRequirements")]
public bool EnableAreaRequirements { get; set; } public bool? EnableAreaRequirements { get; set; }
[JsonPropertyName("parentArea")] [JsonPropertyName("parentArea")]
public string? ParentArea { get; set; } public string? ParentArea { get; set; }
[JsonPropertyName("stages")] [JsonPropertyName("stages")]
public Dictionary<string, Stage> Stages { get; set; } public Dictionary<string, Stage>? Stages { get; set; }
} }
public class HideoutAreaRequirement public class HideoutAreaRequirement
{ {
[JsonPropertyName("areaType")] [JsonPropertyName("areaType")]
public int AreaType { get; set; } public int? AreaType { get; set; }
[JsonPropertyName("requiredLevel")] [JsonPropertyName("requiredLevel")]
public int RequiredLevel { get; set; } public int? RequiredLevel { get; set; }
[JsonPropertyName("type")] [JsonPropertyName("type")]
public string Type { get; set; } public string? Type { get; set; }
} }
public class Stage public class Stage
{ {
[JsonPropertyName("autoUpgrade")] [JsonPropertyName("autoUpgrade")]
public bool AutoUpgrade { get; set; } public bool? AutoUpgrade { get; set; }
[JsonPropertyName("bonuses")] [JsonPropertyName("bonuses")]
public List<StageBonus> Bonuses { get; set; } public List<StageBonus>? Bonuses { get; set; }
[JsonPropertyName("constructionTime")] [JsonPropertyName("constructionTime")]
public double ConstructionTime { get; set; } public double? ConstructionTime { get; set; }
/** Containers inventory tpl */ /** Containers inventory tpl */
[JsonPropertyName("container")] [JsonPropertyName("container")]
public string? Container { get; set; } public string? Container { get; set; }
[JsonPropertyName("description")] [JsonPropertyName("description")]
public string Description { get; set; } public string? Description { get; set; }
[JsonPropertyName("globalCounterId")] [JsonPropertyName("globalCounterId")]
public string GlobalCounterId { get; set; } public string? GlobalCounterId { get; set; }
[JsonPropertyName("displayInterface")] [JsonPropertyName("displayInterface")]
public bool DisplayInterface { get; set; } public bool? DisplayInterface { get; set; }
[JsonPropertyName("improvements")] [JsonPropertyName("improvements")]
public List<StageImprovement> Improvements { get; set; } public List<StageImprovement>? Improvements { get; set; }
[JsonPropertyName("requirements")] [JsonPropertyName("requirements")]
public List<StageRequirement> Requirements { get; set; } public List<StageRequirement>? Requirements { get; set; }
[JsonPropertyName("slots")] [JsonPropertyName("slots")]
public int Slots { get; set; } public int? Slots { get; set; }
} }
public class StageImprovement public class StageImprovement
{ {
[JsonPropertyName("id")] [JsonPropertyName("id")]
public string Id { get; set; } public string? Id { get; set; }
[JsonPropertyName("bonuses")] [JsonPropertyName("bonuses")]
public List<StageImprovementBonus> Bonuses { get; set; } public List<StageImprovementBonus>? Bonuses { get; set; }
[JsonPropertyName("improvementTime")] [JsonPropertyName("improvementTime")]
public int ImprovementTime { get; set; } public int? ImprovementTime { get; set; }
[JsonPropertyName("requirements")] [JsonPropertyName("requirements")]
public List<StageImprovementRequirement> Requirements { get; set; } public List<StageImprovementRequirement>? Requirements { get; set; }
} }
public class StageImprovementBonus public class StageImprovementBonus
{ {
[JsonPropertyName("id")] [JsonPropertyName("id")]
public string Id { get; set; } public string? Id { get; set; }
[JsonPropertyName("passive")] [JsonPropertyName("passive")]
public bool IsPassive { get; set; } public bool? IsPassive { get; set; }
[JsonPropertyName("production")] [JsonPropertyName("production")]
public bool IsProduction { get; set; } public bool? IsProduction { get; set; }
[JsonPropertyName("skillType")] [JsonPropertyName("skillType")]
[JsonConverter(typeof(JsonStringEnumConverter))] [JsonConverter(typeof(JsonStringEnumConverter))]
public SkillTypes SkillType { get; set; } public SkillTypes? SkillType { get; set; }
[JsonPropertyName("type")] [JsonPropertyName("type")]
public string Type { get; set; } public string? Type { get; set; }
[JsonPropertyName("value")] [JsonPropertyName("value")]
public int Value { get; set; } public int? Value { get; set; }
[JsonPropertyName("visible")] [JsonPropertyName("visible")]
public bool IsVisible { get; set; } public bool? IsVisible { get; set; }
} }
public class StageImprovementRequirement public class StageImprovementRequirement
{ {
[JsonPropertyName("count")] [JsonPropertyName("count")]
public int Count { get; set; } public int? Count { get; set; }
[JsonPropertyName("isEncoded")] [JsonPropertyName("isEncoded")]
public bool IsEncoded { get; set; } public bool? IsEncoded { get; set; }
[JsonPropertyName("isFunctional")] [JsonPropertyName("isFunctional")]
public bool IsFunctional { get; set; } public bool? IsFunctional { get; set; }
[JsonPropertyName("templateId")] [JsonPropertyName("templateId")]
public string TemplateId { get; set; } public string? TemplateId { get; set; }
[JsonPropertyName("isSpawnedInSession")] [JsonPropertyName("isSpawnedInSession")]
public bool IsSpawnedInSession { get; set; } public bool? IsSpawnedInSession { get; set; }
[JsonPropertyName("type")] [JsonPropertyName("type")]
public string Type { get; set; } public string? Type { get; set; }
} }
public class StageRequirement : RequirementBase public class StageRequirement : RequirementBase
@@ -155,28 +155,28 @@ public class StageRequirement : RequirementBase
public int? RequiredLevel { get; set; } public int? RequiredLevel { get; set; }
[JsonPropertyName("templateId")] [JsonPropertyName("templateId")]
public string TemplateId { get; set; } public string? TemplateId { get; set; }
[JsonPropertyName("count")] [JsonPropertyName("count")]
public int? Count { get; set; } public int? Count { get; set; }
[JsonPropertyName("isEncoded")] [JsonPropertyName("isEncoded")]
public bool IsEncoded { get; set; } = false; public bool? IsEncoded { get; set; } = false;
[JsonPropertyName("isFunctional")] [JsonPropertyName("isFunctional")]
public bool IsFunctional { get; set; } public bool? IsFunctional { get; set; }
[JsonPropertyName("traderId")] [JsonPropertyName("traderId")]
public string TraderId { get; set; } public string? TraderId { get; set; }
[JsonPropertyName("isSpawnedInSession")] [JsonPropertyName("isSpawnedInSession")]
public bool IsSpawnedInSession { get; set; } public bool? IsSpawnedInSession { get; set; }
[JsonPropertyName("loyaltyLevel")] [JsonPropertyName("loyaltyLevel")]
public int? LoyaltyLevel { get; set; } public int? LoyaltyLevel { get; set; }
[JsonPropertyName("skillName")] [JsonPropertyName("skillName")]
public string SkillName { get; set; } public string? SkillName { get; set; }
[JsonPropertyName("skillLevel")] [JsonPropertyName("skillLevel")]
public int? SkillLevel { get; set; } public int? SkillLevel { get; set; }
@@ -185,16 +185,16 @@ public class StageRequirement : RequirementBase
public class StageBonus public class StageBonus
{ {
[JsonPropertyName("value")] [JsonPropertyName("value")]
public int Value { get; set; } public int? Value { get; set; }
[JsonPropertyName("passive")] [JsonPropertyName("passive")]
public bool Passive { get; set; } public bool? Passive { get; set; }
[JsonPropertyName("production")] [JsonPropertyName("production")]
public bool Production { get; set; } public bool? Production { get; set; }
[JsonPropertyName("visible")] [JsonPropertyName("visible")]
public bool Visible { get; set; } public bool? Visible { get; set; }
[JsonPropertyName("skillType")] [JsonPropertyName("skillType")]
[JsonConverter(typeof(JsonStringEnumConverter))] [JsonConverter(typeof(JsonStringEnumConverter))]
@@ -202,18 +202,18 @@ public class StageBonus
[JsonPropertyName("type")] [JsonPropertyName("type")]
[JsonConverter(typeof(JsonStringEnumConverter))] [JsonConverter(typeof(JsonStringEnumConverter))]
public BonusType Type { get; set; } public BonusType? Type { get; set; }
[JsonPropertyName("filter")] [JsonPropertyName("filter")]
public List<string> Filter { get; set; } public List<string>? Filter { get; set; }
[JsonPropertyName("icon")] [JsonPropertyName("icon")]
public string Icon { get; set; } public string? Icon { get; set; }
/** CHANGES PER DUMP */ /** CHANGES PER DUMP */
[JsonPropertyName("id")] [JsonPropertyName("id")]
public string Id { get; set; } public string? Id { get; set; }
[JsonPropertyName("templateId")] [JsonPropertyName("templateId")]
public string TemplateId { get; set; } public string? TemplateId { get; set; }
} }
@@ -5,8 +5,8 @@ namespace Core.Models.Eft.Hideout;
public class HideoutCircleOfCultistProductionStartRequestData public class HideoutCircleOfCultistProductionStartRequestData
{ {
[JsonPropertyName("Action")] [JsonPropertyName("Action")]
public string Action { get; set; } = "HideoutCircleOfCultistProductionStart"; public string? Action { get; set; } = "HideoutCircleOfCultistProductionStart";
[JsonPropertyName("timestamp")] [JsonPropertyName("timestamp")]
public long Timestamp { get; set; } public long? Timestamp { get; set; }
} }
@@ -5,11 +5,11 @@ namespace Core.Models.Eft.Hideout;
public class HideoutContinuousProductionStartRequestData public class HideoutContinuousProductionStartRequestData
{ {
[JsonPropertyName("Action")] [JsonPropertyName("Action")]
public string Action { get; } = "HideoutContinuousProductionStart"; public string? Action { get; } = "HideoutContinuousProductionStart";
[JsonPropertyName("recipeId")] [JsonPropertyName("recipeId")]
public string RecipeId { get; set; } public string? RecipeId { get; set; }
[JsonPropertyName("timestamp")] [JsonPropertyName("timestamp")]
public double Timestamp { get; set; } public double? Timestamp { get; set; }
} }
+17 -17
View File
@@ -6,59 +6,59 @@ namespace Core.Models.Eft.Hideout;
public class HideoutCustomisation public class HideoutCustomisation
{ {
[JsonPropertyName("globals")] [JsonPropertyName("globals")]
public List<HideoutCustomisationGlobal> Globals { get; set; } public List<HideoutCustomisationGlobal>? Globals { get; set; }
[JsonPropertyName("slots")] [JsonPropertyName("slots")]
public List<HideoutCustomisationSlot> Slots { get; set; } public List<HideoutCustomisationSlot>? Slots { get; set; }
} }
public class HideoutCustomisationGlobal public class HideoutCustomisationGlobal
{ {
[JsonPropertyName("id")] [JsonPropertyName("id")]
public string Id { get; set; } public string? Id { get; set; }
[JsonPropertyName("conditions")] [JsonPropertyName("conditions")]
public List<QuestCondition> Conditions { get; set; } public List<QuestCondition>? Conditions { get; set; }
[JsonPropertyName("type")] [JsonPropertyName("type")]
public string Type { get; set; } public string? Type { get; set; }
[JsonPropertyName("index")] [JsonPropertyName("index")]
public int Index { get; set; } public int? Index { get; set; }
[JsonPropertyName("systemName")] [JsonPropertyName("systemName")]
public string SystemName { get; set; } public string? SystemName { get; set; }
[JsonPropertyName("isEnabled")] [JsonPropertyName("isEnabled")]
public bool IsEnabled { get; set; } public bool? IsEnabled { get; set; }
[JsonPropertyName("itemId")] [JsonPropertyName("itemId")]
public string ItemId { get; set; } public string? ItemId { get; set; }
} }
public class HideoutCustomisationSlot public class HideoutCustomisationSlot
{ {
[JsonPropertyName("id")] [JsonPropertyName("id")]
public string Id { get; set; } public string? Id { get; set; }
[JsonPropertyName("conditions")] [JsonPropertyName("conditions")]
public List<QuestCondition> Conditions { get; set; } public List<QuestCondition>? Conditions { get; set; }
[JsonPropertyName("type")] [JsonPropertyName("type")]
public string Type { get; set; } public string? Type { get; set; }
[JsonPropertyName("index")] [JsonPropertyName("index")]
public int Index { get; set; } public int? Index { get; set; }
[JsonPropertyName("systemName")] [JsonPropertyName("systemName")]
public string SystemName { get; set; } public string? SystemName { get; set; }
[JsonPropertyName("isEnabled")] [JsonPropertyName("isEnabled")]
public bool IsEnabled { get; set; } public bool? IsEnabled { get; set; }
[JsonPropertyName("slotId")] [JsonPropertyName("slotId")]
public string SlotId { get; set; } public string? SlotId { get; set; }
[JsonPropertyName("areaTypeId")] [JsonPropertyName("areaTypeId")]
public int AreaTypeId { get; set; } public int? AreaTypeId { get; set; }
} }
@@ -5,14 +5,14 @@ namespace Core.Models.Eft.Hideout;
public class HideoutCustomizationApplyRequestData public class HideoutCustomizationApplyRequestData
{ {
[JsonPropertyName("Action")] [JsonPropertyName("Action")]
public string Action { get; set; } = "HideoutCustomizationApply"; public string? Action { get; set; } = "HideoutCustomizationApply";
/// <summary> /// <summary>
/// Id of the newly picked item to apply to hideout /// Id of the newly picked item to apply to hideout
/// </summary> /// </summary>
[JsonPropertyName("offerId")] [JsonPropertyName("offerId")]
public string OfferId { get; set; } public string? OfferId { get; set; }
[JsonPropertyName("timestamp")] [JsonPropertyName("timestamp")]
public long Timestamp { get; set; } public long? Timestamp { get; set; }
} }
@@ -5,11 +5,11 @@ namespace Core.Models.Eft.Hideout;
public class HideoutDeleteProductionRequestData public class HideoutDeleteProductionRequestData
{ {
[JsonPropertyName("Action")] [JsonPropertyName("Action")]
public string Action { get; set; } = "HideoutDeleteProductionCommand"; public string? Action { get; set; } = "HideoutDeleteProductionCommand";
[JsonPropertyName("recipeId")] [JsonPropertyName("recipeId")]
public string RecipeId { get; set; } public string? RecipeId { get; set; }
[JsonPropertyName("timestamp")] [JsonPropertyName("timestamp")]
public double Timestamp { get; set; } public double? Timestamp { get; set; }
} }
@@ -5,18 +5,18 @@ namespace Core.Models.Eft.Hideout;
public class HideoutImproveAreaRequestData public class HideoutImproveAreaRequestData
{ {
[JsonPropertyName("Action")] [JsonPropertyName("Action")]
public string Action { get; set; } = "HideoutImproveArea"; public string? Action { get; set; } = "HideoutImproveArea";
/** Hideout area id from areas.json */ /** Hideout area id from areas.json */
[JsonPropertyName("id")] [JsonPropertyName("id")]
public string AreaId { get; set; } public string? AreaId { get; set; }
[JsonPropertyName("areaType")] [JsonPropertyName("areaType")]
public int AreaType { get; set; } public int? AreaType { get; set; }
[JsonPropertyName("items")] [JsonPropertyName("items")]
public List<HideoutItem> Items { get; set; } public List<HideoutItem>? Items { get; set; }
[JsonPropertyName("timestamp")] [JsonPropertyName("timestamp")]
public long Timestamp { get; set; } public long? Timestamp { get; set; }
} }
+38 -38
View File
@@ -6,84 +6,84 @@ namespace Core.Models.Eft.Hideout;
public class HideoutProductionData public class HideoutProductionData
{ {
[JsonPropertyName("recipes")] [JsonPropertyName("recipes")]
public List<HideoutProduction> Recipes { get; set; } public List<HideoutProduction>? Recipes { get; set; }
[JsonPropertyName("scavRecipes")] [JsonPropertyName("scavRecipes")]
public List<ScavRecipe> ScavRecipes { get; set; } public List<ScavRecipe>? ScavRecipes { get; set; }
[JsonPropertyName("cultistRecipes")] [JsonPropertyName("cultistRecipes")]
public List<CultistRecipe> CultistRecipes { get; set; } public List<CultistRecipe>? CultistRecipes { get; set; }
} }
public class HideoutProduction public class HideoutProduction
{ {
[JsonPropertyName("_id")] [JsonPropertyName("_id")]
public string Id { get; set; } public string? Id { get; set; }
[JsonPropertyName("areaType")] [JsonPropertyName("areaType")]
public int AreaType { get; set; } public int? AreaType { get; set; }
[JsonPropertyName("requirements")] [JsonPropertyName("requirements")]
public List<Requirement> Requirements { get; set; } public List<Requirement>? Requirements { get; set; }
[JsonPropertyName("productionTime")] [JsonPropertyName("productionTime")]
public int ProductionTime { get; set; } public int? ProductionTime { get; set; }
/** Tpl of item being crafted */ /** Tpl of item being crafted */
[JsonPropertyName("endProduct")] [JsonPropertyName("endProduct")]
public string EndProduct { get; set; } public string? EndProduct { get; set; }
[JsonPropertyName("isEncoded")] [JsonPropertyName("isEncoded")]
public bool IsEncoded { get; set; } public bool? IsEncoded { get; set; }
[JsonPropertyName("locked")] [JsonPropertyName("locked")]
public bool Locked { get; set; } public bool? Locked { get; set; }
[JsonPropertyName("needFuelForAllProductionTime")] [JsonPropertyName("needFuelForAllProductionTime")]
public bool NeedFuelForAllProductionTime { get; set; } public bool? NeedFuelForAllProductionTime { get; set; }
[JsonPropertyName("continuous")] [JsonPropertyName("continuous")]
public bool Continuous { get; set; } public bool? Continuous { get; set; }
[JsonPropertyName("count")] [JsonPropertyName("count")]
public int Count { get; set; } public int? Count { get; set; }
[JsonPropertyName("productionLimitCount")] [JsonPropertyName("productionLimitCount")]
public int ProductionLimitCount { get; set; } public int? ProductionLimitCount { get; set; }
[JsonPropertyName("isCodeProduction")] [JsonPropertyName("isCodeProduction")]
public bool IsCodeProduction { get; set; } public bool? IsCodeProduction { get; set; }
} }
public class Requirement : RequirementBase public class Requirement : RequirementBase
{ {
[JsonPropertyName("templateId")] [JsonPropertyName("templateId")]
public string? TemplateId { get; set; } public string? TemplateId { get; set; }
[JsonPropertyName("count")] [JsonPropertyName("count")]
public int? Count { get; set; } public int? Count { get; set; }
[JsonPropertyName("isEncoded")] [JsonPropertyName("isEncoded")]
public bool? IsEncoded { get; set; } public bool? IsEncoded { get; set; }
[JsonPropertyName("isFunctional")] [JsonPropertyName("isFunctional")]
public bool? IsFunctional { get; set; } public bool? IsFunctional { get; set; }
[JsonPropertyName("areaType")] [JsonPropertyName("areaType")]
public int? AreaType { get; set; } public int? AreaType { get; set; }
[JsonPropertyName("requiredLevel")] [JsonPropertyName("requiredLevel")]
public int? RequiredLevel { get; set; } public int? RequiredLevel { get; set; }
[JsonPropertyName("resource")] [JsonPropertyName("resource")]
public int? Resource { get; set; } public int? Resource { get; set; }
[JsonPropertyName("questId")] [JsonPropertyName("questId")]
public string? QuestId { get; set; } public string? QuestId { get; set; }
[JsonPropertyName("isSpawnedInSession")] [JsonPropertyName("isSpawnedInSession")]
public bool? IsSpawnedInSession { get; set; } public bool? IsSpawnedInSession { get; set; }
[JsonPropertyName("gameVersions")] [JsonPropertyName("gameVersions")]
public List<string>? GameVersions { get; set; } public List<string>? GameVersions { get; set; }
} }
@@ -91,38 +91,38 @@ public class Requirement : RequirementBase
public class RequirementBase public class RequirementBase
{ {
[JsonPropertyName("type")] [JsonPropertyName("type")]
public string Type { get; set; } public string? Type { get; set; }
} }
public class ScavRecipe public class ScavRecipe
{ {
[JsonPropertyName("_id")] [JsonPropertyName("_id")]
public string Id { get; set; } public string? Id { get; set; }
[JsonPropertyName("requirements")] [JsonPropertyName("requirements")]
public List<Requirement> Requirements { get; set; } public List<Requirement>? Requirements { get; set; }
[JsonPropertyName("productionTime")] [JsonPropertyName("productionTime")]
public int ProductionTime { get; set; } public int? ProductionTime { get; set; }
[JsonPropertyName("endProducts")] [JsonPropertyName("endProducts")]
public EndProducts EndProducts { get; set; } public EndProducts? EndProducts { get; set; }
} }
public class EndProducts public class EndProducts
{ {
[JsonPropertyName("Common")] [JsonPropertyName("Common")]
public MinMax Common { get; set; } public MinMax? Common { get; set; }
[JsonPropertyName("Rare")] [JsonPropertyName("Rare")]
public MinMax Rare { get; set; } public MinMax? Rare { get; set; }
[JsonPropertyName("Superrare")] [JsonPropertyName("Superrare")]
public MinMax Superrare { get; set; } public MinMax? Superrare { get; set; }
} }
public class CultistRecipe public class CultistRecipe
{ {
[JsonPropertyName("_id")] [JsonPropertyName("_id")]
public string Id { get; set; } public string? Id { get; set; }
} }
@@ -5,23 +5,23 @@ namespace Core.Models.Eft.Hideout;
public class HideoutPutItemInRequestData public class HideoutPutItemInRequestData
{ {
[JsonPropertyName("Action")] [JsonPropertyName("Action")]
public string Action { get; set; } = "HideoutPutItemsInAreaSlots"; public string? Action { get; set; } = "HideoutPutItemsInAreaSlots";
[JsonPropertyName("areaType")] [JsonPropertyName("areaType")]
public int AreaType { get; set; } public int? AreaType { get; set; }
[JsonPropertyName("items")] [JsonPropertyName("items")]
public Dictionary<string, ItemDetails> Items { get; set; } public Dictionary<string, ItemDetails>? Items { get; set; }
[JsonPropertyName("timestamp")] [JsonPropertyName("timestamp")]
public long Timestamp { get; set; } public long? Timestamp { get; set; }
} }
public class ItemDetails public class ItemDetails
{ {
[JsonPropertyName("count")] [JsonPropertyName("count")]
public int Count { get; set; } public int? Count { get; set; }
[JsonPropertyName("id")] [JsonPropertyName("id")]
public string Id { get; set; } public string? Id { get; set; }
} }
@@ -5,35 +5,35 @@ namespace Core.Models.Eft.Hideout;
public class HideoutScavCaseStartRequestData public class HideoutScavCaseStartRequestData
{ {
[JsonPropertyName("Action")] [JsonPropertyName("Action")]
public string Action { get; set; } = "HideoutScavCaseProductionStart"; public string? Action { get; set; } = "HideoutScavCaseProductionStart";
[JsonPropertyName("recipeId")] [JsonPropertyName("recipeId")]
public string RecipeId { get; set; } public string? RecipeId { get; set; }
[JsonPropertyName("items")] [JsonPropertyName("items")]
public List<HideoutItem> Items { get; set; } public List<HideoutItem>? Items { get; set; }
[JsonPropertyName("tools")] [JsonPropertyName("tools")]
public List<Tool> Tools { get; set; } public List<Tool>? Tools { get; set; }
[JsonPropertyName("timestamp")] [JsonPropertyName("timestamp")]
public long Timestamp { get; set; } public long? Timestamp { get; set; }
} }
public class HideoutItem public class HideoutItem
{ {
[JsonPropertyName("id")] [JsonPropertyName("id")]
public string Id { get; set; } public string? Id { get; set; }
[JsonPropertyName("count")] [JsonPropertyName("count")]
public int Count { get; set; } public int? Count { get; set; }
} }
public class Tool public class Tool
{ {
[JsonPropertyName("id")] [JsonPropertyName("id")]
public string Id { get; set; } public string? Id { get; set; }
[JsonPropertyName("count")] [JsonPropertyName("count")]
public int Count { get; set; } public int? Count { get; set; }
} }
@@ -5,17 +5,17 @@ namespace Core.Models.Eft.Hideout;
public class HideoutSettingsBase public class HideoutSettingsBase
{ {
[JsonPropertyName("generatorSpeedWithoutFuel")] [JsonPropertyName("generatorSpeedWithoutFuel")]
public double GeneratorSpeedWithoutFuel { get; set; } public double? GeneratorSpeedWithoutFuel { get; set; }
[JsonPropertyName("generatorFuelFlowRate")] [JsonPropertyName("generatorFuelFlowRate")]
public double GeneratorFuelFlowRate { get; set; } public double? GeneratorFuelFlowRate { get; set; }
[JsonPropertyName("airFilterUnitFlowRate")] [JsonPropertyName("airFilterUnitFlowRate")]
public double AirFilterUnitFlowRate { get; set; } public double? AirFilterUnitFlowRate { get; set; }
[JsonPropertyName("cultistAmuletBonusPercent")] [JsonPropertyName("cultistAmuletBonusPercent")]
public double CultistAmuletBonusPercent { get; set; } public double? CultistAmuletBonusPercent { get; set; }
[JsonPropertyName("gpuBoostRate")] [JsonPropertyName("gpuBoostRate")]
public double GpuBoostRate { get; set; } public double? GpuBoostRate { get; set; }
} }
@@ -5,26 +5,26 @@ namespace Core.Models.Eft.Hideout;
public class HideoutSingleProductionStartRequestData public class HideoutSingleProductionStartRequestData
{ {
[JsonPropertyName("Action")] [JsonPropertyName("Action")]
public string Action { get; set; } = "HideoutSingleProductionStart"; public string? Action { get; set; } = "HideoutSingleProductionStart";
[JsonPropertyName("recipeId")] [JsonPropertyName("recipeId")]
public string RecipeId { get; set; } public string? RecipeId { get; set; }
[JsonPropertyName("items")] [JsonPropertyName("items")]
public List<HandoverItem> Items { get; set; } public List<HandoverItem>? Items { get; set; }
[JsonPropertyName("tools")] [JsonPropertyName("tools")]
public List<HandoverItem> Tools { get; set; } public List<HandoverItem>? Tools { get; set; }
[JsonPropertyName("timestamp")] [JsonPropertyName("timestamp")]
public long Timestamp { get; set; } public long? Timestamp { get; set; }
} }
public class HandoverItem public class HandoverItem
{ {
[JsonPropertyName("id")] [JsonPropertyName("id")]
public string Id { get; set; } public string? Id { get; set; }
[JsonPropertyName("count")] [JsonPropertyName("count")]
public int Count { get; set; } public int? Count { get; set; }
} }
@@ -5,14 +5,14 @@ namespace Core.Models.Eft.Hideout;
public class HideoutTakeItemOutRequestData public class HideoutTakeItemOutRequestData
{ {
[JsonPropertyName("Action")] [JsonPropertyName("Action")]
public string Action { get; set; } = "HideoutTakeItemsFromAreaSlots"; public string? Action { get; set; } = "HideoutTakeItemsFromAreaSlots";
[JsonPropertyName("areaType")] [JsonPropertyName("areaType")]
public int AreaType { get; set; } public int? AreaType { get; set; }
[JsonPropertyName("slots")] [JsonPropertyName("slots")]
public int[] Slots { get; set; } public List<int>? Slots { get; set; }
[JsonPropertyName("timestamp")] [JsonPropertyName("timestamp")]
public long Timestamp { get; set; } public long? Timestamp { get; set; }
} }
@@ -4,11 +4,11 @@ namespace Core.Models.Eft.Hideout;
public class HideoutTakeProductionRequestData { public class HideoutTakeProductionRequestData {
[JsonPropertyName("Action")] [JsonPropertyName("Action")]
public string Action { get; set; } = "HideoutTakeProduction"; public string? Action { get; set; } = "HideoutTakeProduction";
[JsonPropertyName("recipeId")] [JsonPropertyName("recipeId")]
public string RecipeId { get; set; } public string? RecipeId { get; set; }
[JsonPropertyName("timestamp")] [JsonPropertyName("timestamp")]
public int Timestamp { get; set; } public int? Timestamp { get; set; }
} }
@@ -5,14 +5,14 @@ namespace Core.Models.Eft.Hideout;
public class HideoutToggleAreaRequestData public class HideoutToggleAreaRequestData
{ {
[JsonPropertyName("Action")] [JsonPropertyName("Action")]
public string Action { get; set; } = "HideoutToggleArea"; public string? Action { get; set; } = "HideoutToggleArea";
[JsonPropertyName("areaType")] [JsonPropertyName("areaType")]
public int AreaType { get; set; } public int? AreaType { get; set; }
[JsonPropertyName("enabled")] [JsonPropertyName("enabled")]
public bool Enabled { get; set; } public bool? Enabled { get; set; }
[JsonPropertyName("timestamp")] [JsonPropertyName("timestamp")]
public long Timestamp { get; set; } public long? Timestamp { get; set; }
} }
@@ -5,11 +5,11 @@ namespace Core.Models.Eft.Hideout;
public class HideoutUpgradeCompleteRequestData public class HideoutUpgradeCompleteRequestData
{ {
[JsonPropertyName("Action")] [JsonPropertyName("Action")]
public string Action { get; set; } = "HideoutUpgradeComplete"; public string? Action { get; set; } = "HideoutUpgradeComplete";
[JsonPropertyName("areaType")] [JsonPropertyName("areaType")]
public int AreaType { get; set; } public int? AreaType { get; set; }
[JsonPropertyName("timestamp")] [JsonPropertyName("timestamp")]
public long Timestamp { get; set; } public long? Timestamp { get; set; }
} }
@@ -6,14 +6,14 @@ namespace Core.Models.Eft.Hideout;
public class HideoutUpgradeRequestData public class HideoutUpgradeRequestData
{ {
[JsonPropertyName("Action")] [JsonPropertyName("Action")]
public string Action { get; set; } = "HideoutUpgrade"; public string? Action { get; set; } = "HideoutUpgrade";
[JsonPropertyName("areaType")] [JsonPropertyName("areaType")]
public int AreaType { get; set; } public int? AreaType { get; set; }
[JsonPropertyName("items")] [JsonPropertyName("items")]
public List<HideoutItem> Items { get; set; } public List<HideoutItem>? Items { get; set; }
[JsonPropertyName("timestamp")] [JsonPropertyName("timestamp")]
public long Timestamp { get; set; } public long? Timestamp { get; set; }
} }
+77 -76
View File
@@ -5,25 +5,25 @@ using Core.Models.Enums.Hideout;
namespace Core.Models.Eft.Hideout; namespace Core.Models.Eft.Hideout;
public class QteData public class QteData
{ {
[JsonPropertyName("id")] [JsonPropertyName("id")]
public string Id { get; set; } public string? Id { get; set; }
[JsonPropertyName("type")] [JsonPropertyName("type")]
public QteActivityType Type { get; set; } public QteActivityType? Type { get; set; }
[JsonPropertyName("area")] [JsonPropertyName("area")]
public HideoutAreas Area { get; set; } public HideoutAreas? Area { get; set; }
[JsonPropertyName("areaLevel")] [JsonPropertyName("areaLevel")]
public int AreaLevel { get; set; } public int? AreaLevel { get; set; }
[JsonPropertyName("quickTimeEvents")] [JsonPropertyName("quickTimeEvents")]
public List<QuickTimeEvent> QuickTimeEvents { get; set; } public List<QuickTimeEvent>? QuickTimeEvents { get; set; }
[JsonPropertyName("requirements")] [JsonPropertyName("requirements")]
public List<object> Requirements { get; set; } public List<object>? Requirements { get; set; }
/* /*
TODO: Could be an array of any of these: TODO: Could be an array of any of these:
| IAreaRequirement | IAreaRequirement
@@ -39,218 +39,219 @@ public class QteData
*/ */
[JsonPropertyName("results")] [JsonPropertyName("results")]
public Dictionary<QteEffectType, QteResult> Results { get; set; } public Dictionary<QteEffectType, QteResult>? Results { get; set; }
} }
public class QuickTimeEvent public class QuickTimeEvent
{ {
[JsonPropertyName("type")] [JsonPropertyName("type")]
[JsonConverter(typeof(JsonStringEnumConverter))] [JsonConverter(typeof(JsonStringEnumConverter))]
public QteType EventType { get; set; } public QteType? EventType { get; set; }
[JsonPropertyName("position")] [JsonPropertyName("position")]
public Position Coordinates { get; set; } public Position? Coordinates { get; set; }
[JsonPropertyName("startDelay")] [JsonPropertyName("startDelay")]
public double StartDelay { get; set; } public double? StartDelay { get; set; }
[JsonPropertyName("endDelay")] [JsonPropertyName("endDelay")]
public double EndDelay { get; set; } public double? EndDelay { get; set; }
[JsonPropertyName("speed")] [JsonPropertyName("speed")]
public float MovementSpeed { get; set; } public float? MovementSpeed { get; set; }
[JsonPropertyName("successRange")] [JsonPropertyName("successRange")]
public Position SuccessCoordinates { get; set; } public Position? SuccessCoordinates { get; set; }
[JsonPropertyName("key")] [JsonPropertyName("key")]
public string UniqueKey { get; set; } public string? UniqueKey { get; set; }
} }
public class QteRequirement public class QteRequirement
{ {
[JsonPropertyName("type")] [JsonPropertyName("type")]
public RequirementType RequirementType { get; set; } public RequirementType? RequirementType { get; set; }
} }
public class QteResult public class QteResult
{ {
[JsonPropertyName("energy")] [JsonPropertyName("energy")]
public int Energy { get; set; } public int? Energy { get; set; }
[JsonPropertyName("hydration")] [JsonPropertyName("hydration")]
public int Hydration { get; set; } public int? Hydration { get; set; }
[JsonPropertyName("rewardsRange")] [JsonPropertyName("rewardsRange")]
public List<QteEffect> RewardEffects { get; set; } public List<QteEffect>? RewardEffects { get; set; }
} }
public class QteEffect public class QteEffect
{ {
[JsonPropertyName("type")] [JsonPropertyName("type")]
[JsonConverter(typeof(JsonStringEnumConverter))] [JsonConverter(typeof(JsonStringEnumConverter))]
public QteRewardType EffectType { get; set; } public QteRewardType? EffectType { get; set; }
[JsonPropertyName("skillId")] [JsonPropertyName("skillId")]
[JsonConverter(typeof(JsonStringEnumConverter))] [JsonConverter(typeof(JsonStringEnumConverter))]
public SkillTypes SkillIdentifier { get; set; } public SkillTypes? SkillIdentifier { get; set; }
[JsonPropertyName("levelMultipliers")] [JsonPropertyName("levelMultipliers")]
public List<SkillLevelMultiplier> LevelMultipliers { get; set; } public List<SkillLevelMultiplier>? LevelMultipliers { get; set; }
[JsonPropertyName("time")] [JsonPropertyName("time")]
public int DurationInMilliseconds { get; set; } public int? DurationInMilliseconds { get; set; }
[JsonPropertyName("weight")] [JsonPropertyName("weight")]
public float EffectWeight { get; set; } public float? EffectWeight { get; set; }
[JsonPropertyName("result")] [JsonPropertyName("result")]
[JsonConverter(typeof(JsonStringEnumConverter))] [JsonConverter(typeof(JsonStringEnumConverter))]
public QteResultType ResultType { get; set; } public QteResultType? ResultType { get; set; }
} }
public class SkillLevelMultiplier public class SkillLevelMultiplier
{ {
[JsonPropertyName("level")] [JsonPropertyName("level")]
public int Level { get; set; } public int? Level { get; set; }
[JsonPropertyName("multiplier")] [JsonPropertyName("multiplier")]
public float MultiplierValue { get; set; } public float? MultiplierValue { get; set; }
} }
public class Position public class Position
{ {
[JsonPropertyName("x")] [JsonPropertyName("x")]
public float X { get; set; } public float? X { get; set; }
[JsonPropertyName("y")] [JsonPropertyName("y")]
public float Y { get; set; } public float? Y { get; set; }
} }
public class AreaRequirement : QteRequirement public class AreaRequirement : QteRequirement
{ {
[JsonPropertyName("type")] [JsonPropertyName("type")]
public RequirementType Type { get; set; } = RequirementType.Area; public RequirementType? Type { get; set; } = Models.Enums.Hideout.RequirementType.Area;
[JsonPropertyName("areaType")] [JsonPropertyName("areaType")]
public HideoutAreas AreaType { get; set; } public HideoutAreas? AreaType { get; set; }
[JsonPropertyName("requiredLevel")] [JsonPropertyName("requiredLevel")]
public int RequiredLevel { get; set; } public int? RequiredLevel { get; set; }
} }
public class TraderUnlockRequirement : QteRequirement public class TraderUnlockRequirement : QteRequirement
{ {
[JsonPropertyName("type")] [JsonPropertyName("type")]
public RequirementType Type { get; set; } = RequirementType.TraderUnlock; public RequirementType? Type { get; set; } = Models.Enums.Hideout.RequirementType.TraderUnlock;
[JsonPropertyName("traderId")] [JsonPropertyName("traderId")]
public string TraderId { get; set; } public string? TraderId { get; set; }
} }
public class TraderLoyaltyRequirement : QteRequirement public class TraderLoyaltyRequirement : QteRequirement
{ {
[JsonPropertyName("type")] [JsonPropertyName("type")]
public RequirementType Type { get; set; } = RequirementType.TraderLoyalty; public RequirementType? Type { get; set; } = Models.Enums.Hideout.RequirementType.TraderLoyalty;
[JsonPropertyName("traderId")] [JsonPropertyName("traderId")]
public string TraderId { get; set; } public string? TraderId { get; set; }
[JsonPropertyName("loyaltyLevel")] [JsonPropertyName("loyaltyLevel")]
public int LoyaltyLevel { get; set; } public int? LoyaltyLevel { get; set; }
} }
public class SkillRequirement : QteRequirement public class SkillRequirement : QteRequirement
{ {
[JsonPropertyName("type")] [JsonPropertyName("type")]
public RequirementType Type { get; set; } = RequirementType.Skill; public RequirementType? Type { get; set; } = Models.Enums.Hideout.RequirementType.Skill;
[JsonPropertyName("skillName")] [JsonPropertyName("skillName")]
public SkillTypes SkillName { get; set; } public SkillTypes? SkillName { get; set; }
[JsonPropertyName("skillLevel")] [JsonPropertyName("skillLevel")]
public int SkillLevel { get; set; } public int? SkillLevel { get; set; }
} }
public class ResourceRequirement : QteRequirement public class ResourceRequirement : QteRequirement
{ {
[JsonPropertyName("type")] [JsonPropertyName("type")]
public RequirementType Type { get; set; } = RequirementType.Resource; public RequirementType? Type { get; set; } = Models.Enums.Hideout.RequirementType.Resource;
[JsonPropertyName("templateId")] [JsonPropertyName("templateId")]
public string TemplateId { get; set; } public string? TemplateId { get; set; }
[JsonPropertyName("resource")] [JsonPropertyName("resource")]
public int Resource { get; set; } public int? Resource { get; set; }
} }
public class ItemRequirement : QteRequirement public class ItemRequirement : QteRequirement
{ {
[JsonPropertyName("type")] [JsonPropertyName("type")]
public RequirementType Type { get; set; } = RequirementType.Item; public RequirementType? Type { get; set; } = Models.Enums.Hideout.RequirementType.Item;
[JsonPropertyName("templateId")] [JsonPropertyName("templateId")]
public string TemplateId { get; set; } public string? TemplateId { get; set; }
[JsonPropertyName("count")] [JsonPropertyName("count")]
public int Count { get; set; } public int? Count { get; set; }
[JsonPropertyName("isFunctional")] [JsonPropertyName("isFunctional")]
public bool IsFunctional { get; set; } public bool? IsFunctional { get; set; }
[JsonPropertyName("isEncoded")] [JsonPropertyName("isEncoded")]
public bool IsEncoded { get; set; } public bool? IsEncoded { get; set; }
} }
public class ToolRequirement : QteRequirement public class ToolRequirement : QteRequirement
{ {
[JsonPropertyName("type")] [JsonPropertyName("type")]
public RequirementType Type { get; set; } = RequirementType.Tool; public RequirementType? Type { get; set; } = Models.Enums.Hideout.RequirementType.Tool;
[JsonPropertyName("templateId")] [JsonPropertyName("templateId")]
public string TemplateId { get; set; } public string? TemplateId { get; set; }
[JsonPropertyName("count")] [JsonPropertyName("count")]
public int Count { get; set; } public int? Count { get; set; }
[JsonPropertyName("isFunctional")] [JsonPropertyName("isFunctional")]
public bool IsFunctional { get; set; } public bool? IsFunctional { get; set; }
[JsonPropertyName("isEncoded")] [JsonPropertyName("isEncoded")]
public bool IsEncoded { get; set; } public bool? IsEncoded { get; set; }
} }
public class QuestRequirement : QteRequirement public class QuestRequirement : QteRequirement
{ {
[JsonPropertyName("type")] [JsonPropertyName("type")]
public RequirementType Type { get; set; } = RequirementType.QuestComplete; public RequirementType? Type { get; set; } = Models.Enums.Hideout.RequirementType.QuestComplete;
[JsonPropertyName("questId")] [JsonPropertyName("questId")]
public string QuestId { get; set; } public string? QuestId { get; set; }
} }
public class HealthRequirement : QteRequirement public class HealthRequirement : QteRequirement
{ {
[JsonPropertyName("type")] [JsonPropertyName("type")]
public RequirementType Type { get; set; } = RequirementType.Health; public RequirementType? Type { get; set; } = Models.Enums.Hideout.RequirementType.Health;
[JsonPropertyName("energy")] [JsonPropertyName("energy")]
public int Energy { get; set; } public int? Energy { get; set; }
[JsonPropertyName("hydration")] [JsonPropertyName("hydration")]
public int Hydration { get; set; } public int? Hydration { get; set; }
} }
public class BodyPartBuffRequirement : QteRequirement public class BodyPartBuffRequirement : QteRequirement
{ {
[JsonPropertyName("type")] [JsonPropertyName("type")]
public RequirementType Type { get; set; } = RequirementType.BodyPartBuff; public RequirementType? Type { get; set; } = Models.Enums.Hideout.RequirementType.BodyPartBuff;
[JsonPropertyName("effectName")] [JsonPropertyName("effectName")]
public Effect EffectName { get; set; } public Effect? EffectName { get; set; }
[JsonPropertyName("bodyPart")] [JsonPropertyName("bodyPart")]
public BodyPart BodyPart { get; set; } public BodyPart? BodyPart { get; set; }
[JsonPropertyName("excluded")] [JsonPropertyName("excluded")]
public bool Excluded { get; set; } public bool? Excluded { get; set; }
} }
@@ -5,8 +5,8 @@ namespace Core.Models.Eft.Hideout;
public class RecordShootingRangePoints public class RecordShootingRangePoints
{ {
[JsonPropertyName("Action")] [JsonPropertyName("Action")]
public string Action { get; set; } = "RecordShootingRangePoints"; public string? Action { get; set; } = "RecordShootingRangePoints";
[JsonPropertyName("points")] [JsonPropertyName("points")]
public int Points { get; set; } public int? Points { get; set; }
} }
@@ -5,11 +5,11 @@ namespace Core.Models.Eft.HttpResponse;
public class GetBodyResponseData<T> public class GetBodyResponseData<T>
{ {
[JsonPropertyName("err")] [JsonPropertyName("err")]
public int Err { get; set; } public int? Err { get; set; }
[JsonPropertyName("errmsg")] [JsonPropertyName("errmsg")]
public string ErrMsg { get; set; } public string? ErrMsg { get; set; }
[JsonPropertyName("data")] [JsonPropertyName("data")]
public T Data { get; set; } public T? Data { get; set; }
} }
@@ -5,11 +5,11 @@ namespace Core.Models.Eft.HttpResponse;
public class NullResponseData public class NullResponseData
{ {
[JsonPropertyName("err")] [JsonPropertyName("err")]
public int Err { get; set; } public int? Err { get; set; }
[JsonPropertyName("errmsg")] [JsonPropertyName("errmsg")]
public object ErrMsg { get; set; } public object? ErrMsg { get; set; }
[JsonPropertyName("data")] [JsonPropertyName("data")]
public object Data { get; set; } public object? Data { get; set; }
} }
@@ -5,11 +5,11 @@ namespace Core.Models.Eft.InRaid;
public class RegisterPlayerRequestData public class RegisterPlayerRequestData
{ {
[JsonPropertyName("crc")] [JsonPropertyName("crc")]
public int Crc { get; set; } public int? Crc { get; set; }
[JsonPropertyName("locationId")] [JsonPropertyName("locationId")]
public string LocationId { get; set; } public string? LocationId { get; set; }
[JsonPropertyName("variantId")] [JsonPropertyName("variantId")]
public int VariantId { get; set; } public int? VariantId { get; set; }
} }
@@ -5,8 +5,8 @@ namespace Core.Models.Eft.Insurance;
public class GetInsuranceCostRequestData public class GetInsuranceCostRequestData
{ {
[JsonPropertyName("traders")] [JsonPropertyName("traders")]
public List<string> Traders { get; set; } public List<string>? Traders { get; set; }
[JsonPropertyName("items")] [JsonPropertyName("items")]
public List<string> Items { get; set; } public List<string>? Items { get; set; }
} }
@@ -6,11 +6,11 @@ namespace Core.Models.Eft.Insurance;
public class InsureRequestData : BaseInteractionRequestData public class InsureRequestData : BaseInteractionRequestData
{ {
[JsonPropertyName("Action")] [JsonPropertyName("Action")]
public string Action { get; set; } = "Insure"; public string? Action { get; set; } = "Insure";
[JsonPropertyName("tid")] [JsonPropertyName("tid")]
public string TransactionId { get; set; } public string? TransactionId { get; set; }
[JsonPropertyName("items")] [JsonPropertyName("items")]
public string[] Items { get; set; } public List<string>? Items { get; set; }
} }
@@ -10,13 +10,13 @@ public class InventoryBaseActionRequestData : BaseInteractionRequestData
public class To public class To
{ {
[JsonPropertyName("id")] [JsonPropertyName("id")]
public string Id { get; set; } public string? Id { get; set; }
[JsonPropertyName("container")] [JsonPropertyName("container")]
public string Container { get; set; } public string? Container { get; set; }
[JsonPropertyName("location")] [JsonPropertyName("location")]
public object Location { get; set; } // TODO: types given IItemLocation or number public object? Location { get; set; } // TODO: types given IItemLocation or number
[JsonPropertyName("isSearched")] [JsonPropertyName("isSearched")]
public bool? IsSearched { get; set; } public bool? IsSearched { get; set; }
@@ -25,29 +25,29 @@ public class To
public class Container public class Container
{ {
[JsonPropertyName("id")] [JsonPropertyName("id")]
public string Id { get; set; } public string? Id { get; set; }
[JsonPropertyName("container")] [JsonPropertyName("container")]
public string ContainerName { get; set; } public string? ContainerName { get; set; }
[JsonPropertyName("location")] [JsonPropertyName("location")]
public object Location { get; set; } // TODO: types given: ILocation or number public object? Location { get; set; } // TODO: types given: ILocation or number
} }
public class Location public class Location
{ {
[JsonPropertyName("x")] [JsonPropertyName("x")]
public double X { get; set; } public double? X { get; set; }
[JsonPropertyName("y")] [JsonPropertyName("y")]
public double Y { get; set; } public double? Y { get; set; }
[JsonPropertyName("r")] [JsonPropertyName("r")]
public string R { get; set; } public string? R { get; set; }
[JsonPropertyName("rotation")] [JsonPropertyName("rotation")]
public string Rotation { get; set; } public string? Rotation { get; set; }
[JsonPropertyName("isSearched")] [JsonPropertyName("isSearched")]
public bool IsSearched { get; set; } public bool? IsSearched { get; set; }
} }
@@ -5,11 +5,11 @@ namespace Core.Models.Eft.Inventory;
public class InventoryBindRequestData : InventoryBaseActionRequestData public class InventoryBindRequestData : InventoryBaseActionRequestData
{ {
[JsonPropertyName("Action")] [JsonPropertyName("Action")]
public string Action { get; set; } = "Bind"; public string? Action { get; set; } = "Bind";
[JsonPropertyName("item")] [JsonPropertyName("item")]
public string Item { get; set; } public string? Item { get; set; }
[JsonPropertyName("index")] [JsonPropertyName("index")]
public int Index { get; set; } public int? Index { get; set; }
} }
@@ -5,26 +5,26 @@ namespace Core.Models.Eft.Inventory;
public class InventoryCreateMarkerRequestData : InventoryBaseActionRequestData public class InventoryCreateMarkerRequestData : InventoryBaseActionRequestData
{ {
[JsonPropertyName("Action")] [JsonPropertyName("Action")]
public string Action { get; set; } = "CreateMapMarker"; public string? Action { get; set; } = "CreateMapMarker";
[JsonPropertyName("item")] [JsonPropertyName("item")]
public string Item { get; set; } public string? Item { get; set; }
[JsonPropertyName("mapMarker")] [JsonPropertyName("mapMarker")]
public MapMarker MapMarker { get; set; } public MapMarker? MapMarker { get; set; }
} }
public class MapMarker public class MapMarker
{ {
[JsonPropertyName("Type")] [JsonPropertyName("Type")]
public string Type { get; set; } public string? Type { get; set; }
[JsonPropertyName("X")] [JsonPropertyName("X")]
public double X { get; set; } public double? X { get; set; }
[JsonPropertyName("Y")] [JsonPropertyName("Y")]
public double Y { get; set; } public double? Y { get; set; }
[JsonPropertyName("Note")] [JsonPropertyName("Note")]
public string Note { get; set; } public string? Note { get; set; }
} }
@@ -5,14 +5,14 @@ namespace Core.Models.Eft.Inventory;
public class InventoryDeleteMarkerRequestData : InventoryBaseActionRequestData public class InventoryDeleteMarkerRequestData : InventoryBaseActionRequestData
{ {
[JsonPropertyName("Action")] [JsonPropertyName("Action")]
public string Action { get; set; } = "DeleteMapMarker"; public string? Action { get; set; } = "DeleteMapMarker";
[JsonPropertyName("item")] [JsonPropertyName("item")]
public string Item { get; set; } public string? Item { get; set; }
[JsonPropertyName("X")] [JsonPropertyName("X")]
public int X { get; set; } public int? X { get; set; }
[JsonPropertyName("Y")] [JsonPropertyName("Y")]
public int Y { get; set; } public int? Y { get; set; }
} }
@@ -5,17 +5,17 @@ namespace Core.Models.Eft.Inventory;
public class InventoryEditMarkerRequestData : InventoryBaseActionRequestData public class InventoryEditMarkerRequestData : InventoryBaseActionRequestData
{ {
[JsonPropertyName("Action")] [JsonPropertyName("Action")]
public string Action { get; set; } = "EditMapMarker"; public string? Action { get; set; } = "EditMapMarker";
[JsonPropertyName("item")] [JsonPropertyName("item")]
public string Item { get; set; } public string? Item { get; set; }
[JsonPropertyName("X")] [JsonPropertyName("X")]
public double X { get; set; } public double? X { get; set; }
[JsonPropertyName("Y")] [JsonPropertyName("Y")]
public double Y { get; set; } public double? Y { get; set; }
[JsonPropertyName("mapMarker")] [JsonPropertyName("mapMarker")]
public MapMarker MapMarker { get; set; } public MapMarker? MapMarker { get; set; }
} }
@@ -6,11 +6,11 @@ namespace Core.Models.Eft.Inventory;
public class InventoryExamineRequestData : InventoryBaseActionRequestData public class InventoryExamineRequestData : InventoryBaseActionRequestData
{ {
[JsonPropertyName("Action")] [JsonPropertyName("Action")]
public string Action { get; set; } = "Examine"; public string? Action { get; set; } = "Examine";
[JsonPropertyName("item")] [JsonPropertyName("item")]
public string Item { get; set; } public string? Item { get; set; }
[JsonPropertyName("fromOwner")] [JsonPropertyName("fromOwner")]
public OwnerInfo FromOwner { get; set; } public OwnerInfo? FromOwner { get; set; }
} }
@@ -5,11 +5,11 @@ namespace Core.Models.Eft.Inventory;
public class InventoryFoldRequestData : InventoryBaseActionRequestData public class InventoryFoldRequestData : InventoryBaseActionRequestData
{ {
[JsonPropertyName("Action")] [JsonPropertyName("Action")]
public string Action { get; set; } = "Fold"; public string? Action { get; set; } = "Fold";
[JsonPropertyName("item")] [JsonPropertyName("item")]
public string Item { get; set; } public string? Item { get; set; }
[JsonPropertyName("value")] [JsonPropertyName("value")]
public bool Value { get; set; } public bool? Value { get; set; }
} }
@@ -5,11 +5,11 @@ namespace Core.Models.Eft.Inventory;
public class InventoryMergeRequestData : InventoryBaseActionRequestData public class InventoryMergeRequestData : InventoryBaseActionRequestData
{ {
[JsonPropertyName("Action")] [JsonPropertyName("Action")]
public string Action { get; set; } = "Merge"; public string? Action { get; set; } = "Merge";
[JsonPropertyName("item")] [JsonPropertyName("item")]
public string Item { get; set; } public string? Item { get; set; }
[JsonPropertyName("with")] [JsonPropertyName("with")]
public string With { get; set; } public string? With { get; set; }
} }
@@ -6,11 +6,11 @@ namespace Core.Models.Eft.Inventory;
public class InventoryMoveRequestData : InventoryBaseActionRequestData public class InventoryMoveRequestData : InventoryBaseActionRequestData
{ {
[JsonPropertyName("Action")] [JsonPropertyName("Action")]
public string Action { get; set; } = "Move"; public string? Action { get; set; } = "Move";
[JsonPropertyName("item")] [JsonPropertyName("item")]
public string Item { get; set; } public string? Item { get; set; }
[JsonPropertyName("to")] [JsonPropertyName("to")]
public To To { get; set; } public To? To { get; set; }
} }
@@ -5,8 +5,8 @@ namespace Core.Models.Eft.Inventory;
public class InventoryReadEncyclopediaRequestData : InventoryBaseActionRequestData public class InventoryReadEncyclopediaRequestData : InventoryBaseActionRequestData
{ {
[JsonPropertyName("Action")] [JsonPropertyName("Action")]
public string Action { get; set; } = "ReadEncyclopedia"; public string? Action { get; set; } = "ReadEncyclopedia";
[JsonPropertyName("ids")] [JsonPropertyName("ids")]
public List<string> Ids { get; set; } public List<string>? Ids { get; set; }
} }
@@ -5,8 +5,8 @@ namespace Core.Models.Eft.Inventory;
public class InventoryRemoveRequestData : InventoryBaseActionRequestData public class InventoryRemoveRequestData : InventoryBaseActionRequestData
{ {
[JsonPropertyName("Action")] [JsonPropertyName("Action")]
public string Action { get; set; } = "Remove"; public string? Action { get; set; } = "Remove";
[JsonPropertyName("item")] [JsonPropertyName("item")]
public string Item { get; set; } public string? Item { get; set; }
} }
@@ -6,8 +6,8 @@ namespace Core.Models.Eft.Inventory;
public class InventorySortRequestData : InventoryBaseActionRequestData public class InventorySortRequestData : InventoryBaseActionRequestData
{ {
[JsonPropertyName("Action")] [JsonPropertyName("Action")]
public string Action { get; set; } = "ApplyInventoryChanges"; public string? Action { get; set; } = "ApplyInventoryChanges";
[JsonPropertyName("changedItems")] [JsonPropertyName("changedItems")]
public List<Item> ChangedItems { get; set; } public List<Item>? ChangedItems { get; set; }
} }
@@ -5,19 +5,19 @@ namespace Core.Models.Eft.Inventory;
public class InventorySplitRequestData : InventoryBaseActionRequestData public class InventorySplitRequestData : InventoryBaseActionRequestData
{ {
[JsonPropertyName("Action")] [JsonPropertyName("Action")]
public string Action { get; } = "Split"; public string? Action { get; } = "Split";
/** Id of item to split */ /** Id of item to split */
[JsonPropertyName("splitItem")] [JsonPropertyName("splitItem")]
public string SplitItem { get; set; } public string? SplitItem { get; set; }
/** Id of new item stack */ /** Id of new item stack */
[JsonPropertyName("newItem")] [JsonPropertyName("newItem")]
public string NewItem { get; set; } public string? NewItem { get; set; }
/** Destination new item will be placed in */ /** Destination new item will be placed in */
[JsonPropertyName("container")] [JsonPropertyName("container")]
public Container Container { get; set; } public Container? Container { get; set; }
public int Count { get; set; } public int? Count { get; set; }
} }
@@ -6,23 +6,23 @@ namespace Core.Models.Eft.Inventory;
public class InventorySwapRequestData : InventoryBaseActionRequestData public class InventorySwapRequestData : InventoryBaseActionRequestData
{ {
[JsonPropertyName("Action")] [JsonPropertyName("Action")]
public string Action { get; set; } = "Swap"; public string? Action { get; set; } = "Swap";
[JsonPropertyName("item")] [JsonPropertyName("item")]
public string Item { get; set; } public string? Item { get; set; }
[JsonPropertyName("to")] [JsonPropertyName("to")]
public To To { get; set; } public To? To { get; set; }
[JsonPropertyName("item2")] [JsonPropertyName("item2")]
public string Item2 { get; set; } public string? Item2 { get; set; }
[JsonPropertyName("to2")] [JsonPropertyName("to2")]
public To To2 { get; set; } public To? To2 { get; set; }
[JsonPropertyName("fromOwner2")] [JsonPropertyName("fromOwner2")]
public OwnerInfo FromOwner2 { get; set; } public OwnerInfo? FromOwner2 { get; set; }
[JsonPropertyName("toOwner2")] [JsonPropertyName("toOwner2")]
public OwnerInfo ToOwner2 { get; set; } public OwnerInfo? ToOwner2 { get; set; }
} }
@@ -5,14 +5,14 @@ namespace Core.Models.Eft.Inventory;
public class InventoryTagRequestData : InventoryBaseActionRequestData public class InventoryTagRequestData : InventoryBaseActionRequestData
{ {
[JsonPropertyName("Action")] [JsonPropertyName("Action")]
public string Action { get; set; } = "Tag"; public string? Action { get; set; } = "Tag";
[JsonPropertyName("item")] [JsonPropertyName("item")]
public string Item { get; set; } public string? Item { get; set; }
[JsonPropertyName("TagName")] [JsonPropertyName("TagName")]
public string TagName { get; set; } public string? TagName { get; set; }
[JsonPropertyName("TagColor")] [JsonPropertyName("TagColor")]
public int TagColor { get; set; } public int? TagColor { get; set; }
} }
@@ -5,11 +5,11 @@ namespace Core.Models.Eft.Inventory;
public class InventoryToggleRequestData : InventoryBaseActionRequestData public class InventoryToggleRequestData : InventoryBaseActionRequestData
{ {
[JsonPropertyName("Action")] [JsonPropertyName("Action")]
public string Action { get; set; } = "Toggle"; public string? Action { get; set; } = "Toggle";
[JsonPropertyName("item")] [JsonPropertyName("item")]
public string Item { get; set; } public string? Item { get; set; }
[JsonPropertyName("value")] [JsonPropertyName("value")]
public bool Value { get; set; } public bool? Value { get; set; }
} }
@@ -5,14 +5,14 @@ namespace Core.Models.Eft.Inventory;
public class InventoryTransferRequestData : InventoryBaseActionRequestData public class InventoryTransferRequestData : InventoryBaseActionRequestData
{ {
[JsonPropertyName("Action")] [JsonPropertyName("Action")]
public string Action { get; set; } = "Transfer"; public string? Action { get; set; } = "Transfer";
[JsonPropertyName("item")] [JsonPropertyName("item")]
public string Item { get; set; } public string? Item { get; set; }
[JsonPropertyName("with")] [JsonPropertyName("with")]
public string With { get; set; } public string? With { get; set; }
[JsonPropertyName("count")] [JsonPropertyName("count")]
public int Count { get; set; } public int? Count { get; set; }
} }
@@ -4,14 +4,14 @@ namespace Core.Models.Eft.Inventory;
public class OpenRandomLootContainerRequestData public class OpenRandomLootContainerRequestData
{ {
public string Action { get; set; } = "OpenRandomLootContainer"; public string? Action { get; set; } = "OpenRandomLootContainer";
/// <summary> /// <summary>
/// Container item id being opened /// Container item id being opened
/// </summary> /// </summary>
[JsonPropertyName("item")] [JsonPropertyName("item")]
public string Item { get; set; } public string? Item { get; set; }
[JsonPropertyName("to")] [JsonPropertyName("to")]
public List<ItemEvent.To> To { get; set; } public List<ItemEvent.To>? To { get; set; }
} }
@@ -6,13 +6,13 @@ namespace Core.Models.Eft.Inventory;
public class PinOrLockItemRequest public class PinOrLockItemRequest
{ {
[JsonPropertyName("Action")] [JsonPropertyName("Action")]
public string Action { get; set; } = "PinLock"; public string? Action { get; set; } = "PinLock";
/** Id of item being pinned */ /** Id of item being pinned */
[JsonPropertyName("Item")] [JsonPropertyName("Item")]
public string Item { get; set; } public string? Item { get; set; }
/** "Pinned"/"Locked"/"Free" */ /** "Pinned"/"Locked"/"Free" */
[JsonPropertyName("State")] [JsonPropertyName("State")]
public PinLockState State { get; set; } public PinLockState? State { get; set; }
} }
@@ -5,17 +5,17 @@ namespace Core.Models.Eft.Inventory;
public class RedeemProfileRequestData : InventoryBaseActionRequestData public class RedeemProfileRequestData : InventoryBaseActionRequestData
{ {
[JsonPropertyName("Action")] [JsonPropertyName("Action")]
public string Action { get; set; } = "RedeemProfileReward"; public string? Action { get; set; } = "RedeemProfileReward";
[JsonPropertyName("events")] [JsonPropertyName("events")]
public List<RedeemProfileRequestEvent> Events { get; set; } public List<RedeemProfileRequestEvent>? Events { get; set; }
} }
public class RedeemProfileRequestEvent public class RedeemProfileRequestEvent
{ {
[JsonPropertyName("MessageId")] [JsonPropertyName("MessageId")]
public string MessageId { get; set; } public string? MessageId { get; set; }
[JsonPropertyName("EventId")] [JsonPropertyName("EventId")]
public string EventId { get; set; } public string? EventId { get; set; }
} }
@@ -5,11 +5,11 @@ namespace Core.Models.Eft.Inventory;
public class SetFavoriteItems : InventoryBaseActionRequestData public class SetFavoriteItems : InventoryBaseActionRequestData
{ {
[JsonPropertyName("Action")] [JsonPropertyName("Action")]
public string Action { get; set; } = "SetFavoriteItems"; public string? Action { get; set; } = "SetFavoriteItems";
[JsonPropertyName("items")] [JsonPropertyName("items")]
public List<object> Items { get; set; } public List<object>? Items { get; set; }
[JsonPropertyName("timestamp")] [JsonPropertyName("timestamp")]
public long Timestamp { get; set; } public long? Timestamp { get; set; }
} }
@@ -5,5 +5,5 @@ namespace Core.Models.Eft.ItemEvent;
public class EmptyItemEventRouterResponse : ItemEventRouterBase public class EmptyItemEventRouterResponse : ItemEventRouterBase
{ {
[JsonPropertyName("profileChanges")] [JsonPropertyName("profileChanges")]
public string ProfileChanges { get; set; } = ""; public string? ProfileChanges { get; set; } = "";
} }
@@ -9,7 +9,7 @@ using System.Text.Json.Serialization;
public class ItemEventRouterBase public class ItemEventRouterBase
{ {
[JsonPropertyName("warnings")] [JsonPropertyName("warnings")]
public List<Warning> Warnings { get; set; } public List<Warning>? Warnings { get; set; }
[JsonPropertyName("profileChanges")] [JsonPropertyName("profileChanges")]
public object ProfileChanges { get; set; } // TODO: Types given TProfileChanges | "" public object ProfileChanges { get; set; } // TODO: Types given TProfileChanges | ""
@@ -22,128 +22,128 @@ public class TProfileChanges : Dictionary<string, ProfileChange>
public class Warning public class Warning
{ {
[JsonPropertyName("index")] [JsonPropertyName("index")]
public int Index { get; set; } public int? Index { get; set; }
[JsonPropertyName("errmsg")] [JsonPropertyName("errmsg")]
public string ErrorMessage { get; set; } public string? ErrorMessage { get; set; }
[JsonPropertyName("code")] [JsonPropertyName("code")]
public string Code { get; set; } public string? Code { get; set; }
[JsonPropertyName("data")] [JsonPropertyName("data")]
public object Data { get; set; } public object? Data { get; set; }
} }
public class ProfileChange public class ProfileChange
{ {
[JsonPropertyName("_id")] [JsonPropertyName("_id")]
public string Id { get; set; } public string? Id { get; set; }
[JsonPropertyName("experience")] [JsonPropertyName("experience")]
public int Experience { get; set; } public int? Experience { get; set; }
[JsonPropertyName("quests")] [JsonPropertyName("quests")]
public List<Quest> Quests { get; set; } public List<Quest>? Quests { get; set; }
[JsonPropertyName("ragFairOffers")] [JsonPropertyName("ragFairOffers")]
public List<RagfairOffer> RagFairOffers { get; set; } public List<RagfairOffer>? RagFairOffers { get; set; }
[JsonPropertyName("weaponBuilds")] [JsonPropertyName("weaponBuilds")]
public List<WeaponBuildChange> WeaponBuilds { get; set; } public List<WeaponBuildChange>? WeaponBuilds { get; set; }
[JsonPropertyName("equipmentBuilds")] [JsonPropertyName("equipmentBuilds")]
public List<EquipmentBuildChange> EquipmentBuilds { get; set; } public List<EquipmentBuildChange>? EquipmentBuilds { get; set; }
[JsonPropertyName("items")] [JsonPropertyName("items")]
public ItemChanges Items { get; set; } public ItemChanges? Items { get; set; }
[JsonPropertyName("production")] [JsonPropertyName("production")]
public Dictionary<string, Productive> Production { get; set; } public Dictionary<string, Productive>? Production { get; set; }
/** Hideout area improvement id */ /** Hideout area improvement id */
[JsonPropertyName("improvements")] [JsonPropertyName("improvements")]
public Dictionary<string, HideoutImprovement> Improvements { get; set; } public Dictionary<string, HideoutImprovement>? Improvements { get; set; }
[JsonPropertyName("skills")] [JsonPropertyName("skills")]
public Skills Skills { get; set; } public Skills? Skills { get; set; }
[JsonPropertyName("health")] [JsonPropertyName("health")]
public Common.Health Health { get; set; } public Common.Health Health { get; set; }
[JsonPropertyName("traderRelations")] [JsonPropertyName("traderRelations")]
public Dictionary<string, TraderData> TraderRelations { get; set; } public Dictionary<string, TraderData>? TraderRelations { get; set; }
[JsonPropertyName("moneyTransferLimitData")] [JsonPropertyName("moneyTransferLimitData")]
public MoneyTransferLimits MoneyTransferLimitData { get; set; } public MoneyTransferLimits? MoneyTransferLimitData { get; set; }
[JsonPropertyName("repeatableQuests")] [JsonPropertyName("repeatableQuests")]
public List<PmcDataRepeatableQuest> RepeatableQuests { get; set; } public List<PmcDataRepeatableQuest>? RepeatableQuests { get; set; }
[JsonPropertyName("recipeUnlocked")] [JsonPropertyName("recipeUnlocked")]
public Dictionary<string, bool> RecipeUnlocked { get; set; } public Dictionary<string, bool>? RecipeUnlocked { get; set; }
[JsonPropertyName("changedHideoutStashes")] [JsonPropertyName("changedHideoutStashes")]
public Dictionary<string, HideoutStashItem> ChangedHideoutStashes { get; set; } public Dictionary<string, HideoutStashItem>? ChangedHideoutStashes { get; set; }
[JsonPropertyName("questsStatus")] [JsonPropertyName("questsStatus")]
public List<QuestStatus> QuestsStatus { get; set; } public List<QuestStatus>? QuestsStatus { get; set; }
} }
public class HideoutStashItem public class HideoutStashItem
{ {
[JsonPropertyName("id")] [JsonPropertyName("id")]
public string Id { get; set; } public string? Id { get; set; }
[JsonPropertyName("tpl")] [JsonPropertyName("tpl")]
public string Template { get; set; } public string? Template { get; set; }
} }
public class WeaponBuildChange public class WeaponBuildChange
{ {
[JsonPropertyName("id")] [JsonPropertyName("id")]
public string Id { get; set; } public string? Id { get; set; }
[JsonPropertyName("name")] [JsonPropertyName("name")]
public string Name { get; set; } public string? Name { get; set; }
[JsonPropertyName("root")] [JsonPropertyName("root")]
public string Root { get; set; } public string? Root { get; set; }
[JsonPropertyName("items")] [JsonPropertyName("items")]
public List<Item> Items { get; set; } public List<Item>? Items { get; set; }
} }
public class EquipmentBuildChange public class EquipmentBuildChange
{ {
[JsonPropertyName("id")] [JsonPropertyName("id")]
public string Id { get; set; } public string? Id { get; set; }
[JsonPropertyName("name")] [JsonPropertyName("name")]
public string Name { get; set; } public string? Name { get; set; }
[JsonPropertyName("root")] [JsonPropertyName("root")]
public string Root { get; set; } public string? Root { get; set; }
[JsonPropertyName("items")] [JsonPropertyName("items")]
public List<Item> Items { get; set; } public List<Item>? Items { get; set; }
[JsonPropertyName("type")] [JsonPropertyName("type")]
public string Type { get; set; } public string? Type { get; set; }
[JsonPropertyName("fastpanel")] [JsonPropertyName("fastpanel")]
public List<object> FastPanel { get; set; } public List<object>? FastPanel { get; set; }
[JsonPropertyName("buildType")] [JsonPropertyName("buildType")]
public EquipmentBuildType BuildType { get; set; } public EquipmentBuildType? BuildType { get; set; }
} }
public class ItemChanges public class ItemChanges
{ {
[JsonPropertyName("new")] [JsonPropertyName("new")]
public List<Product> NewItems { get; set; } public List<Product>? NewItems { get; set; }
[JsonPropertyName("change")] [JsonPropertyName("change")]
public List<Product> ChangedItems { get; set; } public List<Product>? ChangedItems { get; set; }
[JsonPropertyName("del")] [JsonPropertyName("del")]
public List<Product> DeletedItems { get; set; } // Only needs _id property public List<Product> DeletedItems { get; set; } // Only needs _id property
@@ -153,38 +153,38 @@ public class ItemChanges
public class TraderData public class TraderData
{ {
[JsonPropertyName("salesSum")] [JsonPropertyName("salesSum")]
public double SalesSum { get; set; } public double? SalesSum { get; set; }
[JsonPropertyName("standing")] [JsonPropertyName("standing")]
public double Standing { get; set; } public double? Standing { get; set; }
[JsonPropertyName("loyalty")] [JsonPropertyName("loyalty")]
public double Loyalty { get; set; } public double? Loyalty { get; set; }
[JsonPropertyName("unlocked")] [JsonPropertyName("unlocked")]
public bool Unlocked { get; set; } public bool? Unlocked { get; set; }
[JsonPropertyName("disabled")] [JsonPropertyName("disabled")]
public bool Disabled { get; set; } public bool? Disabled { get; set; }
} }
public class Product public class Product
{ {
[JsonPropertyName("_id")] [JsonPropertyName("_id")]
public string Id { get; set; } public string? Id { get; set; }
[JsonPropertyName("_tpl")] [JsonPropertyName("_tpl")]
public string Template { get; set; } public string? Template { get; set; }
[JsonPropertyName("parentId")] [JsonPropertyName("parentId")]
public string ParentId { get; set; } public string? ParentId { get; set; }
[JsonPropertyName("slotId")] [JsonPropertyName("slotId")]
public string SlotId { get; set; } public string? SlotId { get; set; }
[JsonPropertyName("location")] [JsonPropertyName("location")]
public ItemLocation Location { get; set; } public ItemLocation? Location { get; set; }
[JsonPropertyName("upd")] [JsonPropertyName("upd")]
public Upd Upd { get; set; } public Upd? Upd { get; set; }
} }
@@ -5,50 +5,50 @@ namespace Core.Models.Eft.ItemEvent;
public class ItemEventRouterRequest public class ItemEventRouterRequest
{ {
[JsonPropertyName("data")] [JsonPropertyName("data")]
public List<Daum> Data { get; set; } public List<Daum>? Data { get; set; }
[JsonPropertyName("tm")] [JsonPropertyName("tm")]
public int Time { get; set; } public int? Time { get; set; }
[JsonPropertyName("reload")] [JsonPropertyName("reload")]
public int Reload { get; set; } public int? Reload { get; set; }
} }
public class Daum public class Daum
{ {
[JsonPropertyName("Action")] [JsonPropertyName("Action")]
public string Action { get; set; } public string? Action { get; set; }
[JsonPropertyName("item")] [JsonPropertyName("item")]
public string Item { get; set; } public string? Item { get; set; }
[JsonPropertyName("to")] [JsonPropertyName("to")]
public To To { get; set; } public To? To { get; set; }
} }
public class To public class To
{ {
[JsonPropertyName("id")] [JsonPropertyName("id")]
public string Id { get; set; } public string? Id { get; set; }
[JsonPropertyName("container")] [JsonPropertyName("container")]
public string Container { get; set; } public string? Container { get; set; }
[JsonPropertyName("location")] [JsonPropertyName("location")]
public Location Location { get; set; } public Location? Location { get; set; }
} }
public class Location public class Location
{ {
[JsonPropertyName("x")] [JsonPropertyName("x")]
public int X { get; set; } public int? X { get; set; }
[JsonPropertyName("y")] [JsonPropertyName("y")]
public int Y { get; set; } public int? Y { get; set; }
[JsonPropertyName("r")] [JsonPropertyName("r")]
public string R { get; set; } public string? R { get; set; }
[JsonPropertyName("isSearched")] [JsonPropertyName("isSearched")]
public bool IsSearched { get; set; } public bool? IsSearched { get; set; }
} }
@@ -5,5 +5,5 @@ namespace Core.Models.Eft.Launcher;
public class ChangeRequestData : LoginRequestData public class ChangeRequestData : LoginRequestData
{ {
[JsonPropertyName("change")] [JsonPropertyName("change")]
public string Change { get; set; } public string? Change { get; set; }
} }
@@ -5,8 +5,8 @@ namespace Core.Models.Eft.Launcher;
public class GetMiniProfileRequestData public class GetMiniProfileRequestData
{ {
[JsonPropertyName("username")] [JsonPropertyName("username")]
public string Username { get; set; } public string? Username { get; set; }
[JsonPropertyName("password")] [JsonPropertyName("password")]
public string Password { get; set; } public string? Password { get; set; }
} }
+2 -2
View File
@@ -5,8 +5,8 @@ namespace Core.Models.Eft.Launcher;
public class LoginRequestData public class LoginRequestData
{ {
[JsonPropertyName("username")] [JsonPropertyName("username")]
public string Username { get; set; } public string? Username { get; set; }
[JsonPropertyName("password")] [JsonPropertyName("password")]
public string Password { get; set; } public string? Password { get; set; }
} }
+1 -1
View File
@@ -5,5 +5,5 @@ namespace Core.Models.Eft.Launcher;
public class RegisterData : LoginRequestData public class RegisterData : LoginRequestData
{ {
[JsonPropertyName("edition")] [JsonPropertyName("edition")]
public string Edition { get; set; } public string? Edition { get; set; }
} }
@@ -5,5 +5,5 @@ namespace Core.Models.Eft.Location;
public class GetAirdropLootRequest public class GetAirdropLootRequest
{ {
[JsonPropertyName("containerId")] [JsonPropertyName("containerId")]
public string ContainerId { get; set; } public string? ContainerId { get; set; }
} }
@@ -8,8 +8,8 @@ public class GetAirdropLootResponse
{ {
// The type of airdrop // The type of airdrop
[JsonPropertyName("icon")] [JsonPropertyName("icon")]
public AirdropTypeEnum Icon { get; set; } public AirdropTypeEnum? Icon { get; set; }
[JsonPropertyName("container")] [JsonPropertyName("container")]
public List<Item> Container { get; set; } public List<Item>? Container { get; set; }
} }
@@ -11,96 +11,96 @@ public class EndLocalRaidRequestData
/// ID of server player just left /// ID of server player just left
/// </summary> /// </summary>
[JsonPropertyName("serverId")] [JsonPropertyName("serverId")]
public string ServerId { get; set; } public string? ServerId { get; set; }
[JsonPropertyName("results")] [JsonPropertyName("results")]
public EndRaidResult Results { get; set; } public EndRaidResult? Results { get; set; }
/// <summary> /// <summary>
/// Insured items left in raid by player /// Insured items left in raid by player
/// </summary> /// </summary>
[JsonPropertyName("lostInsuredItems")] [JsonPropertyName("lostInsuredItems")]
public List<Item> LostInsuredItems { get; set; } public List<Item>? LostInsuredItems { get; set; }
/// <summary> /// <summary>
/// Items sent via traders to player, keyed to service e.g. BTRTransferStash /// Items sent via traders to player, keyed to service e.g. BTRTransferStash
/// </summary> /// </summary>
[JsonPropertyName("transferItems")] [JsonPropertyName("transferItems")]
public Dictionary<string, List<Item>> TransferItems { get; set; } public Dictionary<string, List<Item>>? TransferItems { get; set; }
[JsonPropertyName("locationTransit")] [JsonPropertyName("locationTransit")]
public LocationTransit LocationTransit { get; set; } public LocationTransit? LocationTransit { get; set; }
} }
public class EndRaidResult public class EndRaidResult
{ {
public PmcData Profile { get; set; } public PmcData? Profile { get; set; }
/// <summary> /// <summary>
/// "Survived/Transit" etc /// "Survived/Transit" etc
/// </summary> /// </summary>
[JsonPropertyName("result")] [JsonPropertyName("result")]
public ExitStatus Result { get; set; } public ExitStatus? Result { get; set; }
[JsonPropertyName("killerId")] [JsonPropertyName("killerId")]
public string KillerId { get; set; } public string? KillerId { get; set; }
[JsonPropertyName("killerAid")] [JsonPropertyName("killerAid")]
public string KillerAid { get; set; } public string? KillerAid { get; set; }
/// <summary> /// <summary>
/// "Gate 3" etc /// "Gate 3" etc
/// </summary> /// </summary>
[JsonPropertyName("exitName")] [JsonPropertyName("exitName")]
public string ExitName { get; set; } public string? ExitName { get; set; }
[JsonPropertyName("inSession")] [JsonPropertyName("inSession")]
public bool InSession { get; set; } public bool? InSession { get; set; }
[JsonPropertyName("favorite")] [JsonPropertyName("favorite")]
public bool Favorite { get; set; } public bool? Favorite { get; set; }
/// <summary> /// <summary>
/// Seconds in raid /// Seconds in raid
/// </summary> /// </summary>
[JsonPropertyName("playTime")] [JsonPropertyName("playTime")]
public int PlayTime { get; set; } public int? PlayTime { get; set; }
} }
public class LocationTransit public class LocationTransit
{ {
[JsonPropertyName("hash")] [JsonPropertyName("hash")]
public string Hash { get; set; } public string? Hash { get; set; }
[JsonPropertyName("playersCount")] [JsonPropertyName("playersCount")]
public int PlayersCount { get; set; } public int? PlayersCount { get; set; }
[JsonPropertyName("ip")] [JsonPropertyName("ip")]
public string Ip { get; set; } public string? Ip { get; set; }
[JsonPropertyName("location")] [JsonPropertyName("location")]
public string Location { get; set; } public string? Location { get; set; }
[JsonPropertyName("profiles")] [JsonPropertyName("profiles")]
public Dictionary<string, TransitProfile> Profiles { get; set; } public Dictionary<string, TransitProfile>? Profiles { get; set; }
[JsonPropertyName("transitionRaidId")] [JsonPropertyName("transitionRaidId")]
public string TransitionRaidId { get; set; } public string? TransitionRaidId { get; set; }
[JsonPropertyName("raidMode")] [JsonPropertyName("raidMode")]
public string RaidMode { get; set; } public string? RaidMode { get; set; }
[JsonPropertyName("side")] [JsonPropertyName("side")]
public string Side { get; set; } public string? Side { get; set; }
[JsonPropertyName("dayTime")] [JsonPropertyName("dayTime")]
public string DayTime { get; set; } public string? DayTime { get; set; }
/// <summary> /// <summary>
/// The location player last visited /// The location player last visited
/// </summary> /// </summary>
[JsonPropertyName("sptLastVisitedLocation")] [JsonPropertyName("sptLastVisitedLocation")]
public string SptLastVisitedLocation { get; set; } public string? SptLastVisitedLocation { get; set; }
/// <summary> /// <summary>
/// Name of exit taken /// Name of exit taken
@@ -112,11 +112,11 @@ public class LocationTransit
public class TransitProfile public class TransitProfile
{ {
[JsonPropertyName("_id")] [JsonPropertyName("_id")]
public string Id { get; set; } public string? Id { get; set; }
[JsonPropertyName("keyId")] [JsonPropertyName("keyId")]
public string KeyId { get; set; } public string? KeyId { get; set; }
[JsonPropertyName("isSolo")] [JsonPropertyName("isSolo")]
public bool IsSolo { get; set; } public bool? IsSolo { get; set; }
} }
@@ -5,8 +5,8 @@ namespace Core.Models.Eft.Match;
public class GetRaidConfigurationRequestData : RaidSettings public class GetRaidConfigurationRequestData : RaidSettings
{ {
[JsonPropertyName("keyId")] [JsonPropertyName("keyId")]
public string KeyId { get; set; } public string? KeyId { get; set; }
[JsonPropertyName("MaxGroupCount")] [JsonPropertyName("MaxGroupCount")]
public int MaxGroupCount { get; set; } public int? MaxGroupCount { get; set; }
} }
+22 -22
View File
@@ -7,19 +7,19 @@ namespace Core.Models.Eft.Match;
public class GroupCharacter public class GroupCharacter
{ {
[JsonPropertyName("_id")] [JsonPropertyName("_id")]
public string Id { get; set; } public string? Id { get; set; }
[JsonPropertyName("aid")] [JsonPropertyName("aid")]
public int Aid { get; set; } public int? Aid { get; set; }
[JsonPropertyName("Info")] [JsonPropertyName("Info")]
public CharacterInfo Info { get; set; } public CharacterInfo? Info { get; set; }
[JsonPropertyName("PlayerVisualRepresentation")] [JsonPropertyName("PlayerVisualRepresentation")]
public PlayerVisualRepresentation? VisualRepresentation { get; set; } public PlayerVisualRepresentation? VisualRepresentation { get; set; }
[JsonPropertyName("isLeader")] [JsonPropertyName("isLeader")]
public bool IsLeader { get; set; } public bool? IsLeader { get; set; }
[JsonPropertyName("isReady")] [JsonPropertyName("isReady")]
public bool? IsReady { get; set; } public bool? IsReady { get; set; }
@@ -34,16 +34,16 @@ public class GroupCharacter
public class CharacterInfo public class CharacterInfo
{ {
[JsonPropertyName("Nickname")] [JsonPropertyName("Nickname")]
public string Nickname { get; set; } public string? Nickname { get; set; }
[JsonPropertyName("Side")] [JsonPropertyName("Side")]
public string Side { get; set; } public string? Side { get; set; }
[JsonPropertyName("Level")] [JsonPropertyName("Level")]
public int Level { get; set; } public int? Level { get; set; }
[JsonPropertyName("MemberCategory")] [JsonPropertyName("MemberCategory")]
public MemberCategory MemberCategory { get; set; } public MemberCategory? MemberCategory { get; set; }
[JsonPropertyName("GameVersion")] [JsonPropertyName("GameVersion")]
public string? GameVersion { get; set; } public string? GameVersion { get; set; }
@@ -61,53 +61,53 @@ public class CharacterInfo
public class PlayerVisualRepresentation public class PlayerVisualRepresentation
{ {
[JsonPropertyName("Info")] [JsonPropertyName("Info")]
public VisualInfo Info { get; set; } public VisualInfo? Info { get; set; }
[JsonPropertyName("Customization")] [JsonPropertyName("Customization")]
public Customization Customization { get; set; } public Customization? Customization { get; set; }
[JsonPropertyName("Equipment")] [JsonPropertyName("Equipment")]
public Equipment Equipment { get; set; } public Equipment? Equipment { get; set; }
} }
public class VisualInfo public class VisualInfo
{ {
[JsonPropertyName("Side")] [JsonPropertyName("Side")]
public string Side { get; set; } public string? Side { get; set; }
[JsonPropertyName("Level")] [JsonPropertyName("Level")]
public int Level { get; set; } public int? Level { get; set; }
[JsonPropertyName("Nickname")] [JsonPropertyName("Nickname")]
public string Nickname { get; set; } public string? Nickname { get; set; }
[JsonPropertyName("MemberCategory")] [JsonPropertyName("MemberCategory")]
public MemberCategory MemberCategory { get; set; } public MemberCategory? MemberCategory { get; set; }
[JsonPropertyName("GameVersion")] [JsonPropertyName("GameVersion")]
public string GameVersion { get; set; } public string? GameVersion { get; set; }
} }
public class Customization public class Customization
{ {
[JsonPropertyName("Head")] [JsonPropertyName("Head")]
public string Head { get; set; } public string? Head { get; set; }
[JsonPropertyName("Body")] [JsonPropertyName("Body")]
public string Body { get; set; } public string? Body { get; set; }
[JsonPropertyName("Feet")] [JsonPropertyName("Feet")]
public string Feet { get; set; } public string? Feet { get; set; }
[JsonPropertyName("Hands")] [JsonPropertyName("Hands")]
public string Hands { get; set; } public string? Hands { get; set; }
} }
public class Equipment public class Equipment
{ {
[JsonPropertyName("Id")] [JsonPropertyName("Id")]
public string Id { get; set; } public string? Id { get; set; }
[JsonPropertyName("Items")] [JsonPropertyName("Items")]
public List<Item> Items { get; set; } public List<Item>? Items { get; set; }
} }
@@ -5,5 +5,5 @@ namespace Core.Models.Eft.Match;
public class MatchGroupCurrentResponse public class MatchGroupCurrentResponse
{ {
[JsonPropertyName("squad")] [JsonPropertyName("squad")]
public List<GroupCharacter> Squad { get; set; } public List<GroupCharacter>? Squad { get; set; }
} }
@@ -5,8 +5,8 @@ namespace Core.Models.Eft.Match;
public class MatchGroupInviteSendRequest public class MatchGroupInviteSendRequest
{ {
[JsonPropertyName("to")] [JsonPropertyName("to")]
public string To { get; set; } public string? To { get; set; }
[JsonPropertyName("inLobby")] [JsonPropertyName("inLobby")]
public bool InLobby { get; set; } public bool? InLobby { get; set; }
} }
@@ -5,5 +5,5 @@ namespace Core.Models.Eft.Match;
public class MatchGroupPlayerRemoveRequest public class MatchGroupPlayerRemoveRequest
{ {
[JsonPropertyName("aidToKick")] [JsonPropertyName("aidToKick")]
public string AidToKick { get; set; } public string? AidToKick { get; set; }
} }
@@ -5,8 +5,8 @@ namespace Core.Models.Eft.Match;
public class MatchGroupStartGameRequest public class MatchGroupStartGameRequest
{ {
[JsonPropertyName("groupId")] [JsonPropertyName("groupId")]
public string GroupId { get; set; } public string? GroupId { get; set; }
[JsonPropertyName("servers")] [JsonPropertyName("servers")]
public List<Server> Servers { get; set; } public List<Server>? Servers { get; set; }
} }
@@ -6,20 +6,20 @@ namespace Core.Models.Eft.Match;
public class MatchGroupStatusRequest public class MatchGroupStatusRequest
{ {
[JsonPropertyName("location")] [JsonPropertyName("location")]
public string Location { get; set; } public string? Location { get; set; }
[JsonPropertyName("savage")] [JsonPropertyName("savage")]
public bool IsSavage { get; set; } public bool? IsSavage { get; set; }
[JsonPropertyName("dt")] [JsonPropertyName("dt")]
public string DateTime { get; set; } public string? DateTime { get; set; }
[JsonPropertyName("keyId")] [JsonPropertyName("keyId")]
public string KeyId { get; set; } public string? KeyId { get; set; }
[JsonPropertyName("raidMode")] [JsonPropertyName("raidMode")]
public RaidMode RaidMode { get; set; } public RaidMode? RaidMode { get; set; }
[JsonPropertyName("spawnPlace")] [JsonPropertyName("spawnPlace")]
public string SpawnPlace { get; set; } public string? SpawnPlace { get; set; }
} }
@@ -5,8 +5,8 @@ namespace Core.Models.Eft.Match;
public class MatchGroupStatusResponse public class MatchGroupStatusResponse
{ {
[JsonPropertyName("players")] [JsonPropertyName("players")]
public List<GroupCharacter> Players { get; set; } public List<GroupCharacter>? Players { get; set; }
[JsonPropertyName("maxPveCountExceeded")] [JsonPropertyName("maxPveCountExceeded")]
public bool MaxPveCountExceeded { get; set; } public bool? MaxPveCountExceeded { get; set; }
} }
@@ -5,5 +5,5 @@ namespace Core.Models.Eft.Match;
public class MatchGroupTransferRequest public class MatchGroupTransferRequest
{ {
[JsonPropertyName("aidToChange")] [JsonPropertyName("aidToChange")]
public string AidToChange { get; set; } public string? AidToChange { get; set; }
} }
@@ -5,8 +5,8 @@ namespace Core.Models.Eft.Match;
public class ProfileStatusResponse public class ProfileStatusResponse
{ {
[JsonPropertyName("maxPveCountExceeded")] [JsonPropertyName("maxPveCountExceeded")]
public bool MaxPveCountExceeded { get; set; } public bool? MaxPveCountExceeded { get; set; }
[JsonPropertyName("profiles")] [JsonPropertyName("profiles")]
public List<SessionStatus> Profiles { get; set; } public List<SessionStatus>? Profiles { get; set; }
} }
+49 -49
View File
@@ -5,158 +5,158 @@ namespace Core.Models.Eft.Match;
public class PutMetricsRequestData public class PutMetricsRequestData
{ {
[JsonPropertyName("sid")] [JsonPropertyName("sid")]
public string SessionId { get; set; } public string? SessionId { get; set; }
[JsonPropertyName("settings")] [JsonPropertyName("settings")]
public object Settings { get; set; } public object? Settings { get; set; }
[JsonPropertyName("SharedSettings")] [JsonPropertyName("SharedSettings")]
public SharedSettings SharedSettings { get; set; } public SharedSettings? SharedSettings { get; set; }
[JsonPropertyName("HardwareDescription")] [JsonPropertyName("HardwareDescription")]
public HardwareDescription HardwareDescription { get; set; } public HardwareDescription? HardwareDescription { get; set; }
[JsonPropertyName("Location")] [JsonPropertyName("Location")]
public string Location { get; set; } public string? Location { get; set; }
[JsonPropertyName("Metrics")] [JsonPropertyName("Metrics")]
public object Metrics { get; set; } public object? Metrics { get; set; }
[JsonPropertyName("ClientEvents")] [JsonPropertyName("ClientEvents")]
public ClientEvents ClientEvents { get; set; } public ClientEvents? ClientEvents { get; set; }
[JsonPropertyName("SpikeSamples")] [JsonPropertyName("SpikeSamples")]
public List<object> SpikeSamples { get; set; } public List<object>? SpikeSamples { get; set; }
[JsonPropertyName("mode")] [JsonPropertyName("mode")]
public string Mode { get; set; } public string? Mode { get; set; }
} }
public class SharedSettings public class SharedSettings
{ {
[JsonPropertyName("StatedFieldOfView")] [JsonPropertyName("StatedFieldOfView")]
public double StatedFieldOfView { get; set; } public double? StatedFieldOfView { get; set; }
} }
public class HardwareDescription public class HardwareDescription
{ {
[JsonPropertyName("deviceUniqueIdentifier")] [JsonPropertyName("deviceUniqueIdentifier")]
public string DeviceUniqueIdentifier { get; set; } public string? DeviceUniqueIdentifier { get; set; }
[JsonPropertyName("systemMemorySize")] [JsonPropertyName("systemMemorySize")]
public double SystemMemorySize { get; set; } public double? SystemMemorySize { get; set; }
[JsonPropertyName("graphicsDeviceID")] [JsonPropertyName("graphicsDeviceID")]
public double GraphicsDeviceId { get; set; } public double? GraphicsDeviceId { get; set; }
[JsonPropertyName("graphicsDeviceName")] [JsonPropertyName("graphicsDeviceName")]
public string GraphicsDeviceName { get; set; } public string? GraphicsDeviceName { get; set; }
[JsonPropertyName("graphicsDeviceType")] [JsonPropertyName("graphicsDeviceType")]
public string GraphicsDeviceType { get; set; } public string? GraphicsDeviceType { get; set; }
[JsonPropertyName("graphicsDeviceVendor")] [JsonPropertyName("graphicsDeviceVendor")]
public string GraphicsDeviceVendor { get; set; } public string? GraphicsDeviceVendor { get; set; }
[JsonPropertyName("graphicsDeviceVendorID")] [JsonPropertyName("graphicsDeviceVendorID")]
public double GraphicsDeviceVendorId { get; set; } public double? GraphicsDeviceVendorId { get; set; }
[JsonPropertyName("graphicsDeviceVersion")] [JsonPropertyName("graphicsDeviceVersion")]
public string GraphicsDeviceVersion { get; set; } public string? GraphicsDeviceVersion { get; set; }
[JsonPropertyName("graphicsMemorySize")] [JsonPropertyName("graphicsMemorySize")]
public double GraphicsMemorySize { get; set; } public double? GraphicsMemorySize { get; set; }
[JsonPropertyName("graphicsMultiThreaded")] [JsonPropertyName("graphicsMultiThreaded")]
public bool GraphicsMultiThreaded { get; set; } public bool? GraphicsMultiThreaded { get; set; }
[JsonPropertyName("graphicsShaderLevel")] [JsonPropertyName("graphicsShaderLevel")]
public double GraphicsShaderLevel { get; set; } public double? GraphicsShaderLevel { get; set; }
[JsonPropertyName("operatingSystem")] [JsonPropertyName("operatingSystem")]
public string OperatingSystem { get; set; } public string? OperatingSystem { get; set; }
[JsonPropertyName("processorCount")] [JsonPropertyName("processorCount")]
public double ProcessorCount { get; set; } public double? ProcessorCount { get; set; }
[JsonPropertyName("processorFrequency")] [JsonPropertyName("processorFrequency")]
public double ProcessorFrequency { get; set; } public double? ProcessorFrequency { get; set; }
[JsonPropertyName("processorType")] [JsonPropertyName("processorType")]
public string ProcessorType { get; set; } public string? ProcessorType { get; set; }
[JsonPropertyName("driveType")] [JsonPropertyName("driveType")]
public string DriveType { get; set; } public string? DriveType { get; set; }
[JsonPropertyName("swapDriveType")] [JsonPropertyName("swapDriveType")]
public string SwapDriveType { get; set; } public string? SwapDriveType { get; set; }
} }
public class ClientEvents public class ClientEvents
{ {
[JsonPropertyName("MatchingCompleted")] [JsonPropertyName("MatchingCompleted")]
public double MatchingCompleted { get; set; } public double? MatchingCompleted { get; set; }
[JsonPropertyName("MatchingCompletedReal")] [JsonPropertyName("MatchingCompletedReal")]
public double MatchingCompletedReal { get; set; } public double? MatchingCompletedReal { get; set; }
[JsonPropertyName("LocationLoaded")] [JsonPropertyName("LocationLoaded")]
public double LocationLoaded { get; set; } public double? LocationLoaded { get; set; }
[JsonPropertyName("LocationLoadedReal")] [JsonPropertyName("LocationLoadedReal")]
public double LocationLoadedReal { get; set; } public double? LocationLoadedReal { get; set; }
[JsonPropertyName("GamePrepared")] [JsonPropertyName("GamePrepared")]
public double GamePrepared { get; set; } public double? GamePrepared { get; set; }
[JsonPropertyName("GamePreparedReal")] [JsonPropertyName("GamePreparedReal")]
public double GamePreparedReal { get; set; } public double? GamePreparedReal { get; set; }
[JsonPropertyName("GameCreated")] [JsonPropertyName("GameCreated")]
public double GameCreated { get; set; } public double? GameCreated { get; set; }
[JsonPropertyName("GameCreatedReal")] [JsonPropertyName("GameCreatedReal")]
public double GameCreatedReal { get; set; } public double? GameCreatedReal { get; set; }
[JsonPropertyName("GamePooled")] [JsonPropertyName("GamePooled")]
public double GamePooled { get; set; } public double? GamePooled { get; set; }
[JsonPropertyName("GamePooledReal")] [JsonPropertyName("GamePooledReal")]
public double GamePooledReal { get; set; } public double? GamePooledReal { get; set; }
[JsonPropertyName("GameRunned")] [JsonPropertyName("GameRunned")]
public double GameRunned { get; set; } public double? GameRunned { get; set; }
[JsonPropertyName("GameRunnedReal")] [JsonPropertyName("GameRunnedReal")]
public double GameRunnedReal { get; set; } public double? GameRunnedReal { get; set; }
[JsonPropertyName("GameSpawn")] [JsonPropertyName("GameSpawn")]
public double GameSpawn { get; set; } public double? GameSpawn { get; set; }
[JsonPropertyName("GameSpawnReal")] [JsonPropertyName("GameSpawnReal")]
public double GameSpawnReal { get; set; } public double? GameSpawnReal { get; set; }
[JsonPropertyName("PlayerSpawnEvent")] [JsonPropertyName("PlayerSpawnEvent")]
public double PlayerSpawnEvent { get; set; } public double? PlayerSpawnEvent { get; set; }
[JsonPropertyName("PlayerSpawnEventReal")] [JsonPropertyName("PlayerSpawnEventReal")]
public double PlayerSpawnEventReal { get; set; } public double? PlayerSpawnEventReal { get; set; }
[JsonPropertyName("GameSpawned")] [JsonPropertyName("GameSpawned")]
public double GameSpawned { get; set; } public double? GameSpawned { get; set; }
[JsonPropertyName("GameSpawnedReal")] [JsonPropertyName("GameSpawnedReal")]
public double GameSpawnedReal { get; set; } public double? GameSpawnedReal { get; set; }
[JsonPropertyName("GameStarting")] [JsonPropertyName("GameStarting")]
public double GameStarting { get; set; } public double? GameStarting { get; set; }
[JsonPropertyName("GameStartingReal")] [JsonPropertyName("GameStartingReal")]
public double GameStartingReal { get; set; } public double? GameStartingReal { get; set; }
[JsonPropertyName("GameStarted")] [JsonPropertyName("GameStarted")]
public double GameStarted { get; set; } public double? GameStarted { get; set; }
[JsonPropertyName("GameStartedReal")] [JsonPropertyName("GameStartedReal")]
public double GameStartedReal { get; set; } public double? GameStartedReal { get; set; }
} }
+48 -48
View File
@@ -8,89 +8,89 @@ namespace Core.Models.Eft.Match;
public class RaidSettings public class RaidSettings
{ {
[JsonPropertyName("keyId")] [JsonPropertyName("keyId")]
public string KeyId { get; set; } public string? KeyId { get; set; }
[JsonPropertyName("location")] [JsonPropertyName("location")]
public string Location { get; set; } public string? Location { get; set; }
[JsonPropertyName("isLocationTransition")] [JsonPropertyName("isLocationTransition")]
public bool IsLocationTransition { get; set; } public bool? IsLocationTransition { get; set; }
[JsonPropertyName("timeVariant")] [JsonPropertyName("timeVariant")]
public DateTime TimeVariant { get; set; } public DateTime? TimeVariant { get; set; }
[JsonPropertyName("metabolismDisabled")] [JsonPropertyName("metabolismDisabled")]
public bool MetabolismDisabled { get; set; } public bool? MetabolismDisabled { get; set; }
[JsonPropertyName("timeAndWeatherSettings")] [JsonPropertyName("timeAndWeatherSettings")]
public TimeAndWeatherSettings TimeAndWeatherSettings { get; set; } public TimeAndWeatherSettings? TimeAndWeatherSettings { get; set; }
[JsonPropertyName("botSettings")] [JsonPropertyName("botSettings")]
public BotSettings BotSettings { get; set; } public BotSettings? BotSettings { get; set; }
[JsonPropertyName("wavesSettings")] [JsonPropertyName("wavesSettings")]
public WavesSettings WavesSettings { get; set; } public WavesSettings? WavesSettings { get; set; }
[JsonPropertyName("side")] [JsonPropertyName("side")]
public SideType Side { get; set; } public SideType? Side { get; set; }
[JsonPropertyName("raidMode")] [JsonPropertyName("raidMode")]
public RaidMode RaidMode { get; set; } public RaidMode? RaidMode { get; set; }
[JsonPropertyName("playersSpawnPlace")] [JsonPropertyName("playersSpawnPlace")]
public PlayersSpawnPlace PlayersSpawnPlace { get; set; } public PlayersSpawnPlace? PlayersSpawnPlace { get; set; }
[JsonPropertyName("canShowGroupPreview")] [JsonPropertyName("canShowGroupPreview")]
public bool CanShowGroupPreview { get; set; } public bool? CanShowGroupPreview { get; set; }
} }
public class TimeAndWeatherSettings public class TimeAndWeatherSettings
{ {
[JsonPropertyName("isRandomTime")] [JsonPropertyName("isRandomTime")]
public bool IsRandomTime { get; set; } public bool? IsRandomTime { get; set; }
[JsonPropertyName("isRandomWeather")] [JsonPropertyName("isRandomWeather")]
public bool IsRandomWeather { get; set; } public bool? IsRandomWeather { get; set; }
[JsonPropertyName("cloudinessType")] [JsonPropertyName("cloudinessType")]
public CloudinessType CloudinessType { get; set; } public CloudinessType? CloudinessType { get; set; }
[JsonPropertyName("rainType")] [JsonPropertyName("rainType")]
public RainType RainType { get; set; } public RainType? RainType { get; set; }
[JsonPropertyName("fogType")] [JsonPropertyName("fogType")]
public FogType FogType { get; set; } public FogType? FogType { get; set; }
[JsonPropertyName("windType")] [JsonPropertyName("windType")]
public WindSpeed WindType { get; set; } public WindSpeed? WindType { get; set; }
[JsonPropertyName("timeFlowType")] [JsonPropertyName("timeFlowType")]
public TimeFlowType TimeFlowType { get; set; } public TimeFlowType? TimeFlowType { get; set; }
[JsonPropertyName("hourOfDay")] [JsonPropertyName("hourOfDay")]
public int HourOfDay { get; set; } public int? HourOfDay { get; set; }
} }
public class BotSettings public class BotSettings
{ {
[JsonPropertyName("isScavWars")] [JsonPropertyName("isScavWars")]
public bool IsScavWars { get; set; } public bool? IsScavWars { get; set; }
[JsonPropertyName("botAmount")] [JsonPropertyName("botAmount")]
public BotAmount BotAmount { get; set; } public BotAmount? BotAmount { get; set; }
} }
public class WavesSettings public class WavesSettings
{ {
[JsonPropertyName("botAmount")] [JsonPropertyName("botAmount")]
public BotAmount BotAmount { get; set; } public BotAmount? BotAmount { get; set; }
[JsonPropertyName("botDifficulty")] [JsonPropertyName("botDifficulty")]
public BotDifficulty BotDifficulty { get; set; } public BotDifficulty? BotDifficulty { get; set; }
[JsonPropertyName("isBosses")] [JsonPropertyName("isBosses")]
public bool IsBosses { get; set; } public bool? IsBosses { get; set; }
[JsonPropertyName("isTaggedAndCursed")] [JsonPropertyName("isTaggedAndCursed")]
public bool IsTaggedAndCursed { get; set; } public bool? IsTaggedAndCursed { get; set; }
} }
+1 -1
View File
@@ -5,5 +5,5 @@ namespace Core.Models.Eft.Match;
public class RequestIdRequest public class RequestIdRequest
{ {
[JsonPropertyName("requestId")] [JsonPropertyName("requestId")]
public string RequestId { get; set; } public string? RequestId { get; set; }
} }
+3 -3
View File
@@ -5,11 +5,11 @@ namespace Core.Models.Eft.Match;
public class Server public class Server
{ {
[JsonPropertyName("ping")] [JsonPropertyName("ping")]
public int Ping { get; set; } public int? Ping { get; set; }
[JsonPropertyName("ip")] [JsonPropertyName("ip")]
public string Ip { get; set; } public string? Ip { get; set; }
[JsonPropertyName("port")] [JsonPropertyName("port")]
public int Port { get; set; } public int? Port { get; set; }
} }
+6 -6
View File
@@ -5,22 +5,22 @@ namespace Core.Models.Eft.Match;
public class SessionStatus public class SessionStatus
{ {
[JsonPropertyName("profileid")] [JsonPropertyName("profileid")]
public string ProfileId { get; set; } public string? ProfileId { get; set; }
[JsonPropertyName("profileToken")] [JsonPropertyName("profileToken")]
public string ProfileToken { get; set; } public string? ProfileToken { get; set; }
[JsonPropertyName("status")] [JsonPropertyName("status")]
public string Status { get; set; } public string? Status { get; set; }
[JsonPropertyName("ip")] [JsonPropertyName("ip")]
public string Ip { get; set; } public string? Ip { get; set; }
[JsonPropertyName("port")] [JsonPropertyName("port")]
public int Port { get; set; } public int? Port { get; set; }
[JsonPropertyName("sid")] [JsonPropertyName("sid")]
public string Sid { get; set; } public string? Sid { get; set; }
[JsonPropertyName("version")] [JsonPropertyName("version")]
public string? Version { get; set; } public string? Version { get; set; }
@@ -6,26 +6,26 @@ namespace Core.Models.Eft.Match;
public class StartLocalRaidRequestData public class StartLocalRaidRequestData
{ {
[JsonPropertyName("serverId")] [JsonPropertyName("serverId")]
public string ServerId { get; set; } public string? ServerId { get; set; }
[JsonPropertyName("location")] [JsonPropertyName("location")]
public string Location { get; set; } public string? Location { get; set; }
[JsonPropertyName("timeVariant")] [JsonPropertyName("timeVariant")]
public string TimeVariant { get; set; } public string? TimeVariant { get; set; }
[JsonPropertyName("mode")] [JsonPropertyName("mode")]
public string Mode { get; set; } public string? Mode { get; set; }
[JsonPropertyName("playerSide")] [JsonPropertyName("playerSide")]
public string PlayerSide { get; set; } public string? PlayerSide { get; set; }
[JsonPropertyName("transitionType")] [JsonPropertyName("transitionType")]
public TransitionType TransitionType { get; set; } public TransitionType? TransitionType { get; set; }
[JsonPropertyName("transition")] [JsonPropertyName("transition")]
public Transition Transition { get; set; } public Transition? Transition { get; set; }
/** Should loot generation be skipped, default false */ /** Should loot generation be skipped, default false */
[JsonPropertyName("sptSkipLootGeneration")] [JsonPropertyName("sptSkipLootGeneration")]
public bool? ShouldSkipLootGeneration { get; set; } public bool? ShouldSkipLootGeneration { get; set; }
@@ -8,41 +8,41 @@ namespace Core.Models.Eft.Match;
public class StartLocalRaidResponseData public class StartLocalRaidResponseData
{ {
[JsonPropertyName("serverId")] [JsonPropertyName("serverId")]
public string ServerId { get; set; } public string? ServerId { get; set; }
[JsonPropertyName("serverSettings")] [JsonPropertyName("serverSettings")]
public LocationServices ServerSettings { get; set; } public LocationServices? ServerSettings { get; set; }
[JsonPropertyName("profile")] [JsonPropertyName("profile")]
public ProfileInsuredItems Profile { get; set; } public ProfileInsuredItems? Profile { get; set; }
[JsonPropertyName("locationLoot")] [JsonPropertyName("locationLoot")]
public LocationBase LocationLoot { get; set; } public LocationBase? LocationLoot { get; set; }
[JsonPropertyName("transitionType")] [JsonPropertyName("transitionType")]
public TransitionType TransitionType { get; set; } public TransitionType? TransitionType { get; set; }
[JsonPropertyName("transition")] [JsonPropertyName("transition")]
public Transition Transition { get; set; } public Transition? Transition { get; set; }
} }
public class ProfileInsuredItems public class ProfileInsuredItems
{ {
[JsonPropertyName("insuredItems")] [JsonPropertyName("insuredItems")]
public List<InsuredItem> InsuredItems { get; set; } public List<InsuredItem>? InsuredItems { get; set; }
} }
public class Transition public class Transition
{ {
[JsonPropertyName("transitionType")] [JsonPropertyName("transitionType")]
public TransitionType TransitionType { get; set; } public TransitionType? TransitionType { get; set; }
[JsonPropertyName("transitionRaidId")] [JsonPropertyName("transitionRaidId")]
public string TransitionRaidId { get; set; } public string? TransitionRaidId { get; set; }
[JsonPropertyName("transitionCount")] [JsonPropertyName("transitionCount")]
public int TransitionCount { get; set; } public int? TransitionCount { get; set; }
[JsonPropertyName("visitedLocations")] [JsonPropertyName("visitedLocations")]
public List<string> VisitedLocations { get; set; } public List<string>? VisitedLocations { get; set; }
} }
+5 -5
View File
@@ -6,20 +6,20 @@ namespace Core.Models.Eft.Notes;
public class NoteActionData : BaseInteractionRequestData public class NoteActionData : BaseInteractionRequestData
{ {
[JsonPropertyName("Action")] [JsonPropertyName("Action")]
public string Action { get; set; } public string? Action { get; set; }
[JsonPropertyName("index")] [JsonPropertyName("index")]
public int Index { get; set; } public int? Index { get; set; }
[JsonPropertyName("note")] [JsonPropertyName("note")]
public Note Note { get; set; } public Note? Note { get; set; }
} }
public class Note public class Note
{ {
[JsonPropertyName("Time")] [JsonPropertyName("Time")]
public int Time { get; set; } public int? Time { get; set; }
[JsonPropertyName("Text")] [JsonPropertyName("Text")]
public string Text { get; set; } public string? Text { get; set; }
} }
+5 -5
View File
@@ -5,17 +5,17 @@ namespace Core.Models.Eft.Notifier;
public class NotifierChannel public class NotifierChannel
{ {
[JsonPropertyName("server")] [JsonPropertyName("server")]
public string Server { get; set; } public string? Server { get; set; }
[JsonPropertyName("channel_id")] [JsonPropertyName("channel_id")]
public string ChannelId { get; set; } public string? ChannelId { get; set; }
[JsonPropertyName("url")] [JsonPropertyName("url")]
public string Url { get; set; } public string? Url { get; set; }
[JsonPropertyName("notifierServer")] [JsonPropertyName("notifierServer")]
public string NotifierServer { get; set; } public string? NotifierServer { get; set; }
[JsonPropertyName("ws")] [JsonPropertyName("ws")]
public string WebSocket { get; set; } public string? WebSocket { get; set; }
} }

Some files were not shown because too many files have changed in this diff Show More