Running and working 3.9 build

project-fika · May 24, 2024 · f56290d · f56290d
1 parent e566206
commit f56290d
Show file tree

Hide file tree

Showing 49 changed files with 196 additions and 153 deletions.
diff --git a/Fika.Core/AkiSupport/Airdrops/Models/FikaAirdropConfigModel.cs b/Fika.Core/AkiSupport/Airdrops/Models/FikaAirdropConfigModel.cs
@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using System.Collections.Generic;
 
-namespace Aki.Custom.Airdrops.Models
+namespace SPT.Custom.Airdrops.Models
 {
     /// <summary>
     /// Created by: SPT-Aki team

diff --git a/Fika.Core/AkiSupport/Airdrops/Models/FikaAirdropLootModel.cs b/Fika.Core/AkiSupport/Airdrops/Models/FikaAirdropLootModel.cs
@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using System.Collections.Generic;
 
-namespace Aki.Custom.Airdrops.Models
+namespace SPT.Custom.Airdrops.Models
 {
     /// <summary>
     /// Created by: SPT-Aki team

diff --git a/Fika.Core/AkiSupport/Airdrops/Models/FikaAirdropParametersModel.cs b/Fika.Core/AkiSupport/Airdrops/Models/FikaAirdropParametersModel.cs
@@ -1,5 +1,5 @@
-using Aki.Custom.Airdrops.Models;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
+using SPT.Custom.Airdrops.Models;
 using UnityEngine;
 
 namespace Fika.Core.AkiSupport.Airdrops.Models

diff --git a/Fika.Core/AkiSupport/Airdrops/Patches/FikaAirdropFlare_Patch.cs b/Fika.Core/AkiSupport/Airdrops/Patches/FikaAirdropFlare_Patch.cs
@@ -1,7 +1,7 @@
-using Aki.Reflection.Patching;
-using Comfort.Common;
+using Comfort.Common;
 using EFT;
 using EFT.Airdrop;
+using SPT.Reflection.Patching;
 using System.Linq;
 using System.Reflection;
 

diff --git a/Fika.Core/AkiSupport/Airdrops/Utils/FikaAirdropUtil.cs b/Fika.Core/AkiSupport/Airdrops/Utils/FikaAirdropUtil.cs
@@ -1,9 +1,9 @@
-using Aki.Common.Http;
-using Aki.Custom.Airdrops.Models;
-using EFT;
+using EFT;
 using EFT.Airdrop;
 using Fika.Core.AkiSupport.Airdrops.Models;
 using Newtonsoft.Json;
+using SPT.Common.Http;
+using SPT.Custom.Airdrops.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;

diff --git a/Fika.Core/AkiSupport/Airdrops/Utils/FikaItemFactoryUtil.cs b/Fika.Core/AkiSupport/Airdrops/Utils/FikaItemFactoryUtil.cs
@@ -1,12 +1,12 @@
-using Aki.Common.Http;
-using Aki.Custom.Airdrops.Models;
-using BepInEx.Logging;
+using BepInEx.Logging;
 using Comfort.Common;
 using EFT;
 using EFT.Interactive;
 using EFT.InventoryLogic;
 using Fika.Core;
 using Newtonsoft.Json;
+using SPT.Common.Http;
+using SPT.Custom.Airdrops.Models;
 using System.Linq;
 
 namespace Aki.Custom.Airdrops.Utils

diff --git a/Fika.Core/AkiSupport/Overrides/AddEnemyToAllGroupsInBotZonePatch_Override.cs b/Fika.Core/AkiSupport/Overrides/AddEnemyToAllGroupsInBotZonePatch_Override.cs
@@ -1,7 +1,7 @@
-using Aki.Reflection.Patching;
-using EFT;
+using EFT;
 using Fika.Core.Coop.Players;
 using HarmonyLib;
+using SPT.Reflection.Patching;
 using System.Collections.Generic;
 using System.Reflection;
 

diff --git a/Fika.Core/AkiSupport/Overrides/BotDifficultyPatch_Override.cs b/Fika.Core/AkiSupport/Overrides/BotDifficultyPatch_Override.cs
@@ -1,7 +1,7 @@
-using Aki.Common.Http;
-using Aki.Reflection.Patching;
-using EFT;
+using EFT;
 using Fika.Core.Coop.Matchmaker;
+using SPT.Common.Http;
+using SPT.Reflection.Patching;
 using System.Reflection;
 
 namespace Fika.Core.AkiSupport.Overrides

diff --git a/Fika.Core/AkiSupport/Overrides/BotTemplateLimitPatch_Override.cs b/Fika.Core/AkiSupport/Overrides/BotTemplateLimitPatch_Override.cs
@@ -1,7 +1,7 @@
-using Aki.Common.Http;
-using Aki.Reflection.Patching;
-using Fika.Core.Coop.Matchmaker;
+using Fika.Core.Coop.Matchmaker;
 using HarmonyLib;
+using SPT.Common.Http;
+using SPT.Reflection.Patching;
 using System;
 using System.Collections.Generic;
 using System.Reflection;

diff --git a/Fika.Core/AkiSupport/Overrides/MaxBotPatch_Override.cs b/Fika.Core/AkiSupport/Overrides/MaxBotPatch_Override.cs
@@ -1,7 +1,7 @@
-using Aki.Common.Http;
-using Aki.Reflection.Patching;
-using Aki.Reflection.Utils;
-using Fika.Core.Coop.Matchmaker;
+using Fika.Core.Coop.Matchmaker;
+using SPT.Common.Http;
+using SPT.Reflection.Patching;
+using SPT.Reflection.Utils;
 using System.Reflection;
 
 namespace Fika.Core.AkiSupport.Overrides

diff --git a/Fika.Core/AkiSupport/Overrides/OfflineRaidSettingsMenuPatch_Override.cs b/Fika.Core/AkiSupport/Overrides/OfflineRaidSettingsMenuPatch_Override.cs
@@ -1,7 +1,7 @@
-using Aki.Reflection.Patching;
-using EFT.UI;
+using EFT.UI;
 using EFT.UI.Matchmaker;
 using HarmonyLib;
+using SPT.Reflection.Patching;
 using System;
 using System.Collections.Generic;
 using System.Reflection;

diff --git a/Fika.Core/AkiSupport/Scav/ScavProfileLoad_Override.cs b/Fika.Core/AkiSupport/Scav/ScavProfileLoad_Override.cs
@@ -1,12 +1,12 @@
-using Aki.Reflection.Patching;
-using EFT;
+using EFT;
+using SPT.Reflection.Patching;
 using System.Reflection;
 
 namespace Fika.Core.AkiSupport.Scav
 {
     internal class ScavProfileLoad_Override : ModulePatch
     {
-        protected override MethodBase GetTargetMethod() => typeof(TarkovApplication).GetMethod(nameof(TarkovApplication.method_46));
+        protected override MethodBase GetTargetMethod() => typeof(TarkovApplication).GetMethod(nameof(TarkovApplication.method_50));
 
         [PatchPrefix]
         private static void PatchPrefix(ref string profileId, Profile savageProfile, RaidSettings ____raidSettings)

diff --git a/Fika.Core/Coop/Airdrops/FikaAirdropsManager.cs b/Fika.Core/Coop/Airdrops/FikaAirdropsManager.cs
@@ -1,5 +1,4 @@
-using Aki.Custom.Airdrops.Models;
-using Aki.Custom.Airdrops.Utils;
+using Aki.Custom.Airdrops.Utils;
 using BepInEx.Logging;
 using Comfort.Common;
 using EFT;
@@ -13,6 +12,7 @@
 using Fika.Core.Networking;
 using LiteNetLib;
 using LiteNetLib.Utils;
+using SPT.Custom.Airdrops.Models;
 using System;
 using System.Collections;
 using UnityEngine;

diff --git a/Fika.Core/Coop/BTR/FikaBTRManager_Client.cs b/Fika.Core/Coop/BTR/FikaBTRManager_Client.cs
@@ -1,7 +1,4 @@
-using Aki.Custom.BTR;
-using Aki.Custom.BTR.Utils;
-using Aki.SinglePlayer.Utils.TraderServices;
-using BepInEx.Logging;
+using BepInEx.Logging;
 using Comfort.Common;
 using EFT;
 using EFT.AssetsManager;
@@ -13,6 +10,9 @@
 using Fika.Core.Networking;
 using HarmonyLib;
 using LiteNetLib.Utils;
+using SPT.Custom.BTR;
+using SPT.Custom.BTR.Utils;
+using SPT.SinglePlayer.Utils.TraderServices;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -360,8 +360,8 @@ private BTRDataPacket UpdateDataPacket()
             btrDataPacket.rotation = btrServerSide.transform.rotation;
             if (btrTurretServer != null && btrTurretServer.gunsBlockRoot != null)
             {
-                btrDataPacket.turretRotation = btrTurretServer.transform.rotation;
-                btrDataPacket.gunsBlockRotation = btrTurretServer.gunsBlockRoot.rotation;
+                btrDataPacket.turretRotation = btrTurretServer.transform.localEulerAngles.y;
+                btrDataPacket.gunsBlockRotation = btrTurretServer.gunsBlockRoot.localEulerAngles.x;
             }
             btrDataPacket.State = (byte)btrServerSide.BtrState;
             btrDataPacket.RouteState = (byte)btrServerSide.VehicleRouteState;

diff --git a/Fika.Core/Coop/BTR/FikaBTRManager_Host.cs b/Fika.Core/Coop/BTR/FikaBTRManager_Host.cs
@@ -1,7 +1,4 @@
-using Aki.Custom.BTR;
-using Aki.Custom.BTR.Utils;
-using Aki.SinglePlayer.Utils.TraderServices;
-using BepInEx.Logging;
+using BepInEx.Logging;
 using Comfort.Common;
 using EFT;
 using EFT.GlobalEvents;
@@ -13,6 +10,9 @@
 using HarmonyLib;
 using LiteNetLib;
 using LiteNetLib.Utils;
+using SPT.Custom.BTR;
+using SPT.Custom.BTR.Utils;
+using SPT.SinglePlayer.Utils.TraderServices;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -481,8 +481,8 @@ private BTRDataPacket UpdateDataPacket()
             btrDataPacket.rotation = btrServerSide.transform.rotation;
             if (btrTurretServer != null && btrTurretServer.gunsBlockRoot != null)
             {
-                btrDataPacket.turretRotation = btrTurretServer.transform.rotation;
-                btrDataPacket.gunsBlockRotation = btrTurretServer.gunsBlockRoot.rotation;
+                btrDataPacket.turretRotation = btrTurretServer.transform.localEulerAngles.y;
+                btrDataPacket.gunsBlockRotation = btrTurretServer.gunsBlockRoot.localEulerAngles.x;
             }
             btrDataPacket.State = (byte)btrServerSide.BtrState;
             btrDataPacket.RouteState = (byte)btrServerSide.VehicleRouteState;

diff --git a/Fika.Core/Coop/ClientClasses/HandsControllers/CoopClientFirearmController.cs b/Fika.Core/Coop/ClientClasses/HandsControllers/CoopClientFirearmController.cs
@@ -9,7 +9,6 @@
 using System.Collections.Generic;
 using System.IO;
 using UnityEngine;
-using static EFT.ClientFirearmController;
 
 namespace Fika.Core.Coop.ClientClasses
 {

diff --git a/Fika.Core/Coop/Custom/FikaDynamicAI.cs b/Fika.Core/Coop/Custom/FikaDynamicAI.cs
@@ -6,7 +6,6 @@
 using Fika.Core.Coop.Components;
 using Fika.Core.Coop.Players;
 using System.Collections.Generic;
-using System.Linq;
 using UnityEngine;
 
 namespace Fika.Core.Coop.Custom

diff --git a/Fika.Core/Coop/FreeCamera/FadeBlackScreen_Patch.cs b/Fika.Core/Coop/FreeCamera/FadeBlackScreen_Patch.cs
@@ -1,5 +1,5 @@
-using Aki.Reflection.Patching;
-using EFT.UI;
+using EFT.UI;
+using SPT.Reflection.Patching;
 using System;
 using System.Reflection;
 using UnityEngine;

diff --git a/Fika.Core/Coop/FreeCamera/Patches/DeathFade_Patch.cs b/Fika.Core/Coop/FreeCamera/Patches/DeathFade_Patch.cs
@@ -1,4 +1,4 @@
-using Aki.Reflection.Patching;
+using SPT.Reflection.Patching;
 using System;
 using System.Reflection;
 using UnityEngine;

diff --git a/Fika.Core/Coop/GameMode/AFikaGame.cs b/Fika.Core/Coop/GameMode/AFikaGame.cs
@@ -1,4 +1,4 @@
-/*using Aki.Reflection.Utils;
+/*using SPT.Reflection.Utils;
 using BepInEx.Logging;
 using Comfort.Common;
 using EFT;