Gittes-archive/new-horizons
2
0
Fork 0
mirror of https://github.com/Outer-Wilds-New-Horizons/new-horizons.git synced 2025-12-11 20:15:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Actually merge extras

Browse Source
This commit is contained in:
xen-42 2024-08-05 16:15:46 -04:00
parent fdbb57d491
commit e25844da38
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
NewHorizons/External/Configs/StarSystemConfig.cs vendored
View File

@ -1,9 +1,11 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using NewHorizons.External.Modules;
using NewHorizons.External.SerializableData;
using NewHorizons.Utility.OWML;
using Newtonsoft.Json;
using static NewHorizons.External.Modules.ShipLogModule;
@ -361,6 +363,21 @@ namespace NewHorizons.External.Configs
entryPositions = Concatenate(entryPositions, otherConfig.entryPositions);
curiosities = Concatenate(curiosities, otherConfig.curiosities);
initialReveal = Concatenate(initialReveal, otherConfig.initialReveal);
if (extras == null) extras = otherConfig.extras;
else if (otherConfig.extras != null)
{
try
{
var extrasDict = extras as Dictionary<string, object>;
var newExtrasDict = otherConfig.extras as Dictionary<string, object>;
extras = extrasDict.Concat(newExtrasDict).ToDictionary(x => x.Key, x => x.Value);
}
catch (Exception ex)
{
NHLogger.LogError($"Couldn't merge extras on system - {ex}");
}
}
}
private T[] Concatenate<T>(T[] array1, T[] array2)