From 54a2b5dee0c1e63eb708672ddbebdc7560597d49 Mon Sep 17 00:00:00 2001 From: Vera Aguilera Puerto <6766154+Zumorica@users.noreply.github.com> Date: Sun, 3 Oct 2021 23:48:29 +0200 Subject: [PATCH] Adds rule button to lobby and character creation. Add IC naming warning. (#4760) --- Content.Client/Info/ServerInfo.cs | 4 +++ .../Preferences/UI/CharacterSetupGui.cs | 12 ++++++- .../Preferences/UI/HumanoidProfileEditor.cs | 31 ++++++++++++++----- Resources/Locale/en-US/info/server-info.ftl | 3 +- .../preferences/ui/character-setup-gui.ftl | 3 +- .../ui/humanoid-profile-editor.ftl | 3 +- 6 files changed, 45 insertions(+), 11 deletions(-) diff --git a/Content.Client/Info/ServerInfo.cs b/Content.Client/Info/ServerInfo.cs index 75e39467b7..10c798638c 100644 --- a/Content.Client/Info/ServerInfo.cs +++ b/Content.Client/Info/ServerInfo.cs @@ -31,6 +31,9 @@ namespace Content.Client.Info var uriOpener = IoCManager.Resolve(); + var rulesButton = new Button() { Text = Loc.GetString("server-info-rules-button") }; + rulesButton.OnPressed += args => new InfoWindow().Open(); + var discordButton = new Button {Text = Loc.GetString("server-info-discord-button") }; discordButton.OnPressed += args => uriOpener.OpenUri(UILinks.Discord); @@ -49,6 +52,7 @@ namespace Content.Client.Info HorizontalAlignment = HAlignment.Right }; + buttons.AddChild(rulesButton); buttons.AddChild(discordButton); buttons.AddChild(websiteButton); buttons.AddChild(reportButton); diff --git a/Content.Client/Preferences/UI/CharacterSetupGui.cs b/Content.Client/Preferences/UI/CharacterSetupGui.cs index 0afabf0db5..c11869182f 100644 --- a/Content.Client/Preferences/UI/CharacterSetupGui.cs +++ b/Content.Client/Preferences/UI/CharacterSetupGui.cs @@ -1,5 +1,6 @@ using System.Linq; using Content.Client.CharacterAppearance; +using Content.Client.Info; using Content.Client.Lobby.UI; using Content.Client.Parallax; using Content.Client.Resources; @@ -30,6 +31,7 @@ namespace Content.Client.Preferences.UI private readonly IClientPreferencesManager _preferencesManager; public readonly Button CloseButton; public readonly Button SaveButton; + public readonly Button RulesButton; public CharacterSetupGui( IEntityManager entityManager, @@ -84,12 +86,19 @@ namespace Content.Client.Preferences.UI StyleClasses = {StyleNano.StyleClassLabelHeadingBigger}, VAlign = Label.VAlignMode.Center, }, - (SaveButton = new Button + (RulesButton = new Button { HorizontalExpand = true, HorizontalAlignment = HAlignment.Right, + Text = Loc.GetString("character-setup-gui-character-setup-rules-button"), + StyleClasses = {StyleNano.StyleClassButtonBig}, + + }), + (SaveButton = new Button + { Text = Loc.GetString("character-setup-gui-character-setup-save-button"), StyleClasses = {StyleNano.StyleClassButtonBig}, + }), (CloseButton = new Button { @@ -155,6 +164,7 @@ namespace Content.Client.Preferences.UI UpdateUI(); + RulesButton.OnPressed += _ => new InfoWindow().Open(); preferencesManager.OnServerDataLoaded += UpdateUI; } diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.cs index 153a83d304..246fbbea66 100644 --- a/Content.Client/Preferences/UI/HumanoidProfileEditor.cs +++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using Content.Client.CharacterAppearance; using Content.Client.Lobby.UI; +using Content.Client.Message; using Content.Client.Stylesheets; using Content.Shared.CharacterAppearance; using Content.Shared.GameTicking; @@ -107,12 +108,8 @@ namespace Content.Client.Preferences.UI #region Randomize var randomizePanel = HighlightedContainer(); - var randomizeEverythingButton = new Button - { - Text = Loc.GetString("humanoid-profile-editor-randomize-everything-button") - }; - randomizeEverythingButton.OnPressed += args => { RandomizeEverything(); }; - randomizePanel.AddChild(randomizeEverythingButton); + var randomizeVbox = new BoxContainer() { Orientation = LayoutOrientation.Vertical }; + randomizePanel.AddChild(randomizeVbox); leftColumn.AddChild(randomizePanel); #endregion Randomize @@ -140,7 +137,27 @@ namespace Content.Client.Preferences.UI nameHBox.AddChild(nameLabel); nameHBox.AddChild(_nameEdit); nameHBox.AddChild(nameRandomButton); - randomizePanel.AddChild(nameHBox); + randomizeVbox.AddChild(nameHBox); + + var randomizeEverythingButton = new Button + { + HorizontalAlignment = HAlignment.Center, + HorizontalExpand = false, + MaxWidth = 256, + Text = Loc.GetString("humanoid-profile-editor-randomize-everything-button"), + }; + randomizeEverythingButton.OnPressed += args => { RandomizeEverything(); }; + randomizeVbox.AddChild(randomizeEverythingButton); + + var warningLabel = new RichTextLabel() + { + HorizontalExpand = false, + VerticalExpand = true, + MaxWidth = 425, + HorizontalAlignment = HAlignment.Left, + }; + warningLabel.SetMarkup($"[color=red]{Loc.GetString("humanoid-profile-editor-naming-rules-warning")}[/color]"); + randomizeVbox.AddChild(warningLabel); #endregion Name diff --git a/Resources/Locale/en-US/info/server-info.ftl b/Resources/Locale/en-US/info/server-info.ftl index ac68494f81..47741bc754 100644 --- a/Resources/Locale/en-US/info/server-info.ftl +++ b/Resources/Locale/en-US/info/server-info.ftl @@ -1,4 +1,5 @@ +server-info-rules-button = Rules server-info-discord-button = Discord server-info-website-button = Website server-info-report-button = Report Bugs -server-info-credits-button = Credits \ No newline at end of file +server-info-credits-button = Credits diff --git a/Resources/Locale/en-US/preferences/ui/character-setup-gui.ftl b/Resources/Locale/en-US/preferences/ui/character-setup-gui.ftl index 4842141bb5..82108f7c40 100644 --- a/Resources/Locale/en-US/preferences/ui/character-setup-gui.ftl +++ b/Resources/Locale/en-US/preferences/ui/character-setup-gui.ftl @@ -1,6 +1,7 @@ character-setup-gui-character-setup-label = Character setup +character-setup-gui-character-setup-rules-button = Rules character-setup-gui-character-setup-save-button = Save character-setup-gui-character-setup-close-button = Close character-setup-gui-create-new-character-button = Create new slot... character-setup-gui-create-new-character-button-tooltip = A maximum of {$maxCharacters} characters are allowed. -character-setup-gui-character-picker-button-delete-button = Delete \ No newline at end of file +character-setup-gui-character-picker-button-delete-button = Delete diff --git a/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl b/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl index 1c4cac4048..94985cd837 100644 --- a/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl +++ b/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl @@ -31,4 +31,5 @@ humanoid-profile-editor-antags-tab = Antags humanoid-profile-editor-job-priority-high-button = High humanoid-profile-editor-job-priority-medium-button = Medium humanoid-profile-editor-job-priority-low-button = Low -humanoid-profile-editor-job-priority-never-button = Never \ No newline at end of file +humanoid-profile-editor-job-priority-never-button = Never +humanoid-profile-editor-naming-rules-warning = Warning: Offensive or LRP IC names will lead to admin intervention on this server. Read our \[Rules\] for more.