mirror of
https://github.com/Outer-Wilds-New-Horizons/new-horizons.git
synced 2025-12-11 20:15:44 +01:00
Handle merging conditionals lists in config
This commit is contained in:
parent
27ff63d400
commit
25f36dcbb7
@ -389,6 +389,15 @@ namespace NewHorizons.External.Configs
|
|||||||
GlobalMusic ??= otherConfig.GlobalMusic;
|
GlobalMusic ??= otherConfig.GlobalMusic;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (conditionalChecks != null && otherConfig.conditionalChecks != null)
|
||||||
|
{
|
||||||
|
conditionalChecks = Concatenate(conditionalChecks, otherConfig.conditionalChecks);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
conditionalChecks ??= otherConfig.conditionalChecks;
|
||||||
|
}
|
||||||
|
|
||||||
entryPositions = Concatenate(entryPositions, otherConfig.entryPositions);
|
entryPositions = Concatenate(entryPositions, otherConfig.entryPositions);
|
||||||
curiosities = Concatenate(curiosities, otherConfig.curiosities);
|
curiosities = Concatenate(curiosities, otherConfig.curiosities);
|
||||||
initialReveal = Concatenate(initialReveal, otherConfig.initialReveal);
|
initialReveal = Concatenate(initialReveal, otherConfig.initialReveal);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user