Fix heirloom flickering bad moods.

Simple-Station · Jan 14, 2025 · 897ef63 · 897ef63
1 parent cd4e99b
commit 897ef63
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/Content.Server/Traits/Assorted/HeirloomSystem.cs b/Content.Server/Traits/Assorted/HeirloomSystem.cs
@@ -31,15 +31,18 @@ public override void Update(float frameTime)
         while (query.MoveNext(out var uid, out var comp))
         {
             var children = RecursiveGetAllChildren(uid);
-            if (!children.Any(c => c == comp.Heirloom))
-                continue;
-            var ev = new MoodEffectEvent(comp.Moodlet);
+            var moodlet = comp.Moodlet;
+
+            if (children.Any(c => c != comp.Heirloom))
+                moodlet = "HeirloomLost";
+
+            var ev = new MoodEffectEvent(moodlet);
             RaiseLocalEvent(uid, ev);
         }
 
         query.Dispose();
 
-        _nextUpdate = _gameTiming.CurTime + TimeSpan.FromSeconds(10);
+        _nextUpdate = _gameTiming.CurTime + TimeSpan.FromSeconds(30);
     }
 
     private IEnumerable<EntityUid> RecursiveGetAllChildren(EntityUid uid)

diff --git a/Resources/Prototypes/Mood/genericNegativeEffects.yml b/Resources/Prototypes/Mood/genericNegativeEffects.yml
@@ -54,3 +54,8 @@
   id: HeirloomLost
   moodChange: -15
   category: Heirloom
+
+- type: moodEffect
+  id: HeirloomNeutral
+  moodChange: -5
+  category: Heirloom
diff --git a/Resources/Prototypes/Mood/genericPositiveEffects.yml b/Resources/Prototypes/Mood/genericPositiveEffects.yml
@@ -51,4 +51,4 @@
   category: Heirloom
   moodChange: 5
   timeout: 60 # A bit of time before they realize it's gone
-  moodletOnEnd: HeirloomLost
+  moodletOnEnd: HeirloomNeutral