Merge pull request #245 from project-fika/fix-locale-errors

Fix locale errors
project-fika · Dec 18, 2024 · 55a7a20 · 55a7a20
2 parents 8d4d47e + e405385
commit 55a7a20
Show file tree

Hide file tree

Showing 8 changed files with 144 additions and 101 deletions.
diff --git a/Fika.Core/Coop/GameMode/CoopGame.cs b/Fika.Core/Coop/GameMode/CoopGame.cs
@@ -650,10 +650,10 @@ private void SyncTransitControllers()
 		/// This task ensures that all players are joined and loaded before continuing
 		/// </summary>
 		/// <returns></returns>
-		private async Task WaitForOtherPlayers()
+		private async Task WaitForOtherPlayersToLoad()
 		{
 #if DEBUG
-			Logger.LogWarning("Starting " + nameof(WaitForOtherPlayers));
+			Logger.LogWarning("Starting " + nameof(WaitForOtherPlayersToLoad));
 #endif
 			if (CoopHandler.TryGetCoopHandler(out CoopHandler coopHandler))
 			{
@@ -955,7 +955,7 @@ private GameObject CreateStartButton()
 					if (isServer)
 					{
 						RaidStarted = true;
-						FikaBackendUtils.HostExpectedNumberOfPlayers = Singleton<FikaServer>.Instance.NetServer.ConnectedPeersCount;
+						FikaBackendUtils.HostExpectedNumberOfPlayers = Singleton<FikaServer>.Instance.NetServer.ConnectedPeersCount + 1;
 						return;
 					}
 
@@ -1410,6 +1410,11 @@ private async Task WaitForHostToStart()
 					Destroy(startButton); 
 				}
 
+				InformationPacket continuePacket = new()
+				{
+					AmountOfPeers = server.NetServer.ConnectedPeersCount + 1
+				};
+				server.SendDataToAll(ref continuePacket, DeliveryMethod.ReliableOrdered);
 				SetStatusModel status = new(FikaBackendUtils.GroupId, LobbyEntry.ELobbyStatus.IN_GAME);
 				await FikaRequestHandler.UpdateSetStatus(status);
 				return;
@@ -1523,7 +1528,7 @@ public override async Task vmethod_1(BotControllerSettings controllerSettings, I
 				DynamicAI = gameObject.AddComponent<FikaDynamicAI>();
 			}
 
-			await WaitForOtherPlayers();
+			await WaitForOtherPlayersToLoad();
 
 			SetMatchmakerStatus(LocaleUtils.UI_FINISHING_RAID_INIT.Localized());
 			Logger.LogInfo("All players are loaded, continuing...");

diff --git a/Fika.Core/Coop/Players/CoopPlayer.cs b/Fika.Core/Coop/Players/CoopPlayer.cs
@@ -61,6 +61,7 @@ public bool WaitingForCallback
 		}
 
 		protected string lastWeaponId;
+		private bool shouldSendSideEffect;
 
 		public ClientMovementContext ClientMovementContext
 		{
@@ -1344,6 +1345,10 @@ public virtual void HandleDamagePacket(ref DamagePacket packet)
 				if (item != null)
 				{
 					damageInfo.Weapon = item;
+					(damageInfo.Player.iPlayer as CoopPlayer).shouldSendSideEffect = true;
+#if DEBUG
+					FikaPlugin.Instance.FikaLogger.LogWarning("Found weapon for knife damage: " + item.Name.Localized()); 
+#endif
 				}
 			}
 
@@ -1354,13 +1359,19 @@ public virtual void HandleDamagePacket(ref DamagePacket packet)
 
 		public override void OnSideEffectApplied(SideEffectComponent sideEffect)
 		{
+			if (!shouldSendSideEffect)
+			{
+				return;
+			}
+
 			SideEffectPacket packet = new()
 			{
 				ItemId = sideEffect.Item.Id,
 				Value = sideEffect.Value
 			};
 
-			PacketSender.SendPacket(ref packet);
+			PacketSender.SendPacket(ref packet, true);
+			shouldSendSideEffect = false;
 		}
 
 		public void HandleArmorDamagePacket(ref ArmorDamagePacket packet)

diff --git a/Fika.Core/Coop/Players/ObservedCoopPlayer.cs b/Fika.Core/Coop/Players/ObservedCoopPlayer.cs
@@ -1112,11 +1112,6 @@ public void InitObservedPlayer(bool isDedicatedHost)
 			}
 		}
 
