Mail table rework

Content.Server/Nyanotrasen/Mail/Components/MailComponent.cs

@@ -65,6 +65,14 @@ public sealed partial class MailComponent : SharedMailComponent
         [DataField("isPriority")]
         public bool IsPriority = false;
 
+        // Frontier: large mail
+        /// <summary>
+        /// Whether this parcel is large.
+        /// </summary>
+        [DataField("isLarge")]
+        public bool IsLarge = false;
+        // End Frontier: large mail
+
         /// <summary>
         /// What will be packaged when the mail is spawned.
         /// </summary>

Content.Server/Nyanotrasen/Mail/Components/MailTeleporterComponent.cs

@@ -28,7 +28,7 @@ public sealed partial class MailTeleporterComponent : Component
         /// teleporter can deliver.
         /// </summary>
         [DataField("mailPool")]
-        public string MailPool = "RandomMailDeliveryPool";
+        public string MailPool = "RandomNFMailDeliveryPool"; // Frontier: use our own mail pool (TODO: migrate to frontier.yml instance?)
 
         /// <summary>
         /// How many mail candidates do we need per actual delivery sent when
@@ -104,5 +104,19 @@ public sealed partial class MailTeleporterComponent : Component
         /// </summary>
         [DataField("priorityMalus")]
         public int PriorityMalus = -250;
+
+        // Frontier: Large mail
+        /// <summary>
+        /// What's the bonus for delivering a large package intact?
+        /// </summary>
+        [DataField("largeBonus")]
+        public int LargeBonus = 5000;
+
+        /// <summary>
+        /// What's the malus for failing to deliver a large package?
+        /// </summary>
+        [DataField("largeMalus")]
+        public int LargeMalus = -250;
+        // End Frontier: Large mail
     }
 }

Content.Server/Nyanotrasen/Mail/MailCommands.cs

@@ -20,6 +20,7 @@ public sealed class MailToCommand : IConsoleCommand
     [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
 
     private readonly string _blankMailPrototype = "MailAdminFun";
+    private readonly string _blankLargeMailPrototype = "MailLargeAdminFun"; // Frontier: large mail
     private readonly string _container = "storagebase";
     private readonly string _mailContainer = "contents";
 
@@ -56,6 +57,16 @@ public async void Execute(IConsoleShell shell, string argStr, string[] args)
             return;
         }
 
+        // Frontier: Large Mail
+        bool isLarge = false;
+        if (args.Length > 4 && !Boolean.TryParse(args[4], out isLarge))
+        {
+            shell.WriteError(Loc.GetString("shell-invalid-bool"));
+            return;
+        }
+        var mailPrototype = isLarge ? _blankLargeMailPrototype : _blankMailPrototype;
+        // End Frontier
+
 
         var _mailSystem = _entitySystemManager.GetEntitySystem<MailSystem>();
         var _containerSystem = _entitySystemManager.GetEntitySystem<SharedContainerSystem>();
@@ -66,9 +77,9 @@ public async void Execute(IConsoleShell shell, string argStr, string[] args)
             return;
         }
 
-        if (!_prototypeManager.HasIndex<EntityPrototype>(_blankMailPrototype))
+        if (!_prototypeManager.HasIndex<EntityPrototype>(mailPrototype)) // Frontier: _blankMailPrototype<mailPrototype
         {
-            shell.WriteLine(Loc.GetString("command-mailto-no-blankmail", ("blankMail", _blankMailPrototype)));
+            shell.WriteLine(Loc.GetString("command-mailto-no-blankmail", ("blankMail", mailPrototype))); // Frontier: _blankMailPrototype<mailPrototype
             return;
         }
 
@@ -90,12 +101,12 @@ public async void Execute(IConsoleShell shell, string argStr, string[] args)
             return;
         }
 
