diff --git a/project/Aki.Custom/Aki.Custom.csproj b/project/Aki.Custom/Aki.Custom.csproj index 4ebb5db..f927622 100644 --- a/project/Aki.Custom/Aki.Custom.csproj +++ b/project/Aki.Custom/Aki.Custom.csproj @@ -39,6 +39,7 @@ + diff --git a/project/Aki.Custom/AkiCustomPlugin.cs b/project/Aki.Custom/AkiCustomPlugin.cs index ddc4a51..4635721 100644 --- a/project/Aki.Custom/AkiCustomPlugin.cs +++ b/project/Aki.Custom/AkiCustomPlugin.cs @@ -1,6 +1,7 @@ using System; using Aki.Common; using Aki.Custom.Airdrops.Patches; +using Aki.Custom.BTR.Patches; using Aki.Custom.Patches; using Aki.Custom.Utils; using BepInEx; @@ -49,6 +50,19 @@ namespace Aki.Custom new RagfairFeePatch().Enable(); new ScavQuestPatch().Enable(); new FixBrokenSpawnOnSandboxPatch().Enable(); + new BTRPathLoadPatch().Enable(); + new BTRActivateTraderDialogPatch().Enable(); + new BTRInteractionPatch().Enable(); + new BTRExtractPassengersPatch().Enable(); + new BTRBotAttachPatch().Enable(); + new BTRBotInitPatch().Enable(); + new BTRReceiveDamageInfoPatch().Enable(); + new BTRTurretCanShootPatch().Enable(); + new BTRTurretDefaultAimingPositionPatch().Enable(); + new BTRIsDoorsClosedPath().Enable(); + new BTRPatch().Enable(); + new BTRTransferItemsPatch().Enable(); + new BTREndRaidItemDeliveryPatch().Enable(); } catch (Exception ex) { diff --git a/project/Aki.Debugging/BTR/BTRManager.cs b/project/Aki.Custom/BTR/BTRManager.cs similarity index 99% rename from project/Aki.Debugging/BTR/BTRManager.cs rename to project/Aki.Custom/BTR/BTRManager.cs index 2e5f8c3..1b0cedc 100644 --- a/project/Aki.Debugging/BTR/BTRManager.cs +++ b/project/Aki.Custom/BTR/BTRManager.cs @@ -1,4 +1,4 @@ -using Aki.Debugging.BTR.Utils; +using Aki.Custom.BTR.Utils; using Aki.SinglePlayer.Utils.TraderServices; using Comfort.Common; using EFT; @@ -14,7 +14,7 @@ using UnityEngine; using Random = UnityEngine.Random; using BotEventHandler = GClass595; -namespace Aki.Debugging.BTR +namespace Aki.Custom.BTR { public class BTRManager : MonoBehaviour { diff --git a/project/Aki.Debugging/BTR/BTRRoadKillTrigger.cs b/project/Aki.Custom/BTR/BTRRoadKillTrigger.cs similarity index 97% rename from project/Aki.Debugging/BTR/BTRRoadKillTrigger.cs rename to project/Aki.Custom/BTR/BTRRoadKillTrigger.cs index 3de6347..8b819eb 100644 --- a/project/Aki.Debugging/BTR/BTRRoadKillTrigger.cs +++ b/project/Aki.Custom/BTR/BTRRoadKillTrigger.cs @@ -2,7 +2,7 @@ using EFT.Interactive; using UnityEngine; -namespace Aki.Debugging.BTR +namespace Aki.Custom.BTR { public class BTRRoadKillTrigger : DamageTrigger { diff --git a/project/Aki.Debugging/BTR/Models/BtrConfigModel.cs b/project/Aki.Custom/BTR/Models/BtrConfigModel.cs similarity index 100% rename from project/Aki.Debugging/BTR/Models/BtrConfigModel.cs rename to project/Aki.Custom/BTR/Models/BtrConfigModel.cs diff --git a/project/Aki.Debugging/BTR/Patches/BTRActivateTraderDialogPatch.cs b/project/Aki.Custom/BTR/Patches/BTRActivateTraderDialogPatch.cs similarity index 94% rename from project/Aki.Debugging/BTR/Patches/BTRActivateTraderDialogPatch.cs rename to project/Aki.Custom/BTR/Patches/BTRActivateTraderDialogPatch.cs index 4e979a0..687699f 100644 --- a/project/Aki.Debugging/BTR/Patches/BTRActivateTraderDialogPatch.cs +++ b/project/Aki.Custom/BTR/Patches/BTRActivateTraderDialogPatch.cs @@ -8,9 +8,9 @@ using System; using System.Reflection; using static EFT.UI.TraderDialogScreen; -namespace Aki.Debugging.BTR.Patches +namespace Aki.Custom.BTR.Patches { - internal class BTRActivateTraderDialogPatch : ModulePatch + public class BTRActivateTraderDialogPatch : ModulePatch { private static FieldInfo _playerInventoryControllerField; private static FieldInfo _playerQuestControllerField; diff --git a/project/Aki.Debugging/BTR/Patches/BTRBotAttachPatch.cs b/project/Aki.Custom/BTR/Patches/BTRBotAttachPatch.cs similarity index 96% rename from project/Aki.Debugging/BTR/Patches/BTRBotAttachPatch.cs rename to project/Aki.Custom/BTR/Patches/BTRBotAttachPatch.cs index cf71fe7..d497442 100644 --- a/project/Aki.Debugging/BTR/Patches/BTRBotAttachPatch.cs +++ b/project/Aki.Custom/BTR/Patches/BTRBotAttachPatch.cs @@ -8,7 +8,7 @@ using HarmonyLib; using System; using System.Reflection; -namespace Aki.Debugging.BTR.Patches +namespace Aki.Custom.BTR.Patches { // Fixes the BTR Bot initialization in AttachBot() of BTRTurretView // @@ -16,7 +16,7 @@ namespace Aki.Debugging.BTR.Patches // ClientGameWorld in LiveEFT will register the server-side BTR Bot as type ObservedPlayerView and is stored in GameWorld's allObservedPlayersByID dictionary. // In SPT, GameWorld.allObservedPlayersByID is empty which results in the game never finishing the initialization of the BTR Bot which includes disabling its gun, voice and mesh renderers. // For now, we do dirty patches to work around the lack of ObservedPlayerView, using Player instead. - internal class BTRBotAttachPatch : ModulePatch + public class BTRBotAttachPatch : ModulePatch { protected override MethodBase GetTargetMethod() { diff --git a/project/Aki.Debugging/BTR/Patches/BTRBotInitPatch.cs b/project/Aki.Custom/BTR/Patches/BTRBotInitPatch.cs similarity index 97% rename from project/Aki.Debugging/BTR/Patches/BTRBotInitPatch.cs rename to project/Aki.Custom/BTR/Patches/BTRBotInitPatch.cs index 018367e..4102446 100644 --- a/project/Aki.Debugging/BTR/Patches/BTRBotInitPatch.cs +++ b/project/Aki.Custom/BTR/Patches/BTRBotInitPatch.cs @@ -10,7 +10,7 @@ using System.Linq; using System.Reflection; using UnityEngine; -namespace Aki.Debugging.BTR.Patches +namespace Aki.Custom.BTR.Patches { // Fixes the BTR Bot initialization in method_1() of BTRTurretView // @@ -18,7 +18,7 @@ namespace Aki.Debugging.BTR.Patches // ClientGameWorld in LiveEFT will register the server-side BTR Bot as type ObservedPlayerView and is stored in GameWorld's allObservedPlayersByID dictionary. // In SPT, allObservedPlayersByID is empty which results in the game never finishing the initialization of the BTR Bot which includes disabling its gun, voice and mesh renderers. // For now, we do dirty patches to work around the lack of ObservedPlayerView, using Player instead. - internal class BTRBotInitPatch : ModulePatch + public class BTRBotInitPatch : ModulePatch { protected override MethodBase GetTargetMethod() { diff --git a/project/Aki.Debugging/BTR/Patches/BTREndRaidItemDeliveryPatch.cs b/project/Aki.Custom/BTR/Patches/BTREndRaidItemDeliveryPatch.cs similarity index 92% rename from project/Aki.Debugging/BTR/Patches/BTREndRaidItemDeliveryPatch.cs rename to project/Aki.Custom/BTR/Patches/BTREndRaidItemDeliveryPatch.cs index 991bf83..afc722a 100644 --- a/project/Aki.Debugging/BTR/Patches/BTREndRaidItemDeliveryPatch.cs +++ b/project/Aki.Custom/BTR/Patches/BTREndRaidItemDeliveryPatch.cs @@ -1,6 +1,5 @@ using Aki.Common.Http; -using Aki.Common.Utils; -using Aki.Debugging.BTR.Utils; +using Aki.Custom.BTR.Utils; using Aki.Reflection.Patching; using Aki.Reflection.Utils; using Comfort.Common; @@ -11,9 +10,9 @@ using System; using System.Linq; using System.Reflection; -namespace Aki.Debugging.BTR.Patches +namespace Aki.Custom.BTR.Patches { - internal class BTREndRaidItemDeliveryPatch : ModulePatch + public class BTREndRaidItemDeliveryPatch : ModulePatch { private static JsonConverter[] _defaultJsonConverters; diff --git a/project/Aki.Debugging/BTR/Patches/BTRExtractPassengersPatch.cs b/project/Aki.Custom/BTR/Patches/BTRExtractPassengersPatch.cs similarity index 93% rename from project/Aki.Debugging/BTR/Patches/BTRExtractPassengersPatch.cs rename to project/Aki.Custom/BTR/Patches/BTRExtractPassengersPatch.cs index caad08b..4335bea 100644 --- a/project/Aki.Debugging/BTR/Patches/BTRExtractPassengersPatch.cs +++ b/project/Aki.Custom/BTR/Patches/BTRExtractPassengersPatch.cs @@ -5,9 +5,9 @@ using EFT.Vehicle; using HarmonyLib; using System.Reflection; -namespace Aki.Debugging.BTR.Patches +namespace Aki.Custom.BTR.Patches { - internal class BTRExtractPassengersPatch : ModulePatch + public class BTRExtractPassengersPatch : ModulePatch { protected override MethodBase GetTargetMethod() { diff --git a/project/Aki.Debugging/BTR/Patches/BTRInteractionPatch.cs b/project/Aki.Custom/BTR/Patches/BTRInteractionPatch.cs similarity index 95% rename from project/Aki.Debugging/BTR/Patches/BTRInteractionPatch.cs rename to project/Aki.Custom/BTR/Patches/BTRInteractionPatch.cs index a2a0169..5b72b04 100644 --- a/project/Aki.Debugging/BTR/Patches/BTRInteractionPatch.cs +++ b/project/Aki.Custom/BTR/Patches/BTRInteractionPatch.cs @@ -7,9 +7,9 @@ using HarmonyLib; using System.Reflection; using GlobalEventHandler = GClass2909; -namespace Aki.Debugging.BTR.Patches +namespace Aki.Custom.BTR.Patches { - internal class BTRInteractionPatch : ModulePatch + public class BTRInteractionPatch : ModulePatch { protected override MethodBase GetTargetMethod() { diff --git a/project/Aki.Debugging/BTR/Patches/BTRIsDoorsClosedPatch.cs b/project/Aki.Custom/BTR/Patches/BTRIsDoorsClosedPatch.cs similarity index 89% rename from project/Aki.Debugging/BTR/Patches/BTRIsDoorsClosedPatch.cs rename to project/Aki.Custom/BTR/Patches/BTRIsDoorsClosedPatch.cs index 5f27c67..95030f3 100644 --- a/project/Aki.Debugging/BTR/Patches/BTRIsDoorsClosedPatch.cs +++ b/project/Aki.Custom/BTR/Patches/BTRIsDoorsClosedPatch.cs @@ -4,9 +4,9 @@ using EFT; using HarmonyLib; using System.Reflection; -namespace Aki.Debugging.BTR.Patches +namespace Aki.Custom.BTR.Patches { - internal class BTRIsDoorsClosedPath : ModulePatch + public class BTRIsDoorsClosedPath : ModulePatch { protected override MethodBase GetTargetMethod() { diff --git a/project/Aki.Debugging/BTR/Patches/BTRPatch.cs b/project/Aki.Custom/BTR/Patches/BTRPatch.cs similarity index 95% rename from project/Aki.Debugging/BTR/Patches/BTRPatch.cs rename to project/Aki.Custom/BTR/Patches/BTRPatch.cs index b532ec6..fcff139 100644 --- a/project/Aki.Debugging/BTR/Patches/BTRPatch.cs +++ b/project/Aki.Custom/BTR/Patches/BTRPatch.cs @@ -6,12 +6,12 @@ using EFT; using EFT.UI; using HarmonyLib; -namespace Aki.Debugging.BTR.Patches +namespace Aki.Custom.BTR.Patches { /// /// Adds a BTRManager component to the GameWorld game object when raid starts. /// - internal class BTRPatch : ModulePatch + public class BTRPatch : ModulePatch { protected override MethodBase GetTargetMethod() { diff --git a/project/Aki.Debugging/BTR/Patches/BTRPathLoadPatch.cs b/project/Aki.Custom/BTR/Patches/BTRPathLoadPatch.cs similarity index 92% rename from project/Aki.Debugging/BTR/Patches/BTRPathLoadPatch.cs rename to project/Aki.Custom/BTR/Patches/BTRPathLoadPatch.cs index dfb2e22..ec6602d 100644 --- a/project/Aki.Debugging/BTR/Patches/BTRPathLoadPatch.cs +++ b/project/Aki.Custom/BTR/Patches/BTRPathLoadPatch.cs @@ -4,11 +4,11 @@ using EFT; using HarmonyLib; using System.Reflection; -namespace Aki.Debugging.BTR.Patches +namespace Aki.Custom.BTR.Patches { // The BTRManager MapPathsConfiguration loading depends on the game state being set to Starting // so set it to Starting while the method is running, then reset it afterwards - internal class BTRPathLoadPatch : ModulePatch + public class BTRPathLoadPatch : ModulePatch { private static PropertyInfo _statusProperty; private static GameStatus originalStatus; diff --git a/project/Aki.Debugging/BTR/Patches/BTRReceiveDamageInfoPatch.cs b/project/Aki.Custom/BTR/Patches/BTRReceiveDamageInfoPatch.cs similarity index 90% rename from project/Aki.Debugging/BTR/Patches/BTRReceiveDamageInfoPatch.cs rename to project/Aki.Custom/BTR/Patches/BTRReceiveDamageInfoPatch.cs index 7754455..6493fec 100644 --- a/project/Aki.Debugging/BTR/Patches/BTRReceiveDamageInfoPatch.cs +++ b/project/Aki.Custom/BTR/Patches/BTRReceiveDamageInfoPatch.cs @@ -6,12 +6,12 @@ using HarmonyLib; using System.Reflection; using BotEventHandler = GClass595; -namespace Aki.Debugging.BTR.Patches +namespace Aki.Custom.BTR.Patches { /// /// Patches an empty method in to handle updating the BTR bot's Neutrals and Enemies lists in response to taking damage. /// - internal class BTRReceiveDamageInfoPatch : ModulePatch + public class BTRReceiveDamageInfoPatch : ModulePatch { protected override MethodBase GetTargetMethod() { diff --git a/project/Aki.Debugging/BTR/Patches/BTRTransferItemsPatch.cs b/project/Aki.Custom/BTR/Patches/BTRTransferItemsPatch.cs similarity index 85% rename from project/Aki.Debugging/BTR/Patches/BTRTransferItemsPatch.cs rename to project/Aki.Custom/BTR/Patches/BTRTransferItemsPatch.cs index f6885ea..f641174 100644 --- a/project/Aki.Debugging/BTR/Patches/BTRTransferItemsPatch.cs +++ b/project/Aki.Custom/BTR/Patches/BTRTransferItemsPatch.cs @@ -1,13 +1,13 @@ -using Aki.Debugging.BTR.Utils; +using Aki.Custom.BTR.Utils; using Aki.Reflection.Patching; using Aki.SinglePlayer.Utils.TraderServices; using EFT.UI; using HarmonyLib; using System.Reflection; -namespace Aki.Debugging.BTR.Patches +namespace Aki.Custom.BTR.Patches { - internal class BTRTransferItemsPatch : ModulePatch + public class BTRTransferItemsPatch : ModulePatch { protected override MethodBase GetTargetMethod() { diff --git a/project/Aki.Debugging/BTR/Patches/BTRTurretCanShootPatch.cs b/project/Aki.Custom/BTR/Patches/BTRTurretCanShootPatch.cs similarity index 91% rename from project/Aki.Debugging/BTR/Patches/BTRTurretCanShootPatch.cs rename to project/Aki.Custom/BTR/Patches/BTRTurretCanShootPatch.cs index 56cd1bf..80ab3bf 100644 --- a/project/Aki.Debugging/BTR/Patches/BTRTurretCanShootPatch.cs +++ b/project/Aki.Custom/BTR/Patches/BTRTurretCanShootPatch.cs @@ -4,9 +4,9 @@ using HarmonyLib; using System.Reflection; using UnityEngine; -namespace Aki.Debugging.BTR.Patches +namespace Aki.Custom.BTR.Patches { - internal class BTRTurretCanShootPatch : ModulePatch + public class BTRTurretCanShootPatch : ModulePatch { protected override MethodBase GetTargetMethod() { diff --git a/project/Aki.Debugging/BTR/Patches/BTRTurretDefaultAimingPositionPatch.cs b/project/Aki.Custom/BTR/Patches/BTRTurretDefaultAimingPositionPatch.cs similarity index 82% rename from project/Aki.Debugging/BTR/Patches/BTRTurretDefaultAimingPositionPatch.cs rename to project/Aki.Custom/BTR/Patches/BTRTurretDefaultAimingPositionPatch.cs index 2e28c39..3123530 100644 --- a/project/Aki.Debugging/BTR/Patches/BTRTurretDefaultAimingPositionPatch.cs +++ b/project/Aki.Custom/BTR/Patches/BTRTurretDefaultAimingPositionPatch.cs @@ -4,9 +4,9 @@ using HarmonyLib; using System.Reflection; using UnityEngine; -namespace Aki.Debugging.BTR.Patches +namespace Aki.Custom.BTR.Patches { - internal class BTRTurretDefaultAimingPositionPatch : ModulePatch + public class BTRTurretDefaultAimingPositionPatch : ModulePatch { protected override MethodBase GetTargetMethod() { diff --git a/project/Aki.Debugging/BTR/Utils/BTRUtil.cs b/project/Aki.Custom/BTR/Utils/BTRUtil.cs similarity index 96% rename from project/Aki.Debugging/BTR/Utils/BTRUtil.cs rename to project/Aki.Custom/BTR/Utils/BTRUtil.cs index 540548a..e02b7b2 100644 --- a/project/Aki.Debugging/BTR/Utils/BTRUtil.cs +++ b/project/Aki.Custom/BTR/Utils/BTRUtil.cs @@ -6,7 +6,7 @@ using EFT.InventoryLogic; using Newtonsoft.Json; using System; -namespace Aki.Debugging.BTR.Utils +namespace Aki.Custom.BTR.Utils { public static class BTRUtil { diff --git a/project/Aki.Debugging/Aki.Debugging.csproj b/project/Aki.Debugging/Aki.Debugging.csproj index e546dc8..a8c129e 100644 --- a/project/Aki.Debugging/Aki.Debugging.csproj +++ b/project/Aki.Debugging/Aki.Debugging.csproj @@ -29,9 +29,9 @@ + - diff --git a/project/Aki.Debugging/AkiDebuggingPlugin.cs b/project/Aki.Debugging/AkiDebuggingPlugin.cs index 552db21..f4c9876 100644 --- a/project/Aki.Debugging/AkiDebuggingPlugin.cs +++ b/project/Aki.Debugging/AkiDebuggingPlugin.cs @@ -1,6 +1,5 @@ using System; using Aki.Common; -using Aki.Debugging.BTR.Patches; using Aki.Debugging.Patches; using BepInEx; @@ -18,23 +17,10 @@ namespace Aki.Debugging new EndRaidDebug().Enable(); // new CoordinatesPatch().Enable(); // new StaticLootDumper().Enable(); - new BTRPathLoadPatch().Enable(); - new BTRActivateTraderDialogPatch().Enable(); - new BTRInteractionPatch().Enable(); - new BTRExtractPassengersPatch().Enable(); - new BTRBotAttachPatch().Enable(); - new BTRBotInitPatch().Enable(); - new BTRReceiveDamageInfoPatch().Enable(); - new BTRTurretCanShootPatch().Enable(); - new BTRTurretDefaultAimingPositionPatch().Enable(); - new BTRIsDoorsClosedPath().Enable(); - new BTRPatch().Enable(); - new BTRTransferItemsPatch().Enable(); - new BTREndRaidItemDeliveryPatch().Enable(); - // Debug command patches, can be disabled later - new BTRDebugCommandPatch().Enable(); - new BTRDebugDataPatch().Enable(); + // BTR debug command patches, can be disabled later + //new BTRDebugCommandPatch().Enable(); + //new BTRDebugDataPatch().Enable(); //new PMCBotSpawnLocationPatch().Enable(); } diff --git a/project/Aki.Debugging/BTR/Patches/BTRDebugCommandPatch.cs b/project/Aki.Debugging/Patches/BTRDebugCommandPatch.cs similarity index 94% rename from project/Aki.Debugging/BTR/Patches/BTRDebugCommandPatch.cs rename to project/Aki.Debugging/Patches/BTRDebugCommandPatch.cs index fc98aaa..64991e7 100644 --- a/project/Aki.Debugging/BTR/Patches/BTRDebugCommandPatch.cs +++ b/project/Aki.Debugging/Patches/BTRDebugCommandPatch.cs @@ -1,13 +1,12 @@ -using Aki.Debugging.BTR.Utils; +using Aki.Custom.BTR.Patches; using Aki.Reflection.Patching; using Aki.SinglePlayer.Utils.TraderServices; using EFT; -using EFT.Console.Core; using EFT.UI; using HarmonyLib; using System.Reflection; -namespace Aki.Debugging.BTR.Patches +namespace Aki.Debugging.Patches { // Enable the `debug_show_dialog_screen` command, and custom `btr_deliver_items` command internal class BTRDebugCommandPatch : ModulePatch