Merge tag '4.0.4'

Author: ArchangelWTF

Build.props

@@ -1,7 +1,7 @@
 <Project>
     <PropertyGroup>
         <!--  SPT specific  -->
-        <SptVersion Condition="'$(SptVersion)' == ''">4.0.2</SptVersion>
+        <SptVersion Condition="'$(SptVersion)' == ''">4.0.3</SptVersion>
         <SptCommit Condition="'$(SptCommit)' == ''">a12b34</SptCommit>
         <SptBuildTime Condition="'$(SptBuildTime)' == ''">0000000000</SptBuildTime>
         <SptBuildType Condition="'$(SptBuildType)' == ''">LOCAL</SptBuildType>

Libraries/SPTarkov.Reflection/Patching/ModPatchCache.cs

@@ -3,6 +3,7 @@ namespace SPTarkov.Reflection.Patching;
 /// <summary>
 ///     Cache of active patches for mod developers to use for compatibility reasons
 /// </summary>
+[Obsolete("Patches will be injectable through IEnumerable<IRuntimePatch> in SPT 4.1, making this redundant")]
 public static class ModPatchCache
 {
     private static readonly List<AbstractPatch> _activePatches = [];
@@ -22,6 +23,7 @@ public static class ModPatchCache
     /// <remarks>
     ///     This should never be called before PreSptLoad is completed, otherwise could be empty.
     /// </remarks>
+    [Obsolete("Patches will be injectable through IEnumerable<IRuntimePatch> in SPT 4.1, making this redundant")]
     public static IReadOnlyList<AbstractPatch> GetActivePatches()
     {
         // We're not exposing _activePatches so it cant be altered outside of this class. Do NOT implement this as a property.
@@ -38,6 +40,7 @@ public static IReadOnlyList<AbstractPatch> GetActivePatches()
     /// <remarks>
     ///     This should never be called before PreSptLoad is completed, otherwise could be empty.
     /// </remarks>
+    [Obsolete("Patches will be injectable through IEnumerable<IRuntimePatch> in SPT 4.1, making this redundant")]
     public static List<string> GetActivePatchedMethodNames()
     {
         var result = new List<string>();

Libraries/SPTarkov.Server.Assets/SPT_Data/configs/bot.json

@@ -2895,10 +2895,19 @@
       "bossKilla",
       "bossKojaniy",
       "bossSanitar",
-      "bossKolontay",
-      "bossKnight"
+      "bossKolontay"
     ],
     "resetDay": "Monday"
   },
+  "goonSpawnSystem": {
+    "enabled": true,
+    "locationPool": [
+      "bigmap",
+      "woods",
+      "shoreline",
+      "lighthouse"
+    ],
+    "spawnChance": 35
+  },
   "replaceScavWith": "assault"
 }

Libraries/SPTarkov.Server.Assets/SPT_Data/configs/item.json

@@ -61,7 +61,8 @@
     "679baa2c61f588ae2b062a24",
     "679baa4f59b8961f370dd683",
     "679baa5a59b8961f370dd685",
-    "679baa9091966fe40408f149"
+    "679baa9091966fe40408f149",
+    "67ab3d4b83869afd170fdd3f"
   ],
   "bossItems": [
     "6275303a9f372d6ea97f9ec7",
@@ -475,6 +476,74 @@
       "_name": "FN SCAR-H X-17 762x51 default",
       "_parent": "679f5f42ca975ceee4001927",
       "_type": "Preset"
+    },
+    {
+      "_changeWeaponName": false,
+      "_encyclopedia": "67d0576f29f580ebc10efd08",
+      "_id": "690a065b64b2a3bab0a986da",
+      "_items": [
+        {
+          "_id": "690a06bc6c65be6d001b4cd1",
+          "_tpl": "67d0576f29f580ebc10efd08",
+          "upd": {
+            "Repairable": {
+              "Durability": 100,
+              "MaxDurability": 100
+            }
+          }
+        },
+        {
+          "_id": "690a06bc6c65be6d001b4d0a",
+          "_tpl": "67d4178bffb910d21f04720a",
+          "parentId": "690a06bc6c65be6d001b4cd1",
+          "slotId": "mod_barrel"
+        },
+        {
+          "_id": "690a06bc6c65be6d001b4d18",
+          "_tpl": "67d417c023ec241bb70d4896",
+          "parentId": "690a06bc6c65be6d001b4d0a",
+          "slotId": "mod_gas_block"
+        },
+        {
+          "_id": "690a06bc6c65be6d001b4d32",
+          "_tpl": "67d41883f378a36c4706eeb7",
+          "parentId": "690a06bc6c65be6d001b4d0a",
+          "slotId": "mod_muzzle"
+        },
+        {
+          "_id": "690a06bc6c65be6d001b4d3b",
+          "_tpl": "67d416e19bd76ef20f0e743b",
+          "parentId": "690a06bc6c65be6d001b4cd1",
+          "slotId": "mod_reciever"
+        },
+        {
+          "_id": "690a06bc6c65be6d001b4d43",
+          "_tpl": "5aa66a9be5b5b0214e506e89",
+          "parentId": "690a06bc6c65be6d001b4d3b",
+          "slotId": "mod_scope"
+        },
+        {
+          "_id": "690a06bc6c65be6d001b4d4b",
+          "_tpl": "5aa66be6e5b5b0214e506e97",
+          "parentId": "690a06bc6c65be6d001b4d43",
+          "slotId": "mod_scope"
+        },
+        {
+          "_id": "690a06bc6c65be6d001b4d5c",
+          "_tpl": "6087e663132d4d12c81fd96b",
+          "parentId": "690a06bc6c65be6d001b4cd1",
+          "slotId": "mod_pistol_grip"
+        },
+        {
+          "_id": "690a06bc6c65be6d001b4d65",
+          "_tpl": "67d418d0ffb910d21f04720e",
+          "parentId": "690a06bc6c65be6d001b4cd1",
+          "slotId": "mod_magazine"
+        }
+      ],
+      "_name": "AK-50 .50 BMG sniper rifle default",
+      "_parent": "690a06bc6c65be6d001b4cd1",
+      "_type": "Preset"
     }
   ],
   "handbookPriceOverride": {

Libraries/SPTarkov.Server.Assets/SPT_Data/configs/ragfair.json

@@ -194,14 +194,14 @@
       },
       "5d650c3e815116009f6201d2": {
         "_name": "FUEL",
-        "conditionChance": 0.12,
+        "conditionChance": 0.23,
         "current": {
           "max": 1,
           "min": 1
         },
         "max": {
           "max": 1,
-          "min": 0.7
+          "min": 0.1
         }
       },
       "644120aa86ffbe10ee032b6f": {
@@ -323,7 +323,8 @@
       "57bef4c42459772e8d35a53b",
       "55802f4a4bdc2ddb688b4569",
       "616eb7aea207f41933308f46",
-      "543be5cb4bdc2deb348b4568"
+      "543be5cb4bdc2deb348b4568",
+      "5d650c3e815116009f6201d2"
     ],
     "showDefaultPresetsOnly": true,
     "stackablePercent": {