-        var mailUid = _entityManager.SpawnEntity(_blankMailPrototype, _entityManager.GetComponent<TransformComponent>(containerUid).Coordinates);
+        var mailUid = _entityManager.SpawnEntity(mailPrototype, _entityManager.GetComponent<TransformComponent>(containerUid).Coordinates); // Frontier: _blankMailPrototype<mailPrototype
         var mailContents = _containerSystem.EnsureContainer<Container>(mailUid, _mailContainer);
 
         if (!_entityManager.TryGetComponent(mailUid, out MailComponent? mailComponent))
         {
-            shell.WriteLine(Loc.GetString("command-mailto-bogus-mail", ("blankMail", _blankMailPrototype), ("requiredMailComponent", nameof(MailComponent))));
+            shell.WriteLine(Loc.GetString("command-mailto-bogus-mail", ("blankMail", mailPrototype), ("requiredMailComponent", nameof(MailComponent)))); // Frontier: _blankMailPrototype<mailPrototype
             return;
         }
 
@@ -104,6 +115,7 @@ public async void Execute(IConsoleShell shell, string argStr, string[] args)
 
         mailComponent.IsFragile = isFragile;
         mailComponent.IsPriority = isPriority;
+        mailComponent.IsLarge = isLarge;
 
         _mailSystem.SetupMail(mailUid, teleporterComponent, recipient.Value);
 

Content.Server/Nyanotrasen/Mail/MailSystem.cs

