Adds rule button to lobby and character creation. Add IC naming warning. (#4760)

This commit is contained in:
Vera Aguilera Puerto
2021-10-03 23:48:29 +02:00
committed by GitHub
parent c8193ef393
commit 54a2b5dee0
6 changed files with 45 additions and 11 deletions

View File

@@ -31,6 +31,9 @@ namespace Content.Client.Info
var uriOpener = IoCManager.Resolve<IUriOpener>(); var uriOpener = IoCManager.Resolve<IUriOpener>();
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") }; var discordButton = new Button {Text = Loc.GetString("server-info-discord-button") };
discordButton.OnPressed += args => uriOpener.OpenUri(UILinks.Discord); discordButton.OnPressed += args => uriOpener.OpenUri(UILinks.Discord);
@@ -49,6 +52,7 @@ namespace Content.Client.Info
HorizontalAlignment = HAlignment.Right HorizontalAlignment = HAlignment.Right
}; };
buttons.AddChild(rulesButton);
buttons.AddChild(discordButton); buttons.AddChild(discordButton);
buttons.AddChild(websiteButton); buttons.AddChild(websiteButton);
buttons.AddChild(reportButton); buttons.AddChild(reportButton);

View File

@@ -1,5 +1,6 @@
using System.Linq; using System.Linq;
using Content.Client.CharacterAppearance; using Content.Client.CharacterAppearance;
using Content.Client.Info;
using Content.Client.Lobby.UI; using Content.Client.Lobby.UI;
using Content.Client.Parallax; using Content.Client.Parallax;
using Content.Client.Resources; using Content.Client.Resources;
@@ -30,6 +31,7 @@ namespace Content.Client.Preferences.UI
private readonly IClientPreferencesManager _preferencesManager; private readonly IClientPreferencesManager _preferencesManager;
public readonly Button CloseButton; public readonly Button CloseButton;
public readonly Button SaveButton; public readonly Button SaveButton;
public readonly Button RulesButton;
public CharacterSetupGui( public CharacterSetupGui(
IEntityManager entityManager, IEntityManager entityManager,
@@ -84,12 +86,19 @@ namespace Content.Client.Preferences.UI
StyleClasses = {StyleNano.StyleClassLabelHeadingBigger}, StyleClasses = {StyleNano.StyleClassLabelHeadingBigger},
VAlign = Label.VAlignMode.Center, VAlign = Label.VAlignMode.Center,
}, },
(SaveButton = new Button (RulesButton = new Button
{ {
HorizontalExpand = true, HorizontalExpand = true,
HorizontalAlignment = HAlignment.Right, 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"), Text = Loc.GetString("character-setup-gui-character-setup-save-button"),
StyleClasses = {StyleNano.StyleClassButtonBig}, StyleClasses = {StyleNano.StyleClassButtonBig},
}), }),
(CloseButton = new Button (CloseButton = new Button
{ {
@@ -155,6 +164,7 @@ namespace Content.Client.Preferences.UI
UpdateUI(); UpdateUI();
RulesButton.OnPressed += _ => new InfoWindow().Open();
preferencesManager.OnServerDataLoaded += UpdateUI; preferencesManager.OnServerDataLoaded += UpdateUI;
} }

View File

@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using Content.Client.CharacterAppearance; using Content.Client.CharacterAppearance;
using Content.Client.Lobby.UI; using Content.Client.Lobby.UI;
using Content.Client.Message;
using Content.Client.Stylesheets; using Content.Client.Stylesheets;
using Content.Shared.CharacterAppearance; using Content.Shared.CharacterAppearance;
using Content.Shared.GameTicking; using Content.Shared.GameTicking;
@@ -107,12 +108,8 @@ namespace Content.Client.Preferences.UI
#region Randomize #region Randomize
var randomizePanel = HighlightedContainer(); var randomizePanel = HighlightedContainer();
var randomizeEverythingButton = new Button var randomizeVbox = new BoxContainer() { Orientation = LayoutOrientation.Vertical };
{ randomizePanel.AddChild(randomizeVbox);
Text = Loc.GetString("humanoid-profile-editor-randomize-everything-button")
};
randomizeEverythingButton.OnPressed += args => { RandomizeEverything(); };
randomizePanel.AddChild(randomizeEverythingButton);
leftColumn.AddChild(randomizePanel); leftColumn.AddChild(randomizePanel);
#endregion Randomize #endregion Randomize
@@ -140,7 +137,27 @@ namespace Content.Client.Preferences.UI
nameHBox.AddChild(nameLabel); nameHBox.AddChild(nameLabel);
nameHBox.AddChild(_nameEdit); nameHBox.AddChild(_nameEdit);
nameHBox.AddChild(nameRandomButton); 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 #endregion Name

View File

@@ -1,3 +1,4 @@
server-info-rules-button = Rules
server-info-discord-button = Discord server-info-discord-button = Discord
server-info-website-button = Website server-info-website-button = Website
server-info-report-button = Report Bugs server-info-report-button = Report Bugs

View File

@@ -1,4 +1,5 @@
character-setup-gui-character-setup-label = Character setup 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-save-button = Save
character-setup-gui-character-setup-close-button = Close 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 = Create new slot...

View File

@@ -32,3 +32,4 @@ humanoid-profile-editor-job-priority-high-button = High
humanoid-profile-editor-job-priority-medium-button = Medium humanoid-profile-editor-job-priority-medium-button = Medium
humanoid-profile-editor-job-priority-low-button = Low humanoid-profile-editor-job-priority-low-button = Low
humanoid-profile-editor-job-priority-never-button = Never 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.