Merge branch 'develop' into test/fix-failing-tests

Libraries/SPTarkov.Server.Assets/Assets/configs/hideout.json

@@ -148,6 +148,36 @@
                 "craftTimeSeconds": 3960,
                 "repeatable": false
             },
+            {
+              "reward": ["590c346786f77423e50ed342"],
+              "requiredItems": ["679b9d55708cfcb2060b9ae3"],
+              "craftTimeSeconds": 3960,
+              "repeatable": false
+            },
+            {
+              "reward": ["64d4b23dc1b37504b41ac2b6"],
+              "requiredItems": ["679b9d6390622daf9708da76"],
+              "craftTimeSeconds": 3960,
+              "repeatable": false
+            },
+            {
+              "reward": ["590c31c586f774245e3141b2"],
+              "requiredItems": ["679b9cce4e4ed4b3b40ae5c5"],
+              "craftTimeSeconds": 3960,
+              "repeatable": false
+            },
+            {
+              "reward": ["5b4335ba86f7744d2837a264"],
+              "requiredItems": ["679b9d4b3374fb14f40efe6d"],
+              "craftTimeSeconds": 3960,
+              "repeatable": false
+            },
+            {
+              "reward": ["62a09e974f842e1bd12da3f0"],
+              "requiredItems": ["679b9d43597ba2ed120c3d44"],
+              "craftTimeSeconds": 3960,
+              "repeatable": false
+            },
             {
                 "reward": ["5d1b376e86f774252519444e"],
                 "requiredItems": ["6582dbf0b8d7830efc45016f"],

Libraries/SPTarkov.Server.Assets/Assets/configs/pmc.json

@@ -2345,7 +2345,7 @@
                 "TriggerName": ""
             },
             {
-                "BossChance": 80,
+                "BossChance": 70,
                 "BossDifficult": "normal",
                 "BossEscortAmount": "0,1,1,2,2,2,2,3",
                 "BossEscortDifficult": "normal",
@@ -2363,7 +2363,7 @@
                 "TriggerName": ""
             },
             {
-                "BossChance": 80,
+                "BossChance": 70,
                 "BossDifficult": "normal",
                 "BossEscortAmount": "0,1,1,2,2,2,2,3",
                 "BossEscortDifficult": "normal",
@@ -2381,7 +2381,7 @@
                 "TriggerName": ""
             },
             {
-                "BossChance": 70,
+                "BossChance": 60,
                 "BossDifficult": "normal",
                 "BossEscortAmount": "0,1,1,2,2,2,2,3",
                 "BossEscortDifficult": "normal",
@@ -2399,7 +2399,7 @@
                 "TriggerName": ""
             },
             {
-                "BossChance": 70,
+                "BossChance": 60,
                 "BossDifficult": "normal",
                 "BossEscortAmount": "0,1,1,2,2,2,2,3",
                 "BossEscortDifficult": "normal",
@@ -2417,7 +2417,7 @@
                 "TriggerName": ""
             },
             {
-                "BossChance": 70,
+                "BossChance": 60,
                 "BossDifficult": "normal",
                 "BossEscortAmount": "0,1,1,2,2,2,2,3",
                 "BossEscortDifficult": "normal",
@@ -2435,7 +2435,7 @@
                 "TriggerName": ""
             },
             {
-                "BossChance": 70,
+                "BossChance": 60,
                 "BossDifficult": "normal",
                 "BossEscortAmount": "0,1,1,2,2,2,2,3",
                 "BossEscortDifficult": "normal",

Libraries/SPTarkov.Server.Core/FodyWeavers.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+    <Virtuosity/>
+</Weavers>

Libraries/SPTarkov.Server.Core/FodyWeavers.xsd

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="Virtuosity" minOccurs="0" maxOccurs="1" type="xs:anyType" />
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>

Libraries/SPTarkov.Server.Core/SPTarkov.Server.Core.csproj

@@ -22,6 +22,18 @@
   <ItemGroup>
     <PackageReference Include="System.IO.Hashing" Version="9.0.5"/>
     <PackageReference Include="FastCloner" Version="3.3.4"/>
+    
+    <!--
+     We are using Fody to make all methods virtual, this is a perfect use case for us to allow modders to override 
+     any behaviour they need and replace any classes.
+     -->
+    <PackageReference Include="Fody" Version="6.9.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Virtuosity.Fody" Version="3.1.2" >
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>