@@ -245,13 +245,14 @@ private void OnAfterInteractUsing(EntityUid uid, MailComponent component, AfterI
 
         private void OnExamined(EntityUid uid, MailComponent component, ExaminedEvent args)
         {
+            MailEntityStrings mailEntityStrings = component.IsLarge ? MailConstants.MailLarge : MailConstants.Mail; //Frontier: mail types stored per type (large mail)
             if (!args.IsInDetailsRange)
             {
-                args.PushMarkup(Loc.GetString("mail-desc-far"));
+                args.PushMarkup(Loc.GetString(mailEntityStrings.DescFar)); // Frontier: mail constants struct
                 return;
             }
 
-            args.PushMarkup(Loc.GetString("mail-desc-close", ("name", component.Recipient), ("job", component.RecipientJob), ("station", component.RecipientStation)));
+            args.PushMarkup(Loc.GetString(mailEntityStrings.DescClose, ("name", component.Recipient), ("job", component.RecipientJob), ("station", component.RecipientStation))); // Frontier: mail constants struct
 
             if (component.IsFragile)
                 args.PushMarkup(Loc.GetString("mail-desc-fragile"));
@@ -469,6 +470,15 @@ public void SetupMail(EntityUid uid, MailTeleporterComponent component, MailReci
             mailComp.Recipient = recipient.Name;
             mailComp.RecipientStation = recipient.Ship; // Frontier
 
+            // Frontier: Large mail bonus
+            MailEntityStrings mailEntityStrings = mailComp.IsLarge ? MailConstants.MailLarge : MailConstants.Mail;
+            if (mailComp.IsLarge)
+            {
+                mailComp.Bounty += component.LargeBonus;
+                mailComp.Penalty += component.LargeMalus;
+            }
+            // End Frontier
+
             if (mailComp.IsFragile)
             {
                 mailComp.Bounty += component.FragileBonus;
@@ -491,7 +501,7 @@ public void SetupMail(EntityUid uid, MailTeleporterComponent component, MailReci
 
             _appearanceSystem.SetData(uid, MailVisuals.JobIcon, recipient.JobIcon);
 
-            _metaDataSystem.SetEntityName(uid, Loc.GetString("mail-item-name-addressed",
+            _metaDataSystem.SetEntityName(uid, Loc.GetString(mailEntityStrings.NameAddressed, // Frontier: move constant to MailEntityString
                 ("recipient", recipient.Name)));
 
             var accessReader = EnsureComp<AccessReaderComponent>(uid);

Content.Server/_NF/Mail/DelayedItemComponent.cs

@@ -0,0 +1,17 @@
+namespace Content.Server.Mail
+{
+    /// <summary>
+    /// A placeholder for another entity, spawned when dropped or placed in someone's hands.
+    /// Useful for storing instant effect entities, e.g. smoke, in the mail.
+    /// </summary>
+    [RegisterComponent]
+    public sealed partial class DelayedItemComponent : Component
+    {
+        /// <summary>
+        /// The entity to replace this when opened or dropped.
+        /// </summary>
+        [ViewVariables(VVAccess.ReadWrite)]
+        [DataField("item")]
+        public string Item = "None";
+    }
+}

Content.Server/_NF/Mail/DelayedItemSystem.cs

@@ -0,0 +1,56 @@
+using Content.Shared.Damage;
+using Content.Shared.Hands;
+using Robust.Shared.Containers;
+
+namespace Content.Server.Mail
+{
+    /// <summary>
+    /// A placeholder for another entity, spawned when taken out of a container, with the placeholder deleted shortly after.
+    /// Useful for storing instant effect entities, e.g. smoke, in the mail.
+    /// </summary>
+    public sealed class DelayedItemSystem : EntitySystem
+    {
+        public override void Initialize()
+        {
+            base.Initialize();
+
+            SubscribeLocalEvent<DelayedItemComponent, DropAttemptEvent>(OnDropAttempt);
+            SubscribeLocalEvent<DelayedItemComponent, GotEquippedHandEvent>(OnHandEquipped);
+            SubscribeLocalEvent<DelayedItemComponent, DamageChangedEvent>(OnDamageChanged);
+            SubscribeLocalEvent<DelayedItemComponent, EntGotRemovedFromContainerMessage>(OnRemovedFromContainer);
+        }
+
+        /// <summary>
+        /// EntGotRemovedFromContainerMessage handler - spawn the intended entity after removed from a container.
+        /// </summary>
+        private void OnRemovedFromContainer(EntityUid uid, DelayedItemComponent component, ContainerModifiedMessage args)
+        {
+            Spawn(component.Item, Transform(uid).Coordinates);
+        }
+
+        /// <summary>
+        /// GotEquippedHandEvent handler - destroy the placeholder.
+        /// </summary>
+        private void OnHandEquipped(EntityUid uid, DelayedItemComponent component, EquippedHandEvent args)
+        {
+            EntityManager.DeleteEntity(uid);
+        }
+
+        /// <summary>
+        /// OnDropAttempt handler - destroy the placeholder.
+        /// </summary>
+        private void OnDropAttempt(EntityUid uid, DelayedItemComponent component, DropAttemptEvent args)
+        {
+            EntityManager.DeleteEntity(uid);
+        }
+
+        /// <summary>
+        /// OnDamageChanged handler - item has taken damage (e.g. inside the envelope), spawn the intended entity outside of any container and delete the placeholder.
+        /// </summary>
+        private void OnDamageChanged(EntityUid uid, DelayedItemComponent component, DamageChangedEvent args)
+        {
+            Spawn(component.Item, Transform(uid).Coordinates);
+            EntityManager.DeleteEntity(uid);
+        }
+    }
+}

Content.Server/_NF/Mail/MailConstants.cs

@@ -0,0 +1,38 @@
+namespace Content.Server.Mail
+{
+    /// <summary>
+    /// A set of localized strings related to mail entities
+    /// </summary>
+    public struct MailEntityStrings
+    {
+        public string NameAddressed;
+        public string DescClose;
+        public string DescFar;
+    }
+
+    /// <summary>
+    /// Constants related to mail.
+    /// </summary>
+    public sealed class MailConstants : EntitySystem
+    {
+        /// <summary>
+        /// Locale strings related to small parcels.
+        /// <summary>
+        public static readonly MailEntityStrings Mail = new()
+        {
+            NameAddressed = "mail-item-name-addressed",
+            DescClose = "mail-desc-close",
+            DescFar = "mail-desc-far"
+        };
+
+        /// <summary>
+        /// Locale strings related to large packages.
+        /// <summary>
+        public static readonly MailEntityStrings MailLarge = new()
+        {
+            NameAddressed = "mail-large-item-name-addressed",
+            DescClose = "mail-large-desc-close",
+            DescFar = "mail-large-desc-far"
+        };
+    }
+}

Resources/Locale/en-US/_NF/mail/mail.ftl

@@ -0,0 +1,4 @@
+mail-large-item-name-unaddressed = package
+mail-large-item-name-addressed = package ({$recipient})
+mail-large-desc-far = A large package.
+mail-large-desc-close = A large package addressed to {CAPITALIZE($name)}, {$job}. Last known location: {$station}.

Resources/Locale/en-US/nyanotrasen/mail.ftl

@@ -17,7 +17,8 @@ mail-item-name-unaddressed = mail
 mail-item-name-addressed = mail ({$recipient})
 
 command-mailto-description = Queue a parcel to be delivered to an entity. Example usage: `mailto 1234 5678 false false`. The target container's contents will be transferred to an actual mail parcel.
-command-mailto-help = Usage: {$command} <recipient entityUid> <container entityUid> [is-fragile: true or false] [is-priority: true or false]
+# Frontier: add is-large description
+command-mailto-help = Usage: {$command} <recipient entityUid> <container entityUid> [is-fragile: true or false] [is-priority: true or false] [is-large: true or false, optional]
 command-mailto-no-mailreceiver = Target recipient entity does not have a {$requiredComponent}.
 command-mailto-no-blankmail = The {$blankMail} prototype doesn't exist. Something is very wrong. Contact a programmer.
 command-mailto-bogus-mail = {$blankMail} did not have {$requiredMailComponent}. Something is very wrong. Contact a programmer.
@@ -29,3 +30,8 @@ command-mailto-success = Success! Mail parcel has been queued for next teleport
 command-mailnow = Force all mail teleporters to deliver another round of mail as soon as possible. This will not bypass the undelivered mail limit.
 command-mailnow-help = Usage: {$command}
 command-mailnow-success = Success! All mail teleporters will be delivering another round of mail soon.
+
+# Frontier: mailtestbulk
+command-mailtestbulk = Sends one of each type of parcel to a given mail teleporter.  Implicitly calls mailnow.
+command-mailtestbulk-help = Usage: {$command} <teleporter_id>
+command-mailtestbulk-success = Success! All mail teleporters will be delivering another round of mail soon.

Resources/Prototypes/Nyanotrasen/mailDeliveries.yml

@@ -1,3 +1,4 @@
+# Frontier: no longer used, look for RandomNFMailDeliveryPool
 - type: mailDeliveryPool
   id: RandomMailDeliveryPool
   everyone:

Resources/Prototypes/_NF/Entities/Clothing/Eyes/hud.yml

@@ -20,6 +20,7 @@
     sprite: _NF/Clothing/Eyes/Hud/mail.rsi
   - type: Clothing
     sprite: _NF/Clothing/Eyes/Hud/mail.rsi
+  - type: ShowJobIcons
 
 - type: entity
   parent: [ClothingEyesHudMedical, ClothingEyesHudNfsd]

Resources/Prototypes/_NF/Entities/Objects/Fun/toys.yml

@@ -498,3 +498,31 @@
   - type: Sprite
     sprite: _NF/Objects/Fun/catplushie.rsi
     state: white
+
+# Rubber Throngler.
+# Essentially a rubber hammer but with explosion noises and RSI
+- type: entity
+  name: The Throngler
+  parent: BaseItem
+  id: ThronglerToy
+  suffix: Toy
+  description: Why would you make this?
+  components:
+    - type: Sprite
+      sprite: Objects/Weapons/Melee/Throngler2.rsi
+      state: icon
+    - type: StaminaDamageOnHit
+      damage: 0.8
+    - type: Appearance
+    - type: DisarmMalus
+      malus: 0
+    - type: MeleeWeapon
+      wideAnimationRotation: -135
+      attackRate: 10
+      damage:
+        types:
+          Blunt: 0
+      soundHit:
+        path: /Audio/Effects/explosion_small1.ogg
+      soundNoDamage:
+        path: /Audio/Effects/explosion_small1.ogg