diff --git a/Content.Client/ADT/CharecterFlavor/CharacterFlavorWindow.xaml b/Content.Client/ADT/CharecterFlavor/CharacterFlavorWindow.xaml index 6a70a3bd3a1..364dd2c3650 100644 --- a/Content.Client/ADT/CharecterFlavor/CharacterFlavorWindow.xaml +++ b/Content.Client/ADT/CharecterFlavor/CharacterFlavorWindow.xaml @@ -83,12 +83,12 @@ Margin="0 10 0 0"> - + - + - - - - - - - - - - - - - - - diff --git a/Content.Client/ADT/CharecterFlavor/CharacterFlavorWindow.xaml.cs b/Content.Client/ADT/CharecterFlavor/CharacterFlavorWindow.xaml.cs index 58cf6c750ef..6a5207a94dd 100644 --- a/Content.Client/ADT/CharecterFlavor/CharacterFlavorWindow.xaml.cs +++ b/Content.Client/ADT/CharecterFlavor/CharacterFlavorWindow.xaml.cs @@ -59,7 +59,6 @@ public void SetEntity(EntityUid uid) Title = metaData.EntityName; FlavorTextLabel.SetMarkup(flavor.FlavorText); - OOCNotesLabel.SetMarkup(flavor.OOCNotes); } public void SetHeadshot(byte[] image) diff --git a/Content.Client/ADT/FlavorText/Rules/FlavorTextRulesControl.xaml b/Content.Client/ADT/FlavorText/Rules/FlavorTextRulesControl.xaml new file mode 100644 index 00000000000..fdb894146bf --- /dev/null +++ b/Content.Client/ADT/FlavorText/Rules/FlavorTextRulesControl.xaml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/Content.Client/ADT/FlavorText/Rules/FlavorTextRulesControl.xaml.cs b/Content.Client/ADT/FlavorText/Rules/FlavorTextRulesControl.xaml.cs new file mode 100644 index 00000000000..81e34257165 --- /dev/null +++ b/Content.Client/ADT/FlavorText/Rules/FlavorTextRulesControl.xaml.cs @@ -0,0 +1,32 @@ +using Content.Client.Guidebook; +using Content.Client.Guidebook.RichText; +using Content.Shared.Guidebook; +using Robust.Client.AutoGenerated; +using Robust.Client.UserInterface.Controls; +using Robust.Client.UserInterface.XAML; +using Robust.Shared.Prototypes; + +namespace Content.Client.ADT.FlavorText.Rules; + +[GenerateTypedNameReferences] +public sealed partial class FlavorTextRulesControl : BoxContainer +{ + [Dependency] private readonly DocumentParsingManager _parsingMan = default!; + + public FlavorTextRulesControl() + { + RobustXamlLoader.Load(this); + IoCManager.InjectDependencies(this); + + SetGuide(); + } + + private void SetGuide(ProtoId? entry = null) + { + entry ??= new ProtoId("FlavorTextRules"); + + Scroll.SetScrollValue(default); + RulesContainer.Children.Clear(); + _parsingMan.TryAddMarkup(RulesContainer, entry.Value); + } +} diff --git a/Content.Client/ADT/FlavorText/Rules/FlavorTextRulesPopup.xaml b/Content.Client/ADT/FlavorText/Rules/FlavorTextRulesPopup.xaml new file mode 100644 index 00000000000..f5953bc6245 --- /dev/null +++ b/Content.Client/ADT/FlavorText/Rules/FlavorTextRulesPopup.xaml @@ -0,0 +1,24 @@ + + + + + + +