From 24e4c1b12c9379cc28ef0edab3cb8c4b5bc63114 Mon Sep 17 00:00:00 2001 From: Rane <60792108+Elijahrane@users.noreply.github.com> Date: Tue, 3 May 2022 21:54:45 -0400 Subject: [PATCH] Mail polish (#40) * Mail polish * Make mail recyclable too --- Content.Client/Mail/MailSystem.cs | 8 +++-- Content.Client/Mail/MailVisualsComponent.cs | 6 ++++ .../Mail/Components/MailComponent.cs | 6 ++++ .../Components/MailTeleporterComponent.cs | 2 +- Content.Server/Mail/MailSystem.cs | 31 ++++++++++++++++-- Content.Shared/Mail/MailVisuals.cs | 3 +- .../Entities/Objects/Specific/Mail/mail.yml | 4 +++ .../Entities/Objects/Specific/Mail/tools.yml | 6 ++-- .../Belt/mailbag.rsi/equipped-BELT.png | Bin 0 -> 653 bytes .../Clothing/Belt/mailbag.rsi/icon.png | Bin 0 -> 762 bytes .../Clothing/Belt/mailbag.rsi/meta.json | 18 ++++++++++ .../Objects/Specific/Mail/mail.rsi/icon.png | Bin 5533 -> 445 bytes .../Objects/Specific/Mail/mail.rsi/locked.png | Bin 4874 -> 4998 bytes .../Objects/Specific/Mail/mail.rsi/meta.json | 8 ++++- .../Specific/Mail/mail.rsi/postmark.png | Bin 0 -> 178 bytes .../Objects/Specific/Mail/mail.rsi/trash.png | Bin 0 -> 486 bytes 16 files changed, 80 insertions(+), 12 deletions(-) create mode 100644 Resources/Textures/Clothing/Belt/mailbag.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Clothing/Belt/mailbag.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Belt/mailbag.rsi/meta.json create mode 100644 Resources/Textures/Objects/Specific/Mail/mail.rsi/postmark.png create mode 100644 Resources/Textures/Objects/Specific/Mail/mail.rsi/trash.png diff --git a/Content.Client/Mail/MailSystem.cs b/Content.Client/Mail/MailSystem.cs index 0c49d93c614b..d56d4a717e1e 100644 --- a/Content.Client/Mail/MailSystem.cs +++ b/Content.Client/Mail/MailSystem.cs @@ -8,9 +8,12 @@ public sealed class MailSystem : VisualizerSystem protected override void OnAppearanceChange(EntityUid uid, MailVisualsComponent component, ref AppearanceChangeEvent args) { if (TryComp(uid, out SpriteComponent? sprite) - && args.Component.TryGetData(MailVisuals.IsLocked, out bool isLocked)) + && args.Component.TryGetData(MailVisuals.IsLocked, out bool isLocked) + && args.Component.TryGetData(MailVisuals.IsTrash, out bool isTrash)) { + var state = isTrash ? component.TrashState : component.NormalState; sprite.LayerSetVisible(MailVisualLayers.IsLocked, isLocked); + sprite.LayerSetState(MailVisualLayers.IsTrash, state); } } } @@ -18,5 +21,6 @@ protected override void OnAppearanceChange(EntityUid uid, MailVisualsComponent c public enum MailVisualLayers : byte { - IsLocked + IsLocked, + IsTrash } diff --git a/Content.Client/Mail/MailVisualsComponent.cs b/Content.Client/Mail/MailVisualsComponent.cs index 64451a4c9931..10750106b336 100644 --- a/Content.Client/Mail/MailVisualsComponent.cs +++ b/Content.Client/Mail/MailVisualsComponent.cs @@ -6,6 +6,12 @@ namespace Content.Client.Mail; [RegisterComponent] public sealed class MailVisualsComponent : Component { + [DataField("normalState", required: true)] + public string NormalState = default!; + + [DataField("trashState", required: true)] + public string TrashState = default!; + [DataField("isLocked")] public bool IsLocked = true; } diff --git a/Content.Server/Mail/Components/MailComponent.cs b/Content.Server/Mail/Components/MailComponent.cs index 22de34bfa5ac..eaba0f3ead11 100644 --- a/Content.Server/Mail/Components/MailComponent.cs +++ b/Content.Server/Mail/Components/MailComponent.cs @@ -31,5 +31,11 @@ public sealed class MailComponent : Component /// The amount that cargo will be awarded for delivering this mail. /// public int Bounty = 500; + + /// + /// Whether this component is enabled. + /// Removed when it becomes trash. + /// + public bool Enabled = true; } } diff --git a/Content.Server/Mail/Components/MailTeleporterComponent.cs b/Content.Server/Mail/Components/MailTeleporterComponent.cs index 0e70da92c486..8f46b8b87cba 100644 --- a/Content.Server/Mail/Components/MailTeleporterComponent.cs +++ b/Content.Server/Mail/Components/MailTeleporterComponent.cs @@ -10,7 +10,7 @@ public sealed class MailTeleporterComponent : Component // Not starting accumulator at 0 so mail carriers have some deliveries to make shortly after roundstart. [DataField("accumulator")] - public float Accumulator = 270f; + public float Accumulator = 285f; [DataField("teleportInterval")] public TimeSpan teleportInterval = TimeSpan.FromMinutes(5); diff --git a/Content.Server/Mail/MailSystem.cs b/Content.Server/Mail/MailSystem.cs index 44181bb5137f..b1d3b14c5b50 100644 --- a/Content.Server/Mail/MailSystem.cs +++ b/Content.Server/Mail/MailSystem.cs @@ -12,6 +12,7 @@ using Content.Shared.Hands.EntitySystems; using Content.Shared.Mail; using Content.Shared.PDA; +using Content.Shared.Tag; using Robust.Shared.Player; using Robust.Shared.Random; using Robust.Shared.Audio; @@ -25,6 +26,7 @@ public sealed class MailSystem : EntitySystem [Dependency] private readonly SharedHandsSystem _handsSystem = default!; [Dependency] private readonly IdCardSystem _idCardSystem = default!; [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private readonly TagSystem _tagSystem = default!; // TODO: YAML Serializer won't catch this. [ViewVariables(VVAccess.ReadWrite)] @@ -50,6 +52,7 @@ public sealed class MailSystem : EntitySystem public override void Initialize() { base.Initialize(); + SubscribeLocalEvent(OnInit); SubscribeLocalEvent(OnUseInHand); SubscribeLocalEvent(OnAfterInteractUsing); SubscribeLocalEvent(OnExamined); @@ -76,11 +79,22 @@ public override void Update(float frameTime) } } + /// + /// Set initial appearance so stuff doesn't break. + /// + private void OnInit(EntityUid uid, MailComponent mail, ComponentInit args) + { + UpdateAntiTamperVisuals(uid, true); + UpdateMailTrashState(uid, false); + } + /// /// Try to open the mail. /// private void OnUseInHand(EntityUid uid, MailComponent component, UseInHandEvent args) { + if (!component.Enabled) + return; if (component.Locked) { _popupSystem.PopupEntity(Loc.GetString("mail-locked"), uid, Filter.Entities(args.User)); @@ -128,7 +142,7 @@ private void OnAfterInteractUsing(EntityUid uid, MailComponent component, AfterI } _popupSystem.PopupEntity(Loc.GetString("mail-bounty", ("bounty", component.Bounty)), uid, Filter.Entities(args.User)); component.Locked = false; - UpdateMailVisuals(uid, false); + UpdateAntiTamperVisuals(uid, false); /// This needs to be revisited for multistation /// For now let's just add the bounty to the first /// console we find. @@ -203,15 +217,26 @@ public void OpenMail(EntityUid uid, MailComponent? component = null, EntityUid? if (user != null) _handsSystem.PickupOrDrop(user, entity); } - EntityManager.QueueDeleteEntity(uid); + _tagSystem.AddTag(uid, "Trash"); + _tagSystem.AddTag(uid, "Recyclable"); + component.Enabled = false; + UpdateMailTrashState(uid, true); } - private void UpdateMailVisuals(EntityUid uid, bool isLocked) + private void UpdateAntiTamperVisuals(EntityUid uid, bool isLocked) { if (!TryComp(uid, out var appearance)) return; appearance.SetData(MailVisuals.IsLocked, isLocked); } + + private void UpdateMailTrashState(EntityUid uid, bool isTrash) + { + if (!TryComp(uid, out var appearance)) + return; + + appearance.SetData(MailVisuals.IsTrash, isTrash); + } } } diff --git a/Content.Shared/Mail/MailVisuals.cs b/Content.Shared/Mail/MailVisuals.cs index 6ed9ca1c100f..d887204e6566 100644 --- a/Content.Shared/Mail/MailVisuals.cs +++ b/Content.Shared/Mail/MailVisuals.cs @@ -8,6 +8,7 @@ namespace Content.Shared.Mail [Serializable, NetSerializable] public enum MailVisuals : byte { - IsLocked + IsLocked, + IsTrash } } diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mail/mail.yml b/Resources/Prototypes/Entities/Objects/Specific/Mail/mail.yml index 339b17722fe5..16d0d4e4f786 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Mail/mail.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Mail/mail.yml @@ -12,10 +12,14 @@ sprite: Objects/Specific/Mail/mail.rsi layers: - state: icon + map: ["enum.MailVisualLayers.IsTrash"] + - state: postmark - state: locked map: ["enum.MailVisualLayers.IsLocked"] - type: Appearance - type: MailVisuals + normalState: icon + trashState: trash - type: entity parent: BaseMail diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mail/tools.yml b/Resources/Prototypes/Entities/Objects/Specific/Mail/tools.yml index f1e3c43e7f05..9959ff6bf802 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Mail/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Mail/tools.yml @@ -6,12 +6,10 @@ components: - type: Sprite netsync: false - sprite: Objects/Specific/Hydroponics/Equipment/plant_bag.rsi - color: blue + sprite: Clothing/Belt/mailbag.rsi state: icon - type: Clothing - sprite: Objects/Specific/Hydroponics/Equipment/plant_bag.rsi - color: blue + sprite: Clothing/Belt/mailbag.rsi quickEquip: false Slots: - belt diff --git a/Resources/Textures/Clothing/Belt/mailbag.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belt/mailbag.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..5d58dd8368126f68c9247055900249543216dbd7 GIT binary patch literal 653 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|S%2 zr;B4q#hkaZ4t57Q${gSC)asb+c(-NA-jWlObar2l%W}>7s6XLCvaISG1(CK3Cl`yw z?Q*NW88vN9@`JV&TQ@XDc$FC(sSw(sYi6o15-fJl=JxV$ziag#pRsvn{{FMv;s@Uu zIu0{A$cQmK+Q1;t&e~w1!*C>#QGt(}p)i7>W3kSIS4ANw%KlbfYLk3&XOa7q)vAZ9 zgM|c6)Ce{^-G1%Wy5>;nbJh_rm`A$7>|^K703SckSe&?3Y_! zSjkvu?n*8$oh@7Dd)WP`=~R|E6_Z%wn3v1Nx$%}=xow}II(P2;8>`G3lfP};`N*6% zU5tGin1^H;n(!o;`k&b8Z_ENXMy z`TKiM@;GXJPplVG+I-}C82k0}^6phBF=-qj0b&Mo4ps(hb{z>wNRo01t5N!!6MWzQ z!=ptn(m8sPUhz(dWc*qFGb7E6xI{h?YBG>T(@+^z4_k{w5&9LaQ^JEBlrLQJo06`!^|j`XZ5X+c>Kxg?{o3# U7OOwq!1Tr7>FVdQ&MBb@06k$PKmY&$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Belt/mailbag.rsi/icon.png b/Resources/Textures/Clothing/Belt/mailbag.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..5114b1ecf4a4d995d3f96423dc5ff85044284f38 GIT binary patch literal 762 zcmVy-W1S@Ky0og+!Y%vQ<9XwP}marfZ z9`Yj5pG(`J!-8VW9>Rn!u@_k=FNH`%AXI~4L0w|O)k0*GMcB~RwD6Rd!q@w~nK!(d zoj1<7hcNbcdH;U=zMpyT_kM4h;2&E9VCMkniAzKr7pI@^in3l800viY=Bz=X2)~y< zusJS*{R0PMpr{=HN!{`r0TKox@)0Z-M*+qBtTHtKTJm+Ic!2<&7c*q_d)X2mxdngL z%h1#k13o8iJI>)+W#|HH`8vXyuZE>NAq9xH9VbfnZBWHYy8X@;%go0oUNXt&#ZSHv zQh>w9I;DZnoIC_?KUQ5W8upow2LfYJ0AHQ(IUodNLO!jZFWSc1j5KU`0O6~yKk9*yuR?JY{jl&q989 z$+@AG6X6*6w^O znXI3i0_aX%fm~*gjkUA)*!s2r@XR%^0$@>sA=3%S1Z`0f2qBB@y>y$NGGCTAFSZL{ zLp=VKhy6#>u$I=~MzanIP_RNrjUSrXuDN`Mhfe2RzXdnYJ zp&uj1S1|nYm1h&=O;?X=J`lhu6)^`K2yj6JT`QTm s%t9Rj29iCe_1ez)D{cTZ0RCHmzvcf$(cf#GCjbBd07*qoM6N<$g2dlk#sB~S literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Belt/mailbag.rsi/meta.json b/Resources/Textures/Clothing/Belt/mailbag.rsi/meta.json new file mode 100644 index 000000000000..796e09790aa6 --- /dev/null +++ b/Resources/Textures/Clothing/Belt/mailbag.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Mail/mail.rsi/icon.png b/Resources/Textures/Objects/Specific/Mail/mail.rsi/icon.png index 0cfd5f493a373210305698b033ff59c985f76a51..c1dfad6a2f1f186a411589b2adc702eeb9a3e7e5 100644 GIT binary patch delta 420 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 diff --git a/Resources/Textures/Objects/Specific/Mail/mail.rsi/locked.png b/Resources/Textures/Objects/Specific/Mail/mail.rsi/locked.png index 93b8713335cae563a0650471a17eaad1292f63c3..8ab46d5519ca8cb05d8de2de87ca14cc21228985 100644 GIT binary patch delta 1784 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 QC;$Ke07*qoM6N<$f>Uh!iU0rr diff --git a/Resources/Textures/Objects/Specific/Mail/mail.rsi/meta.json b/Resources/Textures/Objects/Specific/Mail/mail.rsi/meta.json index 92999ade3b57..e1b289fa1b50 100644 --- a/Resources/Textures/Objects/Specific/Mail/mail.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Mail/mail.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Rane.", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a", "size": { "x": 32, "y": 32 @@ -12,6 +12,12 @@ }, { "name": "locked" + }, + { + "name": "trash" + }, + { + "name": "postmark" } ] } diff --git a/Resources/Textures/Objects/Specific/Mail/mail.rsi/postmark.png b/Resources/Textures/Objects/Specific/Mail/mail.rsi/postmark.png new file mode 100644 index 0000000000000000000000000000000000000000..b4c297cd325dd34edc94515feab3d5d27ab7c8d4 GIT binary patch literal 178 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D462u z;uumf=k4W#oCgdz+!Fb3u83SRIc;Lv@_AfBSwbsJzf1=);T3K0RZ9OJH`M2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Mail/mail.rsi/trash.png b/Resources/Textures/Objects/Specific/Mail/mail.rsi/trash.png new file mode 100644 index 0000000000000000000000000000000000000000..87088548ecfa92d4ea3e89227015012cbd3b9158 GIT binary patch literal 486 zcmV@P)Y2_9RKb_kGCoyt#*M$^o)0 zlMWgaI2ZtDiK3ZeNy2MY5K;h@vpfrc-DiHk@qDOSg|k+m>wG8!5IqI75(G!*beeP*?x@|MbUf@_zd9+;D9g;>pC4e6#r79`>gnI6o#XxNJ0P{kfv!f zXuI7uCVa_$XlRx)h`|7x^%^dr$N9V;;B~(r74k5f3EOe+KMsd(fN-_y`~$v(ru#X* c0sI?)FSq>6PAn&4F8}}l07*qoM6N<$g6^!#=Kufz literal 0 HcmV?d00001