Merge branch 'develop' of https://github.com/sp-tarkov/server-csharp into develop

Libraries/SPTarkov.Server.Assets/SPT_Data/database/globals.json

@@ -35191,6 +35191,7 @@
       ],
       "active": false,
       "activePVE": false,
+      "initialFrozenDelaySec": 60,
       "applyFrozenEverySec": 1,
       "consumables": [
         "67586bee39b1b82b0d0f9d06"

Libraries/SPTarkov.Server.Core/Controllers/DialogueController.cs

@@ -396,7 +396,8 @@ public class DialogueController(
                     var checkTime = message.DateTime + (message.MaxStorageTime ?? 0);
                     return timeNow < checkTime;
                 })
-                .ToList() ?? [];
+                .ToList()
+            ?? [];
     }
 
     /// <summary>

Libraries/SPTarkov.Server.Core/Generators/BotEquipmentModGenerator.cs

@@ -1822,7 +1822,8 @@ public class BotEquipmentModGenerator(
                             .Filter.All(tpl =>
                                 itemHelper.IsOfBaseclasses(tpl, whitelistedSightTypes) || itemHelper.IsOfBaseclass(tpl, BaseClasses.MOUNT)
                             )
-                    ) ?? false
+                    )
+                    ?? false
                 )
                 // Add mod to allowed list
                 {

Libraries/SPTarkov.Server.Core/Generators/BotWeaponGenerator.cs

@@ -716,10 +716,8 @@ public class BotWeaponGenerator(
 
         // Try to get cartridges from slots array first, if none found, try Cartridges array
         var cartridges =
-            magazineTemplate.Value.Properties.Slots.FirstOrDefault()?.Properties?.Filters?.FirstOrDefault()?.Filter ?? magazineTemplate
-                .Value.Properties.Cartridges.FirstOrDefault()
-                ?.Properties?.Filters?.FirstOrDefault()
-                ?.Filter;
+            magazineTemplate.Value.Properties.Slots.FirstOrDefault()?.Properties?.Filters?.FirstOrDefault()?.Filter
+            ?? magazineTemplate.Value.Properties.Cartridges.FirstOrDefault()?.Properties?.Filters?.FirstOrDefault()?.Filter;
 
         return cartridges ?? [];
     }

Libraries/SPTarkov.Server.Core/Models/Eft/Common/Globals.cs

@@ -648,6 +648,9 @@ public record RunddansSettings
     [JsonPropertyName("applyFrozenEverySec")]
     public double ApplyFrozenEverySec { get; set; }
 
+    [JsonPropertyName("initialFrozenDelaySec")]
+    public double InitialFrozenDelaySec { get; set; }
+
     [JsonPropertyName("consumables")]
     public IEnumerable<string> Consumables { get; set; }
 

Libraries/SPTarkov.Server.Core/Services/LocationLifecycleService.cs

@@ -104,10 +104,10 @@ public class LocationLifecycleService(
             ServerSettings = databaseService.GetLocationServices(), // TODO - is this per map or global?
             Profile = new ProfileInsuredItems { InsuredItems = playerProfile.CharacterData.PmcData.InsuredItems },
             LocationLoot = GenerateLocationAndLoot(sessionId, request.Location, !request.ShouldSkipLootGeneration ?? true),
-            TransitionType = TransitionType.NONE,
+            TransitionType = request.TransitionType,
             Transition = new Transition
             {
-                TransitionType = TransitionType.NONE,
+                TransitionType = request.TransitionType,
                 TransitionRaidId = new MongoId(),
                 TransitionCount = 0,
                 VisitedLocations = [],
@@ -128,7 +128,7 @@ public class LocationLifecycleService(
         if (transitionData is not null)
         {
             logger.Success($"Player: {sessionId} is in transit to {request.Location}");
-            result.Transition.TransitionType = TransitionType.COMMON;
+            result.Transition.TransitionType = request.TransitionType;
             result.Transition.TransitionRaidId = transitionData.TransitionRaidId;
             result.Transition.TransitionCount += 1;
 

Libraries/SPTarkov.Server.Core/Services/ProfileFixerService.cs

@@ -585,7 +585,9 @@ public class ProfileFixerService(
                     if (profileBonus is null)
                     {
                         // No bonus in profile, add it
-                        logger.Debug($"Profile has level: {currentLevel} area: {profileArea.Type} but no bonus found, adding: {bonus.Type}");
+                        logger.Debug(
+                            $"Profile has level: {currentLevel} area: {profileArea.Type} but no bonus found, adding: {bonus.Type}"
+                        );
                         hideoutHelper.ApplyPlayerUpgradesBonus(pmcProfile, bonus);
                     }
                 }