From 61cd8aec6c1951e7626feea0d9acc112ab1636cf Mon Sep 17 00:00:00 2001
From: "Nick J. Connors" <nicholasconnors@hotmail.ca>
Date: Wed, 29 Dec 2021 16:34:30 -0500
Subject: [PATCH] Changed method names to make C# conventions

---
 .../Builder/General/HeavenlyBodyBuilder.cs    | 94 +++++++++----------
 NewHorizons/Main.cs                           |  6 +-
 2 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/NewHorizons/Builder/General/HeavenlyBodyBuilder.cs b/NewHorizons/Builder/General/HeavenlyBodyBuilder.cs
index 5689cf15..adde4797 100644
--- a/NewHorizons/Builder/General/HeavenlyBodyBuilder.cs
+++ b/NewHorizons/Builder/General/HeavenlyBodyBuilder.cs
@@ -1,59 +1,59 @@
-using NewHorizons.External;
-using NewHorizons.OrbitalPhysics;
+using NewHorizons.External;
+using NewHorizons.OrbitalPhysics;
 using NewHorizons.Utility;
-using PacificEngine.OW_CommonResources.Game.Resource;
-using PacificEngine.OW_CommonResources.Game.State;
-using PacificEngine.OW_CommonResources.Geometry.Orbits;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine;
-
-namespace NewHorizons.Builder.General
-{
-    public static class HeavenlyBodyBuilder
-    {
-        private static Dictionary<string, HeavenlyBody> bodyName = new Dictionary<string, HeavenlyBody>();
-
-        public static void Make(GameObject body, IPlanetConfig config, float SOI, GravityVolume bodyGravity, InitialMotion initialMotion, AstroObject ao)
-        {
-            var size = new Position.Size(config.Base.SurfaceSize, SOI);
-            var G = GravityVolume.GRAVITATIONAL_CONSTANT;
-            var gravity = Gravity.of(bodyGravity == null ? 2f : bodyGravity.GetFalloffExponent(), bodyGravity == null ? 0 : bodyGravity.GetStandardGravitationalParameter() / G);
-            var parent = getBody(config.Orbit.PrimaryBody);
-            var orbit = OrbitalHelper.KeplerCoordinatesFromOrbitModule(config.Orbit);
-
-            var hb = getBody(config.Name);
+using PacificEngine.OW_CommonResources.Game.Resource;
+using PacificEngine.OW_CommonResources.Game.State;
+using PacificEngine.OW_CommonResources.Geometry.Orbits;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using UnityEngine;
+
+namespace NewHorizons.Builder.General
+{
+    public static class HeavenlyBodyBuilder
+    {
+        private static readonly Dictionary<string, HeavenlyBody> bodyName = new Dictionary<string, HeavenlyBody>();
+
+        public static void Make(GameObject body, IPlanetConfig config, float SOI, GravityVolume bodyGravity, InitialMotion initialMotion)
+        {
+            var size = new Position.Size(config.Base.SurfaceSize, SOI);
+            var G = GravityVolume.GRAVITATIONAL_CONSTANT;
+            var gravity = Gravity.of(bodyGravity == null ? 2f : bodyGravity.GetFalloffExponent(), bodyGravity == null ? 0 : bodyGravity.GetStandardGravitationalParameter() / G);
+            var parent = GetBody(config.Orbit.PrimaryBody);
+            var orbit = OrbitalHelper.KeplerCoordinatesFromOrbitModule(config.Orbit);
+
+            var hb = GetBody(config.Name);
             if (hb == null)
             {
-                hb = addHeavenlyBody(config.Name);
-            }
+                hb = AddHeavenlyBody(config.Name);
+            }
             var planetoid = new Planet.Plantoid(size, gravity, body.transform.rotation, initialMotion._initAngularSpeed, parent, orbit);
 
-            var mapping = Planet.defaultMapping;
-            mapping[hb] = planetoid;
-            Planet.defaultMapping = mapping;
-        }
-
-        private static HeavenlyBody addHeavenlyBody(string name)
+            var mapping = Planet.defaultMapping;
+            mapping[hb] = planetoid;
+            Planet.defaultMapping = mapping;
+        }
+
+        private static HeavenlyBody AddHeavenlyBody(string name)
         {
             var hb = new HeavenlyBody(name);
             bodyName.Add(name, hb);
 
-            var astroLookup = Position.AstroLookup;
-            astroLookup.Add(hb, () => AstroObjectLocator.GetAstroObject(name));
-            Position.AstroLookup = astroLookup;
-
-            var bodyLookup = Position.BodyLookup;
-            bodyLookup.Add(hb, () => AstroObjectLocator.GetAstroObject(name)?.GetAttachedOWRigidbody());
+            var astroLookup = Position.AstroLookup;
+            astroLookup.Add(hb, () => AstroObjectLocator.GetAstroObject(name));
+            Position.AstroLookup = astroLookup;
+
+            var bodyLookup = Position.BodyLookup;
+            bodyLookup.Add(hb, () => AstroObjectLocator.GetAstroObject(name)?.GetAttachedOWRigidbody());
             Position.BodyLookup = bodyLookup;
 
             return hb;
-        }
-
-        private static HeavenlyBody getBody(string name)
+        }
+
+        private static HeavenlyBody GetBody(string name)
         {
             if (bodyName.ContainsKey(name))
             {
@@ -66,6 +66,6 @@ namespace NewHorizons.Builder.General
                 bodyName.Add(name, hb);
             }
             return hb;
-        }
-    }
-}
+        }
+    }
+}
diff --git a/NewHorizons/Main.cs b/NewHorizons/Main.cs
index a2df5581..4368f252 100644
--- a/NewHorizons/Main.cs
+++ b/NewHorizons/Main.cs
@@ -159,7 +159,7 @@ namespace NewHorizons
             {
                 try
                 {
-                    GameObject planetObject = GenerateBody(body);
+                    GameObject planetObject = GenerateBody(body, defaultPrimaryToSun);
                     if (planetObject == null) return false;
                     planetObject.SetActive(true);
                 }
@@ -206,7 +206,7 @@ namespace NewHorizons
 
         public static GameObject GenerateBody(NewHorizonsBody body, bool defaultPrimaryToSun = false)
         {
-            body.Config.Orbit.LongitudeOfAscendingNode = 0;
+            //body.Config.Orbit.LongitudeOfAscendingNode = 0;
             //body.Config.Orbit.ArgumentOfPeriapsis = 0;
 
             AstroObject primaryBody = AstroObjectLocator.GetAstroObject(body.Config.Orbit.PrimaryBody);
@@ -300,7 +300,7 @@ namespace NewHorizons
 
             if (ao.GetAstroObjectName() == AstroObject.Name.CustomString) AstroObjectLocator.RegisterCustomAstroObject(ao);
 
-            HeavenlyBodyBuilder.Make(go, body.Config, sphereOfInfluence, gv, initialMotion, ao);
+            HeavenlyBodyBuilder.Make(go, body.Config, sphereOfInfluence, gv, initialMotion);
 
             return go;
         }