Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix possible error in artifact node generation (#13231)

Browse Source
This commit is contained in:
Nemanja
2022-12-30 12:03:16 -05:00
committed by GitHub
parent e8126e5ebc
commit 0a1485a99d
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.Nodes.cs
View File

@@ -81,29 +81,28 @@ public sealed partial class ArtifactSystem
private ArtifactTriggerPrototype GetRandomTrigger(EntityUid artifact, ref ArtifactNode node) private ArtifactTriggerPrototype GetRandomTrigger(EntityUid artifact, ref ArtifactNode node)
{ {
var allTriggers = _prototype.EnumeratePrototypes<ArtifactTriggerPrototype>().ToList(); var allTriggers = _prototype.EnumeratePrototypes<ArtifactTriggerPrototype>()
.Where(x => (x.Whitelist?.IsValid(artifact, EntityManager) ?? true) && (!x.Blacklist?.IsValid(artifact, EntityManager) ?? true)).ToList();
var validDepth = allTriggers.Select(x => x.TargetDepth).Distinct().ToList(); var validDepth = allTriggers.Select(x => x.TargetDepth).Distinct().ToList();
var weights = GetDepthWeights(validDepth, node.Depth); var weights = GetDepthWeights(validDepth, node.Depth);
var selectedRandomTargetDepth = GetRandomTargetDepth(weights); var selectedRandomTargetDepth = GetRandomTargetDepth(weights);
var targetTriggers = allTriggers var targetTriggers = allTriggers
.Where(x => x.TargetDepth == selectedRandomTargetDepth) .Where(x => x.TargetDepth == selectedRandomTargetDepth).ToList();
.Where(x => (x.Whitelist?.IsValid(artifact, EntityManager) ?? true) && (!x.Blacklist?.IsValid(artifact, EntityManager) ?? true)).ToList();
return _random.Pick(targetTriggers); return _random.Pick(targetTriggers);
} }
private ArtifactEffectPrototype GetRandomEffect(EntityUid artifact, ref ArtifactNode node) private ArtifactEffectPrototype GetRandomEffect(EntityUid artifact, ref ArtifactNode node)
{ {
var allEffects = _prototype.EnumeratePrototypes<ArtifactEffectPrototype>().ToList(); var allEffects = _prototype.EnumeratePrototypes<ArtifactEffectPrototype>()
.Where(x => (x.Whitelist?.IsValid(artifact, EntityManager) ?? true) && (!x.Blacklist?.IsValid(artifact, EntityManager) ?? true)).ToList();
var validDepth = allEffects.Select(x => x.TargetDepth).Distinct().ToList(); var validDepth = allEffects.Select(x => x.TargetDepth).Distinct().ToList();
var weights = GetDepthWeights(validDepth, node.Depth); var weights = GetDepthWeights(validDepth, node.Depth);
var selectedRandomTargetDepth = GetRandomTargetDepth(weights); var selectedRandomTargetDepth = GetRandomTargetDepth(weights);
var targetEffects = allEffects var targetEffects = allEffects
.Where(x => x.TargetDepth == selectedRandomTargetDepth) .Where(x => x.TargetDepth == selectedRandomTargetDepth).ToList();
.Where(x => (x.Whitelist?.IsValid(artifact, EntityManager) ?? true) && (!x.Blacklist?.IsValid(artifact, EntityManager) ?? true)).ToList();
return _random.Pick(targetEffects); return _random.Pick(targetEffects);
} }