Dev > Main

Fika.Core/AkiSupport/Airdrops/Utils/FikaItemFactoryUtil.cs

@@ -19,7 +19,7 @@ public class FikaItemFactoryUtil
         public FikaItemFactoryUtil()
         {
             itemFactory = Singleton<ItemFactory>.Instance;
-            logSource = new("ItemFactoryUtil");
+            logSource = Logger.CreateLogSource("ItemFactoryUtil");
         }
 
         public void BuildContainer(LootableContainer container, FikaAirdropConfigModel config, string dropType)

Fika.Core/Coop/BTR/FikaBTRManager_Client.cs

@@ -61,7 +61,7 @@ internal class FikaBTRManager_Client : MonoBehaviour
             Type btrControllerType = typeof(BTRControllerClass);
             _updateTaxiPriceMethod = AccessTools.GetDeclaredMethods(btrControllerType).Single(IsUpdateTaxiPriceMethod);
             client = Singleton<FikaClient>.Instance;
-            btrLogger = new("BTR Client");
+            btrLogger = BepInEx.Logging.Logger.CreateLogSource("BTR Client");
         }
 
         private void Awake()

Fika.Core/Coop/BTR/FikaBTRManager_Host.cs

@@ -71,7 +71,7 @@ internal class FikaBTRManager_Host : MonoBehaviour
             Type btrControllerType = typeof(BTRControllerClass);
             _updateTaxiPriceMethod = AccessTools.GetDeclaredMethods(btrControllerType).Single(IsUpdateTaxiPriceMethod);
             server = Singleton<FikaServer>.Instance;
-            btrLogger = new("BTR Host");
+            btrLogger = BepInEx.Logging.Logger.CreateLogSource("BTR Host");
         }
 
         public bool CanPlayerEnter(IPlayer player)

Fika.Core/Coop/Components/CoopHandler.cs

@@ -183,7 +183,7 @@ protected void OnDestroy()
             StopCoroutine(ProcessSpawnQueue());
             if (PingRoutine != null)
             {
-                StopCoroutine(PingRoutine); 
+                StopCoroutine(PingRoutine);
             }
         }
 
