From 7008c546d6b1ef652a8ea1d0bb60da34ee57ac56 Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 11 Aug 2023 18:19:58 -0400 Subject: [PATCH 1/5] Rename addPhysics to pushable --- NewHorizons/Builder/General/RigidBodyBuilder.cs | 2 +- NewHorizons/Builder/Orbital/OrbitlineBuilder.cs | 2 +- NewHorizons/External/Modules/BaseModule.cs | 2 +- NewHorizons/Main.cs | 2 -- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/NewHorizons/Builder/General/RigidBodyBuilder.cs b/NewHorizons/Builder/General/RigidBodyBuilder.cs index 5661d430a..6ca756fd7 100644 --- a/NewHorizons/Builder/General/RigidBodyBuilder.cs +++ b/NewHorizons/Builder/General/RigidBodyBuilder.cs @@ -33,7 +33,7 @@ public static OWRigidbody Make(GameObject body, float sphereOfInfluence, PlanetC owRigidBody.EnableKinematicSimulation(); rigidBody.mass = 10000; - if (config.Base.addPhysics) + if (config.Base.pushable) { // hack: make all mesh colliders convex // triggers are already convex diff --git a/NewHorizons/Builder/Orbital/OrbitlineBuilder.cs b/NewHorizons/Builder/Orbital/OrbitlineBuilder.cs index fac2bfcff..a2ffbab06 100644 --- a/NewHorizons/Builder/Orbital/OrbitlineBuilder.cs +++ b/NewHorizons/Builder/Orbital/OrbitlineBuilder.cs @@ -84,7 +84,7 @@ public static OrbitLine Make(GameObject planetGO, NHAstroObject astroObject, boo Delay.FireOnNextUpdate(orbitLine.InitializeLineRenderer); // If the planet has physics and a regular orbit line, make sure that when it's bumped into the old orbit line vanishes - if (config.Base.addPhysics && !config.Orbit.trackingOrbitLine) + if (config.Base.pushable && !config.Orbit.trackingOrbitLine) { var impactSensor = planetGO.GetComponent(); impactSensor.OnImpact += (ImpactData _) => diff --git a/NewHorizons/External/Modules/BaseModule.cs b/NewHorizons/External/Modules/BaseModule.cs index 03dbb51ac..9d72301ce 100644 --- a/NewHorizons/External/Modules/BaseModule.cs +++ b/NewHorizons/External/Modules/BaseModule.cs @@ -77,7 +77,7 @@ public class BaseModule /// This is meant for stuff like satellites which are relatively simple and can be de-orbited. /// If you are using an orbit line but a tracking line, it will be removed when the planet is bumped in to. /// - public bool addPhysics; + public bool pushable; #region Obsolete diff --git a/NewHorizons/Main.cs b/NewHorizons/Main.cs index f2aa10b9f..2906f9be8 100644 --- a/NewHorizons/Main.cs +++ b/NewHorizons/Main.cs @@ -622,8 +622,6 @@ public void LoadConfigs(IModBehaviour mod) { try { - if (mod.ModHelper.Manifest.Filename.Contains("Extinction")) return; - if (_firstLoad) { MountedAddons.Add(mod); From b9b78d3ac28964d083dc87f8514635da83928965 Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 11 Aug 2023 18:20:38 -0400 Subject: [PATCH 2/5] Update manifest.json --- NewHorizons/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NewHorizons/manifest.json b/NewHorizons/manifest.json index 2fb8ac31f..32642e869 100644 --- a/NewHorizons/manifest.json +++ b/NewHorizons/manifest.json @@ -4,7 +4,7 @@ "author": "xen, Bwc9876, clay, MegaPiggy, John, Trifid, Hawkbar, Book", "name": "New Horizons", "uniqueName": "xen.NewHorizons", - "version": "1.14.1", + "version": "1.14.2", "owmlVersion": "2.9.3", "dependencies": [ "JohnCorby.VanillaFix", "_nebula.MenuFramework", "xen.CommonCameraUtility", "dgarro.CustomShipLogModes" ], "conflicts": [ "Raicuparta.QuantumSpaceBuddies", "PacificEngine.OW_CommonResources" ], From 999c3a18c1570c46017a17fe10ef40cd5ca1dd1b Mon Sep 17 00:00:00 2001 From: Ben C Date: Fri, 11 Aug 2023 22:23:53 +0000 Subject: [PATCH 3/5] Updated Schemas --- NewHorizons/Schemas/body_schema.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NewHorizons/Schemas/body_schema.json b/NewHorizons/Schemas/body_schema.json index 843e94789..faf9e1e94 100644 --- a/NewHorizons/Schemas/body_schema.json +++ b/NewHorizons/Schemas/body_schema.json @@ -574,7 +574,7 @@ "format": "int32", "default": 0 }, - "addPhysics": { + "pushable": { "type": "boolean", "description": "Apply physics to this planet when you bump into it. Will have a spherical collider the size of surfaceSize. \nFor custom colliders they have to all be convex and you can leave surface size as 0.\nThis is meant for stuff like satellites which are relatively simple and can be de-orbited.\nIf you are using an orbit line but a tracking line, it will be removed when the planet is bumped in to." } From 8e282ef5ecee0332e366321577889e0c1945aed6 Mon Sep 17 00:00:00 2001 From: JohnCorby Date: Fri, 11 Aug 2023 15:31:44 -0700 Subject: [PATCH 4/5] joe --- NewHorizons/Builder/General/RigidBodyBuilder.cs | 8 +++----- NewHorizons/Components/AddPhysics.cs | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/NewHorizons/Builder/General/RigidBodyBuilder.cs b/NewHorizons/Builder/General/RigidBodyBuilder.cs index 6ca756fd7..ed6560496 100644 --- a/NewHorizons/Builder/General/RigidBodyBuilder.cs +++ b/NewHorizons/Builder/General/RigidBodyBuilder.cs @@ -37,14 +37,12 @@ public static OWRigidbody Make(GameObject body, float sphereOfInfluence, PlanetC { // hack: make all mesh colliders convex // triggers are already convex - // prints errors for non readable meshes but whatever + // doesnt work for some non readable meshes but whatever foreach (var meshCollider in body.GetComponentsInChildren(true)) meshCollider.convex = true; - var shape = body.AddComponent(); - shape._collisionMode = Shape.CollisionMode.Detector; - shape._layerMask = (int)(Shape.Layer.Default | Shape.Layer.Gravity); - shape._radius = config.Base.surfaceSize; + // backup shape in case of no convex colliders + body.AddComponent().radius = config.Base.surfaceSize; var impactSensor = body.AddComponent(); var audioSource = body.AddComponent(); diff --git a/NewHorizons/Components/AddPhysics.cs b/NewHorizons/Components/AddPhysics.cs index c7671a505..4e9cf4a7f 100644 --- a/NewHorizons/Components/AddPhysics.cs +++ b/NewHorizons/Components/AddPhysics.cs @@ -34,7 +34,7 @@ private IEnumerator Start() // hack: make all mesh colliders convex // triggers are already convex - // prints errors for non readable meshes but whatever + // doesnt work for some non readable meshes but whatever foreach (var meshCollider in GetComponentsInChildren(true)) meshCollider.convex = true; From 63b06a8d98d9133fd4cde5be0fd2721d20025c02 Mon Sep 17 00:00:00 2001 From: JohnCorby Date: Fri, 11 Aug 2023 15:32:29 -0700 Subject: [PATCH 5/5] not a shape --- NewHorizons/Builder/General/RigidBodyBuilder.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NewHorizons/Builder/General/RigidBodyBuilder.cs b/NewHorizons/Builder/General/RigidBodyBuilder.cs index ed6560496..09a92c083 100644 --- a/NewHorizons/Builder/General/RigidBodyBuilder.cs +++ b/NewHorizons/Builder/General/RigidBodyBuilder.cs @@ -41,7 +41,7 @@ public static OWRigidbody Make(GameObject body, float sphereOfInfluence, PlanetC foreach (var meshCollider in body.GetComponentsInChildren(true)) meshCollider.convex = true; - // backup shape in case of no convex colliders + // backup collider in case of no convex colliders body.AddComponent().radius = config.Base.surfaceSize; var impactSensor = body.AddComponent();