Merge pull request #404 from project-fika/dev-2.2.4

Dev 2.2.4

Author: Lacyway

Fika.Core/Bundles/Files/masterbundle.bundle

@@ -15,7 +15,9 @@
 
 namespace Fika.Core.ConsoleCommands;
 
+#pragma warning disable RCS1102
 public class FikaCommands
+#pragma warning restore RCS1102
 {
 #if DEBUG
     [ConsoleCommand("bring", "", null, "Teleports all AI to yourself as the host", [])]
@@ -301,11 +303,11 @@ public static void SpawnItem([ConsoleArgument("", "The templateId to spawn an it
     /// Based on SSH's TarkyMenu command
     /// </summary>
     /// <param name="wildSpawnType"></param>
-    /// <param name="number"></param>
+    /// <param name="amount"></param>
     [ConsoleCommand("spawnNPC", "", null, "Spawn NPC with specified WildSpawnType")]
     public static void SpawnNPC([ConsoleArgument("assault", "The WildSpawnType to spawn (use help for a list)")] string wildSpawnType, [ConsoleArgument(1, "The amount of AI to spawn")] int amount)
     {
-        if (string.IsNullOrEmpty(wildSpawnType) || wildSpawnType.ToLower() == "help")
+        if (string.IsNullOrEmpty(wildSpawnType) || string.Equals(wildSpawnType, "help", StringComparison.OrdinalIgnoreCase))
         {
             foreach (WildSpawnType availableSpawnType in Enum.GetValues(typeof(WildSpawnType)))
             {

Fika.Core/ConsoleCommands/FikaCommands.cs

@@ -64,7 +64,9 @@
 		<Reference Include="UnityEngine" HintPath="..\References\UnityEngine.dll" Private="false" />
 		<Reference Include="UnityEngine.UI" HintPath="..\References\UnityEngine.UI.dll" Private="false" />
 		<Reference Include="websocket-sharp" HintPath="..\References\websocket-sharp.dll" Private="false" />
-		</ItemGroup>   <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition=" '$(OS)' == 'Windows_NT' ">
+		</ItemGroup>
+	
+	<Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition=" '$(OS)' == 'Windows_NT' ">
 		<Exec Condition=" '$(Configuration)|$(Platform)' != 'GoldMaster|AnyCPU' " Command="call ../Properties/build/postbuild-core.bat &quot;$(TargetPath)&quot; &quot;$(ProjectDir)&quot;" />
 		<!--<Exec Condition=" '$(Configuration)|$(Platform)' == 'GoldMaster|AnyCPU' " Command="call ../Properties/build/goldmaster-core.bat" />-->
 	</Target> 

Fika.Core/Fika.Core.csproj

@@ -4,6 +4,8 @@
 using Comfort.Common;
 using EFT.UI;
 using Fika.Core.Main.Utils;
+using Fika.Core.Networking.Http;
+
 #if GOLDMASTER
 using Fika.Core.UI; 
 #endif
@@ -13,7 +15,7 @@
 
 namespace Fika.Core;
 
-public class FikaConfig(ConfigFile config)
+public sealed class FikaConfig(ConfigFile config)
 {
     private readonly ConfigFile _config = config;
 
@@ -59,6 +61,7 @@ public class FikaConfig(ConfigFile config)
     public ConfigEntry<Color> FullHealthColor { get; set; }
     public ConfigEntry<Color> LowHealthColor { get; set; }
     public ConfigEntry<Color> NamePlateTextColor { get; set; }
+    public ConfigEntry<bool> ShowBrokenLimbs { get; set; }
 
     // Coop | Quest Sharing
     public ConfigEntry<EQuestSharingTypes> QuestTypesToShareAndReceive { get; set; }
@@ -102,6 +105,28 @@ public class FikaConfig(ConfigFile config)
     public ConfigEntry<bool> DisableBotMetabolism { get; set; }
     #endregion
 
+    #region client config values
+    public bool UseBTR { get; set; }
+    public bool FriendlyFire { get; set; }
+    public bool DynamicVExfils { get; set; }
+    public bool AllowFreeCam { get; set; }
+    public bool AllowSpectateFreeCam { get; set; }
+    public bool AllowItemSending { get; set; }
+    public string[] BlacklistedItems { get; set; }
+    public bool ForceSaveOnDeath { get; set; }
+    public bool UseInertia { get; set; }
+    public bool SharedQuestProgression { get; set; }
+    public bool CanEditRaidSettings { get; set; }
+    public bool EnableTransits { get; set; }
+    public bool AnyoneCanStartRaid { get; set; }
+    public bool AllowNamePlates { get; set; }
+    public bool RandomLabyrinthSpawns { get; set; }
+    public bool PMCFoundInRaid { get; set; }
+    public bool AllowSpectateBots { get; set; }
+    public bool InstantLoad { get; set; }
+    public bool FastLoad { get; set; }
+    #endregion
+
     private ConfigEntry<T> SetupSetting<T>(string section, string key, T defValue, ConfigDescription configDescription, string fallback, ref bool failed, List<string> error)
     {
         try
@@ -305,12 +330,12 @@ public void SetupConfig()
         const string coopDefaultNamePlatesHeader = "Coop | Name Plates";
 
         UseNamePlates = SetupSetting(coopDefaultNamePlatesHeader, "Show Player Name Plates", true,
-            new ConfigDescription(FikaPlugin.Instance.AllowNamePlates ? LocaleUtils.BEPINEX_USE_NAME_PLATES_D.Localized() : disabledMessage, tags: new ConfigurationManagerAttributes()
+            new ConfigDescription(AllowNamePlates ? LocaleUtils.BEPINEX_USE_NAME_PLATES_D.Localized() : disabledMessage, tags: new ConfigurationManagerAttributes()
             {
                 Category = coopNameplatesHeader,
                 DispName = LocaleUtils.BEPINEX_USE_NAME_PLATES_T.Localized(),
                 Order = 16,
-                ReadOnly = !FikaPlugin.Instance.AllowNamePlates
+                ReadOnly = !AllowNamePlates
             }),
             "Show Player Name Plates", ref failed, headers);
 
@@ -423,7 +448,7 @@ public void SetupConfig()
             {
                 Category = coopNameplatesHeader,
                 DispName = LocaleUtils.BEPINEX_USE_OCCLUSION_T.Localized(),
-                Order = 3
+                Order = 4
             }),
             "Use Occlusion", ref failed, headers);
 
@@ -432,7 +457,7 @@ public void SetupConfig()
             {
                 Category = coopNameplatesHeader,
                 DispName = LocaleUtils.BEPINEX_HEALTHCOLOR_FULL_T.Localized(),
-                Order = 2
+                Order = 3
             }),
             "Full Health Color", ref failed, headers);
 
@@ -441,7 +466,7 @@ public void SetupConfig()
             {
                 Category = coopNameplatesHeader,
                 DispName = LocaleUtils.BEPINEX_HEALTHCOLOR_LOW_T.Localized(),
-                Order = 1
+                Order = 2
             }),
             "Low Health Color", ref failed, headers);
 
@@ -450,15 +475,24 @@ public void SetupConfig()
             {
                 Category = coopNameplatesHeader,
                 DispName = LocaleUtils.BEPINEX_NAMEPLATECOLOR_T.Localized(),
-                Order = 0
+                Order = 1
             }),
             "Name Plate Text Color", ref failed, headers);
 
+        ShowBrokenLimbs = SetupSetting(coopDefaultNamePlatesHeader, "Show Broken Limbs", failed,
+            new ConfigDescription(LocaleUtils.BEPINEX_SHOWBROKENLIMBS_D.Localized(), tags: new ConfigurationManagerAttributes()
+            {
+                Category = coopNameplatesHeader,
+                DispName = LocaleUtils.BEPINEX_SHOWBROKENLIMBS_T.Localized(),
+                Order = 0
+            }),
+            "Show Broken Limbs", ref failed, headers);
+
         // Coop | Quest Sharing
 
         var coopQuestSharingHeader = CleanConfigString(LocaleUtils.BEPINEX_H_COOP_QUEST_SHARING.Localized());
         const string coopDefaultQuestSharingHeader = "Coop | Quest Sharing";
-        var questSharingEnabled = Instance.SharedQuestProgression;
+        var questSharingEnabled = SharedQuestProgression;
 
         QuestTypesToShareAndReceive = SetupSetting(coopDefaultQuestSharingHeader, "Quest Types", EQuestSharingTypes.All,
             new ConfigDescription(questSharingEnabled ? LocaleUtils.BEPINEX_QUEST_TYPES_D.Localized() : disabledMessage, tags: new ConfigurationManagerAttributes()
@@ -815,4 +849,31 @@ private string CleanConfigString(string header)
         }
         return header;
     }
+
+    internal void GetClientConfig()
+    {
+        var clientConfig = FikaRequestHandler.GetClientConfig();
+
+        UseBTR = clientConfig.UseBTR;
+        FriendlyFire = clientConfig.FriendlyFire;
+        DynamicVExfils = clientConfig.DynamicVExfils;
+        AllowFreeCam = clientConfig.AllowFreeCam;
+        AllowSpectateFreeCam = clientConfig.AllowSpectateFreeCam;
+        AllowItemSending = clientConfig.AllowItemSending;
+        BlacklistedItems = clientConfig.BlacklistedItems;
+        ForceSaveOnDeath = clientConfig.ForceSaveOnDeath;
+        UseInertia = clientConfig.UseInertia;
+        SharedQuestProgression = clientConfig.SharedQuestProgression;
+        CanEditRaidSettings = clientConfig.CanEditRaidSettings;
+        EnableTransits = clientConfig.EnableTransits;
+        AnyoneCanStartRaid = clientConfig.AnyoneCanStartRaid;
+        AllowNamePlates = clientConfig.AllowNamePlates;
+        RandomLabyrinthSpawns = clientConfig.RandomLabyrinthSpawns;
+        PMCFoundInRaid = clientConfig.PMCFoundInRaid;
+        AllowSpectateBots = clientConfig.AllowSpectateBots;
+        InstantLoad = clientConfig.InstantLoad;
+        FastLoad = clientConfig.FastLoad && !InstantLoad; // can only use one, prioritize InstantLoad
+
+        clientConfig.LogValues();
+    }
 }

Fika.Core/FikaConfig.cs

@@ -6,6 +6,7 @@
 using Fika.Core.Bundles;
 using Fika.Core.ConsoleCommands;
 using Fika.Core.Main.Custom;
+using Fika.Core.Main.Patches.InventoryController;
 using Fika.Core.Main.Utils;
 using Fika.Core.Networking.Http;
 using Fika.Core.Networking.Websocket;
@@ -45,7 +46,7 @@ namespace Fika.Core;
 [BepInDependency("com.SPT.debugging", BepInDependency.DependencyFlags.HardDependency)] // This is used so that we guarantee to load after spt-debugging, that way we can disable its patches
 public class FikaPlugin : BaseUnityPlugin
 {
-    public const string FikaVersion = "2.2.3";
+    public const string FikaVersion = "2.2.4";
     public const string FikaNATPunchMasterServer = "natpunch.project-fika.com";
     public const ushort FikaNATPunchMasterPort = 6790;
 
@@ -106,25 +107,6 @@ public ManualLogSource FikaLogger
         { "trippy",       "One of the chads that made the headless client a reality ~ Archangel"     }
     };
 
-    #region client config
-    public bool UseBTR;
-    public bool FriendlyFire;
-    public bool DynamicVExfils;
-    public bool AllowFreeCam;
-    public bool AllowSpectateFreeCam;
-    public bool AllowItemSending;
-    public string[] BlacklistedItems;
-    public bool ForceSaveOnDeath;
-    public bool UseInertia;
-    public bool SharedQuestProgression;
-    public bool CanEditRaidSettings;
-    public bool EnableTransits;
-    public bool AnyoneCanStartRaid;
-    public bool AllowNamePlates;
-    public bool RandomLabyrinthSpawns;
-    public bool PMCFoundInRaid;
-    #endregion
-
     #region natpunch config
     public bool NatPunchServerEnable;
     public string NatPunchServerIP;
@@ -157,10 +139,16 @@ protected void Awake()
         BotDifficulties = FikaRequestHandler.GetBotDifficulties();
         ConsoleScreen.Processor.RegisterCommandGroup<FikaCommands>();
 
-        if (AllowItemSending)
+        if (Settings.AllowItemSending)
         {
             _patchManager.EnablePatch(new ItemContext_Patch());
         }
+
+        if (Settings.FastLoad)
+        {
+            _patchManager.EnablePatch(new LoadAmmo_Task_Transpiler());
+            _patchManager.EnablePatch(new ItemViewLoadAmmoComponent_Show_Patch());
+        }
     }
 
     /// <summary>
