mirror of
https://github.com/Outer-Wilds-New-Horizons/new-horizons.git
synced 2025-12-11 20:15:44 +01:00
Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
04888b1be7
@ -163,12 +163,9 @@ namespace NewHorizons.Builder.Props
|
||||
nodeWarp._linkedOuterWarpVolume = destination;
|
||||
destination.RegisterSenderWarp(nodeWarp);
|
||||
|
||||
var fogLight = nodeWarp.GetComponent<FogLight>();
|
||||
fogLight._linkedSector = destinationAO._rootSector;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
// DB_EscapePodDimension_Body/Sector_EscapePodDimension/Interactables_EscapePodDimension/InnerWarp_ToAnglerNest // need to change the light shaft color
|
||||
// DB_ExitOnlyDimension_Body/Sector_ExitOnlyDimension/Interactables_ExitOnlyDimension/InnerWarp_ToExitOnly // need to change the colors
|
||||
// DB_HubDimension_Body/Sector_HubDimension/Interactables_HubDimension/InnerWarp_ToCluster // need to delete the child "Signal_Harmonica"
|
||||
@ -189,6 +186,10 @@ namespace NewHorizons.Builder.Props
|
||||
|
||||
var path = config.isSeed ? brambleSeedPrefabPath : brambleNodePrefabPath;
|
||||
var brambleNode = SearchUtilities.Find(path).InstantiateInactive();
|
||||
|
||||
OWAssetHandler.LoadObject(brambleNode);
|
||||
sector.OnOccupantEnterSector += (sd) => OWAssetHandler.OnOccupantEnterSector(brambleNode, sd, sector);
|
||||
|
||||
brambleNode.transform.parent = sector.transform;
|
||||
brambleNode.transform.position = go.transform.TransformPoint(config.position);
|
||||
brambleNode.transform.rotation = go.transform.TransformRotation(Quaternion.Euler(config.rotation));
|
||||
@ -202,9 +203,10 @@ namespace NewHorizons.Builder.Props
|
||||
var fogLight = brambleNode.GetComponent<FogLight>();
|
||||
fogLight._parentBody = go.GetComponent<OWRigidbody>();
|
||||
fogLight._sector = sector;
|
||||
fogLight._linkedFogLights.Clear();
|
||||
fogLight._linkedLightData.Clear();
|
||||
fogLight._linkedSector = null;
|
||||
fogLight._innerWarp = warpController;
|
||||
fogLight._linkedFogLights = new List<FogLight>();
|
||||
fogLight._linkedLightData = new List<FogLight.LightData>();
|
||||
|
||||
sector.RegisterFogLight(fogLight);
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user