Merge pull request #315 from project-fika/1.2.2-dev

1.2.2 dev

Author: Lacyway

Fika.Core/Coop/GameMode/CoopGame.cs

@@ -1518,6 +1518,11 @@ private async Task<LocalPlayer> CreateLocalPlayer()
             LocalPlayer myPlayer;
             try
             {
+                if (Profile_0.Side != EPlayerSide.Savage)
+                {
+                    GenerateNewDogTagId();
+                }
+
                 myPlayer = await vmethod_3(GameWorld_0, num, spawnPoint.Position, spawnPoint.Rotation, "Player", "", EPointOfView.FirstPerson,
                         Profile_0, false, UpdateQueue, eupdateMode, Player.EUpdateMode.Auto,
                         BackendConfigAbstractClass.Config.CharacterController.ClientPlayerMode,
@@ -1539,6 +1544,25 @@ private async Task<LocalPlayer> CreateLocalPlayer()
             return myPlayer;
         }
 
+        /// <summary>
+        /// Temporary workaround since SPT does not generate a unique ID >3.11 for the dogtag
+        /// </summary>
+        private void GenerateNewDogTagId()
+        {
+            Item dogTag = Profile_0.Inventory.Equipment.GetSlot(EquipmentSlot.Dogtag).ContainedItem;
+            if (dogTag != null)
+            {
+                Traverse.Create(dogTag).Field<string>("<Id>k__BackingField").Value = MongoID.Generate(true);
+#if DEBUG
+                Logger.LogWarning("Generated new ID for DogTag");
+#endif
+            }
+            else
+            {
+                Logger.LogError("Could not find DogTag when generating new ID!");
+            }
+        }
+
         private async Task InitExfils()
         {
             SetMatchmakerStatus(LocaleUtils.UI_RETRIEVE_EXFIL_DATA.Localized());
@@ -1586,7 +1610,10 @@ private async Task WaitForHostToStart()
             GameObject startButton = null;
             if (isServer)
             {
-                startButton = CreateStartButton() ?? throw new NullReferenceException("Start button could not be created!");
+                if (!FikaBackendUtils.IsHeadless)
+                {
+                    startButton = CreateStartButton() ?? throw new NullReferenceException("Start button could not be created!"); 
+                }
                 FikaServer server = Singleton<FikaServer>.Instance;
                 server.RaidInitialized = true;
 

Fika.Core/Coop/Players/ObservedCoopPlayer.cs

@@ -1101,7 +1101,10 @@ public void SetInventory(GClass1693 inventoryDescriptor)
                 }
             }
 
-            RefreshSlotViews();
+            if (!FikaBackendUtils.IsHeadless)
+            {
+                RefreshSlotViews(); 
+            }
         }
 
         private void RefreshSlotViews()

Fika.Core/FikaPlugin.cs

@@ -37,6 +37,7 @@
 using System.Net.NetworkInformation;
 using System.Net.Sockets;
 using System.Reflection;
+using System.Text;
 using System.Threading.Tasks;
 using UnityEngine;
 
@@ -55,7 +56,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.1";
+        public const string FikaVersion = "1.2.2";
         public static FikaPlugin Instance;
         public static string EFTVersionMajor { get; internal set; }
         public static string ServerModVersion { get; private set; }
@@ -109,7 +110,7 @@ public ManualLogSource FikaLogger
         #region config values
 
         // Hidden
-        public static ConfigEntry<bool> AcceptedTOS { get; set; }        
+        public static ConfigEntry<string> LastVersion { get; set; }
 
         //Advanced
         public static ConfigEntry<bool> OfficialVersion { get; set; }
@@ -238,11 +239,6 @@ protected void Awake()
             GetNatPunchServerConfig();
             EnableFikaPatches();
             EnableTranspilers();
-
-#if GOLDMASTER
-            new TOS_Patch().Enable();
-#endif
-
             DisableSPTPatches();
             FixSPTBugPatches();
             EnableOverridePatches();
