Mail polish (#40)

* Mail polish

* Make mail recyclable too

Content.Client/Mail/MailSystem.cs

@@ -8,15 +8,19 @@ public sealed class MailSystem : VisualizerSystem<MailVisualsComponent>
         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);
             }
         }
     }
 }
 
 public enum MailVisualLayers : byte
 {
-    IsLocked
+    IsLocked,
+    IsTrash
 }

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;
 }

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.
         /// </summary>
         public int Bounty = 500;
+
+        /// <summary>
+        /// Whether this component is enabled.
+        /// Removed when it becomes trash.
+        /// </summary>
+        public bool Enabled = true;
     }
 }

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);

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<MailComponent, ComponentInit>(OnInit);
             SubscribeLocalEvent<MailComponent, UseInHandEvent>(OnUseInHand);
             SubscribeLocalEvent<MailComponent, AfterInteractUsingEvent>(OnAfterInteractUsing);
             SubscribeLocalEvent<MailComponent, ExaminedEvent>(OnExamined);
@@ -76,11 +79,22 @@ public override void Update(float frameTime)
             }
         }
 
+        /// <summary>
+        /// Set initial appearance so stuff doesn't break.
+        /// </summary>
+        private void OnInit(EntityUid uid, MailComponent mail, ComponentInit args)
+        {
+            UpdateAntiTamperVisuals(uid, true);
+            UpdateMailTrashState(uid, false);
+        }
+
         /// <summary>
         /// Try to open the mail.
         /// <summary>
         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<AppearanceComponent>(uid, out var appearance))
                 return;
 
             appearance.SetData(MailVisuals.IsLocked, isLocked);
         }
+
+        private void UpdateMailTrashState(EntityUid uid, bool isTrash)
+        {
+            if (!TryComp<AppearanceComponent>(uid, out var appearance))
+                return;
+
+            appearance.SetData(MailVisuals.IsTrash, isTrash);
+        }
     }
 }

Content.Shared/Mail/MailVisuals.cs

@@ -8,6 +8,7 @@ namespace Content.Shared.Mail
     [Serializable, NetSerializable]
     public enum MailVisuals : byte
     {
-        IsLocked
+        IsLocked,
+        IsTrash
     }
 }

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

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

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
+    }
+  ]
+}

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"
     }
   ]
 }