(1762f02b3) Merge branch 'dev' into human-ai

Barotrauma/BarotraumaClient/Source/Networking/GameClient.cs

@@ -26,6 +26,7 @@ namespace Barotrauma.Networking
         //TODO: move these to NetLobbyScreen
         public GUIButton EndRoundButton;
         public GUITickBox EndVoteTickBox;
+        private GUIComponent buttonContainer;
 
         private NetStats netStats;
 
@@ -129,7 +130,7 @@ namespace Barotrauma.Networking
             chatBox.OnEnterMessage += EnterChatMessage;
             chatBox.InputBox.OnTextChanged += TypingChatMessage;
 
-            var buttonContainer = new GUILayoutGroup(HUDLayoutSettings.ToRectTransform(HUDLayoutSettings.ButtonAreaTop, inGameHUD.RectTransform),
+            buttonContainer = new GUILayoutGroup(HUDLayoutSettings.ToRectTransform(HUDLayoutSettings.ButtonAreaTop, inGameHUD.RectTransform),
                 isHorizontal: true, childAnchor: Anchor.CenterRight)
             {
                 AbsoluteSpacing = 5,
@@ -630,13 +631,11 @@ namespace Barotrauma.Networking
                     }
                     else
                     {
-                        GameMain.GameSession?.CrewManager?.SetPlayerSpeaking(myClient);
+                        GameMain.GameSession?.CrewManager?.SetClientSpeaking(myClient);
                     }
                 }
             }
 