@@ -493,21 +493,30 @@ private LocalPlayer SpawnObservedPlayer(Profile profile, Vector3 position, int p
                 return null;
 
             ((CoopPlayer)otherPlayer).NetId = netId;
+            Logger.LogInfo($"SpawnObservedPlayer: {profile.Nickname} spawning with NetId {netId}");
             if (!isAI)
+            {
                 HumanPlayers++;
+            }
 
             if (!Players.ContainsKey(netId))
             {
                 Players.Add(netId, (CoopPlayer)otherPlayer);
             }
+            else
+            {
+                Logger.LogError($"Trying to add {otherPlayer.Profile.Nickname} to list of players but it was already there!");
+            }
 
             if (!Singleton<GameWorld>.Instance.RegisteredPlayers.Any(x => x.Profile.ProfileId == profile.ProfileId))
                 Singleton<GameWorld>.Instance.RegisteredPlayers.Add(otherPlayer);
 
             foreach (CoopPlayer player in Players.Values)
             {
                 if (player is not ObservedCoopPlayer)
+                {
                     continue;
+                }
 
                 Collider playerCollider = otherPlayer.GetCharacterControllerCommon().GetCollider();
                 Collider otherCollider = player.GetCharacterControllerCommon().GetCollider();

Fika.Core/Coop/FreeCamera/FreeCameraController.cs

@@ -236,7 +236,7 @@ private void ShowExtractMessage()
                 if (FikaPlugin.ExtractKey.Value.Modifiers.Count() > 0)
                 {
                     string modifiers = string.Join("+", FikaPlugin.ExtractKey.Value.Modifiers);
-                    text = modifiers + "+" + text;
+                    text = modifiers + " + " + text;
                 }
                 extractText = FikaUIUtils.CreateOverlayText($"Press '{text}' to extract");
             }

Fika.Core/Coop/GameMode/CoopGame.cs

@@ -31,7 +31,6 @@
 using HarmonyLib;
 using JsonType;
 using LiteNetLib.Utils;
-using Newtonsoft.Json;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -483,33 +482,31 @@ public override void vmethod_1(float timeBeforeDeploy)
         /// <param name="timeBeforeDeploy">Time in seconds to count down</param>
         private async void DeployScreen(float timeBeforeDeploy)
         {
-            if (MatchmakerAcceptPatches.IsServer && MatchmakerAcceptPatches.HostExpectedNumberOfPlayers <= 1)
+            if (CoopHandler.TryGetCoopHandler(out CoopHandler coopHandler))
             {
-                if (fikaStartButton != null)
+                if (MatchmakerAcceptPatches.IsServer && MatchmakerAcceptPatches.HostExpectedNumberOfPlayers <= 1)
                 {
-                    Destroy(fikaStartButton);
-                }
+                    if (fikaStartButton != null)
+                    {
+                        Destroy(fikaStartButton);
+                    }
 
-                if (CoopHandler.TryGetCoopHandler(out CoopHandler coopHandler))
-                {
                     SetStatusModel status = new SetStatusModel(coopHandler.MyPlayer.ProfileId, LobbyEntry.ELobbyStatus.IN_GAME);
                     await FikaRequestHandler.UpdateSetStatus(status);
-                }
 
-                Singleton<FikaServer>.Instance.ReadyClients++;
-                base.vmethod_1(timeBeforeDeploy);
-                return;
-            }
+                    Singleton<FikaServer>.Instance.ReadyClients++;
+                    base.vmethod_1(timeBeforeDeploy);
+                    return;
+                }
 
-            forceStart = false;
+                NetDataWriter writer = new();
+                forceStart = false;
 
-            MatchmakerAcceptPatches.GClass3163.ChangeStatus("Waiting for other players to finish loading...");
+                MatchmakerAcceptPatches.GClass3163.ChangeStatus("Waiting for other players to finish loading...");
 
-            fikaStartButton?.SetActive(true);
+                fikaStartButton?.SetActive(true);
 
-            if (MatchmakerAcceptPatches.IsServer)
-            {
-                if (CoopHandler.TryGetCoopHandler(out CoopHandler coopHandler))
+                if (MatchmakerAcceptPatches.IsServer)
                 {
                     SetStatusModel status = new SetStatusModel(coopHandler.MyPlayer.ProfileId, LobbyEntry.ELobbyStatus.IN_GAME);
                     await FikaRequestHandler.UpdateSetStatus(status);
@@ -518,52 +515,56 @@ private async void DeployScreen(float timeBeforeDeploy)
                     {
                         await Task.Delay(100);
                     } while (coopHandler.HumanPlayers < MatchmakerAcceptPatches.HostExpectedNumberOfPlayers && !forceStart);
-                }
 
-                FikaServer server = Singleton<FikaServer>.Instance;
-                server.ReadyClients++;
-                InformationPacket packet = new()
-                {
-                    NumberOfPlayers = server.NetServer.ConnectedPeersCount,
-                    ReadyPlayers = server.ReadyClients
-                };
-                NetDataWriter writer = new();
-                writer.Reset();
-                server.SendDataToAll(writer, ref packet, LiteNetLib.DeliveryMethod.ReliableOrdered);
+                    FikaServer server = Singleton<FikaServer>.Instance;
+                    server.ReadyClients++;
+                    InformationPacket packet = new()
+                    {
+                        NumberOfPlayers = server.NetServer.ConnectedPeersCount,
+                        ReadyPlayers = server.ReadyClients
+                    };
+                    writer.Reset();
+                    server.SendDataToAll(writer, ref packet, LiteNetLib.DeliveryMethod.ReliableOrdered);
 
-                do
-                {
-                    await Task.Delay(250);
-                } while (Singleton<FikaServer>.Instance.ReadyClients < MatchmakerAcceptPatches.HostExpectedNumberOfPlayers && !forceStart);
-            }
-            else if (MatchmakerAcceptPatches.IsClient)
-            {
-                if (CoopHandler.TryGetCoopHandler(out CoopHandler coopHandler))
+                    do
+                    {
+                        await Task.Delay(250);
+                    } while (Singleton<FikaServer>.Instance.ReadyClients < MatchmakerAcceptPatches.HostExpectedNumberOfPlayers && !forceStart);
+
+                    foreach (CoopPlayer player in coopHandler.Players.Values)
+                    {
+                        SyncNetIdPacket syncPacket = new(player.ProfileId, player.NetId);
+
+                        writer.Reset();
+                        Singleton<FikaServer>.Instance.SendDataToAll(writer, ref syncPacket, LiteNetLib.DeliveryMethod.ReliableUnordered);
+                    }
+                }
+                else if (MatchmakerAcceptPatches.IsClient)
                 {
                     do
                     {
                         await Task.Delay(100);
                     } while (coopHandler.HumanPlayers < MatchmakerAcceptPatches.HostExpectedNumberOfPlayers && !forceStart);
-                }
 
-                FikaClient client = Singleton<FikaClient>.Instance;
-                InformationPacket packet = new(true)
-                {
-                    ReadyPlayers = 1
-                };
-                NetDataWriter writer = new();
-                writer.Reset();
-                client.SendData(writer, ref packet, LiteNetLib.DeliveryMethod.ReliableOrdered);
+                    FikaClient client = Singleton<FikaClient>.Instance;
+                    InformationPacket packet = new(true)
+                    {
+                        ReadyPlayers = 1
+                    };
+                    writer.Reset();
+                    client.SendData(writer, ref packet, LiteNetLib.DeliveryMethod.ReliableOrdered);
 
-                do
+                    do
+                    {
+                        await Task.Delay(250);
+                    } while (Singleton<FikaClient>.Instance.ReadyClients < MatchmakerAcceptPatches.HostExpectedNumberOfPlayers && !forceStart);
+                }
+
+                if (fikaStartButton != null)
                 {
-                    await Task.Delay(250);
-                } while (Singleton<FikaClient>.Instance.ReadyClients < MatchmakerAcceptPatches.HostExpectedNumberOfPlayers && !forceStart);
-            }
+                    Destroy(fikaStartButton);
+                }
 