@@ -256,26 +244,7 @@ private async Task RunChecks()
 
     private void GetClientConfig()
     {
-        var clientConfig = FikaRequestHandler.GetClientConfig();
-
-        UseBTR = clientConfig.UseBTR;
-        FriendlyFire = clientConfig.FriendlyFire;
-        DynamicVExfils = clientConfig.DynamicVExfils;
-        AllowFreeCam = clientConfig.AllowFreeCam;
-        AllowSpectateFreeCam = clientConfig.AllowSpectateFreeCam;
-        AllowItemSending = clientConfig.AllowItemSending;
-        BlacklistedItems = clientConfig.BlacklistedItems;
-        ForceSaveOnDeath = clientConfig.ForceSaveOnDeath;
-        UseInertia = clientConfig.UseInertia;
-        SharedQuestProgression = clientConfig.SharedQuestProgression;
-        CanEditRaidSettings = clientConfig.CanEditRaidSettings;
-        EnableTransits = clientConfig.EnableTransits;
-        AnyoneCanStartRaid = clientConfig.AnyoneCanStartRaid;
-        AllowNamePlates = clientConfig.AllowNamePlates;
-        RandomLabyrinthSpawns = clientConfig.RandomLabyrinthSpawns;
-        PMCFoundInRaid = clientConfig.PMCFoundInRaid;
-
-        clientConfig.LogValues();
+        Settings.GetClientConfig();
     }
 
     private void GetNatPunchServerConfig()

