Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Downstream Port #1509

Merged
merged 15 commits into from
Jan 17, 2025
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix heirloom flickering bad moods.
sleepyyapril committed Jan 14, 2025
commit 897ef63d0f5545ebf2d3e89e287ac27f2e73bd99
11 changes: 7 additions & 4 deletions Content.Server/Traits/Assorted/HeirloomSystem.cs
Original file line number Diff line number Diff line change
@@ -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)
5 changes: 5 additions & 0 deletions Resources/Prototypes/Mood/genericNegativeEffects.yml
Original file line number Diff line number Diff line change
@@ -54,3 +54,8 @@
id: HeirloomLost
moodChange: -15
category: Heirloom

- type: moodEffect
id: HeirloomNeutral
moodChange: -5
category: Heirloom
2 changes: 1 addition & 1 deletion Resources/Prototypes/Mood/genericPositiveEffects.yml
Original file line number Diff line number Diff line change
@@ -51,4 +51,4 @@
category: Heirloom
moodChange: 5
timeout: 60 # A bit of time before they realize it's gone
moodletOnEnd: HeirloomLost
moodletOnEnd: HeirloomNeutral