From 4ccc8a04bea393042eb81ceaecbcbbcb8d6be000 Mon Sep 17 00:00:00 2001 From: eoineoineoin Date: Sun, 13 Aug 2023 19:28:10 +0100 Subject: [PATCH] Improve paper stamping experience (#17135) --- Content.Client/Fax/AdminUI/AdminFaxEui.cs | 5 +- .../Fax/AdminUI/AdminFaxWindow.xaml | 4 +- .../Fax/AdminUI/AdminFaxWindow.xaml.cs | 10 +- .../Paper/UI/PaperBoundUserInterface.cs | 95 ++++++++-------- Content.Client/Paper/UI/PaperWindow.xaml | 3 +- Content.Client/Paper/UI/PaperWindow.xaml.cs | 14 ++- Content.Client/Paper/UI/StampCollection.xaml | 5 + .../Paper/UI/StampCollection.xaml.cs | 98 +++++++++++++++++ Content.Client/Paper/UI/StampLabel.xaml | 2 + Content.Client/Paper/UI/StampLabel.xaml.cs | 56 ++++++++++ Content.Client/Paper/UI/StampWidget.xaml | 21 +--- Content.Client/Paper/UI/StampWidget.xaml.cs | 62 ++++++++--- Content.Server/Fax/AdminUI/AdminFaxEui.cs | 6 +- Content.Server/Fax/FaxMachineComponent.cs | 7 +- Content.Server/Fax/FaxSystem.cs | 7 +- Content.Server/Nuke/NukeCodePaperSystem.cs | 7 +- Content.Server/Paper/PaperComponent.cs | 34 +++--- Content.Server/Paper/PaperSystem.cs | 31 ++++-- Content.Shared/Fax/AdminFaxEui.cs | 6 +- Content.Shared/Paper/SharedPaperComponent.cs | 103 +++++++++--------- Content.Shared/Paper/StampComponent.cs | 67 ++++++++---- Resources/Locale/en-US/fax/fax-admin.ftl | 7 +- Resources/Maps/core.yml | 3 +- .../Entities/Objects/Misc/paper.yml | 17 +++ Resources/Prototypes/Shaders/shaders.yml | 5 + .../Interface/Paper/paper_stamp_border.svg | 103 ++++++++++++++++++ .../Paper/paper_stamp_border.svg.96dpi.png | Bin 0 -> 445 bytes Resources/Textures/Shaders/paperstamp.swsl | 53 +++++++++ 28 files changed, 629 insertions(+), 202 deletions(-) create mode 100644 Content.Client/Paper/UI/StampCollection.xaml create mode 100644 Content.Client/Paper/UI/StampCollection.xaml.cs create mode 100644 Content.Client/Paper/UI/StampLabel.xaml create mode 100644 Content.Client/Paper/UI/StampLabel.xaml.cs create mode 100644 Resources/Textures/Interface/Paper/paper_stamp_border.svg create mode 100644 Resources/Textures/Interface/Paper/paper_stamp_border.svg.96dpi.png create mode 100644 Resources/Textures/Shaders/paperstamp.swsl diff --git a/Content.Client/Fax/AdminUI/AdminFaxEui.cs b/Content.Client/Fax/AdminUI/AdminFaxEui.cs index 06d0f71d27..695c68e60d 100644 --- a/Content.Client/Fax/AdminUI/AdminFaxEui.cs +++ b/Content.Client/Fax/AdminUI/AdminFaxEui.cs @@ -1,4 +1,4 @@ -using Content.Client.Eui; +using Content.Client.Eui; using Content.Shared.Eui; using Content.Shared.Fax; using JetBrains.Annotations; @@ -15,7 +15,8 @@ public sealed class AdminFaxEui : BaseEui _window = new AdminFaxWindow(); _window.OnClose += () => SendMessage(new AdminFaxEuiMsg.Close()); _window.OnFollowFax += uid => SendMessage(new AdminFaxEuiMsg.Follow(uid)); - _window.OnMessageSend += args => SendMessage(new AdminFaxEuiMsg.Send(args.uid, args.title, args.from, args.message, args.stamp)); + _window.OnMessageSend += args => SendMessage(new AdminFaxEuiMsg.Send(args.uid, args.title, + args.stampedBy, args.message, args.stampSprite, args.stampColor)); } public override void Opened() diff --git a/Content.Client/Fax/AdminUI/AdminFaxWindow.xaml b/Content.Client/Fax/AdminUI/AdminFaxWindow.xaml index 0c148a9fdc..d469a0e9d3 100644 --- a/Content.Client/Fax/AdminUI/AdminFaxWindow.xaml +++ b/Content.Client/Fax/AdminUI/AdminFaxWindow.xaml @@ -1,4 +1,4 @@ - @@ -21,6 +21,8 @@ +