From db2d1aebcd1ba4c2539bf4c6f955738c3fbc4146 Mon Sep 17 00:00:00 2001 From: JohnCorby Date: Fri, 30 Sep 2022 19:33:06 -0700 Subject: [PATCH 1/2] move group builder down here too --- NewHorizons/Builder/Props/DetailBuilder.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/NewHorizons/Builder/Props/DetailBuilder.cs b/NewHorizons/Builder/Props/DetailBuilder.cs index 4929dade..4aa2fc42 100644 --- a/NewHorizons/Builder/Props/DetailBuilder.cs +++ b/NewHorizons/Builder/Props/DetailBuilder.cs @@ -101,8 +101,6 @@ namespace NewHorizons.Builder.Props prop.transform.localScale = detail.stretch ?? (detail.scale != 0 ? Vector3.one * detail.scale : prefab.transform.localScale); - if (!detail.keepLoaded) GroupsBuilder.Make(prop, sector); - if (detail.removeChildren != null) { var detailPath = prop.transform.GetPath(); @@ -158,6 +156,7 @@ namespace NewHorizons.Builder.Props } } + if (!detail.keepLoaded) GroupsBuilder.Make(prop, sector); prop.SetActive(true); return prop; From 63f87e4c6d3c3ed092a17ea7dc1137f6fefb864d Mon Sep 17 00:00:00 2001 From: JohnCorby Date: Fri, 30 Sep 2022 19:46:36 -0700 Subject: [PATCH 2/2] sort arcs by path to hopefully prevent future updates from breaking everything --- NewHorizons/Builder/Props/NomaiTextBuilder.cs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/NewHorizons/Builder/Props/NomaiTextBuilder.cs b/NewHorizons/Builder/Props/NomaiTextBuilder.cs index 981f447d..5528f6c9 100644 --- a/NewHorizons/Builder/Props/NomaiTextBuilder.cs +++ b/NewHorizons/Builder/Props/NomaiTextBuilder.cs @@ -48,7 +48,11 @@ namespace NewHorizons.Builder.Props private static void InitPrefabs() { // Just take every scroll and get the first arc - var existingArcs = GameObject.FindObjectsOfType().Select(x => x?._nomaiWallText?.gameObject?.transform?.Find("Arc 1")?.gameObject).Where(x => x != null).ToArray(); + var existingArcs = GameObject.FindObjectsOfType() + .Select(x => x?._nomaiWallText?.gameObject?.transform?.Find("Arc 1")?.gameObject) + .Where(x => x != null) + .OrderBy(x => x.transform.GetPath()) + .ToArray(); _arcPrefabs = new List(); _childArcPrefabs = new List(); foreach (var existingArc in existingArcs) @@ -67,7 +71,11 @@ namespace NewHorizons.Builder.Props } } - var existingGhostArcs = GameObject.FindObjectsOfType().Select(x => x?._textLine?.gameObject).Where(x => x != null).ToArray(); + var existingGhostArcs = GameObject.FindObjectsOfType() + .Select(x => x?._textLine?.gameObject) + .Where(x => x != null) + .OrderBy(x => x.transform.GetPath()) + .ToArray(); _ghostArcPrefabs = new List(); foreach (var existingArc in existingGhostArcs) {