Merge pull request #50 from Sigma88/Development

v1.7.1
Sigma88 · Jan 2, 2019 · 6a395fe · 6a395fe
2 parents 884bc47 + 0d7b2f0
commit 6a395fe
Showing 9 changed files with 130 additions and 135 deletions.
diff --git a/Changelog.txt b/Changelog.txt
@@ -1,3 +1,8 @@
+**v1.7.1**
+
+- Recompiled against KSP 1.6.0 and Kopernicus 1.6.0-1
+
+
 **v1.7.0**
 
 - Recompiled against KSP 1.4.3 and Kopernicus 1.4.3-1

diff --git a/GameData/Sigma/Binary/Plugins/SigmaBinary.dll b/GameData/Sigma/Binary/Plugins/SigmaBinary.dll
diff --git a/[Source]/Distribution/SigmaBinary.dll b/[Source]/Distribution/SigmaBinary.dll
diff --git a/[Source]/SigmaBinary/Configs.cs b/[Source]/SigmaBinary/Configs.cs
@@ -6,33 +6,15 @@ namespace SigmaBinaryPlugin
 {
     public class Configs
     {
-        static bool ready = false;
         static UrlDir.UrlConfig oldKopernicus;
         static ConfigNode newKopernicus;
         static ConfigNode[] oldBodies;
 
         public static void ModuleManagerPostLoad()
         {
-            TimingManager.UpdateAdd(TimingManager.TimingStage.Normal, LoadKopernicus);
-            LoadKopernicus();
-        }
-
-        static void LoadKopernicus()
-        {
-            if (ready)
-            {
-                TimingManager.UpdateRemove(TimingManager.TimingStage.Normal, LoadKopernicus);
-
-                oldKopernicus = GameDatabase.Instance?.GetConfigs("Kopernicus")?.FirstOrDefault();
-
-                if (oldKopernicus == null) return;
-
-                LoadBodies();
-            }
-            else
-            {
-                ready = true;
-            }
+            oldKopernicus = GameDatabase.Instance?.GetConfigs("Kopernicus")?.FirstOrDefault();
+            if (oldKopernicus == null) return;
+            LoadBodies();
         }
 
         static void LoadBodies()
@@ -56,7 +38,7 @@ static void CheckBodies()
                     ConfigNode Orbit = oldBodies[i].GetNode("Orbit");
                     string referenceBody = Orbit.GetValue("referenceBody");
 
-                    if (!string.IsNullOrEmpty("referenceBody") && referenceBody != "Sun")
+                    if (!string.IsNullOrEmpty(SigmaBinary?.GetValue("name")) && !string.IsNullOrEmpty("referenceBody") && referenceBody != "Sun")
                     {
                         if (!SigmaBinary.HasValue("name"))
                             SigmaBinary.AddValue("name", referenceBody + oldBodies[i].GetValue("name"));

diff --git a/[Source]/SigmaBinary/LateFixes.cs b/[Source]/SigmaBinary/LateFixes.cs
@@ -27,8 +27,8 @@ internal static void TextureFixer(Body body1, Body body2, List<Body> list)
                 }
                 if (DateTime.Today.Day == 25 && DateTime.Today.Month == 05)
                 {
-                    list.Find(x => x.name == "Sun").generatedBody.celestialBody.bodyDescription = "\n\n\n                        DON'T\n                        PANIC";
-                    list.Find(x => x.name == "Kerbin").generatedBody.celestialBody.bodyDescription = "Mostly harmless.";
+                    list.Find(x => x.generatedBody.name == "Sun").generatedBody.celestialBody.bodyDescription = "\n\n\n                        DON'T\n                        PANIC";
+                    list.Find(x => x.generatedBody.name == "Kerbin").generatedBody.celestialBody.bodyDescription = "Mostly harmless.";
                 }
                 if (DateTime.Today.Day == 31 && DateTime.Today.Month == 10)
                 {

diff --git a/[Source]/SigmaBinary/SigmaBinary.cs b/[Source]/SigmaBinary/SigmaBinary.cs
diff --git a/[Source]/SigmaBinary/SigmaBinaryLoader.cs b/[Source]/SigmaBinary/SigmaBinaryLoader.cs
@@ -22,8 +22,8 @@ public string sbName
         {
             set
             {
-                SigmaBinary.sigmabinarySBName.Add(Loader.currentBody, value);
-                SigmaBinary.sigmabinaryRedrawOrbit.Add(Loader.currentBody);
+                SigmaBinary.sigmabinarySBName.Add(Parser.GetState<Body>("Kopernicus:currentBody"), value);
+                SigmaBinary.sigmabinaryRedrawOrbit.Add(Parser.GetState<Body>("Kopernicus:currentBody"));
             }
         }
 
@@ -32,8 +32,8 @@ public string after
         {
             set
             {
-                if (!SigmaBinary.ListOfBinaries.ContainsValue(SigmaBinary.ListOfBodies.Find(b => b.name == value)))
-                    SigmaBinary.sigmabinaryLoadAfter.Add(value, Loader.currentBody);
+                if (!SigmaBinary.ListOfBinaries.ContainsValue(SigmaBinary.ListOfBodies.Find(b => b.generatedBody.name == value)))
+                    SigmaBinary.sigmabinaryLoadAfter.Add(value, Parser.GetState<Body>("Kopernicus:currentBody"));
             }
         }
 
@@ -43,7 +43,7 @@ public NumericParser<bool> primaryLocked
             set
             {
                 if (value)
-                    SigmaBinary.sigmabinaryPrimaryLocked.Add(Loader.currentBody);
+                    SigmaBinary.sigmabinaryPrimaryLocked.Add(Parser.GetState<Body>("Kopernicus:currentBody"));
             }
         }
 
@@ -53,7 +53,7 @@ public NumericParser<bool> redrawOrbit
             set
             {
                 if (!value)
-                    SigmaBinary.sigmabinaryRedrawOrbit.Remove(Loader.currentBody);
+                    SigmaBinary.sigmabinaryRedrawOrbit.Remove(Parser.GetState<Body>("Kopernicus:currentBody"));
             }
         }
 
@@ -72,20 +72,20 @@ void IParserEventSubscriber.Apply(ConfigNode node)
 
         void IParserEventSubscriber.PostApply(ConfigNode node)
         {
-            if (!SigmaBinary.sigmabinaryLoadAfter.ContainsValue(Loader.currentBody))
+            if (!SigmaBinary.sigmabinaryLoadAfter.ContainsValue(Parser.GetState<Body>("Kopernicus:currentBody")))
             {
-                SigmaBinary.ListOfBinaries.Add(SigmaBinary.sigmabinarySBName[Loader.currentBody], Loader.currentBody);
-                LoadAfter(Loader.currentBody);
+                SigmaBinary.ListOfBinaries.Add(SigmaBinary.sigmabinarySBName[Parser.GetState<Body>("Kopernicus:currentBody")], Parser.GetState<Body>("Kopernicus:currentBody"));
+                LoadAfter(Parser.GetState<Body>("Kopernicus:currentBody"));
             }
         }
 
         public void LoadAfter(Body currentBody)
         {
-            if (SigmaBinary.sigmabinaryLoadAfter.ContainsKey(currentBody.name))
+            if (SigmaBinary.sigmabinaryLoadAfter.ContainsKey(currentBody.generatedBody.name))
             {
-                Body body = SigmaBinary.sigmabinaryLoadAfter[currentBody.name];
+                Body body = SigmaBinary.sigmabinaryLoadAfter[currentBody.generatedBody.name];
                 SigmaBinary.ListOfBinaries.Add(SigmaBinary.sigmabinarySBName[body], body);
-                SigmaBinary.sigmabinaryLoadAfter.Remove(currentBody.name);
+                SigmaBinary.sigmabinaryLoadAfter.Remove(currentBody.generatedBody.name);
                 LoadAfter(body);
             }
         }
@@ -103,7 +103,7 @@ public string description
         {
             set
             {
-                SigmaBinary.sigmabinaryDescription.Add(Loader.currentBody, value);
+                SigmaBinary.sigmabinaryDescription.Add(Parser.GetState<Body>("Kopernicus:currentBody"), value);
             }
         }
 
@@ -128,7 +128,7 @@ public EnumParser<OrbitRenderer.DrawMode> mode
         {
             set
             {
-                SigmaBinary.sigmabinaryMode.Add(Loader.currentBody, value);
+                SigmaBinary.sigmabinaryMode.Add(Parser.GetState<Body>("Kopernicus:currentBody"), value);
             }
         }
 
@@ -138,7 +138,7 @@ public EnumParser<OrbitRenderer.DrawIcons> icon
         {
             set
             {
-                SigmaBinary.sigmabinaryIcon.Add(Loader.currentBody, value);
+                SigmaBinary.sigmabinaryIcon.Add(Parser.GetState<Body>("Kopernicus:currentBody"), value);
             }
         }
 
@@ -148,7 +148,7 @@ public ColorParser color
         {
             set
             {
-                SigmaBinary.sigmabinaryOrbitColor.Add(Loader.currentBody, value.Value);
+                SigmaBinary.sigmabinaryOrbitColor.Add(Parser.GetState<Body>("Kopernicus:currentBody"), value.Value);
             }
         }
 
@@ -158,7 +158,7 @@ public ColorParser iconColor
         {
             set
             {
-                SigmaBinary.sigmabinaryIconColor.Add(Loader.currentBody, value.Value);
+                SigmaBinary.sigmabinaryIconColor.Add(Parser.GetState<Body>("Kopernicus:currentBody"), value.Value);
             }
         }
 

diff --git a/[Source]/SigmaBinary/SigmaDebugLogger.cs b/[Source]/SigmaBinary/SigmaDebugLogger.cs
@@ -3,6 +3,7 @@
     internal static class Debug
     {
         internal static bool debug = false;
+
         static string Tag = "[SigmaLog SB]";
 
         internal static void Log(string message)

diff --git a/[Source]/SigmaBinary/Version.cs b/[Source]/SigmaBinary/Version.cs
@@ -6,7 +6,7 @@ namespace SigmaBinaryPlugin
     [KSPAddon(KSPAddon.Startup.Instantly, true)]
     public class Version : MonoBehaviour
     {
-        public static readonly System.Version number = new System.Version("1.7.0");
+        public static readonly System.Version number = new System.Version("1.7.1");
 
         void Awake()
         {