Merge pull request #309 from project-fika/1.2.1-dev

1.2.1

Author: Lacyway

Fika.Core/Coop/GameMode/CoopGame.cs

@@ -997,7 +997,7 @@ public override async Task<LocalPlayer> vmethod_3(GameWorld gameWorld, int playe
 
             //GameObject customButton = null;
 
-            await NetManagerUtils.SetupGameVariables(isServer, coopPlayer);
+            await NetManagerUtils.SetupGameVariables(coopPlayer);
             //customButton = CreateCancelButton(coopPlayer, customButton);
 
             if (!isServer && !FikaBackendUtils.IsReconnect)
@@ -1446,6 +1446,8 @@ private async Task RetrieveLootFromServer(bool register)
         /// <returns>A <see cref="Player"/></returns>
         private async Task<LocalPlayer> CreateLocalPlayer()
         {
+            Status = GameStatus.Running;
+
             int num = Singleton<IFikaNetworkManager>.Instance.NetId;
 
             Player.EUpdateMode eupdateMode = Player.EUpdateMode.Auto;

Fika.Core/Coop/Patches/LocalGame/TarkovApplication_LocalGameCreator_Patch.cs

@@ -104,12 +104,15 @@ public static async Task CreateFikaGame(TarkovApplication instance, TimeAndWeath
 
             LocalSettings localSettings = await instance.Session.LocalRaidStarted(localRaidSettings);
             LocalRaidSettings raidSettingsToUpdate = applicationTraverse.Field<LocalRaidSettings>("localRaidSettings_0").Value;
+            int escapeTimeLimit = raidSettings.SelectedLocation.EscapeTimeLimit;
             if (isServer)
             {
-                raidSettings.SelectedLocation = localSettings.locationLoot; 
+                raidSettings.SelectedLocation = localSettings.locationLoot;
+                raidSettings.SelectedLocation.EscapeTimeLimit = escapeTimeLimit;
             }
             raidSettingsToUpdate.serverId = localSettings.serverId;
             raidSettingsToUpdate.selectedLocation = localSettings.locationLoot;
+            raidSettingsToUpdate.selectedLocation.EscapeTimeLimit = escapeTimeLimit;
             raidSettingsToUpdate.transition = FikaBackendUtils.TransitData;
 
             GClass1325 profileInsurance = localSettings.profileInsurance;

Fika.Core/Coop/Players/CoopPlayer.cs

@@ -172,7 +172,7 @@ await player.Init(rotation, layerName, pointOfView, profile, inventoryController
                 }
             }
 
-            player.Profile.Info.SetProfileNickname(FikaBackendUtils.PMCName);
+            player.Profile.Info.SetProfileNickname(FikaBackendUtils.PMCName ?? profile.Nickname);
 
             return player;
         }
@@ -833,6 +833,11 @@ public override void vmethod_0(WorldInteractiveObject interactiveObject, Interac
         // Execute
         public override void vmethod_1(WorldInteractiveObject door, InteractionResult interactionResult)
         {
+            if (door == null)
+            {
+                return;
+            }
+
             if (this is ObservedCoopPlayer)
             {
                 base.vmethod_1(door, interactionResult);

Fika.Core/Coop/Players/ObservedCoopPlayer.cs

@@ -330,6 +330,11 @@ public override void UpdateSpeedLimitByHealth()
             // Do nothing
         }
 
+        public override void UpdateSpeedLimit(float speedDelta, ESpeedLimit cause, float duration)
+        {
+            // Do nothing
+        }
+
         public override void UpdatePhones()
         {
             // Do nothing
@@ -672,7 +677,7 @@ public override void CreateMovementContext()
         public override void OnHealthEffectAdded(IEffect effect)
         {
             // Check for GClass increments
-            if (effect is GInterface315 fracture && !fracture.WasPaused && FractureSound != null && Singleton<BetterAudio>.Instantiated)
+            if (effect is GInterface316 fracture && !fracture.WasPaused && FractureSound != null && Singleton<BetterAudio>.Instantiated)
             {
                 Singleton<BetterAudio>.Instance.PlayAtPoint(Position, FractureSound, CameraClass.Instance.Distance(Position),
                     BetterAudio.AudioSourceGroupType.Impacts, 15, 0.7f, EOcclusionTest.Fast, null, false);
@@ -1342,7 +1347,7 @@ public void SetMuffledState(bool muffled)
                     VoipEftSource.SetMixerGroup(audioMixerGroup);
                 }
             }
-        }
+        }        
 
         public override void LandingAdjustments(float d)
         {

Fika.Core/Coop/Utils/FikaGlobals.cs

@@ -169,7 +169,7 @@ public static bool IsInRaid()
         /// <returns><see cref="bool"/></returns>
         public static bool IsHeadlessProfile(this Profile profile)
         {
-            return profile.Info.GroupId.ToLower() == "headless";
+            return profile.Info != null && profile.Info.GroupId.ToLower() == "headless";
         }
 
         /// <summary>
@@ -179,8 +179,7 @@ public static bool IsHeadlessProfile(this Profile profile)
         /// <param name="nickname"></param>
         public static void SetProfileNickname(this InfoClass infoClass, string nickname)
         {
-            //Traverse.Create(infoClass).Field<string>("MainProfileNickname").Value = nickname;
-            infoClass.Nickname = nickname;
+            Traverse.Create(infoClass).Field<string>("MainProfileNickname").Value = nickname;
         }
 
         /// <summary>

Fika.Core/Coop/Utils/NetManagerUtils.cs

@@ -176,16 +176,10 @@ public static Task InitNetManager(bool isServer)
             throw new NullReferenceException("FikaGameObject was null");
         }
 
-        public static Task SetupGameVariables(bool isServer, CoopPlayer coopPlayer)
+        public static Task SetupGameVariables(CoopPlayer coopPlayer)
         {
-            logger.LogInfo("Setting up game variables...");
-            if (isServer)
-            {
-                Singleton<FikaServer>.Instance.SetupGameVariables(coopPlayer);
-                return Task.CompletedTask;
-            }
-
-            Singleton<FikaClient>.Instance.SetupGameVariables(coopPlayer);
+            logger.LogInfo("Setting up game variables...");            
+            Singleton<IFikaNetworkManager>.Instance.SetupGameVariables(coopPlayer);
             return Task.CompletedTask;
         }
 

Fika.Core/FikaPlugin.cs

@@ -55,7 +55,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 = "1.2.0";
+        public const string FikaVersion = "1.2.1";
         public static FikaPlugin Instance;
         public static string EFTVersionMajor { get; internal set; }
         public static string ServerModVersion { get; private set; }

Fika.Core/Networking/IFikaNetworkManager.cs

@@ -1,5 +1,6 @@
 using EFT;
 using Fika.Core.Coop.Components;
+using Fika.Core.Coop.Players;
 using Fika.Core.Networking.Packets;
 using LiteNetLib;
 using LiteNetLib.Utils;
@@ -15,6 +16,7 @@ public interface IFikaNetworkManager
         public EPlayerSide RaidSide { get; set; }
         public int SendRate { get; }
         public bool AllowVOIP { get; set; }
+        public void SetupGameVariables(CoopPlayer coopPlayer);
         public void SendVOIPPacket(ref VOIPPacket packet, NetPeer peer = null);
         public void SendVOIPData(ArraySegment<byte> data, NetPeer peer = null);
         /// <summary>