@@ -406,7 +402,7 @@ private IEnumerator RunChecks()
             {
                 yield return null;
             }
-            
+
             WanIP = addressTask.Result;
 
             yield return new WaitForSeconds(5);
@@ -511,10 +507,24 @@ private void SetupConfig()
         {
             bool failed = false;
             List<string> headers = [];
+
             // Hidden
 
-            AcceptedTOS = Config.Bind("Hidden", "Accepted TOS", false,
-                new ConfigDescription("Has accepted TOS", tags: new ConfigurationManagerAttributes() { Browsable = false }));
+            LastVersion = Config.Bind("Hidden", "Last Version", "0",
+                new ConfigDescription("Last loaded version of Fika", tags: new ConfigurationManagerAttributes() { Browsable = false }));
+
+#if GOLDMASTER
+            if (LastVersion.Value != FikaVersion)
+            {
+                Singleton<PreloaderUI>.Instance.ShowFikaMessage("FIKA", LocaleUtils.UI_TOS_LONG.Localized(), ErrorScreen.EButtonType.QuitButton, 15f,
+                    null, () =>
+                    {
+                        LastVersion.Value = FikaVersion;
+                    });
+
+                
+            } 
+#endif
 
             // Advanced
 

Fika.Core/Networking/FikaClient.cs

@@ -236,7 +236,6 @@ private void RegisterPacketsAndTypes()
             RegisterPacket<HealthSyncPacket>(OnHealthSyncPacketReceived);
             RegisterPacket<GenericPacket>(OnGenericPacketReceived);
             RegisterPacket<SendCharacterPacket>(OnSendCharacterPacketReceived);
-            RegisterPacket<AssignNetIdPacket>(OnAssignNetIdPacketReceived);
             RegisterPacket<OperationCallbackPacket>(OnOperationCallbackPacketReceived);
             RegisterPacket<TextMessagePacket>(OnTextMessagePacketReceived);
             RegisterPacket<QuestConditionPacket>(OnQuestConditionPacketReceived);
@@ -859,30 +858,6 @@ private void OnOperationCallbackPacketReceived(OperationCallbackPacket packet)
             }
         }
 
