Enabled max discord party to be updated from max connections config (SubnauticaNitrox#1241)

* Enabled max discord party to be updated from max connections config

* Updated function call with string interpolation

Author: Coding-Hen

NitroxClient/MonoBehaviours/DiscordRP/DiscordRPController.cs

@@ -92,14 +92,14 @@ private void OnDisable()
             DiscordRpc.Shutdown();
         }
 
-        public void InitializeInGame(string username, int playerCount, string ipAddressPort)
+        public void InitializeInGame(string username, int playerCount, int maxConnections, string ipAddressPort)
         {
             Presence.state = "In game";
             Presence.details = "Playing as " + username;
             Presence.startTimestamp = 0;
             Presence.partyId = "PartyID:" + CheckIP(ipAddressPort);
             Presence.partySize = playerCount;
-            Presence.partyMax = 100;
+            Presence.partyMax = maxConnections;
             Presence.joinSecret = CheckIP(ipAddressPort);
             SendRP();
         }

NitroxClient/MonoBehaviours/Multiplayer.cs

@@ -172,7 +172,7 @@ private static void SetLoadingComplete()
             PlayerManager remotePlayerManager = NitroxServiceLocator.LocateService<PlayerManager>();
 
             LoadingScreenVersionText.DisableWarningText();
-            DiscordRPController.Main.InitializeInGame(Main.multiplayerSession.AuthenticationContext.Username, remotePlayerManager.GetTotalPlayerCount(), Main.multiplayerSession.IpAddress + ":" + Main.multiplayerSession.ServerPort);
+            DiscordRPController.Main.InitializeInGame(Main.multiplayerSession.AuthenticationContext.Username, remotePlayerManager.GetTotalPlayerCount(), Main.multiplayerSession.SessionPolicy.MaxConnections, $"{Main.multiplayerSession.IpAddress}:{Main.multiplayerSession.ServerPort}");
             NitroxServiceLocator.LocateService<PlayerChatManager>().LoadChatKeyHint();
         }
 

NitroxModel/Packets/MultiplayerSessionPolicy.cs

@@ -8,18 +8,20 @@ public class MultiplayerSessionPolicy : CorrelatedPacket
     {
         public bool RequiresServerPassword { get; }
         public bool DisableConsole { get; }
+        public int MaxConnections { get; }
 
         public MultiplayerSessionAuthenticationAuthority AuthenticationAuthority { get; }
 
         public Version NitroxVersionAllowed { get; }
 
-        public MultiplayerSessionPolicy(string correlationId, bool disableConsole)
+        public MultiplayerSessionPolicy(string correlationId, bool disableConsole, int maxConnections)
             : base(correlationId)
         {
             // This is done intentionally. It is only a stub for future extension.
             RequiresServerPassword = false;
             AuthenticationAuthority = MultiplayerSessionAuthenticationAuthority.SERVER;
             DisableConsole = disableConsole;
+            MaxConnections = maxConnections;
             // get the full version name
             Version ver = typeof(MultiplayerSessionPolicy).Assembly.GetName().Version;
             // only the major and minor version number is required

NitroxServer/Communication/Packets/Processors/MultiplayerSessionPolicyRequestProcessor.cs

@@ -19,7 +19,7 @@ public MultiplayerSessionPolicyRequestProcessor(ServerConfig config)
         public override void Process(MultiplayerSessionPolicyRequest packet, NitroxConnection connection)
         {
             Log.Info("Providing session policies...");
-            connection.SendPacket(new MultiplayerSessionPolicy(packet.CorrelationId, config.DisableConsole));
+            connection.SendPacket(new MultiplayerSessionPolicy(packet.CorrelationId, config.DisableConsole, config.MaxConnections));
         }
     }
 }

NitroxTest/Client/Communication/MultiplayerSessionTests/ConnectionStateTests/ConnectionNegotiatingStateTests/EstablishingSessionPolicyStateTests.cs

@@ -17,7 +17,7 @@ public void NegotiateShouldTransitionToAwaitingReservationCredentialsState()
         {
             // Arrange
             IMultiplayerSessionConnectionContext connectionContext = Substitute.For<IMultiplayerSessionConnectionContext>();
-            connectionContext.SessionPolicy.Returns(new MultiplayerSessionPolicy(TestConstants.TEST_CORRELATION_ID, false));
+            connectionContext.SessionPolicy.Returns(new MultiplayerSessionPolicy(TestConstants.TEST_CORRELATION_ID, false, TestConstants.TEST_MAX_PLAYER_CONNECTIONS));
 
             EstablishingSessionPolicy connectionState = new EstablishingSessionPolicy(TestConstants.TEST_CORRELATION_ID);
 
@@ -33,7 +33,7 @@ public void NegotiateShouldThrowUncorrelatedPacketExceptionWhenThePolicyHasTheWr
         {
             // Arrange
             IMultiplayerSessionConnectionContext connectionContext = Substitute.For<IMultiplayerSessionConnectionContext>();
-            connectionContext.SessionPolicy.Returns(new MultiplayerSessionPolicy("wrong", false));
+            connectionContext.SessionPolicy.Returns(new MultiplayerSessionPolicy("wrong", false, TestConstants.TEST_MAX_PLAYER_CONNECTIONS));
 
             EstablishingSessionPolicy connectionState = new EstablishingSessionPolicy(TestConstants.TEST_CORRELATION_ID);
 

NitroxTest/Client/Communication/MultiplayerSessionTests/TestConstants.cs

@@ -13,9 +13,10 @@ internal static class TestConstants
         public const string TEST_PLAYER_NAME = "TEST";
         public const string TEST_RESERVATION_KEY = "@#*(&";
         public const string TEST_CORRELATION_ID = "CORRELATED";
+        public const int TEST_MAX_PLAYER_CONNECTIONS = 100;
         public const MultiplayerSessionReservationState TEST_REJECTION_STATE = MultiplayerSessionReservationState.REJECTED | MultiplayerSessionReservationState.UNIQUE_PLAYER_NAME_CONSTRAINT_VIOLATED;
         public static readonly AuthenticationContext TEST_AUTHENTICATION_CONTEXT = new AuthenticationContext(TEST_PLAYER_NAME);
-        public static readonly MultiplayerSessionPolicy TEST_SESSION_POLICY = new MultiplayerSessionPolicy(TEST_CORRELATION_ID, false);
+        public static readonly MultiplayerSessionPolicy TEST_SESSION_POLICY = new MultiplayerSessionPolicy(TEST_CORRELATION_ID, false, TEST_MAX_PLAYER_CONNECTIONS);
         public static readonly PlayerSettings TEST_PLAYER_SETTINGS = new PlayerSettings(RandomColorGenerator.GenerateColor());
         public static readonly IMultiplayerSessionConnectionState TEST_CONNECTION_STATE = Substitute.For<IMultiplayerSessionConnectionState>();
     }