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

More dictionary clearing

Browse Source
This commit is contained in:
Nick 2022-07-05 22:03:40 -04:00
parent db72529e3a
commit 6c1a7c6f12
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
NewHorizons/Builder/Props/BrambleNodeBuilder.cs
View File

@ -1,4 +1,4 @@
using HarmonyLib; using HarmonyLib;
using NewHorizons.Builder.Body; using NewHorizons.Builder.Body;
using NewHorizons.External.Configs; using NewHorizons.External.Configs;
using NewHorizons.Handlers; using NewHorizons.Handlers;
@ -26,30 +26,37 @@ namespace NewHorizons.Builder.Props
// keys are all dimension names that have been referenced by at least one node but do not (yet) exist // keys are all dimension names that have been referenced by at least one node but do not (yet) exist
// values are all nodes' warp controllers that link to a given dimension // values are all nodes' warp controllers that link to a given dimension
// unpairedNodes[name of dimension that doesn't exist yet] => List{warp controller for node that links to that dimension, ...} // unpairedNodes[name of dimension that doesn't exist yet] => List{warp controller for node that links to that dimension, ...}
private static Dictionary<string, List<InnerFogWarpVolume>> unpairedNodes = new(); private static Dictionary<string, List<InnerFogWarpVolume>> _unpairedNodes = new();
private static Dictionary<string, List<SignalInfo>> _propogatedSignals = null;
public static Dictionary<string, InnerFogWarpVolume> namedNodes = new(); public static readonly Dictionary<string, InnerFogWarpVolume> namedNodes = new();
public static Dictionary<BrambleNodeInfo, GameObject> builtBrambleNodes = new(); public static readonly Dictionary<BrambleNodeInfo, GameObject> builtBrambleNodes = new();
public static Dictionary<string, List<SignalInfo>> propogatedSignals = null; public static void Init()
{
_unpairedNodes.Clear();
_propogatedSignals.Clear();
namedNodes.Clear();
builtBrambleNodes.Clear();
}
public static void FinishPairingNodesForDimension(string dimensionName, AstroObject dimensionAO = null) public static void FinishPairingNodesForDimension(string dimensionName, AstroObject dimensionAO = null)
{ {
if (!unpairedNodes.ContainsKey(dimensionName)) return; if (!_unpairedNodes.ContainsKey(dimensionName)) return;
foreach (var nodeWarpController in unpairedNodes[dimensionName]) foreach (var nodeWarpController in _unpairedNodes[dimensionName])
{ {
PairEntrance(nodeWarpController, dimensionName, dimensionAO); PairEntrance(nodeWarpController, dimensionName, dimensionAO);
} }
unpairedNodes.Remove(dimensionName); _unpairedNodes.Remove(dimensionName);
} }
private static void RecordUnpairedNode(InnerFogWarpVolume warpVolume, string linksTo) private static void RecordUnpairedNode(InnerFogWarpVolume warpVolume, string linksTo)
{ {
if (!unpairedNodes.ContainsKey(linksTo)) unpairedNodes[linksTo] = new(); if (!_unpairedNodes.ContainsKey(linksTo)) _unpairedNodes[linksTo] = new();
unpairedNodes[linksTo].Add(warpVolume); _unpairedNodes[linksTo].Add(warpVolume);
} }
private static OuterFogWarpVolume GetOuterFogWarpVolumeFromAstroObject(GameObject go) private static OuterFogWarpVolume GetOuterFogWarpVolumeFromAstroObject(GameObject go)
@ -111,10 +118,10 @@ namespace NewHorizons.Builder.Props
// this dictionary lists all the signals a given node should have, depending on the dimension it links to // this dictionary lists all the signals a given node should have, depending on the dimension it links to
// ie, if a node links to "dimension1", then that node should spawn all of the signals in the list propogatedSignals["dimension1"] // ie, if a node links to "dimension1", then that node should spawn all of the signals in the list propogatedSignals["dimension1"]
propogatedSignals = new Dictionary<string, List<SignalInfo>>(); _propogatedSignals = new Dictionary<string, List<SignalInfo>>();
foreach (var dimension in allDimensions) foreach (var dimension in allDimensions)
{ {
propogatedSignals[dimension.name] = new(); _propogatedSignals[dimension.name] = new();
var dimensionIndex = dimensionNameToIndex[dimension.name]; var dimensionIndex = dimensionNameToIndex[dimension.name];
foreach (var destinationDimension in allDimensions) foreach (var destinationDimension in allDimensions)
@ -124,7 +131,7 @@ namespace NewHorizons.Builder.Props
var destinationIndex = dimensionNameToIndex[destinationDimension.name]; var destinationIndex = dimensionNameToIndex[destinationDimension.name];
if (access[dimensionIndex, destinationIndex]) if (access[dimensionIndex, destinationIndex])
{ {
propogatedSignals[dimension.name].AddRange(destinationDimension.Signal.signals); _propogatedSignals[dimension.name].AddRange(destinationDimension.Signal.signals);
} }
} }
} }
@ -205,8 +212,8 @@ namespace NewHorizons.Builder.Props
// //
// Make signals // Make signals
// //
if (propogatedSignals == null) PropogateSignals(); if (_propogatedSignals == null) PropogateSignals();
foreach (var signalConfig in propogatedSignals[config.linksTo]) foreach (var signalConfig in _propogatedSignals[config.linksTo])
{ {
var signalGO = SignalBuilder.Make(go, sector, signalConfig, mod); var signalGO = SignalBuilder.Make(go, sector, signalConfig, mod);
signalGO.GetComponent<AudioSignal>()._identificationDistance = 0; signalGO.GetComponent<AudioSignal>()._identificationDistance = 0;

1
NewHorizons/Main.cs
View File

@ -271,6 +271,7 @@ namespace NewHorizons
NewHorizonsData.Load(); NewHorizonsData.Load();
SignalBuilder.Init(); SignalBuilder.Init();
BrambleDimensionBuilder.Init(); BrambleDimensionBuilder.Init();
BrambleNodeBuilder.Init();
AstroObjectLocator.Init(); AstroObjectLocator.Init();
OWAssetHandler.Init(); OWAssetHandler.Init();
PlanetCreationHandler.Init(BodyDict[CurrentStarSystem]); PlanetCreationHandler.Init(BodyDict[CurrentStarSystem]);