oracle wrong item message cooldown (#885)

no more oracle spam
DeltaV-Station · Feb 22, 2024 · b9dd5ed · b9dd5ed
1 parent 4639342
commit b9dd5ed
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/Content.Server/Nyanotrasen/Research/Oracle/OracleComponent.cs b/Content.Server/Nyanotrasen/Research/Oracle/OracleComponent.cs
@@ -23,6 +23,12 @@ public sealed partial class OracleComponent : Component
     [DataField("barkTime")]
     public TimeSpan BarkTime = TimeSpan.FromMinutes(1);
 
+    [DataField("rejectAccumulator")]
+    public float RejectAccumulator;
+
+    [DataField("rejectTime")]
+    public TimeSpan RejectTime = TimeSpan.FromSeconds(5);
+
     [ViewVariables(VVAccess.ReadWrite)]
     public EntityPrototype DesiredPrototype = default!;
 

diff --git a/Content.Server/Nyanotrasen/Research/Oracle/OracleSystem.cs b/Content.Server/Nyanotrasen/Research/Oracle/OracleSystem.cs
@@ -38,6 +38,7 @@ public override void Update(float frameTime)
         {
             oracle.Accumulator += frameTime;
             oracle.BarkAccumulator += frameTime;
+            oracle.RejectAccumulator += frameTime;
             if (oracle.BarkAccumulator >= oracle.BarkTime.TotalSeconds)
             {
                 oracle.BarkAccumulator = 0;
@@ -120,8 +121,12 @@ private void OnInteractUsing(EntityUid uid, OracleComponent component, InteractU
 
         if (!validItem)
         {
-            if (!HasComp<RefillableSolutionComponent>(args.Used))
+            if (!HasComp<RefillableSolutionComponent>(args.Used) &&
+                component.RejectAccumulator >= component.RejectTime.TotalSeconds)
+            {
+                component.RejectAccumulator = 0;
                 _chat.TrySendInGameICMessage(uid, _random.Pick(component.RejectMessages), InGameICChatType.Speak, true);
+            }
             return;
         }
 
@@ -186,6 +191,7 @@ private void NextItem(OracleComponent component)
     {
         component.Accumulator = 0;
         component.BarkAccumulator = 0;
+        component.RejectAccumulator = 0;
         var protoString = GetDesiredItem(component);
         if (_prototypeManager.TryIndex<EntityPrototype>(protoString, out var proto))
             component.DesiredPrototype = proto;