fix types
This commit is contained in:
@@ -135,6 +135,7 @@ public class EquipmentBuild : UserBuild
|
||||
public List<Item>? 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<Item>? Items { get; set; }
|
||||
|
||||
[JsonPropertyName("Root")]
|
||||
public string? Root { get; set; }
|
||||
|
||||
[JsonPropertyName("BuildType")]
|
||||
public string? BuildType { get; set; }
|
||||
|
||||
[JsonPropertyName("type")]
|
||||
public string? Type { get; set; }
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
public enum EquipmentBuildType
|
||||
{
|
||||
CUSTOM = 0,
|
||||
STANDARD = 1
|
||||
}
|
||||
Custom,
|
||||
Standard,
|
||||
Storage
|
||||
}
|
||||
|
||||
@@ -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; }
|
||||
}
|
||||
|
||||
@@ -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
|
||||
// TODO: needs to be moved to enums namespace
|
||||
|
||||
Reference in New Issue
Block a user