Weather refactor (#596)

* First pass at Weather generation refactor

* Moved generation logic around

* Added seasonal variability support

* Expanded weather generation to use DI system and allow easier modding

* Updated weather weight values

Converted records into classes

* Added fallback when generator isn't found

* Fixed colliding lambda

Added method comments

* Cleanup of weather code

* Adjusted `weatherPresetWeight` values

---------

Co-authored-by: Chomp <dev@dev.sp-tarkov.com>

Libraries/SPTarkov.Server.Core/Models/Eft/Weather/WeatherData.cs

@@ -1,5 +1,6 @@
 using System.Text.Json.Serialization;
 using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
 
 namespace SPTarkov.Server.Core.Models.Eft.Weather;
 
@@ -67,4 +68,7 @@ public record Weather
 
     [JsonPropertyName("sptInRaidTimestamp")]
     public long? SptInRaidTimestamp { get; set; }
+
+    [JsonPropertyName("sptChosenPreset")]
+    public WeatherPreset? SptChosenPreset { get; set; }
 }

Libraries/SPTarkov.Server.Core/Models/Spt/Config/WeatherConfig.cs

@@ -50,8 +50,8 @@ public record SeasonDateTimes
 
 public record WeatherValues
 {
-    [JsonPropertyName("seasonValues")]
-    public Dictionary<string, SeasonalValues>? SeasonValues { get; set; }
+    [JsonPropertyName("presetWeights")]
+    public Dictionary<string, PresetWeights>? PresetWeights { get; set; }
 
     /// <summary>
     ///     How many hours to generate weather data into the future
@@ -64,30 +64,40 @@ public record WeatherValues
     /// </summary>
     [JsonPropertyName("timePeriod")]
     public WeatherSettings<int>? TimePeriod { get; set; }
+
+    [JsonPropertyName("weatherPresetWeight")]
+    public Dictionary<string, Dictionary<WeatherPreset, double>> WeatherPresetWeight { get; set; }
 }
 
-public record SeasonalValues
+public enum WeatherPreset
+{
+    SUNNY = 1,
+    RAINY = 2,
+    CLOUDY = 3,
+}
+
+public record PresetWeights
 {
     [JsonPropertyName("clouds")]
-    public WeatherSettings<double>? Clouds { get; set; }
+    public Dictionary<string, double> Clouds { get; set; }
 
     [JsonPropertyName("windSpeed")]
-    public WeatherSettings<double>? WindSpeed { get; set; }
+    public Dictionary<string, double>? WindSpeed { get; set; }
 
     [JsonPropertyName("windDirection")]
-    public WeatherSettings<WindDirection>? WindDirection { get; set; }
+    public Dictionary<WindDirection, double>? WindDirection { get; set; }
 
     [JsonPropertyName("windGustiness")]
     public MinMax<double>? WindGustiness { get; set; }
 
     [JsonPropertyName("rain")]
-    public WeatherSettings<double>? Rain { get; set; }
+    public Dictionary<string, double>? Rain { get; set; }
 
     [JsonPropertyName("rainIntensity")]
     public MinMax<double>? RainIntensity { get; set; }
 
     [JsonPropertyName("fog")]
-    public WeatherSettings<double>? Fog { get; set; }
+    public Dictionary<string, double>? Fog { get; set; }
 
     [JsonPropertyName("temp")]
     public TempDayNight? Temp { get; set; }

Libraries/SPTarkov.Server.Core/Models/Spt/Weather/IWeatherPresetGenerator.cs

@@ -0,0 +1,9 @@
+using SPTarkov.Server.Core.Models.Spt.Config;
+
+namespace SPTarkov.Server.Core.Models.Spt.Weather;
+
+public interface IWeatherPresetGenerator
+{
+    public bool CanHandle(WeatherPreset preset);
+    public Eft.Weather.Weather Generate(PresetWeights weatherWeights);
+}