Fixed (?) event spam (SerbiaStrong-220#1870)

Surani1 · Sep 15, 2024 · 408b94f · 408b94f
1 parent 0e3c5d9
commit 408b94f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs b/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs
@@ -24,9 +24,6 @@ public sealed class BasicStationEventSchedulerSystem : GameRuleSystem<BasicStati
         [Dependency] private readonly IRobustRandom _random = default!;
         [Dependency] private readonly EventManagerSystem _event = default!;
 
-        public const float MinEventTime = 60 * 8; //SS220 Event_spawn_decrease
-        public const float MaxEventTime = 60 * 15; //SS220 Event_spawn_decrease
-
         protected override void Started(EntityUid uid, BasicStationEventSchedulerComponent component, GameRuleComponent gameRule,
             GameRuleStartedEvent args)
         {

diff --git a/Content.Server/StationEvents/Components/BasicStationEventSchedulerComponent.cs b/Content.Server/StationEvents/Components/BasicStationEventSchedulerComponent.cs
@@ -11,13 +11,13 @@ public sealed partial class BasicStationEventSchedulerComponent : Component
     /// How long the the scheduler waits to begin starting rules.
     /// </summary>
     [DataField]
-    public float MinimumTimeUntilFirstEvent = 200;
+    public float MinimumTimeUntilFirstEvent = 300f; //SS220 Event_spawn_decrease
 
     /// <summary>
     /// The minimum and maximum time between rule starts in seconds.
     /// </summary>
     [DataField]
-    public MinMax MinMaxEventTiming = new(3 * 60, 10 * 60);
+    public MinMax MinMaxEventTiming = new(60 * 8, 60 * 15); //SS220 Event_spawn_decrease
 
     /// <summary>
     /// How long until the next check for an event runs, is initially set based on MinimumTimeUntilFirstEvent & MinMaxEventTiming.

diff --git a/Content.Server/StationEvents/EventManagerSystem.cs b/Content.Server/StationEvents/EventManagerSystem.cs
@@ -45,6 +45,7 @@ public void RunRandomEvent()
             Log.Error(errStr);
             return;
         }
+        // SS220 Проверка на отключенные случаные события в текущем пресете
 
         var randomEvent = PickRandomEvent();
 
@@ -63,6 +64,15 @@ public void RunRandomEvent()
     /// </summary>
     public void RunRandomEvent(EntityTableSelector limitedEventsTable)
     {
+        // SS220 Проверка на отключенные случаные события в текущем пресете
+        if (GameTicker.CurrentPreset != null && GameTicker.CurrentPreset.DisableRandomEvents)
+        {
+            var errStr = Loc.GetString("station-event-system-run-random-event-disablerandevents");
+            Log.Error(errStr);
+            return;
+        }
+        // SS220 Проверка на отключенные случаные события в текущем пресете
+
         if (!TryBuildLimitedEvents(limitedEventsTable, out var limitedEvents))
         {
             Log.Warning("Provided event table could not build dict!");