[WIP FEATURE] Add Reconnecting

Fika.Core/Coop/ClientClasses/CoopClientAchievementController.cs

@@ -0,0 +1,28 @@
+using Comfort.Common;
+using EFT;
+using EFT.Quests;
+using Fika.Core.Coop.Matchmaker;
+using Fika.Core.Networking;
+
+namespace Fika.Core.Coop.ClientClasses
+{
+    public class CoopClientAchievementController : AchievementControllerClass
+    {
+        private readonly FikaClient _fikaClient = Singleton<FikaClient>.Instance;
+
+        public CoopClientAchievementController(Profile profile, InventoryControllerClass inventoryController, ISession session, bool fromServer) : base(profile, inventoryController, session, fromServer)
+        {
+        }
+
+        public override void OnConditionValueChanged(IConditionCounter conditional, EQuestStatus status, Condition condition, bool notify)
+        {
+            if (MatchmakerAcceptPatches.IsClient)
+            {
+                ConditionChangePacket packet = new(_fikaClient.MyPlayer.NetId, condition.id, condition.value);
+                _fikaClient.SendData(_fikaClient.DataWriter, ref packet, LiteNetLib.DeliveryMethod.ReliableUnordered);
+            }
+
+            base.OnConditionValueChanged(conditional, status, condition, notify);
+        }
+    }
+}

Fika.Core/Coop/ClientClasses/CoopClientQuestController.cs

@@ -0,0 +1,28 @@
+using Comfort.Common;
+using EFT;
+using EFT.Quests;
+using Fika.Core.Coop.Matchmaker;
+using Fika.Core.Networking;
+
+namespace Fika.Core.Coop.ClientClasses
+{
+    public class CoopClientQuestController : GClass3206
+    {
+        private FikaClient fikaClient = Singleton<FikaClient>.Instance;
+
+        public CoopClientQuestController(Profile profile, InventoryControllerClass inventoryController, ISession session, bool fromServer) : base(profile, inventoryController, session, fromServer)
+        {
+        }
+
+        public override void OnConditionValueChanged(IConditionCounter conditional, EQuestStatus status, Condition condition, bool notify)
+        {
+            if (MatchmakerAcceptPatches.IsClient)
+            {
+                ConditionChangePacket packet = new(fikaClient.MyPlayer.NetId, condition.id, condition.value);
+                fikaClient.SendData(fikaClient.DataWriter, ref packet, LiteNetLib.DeliveryMethod.ReliableUnordered);
+            }
+
+            base.OnConditionValueChanged(conditional, status, condition, notify);
+        }
+    }
+}

Fika.Core/Coop/Components/CoopHandler.cs

