diff --git a/Libraries/Core/Models/Eft/Match/RaidSettings.cs b/Libraries/Core/Models/Eft/Match/RaidSettings.cs index 14a051ad..357c69b8 100644 --- a/Libraries/Core/Models/Eft/Match/RaidSettings.cs +++ b/Libraries/Core/Models/Eft/Match/RaidSettings.cs @@ -17,6 +17,7 @@ public record RaidSettings public bool? IsLocationTransition { get; set; } [JsonPropertyName("timeVariant")] + [JsonConverter(typeof(JsonStringEnumConverter))] public DateTimeEnum TimeVariant { get; set; } [JsonPropertyName("metabolismDisabled")] @@ -35,12 +36,14 @@ public record RaidSettings public SideType? Side { get; set; } [JsonPropertyName("raidMode")] + [JsonConverter(typeof(JsonStringEnumConverter))] public RaidMode? RaidMode { get; set; } [JsonPropertyName("playersSpawnPlace")] + [JsonConverter(typeof(JsonStringEnumConverter))] public PlayersSpawnPlace? PlayersSpawnPlace { get; set; } - [JsonPropertyName("canShowGroupPreview")] + [JsonPropertyName("CanShowGroupPreview")] public bool? CanShowGroupPreview { get; set; } } @@ -53,18 +56,23 @@ public record TimeAndWeatherSettings public bool? IsRandomWeather { get; set; } [JsonPropertyName("cloudinessType")] + [JsonConverter(typeof(JsonStringEnumConverter))] public CloudinessType? CloudinessType { get; set; } [JsonPropertyName("rainType")] + [JsonConverter(typeof(JsonStringEnumConverter))] public RainType? RainType { get; set; } [JsonPropertyName("fogType")] + [JsonConverter(typeof(JsonStringEnumConverter))] public FogType? FogType { get; set; } [JsonPropertyName("windType")] + [JsonConverter(typeof(JsonStringEnumConverter))] public WindSpeed? WindType { get; set; } [JsonPropertyName("timeFlowType")] + [JsonConverter(typeof(JsonStringEnumConverter))] public TimeFlowType? TimeFlowType { get; set; } [JsonPropertyName("hourOfDay")] @@ -77,15 +85,18 @@ public record BotSettings public bool? IsScavWars { get; set; } [JsonPropertyName("botAmount")] + [JsonConverter(typeof(JsonStringEnumConverter))] public BotAmount? BotAmount { get; set; } } public record WavesSettings { [JsonPropertyName("botAmount")] + [JsonConverter(typeof(JsonStringEnumConverter))] public BotAmount? BotAmount { get; set; } [JsonPropertyName("botDifficulty")] + [JsonConverter(typeof(JsonStringEnumConverter))] public BotDifficulty? BotDifficulty { get; set; } [JsonPropertyName("isBosses")] diff --git a/Libraries/Core/Models/Enums/PlayersSpawnPlace.cs b/Libraries/Core/Models/Enums/PlayersSpawnPlace.cs index 91c4ec72..84c537b6 100644 --- a/Libraries/Core/Models/Enums/PlayersSpawnPlace.cs +++ b/Libraries/Core/Models/Enums/PlayersSpawnPlace.cs @@ -2,7 +2,7 @@ public enum PlayersSpawnPlace { - SAME_PLACE, - DIFFERENT_PLACES, - AT_THE_ENDS_OF_THE_MAP -} \ No newline at end of file + SamePlace, + DifferentPlaces, + AtTheEndsOfTheMap +} diff --git a/Libraries/Core/Models/Enums/RaidSettings/BotAmount.cs b/Libraries/Core/Models/Enums/RaidSettings/BotAmount.cs index 06678794..4233b9d9 100644 --- a/Libraries/Core/Models/Enums/RaidSettings/BotAmount.cs +++ b/Libraries/Core/Models/Enums/RaidSettings/BotAmount.cs @@ -2,10 +2,10 @@ public enum BotAmount { - AS_ONLINE, - NO_BOTS, - LOW, - MEDIUM, - HIGH, - HORDE -} \ No newline at end of file + AsOnline, + NoBots, + Low, + Medium, + High, + Horde +} diff --git a/Libraries/Core/Models/Enums/RaidSettings/BotDifficulty.cs b/Libraries/Core/Models/Enums/RaidSettings/BotDifficulty.cs index f641a086..5c1f8bd9 100644 --- a/Libraries/Core/Models/Enums/RaidSettings/BotDifficulty.cs +++ b/Libraries/Core/Models/Enums/RaidSettings/BotDifficulty.cs @@ -2,10 +2,10 @@ public enum BotDifficulty { - AS_ONLINE, - EASY, - MEDIUM, - HARD, - IMPOSSIBLE, - RANDOM -} \ No newline at end of file + AsOnline, + Easy, + Medium, + Hard, + Impossible, + Random +} diff --git a/Libraries/Core/Models/Enums/RaidSettings/TimeAndWeather/FogType.cs b/Libraries/Core/Models/Enums/RaidSettings/TimeAndWeather/FogType.cs index c225e0e1..e86e4549 100644 --- a/Libraries/Core/Models/Enums/RaidSettings/TimeAndWeather/FogType.cs +++ b/Libraries/Core/Models/Enums/RaidSettings/TimeAndWeather/FogType.cs @@ -2,9 +2,9 @@ public enum FogType { - NO_FOG, - FAINT, - FOG, - HEAVY, - CONTINUOUS -} \ No newline at end of file + NoFog, + Faint, + Fog, + Heavy, + Continuous +} diff --git a/Libraries/Core/Models/Enums/RaidSettings/TimeAndWeather/RainType.cs b/Libraries/Core/Models/Enums/RaidSettings/TimeAndWeather/RainType.cs index 32f7cffa..f38de375 100644 --- a/Libraries/Core/Models/Enums/RaidSettings/TimeAndWeather/RainType.cs +++ b/Libraries/Core/Models/Enums/RaidSettings/TimeAndWeather/RainType.cs @@ -2,9 +2,9 @@ public enum RainType { - NO_RAIN, - DRIZZLING, - RAIN, - HEAVY, - SHOWER -} \ No newline at end of file + NoRain, + Drizzling, + Rain, + Heavy, + Shower +} diff --git a/Libraries/Core/Models/Enums/RaidSettings/TimeAndWeather/TimeFlowType.cs b/Libraries/Core/Models/Enums/RaidSettings/TimeAndWeather/TimeFlowType.cs index f7099fc0..b03fdcb7 100644 --- a/Libraries/Core/Models/Enums/RaidSettings/TimeAndWeather/TimeFlowType.cs +++ b/Libraries/Core/Models/Enums/RaidSettings/TimeAndWeather/TimeFlowType.cs @@ -2,12 +2,12 @@ public enum TimeFlowType { - X0, - X0_14, - X0_25, - X0_5, - X1, - X2, - X4, - X8 -} \ No newline at end of file + x0, + x0_14, + x0_25, + x0_5, + x1, + x2, + x4, + x8 +} diff --git a/Libraries/Core/Models/Enums/RaidSettings/TimeAndWeather/WindSpeed.cs b/Libraries/Core/Models/Enums/RaidSettings/TimeAndWeather/WindSpeed.cs index 0985983d..859a089e 100644 --- a/Libraries/Core/Models/Enums/RaidSettings/TimeAndWeather/WindSpeed.cs +++ b/Libraries/Core/Models/Enums/RaidSettings/TimeAndWeather/WindSpeed.cs @@ -2,9 +2,9 @@ public enum WindSpeed { - LIGHT, - MODERATE, - STRONG, - VERY_STRONG, - HURRICANE -} \ No newline at end of file + Light, + Moderate, + Strong, + VeryStrong, + Hurricane +}