Re-enable MAIL

Content.Server/_DV/Mail/EntitySystems/MailSystem.cs

@@ -7,7 +7,6 @@
 using Content.Server.Destructible.Thresholds.Triggers;
 using Content.Server.Destructible.Thresholds;
 using Content.Server.Destructible;
-using Content.Server.Mind;
 using Content.Server.Popups;
 using Content.Server.Spawners.EntitySystems;
 using Content.Server.Station.Systems;
@@ -64,7 +63,6 @@ public sealed class MailSystem : EntitySystem
         [Dependency] private readonly IRobustRandom _random = default!;
         [Dependency] private readonly IdCardSystem _idCardSystem = default!;
         [Dependency] private readonly MetaDataSystem _metaDataSystem = default!;
-        // [Dependency] private readonly MindSystem _mindSystem = default!; // Frontier: warning suppression
         [Dependency] private readonly OpenableSystem _openable = default!;
         [Dependency] private readonly PopupSystem _popupSystem = default!;
         [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!;
@@ -85,6 +83,8 @@ public sealed class MailSystem : EntitySystem
         private static readonly ProtoId<TagPrototype> MailTag = "Mail"; // Frontier
         private static readonly ProtoId<TagPrototype> TrashTag = "Trash"; // Frontier
         private static readonly ProtoId<TagPrototype> RecyclableTag = "Recyclable"; // Frontier
+        private bool _loggedNoValidTeleporters; // HardLight
+        private bool _loggedNoCandidates; // HardLight
 
         public override void Initialize()
         {
@@ -461,6 +461,34 @@ private bool TryMatchJobTitleToPrototype(string jobTitle, [NotNullWhen(true)] ou
             return jobPrototype != null;
         }
 
+        // HardLight start
+        private static void MergeParcelWeights(Dictionary<string, float> target, IReadOnlyDictionary<string, float> source)
+        {
+            foreach (var (key, value) in source)
+            {
+                target[key] = value;
+            }
+        }
+
+        private void LogNoValidTeleportersOnce()
+        {
+            if (_loggedNoValidTeleporters)
+                return;
+
+            _loggedNoValidTeleporters = true;
+            _sawmill.Info("List of valid mail teleporters was empty!");
+        }
+
+        private void LogNoCandidatesOnce()
+        {
+            if (_loggedNoCandidates)
+                return;
+
+            _loggedNoCandidates = true;
+            _sawmill.Info("List of mail candidates was empty!");
+        }
+        // HardLight end
+
         /// <summary>
         /// Handle all the gritty details particular to a new mail entity.
         /// </summary>
@@ -554,29 +582,27 @@ public void SetupMail(EntityUid uid, SectorMailComponent component, MailRecipien
         }
 
         /// <summary>
-        /// Return the parcels waiting for delivery.
+        /// Return how many parcels are waiting for delivery on this teleporter's tile. // HardLight: Rephrased
         /// </summary>
-        /// <param name="uid">The mail teleporter to check.</param>
-        private List<EntityUid> GetUndeliveredParcels(EntityUid uid)
+        private uint GetUndeliveredParcelCount(EntityUid uid) // HardLight
         {
             // An alternative solution would be to keep a list of the unopened
             // parcels spawned by the teleporter and see if they're not carried
             // by someone, but this is simple, and simple is good.
             var coordinates = Transform(uid).Coordinates;
             const LookupFlags lookupFlags = LookupFlags.Dynamic | LookupFlags.Sundries;
-
             var entitiesInTile = _lookup.GetEntitiesIntersecting(coordinates, lookupFlags);
 
-            return entitiesInTile.Where(HasComp<MailComponent>).ToList();
-        }
+            // HardLight start
+            uint count = 0;
+            foreach (var entity in entitiesInTile)
+            {
+                if (HasComp<MailComponent>(entity))
+                    count++;
+            }
 
-        /// <summary>
-        /// Return how many parcels are waiting for delivery.
-        /// </summary>
-        /// <param name="uid">The mail teleporter to check.</param>
-        private uint GetUndeliveredParcelCount(EntityUid uid)
-        {
-            return (uint)GetUndeliveredParcels(uid).Count;
+            return count;
+            // HardLight end
         }
 
         /// <summary>
@@ -642,7 +668,6 @@ public bool TryGetMailRecipientForReceiver(EntityUid receiverUid, [NotNullWhen(t
                 // End Frontier
 
                 var accessTags = access.Tags;
-                //var mayReceivePriorityMail = !(_mindSystem.GetMind(receiverUid) == null);
 
                 recipient = new MailRecipient(
                     idCard.Comp.FullName,
@@ -665,25 +690,12 @@ private List<MailRecipient> GetMailRecipientCandidates() // Frontier: remove Ent
         {
             var candidateList = new List<MailRecipient>();
             var query = EntityQueryEnumerator<MailReceiverComponent>();
-            //var teleporterStation = _stationSystem.GetOwningStation(uid); // Frontier: unnecessary
 
             while (query.MoveNext(out var receiverUid, out _))
             {
-                var location = Transform(receiverUid);
-
-                // Frontier: sector-wide mail
-                // var receiverStation = _stationSystem.GetOwningStation(receiverUid);
-                // if (receiverStation != teleporterStation)
-                //     continue;
-
-                // Are you on expedition or in FTL? No mail for you.
-                if (location.MapID != Transform(receiverUid).MapID)
-                    continue;
-
                 // Is this player displaying as SSD? If so, skip 'em.
                 if (TryComp(receiverUid, out SSDIndicatorComponent? ssd) && ssd.IsSSD)
                     continue;
-                // End Frontier
 
                 // Skip ghosts and adminghosts
                 if (HasComp<GhostComponent>(receiverUid) || HasComp<GhostRoleComponent>(receiverUid))
@@ -723,17 +735,19 @@ private void SpawnMail(SectorMailComponent component)
             // If list of teleporters is empty, return.
             if (validTeleporters.Count <= 0)
             {
-                _sawmill.Info("List of valid mail teleporters was empty!");
+                LogNoValidTeleportersOnce(); // HardLight
                 return;
             }
+            _loggedNoValidTeleporters = false; // HardLight
 
             var candidateList = GetMailRecipientCandidates();
 
             if (candidateList.Count <= 0)
             {
-                _sawmill.Info("List of mail candidates was empty!");
+                LogNoCandidatesOnce(); // HardLight
                 return;
             }
+            _loggedNoCandidates = false; // HardLight
 
             if (!_prototypeManager.TryIndex<MailDeliveryPoolPrototype>(component.MailPool, out var pool))
             {
@@ -742,28 +756,33 @@ private void SpawnMail(SectorMailComponent component)
             }
 
             var deliveryCount = component.MinimumDeliveriesPerTeleport + candidateList.Count / component.CandidatesPerDelivery;
+            var remainingCandidates = new List<MailRecipient>(candidateList); // HardLight
+            _random.Shuffle(remainingCandidates); // HardLight
 
             for (var i = 0; i < deliveryCount; i++)
             {
-                var candidate = _random.Pick(candidateList);
+                // HardLight start
+                if (remainingCandidates.Count == 0)
+                {
+                    remainingCandidates = new List<MailRecipient>(candidateList);
+                    _random.Shuffle(remainingCandidates);
+                }
+
+                var candidate = remainingCandidates[^1];
+                remainingCandidates.RemoveAt(remainingCandidates.Count - 1);
+                // HardLight end
                 var possibleParcels = new Dictionary<string, float>(pool.Everyone);
 
                 if (TryMatchJobTitleToPrototype(candidate.Job, out var jobPrototype)
                     && pool.Jobs.TryGetValue(jobPrototype.ID, out var jobParcels))
                 {
-                    possibleParcels = possibleParcels
-                        .Concat(jobParcels)
-                        .GroupBy(g => g.Key)
-                        .ToDictionary(pair => pair.Key, pair => pair.First().Value);
+                    MergeParcelWeights(possibleParcels, jobParcels); // HardLight
                 }
 
                 if (TryMatchJobTitleToDepartment(candidate.Job, out var department)
                     && pool.Departments.TryGetValue(department, out var departmentParcels))
                 {
-                    possibleParcels = possibleParcels
-                        .Concat(departmentParcels)
-                        .GroupBy(g => g.Key)
-                        .ToDictionary(pair => pair.Key, pair => pair.First().Value);
+                    MergeParcelWeights(possibleParcels, departmentParcels); // HardLight
                 }
 
                 var accumulated = 0f;

Content.Server/_DV/Mail/MailCommands.cs

@@ -111,7 +111,7 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args)
             return;
         }
 
-        if (!mailSystem.TryGetMailTeleporterForReceiver(recipientUid, out var teleporterComponent, out var teleporterUid))
+        if (!mailSystem.TryGetMailTeleporterForReceiver(recipientUid, out _, out var teleporterUid)) // HardLight: var teleporterComponent<_
         {
             shell.WriteLine(Loc.GetString("command-mailto-no-teleporter-found"));
             return;
@@ -183,7 +183,7 @@ public sealed class MailNowCommand : IConsoleCommand
     [Dependency] private readonly IEntityManager _entityManager = default!;
     [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!; // Frontier
 
-    public async void Execute(IConsoleShell shell, string argStr, string[] args)
+    public void Execute(IConsoleShell shell, string argStr, string[] args) // HardLight: Removed async
     {
         var sectorService = _entitySystemManager.GetEntitySystem<SectorServiceSystem>();
         // Frontier: sector-wide mail

Resources/Prototypes/_NF/SectorServices/services.yml

@@ -7,6 +7,7 @@
   id: Mail
   components:
   - type: SectorLogisticStats
+  - type: SectorMail # Contains sector-wide mail parameters
 
 - type: sectorService
   id: ShuttleRecords