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

fix up nullables missed

Browse Source
This commit is contained in:
CWX
2025-01-08 14:01:23 +00:00
parent 5d866c25c0
commit 3a8f9c77a0
66 changed files with 725 additions and 725 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Core/Models/Common/MinMax.cs
+2 -2
View File
@@ -5,8 +5,8 @@ namespace Core.Models.Common;
public class MinMax
{
[JsonPropertyName("max")]
public double Max { get; set; }
public double? Max { get; set; }
[JsonPropertyName("min")]
public double Min { get; set; }
public double? Min { get; set; }
}
Core/Models/Eft/Common/LocationBase.cs
+2 -2
View File
@@ -326,7 +326,7 @@ public class LocationBase
public class Transit
{
[JsonPropertyName("activateAfterSec")]
public int ActivateAfterSeconds { get; set; } // TODO: Int in client
public int? ActivateAfterSeconds { get; set; } // TODO: Int in client
[JsonPropertyName("active")]
public bool? IsActive { get; set; }
@@ -608,7 +608,7 @@ public class ChancedEnemy
public class MinMaxBot : MinMax
{
[JsonPropertyName("WildSpawnType")]
public object WildSpawnType { get; set; } // TODO: Could be WildSpawnType or string
public object? WildSpawnType { get; set; } // TODO: Could be WildSpawnType or string
}
public class MinPlayerWaitTime
Core/Models/Eft/Common/Tables/BotBase.cs
+203 -203
View File
@@ -108,97 +108,97 @@ public class MoneyTransferLimits
public double? NextResetTime { get; set; }
[JsonPropertyName("remainingLimit")]
public double RemainingLimit { get; set; }
public double? RemainingLimit { get; set; }
[JsonPropertyName("totalLimit")]
public double TotalLimit { get; set; }
public double? TotalLimit { get; set; }
[JsonPropertyName("resetInterval")]
public double ResetInterval { get; set; }
public double? ResetInterval { get; set; }
}
public class TaskConditionCounter
{
[JsonPropertyName("id")]
public string Id { get; set; }
public string? Id { get; set; }
[JsonPropertyName("type")]
public string Type { get; set; }
public string? Type { get; set; }
[JsonPropertyName("value")]
public double Value { get; set; }
public double? Value { get; set; }
/** Quest id */
[JsonPropertyName("sourceId")]
public string SourceId { get; set; }
public string? SourceId { get; set; }
}
public class UnlockedInfo
{
[JsonPropertyName("unlockedProductionRecipe")]
public List<string> UnlockedProductionRecipe { get; set; }
public List<string>? UnlockedProductionRecipe { get; set; }
}
public class Info
{
public string EntryPoint { get; set; }
public string Nickname { get; set; }
public string? EntryPoint { get; set; }
public string? Nickname { get; set; }
public string? MainProfileNickname { get; set; }
public string LowerNickname { get; set; }
public string Side { get; set; }
public bool SquadInviteRestriction { get; set; }
public bool HasCoopExtension { get; set; }
public bool HasPveGame { get; set; }
public string Voice { get; set; }
public double Level { get; set; }
public double Experience { get; set; }
public long RegistrationDate { get; set; }
public string GameVersion { get; set; }
public double AccountType { get; set; }
public MemberCategory MemberCategory { get; set; }
public MemberCategory SelectedMemberCategory { get; set; }
public string? LowerNickname { get; set; }
public string? Side { get; set; }
public bool? SquadInviteRestriction { get; set; }
public bool? HasCoopExtension { get; set; }
public bool? HasPveGame { get; set; }
public string? Voice { get; set; }
public double? Level { get; set; }
public double? Experience { get; set; }
public long? RegistrationDate { get; set; }
public string? GameVersion { get; set; }
public double? AccountType { get; set; }
public MemberCategory? MemberCategory { get; set; }
public MemberCategory? SelectedMemberCategory { get; set; }
[JsonPropertyName("lockedMoveCommands")]
public bool LockedMoveCommands { get; set; }
public bool? LockedMoveCommands { get; set; }
public long SavageLockTime { get; set; }
public long LastTimePlayedAsSavage { get; set; }
public BotInfoSettings Settings { get; set; }
public long NicknameChangeDate { get; set; }
public List<object> NeedWipeOptions { get; set; }
public long? SavageLockTime { get; set; }
public long? LastTimePlayedAsSavage { get; set; }
public BotInfoSettings? Settings { get; set; }
public long? NicknameChangeDate { get; set; }
public List<object>? NeedWipeOptions { get; set; }
[JsonPropertyName("lastCompletedWipe")]
public LastCompleted LastCompletedWipe { get; set; }
public LastCompleted? LastCompletedWipe { get; set; }
public List<Ban> Bans { get; set; }
public bool BannedState { get; set; }
public long BannedUntil { get; set; }
public bool IsStreamerModeAvailable { get; set; }
public List<Ban>? Bans { get; set; }
public bool? BannedState { get; set; }
public long? BannedUntil { get; set; }
public bool? IsStreamerModeAvailable { get; set; }
[JsonPropertyName("lastCompletedEvent")]
public LastCompleted? LastCompletedEvent { get; set; }
[JsonPropertyName("isMigratedSkills")]
public bool IsMigratedSkills { get; set; }
public bool? IsMigratedSkills { get; set; }
}
public class BotInfoSettings
{
public string Role { get; set; }
public string BotDifficulty { get; set; }
public double Experience { get; set; }
public double StandingForKill { get; set; }
public double AggressorBonus { get; set; }
public bool UseSimpleAnimator { get; set; }
public string? Role { get; set; }
public string? BotDifficulty { get; set; }
public double? Experience { get; set; }
public double? StandingForKill { get; set; }
public double? AggressorBonus { get; set; }
public bool? UseSimpleAnimator { get; set; }
}
public class Ban
{
[JsonPropertyName("banType")]
public BanType BanType { get; set; }
public BanType? BanType { get; set; }
[JsonPropertyName("dateTime")]
public long DateTime { get; set; }
public long? DateTime { get; set; }
}
public enum BanType
@@ -214,36 +214,36 @@ public enum BanType
public class Customization
{
public string Head { get; set; }
public string Body { get; set; }
public string Feet { get; set; }
public string Hands { get; set; }
public string? Head { get; set; }
public string? Body { get; set; }
public string? Feet { get; set; }
public string? Hands { get; set; }
}
public class BotBaseHealth
{
public CurrentMax Hydration { get; set; }
public CurrentMax Energy { get; set; }
public CurrentMax Temperature { get; set; }
public BodyPartsHealth BodyParts { get; set; }
public double UpdateTime { get; set; }
public CurrentMax? Hydration { get; set; }
public CurrentMax? Energy { get; set; }
public CurrentMax? Temperature { get; set; }
public BodyPartsHealth? BodyParts { get; set; }
public double? UpdateTime { get; set; }
public bool? Immortal { get; set; }
}
public class BodyPartsHealth
{
public BodyPartHealth Head { get; set; }
public BodyPartHealth Chest { get; set; }
public BodyPartHealth Stomach { get; set; }
public BodyPartHealth LeftArm { get; set; }
public BodyPartHealth RightArm { get; set; }
public BodyPartHealth LeftLeg { get; set; }
public BodyPartHealth RightLeg { get; set; }
public BodyPartHealth? Head { get; set; }
public BodyPartHealth? Chest { get; set; }
public BodyPartHealth? Stomach { get; set; }
public BodyPartHealth? LeftArm { get; set; }
public BodyPartHealth? RightArm { get; set; }
public BodyPartHealth? LeftLeg { get; set; }
public BodyPartHealth? RightLeg { get; set; }
}
public class BodyPartHealth
{
public CurrentMax Health { get; set; }
public CurrentMax? Health { get; set; }
public Dictionary<string, BodyPartEffectProperties>? Effects { get; set; }
}
@@ -251,68 +251,68 @@ public class BodyPartEffectProperties
{
// TODO: this was any, what actual type is it?
public object? ExtraData { get; set; }
public double Time { get; set; }
public double? Time { get; set; }
}
public class CurrentMax
{
public double Current { get; set; }
public double Maximum { get; set; }
public double? Current { get; set; }
public double? Maximum { get; set; }
}
public class BotBaseInventory
{
[JsonPropertyName("items")]
public List<Item> Items { get; set; }
public List<Item>? Items { get; set; }
[JsonPropertyName("equipment")]
public string Equipment { get; set; }
public string? Equipment { get; set; }
[JsonPropertyName("stash")]
public string Stash { get; set; }
public string? Stash { get; set; }
[JsonPropertyName("sortingTable")]
public string SortingTable { get; set; }
public string? SortingTable { get; set; }
[JsonPropertyName("questRaidItems")]
public string QuestRaidItems { get; set; }
public string? QuestRaidItems { get; set; }
[JsonPropertyName("questStashItems")]
public string QuestStashItems { get; set; }
public string? QuestStashItems { get; set; }
/** Key is hideout area enum numeric as string e.g. "24", value is area _id */
[JsonPropertyName("hideoutAreaStashes")]
public Dictionary<string, string> HideoutAreaStashes { get; set; }
public Dictionary<string, string>? HideoutAreaStashes { get; set; }
[JsonPropertyName("fastPanel")]
public Dictionary<string, string> FastPanel { get; set; }
public Dictionary<string, string>? FastPanel { get; set; }
[JsonPropertyName("favoriteItems")]
public List<string> FavoriteItems { get; set; }
public List<string>? FavoriteItems { get; set; }
}
public class BaseJsonSkills
{
public Dictionary<string, Common> Common { get; set; }
public Dictionary<string, Mastering> Mastering { get; set; }
public double Points { get; set; }
public Dictionary<string, Common>? Common { get; set; }
public Dictionary<string, Mastering>? Mastering { get; set; }
public double? Points { get; set; }
}
public class Skills
{
[JsonConverter(typeof(ArrayToObjectFactoryConverter))]
public Dictionary<SkillTypes, Common> Common { get; set; }
public Dictionary<SkillTypes, Common>? Common { get; set; }
[JsonConverter(typeof(ArrayToObjectFactoryConverter))]
public Dictionary<string, Mastering> Mastering { get; set; }
public Dictionary<string, Mastering>? Mastering { get; set; }
public double Points { get; set; }
public double? Points { get; set; }
}
public class BaseSkill
{
public string Id { get; set; }
public double Progress { get; set; }
public string? Id { get; set; }
public double? Progress { get; set; }
[JsonPropertyName("max")]
public int? Max { get; set; }
@@ -338,12 +338,12 @@ public class Stats
public class EftStats
{
public List<string> CarriedQuestItems { get; set; }
public List<Victim> Victims { get; set; }
public double TotalSessionExperience { get; set; }
public long LastSessionDate { get; set; }
public SessionCounters SessionCounters { get; set; }
public OverallCounters OverallCounters { get; set; }
public List<string>? CarriedQuestItems { get; set; }
public List<Victim>? Victims { get; set; }
public double? TotalSessionExperience { get; set; }
public long? LastSessionDate { get; set; }
public SessionCounters? SessionCounters { get; set; }
public OverallCounters? OverallCounters { get; set; }
public float? SessionExperienceMult { get; set; }
public float? ExperienceBonusMult { get; set; }
public Aggressor? Aggressor { get; set; }
@@ -352,7 +352,7 @@ public class EftStats
public DamageHistory? DamageHistory { get; set; }
public DeathCause? DeathCause { get; set; }
public LastPlayerState? LastPlayerState { get; set; }
public double TotalInGameTime { get; set; }
public double? TotalInGameTime { get; set; }
public string? SurvivorClass { get; set; }
[JsonPropertyName("sptLastRaidFenceRepChange")]
@@ -361,191 +361,191 @@ public class EftStats
public class DroppedItem
{
public string QuestId { get; set; }
public string ItemId { get; set; }
public string ZoneId { get; set; }
public string? QuestId { get; set; }
public string? ItemId { get; set; }
public string? ZoneId { get; set; }
}
public class FoundInRaidItem
{
public string QuestId { get; set; }
public string ItemId { get; set; }
public string? QuestId { get; set; }
public string? ItemId { get; set; }
}
// TODO: Same as Aggressor?
public class Victim
{
public string AccountId { get; set; }
public string ProfileId { get; set; }
public string Name { get; set; }
public string Side { get; set; }
public string BodyPart { get; set; }
public string Time { get; set; }
public float Distance { get; set; }
public double Level { get; set; }
public string Weapon { get; set; }
public string Role { get; set; }
public string Location { get; set; }
public string? AccountId { get; set; }
public string? ProfileId { get; set; }
public string? Name { get; set; }
public string? Side { get; set; }
public string? BodyPart { get; set; }
public string? Time { get; set; }
public float? Distance { get; set; }
public double? Level { get; set; }
public string? Weapon { get; set; }
public string? Role { get; set; }
public string? Location { get; set; }
}
public class SessionCounters
{
public List<CounterKeyValue> Items { get; set; }
public List<CounterKeyValue>? Items { get; set; }
}
public class OverallCounters
{
public List<CounterKeyValue> Items { get; set; }
public List<CounterKeyValue>? Items { get; set; }
}
public class CounterKeyValue
{
public List<string> Key { get; set; }
public double Value { get; set; }
public List<string>? Key { get; set; }
public double? Value { get; set; }
}
public class Aggressor
{
public string AccountId { get; set; }
public string ProfileId { get; set; }
public string MainProfileNickname { get; set; }
public string Name { get; set; }
public string Side { get; set; }
public string BodyPart { get; set; }
public string HeadSegment { get; set; }
public string WeaponName { get; set; }
public string Category { get; set; }
public string? AccountId { get; set; }
public string? ProfileId { get; set; }
public string? MainProfileNickname { get; set; }
public string? Name { get; set; }
public string? Side { get; set; }
public string? BodyPart { get; set; }
public string? HeadSegment { get; set; }
public string? WeaponName { get; set; }
public string? Category { get; set; }
}
public class DamageHistory
{
public string LethalDamagePart { get; set; }
public LethalDamage LethalDamage { get; set; }
public string? LethalDamagePart { get; set; }
public LethalDamage? LethalDamage { get; set; }
[JsonConverter(typeof(ArrayToObjectFactoryConverter))]
public BodyPartsDamageHistory BodyParts { get; set; }
public BodyPartsDamageHistory? BodyParts { get; set; }
}
// TODO: this class seems exactly the same as DamageStats, why have it?
public class LethalDamage
{
public double Amount { get; set; }
public string Type { get; set; }
public string SourceId { get; set; }
public string OverDamageFrom { get; set; }
public bool Blunt { get; set; }
public double ImpactsCount { get; set; }
public double? Amount { get; set; }
public string? Type { get; set; }
public string? SourceId { get; set; }
public string? OverDamageFrom { get; set; }
public bool? Blunt { get; set; }
public double? ImpactsCount { get; set; }
}
public class BodyPartsDamageHistory
{
public List<DamageStats> Head { get; set; }
public List<DamageStats> Chest { get; set; }
public List<DamageStats> Stomach { get; set; }
public List<DamageStats> LeftArm { get; set; }
public List<DamageStats> RightArm { get; set; }
public List<DamageStats> LeftLeg { get; set; }
public List<DamageStats> RightLeg { get; set; }
public List<DamageStats> Common { get; set; }
public List<DamageStats>? Head { get; set; }
public List<DamageStats>? Chest { get; set; }
public List<DamageStats>? Stomach { get; set; }
public List<DamageStats>? LeftArm { get; set; }
public List<DamageStats>? RightArm { get; set; }
public List<DamageStats>? LeftLeg { get; set; }
public List<DamageStats>? RightLeg { get; set; }
public List<DamageStats>? Common { get; set; }
}
public class DamageStats
{
public double Amount { get; set; }
public string Type { get; set; }
public string SourceId { get; set; }
public string OverDamageFrom { get; set; }
public bool Blunt { get; set; }
public double ImpactsCount { get; set; }
public double? Amount { get; set; }
public string? Type { get; set; }
public string? SourceId { get; set; }
public string? OverDamageFrom { get; set; }
public bool? Blunt { get; set; }
public double? ImpactsCount { get; set; }
}
public class DeathCause
{
public string DamageType { get; set; }
public string Side { get; set; }
public string Role { get; set; }
public string WeaponId { get; set; }
public string? DamageType { get; set; }
public string? Side { get; set; }
public string? Role { get; set; }
public string? WeaponId { get; set; }
}
public class LastPlayerState
{
public LastPlayerStateInfo Info { get; set; }
public Dictionary<string, string> Customization { get; set; }
public LastPlayerStateInfo? Info { get; set; }
public Dictionary<string, string>? Customization { get; set; }
// TODO: there is no definition on TS just any
public object Equipment { get; set; }
public object? Equipment { get; set; }
}
public class LastPlayerStateInfo
{
public string Nickname { get; set; }
public string Side { get; set; }
public double Level { get; set; }
public MemberCategory MemberCategory { get; set; }
public string? Nickname { get; set; }
public string? Side { get; set; }
public double? Level { get; set; }
public MemberCategory? MemberCategory { get; set; }
}
public class BackendCounter
{
[JsonPropertyName("id")]
public string Id { get; set; }
public string? Id { get; set; }
[JsonPropertyName("qid")]
public string? QId { get; set; }
[JsonPropertyName("value")]
public double Value { get; set; }
public double? Value { get; set; }
}
public class InsuredItem
{
/** Trader Id item was insured by */
[JsonPropertyName("tid")]
public string TId { get; set; }
public string? TId { get; set; }
[JsonPropertyName("itemId")]
public string ItemId { get; set; }
public string? ItemId { get; set; }
}
public class Hideout
{
public Dictionary<string, Production> Production { get; set; }
public List<BotHideoutArea> Areas { get; set; }
public Dictionary<string, HideoutImprovement> Improvements { get; set; }
public HideoutCounters HideoutCounters { get; set; }
public double Seed { get; set; }
public List<string> MannequinPoses { get; set; }
public Dictionary<string, Production>? Production { get; set; }
public List<BotHideoutArea>? Areas { get; set; }
public Dictionary<string, HideoutImprovement>? Improvements { get; set; }
public HideoutCounters? HideoutCounters { get; set; }
public double? Seed { get; set; }
public List<string>? MannequinPoses { get; set; }
[JsonPropertyName("sptUpdateLastRunTimestamp")]
public long SptUpdateLastRunTimestamp { get; set; }
public long? SptUpdateLastRunTimestamp { get; set; }
}
public class HideoutCounters
{
[JsonPropertyName("fuelCounter")]
public double FuelCounter { get; set; }
public double? FuelCounter { get; set; }
[JsonPropertyName("airFilterCounter")]
public double AirFilterCounter { get; set; }
public double? AirFilterCounter { get; set; }
[JsonPropertyName("waterFilterCounter")]
public double WaterFilterCounter { get; set; }
public double? WaterFilterCounter { get; set; }
[JsonPropertyName("craftingTimeCounter")]
public double CraftingTimeCounter { get; set; }
public double? CraftingTimeCounter { get; set; }
}
public class HideoutImprovement
{
[JsonPropertyName("completed")]
public bool Completed { get; set; }
public bool? Completed { get; set; }
[JsonPropertyName("improveCompleteTimestamp")]
public long ImproveCompleteTimestamp { get; set; }
public long? ImproveCompleteTimestamp { get; set; }
}
public class Productive
{
public List<Product> Products { get; set; }
public List<Product>? Products { get; set; }
/** Seconds passed of production */
public int? Progress { get; set; }
@@ -554,15 +554,15 @@ public class Productive
[JsonPropertyName("inProgress")]
public bool? InProgress { get; set; }
public string StartTimestamp { get; set; }
public string? StartTimestamp { get; set; }
public int? SkipTime { get; set; }
/** Seconds needed to fully craft */
public int? ProductionTime { get; set; }
public List<Item> GivenItemsInStart { get; set; }
public List<Item>? GivenItemsInStart { get; set; }
public bool? Interrupted { get; set; }
public string Code { get; set; }
public string? Code { get; set; }
public bool? Decoded { get; set; }
public bool? AvailableForFinish { get; set; }
@@ -585,7 +585,7 @@ public class Productive
/** Stores a list of tools used in this craft and whether they're FiR, to give back once the craft is done */
[JsonPropertyName("sptRequiredTools")]
public List<Item> SptRequiredTools { get; set; }
public List<Item>? SptRequiredTools { get; set; }
// Craft is cultist circle sacrifice
[JsonPropertyName("sptIsCultistCircle")]
@@ -594,23 +594,23 @@ public class Productive
public class Production : Productive
{
public string RecipeId { get; set; }
public string? RecipeId { get; set; }
public int? SkipTime { get; set; }
public int? ProductionTime { get; set; }
}
public class ScavCase : Productive
{
public string RecipeId { get; set; }
public string? RecipeId { get; set; }
}
public class Product
{
[JsonPropertyName("_id")]
public string Id { get; set; }
public string? Id { get; set; }
[JsonPropertyName("_tpl")]
public string Template { get; set; }
public string? Template { get; set; }
[JsonPropertyName("upd")]
public Upd? Upd { get; set; }
@@ -619,29 +619,29 @@ public class Product
public class BotHideoutArea
{
[JsonPropertyName("type")]
public HideoutAreas Type { get; set; }
public HideoutAreas? Type { get; set; }
[JsonPropertyName("level")]
public double Level { get; set; }
public double? Level { get; set; }
[JsonPropertyName("active")]
public bool Active { get; set; }
public bool? Active { get; set; }
[JsonPropertyName("passiveBonusesEnabled")]
public bool PassiveBonusesEnabled { get; set; }
public bool? PassiveBonusesEnabled { get; set; }
/** Must be integer */
[JsonPropertyName("completeTime")]
public double CompleteTime { get; set; }
public double? CompleteTime { get; set; }
[JsonPropertyName("constructing")]
public bool Constructing { get; set; }
public bool? Constructing { get; set; }
[JsonPropertyName("slots")]
public List<HideoutSlot> Slots { get; set; }
public List<HideoutSlot>? Slots { get; set; }
[JsonPropertyName("lastRecipe")]
public string LastRecipe { get; set; }
public string? LastRecipe { get; set; }
}
public class HideoutSlot
@@ -650,7 +650,7 @@ public class HideoutSlot
/// SPT specific value to keep track of what index this slot is (0,1,2,3 etc)
/// </summary>
[JsonPropertyName("locationIndex")]
public double LocationIndex { get; set; }
public double? LocationIndex { get; set; }
[JsonPropertyName("item")]
public List<HideoutItem>? Items { get; set; }
@@ -659,10 +659,10 @@ public class HideoutSlot
public class HideoutItem
{
[JsonPropertyName("_id")]
public string Id { get; set; }
public string? Id { get; set; }
[JsonPropertyName("_tpl")]
public string Template { get; set; }
public string? Template { get; set; }
[JsonPropertyName("upd")]
public Upd? Upd { get; set; }
@@ -671,13 +671,13 @@ public class HideoutItem
public class LastCompleted
{
[JsonPropertyName("$oid")]
public string OId { get; set; }
public string? OId { get; set; }
}
public class Notes
{
[JsonPropertyName("notes")]
public List<Note> DataNotes { get; set; }
public List<Note>? DataNotes { get; set; }
}
public enum SurvivorClass
@@ -692,13 +692,13 @@ public enum SurvivorClass
public class Quests
{
[JsonPropertyName("qid")]
public string QId { get; set; }
public string? QId { get; set; }
[JsonPropertyName("startTime")]
public long StartTime { get; set; }
public long? StartTime { get; set; }
[JsonPropertyName("status")]
public QuestStatus Status { get; set; }
public QuestStatus? Status { get; set; }
[JsonPropertyName("statusTimers")]
public Dictionary<string, long>? StatusTimers { get; set; }
@@ -717,31 +717,31 @@ public class TraderInfo
public int? LoyaltyLevel { get; set; }
[JsonPropertyName("salesSum")]
public double SalesSum { get; set; }
public double? SalesSum { get; set; }
[JsonPropertyName("standing")]
public double Standing { get; set; }
public double? Standing { get; set; }
[JsonPropertyName("nextResupply")]
public double NextResupply { get; set; }
public double? NextResupply { get; set; }
[JsonPropertyName("unlocked")]
public bool Unlocked { get; set; }
public bool? Unlocked { get; set; }
[JsonPropertyName("disabled")]
public bool Disabled { get; set; }
public bool? Disabled { get; set; }
}
public class RagfairInfo
{
[JsonPropertyName("rating")]
public double Rating { get; set; }
public double? Rating { get; set; }
[JsonPropertyName("isRatingGrowing")]
public bool IsRatingGrowing { get; set; }
public bool? IsRatingGrowing { get; set; }
[JsonPropertyName("offers")]
public List<RagfairOffer> Offers { get; set; }
public List<RagfairOffer>? Offers { get; set; }
}
public class Bonus
@@ -750,7 +750,7 @@ public class Bonus
public string? Id { get; set; }
[JsonPropertyName("type")]
public BonusType Type { get; set; }
public BonusType? Type { get; set; }
[JsonPropertyName("templateId")]
public string? TemplateId { get; set; }
@@ -779,6 +779,6 @@ public class Bonus
public class Note
{
public double Time { get; set; }
public string Text { get; set; }
public double? Time { get; set; }
public string? Text { get; set; }
}
Core/Models/Eft/Common/Tables/BotCore.cs
+106 -106
View File
@@ -80,320 +80,320 @@ public class BotCore
public double? CoverDistanceClose { get; set; }
[JsonPropertyName("GOOD_DIST_TO_POINT")]
public double GoodDistanceToPoint { get; set; }
public double? GoodDistanceToPoint { get; set; }
[JsonPropertyName("COVER_TOOFAR_FROM_BOSS")]
public double CoverTooFarFromBoss { get; set; }
public double? CoverTooFarFromBoss { get; set; }
[JsonPropertyName("COVER_TOOFAR_FROM_BOSS_SQRT")]
public double CoverTooFarFromBossSqrt { get; set; }
public double? CoverTooFarFromBossSqrt { get; set; }
[JsonPropertyName("MAX_Y_DIFF_TO_PROTECT")]
public double MaxYDifferenceToProtect { get; set; }
public double? MaxYDifferenceToProtect { get; set; }
[JsonPropertyName("FLARE_POWER")]
public double FlarePower { get; set; }
public double? FlarePower { get; set; }
[JsonPropertyName("MOVE_COEF")]
public double MoveCoefficient { get; set; }
public double? MoveCoefficient { get; set; }
[JsonPropertyName("PRONE_POSE")]
public double PronePose { get; set; }
public double? PronePose { get; set; }
[JsonPropertyName("LOWER_POSE")]
public double LowerPose { get; set; }
public double? LowerPose { get; set; }
[JsonPropertyName("MAX_POSE")]
public double MaxPose { get; set; }
public double? MaxPose { get; set; }
[JsonPropertyName("FLARE_TIME")]
public double FlareTime { get; set; }
public double? FlareTime { get; set; }
[JsonPropertyName("MAX_REQUESTS__PER_GROUP")]
public double MaxRequestsPerGroup { get; set; }
public double? MaxRequestsPerGroup { get; set; }
[JsonPropertyName("UPDATE_GOAL_TIMER_SEC")]
public double UpdateGoalTimerSeconds { get; set; }
public double? UpdateGoalTimerSeconds { get; set; }
[JsonPropertyName("DIST_NOT_TO_GROUP")]
public double DistanceNotToGroup { get; set; }
public double? DistanceNotToGroup { get; set; }
[JsonPropertyName("DIST_NOT_TO_GROUP_SQR")]
public double DistanceNotToGroupSquared { get; set; }
public double? DistanceNotToGroupSquared { get; set; }
[JsonPropertyName("LAST_SEEN_POS_LIFETIME")]
public double LastSeenPositionLifetime { get; set; }
public double? LastSeenPositionLifetime { get; set; }
[JsonPropertyName("DELTA_GRENADE_START_TIME")]
public double DeltaGrenadeStartTime { get; set; }
public double? DeltaGrenadeStartTime { get; set; }
[JsonPropertyName("DELTA_GRENADE_END_TIME")]
public double DeltaGrenadeEndTime { get; set; }
public double? DeltaGrenadeEndTime { get; set; }
[JsonPropertyName("DELTA_GRENADE_RUN_DIST")]
public double DeltaGrenadeRunDistance { get; set; }
public double? DeltaGrenadeRunDistance { get; set; }
[JsonPropertyName("DELTA_GRENADE_RUN_DIST_SQRT")]
public double DeltaGrenadeRunDistanceSqrt { get; set; }
public double? DeltaGrenadeRunDistanceSqrt { get; set; }
[JsonPropertyName("PATROL_MIN_LIGHT_DIST")]
public double PatrolMinimumLightDistance { get; set; }
public double? PatrolMinimumLightDistance { get; set; }
[JsonPropertyName("HOLD_MIN_LIGHT_DIST")]
public double HoldMinimumLightDistance { get; set; }
public double? HoldMinimumLightDistance { get; set; }
[JsonPropertyName("STANDART_BOT_PAUSE_DOOR")]
public double StandardBotPauseDoor { get; set; }
public double? StandardBotPauseDoor { get; set; }
[JsonPropertyName("ARMOR_CLASS_COEF")]
public double ArmorClassCoefficient { get; set; }
public double? ArmorClassCoefficient { get; set; }
[JsonPropertyName("SHOTGUN_POWER")]
public double ShotgunPower { get; set; }
public double? ShotgunPower { get; set; }
[JsonPropertyName("RIFLE_POWER")]
public double RiflePower { get; set; }
public double? RiflePower { get; set; }
[JsonPropertyName("PISTOL_POWER")]
public double PistolPower { get; set; }
public double? PistolPower { get; set; }
[JsonPropertyName("SMG_POWER")]
public double SMGPower { get; set; }
public double? SMGPower { get; set; }
[JsonPropertyName("SNIPE_POWER")]
public double SniperPower { get; set; }
public double? SniperPower { get; set; }
[JsonPropertyName("GESTUS_PERIOD_SEC")]
public double GestusPeriodSeconds { get; set; }
public double? GestusPeriodSeconds { get; set; }
[JsonPropertyName("GESTUS_AIMING_DELAY")]
public double GestusAimingDelay { get; set; }
public double? GestusAimingDelay { get; set; }
[JsonPropertyName("GESTUS_REQUEST_LIFETIME")]
public double GestusRequestLifetime { get; set; }
public double? GestusRequestLifetime { get; set; }
[JsonPropertyName("GESTUS_FIRST_STAGE_MAX_TIME")]
public double GestusFirstStageMaxTime { get; set; }
public double? GestusFirstStageMaxTime { get; set; }
[JsonPropertyName("GESTUS_SECOND_STAGE_MAX_TIME")]
public double GestusSecondStageMaxTime { get; set; }
public double? GestusSecondStageMaxTime { get; set; }
[JsonPropertyName("GESTUS_MAX_ANSWERS")]
public double GestusMaxAnswers { get; set; }
public double? GestusMaxAnswers { get; set; }
[JsonPropertyName("GESTUS_FUCK_TO_SHOOT")]
public double GestusFuckToShoot { get; set; }
public double? GestusFuckToShoot { get; set; }
[JsonPropertyName("GESTUS_DIST_ANSWERS")]
public double GestusDistanceAnswers { get; set; }
public double? GestusDistanceAnswers { get; set; }
[JsonPropertyName("GESTUS_DIST_ANSWERS_SQRT")]
public double GestusDistanceAnswersSqrt { get; set; }
public double? GestusDistanceAnswersSqrt { get; set; }
[JsonPropertyName("GESTUS_ANYWAY_CHANCE")]
public double GestusAnywayChance { get; set; }
public double? GestusAnywayChance { get; set; }
[JsonPropertyName("TALK_DELAY")]
public double TalkDelay { get; set; }
public double? TalkDelay { get; set; }
[JsonPropertyName("CAN_SHOOT_TO_HEAD")]
public bool CanShootToHead { get; set; }
public bool? CanShootToHead { get; set; }
[JsonPropertyName("CAN_TILT")]
public bool CanTilt { get; set; }
public bool? CanTilt { get; set; }
[JsonPropertyName("TILT_CHANCE")]
public double TiltChance { get; set; }
public double? TiltChance { get; set; }
[JsonPropertyName("MIN_BLOCK_DIST")]
public double MinimumBlockDistance { get; set; }
public double? MinimumBlockDistance { get; set; }
[JsonPropertyName("MIN_BLOCK_TIME")]
public double MinimumBlockTime { get; set; }
public double? MinimumBlockTime { get; set; }
[JsonPropertyName("COVER_SECONDS_AFTER_LOSE_VISION")]
public double CoverSecondsAfterLoseVision { get; set; }
public double? CoverSecondsAfterLoseVision { get; set; }
[JsonPropertyName("MIN_ARG_COEF")]
public double MinimumArgumentCoefficient { get; set; }
public double? MinimumArgumentCoefficient { get; set; }
[JsonPropertyName("MAX_ARG_COEF")]
public double MaximumArgumentCoefficient { get; set; }
public double? MaximumArgumentCoefficient { get; set; }
[JsonPropertyName("DEAD_AGR_DIST")]
public double DeadAgrDistance { get; set; }
public double? DeadAgrDistance { get; set; }
[JsonPropertyName("MAX_DANGER_CARE_DIST_SQRT")]
public double MaxDangerCareDistanceSqrt { get; set; }
public double? MaxDangerCareDistanceSqrt { get; set; }
[JsonPropertyName("MAX_DANGER_CARE_DIST")]
public double MaxDangerCareDistance { get; set; }
public double? MaxDangerCareDistance { get; set; }
[JsonPropertyName("MIN_MAX_PERSON_SEARCH")]
public double MinimumMaximumPersonSearch { get; set; }
public double? MinimumMaximumPersonSearch { get; set; }
[JsonPropertyName("PERCENT_PERSON_SEARCH")]
public double PercentPersonSearch { get; set; }
public double? PercentPersonSearch { get; set; }
[JsonPropertyName("LOOK_ANYSIDE_BY_WALL_SEC_OF_ENEMY")]
public double LookAnySideByWallSecondsOfEnemy { get; set; }
public double? LookAnySideByWallSecondsOfEnemy { get; set; }
[JsonPropertyName("CLOSE_TO_WALL_ROTATE_BY_WALL_SQRT")]
public double CloseToWallRotateByWallSqrt { get; set; }
public double? CloseToWallRotateByWallSqrt { get; set; }
[JsonPropertyName("SHOOT_TO_CHANGE_RND_PART_MIN")]
public double ShootToChangeRandomPartMinimum { get; set; }
public double? ShootToChangeRandomPartMinimum { get; set; }
[JsonPropertyName("SHOOT_TO_CHANGE_RND_PART_MAX")]
public double ShootToChangeRandomPartMaximum { get; set; }
public double? ShootToChangeRandomPartMaximum { get; set; }
[JsonPropertyName("SHOOT_TO_CHANGE_RND_PART_DELTA")]
public double ShootToChangeRandomPartDelta { get; set; }
public double? ShootToChangeRandomPartDelta { get; set; }
[JsonPropertyName("FORMUL_COEF_DELTA_DIST")]
public double FormulaCoefficientDeltaDistance { get; set; }
public double? FormulaCoefficientDeltaDistance { get; set; }
[JsonPropertyName("FORMUL_COEF_DELTA_SHOOT")]
public double FormulaCoefficientDeltaShoot { get; set; }
public double? FormulaCoefficientDeltaShoot { get; set; }
[JsonPropertyName("FORMUL_COEF_DELTA_FRIEND_COVER")]
public double FormulaCoefficientDeltaFriendCover { get; set; }
public double? FormulaCoefficientDeltaFriendCover { get; set; }
[JsonPropertyName("SUSPETION_POINT_DIST_CHECK")]
public double SuspicionPointDistanceCheck { get; set; }
public double? SuspicionPointDistanceCheck { get; set; }
[JsonPropertyName("MAX_BASE_REQUESTS_PER_PLAYER")]
public double MaxBaseRequestsPerPlayer { get; set; }
public double? MaxBaseRequestsPerPlayer { get; set; }
[JsonPropertyName("MAX_HOLD_REQUESTS_PER_PLAYER")]
public double MaxHoldRequestsPerPlayer { get; set; }
public double? MaxHoldRequestsPerPlayer { get; set; }
[JsonPropertyName("MAX_GO_TO_REQUESTS_PER_PLAYER")]
public double MaxGoToRequestsPerPlayer { get; set; }
public double? MaxGoToRequestsPerPlayer { get; set; }
[JsonPropertyName("MAX_COME_WITH_ME_REQUESTS_PER_PLAYER")]
public double MaxComeWithMeRequestsPerPlayer { get; set; }
public double? MaxComeWithMeRequestsPerPlayer { get; set; }
[JsonPropertyName("CORE_POINT_MAX_VALUE")]
public double CorePointMaxValue { get; set; }
public double? CorePointMaxValue { get; set; }
[JsonPropertyName("CORE_POINTS_MAX")]
public double CorePointsMax { get; set; }
public double? CorePointsMax { get; set; }
[JsonPropertyName("CORE_POINTS_MIN")]
public double CorePointsMin { get; set; }
public double? CorePointsMin { get; set; }
[JsonPropertyName("BORN_POISTS_FREE_ONLY_FAREST_BOT")]
public bool BornPointsFreeOnlyFarthestBot { get; set; }
public bool? BornPointsFreeOnlyFarthestBot { get; set; }
[JsonPropertyName("BORN_POINSTS_FREE_ONLY_FAREST_PLAYER")]
public bool BornPointsFreeOnlyFarthestPlayer { get; set; }
public bool? BornPointsFreeOnlyFarthestPlayer { get; set; }
[JsonPropertyName("SCAV_GROUPS_TOGETHER")]
public bool ScavGroupsTogether { get; set; }
public bool? ScavGroupsTogether { get; set; }
[JsonPropertyName("LAY_DOWN_ANG_SHOOT")]
public double LayDownAngleShoot { get; set; }
public double? LayDownAngleShoot { get; set; }
[JsonPropertyName("HOLD_REQUEST_TIME_SEC")]
public double HoldRequestTimeSeconds { get; set; }
public double? HoldRequestTimeSeconds { get; set; }
[JsonPropertyName("TRIGGERS_DOWN_TO_RUN_WHEN_MOVE")]
public double TriggersDownToRunWhenMove { get; set; }
public double? TriggersDownToRunWhenMove { get; set; }
[JsonPropertyName("MIN_DIST_TO_RUN_WHILE_ATTACK_MOVING")]
public double MinimumDistanceToRunWhileAttackingMoving { get; set; }
public double? MinimumDistanceToRunWhileAttackingMoving { get; set; }
[JsonPropertyName("MIN_DIST_TO_RUN_WHILE_ATTACK_MOVING_OTHER_ENEMIS")]
public double MinimumDistanceToRunWhileAttackingMovingOtherEnemies { get; set; }
public double? MinimumDistanceToRunWhileAttackingMovingOtherEnemies { get; set; }
[JsonPropertyName("MIN_DIST_TO_STOP_RUN")]
public double MinimumDistanceToStopRunning { get; set; }
public double? MinimumDistanceToStopRunning { get; set; }
[JsonPropertyName("JUMP_SPREAD_DIST")]
public double JumpSpreadDistance { get; set; }
public double? JumpSpreadDistance { get; set; }
[JsonPropertyName("LOOK_TIMES_TO_KILL")]
public double LookTimesToKill { get; set; }
public double? LookTimesToKill { get; set; }
[JsonPropertyName("COME_INSIDE_TIMES")]
public double ComeInsideTimes { get; set; }
public double? ComeInsideTimes { get; set; }
[JsonPropertyName("TOTAL_TIME_KILL")]
public double TotalTimeKill { get; set; }
public double? TotalTimeKill { get; set; }
[JsonPropertyName("TOTAL_TIME_KILL_AFTER_WARN")]
public double TotalTimeKillAfterWarning { get; set; }
public double? TotalTimeKillAfterWarning { get; set; }
[JsonPropertyName("MOVING_AIM_COEF")]
public double MovingAimCoefficient { get; set; }
public double? MovingAimCoefficient { get; set; }
[JsonPropertyName("VERTICAL_DIST_TO_IGNORE_SOUND")]
public double VerticalDistanceToIgnoreSound { get; set; }
public double? VerticalDistanceToIgnoreSound { get; set; }
[JsonPropertyName("DEFENCE_LEVEL_SHIFT")]
public double DefenseLevelShift { get; set; }
public double? DefenseLevelShift { get; set; }
[JsonPropertyName("MIN_DIST_CLOSE_DEF")]
public double MinimumDistanceCloseDefense { get; set; }
public double? MinimumDistanceCloseDefense { get; set; }
[JsonPropertyName("USE_ID_PRIOR_WHO_GO")]
public bool UseIdPriorWhoGoes { get; set; }
public bool? UseIdPriorWhoGoes { get; set; }
[JsonPropertyName("SMOKE_GRENADE_RADIUS_COEF")]
public double SmokeGrenadeRadiusCoefficient { get; set; }
public double? SmokeGrenadeRadiusCoefficient { get; set; }
[JsonPropertyName("GRENADE_PRECISION")]
public double GrenadePrecision { get; set; }
public double? GrenadePrecision { get; set; }
[JsonPropertyName("MAX_WARNS_BEFORE_KILL")]
public double MaxWarningsBeforeKill { get; set; }
public double? MaxWarningsBeforeKill { get; set; }
[JsonPropertyName("CARE_ENEMY_ONLY_TIME")]
public double CareEnemyOnlyTime { get; set; }
public double? CareEnemyOnlyTime { get; set; }
[JsonPropertyName("MIDDLE_POINT_COEF")]
public double MiddlePointCoefficient { get; set; }
public double? MiddlePointCoefficient { get; set; }
[JsonPropertyName("MAIN_TACTIC_ONLY_ATTACK")]
public bool MainTacticOnlyAttack { get; set; }
public bool? MainTacticOnlyAttack { get; set; }
[JsonPropertyName("LAST_DAMAGE_ACTIVE")]
public double LastDamageActive { get; set; }
public double? LastDamageActive { get; set; }
[JsonPropertyName("SHALL_DIE_IF_NOT_INITED")]
public bool ShallDieIfNotInitialized { get; set; }
public bool? ShallDieIfNotInitialized { get; set; }
[JsonPropertyName("CHECK_BOT_INIT_TIME_SEC")]
public double CheckBotInitializationTimeSeconds { get; set; }
public double? CheckBotInitializationTimeSeconds { get; set; }
[JsonPropertyName("WEAPON_ROOT_Y_OFFSET")]
public double WeaponRootYOffset { get; set; }
public double? WeaponRootYOffset { get; set; }
[JsonPropertyName("DELTA_SUPRESS_DISTANCE_SQRT")]
public double DeltaSuppressDistanceSqrt { get; set; }
public double? DeltaSuppressDistanceSqrt { get; set; }
[JsonPropertyName("DELTA_SUPRESS_DISTANCE")]
public double DeltaSuppressDistance { get; set; }
public double? DeltaSuppressDistance { get; set; }
[JsonPropertyName("WAVE_COEF_LOW")]
public double WaveCoefficientLow { get; set; }
public double? WaveCoefficientLow { get; set; }
[JsonPropertyName("WAVE_COEF_MID")]
public double WaveCoefficientMid { get; set; }
public double? WaveCoefficientMid { get; set; }
[JsonPropertyName("WAVE_COEF_HIGH")]
public double WaveCoefficientHigh { get; set; }
public double? WaveCoefficientHigh { get; set; }
[JsonPropertyName("WAVE_COEF_HORDE")]
public double WaveCoefficientHorde { get; set; }
public double? WaveCoefficientHorde { get; set; }
[JsonPropertyName("WAVE_ONLY_AS_ONLINE")]
public bool WaveOnlyAsOnline { get; set; }
public bool? WaveOnlyAsOnline { get; set; }
[JsonPropertyName("LOCAL_BOTS_COUNT")]
public double LocalBotsCount { get; set; }
public double? LocalBotsCount { get; set; }
[JsonPropertyName("AXE_MAN_KILLS_END")]
public double AxeManKillsEnd { get; set; }
public double? AxeManKillsEnd { get; set; }
}
Core/Models/Eft/Common/Tables/BotType.cs
+52 -52
View File
@@ -125,160 +125,160 @@ public class EquipmentChances
public class ModsChances
{
[JsonPropertyName("mod_charge")]
public double ModCharge { get; set; }
public double? ModCharge { get; set; }
[JsonPropertyName("mod_bipod")]
public double ModBipod { get; set; }
public double? ModBipod { get; set; }
[JsonPropertyName("mod_barrel")]
public double ModBarrel { get; set; }
public double? ModBarrel { get; set; }
[JsonPropertyName("mod_catch")]
public double ModCatch { get; set; }
public double? ModCatch { get; set; }
[JsonPropertyName("mod_gas_block")]
public double ModGasBlock { get; set; }
public double? ModGasBlock { get; set; }
[JsonPropertyName("mod_hammer")]
public double ModHammer { get; set; }
public double? ModHammer { get; set; }
[JsonPropertyName("mod_equipment")]
public double ModEquipment { get; set; }
public double? ModEquipment { get; set; }
[JsonPropertyName("mod_equipment_000")]
public double ModEquipment000 { get; set; }
public double? ModEquipment000 { get; set; }
[JsonPropertyName("mod_equipment_001")]
public double ModEquipment001 { get; set; }
public double? ModEquipment001 { get; set; }
[JsonPropertyName("mod_equipment_002")]
public double ModEquipment002 { get; set; }
public double? ModEquipment002 { get; set; }
[JsonPropertyName("mod_flashlight")]
public double ModFlashlight { get; set; }
public double? ModFlashlight { get; set; }
[JsonPropertyName("mod_foregrip")]
public double ModForegrip { get; set; }
public double? ModForegrip { get; set; }
[JsonPropertyName("mod_launcher")]
public double ModLauncher { get; set; }
public double? ModLauncher { get; set; }
[JsonPropertyName("mod_magazine")]
public double ModMagazine { get; set; }
public double? ModMagazine { get; set; }
[JsonPropertyName("mod_mount")]
public double ModMount { get; set; }
public double? ModMount { get; set; }
[JsonPropertyName("mod_mount_000")]
public double ModMount000 { get; set; }
public double? ModMount000 { get; set; }
[JsonPropertyName("mod_mount_001")]
public double ModMount001 { get; set; }
public double? ModMount001 { get; set; }
[JsonPropertyName("mod_muzzle")]
public double ModMuzzle { get; set; }
public double? ModMuzzle { get; set; }
[JsonPropertyName("mod_nvg")]
public double ModNvg { get; set; }
public double? ModNvg { get; set; }
[JsonPropertyName("mod_pistol_grip")]
public double ModPistolGrip { get; set; }
public double? ModPistolGrip { get; set; }
[JsonPropertyName("mod_reciever")]
public double ModReceiver { get; set; }
public double? ModReceiver { get; set; }
[JsonPropertyName("mod_scope")]
public double ModScope { get; set; }
public double? ModScope { get; set; }
[JsonPropertyName("mod_scope_000")]
public double ModScope000 { get; set; }
public double? ModScope000 { get; set; }
[JsonPropertyName("mod_scope_001")]
public double ModScope001 { get; set; }
public double? ModScope001 { get; set; }
[JsonPropertyName("mod_scope_002")]
public double ModScope002 { get; set; }
public double? ModScope002 { get; set; }
[JsonPropertyName("mod_scope_003")]
public double ModScope003 { get; set; }
public double? ModScope003 { get; set; }
[JsonPropertyName("mod_sight_front")]
public double ModSightFront { get; set; }
public double? ModSightFront { get; set; }
[JsonPropertyName("mod_sight_rear")]
public double ModSightRear { get; set; }
public double? ModSightRear { get; set; }
[JsonPropertyName("mod_stock")]
public double ModStock { get; set; }
public double? ModStock { get; set; }
[JsonPropertyName("mod_stock_000")]
public double ModStock000 { get; set; }
public double? ModStock000 { get; set; }
[JsonPropertyName("mod_stock_002")]
public double ModStock002 { get; set; }
public double? ModStock002 { get; set; }
[JsonPropertyName("mod_stock_akms")]
public double ModStockAkms { get; set; }
public double? ModStockAkms { get; set; }
[JsonPropertyName("mod_tactical")]
public double ModTactical { get; set; }
public double? ModTactical { get; set; }
[JsonPropertyName("mod_tactical_000")]
public double ModTactical000 { get; set; }
public double? ModTactical000 { get; set; }
[JsonPropertyName("mod_tactical_001")]
public double ModTactical001 { get; set; }
public double? ModTactical001 { get; set; }
[JsonPropertyName("mod_tactical_002")]
public double ModTactical002 { get; set; }
public double? ModTactical002 { get; set; }
[JsonPropertyName("mod_tactical_2")]
public double ModTactical2 { get; set; }
public double? ModTactical2 { get; set; }
[JsonPropertyName("mod_tactical_003")]
public double ModTactical003 { get; set; }
public double? ModTactical003 { get; set; }
[JsonPropertyName("mod_handguard")]
public double ModHandguard { get; set; }
public double? ModHandguard { get; set; }
[JsonPropertyName("back_plate")]
public double BackPlate { get; set; }
public double? BackPlate { get; set; }
[JsonPropertyName("front_plate")]
public double FrontPlate { get; set; }
public double? FrontPlate { get; set; }
[JsonPropertyName("left_side_plate")]
public double LeftSidePlate { get; set; }
public double? LeftSidePlate { get; set; }
[JsonPropertyName("right_side_plate")]
public double RightSidePlate { get; set; }
public double? RightSidePlate { get; set; }
[JsonPropertyName("mod_mount_002")]
public double ModMount002 { get; set; }
public double? ModMount002 { get; set; }
[JsonPropertyName("mod_mount_003")]
public double ModMount003 { get; set; }
public double? ModMount003 { get; set; }
[JsonPropertyName("mod_mount_004")]
public double ModMount004 { get; set; }
public double? ModMount004 { get; set; }
[JsonPropertyName("mod_mount_005")]
public double ModMount005 { get; set; }
public double? ModMount005 { get; set; }
[JsonPropertyName("mod_mount_006")]
public double ModMount006 { get; set; }
public double? ModMount006 { get; set; }
[JsonPropertyName("mod_muzzle_000")]
public double ModMuzzle000 { get; set; }
public double? ModMuzzle000 { get; set; }
[JsonPropertyName("mod_muzzle_001")]
public double ModMuzzle001 { get; set; }
public double? ModMuzzle001 { get; set; }
[JsonPropertyName("mod_pistol_grip_akms")]
public double ModPistolGripAkms { get; set; }
public double? ModPistolGripAkms { get; set; }
[JsonPropertyName("mod_pistolgrip")]
public double ModPistol_Grip { get; set; }
public double? ModPistol_Grip { get; set; }
}
*/
Core/Models/Eft/Common/Tables/TemplateItem.cs
+17 -17
View File
@@ -224,10 +224,10 @@ public class Props
public bool? DogTagQualities { get; set; }
[JsonPropertyName("Grids")]
public List<Grid> Grids { get; set; }
public List<Grid>? Grids { get; set; }
[JsonPropertyName("Slots")]
public List<Slot> Slots { get; set; }
public List<Slot>? Slots { get; set; }
[JsonPropertyName("CanPutIntoDuringTheRaid")]
public bool? CanPutIntoDuringTheRaid { get; set; }
@@ -620,7 +620,7 @@ public class Props
public int? RecoilCategoryMultiplierHandRotation { get; set; }
[JsonPropertyName("weapFireType")]
public List<string> WeapFireType { get; set; }
public List<string>? WeapFireType { get; set; }
[JsonPropertyName("recolDispersion")]
public int? RecolDispersion { get; set; }
@@ -698,7 +698,7 @@ public class Props
public XYZ? RotationCenterNoStock { get; set; }
[JsonPropertyName("shotsGroupSettings")]
public List<ShotsGroupSettings> ShotsGroupSettings { get; set; }
public List<ShotsGroupSettings>? ShotsGroupSettings { get; set; }
[JsonPropertyName("foldedSlot")]
public string? FoldedSlot { get; set; }
@@ -1178,7 +1178,7 @@ public class Props
public int? FragmentsCount { get; set; }
[JsonPropertyName("fragmentType")]
public string FragmentType { get; set; }
public string? FragmentType { get; set; }
[JsonPropertyName("showHitEffectOnExplode")]
public bool? ShowHitEffectOnExplode { get; set; }
@@ -1190,7 +1190,7 @@ public class Props
public int? AmmoLifeTimeSec { get; set; }
[JsonPropertyName("ammoTooltipClass")]
public string AmmoTooltipClass { get; set; }
public string? AmmoTooltipClass { get; set; }
[JsonPropertyName("contusion")]
public XYZ? Contusion { get; set; }
@@ -1319,46 +1319,46 @@ public class Props
public class WeaponRecoilSettings
{
[JsonPropertyName("Enable")]
public bool Enable { get; set; }
public bool? Enable { get; set; }
[JsonPropertyName("values")]
public List<WeaponRecoilSettingValues> Values { get; set; }
public List<WeaponRecoilSettingValues>? Values { get; set; }
}
public class WeaponRecoilSettingValues
{
[JsonPropertyName("Enable")]
public bool Enable { get; set; }
public bool? Enable { get; set; }
[JsonPropertyName("Process")]
public WeaponRecoilProcess Process { get; set; }
public WeaponRecoilProcess? Process { get; set; }
[JsonPropertyName("Target")]
public string Target { get; set; }
public string? Target { get; set; }
}
public class WeaponRecoilProcess
{
[JsonPropertyName("ComponentType")]
public string ComponentType { get; set; }
public string? ComponentType { get; set; }
[JsonPropertyName("CurveAimingValueMultiply")]
public double CurveAimingValueMultiply { get; set; }
public double? CurveAimingValueMultiply { get; set; }
[JsonPropertyName("CurveTimeMultiply")]
public double CurveTimeMultiply { get; set; }
public double? CurveTimeMultiply { get; set; }
[JsonPropertyName("CurveValueMultiply")]
public double CurveValueMultiply { get; set; }
public double? CurveValueMultiply { get; set; }
[JsonPropertyName("TransformationCurve")]
public WeaponRecoilTransformationCurve TransformationCurve { get; set; }
public WeaponRecoilTransformationCurve? TransformationCurve { get; set; }
}
public class WeaponRecoilTransformationCurve
{
[JsonPropertyName("Keys")]
public List<WeaponRecoilTransformationCurveKey> Keys { get; set; }
public List<WeaponRecoilTransformationCurveKey>? Keys { get; set; }
}
public class WeaponRecoilTransformationCurveKey
Core/Models/Eft/Customization/BuyClothingRequestData.cs
+1 -1
View File
@@ -5,7 +5,7 @@ namespace Core.Models.Eft.Customization;
public class BuyClothingRequestData
{
[JsonPropertyName("Action")]
public string Action { get; set; } = "CustomizationBuy";
public string? Action { get; set; } = "CustomizationBuy";
[JsonPropertyName("offer")]
public string? Offer { get; set; }
Core/Models/Eft/Customization/CustomizationSetRequest.cs
+1 -1
View File
@@ -5,7 +5,7 @@ namespace Core.Models.Eft.Customization;
public class CustomizationSetRequest
{
[JsonPropertyName("Action")]
public string Action { get; set; } = "CustomizationSet";
public string? Action { get; set; } = "CustomizationSet";
[JsonPropertyName("customizations")]
public List<CustomizationSetOption>? Customizations { get; set; }
Core/Models/Eft/Dialog/GetAllAttachmentsResponse.cs
+1 -1
View File
@@ -9,7 +9,7 @@ public class GetAllAttachmentsResponse
public List<Message>? Messages { get; set; }
[JsonPropertyName("profiles")]
public List<object> Profiles { get; set; } // Assuming 'any' translates to 'object'
public List<object>? Profiles { get; set; } // Assuming 'any' translates to 'object'
[JsonPropertyName("hasMessagesWithRewards")]
public bool? HasMessagesWithRewards { get; set; }
Core/Models/Eft/Dialog/GetMailDialogViewRequestData.cs
+1 -1
View File
@@ -15,5 +15,5 @@ public class GetMailDialogViewRequestData
public int? Limit { get; set; }
[JsonPropertyName("time")]
public decimal Time { get; set; } // decimal
public decimal? Time { get; set; } // decimal
}
Core/Models/Eft/Repair/BaseRepairActionDataRequest.cs
+1 -1
View File
@@ -5,5 +5,5 @@ namespace Core.Models.Eft.Repair;
public class BaseRepairActionDataRequest
{
[JsonPropertyName("Action")]
public string Action { get; set; }
public string? Action { get; set; }
}
Core/Models/Eft/Repair/RepairActionDataRequest.cs
+5 -5
View File
@@ -5,20 +5,20 @@ namespace Core.Models.Eft.Repair;
public class RepairActionDataRequest : BaseRepairActionDataRequest
{
[JsonPropertyName("Action")]
public string Action { get; set; } = "Repair";
public string? Action { get; set; } = "Repair";
[JsonPropertyName("repairKitsInfo")]
public List<RepairKitsInfo> RepairKitsInfo { get; set; }
public List<RepairKitsInfo>? RepairKitsInfo { get; set; }
[JsonPropertyName("target")]
public string Target { get; set; } // item to repair
public string? Target { get; set; } // item to repair
}
public class RepairKitsInfo
{
[JsonPropertyName("_id")]
public string Id { get; set; } // id of repair kit to use
public string? Id { get; set; } // id of repair kit to use
[JsonPropertyName("count")]
public int Count { get; set; } // amount of units to reduce kit by
public int? Count { get; set; } // amount of units to reduce kit by
}
Core/Models/Eft/Repair/TraderRepairActionDataRequest.cs
+5 -5
View File
@@ -5,20 +5,20 @@ namespace Core.Models.Eft.Repair;
public class TraderRepairActionDataRequest : BaseRepairActionDataRequest
{
[JsonPropertyName("Action")]
public string Action { get; set; } = "TraderRepair";
public string? Action { get; set; } = "TraderRepair";
[JsonPropertyName("tid")]
public string TId { get; set; }
public string? TId { get; set; }
[JsonPropertyName("repairItems")]
public List<RepairItem> RepairItems { get; set; }
public List<RepairItem>? RepairItems { get; set; }
}
public class RepairItem
{
[JsonPropertyName("_id")]
public string Id { get; set; }
public string? Id { get; set; }
[JsonPropertyName("count")]
public int Count { get; set; }
public int? Count { get; set; }
}
Core/Models/Eft/Trade/ProcessBaseTradeRequestData.cs
+3 -3
View File
@@ -5,11 +5,11 @@ namespace Core.Models.Eft.Trade;
public class ProcessBaseTradeRequestData
{
[JsonPropertyName("Action")]
public string Action { get; set; }
public string? Action { get; set; }
[JsonPropertyName("type")]
public string Type { get; set; }
public string? Type { get; set; }
[JsonPropertyName("tid")]
public string TransactionId { get; set; }
public string? TransactionId { get; set; }
}
Core/Models/Eft/Trade/ProcessBuyTradeRequestData.cs
+9 -9
View File
@@ -5,33 +5,33 @@ namespace Core.Models.Eft.Trade;
public class ProcessBuyTradeRequestData : ProcessBaseTradeRequestData
{
[JsonPropertyName("Action")]
public string Action { get; set; } // TODO: formerly - "buy_from_trader" | "TradingConfirm" | "RestoreHealth" | "SptInsure" | "SptRepair" | ""
public string? Action { get; set; } // TODO: formerly - "buy_from_trader" | "TradingConfirm" | "RestoreHealth" | "SptInsure" | "SptRepair" | ""
[JsonPropertyName("type")]
public string Type { get; set; }
public string? Type { get; set; }
[JsonPropertyName("tid")]
public string TId { get; set; }
public string? TId { get; set; }
[JsonPropertyName("item_id")]
public string ItemId { get; set; }
public string? ItemId { get; set; }
[JsonPropertyName("count")]
public int Count { get; set; }
public int? Count { get; set; }
[JsonPropertyName("scheme_id")]
public int SchemeId { get; set; }
public int? SchemeId { get; set; }
[JsonPropertyName("scheme_items")]
public List<SchemeItem> SchemeItems { get; set; }
public List<SchemeItem>? SchemeItems { get; set; }
}
public class SchemeItem
{
/** Id of stack to take money from, is money tpl when Action is `SptInsure` */
[JsonPropertyName("id")]
public string Id { get; set; }
public string? Id { get; set; }
[JsonPropertyName("count")]
public int Count { get; set; }
public int? Count { get; set; }
}
Core/Models/Eft/Trade/ProcessRagfairTradeRequestData.cs
+7 -7
View File
@@ -5,29 +5,29 @@ namespace Core.Models.Eft.Trade;
public class ProcessRagfairTradeRequestData
{
[JsonPropertyName("Action")]
public string Action { get; set; }
public string? Action { get; set; }
[JsonPropertyName("offers")]
public List<OfferRequest> Offers { get; set; }
public List<OfferRequest>? Offers { get; set; }
}
public class OfferRequest
{
[JsonPropertyName("id")]
public string Id { get; set; }
public string? Id { get; set; }
[JsonPropertyName("count")]
public int Count { get; set; }
public int? Count { get; set; }
[JsonPropertyName("items")]
public List<ItemRequest> Items { get; set; }
public List<ItemRequest>? Items { get; set; }
}
public class ItemRequest
{
[JsonPropertyName("id")]
public string Id { get; set; }
public string? Id { get; set; }
[JsonPropertyName("count")]
public int Count { get; set; }
public int? Count { get; set; }
}
Core/Models/Eft/Trade/ProcessSellTradeRequestData.cs
+8 -8
View File
@@ -5,29 +5,29 @@ namespace Core.Models.Eft.Trade;
public class ProcessSellTradeRequestData : ProcessBaseTradeRequestData
{
[JsonPropertyName("Action")]
public string Action { get; set; } = "sell_to_trader";
public string? Action { get; set; } = "sell_to_trader";
[JsonPropertyName("type")]
public string Type { get; set; }
public string? Type { get; set; }
[JsonPropertyName("tid")]
public string Tid { get; set; }
public string? Tid { get; set; }
[JsonPropertyName("price")]
public double Price { get; set; }
public double? Price { get; set; }
[JsonPropertyName("items")]
public List<SoldItem> Items { get; set; }
public List<SoldItem>? Items { get; set; }
}
public class SoldItem
{
[JsonPropertyName("id")]
public string Id { get; set; }
public string? Id { get; set; }
[JsonPropertyName("count")]
public int Count { get; set; }
public int? Count { get; set; }
[JsonPropertyName("scheme_id")]
public int SchemeId { get; set; }
public int? SchemeId { get; set; }
}
Core/Models/Eft/Trade/SellScavItemsToFenceRequestData.cs
+4 -4
View File
@@ -6,14 +6,14 @@ namespace Core.Models.Eft.Trade;
public class SellScavItemsToFenceRequestData
{
[JsonPropertyName("Action")]
public string Action { get; set; } = "SellAllFromSavage";
public string? Action { get; set; } = "SellAllFromSavage";
[JsonPropertyName("totalValue")]
public double TotalValue { get; set; }
public double? TotalValue { get; set; }
[JsonPropertyName("fromOwner")]
public OwnerInfo FromOwner { get; set; }
public OwnerInfo? FromOwner { get; set; }
[JsonPropertyName("toOwner")]
public OwnerInfo ToOwner { get; set; }
public OwnerInfo? ToOwner { get; set; }
}
Core/Models/Eft/Weather/WeatherData.cs
+18 -18
View File
@@ -6,61 +6,61 @@ namespace Core.Models.Eft.Weather;
public class WeatherData
{
[JsonPropertyName("acceleration")]
public double Acceleration { get; set; }
public double? Acceleration { get; set; }
[JsonPropertyName("time")]
public string Time { get; set; }
public string? Time { get; set; }
[JsonPropertyName("date")]
public string Date { get; set; }
public string? Date { get; set; }
[JsonPropertyName("weather")]
public Weather Weather { get; set; }
public Weather? Weather { get; set; }
[JsonPropertyName("season")]
public Season Season { get; set; }
public Season? Season { get; set; }
}
public class Weather
{
[JsonPropertyName("pressure")]
public double Pressure { get; set; }
public double? Pressure { get; set; }
[JsonPropertyName("temp")]
public double Temperature { get; set; }
public double? Temperature { get; set; }
[JsonPropertyName("fog")]
public double Fog { get; set; }
public double? Fog { get; set; }
[JsonPropertyName("rain_intensity")]
public double RainIntensity { get; set; }
public double? RainIntensity { get; set; }
/** 1 - 3 light rain, 3+ 'rain' */
[JsonPropertyName("rain")]
public double Rain { get; set; }
public double? Rain { get; set; }
[JsonPropertyName("wind_gustiness")]
public double WindGustiness { get; set; }
public double? WindGustiness { get; set; }
[JsonPropertyName("wind_direction")]
public WindDirection WindDirection { get; set; }
public WindDirection? WindDirection { get; set; }
[JsonPropertyName("wind_speed")]
public double WindSpeed { get; set; }
public double? WindSpeed { get; set; }
/** < -0.4 = clear day */
[JsonPropertyName("cloud")]
public double Cloud { get; set; }
public double? Cloud { get; set; }
[JsonPropertyName("time")]
public string Time { get; set; }
public string? Time { get; set; }
[JsonPropertyName("date")]
public string Date { get; set; }
public string? Date { get; set; }
[JsonPropertyName("timestamp")]
public long Timestamp { get; set; }
public long? Timestamp { get; set; }
[JsonPropertyName("sptInRaidTimestamp")]
public long SptInRaidTimestamp { get; set; }
public long? SptInRaidTimestamp { get; set; }
}
Core/Models/Eft/Wishlist/AddToWishlistRequest.cs
+2 -2
View File
@@ -5,8 +5,8 @@ namespace Core.Models.Eft.Wishlist;
public class AddToWishlistRequest
{
[JsonPropertyName("Action")]
public string Action { get; set; }
public string? Action { get; set; }
[JsonPropertyName("items")]
public Dictionary<string, int> Items { get; set; }
public Dictionary<string, int>? Items { get; set; }
}
Core/Models/Eft/Wishlist/ChangeWishlistItemCategoryRequest.cs
+3 -3
View File
@@ -5,11 +5,11 @@ namespace Core.Models.Eft.Wishlist;
public class ChangeWishlistItemCategoryRequest
{
[JsonPropertyName("Action")]
public string Action { get; set; }
public string? Action { get; set; }
[JsonPropertyName("item")]
public string Item { get; set; }
public string? Item { get; set; }
[JsonPropertyName("category")]
public int Category { get; set; }
public int? Category { get; set; }
}
Core/Models/Eft/Wishlist/RemoveFromWishlistRequest.cs
+2 -2
View File
@@ -5,8 +5,8 @@ namespace Core.Models.Eft.Wishlist;
public class RemoveFromWishlistRequest
{
[JsonPropertyName("Action")]
public string Action { get; set; }
public string? Action { get; set; }
[JsonPropertyName("items")]
public List<string> Items { get; set; }
public List<string>? Items { get; set; }
}
Core/Models/Eft/Ws/WsGroupMatchInviteAccept.cs
+4 -4
View File
@@ -7,19 +7,19 @@ public class WsGroupMatchInviteAccept : WsNotificationEvent // TODO: trying to i
{
// Copy pasted properties from GroupCharacter to resolve multitype
[JsonPropertyName("_id")]
public string Id { get; set; }
public string? Id { get; set; }
[JsonPropertyName("aid")]
public int Aid { get; set; }
public int? Aid { get; set; }
[JsonPropertyName("Info")]
public CharacterInfo Info { get; set; }
public CharacterInfo? Info { get; set; }
[JsonPropertyName("PlayerVisualRepresentation")]
public PlayerVisualRepresentation? VisualRepresentation { get; set; }
[JsonPropertyName("isLeader")]
public bool IsLeader { get; set; }
public bool? IsLeader { get; set; }
[JsonPropertyName("isReady")]
public bool? IsReady { get; set; }
Core/Models/Eft/Ws/WsGroupMatchInviteDecline.cs
+2 -2
View File
@@ -5,8 +5,8 @@ namespace Core.Models.Eft.Ws;
public class WsGroupMatchInviteDecline : WsNotificationEvent
{
[JsonPropertyName("aid")]
public int Aid { get; set; }
public int? Aid { get; set; }
[JsonPropertyName("Nickname")]
public string Nickname { get; set; }
public string? Nickname { get; set; }
}
Core/Models/Eft/Ws/WsGroupMatchInviteSend.cs
+3 -3
View File
@@ -6,11 +6,11 @@ namespace Core.Models.Eft.Ws;
public class WsGroupMatchInviteSend : WsNotificationEvent
{
[JsonPropertyName("requestId")]
public string RequestId { get; set; }
public string? RequestId { get; set; }
[JsonPropertyName("from")]
public int From { get; set; }
public int? From { get; set; }
[JsonPropertyName("members")]
public List<GroupCharacter> Members { get; set; }
public List<GroupCharacter>? Members { get; set; }
}
Core/Models/Eft/Ws/WsGroupMatchLeaderChanged.cs
+1 -1
View File
@@ -5,5 +5,5 @@ namespace Core.Models.Eft.Ws;
public class WsGroupMatchLeaderChanged : WsNotificationEvent
{
[JsonPropertyName("owner")]
public int Owner { get; set; }
public int? Owner { get; set; }
}
Core/Models/Eft/Ws/WsGroupMatchRaidReady.cs
+1 -1
View File
@@ -6,5 +6,5 @@ namespace Core.Models.Eft.Ws;
public class WsGroupMatchRaidReady : WsNotificationEvent
{
[JsonPropertyName("extendedProfile")]
public GroupCharacter ExtendedProfile { get; set; }
public GroupCharacter? ExtendedProfile { get; set; }
}
Core/Models/Eft/Ws/WsGroupMatchRaidSettings.cs
+1 -1
View File
@@ -6,5 +6,5 @@ namespace Core.Models.Eft.Ws;
public class WsGroupMatchRaidSettings : WsNotificationEvent
{
[JsonPropertyName("raidSettings")]
public RaidSettings RaidSettings { get; set; }
public RaidSettings? RaidSettings { get; set; }
}
Core/Models/Eft/Ws/WsNotificationEvent.cs
+1 -1
View File
@@ -5,7 +5,7 @@ namespace Core.Models.Eft.Ws;
public class WsNotificationEvent
{
[JsonPropertyName("type")]
public string EventType { get; set; }
public string? EventType { get; set; }
[JsonPropertyName("eventId")]
public string? EventIdentifier { get; set; }
Core/Models/Eft/Ws/WsRagfairOfferSold.cs
+3 -3
View File
@@ -5,11 +5,11 @@ namespace Core.Models.Eft.Ws;
public class WsRagfairOfferSold : WsNotificationEvent
{
[JsonPropertyName("offerId")]
public string OfferId { get; set; }
public string? OfferId { get; set; }
[JsonPropertyName("count")]
public int Count { get; set; }
public int? Count { get; set; }
[JsonPropertyName("handbookId")]
public string HandbookId { get; set; }
public string? HandbookId { get; set; }
}
Core/Models/Eft/Ws/WsUserConfirmed.cs
+12 -12
View File
@@ -6,38 +6,38 @@ namespace Core.Models.Eft.Ws;
public class WsUserConfirmed : WsNotificationEvent
{
[JsonPropertyName("profileid")]
public string ProfileId { get; set; }
public string? ProfileId { get; set; }
[JsonPropertyName("profileToken")]
public string ProfileToken { get; set; }
public string? ProfileToken { get; set; }
[JsonPropertyName("status")]
public ProfileStatus Status { get; set; }
public ProfileStatus? Status { get; set; }
[JsonPropertyName("ip")]
public string Ip { get; set; }
public string? Ip { get; set; }
[JsonPropertyName("port")]
public int Port { get; set; }
public int? Port { get; set; }
[JsonPropertyName("sid")]
public string Sid { get; set; }
public string? Sid { get; set; }
[JsonPropertyName("version")]
public string Version { get; set; }
public string? Version { get; set; }
[JsonPropertyName("location")]
public string Location { get; set; }
public string? Location { get; set; }
[JsonPropertyName("raidMode")]
public RaidMode RaidMode { get; set; }
public RaidMode? RaidMode { get; set; }
[JsonPropertyName("mode")]
public string Mode { get; set; }
public string? Mode { get; set; }
[JsonPropertyName("shortId")]
public string ShortId { get; set; }
public string? ShortId { get; set; }
[JsonPropertyName("additional_info")]
public List<object> AdditionalInfo { get; set; } // TODO: Was `any` in the node server.
public List<object>? AdditionalInfo { get; set; } // TODO: Was `any` in the node server.
}
Core/Models/Spt/Bots/BotGenerationDetails.cs
+8 -8
View File
@@ -9,19 +9,19 @@ public class BotGenerationDetails
/// Should the bot be generated as a PMC
/// </summary>
[JsonPropertyName("isPmc")]
public bool IsPmc { get; set; }
public bool? IsPmc { get; set; }
/// <summary>
/// assault/pmcBot etc
/// </summary>
[JsonPropertyName("role")]
public string Role { get; set; }
public string? Role { get; set; }
/// <summary>
/// Side of bot
/// </summary>
[JsonPropertyName("side")]
public string Side { get; set; }
public string? Side { get; set; }
/// <summary>
/// Active players current level
@@ -42,31 +42,31 @@ public class BotGenerationDetails
/// Delta of highest level of bot e.g. 50 means 50 levels above player
/// </summary>
[JsonPropertyName("botRelativeLevelDeltaMax")]
public int BotRelativeLevelDeltaMax { get; set; }
public int? BotRelativeLevelDeltaMax { get; set; }
/// <summary>
/// Delta of lowest level of bot e.g. 50 means 50 levels below player
/// </summary>
[JsonPropertyName("botRelativeLevelDeltaMin")]
public int BotRelativeLevelDeltaMin { get; set; }
public int? BotRelativeLevelDeltaMin { get; set; }
/// <summary>
/// How many to create and store
/// </summary>
[JsonPropertyName("botCountToGenerate")]
public int BotCountToGenerate { get; set; }
public int? BotCountToGenerate { get; set; }
/// <summary>
/// Desired difficulty of the bot
/// </summary>
[JsonPropertyName("botDifficulty")]
public string BotDifficulty { get; set; }
public string? BotDifficulty { get; set; }
/// <summary>
/// Will the generated bot be a player scav
/// </summary>
[JsonPropertyName("isPlayerScav")]
public bool IsPlayerScav { get; set; }
public bool? IsPlayerScav { get; set; }
[JsonPropertyName("eventRole")]
public string? EventRole { get; set; }
Core/Models/Spt/Bots/BotLootCache.cs
+13 -13
View File
@@ -5,43 +5,43 @@ namespace Core.Models.Spt.Bots;
public class BotLootCache
{
[JsonPropertyName("backpackLoot")]
public Dictionary<string, int> BackpackLoot { get; set; }
public Dictionary<string, int>? BackpackLoot { get; set; }
[JsonPropertyName("pocketLoot")]
public Dictionary<string, int> PocketLoot { get; set; }
public Dictionary<string, int>? PocketLoot { get; set; }
[JsonPropertyName("vestLoot")]
public Dictionary<string, int> VestLoot { get; set; }
public Dictionary<string, int>? VestLoot { get; set; }
[JsonPropertyName("secureLoot")]
public Dictionary<string, int> SecureLoot { get; set; }
public Dictionary<string, int>? SecureLoot { get; set; }
[JsonPropertyName("combinedPoolLoot")]
public Dictionary<string, int> CombinedPoolLoot { get; set; }
public Dictionary<string, int>? CombinedPoolLoot { get; set; }
[JsonPropertyName("specialItems")]
public Dictionary<string, int> SpecialItems { get; set; }
public Dictionary<string, int>? SpecialItems { get; set; }
[JsonPropertyName("healingItems")]
public Dictionary<string, int> HealingItems { get; set; }
public Dictionary<string, int>? HealingItems { get; set; }
[JsonPropertyName("drugItems")]
public Dictionary<string, int> DrugItems { get; set; }
public Dictionary<string, int>? DrugItems { get; set; }
[JsonPropertyName("foodItems")]
public Dictionary<string, int> FoodItems { get; set; }
public Dictionary<string, int>? FoodItems { get; set; }
[JsonPropertyName("drinkItems")]
public Dictionary<string, int> DrinkItems { get; set; }
public Dictionary<string, int>? DrinkItems { get; set; }
[JsonPropertyName("currencyItems")]
public Dictionary<string, int> CurrencyItems { get; set; }
public Dictionary<string, int>? CurrencyItems { get; set; }
[JsonPropertyName("stimItems")]
public Dictionary<string, int> StimItems { get; set; }
public Dictionary<string, int>? StimItems { get; set; }
[JsonPropertyName("grenadeItems")]
public Dictionary<string, int> GrenadeItems { get; set; }
public Dictionary<string, int>? GrenadeItems { get; set; }
}
public static class LootCacheType
Core/Models/Spt/Bots/Bots.cs
+3 -3
View File
@@ -6,11 +6,11 @@ namespace Core.Models.Spt.Bots;
public class Bots
{
[JsonPropertyName("types")]
public Dictionary<string, BotType> Types { get; set; }
public Dictionary<string, BotType>? Types { get; set; }
[JsonPropertyName("base")]
public BotBase Base { get; set; }
public BotBase? Base { get; set; }
[JsonPropertyName("core")]
public Dictionary<string, object> Core { get; set; }
public Dictionary<string, object>? Core { get; set; }
}
Core/Models/Spt/Bots/ChooseRandomCompatibleModResult.cs
+2 -2
View File
@@ -5,7 +5,7 @@ namespace Core.Models.Spt.Bots;
public class ChooseRandomCompatibleModResult
{
[JsonPropertyName("incompatible")]
public bool Incompatible { get; set; }
public bool? Incompatible { get; set; }
[JsonPropertyName("found")]
public bool? Found { get; set; }
@@ -14,7 +14,7 @@ public class ChooseRandomCompatibleModResult
public string? ChosenTemplate { get; set; }
[JsonPropertyName("reason")]
public string Reason { get; set; }
public string? Reason { get; set; }
[JsonPropertyName("slotBlocked")]
public bool? SlotBlocked { get; set; }
Core/Models/Spt/Bots/FilterPlateModsForSlotByLevelResult.cs
+2 -2
View File
@@ -5,10 +5,10 @@ namespace Core.Models.Spt.Bots;
public class FilterPlateModsForSlotByLevelResult
{
[JsonPropertyName("result")]
public Result Result { get; set; }
public Result? Result { get; set; }
[JsonPropertyName("plateModTpls")]
public List<string> PlateModTemplates { get; set; }
public List<string>? PlateModTemplates { get; set; }
}
public enum Result
Core/Models/Spt/Bots/GenerateEquipmentProperties.cs
+10 -10
View File
@@ -10,47 +10,47 @@ public class GenerateEquipmentProperties
/// Root Slot being generated
/// </summary>
[JsonPropertyName("rootEquipmentSlot")]
public string RootEquipmentSlot { get; set; }
public string? RootEquipmentSlot { get; set; }
/// <summary>
/// Equipment pool for root slot being generated
/// </summary>
[JsonPropertyName("rootEquipmentPool")]
public Dictionary<string, int> RootEquipmentPool { get; set; }
public Dictionary<string, int>? RootEquipmentPool { get; set; }
[JsonPropertyName("modPool")]
public GlobalMods ModPool { get; set; }
public GlobalMods? ModPool { get; set; }
/// <summary>
/// Dictionary of mod items and their chance to spawn for this bot type
/// </summary>
[JsonPropertyName("spawnChances")]
public Chances SpawnChances { get; set; }
public Chances? SpawnChances { get; set; }
/// <summary>
/// Bot-specific properties
/// </summary>
[JsonPropertyName("botData")]
public BotData BotData { get; set; }
public BotData? BotData { get; set; }
[JsonPropertyName("inventory")]
public BotBaseInventory Inventory { get; set; }
public BotBaseInventory? Inventory { get; set; }
[JsonPropertyName("botEquipmentConfig")]
public EquipmentFilters BotEquipmentConfig { get; set; }
public EquipmentFilters? BotEquipmentConfig { get; set; }
/// <summary>
/// Settings from bot.json to adjust how item is generated
/// </summary>
[JsonPropertyName("randomisationDetails")]
public RandomisationDetails RandomisationDetails { get; set; }
public RandomisationDetails? RandomisationDetails { get; set; }
/// <summary>
/// OPTIONAL - Do not generate mods for tpls in this array
/// </summary>
[JsonPropertyName("generateModsBlacklist")]
public List<string> GenerateModsBlacklist { get; set; }
public List<string>? GenerateModsBlacklist { get; set; }
[JsonPropertyName("generatingPlayerLevel")]
public int GeneratingPlayerLevel { get; set; }
public int? GeneratingPlayerLevel { get; set; }
}
Core/Models/Spt/Bots/GenerateWeaponRequest.cs
+20 -20
View File
@@ -7,58 +7,58 @@ public class GenerateWeaponRequest
{
/** Weapon to add mods to / result that is returned */
[JsonPropertyName("weapon")]
public List<Item> Weapon { get; set; }
public List<Item>? Weapon { get; set; }
/** Pool of compatible mods to attach to weapon */
[JsonPropertyName("modPool")]
public GlobalMods ModPool { get; set; }
public GlobalMods? ModPool { get; set; }
/** ParentId of weapon */
[JsonPropertyName("weaponId")]
public string WeaponId { get; set; }
public string? WeaponId { get; set; }
/** Weapon which mods will be generated on */
[JsonPropertyName("parentTemplate")]
public TemplateItem ParentTemplate { get; set; }
public TemplateItem? ParentTemplate { get; set; }
/** Chance values mod will be added */
[JsonPropertyName("modSpawnChances")]
public Dictionary<string, double> ModSpawnChances { get; set; }
public Dictionary<string, double>? ModSpawnChances { get; set; }
/** Ammo tpl to use when generating magazines/cartridges */
[JsonPropertyName("ammoTpl")]
public string AmmoTpl { get; set; }
public string? AmmoTpl { get; set; }
/** Bot-specific properties */
[JsonPropertyName("botData")]
public BotData BotData { get; set; }
public BotData? BotData { get; set; }
/** limits placed on certain mod types per gun */
[JsonPropertyName("modLimits")]
public BotModLimits ModLimits { get; set; }
public BotModLimits? ModLimits { get; set; }
/** Info related to the weapon being generated */
[JsonPropertyName("weaponStats")]
public WeaponStats WeaponStats { get; set; }
public WeaponStats? WeaponStats { get; set; }
/** Array of item tpls the weapon does not support */
[JsonPropertyName("conflictingItemTpls")]
public HashSet<string> ConflictingItemTpls { get; set; }
public HashSet<string>? ConflictingItemTpls { get; set; }
}
public class BotData
{
/** Role of bot weapon is generated for */
[JsonPropertyName("role")]
public string Role { get; set; }
public string? Role { get; set; }
/** Level of the bot weapon is being generated for */
[JsonPropertyName("level")]
public int Level { get; set; }
public int? Level { get; set; }
/** role of bot when accessing bot.json equipment config settings */
[JsonPropertyName("equipmentRole")]
public string EquipmentRole { get; set; }
public string? EquipmentRole { get; set; }
}
public class WeaponStats
@@ -76,26 +76,26 @@ public class WeaponStats
public class BotModLimits
{
[JsonPropertyName("scope")]
public ItemCount Scope { get; set; }
public ItemCount? Scope { get; set; }
[JsonPropertyName("scopeMax")]
public int ScopeMax { get; set; }
public int? ScopeMax { get; set; }
[JsonPropertyName("scopeBaseTypes")]
public string[] ScopeBaseTypes { get; set; }
public List<string>? ScopeBaseTypes { get; set; }
[JsonPropertyName("flashlightLaser")]
public ItemCount FlashlightLaser { get; set; }
public ItemCount? FlashlightLaser { get; set; }
[JsonPropertyName("flashlightLaserMax")]
public int FlashlightLaserMax { get; set; }
public int? FlashlightLaserMax { get; set; }
[JsonPropertyName("flashlightLaserBaseTypes")]
public string[] FlashlightLaserBaseTypes { get; set; }
public List<string>? FlashlightLaserBaseTypes { get; set; }
}
public class ItemCount
{
[JsonPropertyName("count")]
public int Count { get; set; }
public int? Count { get; set; }
}
Core/Models/Spt/Bots/GenerateWeaponResult.cs
+5 -5
View File
@@ -6,17 +6,17 @@ namespace Core.Models.Spt.Bots;
public class GenerateWeaponResult
{
[JsonPropertyName("weapon")]
public List<Item> Weapon { get; set; }
public List<Item>? Weapon { get; set; }
[JsonPropertyName("chosenAmmoTpl")]
public string ChosenAmmoTemplate { get; set; }
public string? ChosenAmmoTemplate { get; set; }
[JsonPropertyName("chosenUbglAmmoTpl")]
public string ChosenUbglAmmoTemplate { get; set; }
public string? ChosenUbglAmmoTemplate { get; set; }
[JsonPropertyName("weaponMods")]
public GlobalMods WeaponMods { get; set; }
public GlobalMods? WeaponMods { get; set; }
[JsonPropertyName("weaponTemplate")]
public TemplateItem WeaponTemplate { get; set; }
public TemplateItem? WeaponTemplate { get; set; }
}
Core/Models/Spt/Bots/ItemSpawnLimitSettings.cs
+2 -2
View File
@@ -5,8 +5,8 @@ namespace Core.Models.Spt.Bots;
public class ItemSpawnLimitSettings
{
[JsonPropertyName("currentLimits")]
public Dictionary<string, int> CurrentLimits { get; set; }
public Dictionary<string, int>? CurrentLimits { get; set; }
[JsonPropertyName("globalLimits")]
public Dictionary<string, int> GlobalLimits { get; set; }
public Dictionary<string, int>? GlobalLimits { get; set; }
}
Core/Models/Spt/Bots/ModToSpawnRequest.cs
+13 -13
View File
@@ -11,71 +11,71 @@ public class ModToSpawnRequest
/// Slot mod will fit into
/// </summary>
[JsonPropertyName("modSlot")]
public string ModSlot { get; set; }
public string? ModSlot { get; set; }
/// <summary>
/// Will generate a randomised mod pool if true
/// </summary>
[JsonPropertyName("isRandomisableSlot")]
public bool IsRandomisableSlot { get; set; }
public bool? IsRandomisableSlot { get; set; }
[JsonPropertyName("randomisationSettings")]
public RandomisationDetails RandomisationSettings { get; set; }
public RandomisationDetails? RandomisationSettings { get; set; }
/// <summary>
/// Parent slot the item will be a part of
/// </summary>
[JsonPropertyName("botWeaponSightWhitelist")]
public Dictionary<string, List<string>> BotWeaponSightWhitelist { get; set; }
public Dictionary<string, List<string>>? BotWeaponSightWhitelist { get; set; }
/// <summary>
/// Blacklist to prevent mods from being picked
/// </summary>
[JsonPropertyName("botEquipBlacklist")]
public EquipmentFilterDetails BotEquipBlacklist { get; set; }
public EquipmentFilterDetails? BotEquipBlacklist { get; set; }
/// <summary>
/// Pool of items to pick from
/// </summary>
[JsonPropertyName("itemModPool")]
public Dictionary<string, List<string>> ItemModPool { get; set; }
public Dictionary<string, List<string>>? ItemModPool { get; set; }
/// <summary>
/// List with only weapon tpl in it, ready for mods to be added
/// </summary>
[JsonPropertyName("weapon")]
public List<Item> Weapon { get; set; }
public List<Item>? Weapon { get; set; }
/// <summary>
/// Ammo tpl to use if slot requires a cartridge to be added (e.g. mod_magazine)
/// </summary>
[JsonPropertyName("ammoTpl")]
public string AmmoTpl { get; set; }
public string? AmmoTpl { get; set; }
/// <summary>
/// Parent item the mod will go into
/// </summary>
[JsonPropertyName("parentTemplate")]
public TemplateItem ParentTemplate { get; set; }
public TemplateItem? ParentTemplate { get; set; }
/// <summary>
/// Should mod be spawned/skipped/use default
/// </summary>
[JsonPropertyName("modSpawnResult")]
public ModSpawn ModSpawnResult { get; set; }
public ModSpawn? ModSpawnResult { get; set; }
/// <summary>
/// Weapon stats for weapon being generated
/// </summary>
[JsonPropertyName("weaponStats")]
public WeaponStats WeaponStats { get; set; }
public WeaponStats? WeaponStats { get; set; }
/// <summary>
/// List of item tpls the weapon does not support
/// </summary>
[JsonPropertyName("conflictingItemTpls")]
public HashSet<string> ConflictingItemTpls { get; set; }
public HashSet<string>? ConflictingItemTpls { get; set; }
[JsonPropertyName("botData")]
public BotData BotData { get; set; }
public BotData? BotData { get; set; }
}
Core/Models/Spt/Dialog/SendMessageDetails.cs
+5 -5
View File
@@ -11,13 +11,13 @@ public class SendMessageDetails
/// Player id
/// </summary>
[JsonPropertyName("recipientId")]
public string RecipientId { get; set; }
public string? RecipientId { get; set; }
/// <summary>
/// Who is sending this message
/// </summary>
[JsonPropertyName("sender")]
public MessageType Sender { get; set; }
public MessageType? Sender { get; set; }
/// <summary>
/// Optional - leave blank to use sender value
@@ -83,13 +83,13 @@ public class SendMessageDetails
public class ProfileChangeEvent
{
[JsonPropertyName("_id")]
public string Id { get; set; }
public string? Id { get; set; }
[JsonPropertyName("Type")]
public ProfileChangeEventType Type { get; set; }
public ProfileChangeEventType? Type { get; set; }
[JsonPropertyName("value")]
public double Value { get; set; }
public double? Value { get; set; }
[JsonPropertyName("entity")]
public string? Entity { get; set; }
Core/Models/Spt/Fence/CreateFenceAssortsResult.cs
+3 -3
View File
@@ -6,11 +6,11 @@ namespace Core.Models.Spt.Fence;
public class CreateFenceAssortsResult
{
[JsonPropertyName("sptItems")]
public List<List<Item>> SptItems { get; set; }
public List<List<Item>>? SptItems { get; set; }
[JsonPropertyName("barter_scheme")]
public Dictionary<string, List<List<BarterScheme>>> BarterScheme { get; set; }
public Dictionary<string, List<List<BarterScheme>>>? BarterScheme { get; set; }
[JsonPropertyName("loyal_level_items")]
public Dictionary<string, int> LoyalLevelItems { get; set; }
public Dictionary<string, int>? LoyalLevelItems { get; set; }
}
Core/Models/Spt/Fence/FenceAssortGenerationValues.cs
+5 -5
View File
@@ -5,20 +5,20 @@ namespace Core.Models.Spt.Fence;
public class FenceAssortGenerationValues
{
[JsonPropertyName("normal")]
public GenerationAssortValues Normal { get; set; }
public GenerationAssortValues? Normal { get; set; }
[JsonPropertyName("discount")]
public GenerationAssortValues Discount { get; set; }
public GenerationAssortValues? Discount { get; set; }
}
public class GenerationAssortValues
{
[JsonPropertyName("item")]
public int Item { get; set; }
public int? Item { get; set; }
[JsonPropertyName("weaponPreset")]
public int WeaponPreset { get; set; }
public int? WeaponPreset { get; set; }
[JsonPropertyName("equipmentPreset")]
public int EquipmentPreset { get; set; }
public int? EquipmentPreset { get; set; }
}
Core/Models/Spt/Hideout/CircleCraftDetails.cs
+3 -3
View File
@@ -7,13 +7,13 @@ namespace Core.Models.Spt.Hideout;
public class CircleCraftDetails
{
[JsonPropertyName("time")]
public int Time { get; set; } // this might not be the right "number" type
public long Time { get; set; }
[JsonPropertyName("rewardType")]
public CircleRewardType RewardType { get; set; }
public CircleRewardType? RewardType { get; set; }
[JsonPropertyName("rewardAmountRoubles")]
public int RewardAmountRoubles { get; set; }
public int? RewardAmountRoubles { get; set; }
[JsonPropertyName("rewardDetails")]
public CraftTimeThreshhold? RewardDetails { get; set; }
Core/Models/Spt/Hideout/Hideout.cs
+5 -5
View File
@@ -6,17 +6,17 @@ namespace Core.Models.Spt.Hideout;
public class Hideout
{
[JsonPropertyName("areas")]
public List<HideoutArea> Areas { get; set; }
public List<HideoutArea>? Areas { get; set; }
[JsonPropertyName("customisation")]
public HideoutCustomisation Customisation { get; set; }
public HideoutCustomisation? Customisation { get; set; }
[JsonPropertyName("production")]
public HideoutProductionData Production { get; set; }
public HideoutProductionData? Production { get; set; }
[JsonPropertyName("settings")]
public HideoutSettingsBase Settings { get; set; }
public HideoutSettingsBase? Settings { get; set; }
[JsonPropertyName("qte")]
public List<QteData> Qte { get; set; }
public List<QteData>? Qte { get; set; }
}
Core/Models/Spt/Hideout/ScavCaseRewardCountsAndPrices.cs
+7 -7
View File
@@ -5,26 +5,26 @@ namespace Core.Models.Spt.Hideout;
public class ScavCaseRewardCountsAndPrices
{
[JsonPropertyName("Common")]
public RewardCountAndPriceDetails Common { get; set; }
public RewardCountAndPriceDetails? Common { get; set; }
[JsonPropertyName("Rare")]
public RewardCountAndPriceDetails Rare { get; set; }
public RewardCountAndPriceDetails? Rare { get; set; }
[JsonPropertyName("Superrare")]
public RewardCountAndPriceDetails Superrare { get; set; }
public RewardCountAndPriceDetails? Superrare { get; set; }
}
public class RewardCountAndPriceDetails
{
[JsonPropertyName("minCount")]
public int MinCount { get; set; }
public int? MinCount { get; set; }
[JsonPropertyName("maxCount")]
public int MaxCount { get; set; }
public int? MaxCount { get; set; }
[JsonPropertyName("minPriceRub")]
public int MinPriceRub { get; set; }
public int? MinPriceRub { get; set; }
[JsonPropertyName("maxPriceRub")]
public int MaxPriceRub { get; set; }
public int? MaxPriceRub { get; set; }
}
Core/Models/Spt/Inventory/OwnerInventoryItems.cs
+4 -4
View File
@@ -6,14 +6,14 @@ namespace Core.Models.Spt.Inventory;
public class OwnerInventoryItems
{
[JsonPropertyName("from")]
public List<Item> From { get; set; }
public List<Item>? From { get; set; }
[JsonPropertyName("to")]
public List<Item> To { get; set; }
public List<Item>? To { get; set; }
[JsonPropertyName("sameInventory")]
public bool SameInventory { get; set; }
public bool? SameInventory { get; set; }
[JsonPropertyName("isMail")]
public bool IsMail { get; set; }
public bool? IsMail { get; set; }
}
Core/Models/Spt/Location/RaidChanges.cs
+3 -3
View File
@@ -5,11 +5,11 @@ namespace Core.Models.Spt.Location;
public class RaidChanges
{
[JsonPropertyName("dynamicLootPercent")]
public float DynamicLootPercent { get; set; }
public float? DynamicLootPercent { get; set; }
[JsonPropertyName("staticLootPercent")]
public float StaticLootPercent { get; set; }
public float? StaticLootPercent { get; set; }
[JsonPropertyName("simulatedRaidStartSeconds")]
public int SimulatedRaidStartSeconds { get; set; }
public int? SimulatedRaidStartSeconds { get; set; }
}
Core/Models/Spt/Logging/ClientLogRequest.cs
+3 -3
View File
@@ -5,13 +5,13 @@ namespace Core.Models.Spt.Logging;
public class ClientLogRequest
{
[JsonPropertyName("Source")]
public string Source { get; set; }
public string? Source { get; set; }
[JsonPropertyName("Level")]
public LogLevel Level { get; set; }
public LogLevel? Level { get; set; }
[JsonPropertyName("Message")]
public string Message { get; set; }
public string? Message { get; set; }
[JsonPropertyName("Color")]
public string? Color { get; set; }
Core/Models/Spt/Mod/NewItemDetails.cs
+15 -15
View File
@@ -7,61 +7,61 @@ namespace Core.Models.Spt.Mod;
public class NewItemDetails : NewItemDetailsBase
{
[JsonPropertyName("newItem")]
public TemplateItem NewItem { get; set; }
public TemplateItem? NewItem { get; set; }
}
public class NewItemFromCloneDetails : NewItemDetailsBase
{
[JsonPropertyName("itemTplToClone")]
public string ItemTplToClone { get; set; }
public string? ItemTplToClone { get; set; }
[JsonPropertyName("overrideProperties")]
public Props OverrideProperties { get; set; }
public Props? OverrideProperties { get; set; }
[JsonPropertyName("parentId")]
public string ParentId { get; set; }
public string? ParentId { get; set; }
[JsonPropertyName("newId")]
public string NewId { get; set; } = "";
public string? NewId { get; set; } = "";
}
public class NewItemDetailsBase
{
[JsonPropertyName("fleaPriceRoubles")]
public float FleaPriceRoubles { get; set; }
public float? FleaPriceRoubles { get; set; }
[JsonPropertyName("handbookPriceRoubles")]
public float HandbookPriceRoubles { get; set; }
public float? HandbookPriceRoubles { get; set; }
[JsonPropertyName("handbookParentId")]
public string HandbookParentId { get; set; }
public string? HandbookParentId { get; set; }
[JsonPropertyName("locales")]
public Dictionary<string, LocaleDetails> Locales { get; set; }
public Dictionary<string, LocaleDetails>? Locales { get; set; }
}
public class LocaleDetails
{
[JsonPropertyName("name")]
public string Name { get; set; }
public string? Name { get; set; }
[JsonPropertyName("shortName")]
public string ShortName { get; set; }
public string? ShortName { get; set; }
[JsonPropertyName("description")]
public string Description { get; set; }
public string? Description { get; set; }
}
public class CreateItemResult
{
[JsonPropertyName("success")]
public bool Success { get; set; }
public bool? Success { get; set; }
[JsonPropertyName("itemId")]
public string ItemId { get; set; }
public string? ItemId { get; set; }
[JsonPropertyName("errors")]
public List<string> Errors { get; set; }
public List<string>? Errors { get; set; }
public CreateItemResult()
{
Core/Models/Spt/Mod/PackageJsonData.cs
+10 -10
View File
@@ -20,38 +20,38 @@ public class PackageJsonData
public Dictionary<string, string>? ModDependencies { get; set; }
[JsonPropertyName("name")]
public string Name { get; set; }
public string? Name { get; set; }
[JsonPropertyName("url")]
public string Url { get; set; }
public string? Url { get; set; }
[JsonPropertyName("author")]
public string Author { get; set; }
public string? Author { get; set; }
[JsonPropertyName("version")]
public string Version { get; set; }
public string? Version { get; set; }
[JsonPropertyName("sptVersion")]
public string SptVersion { get; set; }
public string? SptVersion { get; set; }
// We deliberately purge this data
[JsonPropertyName("scripts")]
public Dictionary<string, string> Scripts { get; set; }
public Dictionary<string, string>? Scripts { get; set; }
[JsonPropertyName("devDependencies")]
public Dictionary<string, string>? DevDependencies { get; set; }
[JsonPropertyName("licence")]
public string Licence { get; set; }
public string? Licence { get; set; }
[JsonPropertyName("main")]
public string Main { get; set; }
public string? Main { get; set; }
[JsonPropertyName("isBundleMod")]
public bool IsBundleMod { get; set; }
public bool? IsBundleMod { get; set; }
[JsonPropertyName("contributors")]
public List<string> Contributors { get; set; }
public List<string>? Contributors { get; set; }
}
// TODO: this will need changing to however we implement it in this project
Core/Models/Spt/Quests/GetRepeatableByIdResult.cs
+2 -2
View File
@@ -6,8 +6,8 @@ namespace Core.Models.Spt.Quests;
public class GetRepeatableByIdResult
{
[JsonPropertyName("quest")]
public RepeatableQuest Quest { get; set; }
public RepeatableQuest? Quest { get; set; }
[JsonPropertyName("repeatableType")]
public PmcDataRepeatableQuest RepeatableType { get; set; }
public PmcDataRepeatableQuest? RepeatableType { get; set; }
}
Core/Models/Spt/Ragfair/RagfairServerPrices.cs
+2 -2
View File
@@ -5,8 +5,8 @@ namespace Core.Models.Spt.Ragfair;
public class RagfairServerPrices
{
[JsonPropertyName("static")]
public Dictionary<string, int> Static { get; set; }
public Dictionary<string, int>? Static { get; set; }
[JsonPropertyName("dynamic")]
public Dictionary<string, int> Dynamic { get; set; }
public Dictionary<string, int>? Dynamic { get; set; }
}
Core/Models/Spt/Ragfair/TplWithFleaPrice.cs
+2 -2
View File
@@ -5,9 +5,9 @@ namespace Core.Models.Spt.Ragfair;
public class TplWithFleaPrice
{
[JsonPropertyName("tpl")]
public string Tpl { get; set; }
public string? Tpl { get; set; }
// Roubles
[JsonPropertyName("price")]
public decimal Price { get; set; }
public decimal? Price { get; set; }
}
Core/Models/Spt/Repeatable/QuestRewardValues.cs
+7 -7
View File
@@ -5,23 +5,23 @@ namespace Core.Models.Spt.Repeatable;
public class QuestRewardValues
{
[JsonPropertyName("skillPointReward")]
public int SkillPointReward { get; set; }
public int? SkillPointReward { get; set; }
[JsonPropertyName("skillRewardChance")]
public int SkillRewardChance { get; set; }
public int? SkillRewardChance { get; set; }
[JsonPropertyName("rewardReputation")]
public int RewardReputation { get; set; }
public int? RewardReputation { get; set; }
[JsonPropertyName("rewardNumItems")]
public int RewardNumItems { get; set; }
public int? RewardNumItems { get; set; }
[JsonPropertyName("rewardRoubles")]
public int RewardRoubles { get; set; }
public int? RewardRoubles { get; set; }
[JsonPropertyName("gpCoinRewardCount")]
public int GpCoinRewardCount { get; set; }
public int? GpCoinRewardCount { get; set; }
[JsonPropertyName("rewardXP")]
public int RewardXP { get; set; }
public int? RewardXP { get; set; }
}
Core/Models/Spt/Repeatable/QuestTypePool.cs
+8 -8
View File
@@ -7,34 +7,34 @@ namespace Core.Models.Spt.Repeatable;
public class QuestTypePool
{
[JsonPropertyName("types")]
public List<string> Types { get; set; }
public List<string>? Types { get; set; }
[JsonPropertyName("pool")]
public QuestPool Pool { get; set; }
public QuestPool? Pool { get; set; }
}
public class QuestPool
{
[JsonPropertyName("Exploration")]
public ExplorationPool Exploration { get; set; }
public ExplorationPool? Exploration { get; set; }
[JsonPropertyName("Elimination")]
public EliminationPool Elimination { get; set; }
public EliminationPool? Elimination { get; set; }
[JsonPropertyName("Pickup")]
public ExplorationPool Pickup { get; set; }
public ExplorationPool? Pickup { get; set; }
}
public class ExplorationPool
{
[JsonPropertyName("locations")]
public Dictionary<ELocationName, List<string>> Locations { get; set; } // TODO: check the type, originally - Partial<Record<ELocationName, string[]>>
public Dictionary<ELocationName, List<string>>? Locations { get; set; } // TODO: check the type, originally - Partial<Record<ELocationName, string[]>>
}
public class EliminationPool
{
[JsonPropertyName("targets")]
public EliminationTargetPool Targets { get; set; }
public EliminationTargetPool? Targets { get; set; }
}
public class EliminationTargetPool
@@ -76,5 +76,5 @@ public class EliminationTargetPool
public class TargetLocation
{
[JsonPropertyName("locations")]
public List<string> Locations { get; set; }
public List<string>? Locations { get; set; }
}
Core/Models/Spt/Server/LocaleBase.cs
+4 -4
View File
@@ -5,14 +5,14 @@ namespace Core.Models.Spt.Server;
public class LocaleBase
{
[JsonPropertyName("global")]
public Dictionary<string, Dictionary<string, string>> Global { get; set; }
public Dictionary<string, Dictionary<string, string>>? Global { get; set; }
[JsonPropertyName("menu")]
public Dictionary<string, Dictionary<string, object>> Menu { get; set; }
public Dictionary<string, Dictionary<string, object>>? Menu { get; set; }
[JsonPropertyName("languages")]
public Dictionary<string, string> Languages { get; set; }
public Dictionary<string, string>? Languages { get; set; }
[JsonPropertyName("server")]
public Dictionary<string, Dictionary<string, string>> Server { get; set; }
public Dictionary<string, Dictionary<string, string>>? Server { get; set; }
}
Core/Models/Spt/Server/ServerBase.cs
+2 -2
View File
@@ -5,8 +5,8 @@ namespace Core.Models.Spt.Server;
public class ServerBase
{
[JsonPropertyName("ip")]
public string Ip { get; set; }
public string? Ip { get; set; }
[JsonPropertyName("port")]
public int Port { get; set; }
public int? Port { get; set; }
}
Core/Models/Spt/Server/SettingsBase.cs
+42 -42
View File
@@ -5,143 +5,143 @@ namespace Core.Models.Spt.Server;
public class SettingsBase
{
[JsonPropertyName("config")]
public Config Configuration { get; set; }
public Config? Configuration { get; set; }
}
public class Config
{
[JsonPropertyName("AFKTimeoutSeconds")]
public int AFKTimeoutSeconds { get; set; }
public int? AFKTimeoutSeconds { get; set; }
[JsonPropertyName("AdditionalRandomDelaySeconds")]
public int AdditionalRandomDelaySeconds { get; set; }
public int? AdditionalRandomDelaySeconds { get; set; }
[JsonPropertyName("ClientSendRateLimit")]
public int ClientSendRateLimit { get; set; }
public int? ClientSendRateLimit { get; set; }
[JsonPropertyName("CriticalRetriesCount")]
public int CriticalRetriesCount { get; set; }
public int? CriticalRetriesCount { get; set; }
[JsonPropertyName("DefaultRetriesCount")]
public int DefaultRetriesCount { get; set; }
public int? DefaultRetriesCount { get; set; }
[JsonPropertyName("FirstCycleDelaySeconds")]
public int FirstCycleDelaySeconds { get; set; }
public int? FirstCycleDelaySeconds { get; set; }
[JsonPropertyName("FramerateLimit")]
public FramerateLimit FramerateLimit { get; set; }
public FramerateLimit? FramerateLimit { get; set; }
[JsonPropertyName("GroupStatusInterval")]
public int GroupStatusInterval { get; set; }
public int? GroupStatusInterval { get; set; }
[JsonPropertyName("GroupStatusButtonInterval")]
public int GroupStatusButtonInterval { get; set; }
public int? GroupStatusButtonInterval { get; set; }
[JsonPropertyName("KeepAliveInterval")]
public int KeepAliveInterval { get; set; }
public int? KeepAliveInterval { get; set; }
[JsonPropertyName("LobbyKeepAliveInterval")]
public int LobbyKeepAliveInterval { get; set; }
public int? LobbyKeepAliveInterval { get; set; }
[JsonPropertyName("Mark502and504AsNonImportant")]
public bool Mark502and504AsNonImportant { get; set; }
public bool? Mark502and504AsNonImportant { get; set; }
[JsonPropertyName("MemoryManagementSettings")]
public MemoryManagementSettings MemoryManagementSettings { get; set; }
public MemoryManagementSettings? MemoryManagementSettings { get; set; }
[JsonPropertyName("NVidiaHighlights")]
public bool NVidiaHighlights { get; set; }
public bool? NVidiaHighlights { get; set; }
[JsonPropertyName("NextCycleDelaySeconds")]
public int NextCycleDelaySeconds { get; set; }
public int? NextCycleDelaySeconds { get; set; }
[JsonPropertyName("PingServerResultSendInterval")]
public int PingServerResultSendInterval { get; set; }
public int? PingServerResultSendInterval { get; set; }
[JsonPropertyName("PingServersInterval")]
public int PingServersInterval { get; set; }
public int? PingServersInterval { get; set; }
[JsonPropertyName("ReleaseProfiler")]
public ReleaseProfiler ReleaseProfiler { get; set; }
public ReleaseProfiler? ReleaseProfiler { get; set; }
[JsonPropertyName("RequestConfirmationTimeouts")]
public List<double> RequestConfirmationTimeouts { get; set; }
public List<double>? RequestConfirmationTimeouts { get; set; }
[JsonPropertyName("RequestsMadeThroughLobby")]
public List<string> RequestsMadeThroughLobby { get; set; }
public List<string>? RequestsMadeThroughLobby { get; set; }
[JsonPropertyName("SecondCycleDelaySeconds")]
public int SecondCycleDelaySeconds { get; set; }
public int? SecondCycleDelaySeconds { get; set; }
[JsonPropertyName("ShouldEstablishLobbyConnection")]
public bool ShouldEstablishLobbyConnection { get; set; }
public bool? ShouldEstablishLobbyConnection { get; set; }
[JsonPropertyName("TurnOffLogging")]
public bool TurnOffLogging { get; set; }
public bool? TurnOffLogging { get; set; }
[JsonPropertyName("WeaponOverlapDistanceCulling")]
public int WeaponOverlapDistanceCulling { get; set; }
public int? WeaponOverlapDistanceCulling { get; set; }
[JsonPropertyName("WebDiagnosticsEnabled")]
public bool WebDiagnosticsEnabled { get; set; }
public bool? WebDiagnosticsEnabled { get; set; }
[JsonPropertyName("NetworkStateView")]
public NetworkStateView NetworkStateView { get; set; }
public NetworkStateView? NetworkStateView { get; set; }
[JsonPropertyName("WsReconnectionDelays")]
public List<int> WsReconnectionDelays { get; set; }
public List<int>? WsReconnectionDelays { get; set; }
}
public class FramerateLimit
{
[JsonPropertyName("MaxFramerateGameLimit")]
public int MaxFramerateGameLimit { get; set; }
public int? MaxFramerateGameLimit { get; set; }
[JsonPropertyName("MaxFramerateLobbyLimit")]
public int MaxFramerateLobbyLimit { get; set; }
public int? MaxFramerateLobbyLimit { get; set; }
[JsonPropertyName("MinFramerateLimit")]
public int MinFramerateLimit { get; set; }
public int? MinFramerateLimit { get; set; }
}
public class MemoryManagementSettings
{
[JsonPropertyName("AggressiveGC")]
public bool AggressiveGC { get; set; }
public bool? AggressiveGC { get; set; }
[JsonPropertyName("GigabytesRequiredToDisableGCDuringRaid")]
public int GigabytesRequiredToDisableGCDuringRaid { get; set; }
public int? GigabytesRequiredToDisableGCDuringRaid { get; set; }
[JsonPropertyName("HeapPreAllocationEnabled")]
public bool HeapPreAllocationEnabled { get; set; }
public bool? HeapPreAllocationEnabled { get; set; }
[JsonPropertyName("HeapPreAllocationMB")]
public int HeapPreAllocationMB { get; set; }
public int? HeapPreAllocationMB { get; set; }
[JsonPropertyName("OverrideRamCleanerSettings")]
public bool OverrideRamCleanerSettings { get; set; }
public bool? OverrideRamCleanerSettings { get; set; }
[JsonPropertyName("RamCleanerEnabled")]
public bool RamCleanerEnabled { get; set; }
public bool? RamCleanerEnabled { get; set; }
}
public class ReleaseProfiler
{
[JsonPropertyName("Enabled")]
public bool Enabled { get; set; }
public bool? Enabled { get; set; }
[JsonPropertyName("MaxRecords")]
public int MaxRecords { get; set; }
public int? MaxRecords { get; set; }
[JsonPropertyName("RecordTriggerValue")]
public int RecordTriggerValue { get; set; }
public int? RecordTriggerValue { get; set; }
}
public class NetworkStateView
{
[JsonPropertyName("LossThreshold")]
public int LossThreshold { get; set; }
public int? LossThreshold { get; set; }
[JsonPropertyName("RttThreshold")]
public int RttThreshold { get; set; }
public int? RttThreshold { get; set; }
}
Core/Models/Spt/Services/InsuranceEquipmentPkg.cs
+4 -4
View File
@@ -7,14 +7,14 @@ namespace Core.Models.Spt.Services;
public class InsuranceEquipmentPkg
{
[JsonPropertyName("sessionID")]
public string SessionId { get; set; }
public string? SessionId { get; set; }
[JsonPropertyName("pmcData")]
public PmcData PmcData { get; set; }
public PmcData? PmcData { get; set; }
[JsonPropertyName("itemToReturnToPlayer")]
public Item ItemToReturnToPlayer { get; set; }
public Item? ItemToReturnToPlayer { get; set; }
[JsonPropertyName("traderId")]
public string TraderId { get; set; }
public string? TraderId { get; set; }
}
Core/Models/Spt/Services/LootItem.cs
+3 -3
View File
@@ -8,11 +8,11 @@ public class LootItem
public string? Id { get; set; }
[JsonPropertyName("tpl")]
public string Tpl { get; set; }
public string? Tpl { get; set; }
[JsonPropertyName("isPreset")]
public bool IsPreset { get; set; }
public bool? IsPreset { get; set; }
[JsonPropertyName("stackCount")]
public int StackCount { get; set; }
public int? StackCount { get; set; }
}
Core/Models/Spt/Services/LootRequest.cs
+11 -11
View File
@@ -10,58 +10,58 @@ public class LootRequest
/// Count of weapons to generate
/// </summary>
[JsonPropertyName("weaponPresetCount")]
public MinMax WeaponPresetCount { get; set; }
public MinMax? WeaponPresetCount { get; set; }
/// <summary>
/// Count of armor to generate
/// </summary>
[JsonPropertyName("armorPresetCount")]
public MinMax ArmorPresetCount { get; set; }
public MinMax? ArmorPresetCount { get; set; }
/// <summary>
/// Count of items to generate
/// </summary>
[JsonPropertyName("itemCount")]
public MinMax ItemCount { get; set; }
public MinMax? ItemCount { get; set; }
/// <summary>
/// Count of sealed weapon crates to generate
/// </summary>
[JsonPropertyName("weaponCrateCount")]
public MinMax WeaponCrateCount { get; set; }
public MinMax? WeaponCrateCount { get; set; }
/// <summary>
/// Item tpl blacklist to exclude
/// </summary>
[JsonPropertyName("itemBlacklist")]
public List<string> ItemBlacklist { get; set; }
public List<string>? ItemBlacklist { get; set; }
/// <summary>
/// Item tpl whitelist to pick from
/// </summary>
[JsonPropertyName("itemTypeWhitelist")]
public List<string> ItemTypeWhitelist { get; set; }
public List<string>? ItemTypeWhitelist { get; set; }
/// <summary>
/// key: item base type: value: max count
/// </summary>
[JsonPropertyName("itemLimits")]
public Dictionary<string, int> ItemLimits { get; set; }
public Dictionary<string, int>? ItemLimits { get; set; }
[JsonPropertyName("itemStackLimits")]
public Dictionary<string, MinMax> ItemStackLimits { get; set; }
public Dictionary<string, MinMax>? ItemStackLimits { get; set; }
/// <summary>
/// Allowed armor plate levels 2/3/4/5/6 for armor generated
/// </summary>
[JsonPropertyName("armorLevelWhitelist")]
public List<int> ArmorLevelWhitelist { get; set; }
public List<int>? ArmorLevelWhitelist { get; set; }
/// <summary>
/// Should boss items be included in allowed items
/// </summary>
[JsonPropertyName("allowBossItems")]
public bool AllowBossItems { get; set; }
public bool? AllowBossItems { get; set; }
/// <summary>
/// Should item.json item reward blacklist be used
@@ -79,7 +79,7 @@ public class LootRequest
/// Item tpls + count of items to force include
/// </summary>
[JsonPropertyName("forcedLoot")]
public Dictionary<string, MinMax> ForcedLoot { get; set; }
public Dictionary<string, MinMax>? ForcedLoot { get; set; }
}
public class AirdropLootRequest : LootRequest
Core/Models/Spt/Services/TraderServiceModel.cs
+1 -1
View File
@@ -6,7 +6,7 @@ namespace Core.Models.Spt.Services;
public class TraderServiceModel
{
[JsonPropertyName("serviceType")]
public TraderServiceType ServiceType { get; set; }
public TraderServiceType? ServiceType { get; set; }
[JsonPropertyName("itemsToPay")]
public Dictionary<string, int>? ItemsToPay { get; set; }
Core/Models/Spt/Templates/Templates.cs
+13 -13
View File
@@ -7,46 +7,46 @@ namespace Core.Models.Spt.Templates;
public class Templates
{
[JsonPropertyName("character")]
public List<string> Character { get; set; }
public List<string>? Character { get; set; }
[JsonPropertyName("customisationStorage")]
public List<CustomisationStorage> CustomisationStorage { get; set; }
public List<CustomisationStorage>? CustomisationStorage { get; set; }
[JsonPropertyName("items")]
public Dictionary<string, TemplateItem> Items { get; set; }
public Dictionary<string, TemplateItem>? Items { get; set; }
[JsonPropertyName("prestige")]
public Prestige Prestige { get; set; }
public Prestige? Prestige { get; set; }
[JsonPropertyName("quests")]
public Dictionary<string, Quest> Quests { get; set; }
public Dictionary<string, Quest>? Quests { get; set; }
[JsonPropertyName("repeatableQuests")]
public RepeatableQuestDatabase RepeatableQuests { get; set; }
public RepeatableQuestDatabase? RepeatableQuests { get; set; }
[JsonPropertyName("handbook")]
public HandbookBase Handbook { get; set; }
public HandbookBase? Handbook { get; set; }
[JsonPropertyName("customization")]
public Dictionary<string, CustomizationItem> Customization { get; set; }
public Dictionary<string, CustomizationItem>? Customization { get; set; }
/** The profile templates listed in the launcher on profile creation, split by account type (e.g. Standard) then side (e.g. bear/usec) */
[JsonPropertyName("profiles")]
public ProfileTemplates Profiles { get; set; }
public ProfileTemplates? Profiles { get; set; }
/** Flea prices of items - gathered from online flea market dump */
[JsonPropertyName("prices")]
public Dictionary<string, double> Prices { get; set; }
public Dictionary<string, double>? Prices { get; set; }
/** Default equipment loadouts that show on main inventory screen */
[JsonPropertyName("defaultEquipmentPresets")]
public List<DefaultEquipmentPreset> DefaultEquipmentPresets { get; set; }
public List<DefaultEquipmentPreset>? DefaultEquipmentPresets { get; set; }
/** Achievements */
[JsonPropertyName("achievements")]
public List<Achievement> Achievements { get; set; }
public List<Achievement>? Achievements { get; set; }
/** Location services data */
[JsonPropertyName("locationServices")]
public LocationServices LocationServices { get; set; }
public LocationServices? LocationServices { get; set; }
}
Core/Models/Spt/Weather/GetLocalWeatherResponseData.cs
+2 -2
View File
@@ -5,8 +5,8 @@ namespace Core.Models.Spt.Weather;
public class GetLocalWeatherResponseData
{
[JsonPropertyName("season")]
public int Season { get; set; }
public int? Season { get; set; }
[JsonPropertyName("weather")]
public List<Eft.Weather.Weather> Weather { get; set; }
public List<Eft.Weather.Weather>? Weather { get; set; }
}