Groups

Fika.Core/Coop/ClientClasses/NoInertiaMovementContext.cs

@@ -0,0 +1,57 @@
+using Comfort.Common;
+using EFT;
+using System;
+using UnityEngine;
+
+namespace Fika.Core.Coop.ClientClasses
+{
+    /// <summary>
+    /// Used to simulate having near no inertia
+    /// </summary>
+    public class NoInertiaMovementContext : MovementContext
+    {
+        public new static NoInertiaMovementContext Create(Player player, Func<IAnimator> animatorGetter, Func<ICharacterController> characterControllerGetter, LayerMask groundMask)
+        {
+            NoInertiaMovementContext movementContext = Create<NoInertiaMovementContext>(player, animatorGetter, characterControllerGetter, groundMask);
+            return movementContext;
+        }
+
+        public override void Init()
+        {
+            base.Init();
+            TiltInertia = 0.22f;
+            WalkInertia = 0.005f;
+            SprintBrakeInertia = 0f;
+        }
+
+        public override void WeightRelatedValuesUpdated()
+        {
+            if (_player.ProceduralWeaponAnimation != null)
+            {
+                _player.ProceduralWeaponAnimation.Overweight = _player.Physical.Overweight;
+                _player.ProceduralWeaponAnimation.UpdateSwayFactors();
+                _player.ProceduralWeaponAnimation.UpdateSwaySettings();
+                _player.ProceduralWeaponAnimation.WeaponFlipSpeed = InertiaSettings.WeaponFlipSpeed.Evaluate(_player.Physical.Inertia);
+            }
+            UpdateCovertEfficiency(_player.MovementContext.ClampedSpeed, true);
+            _player.UpdateStepSoundRolloff();
+            _player.HealthController.FallSafeHeight = Mathf.Lerp(Singleton<BackendConfigSettingsClass>.Instance.Health.Falling.SafeHeight, Singleton<BackendConfigSettingsClass>.Instance.Stamina.SafeHeightOverweight, _player.Physical.Overweight);
+            PlayerAnimatorTransitionSpeed = TransitionSpeed;
+            if (PoseLevel > _player.Physical.MaxPoseLevel && CurrentState is MovementState movementState)
+            {
+                movementState.ChangePose(_player.Physical.MaxPoseLevel - PoseLevel);
+            }
+            if (_player.PoseMemo > _player.Physical.MaxPoseLevel)
+            {
+                _player.PoseMemo = _player.Physical.MaxPoseLevel;
+            }
+            float walkSpeedLimit = _player.Physical.WalkSpeedLimit;
+            RemoveStateSpeedLimit(Player.ESpeedLimit.Weight);
+            if (walkSpeedLimit < 1f)
+            {
+                AddStateSpeedLimit(walkSpeedLimit * MaxSpeed, Player.ESpeedLimit.Weight);
+            }
+            UpdateCharacterControllerSpeedLimit();
+        }
+    }
+}

Fika.Core/Coop/ClientClasses/NoInertiaPhysical.cs

@@ -5,6 +5,9 @@
 
 namespace Fika.Core.Coop.ClientClasses
 {
+    /// <summary>
+    /// Currently unused
+    /// </summary>
     public class NoInertiaPhysical : PlayerPhysicalClass
     {
         private CoopPlayer coopPlayer;

Fika.Core/Coop/Components/CoopHandler.cs

@@ -83,7 +83,7 @@ public static string GetServerId()
             CoopHandler coopGC = GetCoopHandler();
             if (coopGC == null)
             {
-                return FikaBackendUtils.GetGroupId();
+                return FikaBackendUtils.GetServerId();
             }
 
             return coopGC.ServerId;
@@ -226,7 +226,6 @@ void ProcessQuitting()
                 {
                     coopGame.Stop(Singleton<GameWorld>.Instance.MainPlayer.ProfileId, coopGame.MyExitStatus, MyPlayer.ActiveHealthController.IsAlive ? coopGame.MyExitLocation : null, 0);
                 }
-                return;
             }
         }
 
@@ -348,7 +347,9 @@ await Singleton<PoolManager>.Instance.LoadBundlesAndCreatePools(PoolManager.Pool
                     if (botController != null)
                     {
                         // Start Coroutine as botController might need a while to start sometimes...
+#if DEBUG
                         Logger.LogInfo("Starting AddClientToBotEnemies routine.");
+#endif
                         StartCoroutine(AddClientToBotEnemies(botController, otherPlayer));
                     }
                     else
@@ -519,8 +520,10 @@ private ObservedCoopPlayer SpawnObservedPlayer(Profile profile, Vector3 position
         private IEnumerator AddClientToBotEnemies(BotsController botController, LocalPlayer playerToAdd)
         {
             CoopGame coopGame = LocalGameInstance;
-
+
+#if DEBUG
             Logger.LogInfo($"AddClientToBotEnemies: " + playerToAdd.Profile.Nickname);
+#endif
 
             while (coopGame.Status != GameStatus.Running && !botController.IsEnable)
             {
@@ -531,29 +534,12 @@ private IEnumerator AddClientToBotEnemies(BotsController botController, LocalPla
             {
                 yield return null;
             }
-
+
+#if DEBUG
             Logger.LogInfo($"Adding Client {playerToAdd.Profile.Nickname} to enemy list");
-            botController.AddActivePLayer(playerToAdd);
-
-            bool found = false;
-
-            for (int i = 0; i < botController.BotSpawner.PlayersCount; i++)
-            {
-                if (botController.BotSpawner.GetPlayer(i) == playerToAdd)
-                {
-                    found = true;
-                    break;
-                }
-            }
+#endif
 
-            if (found)
-            {
-                Logger.LogInfo($"Verified that {playerToAdd.Profile.Nickname} was added to the enemy list.");
-            }
-            else
-            {
-                Logger.LogInfo($"Failed to add {playerToAdd.Profile.Nickname} to the enemy list.");
-            }
+            botController.AddActivePLayer(playerToAdd);
         }
 
         /// <summary>

Fika.Core/Coop/Custom/FikaDynamicAI.cs

@@ -77,6 +77,14 @@ private void Spawner_OnBotCreated(BotOwner botOwner)
                 return;
             }
 
+            if (FikaPlugin.DynamicAIIgnoreSnipers.Value)
+            {
+                if (botOwner.IsRole(WildSpawnType.marksman))
+                {
+                    return;
+                }
+            }
+
             bots.Add((CoopBot)botOwner.GetPlayer);
         }