From ec8f7c3cbdad20fa8d99d2412d878dbf0b8f97b1 Mon Sep 17 00:00:00 2001 From: "Nick J. Connors" Date: Mon, 3 Jan 2022 11:53:57 -0500 Subject: [PATCH] Fixed bad merge Also moved black hole building to shared generation --- NewHorizons/Builder/Props/PropBuilder.cs | 16 ---------------- NewHorizons/Main.cs | 8 ++++---- NewHorizons/manifest.json | 2 +- 3 files changed, 5 insertions(+), 21 deletions(-) diff --git a/NewHorizons/Builder/Props/PropBuilder.cs b/NewHorizons/Builder/Props/PropBuilder.cs index 4482ddb3..4434af7a 100644 --- a/NewHorizons/Builder/Props/PropBuilder.cs +++ b/NewHorizons/Builder/Props/PropBuilder.cs @@ -120,22 +120,6 @@ namespace NewHorizons.Builder.Props prop.transform.parent = go.transform; prop.transform.localPosition = position == null ? Vector3.zero : (Vector3)position; - Quaternion rot = rotation == null ? prefab.transform.rotation : Quaternion.Euler((Vector3)rotation); - prop.transform.rotation = rot; - if (alignWithNormal) - { - // TODO: Make this work or smthng - if (component is GhostIK) (component as GhostIK).enabled = false; - if(component is GhostEffects) (component as GhostEffects).enabled = false; - - - var enabledField = component.GetType().GetField("enabled"); - if(enabledField != null && enabledField.FieldType == typeof(bool)) enabledField.SetValue(component, true); - } - - prop.transform.parent = go.transform; - prop.transform.localPosition = position == null ? prefab.transform.localPosition : (Vector3)position; - Quaternion rot = rotation == null ? prefab.transform.rotation : Quaternion.Euler((Vector3)rotation); prop.transform.rotation = rot; if (alignWithNormal) diff --git a/NewHorizons/Main.cs b/NewHorizons/Main.cs index 9a1de336..d3b996df 100644 --- a/NewHorizons/Main.cs +++ b/NewHorizons/Main.cs @@ -99,7 +99,7 @@ namespace NewHorizons StarLightController = starLightGO.AddComponent(); StarLightController.AddStar(starController); - + starLightGO.SetActive(true); // TODO: Make this configurable probably @@ -321,9 +321,6 @@ namespace NewHorizons if (body.Config.ProcGen != null) ProcGenBuilder.Make(go, body.Config.ProcGen); - if (body.Config.Base.BlackHoleSize != 0 || body.Config.Singularity != null) - SingularityBuilder.Make(go, sector, owRigidBody, body.Config); - if (body.Config.Star != null) StarLightController.AddStar(StarBuilder.Make(go, sector, body.Config.Star)); if (body.Config.FocalPoint != null) @@ -403,6 +400,9 @@ namespace NewHorizons if (body.Config.Signal != null) SignalBuilder.Make(go, sector, body.Config.Signal, body.Assets); + if (body.Config.Base.BlackHoleSize != 0 || body.Config.Singularity != null) + SingularityBuilder.Make(go, sector, rb, body.Config); + return go; } } diff --git a/NewHorizons/manifest.json b/NewHorizons/manifest.json index 6b7dfd04..a37b854b 100644 --- a/NewHorizons/manifest.json +++ b/NewHorizons/manifest.json @@ -3,6 +3,6 @@ "author": "xen", "name": "New Horizons", "uniqueName": "xen.NewHorizons", - "version": "0.3.1", + "version": "0.4.0", "owmlVersion": "2.1.0" }