-		public override void OnSideEffectApplied(SideEffectComponent sideEffect)
-		{
-			// Do nothing
-		}
-
 		private IEnumerator CreateHealthBar()
 		{
 			CoopGame coopGame = (CoopGame)Singleton<IFikaGame>.Instance;

diff --git a/Fika.Core/FikaPlugin.cs b/Fika.Core/FikaPlugin.cs
diff --git a/Fika.Core/Networking/FikaClient.cs b/Fika.Core/Networking/FikaClient.cs
@@ -213,6 +213,9 @@ public async void Init()
 
 		private void OnSideEffectPacketReceived(SideEffectPacket packet)
 		{
+#if DEBUG
+			logger.LogWarning("OnSideEffectPacketReceived: Received"); 
+#endif
 			GameWorld gameWorld = Singleton<GameWorld>.Instance;
 			if (gameWorld == null)
 			{
@@ -231,7 +234,9 @@ private void OnSideEffectPacketReceived(SideEffectPacket packet)
 			{
 				sideEffectComponent.Value = packet.Value;
 				item.RaiseRefreshEvent(false, false);
+				return;
 			}
+			logger.LogError("OnSideEffectPacketReceived: SideEffectComponent was not found!");
 		}
 
 		private void OnCorpsePositionPacketReceived(CorpsePositionPacket packet)
@@ -1086,11 +1091,14 @@ private void OnInformationPacketReceived(InformationPacket packet)
 			if (coopGame != null)
 			{
 				coopGame.RaidStarted = packet.RaidStarted;
-				FikaBackendUtils.HostExpectedNumberOfPlayers = packet.ReadyPlayers;
 			}
 			ReadyClients = packet.ReadyPlayers;
 			HostReady = packet.HostReady;
 			HostLoaded = packet.HostLoaded;
+			if (packet.AmountOfPeers > 0)
+			{
+				FikaBackendUtils.HostExpectedNumberOfPlayers = packet.AmountOfPeers;
+			}
 
 			if (packet.HostReady)
 			{

diff --git a/Fika.Core/Networking/FikaServer.cs b/Fika.Core/Networking/FikaServer.cs
@@ -298,6 +298,9 @@ public async Task Init()
 
 		private void OnSideEffectPacketReceived(SideEffectPacket packet, NetPeer peer)
 		{
+#if DEBUG
+			logger.LogWarning("OnSideEffectPacketReceived: Received"); 
+#endif
 			SendDataToAll(ref packet, DeliveryMethod.ReliableOrdered, peer);
 
 			GameWorld gameWorld = Singleton<GameWorld>.Instance;
@@ -316,9 +319,14 @@ private void OnSideEffectPacketReceived(SideEffectPacket packet, NetPeer peer)
 			Item item = gstruct2.Value;
 			if (item.TryGetItemComponent(out SideEffectComponent sideEffectComponent))
 			{
+#if DEBUG
+				logger.LogInfo("Setting value to: " + packet.Value + ", original: " + sideEffectComponent.Value); 
+#endif
 				sideEffectComponent.Value = packet.Value;
 				item.RaiseRefreshEvent(false, false);
+				return;
 			}
+			logger.LogError("OnSideEffectPacketReceived: SideEffectComponent was not found!");
 		}
 
 		private void OnLoadingProfilePacketReceived(LoadingProfilePacket packet, NetPeer peer)

diff --git a/Fika.Core/Networking/Packets/Backend/InformationPacket.cs b/Fika.Core/Networking/Packets/Backend/InformationPacket.cs
@@ -10,6 +10,7 @@ public struct InformationPacket : INetSerializable
 		public bool RaidStarted;
 		public bool RequestStart;
 		public int ReadyPlayers;
+		public int AmountOfPeers;
 		public bool HostReady;
 		public bool HostLoaded;
 		public DateTime GameTime;
@@ -20,6 +21,7 @@ public void Deserialize(NetDataReader reader)
 			RaidStarted = reader.GetBool();
 			RequestStart = reader.GetBool();
 			ReadyPlayers = reader.GetInt();
+			AmountOfPeers = reader.GetInt();
 			HostReady = reader.GetBool();
 			if (HostReady)
 			{
@@ -34,6 +36,7 @@ public void Serialize(NetDataWriter writer)
 			writer.Put(RaidStarted);
 			writer.Put(RequestStart);
 			writer.Put(ReadyPlayers);
+			writer.Put(AmountOfPeers);
 			writer.Put(HostReady);
 			if (HostReady)
 			{

diff --git a/Fika.Core/UI/Patches/MenuTaskBar_Patch.cs b/Fika.Core/UI/Patches/MenuTaskBar_Patch.cs
@@ -74,7 +74,7 @@ public static void Postfix(Dictionary<EMenuType, AnimatedToggle> ____toggleButto
 								{
 									Singleton<GUISounds>.Instance.PlayUISound(EUISoundType.ButtonBottomBarClick);
 									string installDir = Environment.CurrentDirectory;
-									string fikaDir = Path.Combine(installDir, @"\user\fika");
+									string fikaDir = installDir + @"\user\fika";
 
 									if (!string.IsNullOrEmpty(installDir))
 									{