Adds Team Messaging Helper Methods

- Adds overload for FindBroadcastPlayer(Team) to find first player on specified team - Adds SendChatMessageToTeam helper method for mods - Separates network code into NetworkSendChat method
data-bomb · Jun 24, 2024 · 58cbd9f · 58cbd9f
1 parent 1deee24
commit 58cbd9f
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 6 deletions.
diff --git a/Si_AdminMod/HelperMethods.cs b/Si_AdminMod/HelperMethods.cs
@@ -98,6 +98,25 @@ public static void AlertAdminAction(Player? adminPlayer, string action)
             broadcastPlayer.SendChatMessage(chatPrefix + GetAdminColor() + adminName + defaultColor + " " + action, false);
         }
 
+        public static void SendChatMessageToTeam(Team team, params string[] messages)
+        {
+            Player broadcastPlayer = FindBroadcastPlayer(team);
+
+            for (int i = 0; i < Player.Players.Count; i++)
+            {
+                Player? player = Player.Players[i];
+                if (player == null)
+                {
+                    continue;
+                }
+
+                if (player.Team == team)
+                {
+                    NetworkSendChat(player, broadcastPlayer, messages);
+                }
+            }
+        }
+
         public static void SendChatMessageToPlayer(Player? player, params string[] messages)
         {
             // send to server console if null
@@ -109,15 +128,19 @@ public static void SendChatMessageToPlayer(Player? player, params string[] messa
             }
 
             Player broadcastPlayer = FindBroadcastPlayer();
-
-            GameByteStreamWriter gameByteStreamWriter = GameByteStreamWriter.GetGameByteStreamWriter(0U, "Si_AdminMod::SendChatMessageToPlayer", true);
+            NetworkSendChat(player, broadcastPlayer, messages);
+        }
+
+        public static void NetworkSendChat(Player recipient, Player sender, params string[] messages)
+        {
+            GameByteStreamWriter gameByteStreamWriter = GameByteStreamWriter.GetGameByteStreamWriter(0U, "Si_AdminMod::NetworkSendChat", true);
             gameByteStreamWriter.WriteByte((byte)ENetworkPacketType.ChatMessage);
-            gameByteStreamWriter.WriteUInt64((ulong)broadcastPlayer.PlayerID);
-            gameByteStreamWriter.WriteByte((byte)broadcastPlayer.PlayerChannel);
+            gameByteStreamWriter.WriteUInt64((ulong)sender.PlayerID);
+            gameByteStreamWriter.WriteByte((byte)sender.PlayerChannel);
             gameByteStreamWriter.WriteString(String.Concat(messages));
             gameByteStreamWriter.WriteBool(false);
 
-            SteamGameServerNetworking.SendP2PPacket(player.PlayerID, gameByteStreamWriter.GetByteData(), (uint)gameByteStreamWriter.GetByteDataSize(), EP2PSend.k_EP2PSendReliable, player.PlayerChannel);
+            SteamGameServerNetworking.SendP2PPacket(recipient.PlayerID, gameByteStreamWriter.GetByteData(), (uint)gameByteStreamWriter.GetByteDataSize(), EP2PSend.k_EP2PSendReliable, recipient.PlayerChannel);
         }
 
         public static Player FindBroadcastPlayer()
@@ -136,6 +159,31 @@ public static Player FindBroadcastPlayer()
             return NetworkGameServer.GetServerPlayer();
         }
 
+        public static Player FindBroadcastPlayer(Team team)
+        {
+            if (!NetworkGameServer.GetServerDedicated())
+            {
+                return NetworkGameServer.GetServerPlayer();
+            }
+
+            // not ideal but funnel messages through the first player on the team for now
+            for (int i = 0; i < Player.Players.Count; i++)
+            {
+                Player? player = Player.Players[i];
+                if (player == null)
+                {
+                    continue;
+                }
+
+                if (player.Team == team)
+                {
+                    return player;
+                }
+            }
+
+            return NetworkGameServer.GetServerPlayer();
+        }
+
         public static void PrintError(Exception exception, string? message = null)
         {
             if (message != null)

diff --git a/Si_AdminMod/ModAttributes.cs b/Si_AdminMod/ModAttributes.cs
@@ -21,7 +21,7 @@ You should have received a copy of the GNU General Public License
 using SilicaAdminMod;
 using System.Drawing;
 
-[assembly: MelonInfo(typeof(SiAdminMod), "Admin Mod", "2.0.819", "databomb", "https://github.com/data-bomb/Silica")]
+[assembly: MelonInfo(typeof(SiAdminMod), "Admin Mod", "2.0.823", "databomb", "https://github.com/data-bomb/Silica")]
 [assembly: MelonGame("Bohemia Interactive", "Silica")]
 
 // Color.Cyan