Fika.Core/FikaPlugin.cs

@@ -4,7 +4,7 @@
 
 namespace Fika.Core.Main.BotClasses;
 
-public class BotFirearmController : FikaClientFirearmController
+public sealed class BotFirearmController : FikaClientFirearmController
 {
     public override Vector3 WeaponDirection
     {

Fika.Core/Main/BotClasses/BotFirearmController.cs

@@ -9,12 +9,13 @@
 using Fika.Core.Main.Utils;
 using Fika.Core.Networking.Packets.Generic;
 using Fika.Core.Networking.Packets.Generic.SubPackets;
+using Fika.Core.Networking.Pooling;
 using JetBrains.Annotations;
 using static EFT.Player;
 
 namespace Fika.Core.Main.BotClasses;
 
-public class BotInventoryController : PlayerInventoryController
+public sealed class BotInventoryController : PlayerInventoryController
 {
     public override bool HasDiscardLimits
     {
@@ -24,23 +25,18 @@ public override bool HasDiscardLimits
         }
     }
     private readonly FikaBot _fikaBot;
-    private readonly IPlayerSearchController _searchController;
+    private readonly BotInventoryOperationHandlerPool _botInventoryOperationHandlerPool;
 
     public BotInventoryController(Player player, Profile profile, bool examined, MongoID currentId, ushort nextOperationId) : base(player, profile, examined)
     {
         _fikaBot = (FikaBot)player;
         MongoID_0 = currentId;
         Ushort_0 = nextOperationId;
-        _searchController = new BotSearchControllerClass(profile);
+        PlayerSearchController = new BotSearchControllerClass(profile);
+        _botInventoryOperationHandlerPool = BotInventoryOperationHandlerPool.Instance;
     }
 
-    public override IPlayerSearchController PlayerSearchController
-    {
-        get
-        {
-            return _searchController;
-        }
-    }
+    public override IPlayerSearchController PlayerSearchController { get; }
 
     public override void CallMalfunctionRepaired(Weapon weapon)
     {
@@ -83,35 +79,26 @@ private async Task HandleOperation(BaseInventoryOperationClass operation, Callba
 
     private void RunBotOperation(BaseInventoryOperationClass operation, Callback callback)
     {
-        BotInventoryOperationHandler handler = new(this, operation, callback);
-        if (vmethod_0(operation))
+        var handler = _botInventoryOperationHandlerPool.Get();
+        handler.Set(this, operation, callback);
+        try
         {
-            handler.Operation.method_1(handler.HandleResult);
-            return;
+            if (vmethod_0(operation))
+            {
+                handler.Operation.method_1(handler.HandleResult);
+                return;
+            }
+            handler.Operation.Dispose();
+            handler.Callback?.Fail($"Can't execute {handler.Operation}", 1);
+        }
+        finally
+        {
+            _botInventoryOperationHandlerPool.ReturnHandler(handler);
         }
-        handler.Operation.Dispose();
-        handler.Callback?.Fail($"Can't execute {handler.Operation}", 1);
     }
 
     public override SearchContentOperation vmethod_2(SearchableItemItemClass item)
     {
         return new SearchContentOperationResultClass(method_12(), this, PlayerSearchController, Profile, item);
     }
-
-    private class BotInventoryOperationHandler(BotInventoryController controller, BaseInventoryOperationClass operation, Callback callback)
-    {
-        private readonly BotInventoryController controller = controller;
-        public readonly BaseInventoryOperationClass Operation = operation;
-        public readonly Callback Callback = callback;
-
-        public void HandleResult(IResult result)
-        {
-            if (result.Failed)
-            {
-                FikaGlobals.LogWarning($"BotInventoryOperationHandler: Operation has failed! Controller: {controller.Name}, Operation ID: {Operation.Id}, Operation: {Operation}, Error: {result.Error}");
-            }
-
-            Callback?.Invoke(result);
-        }
-    }
 }