Fix FreeCamere not enter after extract

.github/workflows/SIT-CD.yml

@@ -3,7 +3,6 @@ name: SIT Build Release
 on:
     workflow_dispatch:
 
-
 permissions:
   contents: write
 
@@ -16,78 +15,48 @@ jobs:
       matrix:
         configuration: [Release]
 
-    runs-on: windows-latest 
+    runs-on: ubuntu-latest
 
     env:
       SolutionName: StayInTarkov                              
-      CSProj: Source/StayInTarkov.csproj               
+      ProjectClient: Source/StayInTarkov.csproj      
+      ProjectPrePatcher: SIT.WildSpawnType.PrePatcher/SIT.WildSpawnType.PrePatcher.csproj          
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
-
-    # Install the .NET Core workload
     - name: Install .NET Core
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: 6.0.x
 
-    # Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
-    - name: Setup MSBuild.exe
-      uses: microsoft/[email protected]
-
-    # Restore all projects
     - name: dotnet Restore
       run: dotnet restore
 
-    # Publish the Launcher as Self-Contained Single-File
-    - name: dotnet Publish
+    - name: dotnet build
       run: |
         mkdir ${{ env.SolutionName }}-${{ matrix.configuration }}
-        dotnet build ${{ env.CSProj }} -c ${{ matrix.configuration }} -o ${{ env.SolutionName }}-${{ matrix.configuration }}
+        dotnet build ${{ env.ProjectClient }} -c ${{ matrix.configuration }} -o ${{ env.SolutionName }}-${{ matrix.configuration }}
+        dotnet build ${{ env.ProjectPrePatcher }} -c ${{ matrix.configuration }} -o ${{ env.SolutionName }}-${{ matrix.configuration }}
 
     - name: Get version from DLL
       id: extract-version
       run: |
-        $version = [System.Diagnostics.FileVersionInfo]::GetVersionInfo("${{ env.SolutionName }}-${{ matrix.configuration }}\StayInTarkov.dll").ProductVersion
-        echo "::set-output name=VERSION::$version"
-
-
-    - name: Remove unnecessary files
-      run: |
-          del ${{ env.SolutionName }}-${{ matrix.configuration }}\StayInTarkov.pdb
-
-    #- name: Display Version in Logs
-     # run: echo "The extracted version is ${{ steps.extract-version.outputs.VERSION }}"
+        version=`monodis --assembly ${{ env.SolutionName }}-${{ matrix.configuration }}/StayInTarkov.dll | grep Version | awk '{print $2}'`
+        echo "VERSION=$version" >> "$GITHUB_ENV"
 
     - name: Zip remaining files
       run: |