-            if (fikaStartButton != null)
-            {
-                Destroy(fikaStartButton);
             }
 
             base.vmethod_1(timeBeforeDeploy);
@@ -653,7 +654,7 @@ public override async Task<LocalPlayer> vmethod_2(int playerId, Vector3 position
             LocalPlayer myPlayer = await CoopPlayer.Create(playerId, spawnPoint.Position, spawnPoint.Rotation, "Player", "Main_", EPointOfView.FirstPerson, profile,
                 false, UpdateQueue, Player.EUpdateMode.Auto, Player.EUpdateMode.Auto,
                 GClass549.Config.CharacterController.ClientPlayerMode, () => Singleton<SharedGameSettingsClass>.Instance.Control.Settings.MouseSensitivity,
-                () => Singleton<SharedGameSettingsClass>.Instance.Control.Settings.MouseAimingSensitivity, new GClass1445(), 0, questController);
+                () => Singleton<SharedGameSettingsClass>.Instance.Control.Settings.MouseAimingSensitivity, new GClass1445(), MatchmakerAcceptPatches.IsServer ? 0 : 1000, questController);
 
             profile.SetSpawnedInSession(profile.Side == EPlayerSide.Savage);
 
@@ -1374,8 +1375,15 @@ public override void Stop(string profileId, ExitStatus exitStatus, string exitNa
 
             wavesSpawnScenario_0?.Stop();
 
-            PlayerLeftRequest body = new PlayerLeftRequest(myPlayer.ProfileId);
-            FikaRequestHandler.RaidLeave(body);
+            try
+            {
+                PlayerLeftRequest body = new(myPlayer.ProfileId);
+                FikaRequestHandler.RaidLeave(body);
+            }
+            catch (Exception)
+            {
+                FikaPlugin.Instance.FikaLogger.LogError("Unable to send RaidLeave request to server.");
+            }
 
             if (CoopHandler.TryGetCoopHandler(out CoopHandler coopHandler))
             {

Fika.Core/Coop/PacketHandlers/ClientPacketSender.cs

@@ -10,6 +10,7 @@
 using LiteNetLib.Utils;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using UnityEngine;
 
 namespace Fika.Core.Coop.PacketHandlers
@@ -121,7 +122,11 @@ private void Update()
                     Client?.SendData(Writer, ref healthSyncPacket, DeliveryMethod.ReliableOrdered);
                 }
             }
