Revert "Revert changes by MegaPiggy"

This reverts commit 80de0f1cb79b59487f4c4ce4285659554c5db78a.
This commit is contained in:
xen-42 2025-02-04 18:47:10 -05:00
parent 786f1751dc
commit 458c202fa4
2 changed files with 8 additions and 7 deletions

View File

@ -15,10 +15,11 @@ namespace NewHorizons.Builder.General
var gravityRadius = GM / 0.1f; var gravityRadius = GM / 0.1f;
if (exponent == 2f) gravityRadius = Mathf.Sqrt(gravityRadius); if (exponent == 2f) gravityRadius = Mathf.Sqrt(gravityRadius);
if (config.FocalPoint != null) gravityRadius = 0; // keep it at the lowest possible
else if (config.Base.soiOverride != 0f) gravityRadius = config.Base.soiOverride;
else if (config.Star != null) gravityRadius = Mathf.Min(gravityRadius, 15 * config.Base.surfaceSize);
// To let you actually orbit things the way you would expect we cap this at 4x the diameter if its not a star (this is what giants deep has) // To let you actually orbit things the way you would expect we cap this at 4x the diameter if its not a star (this is what giants deep has)
if (config.Star == null) gravityRadius = Mathf.Min(gravityRadius, 4 * config.Base.surfaceSize); else gravityRadius = Mathf.Min(gravityRadius, 4 * config.Base.surfaceSize);
else gravityRadius = Mathf.Min(gravityRadius, 15 * config.Base.surfaceSize);
if (config.Base.soiOverride != 0f) gravityRadius = config.Base.soiOverride;
var gravityGO = new GameObject("GravityWell"); var gravityGO = new GameObject("GravityWell");
gravityGO.transform.parent = planetGO.transform; gravityGO.transform.parent = planetGO.transform;

View File

@ -57,11 +57,11 @@ namespace NewHorizons.Builder.Orbital
config.Base.surfaceGravity = gravitationalMass * GravityVolume.GRAVITATIONAL_CONSTANT; config.Base.surfaceGravity = gravitationalMass * GravityVolume.GRAVITATIONAL_CONSTANT;
config.Base.gravityFallOff = primary.Config.Base.gravityFallOff; config.Base.gravityFallOff = primary.Config.Base.gravityFallOff;
// Other stuff to make the barycenter not interact with anything in any way
config.Base.soiOverride = 0;
var separation = primary.Config.Orbit.semiMajorAxis + secondary.Config.Orbit.semiMajorAxis; var separation = primary.Config.Orbit.semiMajorAxis + secondary.Config.Orbit.semiMajorAxis;
config.ReferenceFrame.bracketRadius = separation; var separationRadius = (separation / 2);
config.ReferenceFrame.targetColliderRadius = separation; config.Base.soiOverride = separationRadius * 1.5f;
config.ReferenceFrame.bracketRadius = separationRadius;
config.ReferenceFrame.targetColliderRadius = separationRadius;
config.Base.showMinimap = false; config.Base.showMinimap = false;
} }