diff --git a/NewHorizons/Builder/General/RFVolumeBuilder.cs b/NewHorizons/Builder/General/RFVolumeBuilder.cs index 42d6975c..30c91c36 100644 --- a/NewHorizons/Builder/General/RFVolumeBuilder.cs +++ b/NewHorizons/Builder/General/RFVolumeBuilder.cs @@ -67,6 +67,7 @@ namespace NewHorizons.Builder.General return null; } + rfGO.SetActive(true); return rfGO; } } diff --git a/NewHorizons/Builder/Props/DetailBuilder.cs b/NewHorizons/Builder/Props/DetailBuilder.cs index 4aa2fc42..03dc1d12 100644 --- a/NewHorizons/Builder/Props/DetailBuilder.cs +++ b/NewHorizons/Builder/Props/DetailBuilder.cs @@ -70,10 +70,14 @@ namespace NewHorizons.Builder.Props StreamingHandler.SetUpStreaming(prop, sector); + // Could check this in the for loop but I'm not sure what order we need to know about this in var isTorch = prop.GetComponent() != null; + var isItem = false; foreach (var component in prop.GetComponentsInChildren(true)) { + if (component.gameObject == prop && component is OWItem) isItem = true; + if (sector == null) { if (FixUnsectoredComponent(component)) continue; @@ -83,6 +87,9 @@ namespace NewHorizons.Builder.Props FixComponent(component, go); } + // Items shouldn't use these else they get weird + if (isItem) detail.keepLoaded = true; + prop.transform.position = detail.position == null ? go.transform.position : go.transform.TransformPoint(detail.position); Quaternion rot = detail.rotation == null ? Quaternion.identity : Quaternion.Euler(detail.rotation); @@ -156,6 +163,13 @@ namespace NewHorizons.Builder.Props } } + if (isItem) + { + // Else when you put them down you can't pick them back up + var col = prop.GetComponent(); + if (col != null) col._physicsRemoved = false; + } + if (!detail.keepLoaded) GroupsBuilder.Make(prop, sector); prop.SetActive(true); diff --git a/NewHorizons/manifest.json b/NewHorizons/manifest.json index 4a8968b9..4a7de067 100644 --- a/NewHorizons/manifest.json +++ b/NewHorizons/manifest.json @@ -4,7 +4,7 @@ "author": "xen, Bwc9876, clay, MegaPiggy, John, Hawkbar, Trifid, Book", "name": "New Horizons", "uniqueName": "xen.NewHorizons", - "version": "1.6.2", + "version": "1.6.4", "owmlVersion": "2.7.2", "dependencies": [ "JohnCorby.VanillaFix", "_nebula.MenuFramework", "xen.CommonCameraUtility", "dgarro.CustomShipLogModes" ], "conflicts": [ "Raicuparta.QuantumSpaceBuddies", "PacificEngine.OW_Randomizer" ],