From f4554677651821ef0b9b86e9e3357f36de5e7b39 Mon Sep 17 00:00:00 2001 From: Joonas Rikkonen Date: Sun, 9 Jun 2019 17:46:07 +0300 Subject: [PATCH] (bcf4eea95) Allow muting players mid-round through the info menu --- .../Source/GameSession/CrewManager.cs | 2 +- .../Source/Networking/GameClient.cs | 20 ++++++++++++++++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs b/Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs index 392301a01..69b2aa985 100644 --- a/Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs +++ b/Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs @@ -1318,7 +1318,7 @@ namespace Barotrauma GUIComponent existingPreview = crewFrame.FindChild("SelectedCharacter"); if (existingPreview != null) crewFrame.RemoveChild(existingPreview); - var previewPlayer = new GUIFrame(new RectTransform(new Vector2(0.4f, 0.8f), crewFrame.RectTransform, Anchor.CenterRight) { RelativeOffset = new Vector2(0.05f, 0.0f) }, style: "InnerFrame") + var previewPlayer = new GUIFrame(new RectTransform(new Vector2(0.45f, 0.9f), crewFrame.RectTransform, Anchor.CenterRight) { RelativeOffset = new Vector2(0.05f, 0.0f) }, style: "InnerFrame") { UserData = "SelectedCharacter" }; diff --git a/Barotrauma/BarotraumaClient/Source/Networking/GameClient.cs b/Barotrauma/BarotraumaClient/Source/Networking/GameClient.cs index 96ea44c5e..4b910e119 100644 --- a/Barotrauma/BarotraumaClient/Source/Networking/GameClient.cs +++ b/Barotrauma/BarotraumaClient/Source/Networking/GameClient.cs @@ -2384,9 +2384,23 @@ namespace Barotrauma.Networking var client = GameMain.NetworkMember.ConnectedClients.Find(c => c.Character == character); if (client == null) return false; + var mute = new GUITickBox(new RectTransform(new Vector2(0.95f, 0.1f), characterFrame.RectTransform, Anchor.BottomCenter) { RelativeOffset = new Vector2(0.0f, 0.1f) }, + TextManager.Get("Mute")) + { + Selected = client.MutedLocally, + OnSelected = (tickBox) => { client.MutedLocally = tickBox.Selected; return true; } + }; + + var buttonContainer = new GUILayoutGroup(new RectTransform(new Vector2(0.95f, 0.1f), characterFrame.RectTransform, Anchor.BottomCenter), isHorizontal: true) + { + RelativeSpacing = 0.05f, + ChildAnchor = Anchor.CenterLeft, + Stretch = true + }; + if (HasPermission(ClientPermissions.Ban)) { - var banButton = new GUIButton(new RectTransform(new Vector2(0.45f, 0.15f), characterFrame.RectTransform, Anchor.BottomRight), + var banButton = new GUIButton(new RectTransform(new Vector2(0.45f, 0.9f), buttonContainer.RectTransform), TextManager.Get("Ban")) { UserData = character.Name, @@ -2395,7 +2409,7 @@ namespace Barotrauma.Networking } if (HasPermission(ClientPermissions.Kick)) { - var kickButton = new GUIButton(new RectTransform(new Vector2(0.45f, 0.15f), characterFrame.RectTransform, Anchor.BottomLeft), + var kickButton = new GUIButton(new RectTransform(new Vector2(0.45f, 0.9f), buttonContainer.RectTransform), TextManager.Get("Kick")) { UserData = character.Name, @@ -2404,7 +2418,7 @@ namespace Barotrauma.Networking } else if (serverSettings.Voting.AllowVoteKick) { - var kickVoteButton = new GUIButton(new RectTransform(new Vector2(0.45f, 0.15f), characterFrame.RectTransform, Anchor.BottomRight) { RelativeOffset = new Vector2(0.0f, 0.16f) }, + var kickVoteButton = new GUIButton(new RectTransform(new Vector2(0.45f, 0.9f), buttonContainer.RectTransform), TextManager.Get("VoteToKick")) { UserData = character,