@@ -61,6 +61,7 @@ public class SpawnObject(Profile profile, Vector3 position, bool isAlive, bool i
         internal static GameObject CoopHandlerParent;
 
         private Coroutine PingRoutine;
+        public bool StartSpawning = false;
 
         #endregion
 
@@ -283,6 +284,11 @@ private async Task ReadFromServerCharactersLoop()
         {
             while (RunAsyncTasks)
             {
+                while (!StartSpawning)
+                {
+                    await Task.Delay(1000);
+                }
+
                 CoopGame coopGame = (CoopGame)Singleton<IFikaGame>.Instance;
                 int waitTime = 2500;
                 if (coopGame.Status == GameStatus.Started)
@@ -294,7 +300,6 @@ private async Task ReadFromServerCharactersLoop()
                 if (Players == null)
                 {
                     continue;
-
                 }
 
                 ReadFromServerCharacters();
@@ -369,7 +374,7 @@ await Singleton<PoolManager>.Instance.LoadBundlesAndCreatePools(PoolManager.Pool
 
             if (!spawnObject.IsAlive)
             {
-                // TODO: Spawn them as corpses?
+                otherPlayer.OnDead(EDamageType.Undefined);
             }
 
             if (MatchmakerAcceptPatches.IsServer)
@@ -402,6 +407,11 @@ private IEnumerator ProcessSpawnQueue()
         {
             while (true)
             {
+                if (!StartSpawning)
+                {
+                    yield return new WaitUntil(() => StartSpawning);
+                }
+
                 yield return new WaitForSeconds(1f);
 
                 if (Singleton<AbstractGame>.Instantiated)
@@ -456,7 +466,7 @@ public WorldInteractiveObject GetInteractiveObject(string objectId, out WorldInt
         private ObservedCoopPlayer SpawnObservedPlayer(Profile profile, Vector3 position, int playerId, bool isAI, int netId)
         {
             ObservedCoopPlayer otherPlayer = ObservedCoopPlayer.CreateObservedPlayer(playerId, position, Quaternion.identity,
-                "Player", isAI == true ? "Bot_" : $"Player_{profile.Nickname}_", EPointOfView.ThirdPerson, profile, isAI,
+                "Player", isAI == true ? $"Bot_{netId}_" : $"Player_{profile.Nickname}_", EPointOfView.ThirdPerson, profile, isAI,
                 EUpdateQueue.Update, Player.EUpdateMode.Manual, Player.EUpdateMode.Auto,
                 GClass549.Config.CharacterController.ObservedPlayerMode,
                 () => Singleton<SharedGameSettingsClass>.Instance.Control.Settings.MouseSensitivity,

Fika.Core/Coop/GameMode/CoopGame.cs

@@ -38,6 +38,7 @@
 using Fika.Core.UI.Models;
 using HarmonyLib;
 using JsonType;
+using LiteNetLib;
 using LiteNetLib.Utils;
 using Newtonsoft.Json;
 using System;
@@ -486,7 +487,7 @@ private bool TryDespawnFurthest(Profile profile, Vector3 position, CoopHandler c
             if (botKey == string.Empty)
             {
 #if DEBUG
-                Logger.LogWarning("TryDespawnFurthest: botKey was empty"); 
+                Logger.LogWarning("TryDespawnFurthest: botKey was empty");
 #endif
                 return false;
             }
@@ -677,7 +678,7 @@ private async Task SendOrReceiveSpawnPoint()
 
                 if (!string.IsNullOrEmpty(name))
                 {
-                    Logger.LogInfo($"Retrieved Spawn Point '{name}' from server");
+                    Logger.LogInfo($"Retrieved Spawn Point {name} from server");
 
                     Dictionary<ISpawnPoint, SpawnPointMarker> allSpawnPoints = Traverse.Create(spawnPoints).Field("dictionary_0").GetValue<Dictionary<ISpawnPoint, SpawnPointMarker>>();
                     foreach (ISpawnPoint spawnPointObject in allSpawnPoints.Keys)
@@ -727,7 +728,37 @@ public override async Task<LocalPlayer> vmethod_2(int playerId, Vector3 position
             await CreateCoopHandler();
             CoopHandler.GetCoopHandler().LocalGameInstance = this;
 
-            LocalPlayer myPlayer = await CoopPlayer.Create(playerId, spawnPoint.Position, spawnPoint.Rotation, "Player", "Main_", EPointOfView.FirstPerson, profile,
+            Vector3 PosToSpawn = spawnPoint.Position;
+            Quaternion RotToSpawn = spawnPoint.Rotation;
+            if (MatchmakerAcceptPatches.IsClient && MatchmakerAcceptPatches.IsReconnect)
+            {
+                ReconnectRequestPacket reconnectPacket = new(ProfileId);
+                MatchmakerAcceptPatches.GClass3163?.ChangeStatus($"Sending Reconnect Request...");
+
+                int retryCount = 0;
+                while (MatchmakerAcceptPatches.ReconnectPacket == null && retryCount < 5)
+                {
+                    Singleton<FikaClient>.Instance?.SendData(new NetDataWriter(), ref reconnectPacket, DeliveryMethod.ReliableUnordered);
+                    MatchmakerAcceptPatches.GClass3163?.ChangeStatus($"Requests Sent for reconnect... {retryCount + 1}");
+                    await Task.Delay(3000);
+                    retryCount++;
+                }
+
+                if (MatchmakerAcceptPatches.ReconnectPacket == null && retryCount == 5)
+                {
+                    MatchmakerAcceptPatches.GClass3163?.ChangeStatus($"Failed to Reconnect...");
+                    Singleton<PreloaderUI>.Instance.ShowCriticalErrorScreen("Network Error", "[EXPERIMENTAL] Unable to reconnect to the host. Please try again after returning to main menu.",
+                        ErrorScreen.EButtonType.OkButton, 10f, ReconnectFailed, ReconnectFailed);
+                }
+
+                MatchmakerAcceptPatches.GClass3163?.ChangeStatus($"Reconnecting to host...");
+
+                PosToSpawn = MatchmakerAcceptPatches.ReconnectPacket.Value.Position;
+                RotToSpawn = MatchmakerAcceptPatches.ReconnectPacket.Value.Rotation;
+                profile = MatchmakerAcceptPatches.ReconnectPacket.Value.Profile.Profile;
+            }
+
+            LocalPlayer myPlayer = await CoopPlayer.Create(playerId, PosToSpawn, RotToSpawn, "Player", "Main_", EPointOfView.FirstPerson, profile,
                 false, UpdateQueue, armsUpdateMode, bodyUpdateMode,
                 GClass549.Config.CharacterController.ClientPlayerMode, getSensitivity,
                 getAimingSensitivity, new GClass1445(), MatchmakerAcceptPatches.IsServer ? 0 : 1000, statisticsManager);
@@ -740,13 +771,21 @@ public override async Task<LocalPlayer> vmethod_2(int playerId, Vector3 position
                 throw new MissingComponentException("CoopHandler was missing during CoopGame init");
             }
 
+            CoopPlayer coopPlayer = (CoopPlayer)myPlayer;
+
+            if (MatchmakerAcceptPatches.IsClient && MatchmakerAcceptPatches.IsReconnect)
+            {
+                coopPlayer.NetId = MatchmakerAcceptPatches.ReconnectPacket.Value.NetId;
+                myPlayer.MovementContext.SetPoseLevel(MatchmakerAcceptPatches.ReconnectPacket.Value.PoseLevel, true);
+                myPlayer.MovementContext.IsInPronePose = MatchmakerAcceptPatches.ReconnectPacket.Value.IsProne;
+            }
+
             if (RaidSettings.MetabolismDisabled)
             {
                 myPlayer.HealthController.DisableMetabolism();
                 NotificationManagerClass.DisplayMessageNotification("Metabolism disabled", iconType: EFT.Communications.ENotificationIconType.Alert);
             }
 
-            CoopPlayer coopPlayer = (CoopPlayer)myPlayer;
             coopHandler.Players.Add(coopPlayer.NetId, coopPlayer);
 
             PlayerSpawnRequest body = new(myPlayer.ProfileId, MatchmakerAcceptPatches.GetGroupId());
@@ -822,15 +861,18 @@ public override async Task<LocalPlayer> vmethod_2(int playerId, Vector3 position
                 }
             }
 
-            SendCharacterPacket packet = new(new FikaSerialization.PlayerInfoPacket() { Profile = myPlayer.Profile }, myPlayer.HealthController.IsAlive, false, myPlayer.Transform.position, (myPlayer as CoopPlayer).NetId);
-
-            if (MatchmakerAcceptPatches.IsServer)
+            if (!MatchmakerAcceptPatches.IsReconnect)
             {
-                await SetStatus(myPlayer, LobbyEntry.ELobbyStatus.COMPLETE);
-            }
-            else
-            {
-                Singleton<FikaClient>.Instance.SendData(new NetDataWriter(), ref packet, LiteNetLib.DeliveryMethod.ReliableUnordered);
+                SendCharacterPacket packet = new(new FikaSerialization.PlayerInfoPacket() { Profile = myPlayer.Profile }, myPlayer.HealthController.IsAlive, false, myPlayer.Transform.position, (myPlayer as CoopPlayer).NetId);
+
+                if (MatchmakerAcceptPatches.IsServer)
+                {
+                    await SetStatus(myPlayer, LobbyEntry.ELobbyStatus.COMPLETE);
+                }
+                else
+                {
+                    Singleton<FikaClient>.Instance.SendData(new NetDataWriter(), ref packet, LiteNetLib.DeliveryMethod.ReliableUnordered);
+                }
             }
 
             if (MatchmakerAcceptPatches.IsServer)
@@ -848,6 +890,7 @@ public override async Task<LocalPlayer> vmethod_2(int playerId, Vector3 position
                 }
             }
 
+            coopHandler.StartSpawning = true;
             await WaitForPlayers();
 
             Destroy(customButton);
@@ -861,6 +904,12 @@ public override async Task<LocalPlayer> vmethod_2(int playerId, Vector3 position
             return myPlayer;
         }
 
+        private void ReconnectFailed()
+        {
+            ClientAppUtils.GetMainApp().method_48().HandleExceptions();
+            Logger.LogError($"Failed to reconnect to the host. Returning to main menu...");
+        }
+
         private void MainPlayerDied(EDamageType obj)
         {
             EndByTimerScenario endByTimerScenario = GetComponent<EndByTimerScenario>();
@@ -960,6 +1009,8 @@ private async Task<Player> CreateLocalPlayer()
             {
                 spawnPoint = SpawnSystem.SelectSpawnPoint(ESpawnCategory.Player, Profile_0.Info.Side);
                 await SendOrReceiveSpawnPoint();
+                MatchmakerAcceptPatches.IsReconnect = false;
+                MatchmakerAcceptPatches.ReconnectPacket = null;
             }
 
             if (MatchmakerAcceptPatches.IsClient)
@@ -1086,6 +1137,8 @@ private async Task WaitForPlayers()
                     client.SendData(writer, ref packet, LiteNetLib.DeliveryMethod.ReliableOrdered);
                     await Task.Delay(1000);
                 } while (numbersOfPlayersToWaitFor > 0 && !forceStart);
+
+                MatchmakerAcceptPatches.SpawnedPlayersComplete = true;
             }
         }
 
@@ -1166,7 +1219,7 @@ public override IEnumerator vmethod_4(float startDelay, BotControllerSettings co
                     if (limits > 0)
                     {
                         botsController_0.BotSpawner.SetMaxBots(limits);
-                    } 
+                    }
                 }
 
                 DynamicAI = gameObject.AddComponent<FikaDynamicAI>();
@@ -1605,6 +1658,13 @@ public override void Stop(string profileId, ExitStatus exitStatus, string exitNa
         {
             Logger.LogInfo("CoopGame::Stop");
 
+            if (MatchmakerAcceptPatches.IsReconnect)
+            {
+                MatchmakerAcceptPatches.IsReconnect = false;
+                MatchmakerAcceptPatches.ReconnectPacket = null;
+                MatchmakerAcceptPatches.SpawnedPlayersComplete = false;
+            }
+
             CoopPlayer myPlayer = (CoopPlayer)Singleton<GameWorld>.Instance.MainPlayer;
             myPlayer.PacketSender.DestroyThis();
 

Fika.Core/Coop/Matchmaker/MatchmakerAccept/MatchmakerAcceptPatches.cs

@@ -1,5 +1,6 @@
 using EFT;
 using EFT.UI.Matchmaker;
+using Fika.Core.Networking;
 using Fika.Core.Networking.Http;
 using Fika.Core.Networking.Http.Models;
 using System;
@@ -32,6 +33,10 @@ public static class MatchmakerAcceptPatches
         public static WeatherClass[] Nodes { get; set; } = null;
         private static string groupId;
         private static long timestamp;
+        public static bool IsReconnect = false;
+        public static ReconnectResponsePacket? ReconnectPacket;
+        public static bool SpawnedPlayersComplete = false;
+
         #endregion
 
         #region Static Fields

Fika.Core/Coop/Patches/BaseLocalGame/BaseLocalGame_method_6_Patch.cs

@@ -0,0 +1,26 @@
+using System.Reflection;
+using Aki.Reflection.Patching;
+using EFT;
+using Fika.Core.Coop.Matchmaker;
+
+namespace Fika.Core.Coop.Patches
+{
+    internal class BaseLocalGame_method_6_Patch : ModulePatch
+    {
+        protected override MethodBase GetTargetMethod()
+        {
+            return typeof(BaseLocalGame<GamePlayerOwner>).GetMethod(nameof(BaseLocalGame<GamePlayerOwner>.method_11));
+        }
+
+        [PatchPrefix]
+        public static bool PatchPrefix(ref LocationSettingsClass.Location location)
+        {
+            if (MatchmakerAcceptPatches.IsClient && MatchmakerAcceptPatches.IsReconnect)
+            {
+                location.Loot = MatchmakerAcceptPatches.ReconnectPacket.Value.Items;
+            }
+
+            return true;
+        }
+    }
+}

Fika.Core/Coop/Players/CoopPlayer.cs

@@ -66,11 +66,11 @@ public static async Task<LocalPlayer> Create(int playerId, Vector3 position, Qua
 
             ISession session = Singleton<ClientApplication<ISession>>.Instance.GetClientBackEndSession();
 
-            GClass3206 questController = new(profile, inventoryController, session, true);
+            CoopClientQuestController questController = new(profile, inventoryController, session, true);
             questController.Init();
             questController.Run();
 
-            AchievementControllerClass achievementsController = new(profile, inventoryController, session, true);
+            CoopClientAchievementController achievementsController = new(profile, inventoryController, session, true);
             achievementsController.Init();
             achievementsController.Run();
 
@@ -844,7 +844,6 @@ public override void TryInteractionCallback(LootableContainer container)
         protected virtual void Start()
         {
             Profile.Info.GroupId = "Fika";
-
             if (Side != EPlayerSide.Savage)
             {
                 if (Equipment.GetSlot(EquipmentSlot.Dogtag).ContainedItem != null)

Fika.Core/Coop/Players/ObservedCoopPlayer.cs

@@ -139,6 +139,7 @@ public static async Task<ObservedCoopPlayer> CreateObservedPlayer(int playerId,
 
             CoopObservedStatisticsManager statisticsManager = new();
 
+
             await player.Init(rotation, layerName, pointOfView, profile, inventoryController, healthController,
                 statisticsManager, null, null, filter, EVoipState.NotAvailable, aiControl, false);
 
@@ -746,7 +747,10 @@ public override void OnDead(EDamageType damageType)
                     }
                     else
                     {
-                        NotificationManagerClass.DisplayWarningNotification($"Group member '{nickname}' has died");
+                        if (!MatchmakerAcceptPatches.IsReconnect)
+                        {
+                            NotificationManagerClass.DisplayWarningNotification($"Group member '{Profile.Nickname}' has died");
+                        }
                     }
                 }
                 if (IsBoss(Profile.Info.Settings.Role, out string name) && IsObservedAI && LastAggressor != null)

Fika.Core/FikaPlugin.cs

@@ -206,6 +206,7 @@ protected void Awake()
             new BotCacher_Patch().Enable();
             new InventoryScroll_Patch().Enable();
             new AbstractGame_InRaid_Patch().Enable();
+            new BaseLocalGame_method_6_Patch().Enable();
 #if GOLDMASTER
             new TOS_Patch().Enable();
 #endif