-        private void OnAssignNetIdPacketReceived(AssignNetIdPacket packet)
-        {
-            FikaPlugin.Instance.FikaLogger.LogInfo($"OnAssignNetIdPacketReceived: Assigned NetId {packet.NetId} to my own client.");
-            NetId = packet.NetId;
-            int i = -1;
-            foreach (KeyValuePair<int, CoopPlayer> player in coopHandler.Players)
-            {
-                if (player.Value == MyPlayer)
-                {
-                    i = player.Key;
-                    break;
-                }
-            }
-
-            if (i == -1)
-            {
-                FikaPlugin.Instance.FikaLogger.LogError("OnAssignNetIdPacketReceived: Could not find own player among players list");
-                return;
-            }
-
-            coopHandler.Players.Remove(i);
-            coopHandler.Players[packet.NetId] = MyPlayer;
-        }
-
         private void OnSendCharacterPacketReceived(SendCharacterPacket packet)
         {
             if (coopHandler == null)

Fika.Core/Networking/FikaServer.cs

@@ -127,6 +127,7 @@ public CoopHandler CoopHandler
         private CancellationTokenSource natIntroduceRoutineCts;
         private int statisticsCounter;
         private Dictionary<Profile, bool> visualProfiles;
+        private Dictionary<int, int> cachedConnections;
 
         internal FikaVOIPServer VOIPServer { get; set; }
         internal FikaVOIPClient VOIPClient { get; set; }
@@ -153,6 +154,7 @@ public async void Init()
             dataWriter = new();
             externalIp = NetUtils.GetLocalIp(LocalAddrType.IPv4);
             statisticsCounter = 0;
+            cachedConnections = [];
             logger = BepInEx.Logging.Logger.CreateLogSource("Fika.Server");
 
             ReadyClients = 0;
@@ -611,7 +613,7 @@ public void SendAirdropContainerData(EAirdropType containerType, Item item, int
                 {
                     ObjectId = ObjectId,
                     IsStatic = false,
-                    Position = containerObject != null ? containerObject.transform.position : Vector3.zero,
+                    Position = new(0, -1000, 0),
                     Rotation = containerObject != null ? containerObject.transform.rotation : Quaternion.identity,
                     AirdropType = containerType,
                     AirdropItem = item,
@@ -788,6 +790,11 @@ private void OnReconnectPacketReceived(ReconnectPacket packet, NetPeer peer)
 
                 foreach (CoopPlayer player in coopHandler.Players.Values)
                 {
+                    if (player.ProfileId == packet.ProfileId)
+                    {
+                        continue;
+                    }
+
                     SendCharacterPacket characterPacket = new(new()
                     {
                         Profile = player.Profile,
@@ -815,19 +822,6 @@ private void OnReconnectPacketReceived(ReconnectPacket packet, NetPeer peer)
                     SendDataToPeer(peer, ref characterPacket, DeliveryMethod.ReliableOrdered);
                 }
 
-                foreach (CoopPlayer player in coopHandler.HumanPlayers)
-                {
-                    if (player.ProfileId == packet.ProfileId)
-                    {
-                        AssignNetIdPacket assignPacket = new()
-                        {
-                            NetId = player.NetId
-                        };
-
-                        SendDataToPeer(peer, ref assignPacket, DeliveryMethod.ReliableOrdered);
-                    }
-                }
-
                 ReconnectPacket finishPacket = new()
                 {
                     Type = EReconnectDataType.Finished
@@ -1287,10 +1281,17 @@ public void OnPeerConnected(NetPeer peer)
 
             HasHadPeer = true;
 
+            int hash = peer.Address.GetHashCode();
+            if (!cachedConnections.TryGetValue(hash, out int netId))
+            {
+                netId = PopNetId();
+                cachedConnections.Add(hash, netId);
+            }
+
             NetworkSettingsPacket packet = new()
             {
                 SendRate = sendRate,
-                NetId = PopNetId(),
+                NetId = netId,
                 AllowVOIP = AllowVOIP
             };
             SendDataToPeer(peer, ref packet, DeliveryMethod.ReliableOrdered);

Fika.Core/Networking/Packets/Communication/AllCharacterRequestPacket.cs

@@ -5,6 +5,7 @@
 using EFT.InventoryLogic;
 using EFT.SynchronizableObjects;
 using Fika.Core.Coop.Players;
+using Fika.Core.Coop.Utils;
 using LiteNetLib.Utils;
 using System;
 using UnityEngine;
@@ -155,10 +156,22 @@ public void Execute(CoopPlayer player)
                     return;
                 }
 
+#if DEBUG
+                FikaGlobals.LogWarning($"Spawning airdrop at {Position} with id {ObjectId}");
+#endif
+
                 AirdropSynchronizableObject syncObject = (AirdropSynchronizableObject)processor.TakeFromPool(SynchronizableObjectType.AirDrop);
                 syncObject.ObjectId = ObjectId;
                 syncObject.transform.position = Position;
                 syncObject.transform.rotation = Rotation;
+                if (syncObject.Logic is AirdropLogicClass airdropLogicClass)
+                {
+                    airdropLogicClass.vector3_0 = Position;
+                }
+                else
+                {
+                    FikaGlobals.LogWarning("AirdropSynchronizableObject logic was not of type AirdropLogicClass!");
+                }
                 syncObject.AirdropType = AirdropType;
                 LootableContainer container = syncObject.GetComponentInChildren<LootableContainer>().gameObject.GetComponentInChildren<LootableContainer>();
                 container.enabled = true;