-            if (FikaPlugin.PingButton.Value.IsPressed() && player.IsYourPlayer && player.HealthController.IsAlive && FikaPlugin.UsePingSystem.Value)
+            if (Input.GetKey(FikaPlugin.PingButton.Value.MainKey)
+                && FikaPlugin.PingButton.Value.Modifiers.All(Input.GetKey)
+                && player.IsYourPlayer
+                && player.HealthController.IsAlive
+                && FikaPlugin.UsePingSystem.Value)
             {
                 player?.Ping();
             }

Fika.Core/Coop/PacketHandlers/ServerPacketSender.cs

@@ -13,6 +13,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using UnityEngine;
 
 namespace Fika.Core.Coop.PacketHandlers
@@ -34,7 +35,7 @@ public class ServerPacketSender : MonoBehaviour, IPacketSender
 
         private void Awake()
         {
-            logger = new("ServerPacketSender");
+            logger = BepInEx.Logging.Logger.CreateLogSource("ServerPacketSender");
             player = GetComponent<CoopPlayer>();
         }
 
@@ -128,7 +129,11 @@ private void Update()
                     Server?.SendDataToAll(Writer, ref healthSyncPacket, DeliveryMethod.ReliableOrdered);
                 }
             }
-            if (FikaPlugin.PingButton.Value.IsPressed() && player.IsYourPlayer && player.HealthController.IsAlive && FikaPlugin.UsePingSystem.Value)
+            if (Input.GetKey(FikaPlugin.PingButton.Value.MainKey)
+                && FikaPlugin.PingButton.Value.Modifiers.All(Input.GetKey)
+                && player.IsYourPlayer
+                && player.HealthController.IsAlive
+                && FikaPlugin.UsePingSystem.Value)
             {
                 player?.Ping();
             }

Fika.Core/Coop/Players/CoopPlayer.cs

@@ -200,6 +200,13 @@ public override void ApplyDamageInfo(DamageInfo damageInfo, EBodyPart bodyPartTy
         {
             if (IsYourPlayer)
             {
+                if (damageInfo.Player != null)
+                {
+                    if (!FikaPlugin.Instance.FriendlyFire && damageInfo.Player.iPlayer is ObservedCoopPlayer observedCoopPlayer && !observedCoopPlayer.IsObservedAI)
+                    {
+                        return;
+                    }
+                }
                 if (colliderType == EBodyPartColliderType.HeadCommon)
                 {
                     damageInfo.Damage *= FikaPlugin.HeadDamageMultiplier.Value;
@@ -221,7 +228,7 @@ public override GClass1676 ApplyShot(DamageInfo damageInfo, EBodyPart bodyPartTy
                 return base.ApplyShot(damageInfo, bodyPartType, colliderType, armorPlateCollider, shotId);
             }
 
-            return null;            
+            return null;
         }
 
         public override void Proceed(bool withNetwork, Callback<GInterface125> callback, bool scheduled = true)
@@ -1280,7 +1287,7 @@ public virtual void HandleDamagePacket(DamagePacket packet)
                         if (!FikaPlugin.Instance.FriendlyFire && damageInfo.Player.iPlayer is ObservedCoopPlayer observedCoopPlayer && !observedCoopPlayer.IsObservedAI)
                         {
                             return;
-                        } 
+                        }
                     }
                 }
 

Fika.Core/Coop/Players/ObservedCoopPlayer.cs

@@ -889,7 +889,7 @@ protected override async void Start()
             {
                 IsObservedAI = true;
             }
-            
+
             PacketSender = gameObject.AddComponent<ObservedPacketSender>();
 
             if (IsObservedAI)