Battle message are sent by host now

NebulaModTeam · Aug 27, 2024 · 2c5815b · 2c5815b
1 parent 6cc1e67
commit 2c5815b
Show file tree

Hide file tree

Showing 10 changed files with 55 additions and 29 deletions.
diff --git a/NebulaModel/Packets/Chat/NewChatMessagePacket.cs b/NebulaModel/Packets/Chat/NewChatMessagePacket.cs
@@ -11,11 +11,11 @@ public class NewChatMessagePacket
 {
     public NewChatMessagePacket() { }
 
-    public NewChatMessagePacket(ChatMessageType messageType, string messageText, DateTime sentAt, string userName)
+    public NewChatMessagePacket(ChatMessageType messageType, string messageText, DateTime sentAt = default, string userName = "")
     {
         MessageType = messageType;
         MessageText = messageText;
-        SentAt = sentAt.ToBinary();
+        SentAt = sentAt == default ? 0 : sentAt.ToBinary();
         UserName = userName;
     }
 

diff --git a/NebulaNetwork/PacketProcessors/Chat/NewChatMessageProcessor.cs b/NebulaNetwork/PacketProcessors/Chat/NewChatMessageProcessor.cs
@@ -29,6 +29,12 @@ protected override void ProcessPacket(NewChatMessagePacket packet, NebulaConnect
             Server.SendPacketExclude(packet, conn);
         }
 
+        if (string.IsNullOrEmpty(packet.UserName))
+        {
+            // non-player chat
+            ChatManager.Instance.SendChatMessage(packet.MessageText, packet.MessageType);
+            return;
+        }
         var sentAt = packet.SentAt == 0 ? DateTime.Now : DateTime.FromBinary(packet.SentAt);
         ChatManager.Instance.SendChatMessage(ChatManager.FormatChatMessage(sentAt, packet.UserName, packet.MessageText),
             packet.MessageType);

diff --git a/NebulaNetwork/PacketProcessors/Combat/DFRelay/DFRelayArriveBaseProcessor.cs b/NebulaNetwork/PacketProcessors/Combat/DFRelay/DFRelayArriveBaseProcessor.cs
@@ -42,12 +42,6 @@ protected override void ProcessPacket(DFRelayArriveBasePacket packet, NebulaConn
                     EnemyManager.SetPlanetFactoryNextEnemyId(factory, packet.NextGroundEnemyId);
                 }
                 dfrelayComponent.ArriveBase();
-
-                // Display message when DF relay is successfully landed and the planet has buildings
-                if (packet.HasFactory)
-                {
-                    Multiplayer.Session.Enemies.DisplayPlanetPingMessage("DF relay landed on planet".Translate(), dfrelayComponent.targetAstroId, dfrelayComponent.targetLPos);
-                }
             }
         }
     }

