weighted announcers

Content.Server/Announcements/Systems/AnnouncerSystem.Announcer.cs

@@ -2,7 +2,8 @@
 using Content.Shared.GameTicking;
 using Content.Shared.Announcements.Prototypes;
 using Content.Shared.CCVar;
-using Robust.Shared.Random;
+using Content.Shared.Random;
+using Content.Shared.Random.Helpers;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Announcements.Systems;
@@ -25,9 +26,14 @@ private void OnRoundRestarting(RoundRestartCleanupEvent ev)
     /// <remarks>Probably not very useful for any other system</remarks>
     public AnnouncerPrototype PickAnnouncer()
     {
-        return _random.Pick(_proto.EnumeratePrototypes<AnnouncerPrototype>()
-            .Where(x => !_config.GetCVar(CCVars.AnnouncerBlacklist).Contains(x.ID))
-            .ToArray());
+        var list = _proto.Index<WeightedRandomPrototype>(_config.GetCVar(CCVars.AnnouncerList));
+        var modWeights = list.Weights.Where(a => !_config.GetCVar(CCVars.AnnouncerBlacklist).Contains(a.Key));
+
+        list = new WeightedRandomPrototype();
+        foreach (var (key, value) in modWeights)
+            list.Weights.Add(key, value);
+
+        return _proto.Index<AnnouncerPrototype>(list.Pick());
     }
 
 
@@ -38,7 +44,7 @@ public AnnouncerPrototype PickAnnouncer()
     public void SetAnnouncer(string announcerId)
     {
         if (!_proto.TryIndex<AnnouncerPrototype>(announcerId, out var announcer))
-            DebugTools.Assert("Set announcer does not exist, attempting to use previously set one.");
+            DebugTools.Assert($"Set announcer {announcerId} does not exist, attempting to use previously set one.");
         else
             Announcer = announcer;
     }

Content.Server/Announcements/Systems/AnnouncerSystem.cs

@@ -5,14 +5,12 @@
 using Content.Shared.CCVar;
 using Robust.Shared.Configuration;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
 
 namespace Content.Server.Announcements.Systems;
 
 public sealed partial class AnnouncerSystem : SharedAnnouncerSystem
 {
     [Dependency] private readonly IConfigurationManager _config = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly IPrototypeManager _proto = default!;
     [Dependency] private readonly ChatSystem _chat = default!;
 

Content.Shared/CCVar/CCVars.cs

@@ -392,6 +392,12 @@ public static readonly CVarDef<bool>
          * Announcers
          */
 
+        /// <summary>
+        ///     Weighted list of announcers to choose from
+        /// </summary>
+        public static readonly CVarDef<string> AnnouncerList =
+            CVarDef.Create("announcer.list", "RandomAnnouncers", CVar.SERVERONLY | CVar.REPLICATED);
+
         /// <summary>
         ///     Optionally force set an announcer
         /// </summary>

Resources/Prototypes/Announcers/!randomAnnouncers.yml

@@ -0,0 +1,8 @@
+- type: weightedRandom
+  id: RandomAnnouncers
+  weights:
+    Intern: 0.15
+    MedBot: 0.5
+    Michael: 0.9
+    NEIL: 1
+    VoxFem: 0.55