-            if (gameStarted) SetRadioButtonColor();
-
             if (ShowNetStats && client?.ServerConnection != null)
             {
                 netStats.AddValue(NetStats.NetStatType.ReceivedBytes, client.ServerConnection.Statistics.ReceivedBytes);
@@ -2124,9 +2123,7 @@ namespace Barotrauma.Networking
         protected GUIFrame inGameHUD;
         protected ChatBox chatBox;
         public GUIButton ShowLogButton; //TODO: move to NetLobbyScreen
-
-        private float myCharacterFrameOpenState;
-
+        
         public GUIFrame InGameHUD
         {
             get { return inGameHUD; }
@@ -2136,22 +2133,7 @@ namespace Barotrauma.Networking
         {
             get { return chatBox; }
         }
-
-        protected void SetRadioButtonColor()
-        {
-            if (Character.Controlled == null || Character.Controlled.SpeechImpediment >= 100.0f)
-            {
-                chatBox.RadioButton.GetChild<GUIImage>().Color = new Color(60, 60, 60, 255);
-            }
-            else
-            {
-                var radioItem = Character.Controlled?.Inventory?.Items.FirstOrDefault(i => i?.GetComponent<WifiComponent>() != null);
-                chatBox.RadioButton.GetChild<GUIImage>().Color =
-                    (radioItem != null && Character.Controlled.HasEquippedItem(radioItem) && radioItem.GetComponent<WifiComponent>().CanTransmit()) ?
-                    Color.White : new Color(60, 60, 60, 255);
-            }
-        }
-
+        
         public bool TypingChatMessage(GUITextBox textBox, string text)
         {
             return chatBox.TypingChatMessage(textBox, text);
@@ -2183,11 +2165,6 @@ namespace Barotrauma.Networking
                 Screen.Selected == GameMain.GameScreen)
             {
                 inGameHUD.AddToGUIUpdateList();
-
-                if (Character.Controlled == null)
-                {
-                    GameMain.NetLobbyScreen.MyCharacterFrame.AddToGUIUpdateList();
-                }
             }
         }
 
@@ -2206,24 +2183,17 @@ namespace Barotrauma.Networking
 
             if (gameStarted && Screen.Selected == GameMain.GameScreen)
             {
+                bool disableButtons =
+                    Character.Controlled != null &&
+                    Character.Controlled.SelectedConstruction?.GetComponent<Controller>() != null;
+                buttonContainer.Visible = !disableButtons;
+                
                 if (!GUI.DisableHUD && !GUI.DisableUpperHUD)
                 {
                     inGameHUD.UpdateManually(deltaTime);
                     chatBox.Update(deltaTime);
 
                     cameraFollowsSub.Visible = Character.Controlled == null;
-
-                    if (Character.Controlled == null)
-                    {
-                        myCharacterFrameOpenState = GameMain.NetLobbyScreen.MyCharacterFrameOpen ? myCharacterFrameOpenState + deltaTime * 5 : myCharacterFrameOpenState - deltaTime * 5;
-                        myCharacterFrameOpenState = MathHelper.Clamp(myCharacterFrameOpenState, 0.0f, 1.0f);
-
-                        var myCharFrame = GameMain.NetLobbyScreen.MyCharacterFrame;
-                        int padding = GameMain.GraphicsWidth - myCharFrame.Parent.Rect.Right;
-
-                        myCharFrame.RectTransform.AbsoluteOffset =
-                            Vector2.SmoothStep(new Vector2(-myCharFrame.Rect.Width - padding, 0.0f), new Vector2(-padding, 0), myCharacterFrameOpenState).ToPoint();
-                    }
                 }
                 if (Character.Controlled == null || Character.Controlled.IsDead)
                 {

Barotrauma/BarotraumaClient/Source/Networking/ServerInfo.cs

@@ -25,6 +25,7 @@ namespace Barotrauma.Networking
         public SelectionMode? ModeSelectionMode;
         public SelectionMode? SubSelectionMode;
         public bool? AllowSpectating;
+        public bool? VoipEnabled;
         public bool? AllowRespawn;
         public YesNoMaybe? TraitorsEnabled;
         public string GameMode;
@@ -150,11 +151,14 @@ namespace Barotrauma.Networking
             else
                 allowRespawn.Selected = AllowRespawn.Value;
 
-            /*new GUITickBox(new RectTransform(new Vector2(1.0f, elementHeight), columnRight.RectTransform), TextManager.Get("ServerListHasPassword"))
+            var voipEnabledTickBox = new GUITickBox(new RectTransform(new Vector2(1.0f, elementHeight), columnRight.RectTransform), TextManager.Get("serversettingsvoicechatenabled"))
             {
-                Selected = HasPassword,
                 CanBeFocused = false
-            };*/
+            };
+            if (!VoipEnabled.HasValue)
+                new GUITextBlock(new RectTransform(new Vector2(0.8f, 0.8f), voipEnabledTickBox.Box.RectTransform, Anchor.Center), "?", textAlignment: Alignment.Center);
+            else
+                voipEnabledTickBox.Selected = VoipEnabled.Value;
 
             var usingWhiteList = new GUITickBox(new RectTransform(new Vector2(1, elementHeight), columnRight.RectTransform), TextManager.Get("ServerListUsingWhitelist"))
             {

Barotrauma/BarotraumaClient/Source/Networking/ServerSettings.cs

@@ -388,7 +388,7 @@ namespace Barotrauma.Networking
                 ToolTip = TextManager.Get("ServerSettingsMinRespawnToolTip")
             };
 
-            string minRespawnLabel = TextManager.Get("ServerSettingsMinRespawn");
+            string minRespawnLabel = TextManager.Get("ServerSettingsMinRespawn") + " ";
             CreateLabeledSlider(roundsTab, "", out slider, out sliderLabel);
             slider.ToolTip = minRespawnText.ToolTip;
             slider.UserData = minRespawnText;
@@ -407,7 +407,7 @@ namespace Barotrauma.Networking
                 ToolTip = TextManager.Get("ServerSettingsRespawnDurationToolTip")
             };
 
-            string respawnDurationLabel = TextManager.Get("ServerSettingsRespawnDuration");
+            string respawnDurationLabel = TextManager.Get("ServerSettingsRespawnDuration") + " ";
             CreateLabeledSlider(roundsTab, "", out slider, out sliderLabel);
             slider.ToolTip = respawnDurationText.ToolTip;
             slider.UserData = respawnDurationText;
@@ -471,7 +471,7 @@ namespace Barotrauma.Networking
             {
                 string translatedLabel = TextManager.Get($"Character.{s}", true);
                 var monsterEnabledBox = new GUITickBox(new RectTransform(new Vector2(1.0f, 0.1f), monsterFrame.Content.RectTransform) { MinSize = new Point(0, 25) },
-                    label: translatedLabel != null ? translatedLabel : s)
+                    label: translatedLabel ?? s)
                 {
                     Selected = tempMonsterEnabled[s],
                     OnSelected = (GUITickBox tb) =>
@@ -573,7 +573,7 @@ namespace Barotrauma.Networking
 
             //***********************************************
 
-            string autoRestartDelayLabel = TextManager.Get("ServerSettingsAutoRestartDelay");
+            string autoRestartDelayLabel = TextManager.Get("ServerSettingsAutoRestartDelay") + " ";
             var startIntervalText = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.05f), serverTab.RectTransform), autoRestartDelayLabel);
             var startIntervalSlider = new GUIScrollBar(new RectTransform(new Vector2(1.0f, 0.05f), serverTab.RectTransform), barSize: 0.1f)
             {
@@ -617,7 +617,7 @@ namespace Barotrauma.Networking
             GetPropertyData("AllowVoteKick").AssignGUIComponent(voteKickBox);
 
             CreateLabeledSlider(serverTab, "ServerSettingsKickVotesRequired", out slider, out sliderLabel);
-            string votesRequiredLabel = sliderLabel.Text;
+            string votesRequiredLabel = sliderLabel.Text + " ";
             slider.Step = 0.2f;
             slider.Range = new Vector2(0.5f, 1.0f);
             slider.OnMoved = (GUIScrollBar scrollBar, float barScroll) =>
@@ -629,7 +629,7 @@ namespace Barotrauma.Networking
             slider.OnMoved(slider, slider.BarScroll);
 
             CreateLabeledSlider(serverTab, "ServerSettingsAutobanTime", out slider, out sliderLabel);
-            string autobanLabel = sliderLabel.Text;
+            string autobanLabel = sliderLabel.Text + " ";
             slider.Step = 0.05f;
             slider.Range = new Vector2(0.0f, MaxAutoBanTime);
             slider.OnMoved = (GUIScrollBar scrollBar, float barScroll) =>
@@ -681,8 +681,8 @@ namespace Barotrauma.Networking
                 traitorRatioSlider.Range = new Vector2(1.0f, maxPlayers);
             }
 
