Gamerule Entities (#15513)

Content.Server/GameTicking/Rules/SecretRuleSystem.cs

@@ -1,6 +1,5 @@
-using System.Linq;
 using Content.Server.GameTicking.Presets;
-using Content.Server.GameTicking.Rules.Configurations;
+using Content.Server.GameTicking.Rules.Components;
 using Content.Shared.Random;
 using Content.Shared.Random.Helpers;
 using Robust.Shared.Prototypes;
@@ -8,25 +7,28 @@ using Robust.Shared.Random;
 
 namespace Content.Server.GameTicking.Rules;
 
-public sealed class SecretRuleSystem : GameRuleSystem
+public sealed class SecretRuleSystem : GameRuleSystem<SecretRuleComponent>
 {
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly GameTicker _ticker = default!;
 
-    public override string Prototype => "Secret";
-
-    public override void Started()
+    protected override void Started(EntityUid uid, SecretRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
     {
-        PickRule();
+        base.Started(uid, component, gameRule, args);
+        PickRule(component);
     }
 
-    public override void Ended()
+    protected override void Ended(EntityUid uid, SecretRuleComponent component, GameRuleComponent gameRule, GameRuleEndedEvent args)
     {
-        // Preset should already handle it.
+        base.Ended(uid, component, gameRule, args);
+
+        foreach (var rule in component.AdditionalGameRules)
+        {
+            GameTicker.EndGameRule(rule);
+        }
     }
 
-    private void PickRule()
+    private void PickRule(SecretRuleComponent component)
     {
         // TODO: This doesn't consider what can't start due to minimum player count, but currently there's no way to know anyway.
         // as they use cvars.
@@ -35,7 +37,8 @@ public sealed class SecretRuleSystem : GameRuleSystem
 
         foreach (var rule in _prototypeManager.Index<GamePresetPrototype>(preset).Rules)
         {
-            _ticker.StartGameRule(_prototypeManager.Index<GameRulePrototype>(rule));
+            GameTicker.StartGameRule(rule, out var ruleEnt);
+            component.AdditionalGameRules.Add(ruleEnt);
         }
     }
 }