diff --git a/Core/Models/Eft/Profile/SptProfile.cs b/Core/Models/Eft/Profile/SptProfile.cs index 2950bbdc..160aacfd 100644 --- a/Core/Models/Eft/Profile/SptProfile.cs +++ b/Core/Models/Eft/Profile/SptProfile.cs @@ -135,6 +135,7 @@ public class EquipmentBuild : UserBuild public List? Items { get; set; } // Same as PMC inventory items [JsonPropertyName("BuildType")] + [JsonConverter(typeof(JsonStringEnumConverter))] public EquipmentBuildType? BuildType { get; set; } } @@ -165,15 +166,6 @@ public class MagazineTemplateAmmoItem /** Used by defaultEquipmentPresets.json */ public class DefaultEquipmentPreset : EquipmentBuild { - [JsonPropertyName("Items")] - public List? Items { get; set; } - - [JsonPropertyName("Root")] - public string? Root { get; set; } - - [JsonPropertyName("BuildType")] - public string? BuildType { get; set; } - [JsonPropertyName("type")] public string? Type { get; set; } } diff --git a/Core/Models/Enums/EquipmentBuildType.cs b/Core/Models/Enums/EquipmentBuildType.cs index 073f4169..36dd56de 100644 --- a/Core/Models/Enums/EquipmentBuildType.cs +++ b/Core/Models/Enums/EquipmentBuildType.cs @@ -2,6 +2,7 @@ public enum EquipmentBuildType { - CUSTOM = 0, - STANDARD = 1 -} \ No newline at end of file + Custom, + Standard, + Storage +} diff --git a/Core/Models/Spt/Logging/ClientLogRequest.cs b/Core/Models/Spt/Logging/ClientLogRequest.cs index a641d3ff..f015f80d 100644 --- a/Core/Models/Spt/Logging/ClientLogRequest.cs +++ b/Core/Models/Spt/Logging/ClientLogRequest.cs @@ -10,14 +10,15 @@ public class ClientLogRequest : IRequestData public string? Source { get; set; } [JsonPropertyName("Level")] + [JsonConverter(typeof(JsonStringEnumConverter))] // TODO: Fix in modules to send enumValue instead of string public LogLevel? Level { get; set; } [JsonPropertyName("Message")] public string? Message { get; set; } [JsonPropertyName("Color")] - public LogTextColor? Color { get; set; } + public string? Color { get; set; } // TODO: FIX THIS SHIT FOR COLOURS [JsonPropertyName("BackgroundColor")] - public LogBackgroundColor? BackgroundColor { get; set; } + public string? BackgroundColor { get; set; } } diff --git a/Core/Models/Spt/Logging/LogLevel.cs b/Core/Models/Spt/Logging/LogLevel.cs index 051cde1a..ee66cd1d 100644 --- a/Core/Models/Spt/Logging/LogLevel.cs +++ b/Core/Models/Spt/Logging/LogLevel.cs @@ -2,12 +2,12 @@ public enum LogLevel { - ERROR = 0, - WARN = 1, - SUCCESS = 2, - INFO = 3, - CUSTOM = 4, - DEBUG = 5 + Error, + Warn, + Success, + Info, + Custom, + Debug } -// TODO: needs to be moved to enums namespace \ No newline at end of file +// TODO: needs to be moved to enums namespace