-            string traitorRatioLabel = TextManager.Get("ServerSettingsTraitorRatio");
-            string traitorCountLabel = TextManager.Get("ServerSettingsTraitorCount");
+            string traitorRatioLabel = TextManager.Get("ServerSettingsTraitorRatio") + " ";
+            string traitorCountLabel = TextManager.Get("ServerSettingsTraitorCount") + " ";
 
             traitorRatioSlider.Range = new Vector2(0.1f, 1.0f);
             traitorRatioSlider.OnMoved = (GUIScrollBar scrollBar, float barScroll) =>

Barotrauma/BarotraumaClient/Source/Networking/SteamManager.cs

@@ -214,6 +214,7 @@ namespace Barotrauma.Steam
                     }
                     if (s.Rules.ContainsKey("allowspectating")) serverInfo.AllowSpectating = s.Rules["allowspectating"] == "True";
                     if (s.Rules.ContainsKey("allowrespawn")) serverInfo.AllowRespawn = s.Rules["allowrespawn"] == "True";
+                    if (s.Rules.ContainsKey("voicechatenabled")) serverInfo.VoipEnabled = s.Rules["voicechatenabled"] == "True";
                     if (s.Rules.ContainsKey("traitors"))
                     {
                         if (Enum.TryParse(s.Rules["traitors"], out YesNoMaybe traitorsEnabled)) serverInfo.TraitorsEnabled = traitorsEnabled;

Barotrauma/BarotraumaClient/Source/Networking/Voip/VoipClient.cs

@@ -115,7 +115,7 @@ namespace Barotrauma.Networking
                     }
                 }
                 GameMain.NetLobbyScreen.SetPlayerSpeaking(client);
-                GameMain.GameSession?.CrewManager?.SetPlayerSpeaking(client);
+                GameMain.GameSession?.CrewManager?.SetClientSpeaking(client);
             }
         }