From 8b4c5b8cd7be030eb07ca10f09c8159366fdaa72 Mon Sep 17 00:00:00 2001 From: Joonas Rikkonen Date: Thu, 18 Apr 2019 12:03:37 +0300 Subject: [PATCH] (a5643136e) Removed the separate "my character panel" from the top right corner of the screen in MP (not needed anymore because the job preferences etc can be edited in the info menu), removed the radio button below the chatbox (looks bad and not necessary now that we have a dedicated chat hotkey) --- .../BarotraumaClient/Source/GUI/ChatBox.cs | 38 ++-------------- .../Source/Networking/GameClient.cs | 43 ++----------------- .../Source/Screens/NetLobbyScreen.cs | 28 ++---------- 3 files changed, 10 insertions(+), 99 deletions(-) diff --git a/Barotrauma/BarotraumaClient/Source/GUI/ChatBox.cs b/Barotrauma/BarotraumaClient/Source/GUI/ChatBox.cs index 490c0d21a..ff3cd1dae 100644 --- a/Barotrauma/BarotraumaClient/Source/GUI/ChatBox.cs +++ b/Barotrauma/BarotraumaClient/Source/GUI/ChatBox.cs @@ -18,9 +18,7 @@ namespace Barotrauma private GUITextBox inputBox; private GUIButton toggleButton; - - private GUIButton radioButton; - + private Point screenResolution; private bool isSinglePlayer; @@ -60,12 +58,7 @@ namespace Barotrauma { get { return guiFrame; } } - - public GUIButton RadioButton - { - get { return radioButton; } - } - + public GUITextBox InputBox { get { return inputBox; } @@ -109,31 +102,7 @@ namespace Barotrauma { gui.Text = ""; }; - - radioButton = new GUIButton(new RectTransform(new Vector2(0.1f, 2.0f), inputBox.RectTransform, - HUDLayoutSettings.ChatBoxAlignment == Alignment.Right ? Anchor.BottomRight : Anchor.BottomLeft, - HUDLayoutSettings.ChatBoxAlignment == Alignment.Right ? Pivot.TopRight : Pivot.TopLeft), - style: null); - new GUIImage(new RectTransform(Vector2.One, radioButton.RectTransform), radioIcon, scaleToFit: true); - radioButton.OnClicked = (GUIButton btn, object userData) => - { - if (inputBox.Selected) - { - inputBox.Text = ""; - inputBox.Deselect(); - } - else - { - inputBox.Select(); - var radioItem = Character.Controlled?.Inventory?.Items.FirstOrDefault(i => i?.GetComponent() != null); - if (radioItem != null && Character.Controlled.HasEquippedItem(radioItem) && radioItem.GetComponent().CanTransmit()) - { - inputBox.Text = "r; "; - } - } - return true; - }; - + ToggleOpen = GameMain.Config.ChatOpen; } @@ -368,7 +337,6 @@ namespace Barotrauma } openState = MathHelper.Clamp(openState, 0.0f, 1.0f); int hiddenBoxOffset = guiFrame.Rect.Width + toggleButton.Rect.Width; - if (radioButton != null) hiddenBoxOffset += (int)(radioButton.Rect.Width * 1.5f); guiFrame.RectTransform.AbsoluteOffset = new Point((int)MathHelper.SmoothStep(hiddenBoxOffset * (HUDLayoutSettings.ChatBoxAlignment == Alignment.Left ? -1 : 1), 0, openState), 0); } diff --git a/Barotrauma/BarotraumaClient/Source/Networking/GameClient.cs b/Barotrauma/BarotraumaClient/Source/Networking/GameClient.cs index fa4a2d3b4..383acd362 100644 --- a/Barotrauma/BarotraumaClient/Source/Networking/GameClient.cs +++ b/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, @@ -635,8 +636,6 @@ namespace Barotrauma.Networking } } - 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().Color = new Color(60, 60, 60, 255); - } - else - { - var radioItem = Character.Controlled?.Inventory?.Items.FirstOrDefault(i => i?.GetComponent() != null); - chatBox.RadioButton.GetChild().Color = - (radioItem != null && Character.Controlled.HasEquippedItem(radioItem) && radioItem.GetComponent().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(); - } } } @@ -2212,18 +2189,6 @@ namespace Barotrauma.Networking 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) { diff --git a/Barotrauma/BarotraumaClient/Source/Screens/NetLobbyScreen.cs b/Barotrauma/BarotraumaClient/Source/Screens/NetLobbyScreen.cs index 3a7b00d0b..f136ff3a2 100644 --- a/Barotrauma/BarotraumaClient/Source/Screens/NetLobbyScreen.cs +++ b/Barotrauma/BarotraumaClient/Source/Screens/NetLobbyScreen.cs @@ -158,14 +158,7 @@ namespace Barotrauma get; private set; } - - public GUIFrame MyCharacterFrame - { - get { return myCharacterFrame; } - } - - public bool MyCharacterFrameOpen; - + public GUIFrame InfoFrame { get { return infoFrame; } @@ -300,18 +293,7 @@ namespace Barotrauma OnSelected = TogglePlayYourself, UserData = "playyourself" }; - - var toggleMyPlayerFrame = new GUIButton(new RectTransform(new Point(25, 70), myCharacterFrame.RectTransform, Anchor.TopLeft, Pivot.TopRight), "", style: "GUIButtonHorizontalArrow"); - toggleMyPlayerFrame.OnClicked += (GUIButton btn, object userdata) => - { - MyCharacterFrameOpen = !MyCharacterFrameOpen; - foreach (GUIComponent child in btn.Children) - { - child.SpriteEffects = MyCharacterFrameOpen ? SpriteEffects.FlipHorizontally : SpriteEffects.None; - } - return true; - }; - + //player list ------------------------------------------------------------------ playerListFrame = new GUIFrame(new RectTransform(new Vector2(0.3f - panelSpacing, 0.35f - panelSpacing), defaultModeContainer.RectTransform, Anchor.BottomRight)); @@ -698,7 +680,6 @@ namespace Barotrauma public override void Deselect() { textBox.Deselect(); - myCharacterFrame.GetChild().Visible = true; CampaignCharacterDiscarded = false; } @@ -713,10 +694,7 @@ namespace Barotrauma textBox.Select(); textBox.OnEnterPressed = GameMain.Client.EnterChatMessage; textBox.OnTextChanged += GameMain.Client.TypingChatMessage; - - myCharacterFrame.RectTransform.AbsoluteOffset = new Point(0, 0); - myCharacterFrame.GetChild().Visible = false; - + subList.Enabled = AllowSubSelection;// || GameMain.Server != null; shuttleList.Enabled = AllowSubSelection;// || GameMain.Server != null;