-          Compress-Archive -Path ${{ env.SolutionName }}-${{ matrix.configuration }} -DestinationPath ${{ env.SolutionName }}-${{ matrix.configuration }}.zip
-
+        cd ${{ env.SolutionName }}-${{ matrix.configuration }}
+        zip -r ../${{ env.SolutionName }}-${{ matrix.configuration }}.zip ./*.dll
 
-
-    # Upload artifact unless its merge to master
-    - name: Upload artifact
-      uses: actions/upload-artifact@v3
-      with:
-        name: StayInTarkov-${{ matrix.configuration }}
-        path: ${{ env.SolutionName }}-${{ matrix.configuration }}\
-        if-no-files-found: error
-
-    #- name: Set build date
-     # run: |
-      #  $NOW=& Get-Date -format yyyy-MM-dd-HH-mm
-       # echo "NOW=$NOW" >> $env:GITHUB_ENV
-
-    # Create release as draft from the compressed file
     - name: Create Release
       uses: softprops/action-gh-release@v1
-      if: ${{ matrix.configuration == 'Release' }}
       with:
           draft: true
           generate_release_notes: true
           files: ${{ env.SolutionName }}-${{ matrix.configuration }}.zip
-          tag_name: StayInTarkov.Client-${{ steps.extract-version.outputs.VERSION }}
+          tag_name: StayInTarkov.Client-${{ env.VERSION }}

.github/workflows/SIT-CI-Linux.yml

@@ -28,16 +28,17 @@ jobs:
 
     env:
       SolutionName: StayInTarkov
-      CSProj: Source/StayInTarkov.csproj
+      ProjectClient: Source/StayInTarkov.csproj
+      ProjectPrePatcher: SIT.WildSpawnType.PrePatcher/SIT.WildSpawnType.PrePatcher.csproj          
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Setup .NET Core
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 6.0.x
 
@@ -49,12 +50,13 @@ jobs:
       - name: dotnet Publish
         run: |
           mkdir ${{ env.SolutionName }}-${{ matrix.configuration }}
-          dotnet build ${{ env.CSProj }} -c ${{ matrix.configuration }} -o ${{ env.SolutionName }}-${{ matrix.configuration }}
+          dotnet build ${{ env.ProjectClient }} -c ${{ matrix.configuration }} -o ${{ env.SolutionName }}-${{ matrix.configuration }}
+          dotnet build ${{ env.ProjectPrePatcher }} -c ${{ matrix.configuration }} -o ${{ env.SolutionName }}-${{ matrix.configuration }}
 
       # Remove unnecessary files
       - name: Remove unnecessary files
         run: |
-          rm ${{ env.SolutionName }}-${{ matrix.configuration }}/StayInTarkov.pdb
+          rm ${{ env.SolutionName }}-${{ matrix.configuration }}/*.pdb
 
       # Zip remaining files
       - name: Zip remaining files
@@ -63,7 +65,7 @@ jobs:
 
       # Upload artifact with GitHub commit SHA
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.SolutionName }}-${{ matrix.configuration }}-${{ github.sha }}
           path: ${{ env.SolutionName }}-${{ matrix.configuration }}/

.github/workflows/publish-wiki.yml

@@ -15,5 +15,5 @@ jobs:
   publish-wiki:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: Andrew-Chen-Wang/github-wiki-action@v4

.gitignore

@@ -9,6 +9,7 @@
 # 
 [Bb]in/
 [Dd]ebug/
+/vcpkg_installed
 
 # User-specific files
 *.rsuser

COMPILE.md

@@ -1,15 +1,22 @@
-## How to compile? 
+## How to compile Master branch?
+1. Create Working Directory for all Tarkov Modding {EFT_WORK}
+2. Clone this {SIT_CORE} to a {SIT_CORE} directory inside {EFT_WORK}
+3. Open the .sln with Visual Studio 2022
+4. Rebuild Solution (This should download and install all nuget packages on compilation)
+
+## How to compile on Latest EFT? 
 1. Create Working Directory for all Tarkov Modding {EFT_WORK}
 2. Clone this {SIT_CORE} to a {SIT_CORE} directory inside {EFT_WORK}
 3. Copy your Live Tarkov Directory somewhere else {EFT_OFFLINE}
-4. Deobfuscate latest Assembly-CSharp in {EFT_OFFLINE} via [SIT.Launcher](https://github.com/paulov-t/SIT.Tarkov.Launcher). Ensure to close and restart Launcher after Deobfuscation.
-5. Copy all of {EFT_OFFLINE}\EscapeFromTarkov_Data\Managed assemblies to References {TARKOV.REF} in the folder of this project {EFT_WORK}
+4. Deobfuscate latest Assembly-CSharp in {EFT_OFFLINE} via [SIT.Launcher](https://github.com/paulov-t/SIT.Launcher.Classic). Ensure to close and restart Launcher after Deobfuscation.
+5. Copy {EFT_OFFLINE}\EscapeFromTarkov_Data\Managed\Assembly-CSharp to References {TARKOV.REF} in the folder of this project {EFT_WORK}
 6. You will need BepInEx Nuget Feed installed on your PC by running the following command in a terminal. 
 ```
 dotnet new -i BepInEx.Templates --nuget-source https://nuget.bepinex.dev/v3/index.json
 ```
 7. Open the .sln with Visual Studio 2022
-8. Rebuild Solution (This should download and install all nuget packages on compilation)
+8. Copy the `contents` of `_GlobalUsings.SITRemapperConfig.cs` into `GlobalUsings.cs` in this project. `!Manually remove bad remaps!`
+9. Rebuild Solution (This should download and install all nuget packages on compilation)
 
-## Which version of BepInEx is this built for?
+## Which version of BepInEx is this project compatible with?
 Version 5

SIT.WildSpawnType.PrePatcher/SIT.WildSpawnType.PrePatcher.csproj

@@ -0,0 +1,28 @@
+
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net471</TargetFramework>
+    <AssemblyName>SIT.WildSpawnType.PrePatcher</AssemblyName>
+	<Configuration>Release</Configuration>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <Company>Stay In Tarkov</Company>
+    <Copyright>Copyright @ Stay In Tarkov 2024</Copyright>
+	<Description>Stay in Tarkov plugin for Escape From Tarkov</Description>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="Assembly-CSharp" HintPath="..\References\Assembly-CSharp.dll" Private="False" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="BepInEx.Core" Version="5.4.21" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" ExcludeAssets="runtime" PrivateAssets="all">
+      <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" Private="False" ExcludeAssets="runtime" PrivateAssets="all" />
+  </ItemGroup>
+
+</Project>

SIT.WildSpawnType.PrePatcher/WildSpawnTypePrePatcher.cs

@@ -0,0 +1,35 @@
+using System.Collections.Generic;
+using System.Linq;
+using Mono.Cecil;
+
+namespace StayInTarkov
+{
+    public static class WildSpawnTypePrePatcher
+    {
+        public static IEnumerable<string> TargetDLLs { get; } = new[] { "Assembly-CSharp.dll" };
+
+        public static int sptUsecValue = 47;
+        public static int sptBearValue = 48;
+
+        public static void Patch(ref AssemblyDefinition assembly)
+        {
+            var botEnums = assembly.MainModule.GetType("EFT.WildSpawnType");
+
+            var sptUsec = new FieldDefinition("sptUsec",
+                    FieldAttributes.Public | FieldAttributes.Static | FieldAttributes.Literal | FieldAttributes.HasDefault,
+                    botEnums)
+                { Constant = sptUsecValue };
+
+            var sptBear = new FieldDefinition("sptBear",
+                    FieldAttributes.Public | FieldAttributes.Static | FieldAttributes.Literal | FieldAttributes.HasDefault,
+                    botEnums)
+                { Constant = sptBearValue };
+
+            if(!botEnums.Fields.Any(x => x.Name == "sptUsec"))
+                botEnums.Fields.Add(sptUsec);
+
+            if(!botEnums.Fields.Any(x => x.Name == "sptBear"))
+                botEnums.Fields.Add(sptBear);
+        }
+    }
+}

Source/AI/BlockerErrorFixPatch.cs

@@ -0,0 +1,34 @@
+//using EFT;
+//using HarmonyLib;
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Reflection;
+//using System.Security.Cryptography.X509Certificates;
+//using System.Text;
+//using System.Threading.Tasks;
+
+//namespace StayInTarkov.AI
+//{
+//    /// <summary>
+//    /// Paulov: Stay in Tarkov causes an error with the phrase BLOCKER ERROR caused by spt WildSpawnTypes
+//    /// This patch resolves this error by adding the spt WildSpawnTypes to the ServerBotSettingsClass
+//    /// LICENSE: This patch is only for use in Stay In Tarkov
+//    /// </summary>
+//    public sealed class BlockerErrorFixPatch : ModulePatch
+//    {
+//        protected override MethodBase GetTargetMethod()
+//        {
+//            return AccessTools.GetDeclaredMethods(typeof(ServerBotSettingsClass)).First(x => x.Name == nameof(ServerBotSettingsClass.Init));
+//        }
+
+//        [PatchPrefix]
+//        public static bool Prefix(Dictionary<WildSpawnType, ServerBotSettingsValuesClass> ___dictionary_0)
+//        {
+//            var enumValues = Enum.GetValues(typeof(WildSpawnType));
+//            ___dictionary_0.Add((WildSpawnType)enumValues.GetValue(enumValues.Length - 2), new ServerBotSettingsValuesClass(false, false, true, "ScavRole/PmcBot"));
+//            ___dictionary_0.Add((WildSpawnType)enumValues.GetValue(enumValues.Length - 1), new ServerBotSettingsValuesClass(false, false, true, "ScavRole/PmcBot"));
+//            return true;
+//        }
+//    }
+//}