diff --git a/NebulaNetwork/PacketProcessors/Combat/DFTinder/DFTinderDispatchProcessor.cs b/NebulaNetwork/PacketProcessors/Combat/DFTinder/DFTinderDispatchProcessor.cs
@@ -18,8 +18,6 @@ protected override void ProcessPacket(DFTinderDispatchPacket packet, NebulaConne
         var hiveSystem = GameMain.spaceSector.GetHiveByAstroId(packet.OriginHiveAstroId);
         if (hiveSystem == null) return;
 
-        Multiplayer.Session.Enemies.DisplayAstroMessage("DF seed sent out from".Translate(), hiveSystem.starData.astroId);
-
         ref var tinderComponent = ref hiveSystem.tinders.buffer[packet.TinderId];
         if (tinderComponent.id != packet.TinderId) return;
 

diff --git a/NebulaNetwork/PacketProcessors/Combat/GroundEnemy/DFGLaunchAssaultProcessor.cs b/NebulaNetwork/PacketProcessors/Combat/GroundEnemy/DFGLaunchAssaultProcessor.cs
@@ -20,8 +20,6 @@ protected override void ProcessPacket(DFGLaunchAssaultPacket packet, NebulaConne
         var factory = GameMain.galaxy.PlanetById(packet.PlanetId)?.factory;
         if (factory == null)
         {
-            // Display message in chat if it can't show in UIDarkFogMonitor
-            Multiplayer.Session.Enemies.DisplayPlanetPingMessage("Planetary base is attacking".Translate(), packet.PlanetId, packet.TarPos.ToVector3());
             return;
         }
 

diff --git a/NebulaNetwork/PacketProcessors/Combat/SpaceEnemy/DFSLaunchLancerAssaultProcessor.cs b/NebulaNetwork/PacketProcessors/Combat/SpaceEnemy/DFSLaunchLancerAssaultProcessor.cs
@@ -17,7 +17,6 @@ public class DFSLaunchLancerAssaultProcessor : PacketProcessor<DFSLaunchLancerAs
 {
     protected override void ProcessPacket(DFSLaunchLancerAssaultPacket packet, NebulaConnection conn)
     {
-        Multiplayer.Session.Enemies.DisplayAstroMessage("Space hive is attacking".Translate(), packet.TargetAstroId);
         var spaceSector = GameMain.spaceSector;
         var hive = spaceSector.GetHiveByAstroId(packet.HiveAstroId);
         if (hive == null) return;

diff --git a/NebulaPatcher/Patches/Dynamic/DFRelayComponent_Patch.cs b/NebulaPatcher/Patches/Dynamic/DFRelayComponent_Patch.cs
@@ -54,7 +54,7 @@ public static void ArriveBase_Postfix(DFRelayComponent __instance)
         var factory = __instance.hive.galaxy.astrosFactory[__instance.targetAstroId];
         if (factory != null && factory.entityCount > 0 && __instance.baseId > 0)
         {
-            Multiplayer.Session.Enemies.DisplayPlanetPingMessage("DF relay landed on planet".Translate(), __instance.targetAstroId, __instance.targetLPos);
+            Multiplayer.Session.Enemies.SendPlanetPosMessage("DF relay landed on".Translate(), __instance.targetAstroId, __instance.targetLPos);
         }
     }
 
@@ -80,7 +80,7 @@ public static bool LeaveBase_Prefix(DFRelayComponent __instance)
             var planet = GameMain.galaxy.PlanetById(__instance.targetAstroId);
             if (planet != null)
             {
-                Multiplayer.Session.Enemies.DisplayPlanetPingMessage("DF relay left from planet".Translate(), __instance.targetAstroId, __instance.targetLPos);
+                Multiplayer.Session.Enemies.SendPlanetPosMessage("DF relay left from".Translate(), __instance.targetAstroId, __instance.targetLPos);
             }
         }
 

diff --git a/NebulaPatcher/Patches/Dynamic/DFTinderComponent_Patch.cs b/NebulaPatcher/Patches/Dynamic/DFTinderComponent_Patch.cs
@@ -24,7 +24,19 @@ public static bool DispatchFromHive_Prefix(ref DFTinderComponent __instance, int
         {
             __instance.targetHiveAstroId = _targetHiveAstroId;
             Multiplayer.Session.Network.SendPacket(new DFTinderDispatchPacket(__instance));
-            Multiplayer.Session.Enemies.DisplayAstroMessage("DF seed sent out from".Translate(), hive1.starData.astroId);
+            var hasFactory = false;
+            foreach (var planet in hive2.starData.planets)
+            {
+                if (planet != null && planet.factory != null && planet.factory.entityCount > 0)
+                {
+                    hasFactory = true;
+                    break;
+                }
+            }
+            if (hasFactory)
+            {
+                Multiplayer.Session.Enemies.SendAstroMessage("DF seed sent out".Translate(), hive1.starData.astroId, hive2.starData.astroId);
+            }
         }
         return true;
     }

diff --git a/NebulaPatcher/Patches/Dynamic/EnemyDFHiveSystem_Patch.cs b/NebulaPatcher/Patches/Dynamic/EnemyDFHiveSystem_Patch.cs
@@ -233,19 +233,24 @@ public static bool LaunchLancerAssault_Prefix(EnemyDFHiveSystem __instance, EAgg
         if (!Multiplayer.IsActive) return true;
         if (Multiplayer.Session.IsClient) return Multiplayer.Session.Enemies.IsIncomingRequest;
 
-        // Brocast launch assault events to all players
+        // Broadcast launch assault events to all players
         var packet = new DFSLaunchLancerAssaultPacket(in __instance, aggressiveLevel,
             in tarPos, in maxHatredPos, targetAstroId, unitCount0, unitThreat);
         Multiplayer.Session.Server.SendPacket(packet);
-        Multiplayer.Session.Enemies.DisplayAstroMessage("Space hive is attacking".Translate(), packet.TargetAstroId);
+        Multiplayer.Session.Enemies.SendAstroMessage("Space hive is attacking".Translate(), packet.TargetAstroId);
         return true;
     }
 
     [HarmonyPrefix]
     [HarmonyPatch(nameof(EnemyDFHiveSystem.NotifyRelayKilled))]
-    public static bool NotifyRelayKilled(EnemyDFHiveSystem __instance, ref EnemyData enemy)
+    public static bool NotifyRelayKilled_Prefix(EnemyDFHiveSystem __instance, ref EnemyData enemy)
     {
-        if (!Multiplayer.IsActive || Multiplayer.Session.IsServer) return true;
+        if (!Multiplayer.IsActive) return true;
+        if (Multiplayer.Session.IsServer)
+        {
+            Multiplayer.Session.Enemies.SendAstroMessage("DF relay killed on".Translate(), enemy.astroId);
+            return true;
+        }
 
         var dfrelayComponent = __instance.relays.buffer[enemy.dfRelayId];
         if (dfrelayComponent?.id == enemy.dfRelayId)

diff --git a/NebulaWorld/Combat/EnemyManager.cs b/NebulaWorld/Combat/EnemyManager.cs
@@ -5,6 +5,7 @@
 using NebulaModel.DataStructures;
 using NebulaModel.DataStructures.Chat;
 using NebulaModel.Logger;
+using NebulaModel.Packets.Chat;
 using NebulaModel.Packets.Combat.DFHive;
 using NebulaModel.Packets.Combat.GroundEnemy;
 using NebulaWorld.Chat.ChatLinks;
@@ -86,31 +87,44 @@ public void BroadcastHiveStatusPackets(EnemyDFHiveSystem hive, long gameTick)
         }
     }
 
-    public void DisplayPlanetPingMessage(string text, int planetId, Vector3 pos)
+    public void SendPlanetPosMessage(string text, int planetId, Vector3 pos)
     {
+        if (Multiplayer.Session.IsClient) return;
         var planet = GameMain.galaxy.PlanetById(planetId);
         if (planet == null) return;
 
         var message = text + " [" + NavigateChatLinkHandler.FormatNavigateToPlanetPos(planetId, pos, planet.displayName) + "]";
         ChatManager.Instance.SendChatMessage(message, ChatMessageType.BattleMessage);
+        Multiplayer.Session.Network.SendPacket(new NewChatMessagePacket(ChatMessageType.BattleMessage, message));
     }
 
-    public void DisplayAstroMessage(string text, int astroId)
+    public void SendAstroMessage(string text, int astroId0, int astroId1 = 0)
     {
-        string displayMessage = null;
+        if (Multiplayer.Session.IsClient) return;
 
+        var message = text + " " + GetAstroLinkText(astroId0);
+        if (astroId1 != 0) message += " => " + GetAstroLinkText(astroId1);
+        ChatManager.Instance.SendChatMessage(message, ChatMessageType.BattleMessage);
+        Multiplayer.Session.Network.SendPacket(new NewChatMessagePacket(ChatMessageType.BattleMessage, message));
+    }
+
+    static string GetAstroLinkText(int astroId)
+    {
+        string displayName = null;
         if (GameMain.galaxy.PlanetById(astroId) != null)
         {
-            displayMessage = GameMain.galaxy.PlanetById(astroId).displayName;
+            displayName = GameMain.galaxy.PlanetById(astroId).displayName;
         }
         else if (GameMain.galaxy.StarById(astroId / 100) != null)
         {
-            displayMessage = GameMain.galaxy.StarById(astroId / 100).displayName;
+            displayName = GameMain.galaxy.StarById(astroId / 100).displayName;
         }
-        if (displayMessage == null) return;
-
-        var message = text + " [" + NavigateChatLinkHandler.FormatNavigateToAstro(astroId, displayMessage) + "]";
-        ChatManager.Instance.SendChatMessage(message, ChatMessageType.BattleMessage);
+        else if (GameMain.spaceSector.GetHiveByAstroId(astroId) != null)
+        {
+            displayName = GameMain.spaceSector.GetHiveByAstroId(astroId).displayName;
+        }
+        if (displayName == null) return "";
+        return "[" + NavigateChatLinkHandler.FormatNavigateToAstro(astroId, displayName) + "]";
     }
 
     public void OnFactoryLoadFinished(PlanetFactory factory)