Rework scenariomodule, group offset editor and other changes

src/Core/Config/ConfigParser.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.IO.Compression;
 using System.Linq;
 using UnityEngine;
-using System.IO.Compression;
 
 
 namespace KerbalKonstructs.Core
@@ -328,7 +328,6 @@ internal static void LoadAllMapDecals()
                 Log.Normal("Rebuilding PQS sphere on: " + body.name);
                 body.pqsController.RebuildSphere();
             }
-
         }
 
         /// <summary>
@@ -337,6 +336,7 @@ internal static void LoadAllMapDecals()
         /// <param name="instance"></param>
         internal static void SaveMapDecalInstance(MapDecalInstance instance)
         {
+            if (instance.isInSavegame) return;
 
             if (!Directory.Exists(KSPUtil.ApplicationRootPath + "GameData/" + KerbalKonstructs.newInstancePath))
             {
@@ -346,7 +346,7 @@ internal static void SaveMapDecalInstance(MapDecalInstance instance)
             if (instance.configPath == null)
             {
                 instance.configPath = KerbalKonstructs.newInstancePath + "/KK_MapDecal_" + instance.Name + ".cfg";
-                if (System.IO.File.Exists(instance.configPath))
+                if (System.IO.File.Exists(KSPUtil.ApplicationRootPath + "GameData/" + instance.configPath))
                 {
                     instance.configPath = KerbalKonstructs.newInstancePath + "/KK_MapDecal_" + instance.Name + "_" + Guid.NewGuid() + ".cfg";
                 }
@@ -416,34 +416,40 @@ internal static void SaveInstanceByCfg(string pathname)
             }
 
             Log.Debug("Saving File: " + pathname);
-            StaticInstance[] allInstances = StaticDatabase.allStaticInstances.Where(instance => instance.configPath == pathname).ToArray();
-            StaticInstance firstInstance = allInstances.First();
-            ConfigNode instanceConfig = null;
+            StaticInstance[] allInstances = StaticDatabase.allStaticInstances.Where(instance => instance.configPath == pathname && !instance.isInSavegame).ToArray();
 
             ConfigNode staticNode = new ConfigNode("STATIC");
 
-            if (firstInstance.configUrl == null) //this are newly spawned instances
+            if (allInstances.Length > 0)
             {
-                instanceConfig = new ConfigNode("STATIC");
-                instanceConfig.AddValue("pointername", firstInstance.model.name);
-            }
-            else
-            {
-                //instanceConfig = GameDatabase.Instance.GetConfigNode(firstInstance.configUrl.url);
-                //instanceConfig.RemoveNodes("Instances");
-                //instanceConfig.RemoveValues();
-                instanceConfig = new ConfigNode("STATIC");
-                instanceConfig.AddValue("pointername", firstInstance.model.name);
+                StaticInstance firstInstance = allInstances.First();
+                ConfigNode instanceConfig = null;
 
-            }
 
-            staticNode.AddNode(instanceConfig);
-            foreach (StaticInstance instance in allInstances)
-            {
-                ConfigNode inst = new ConfigNode("Instances");
-                ConfigParser.WriteInstanceConfig(instance, inst);
-                instanceConfig.nodes.Add(inst);
+                if (firstInstance.configUrl == null) //this are newly spawned instances
+                {
+                    instanceConfig = new ConfigNode("STATIC");
+                    instanceConfig.AddValue("pointername", firstInstance.model.name);
+                }
+                else
+                {
+                    //instanceConfig = GameDatabase.Instance.GetConfigNode(firstInstance.configUrl.url);
+                    //instanceConfig.RemoveNodes("Instances");
+                    //instanceConfig.RemoveValues();
+                    instanceConfig = new ConfigNode("STATIC");
+                    instanceConfig.AddValue("pointername", firstInstance.model.name);
+
+                }
+
+                staticNode.AddNode(instanceConfig);
+                foreach (StaticInstance instance in allInstances)
+                {
+                    ConfigNode inst = new ConfigNode("Instances");
+                    ConfigParser.WriteInstanceConfig(instance, inst);
+                    instanceConfig.nodes.Add(inst);
+                }
             }
+
             staticNode.Save(KSPUtil.ApplicationRootPath + "GameData/" + pathname, "Generated by Kerbal Konstructs");
         }
 
@@ -483,6 +489,8 @@ internal static void ExportAllGroups()
 
             foreach (GroupCenter group in StaticDatabase.allGroupCenters)
             {
+                if (group.isInSavegame) continue;
+
                 parsedModels.Clear();
 
                 if (!System.IO.Directory.Exists(basePath))
@@ -505,6 +513,8 @@ internal static void ExportAllGroups()
                 }
                 foreach (StaticInstance instance in group.childInstances)
                 {
+                    if (instance.isInSavegame) continue;
+
                     if (parsedModels.Contains(instance.model.name))
                     {
                         continue;
@@ -562,9 +572,9 @@ internal static void CreateZips()
 
             string basePath = KSPUtil.ApplicationRootPath + "GameData/KerbalKonstructs/ExportedInstances/" + exportTime;
             string allFileName = "AllExports" + DateTime.Now.ToString("_yyyy-MMdd-HHmm-ss") + ".zip";
-                        
-            
-            ZipFile.CreateFromDirectory(basePath, KSPUtil.ApplicationRootPath + "GameData/KerbalKonstructs/ExportedInstances/"+ allFileName, System.IO.Compression.CompressionLevel.Fastest, false);
+
+
+            ZipFile.CreateFromDirectory(basePath, KSPUtil.ApplicationRootPath + "GameData/KerbalKonstructs/ExportedInstances/" + allFileName, System.IO.Compression.CompressionLevel.Fastest, false);
 
             foreach (string dirname in Directory.GetDirectories(basePath))
             {
@@ -579,7 +589,7 @@ internal static void CreateZips()
                 ZipFile.CreateFromDirectory(dirname, groupFilename, System.IO.Compression.CompressionLevel.Fastest, true);
                 Directory.Delete(dirname, true);
             }
-         }
+        }
 
     }
 }

src/Core/LaunchSites/LaunchSiteManager.cs

@@ -479,7 +479,7 @@ internal static void RegisterMHLaunchSites(EditorFacility facility)
         /// Removes the launchSite from the facilities
         /// </summary>
         /// <param name="site"></param>
-        internal static void UnregisterLaunchSite(KKLaunchSite site)
+        public static void UnregisterLaunchSite(KKLaunchSite site)
         {
             if (site.isOpen)
             {
@@ -510,7 +510,7 @@ internal static void UnregisterLaunchSite(KKLaunchSite site)
         /// Deletes a LaunchSite from the internal Database
         /// </summary>
         /// <param name="site2delete"></param>
-        internal static void DeleteLaunchSite(KKLaunchSite site2delete)
+        public static void DeleteLaunchSite(KKLaunchSite site2delete)
         {
             if (launchSites.Contains(site2delete))
             {

src/Core/MapDecals/DecalsDatabase.cs

@@ -41,6 +41,11 @@ internal static void DeleteMapDecalInstance(MapDecalInstance instance)
                 _allMapDecalInstances.Remove(instance);
                 allMapDecalInstances = _allMapDecalInstances.ToArray();
                 Log.Debug("MapDecal instace " + instance.Name + " removed from Database");
+
+                if (instance.configPath != null && System.IO.File.Exists(KSPUtil.ApplicationRootPath + "GameData/" + instance.configPath))
+                {
+                    System.IO.File.Delete(KSPUtil.ApplicationRootPath + "GameData/" + instance.configPath);
+                }
             }
         }
 

src/Core/MapDecals/MapDecalInstance.cs

@@ -56,6 +56,8 @@ public class MapDecalInstance
         [CFGSetting]
         public string Group = "Ungrouped";
 
+        public bool isInSavegame = false;
+
 
         internal MapDecalsMap heighMap = null;
         internal MapDecalsMap colormapMap = null;

src/Core/StaticGroup/GroupCenter.cs

@@ -34,32 +34,32 @@ public class GroupCenter
         [CFGSetting]
         public bool SeaLevelAsReference = false;
         [CFGSetting]
-        internal double RefLatitude = 361d;
+        public double RefLatitude = 361d;
         [CFGSetting]
-        internal double RefLongitude = 361d;
+        public double RefLongitude = 361d;
 
 
         public UrlDir.UrlConfig configUrl;
         public String configPath = null;
 
-        internal GameObject gameObject;
+        public GameObject gameObject;
         internal PQSCity pqsCity;
         private Vector3 origScale = new Vector3(1, 1, 1);
 
-        internal List<StaticInstance> childInstances = new List<StaticInstance>();
-        internal bool isActive = true;
+        public List<StaticInstance> childInstances = new List<StaticInstance>();
+        public bool isActive = true;
 
-        internal List<KKLaunchSite> launchsites = new List<KKLaunchSite>();
+        public List<KKLaunchSite> launchsites = new List<KKLaunchSite>();
 
-        internal bool hidden = false;
-        internal bool isBuiltIn = false;
-        internal bool isInSavegame = false;
+        public bool hidden = false;
+        public bool isBuiltIn = false;
+        public bool isInSavegame = false;
 
 
 
 
 
-        internal bool isHidden
+        public bool isHidden
         {
             get
             {
@@ -197,7 +197,7 @@ internal void UpdateRotation2Heading()
 
         }
 
-        internal void RenameGroup(string newName)
+        public void RenameGroup(string newName)
         {
             StaticDatabase.RemoveGroupCenter(this);
             Group = newName;
@@ -212,7 +212,7 @@ internal void RenameGroup(string newName)
 
         }
 
-        internal void AddInstance(StaticInstance instance)
+        public void AddInstance(StaticInstance instance)
         {
             if (!childInstances.Contains(instance))
             {
@@ -222,7 +222,7 @@ internal void AddInstance(StaticInstance instance)
         }
 
 
-        internal void RemoveInstance(StaticInstance instance)
+        public void RemoveInstance(StaticInstance instance)
         {
             if (childInstances.Contains(instance))
             {
@@ -232,7 +232,7 @@ internal void RemoveInstance(StaticInstance instance)
 
 
 
-        internal void SetInstancesEnabled(bool isInRange)
+        public void SetInstancesEnabled(bool isInRange)
         {
             if (isInRange == isActive)
             {
@@ -262,7 +262,7 @@ internal void SetInstancesEnabled(bool isInRange)
         /// </summary>
         /// <param name="distance"></param>
         /// <param name="maxDistance"></param>
-        internal void CheckIfInRange(float distance, float maxDistance)
+        public void CheckIfInRange(float distance, float maxDistance)
         {
 
             if (distance < 5000  && isHidden)
@@ -277,7 +277,7 @@ internal void CheckIfInRange(float distance, float maxDistance)
             SetInstancesEnabled(isInRange);
         }
 
-        internal static void ActivateInstance(StaticInstance instance)
+        public static void ActivateInstance(StaticInstance instance)
         {
             switch (instance.FacilityType)
             {
@@ -296,7 +296,7 @@ internal static void ActivateInstance(StaticInstance instance)
             }
         }
 
-        internal static void DeActivateInstance(StaticInstance instance)
+        public static void DeActivateInstance(StaticInstance instance)
         {
             switch (instance.FacilityType)
             {
@@ -316,7 +316,7 @@ internal static void DeActivateInstance(StaticInstance instance)
         }
 
 
-        internal void Update()
+        public void Update()
         {
             if (pqsCity != null)
             {
@@ -444,13 +444,15 @@ internal void CopyGroup(GroupCenter sourceGroup)
         }
 
 
-        internal void DeleteGroupCenter()
+        public void DeleteGroupCenter()
         {
             foreach (StaticInstance child in childInstances.ToArray())
             {
                 KerbalKonstructs.instance.DeleteInstance(child);
             }
 
+            if (StaticsEditorGUI.GetActiveGroup() == this) StaticsEditorGUI.SetActiveGroup(null);
+
             StaticDatabase.RemoveGroupCenter(this);
             // check later when saving if this file is empty
 
@@ -469,15 +471,15 @@ internal void SetReference()
             pqsCity.repositionToSphereSurfaceAddHeight = !SeaLevelAsReference;
         }
 
-        internal double surfaceHeight
+        public double surfaceHeight
         {
             get
             {
                 return (CelestialBody.pqsController.GetSurfaceHeight(CelestialBody.GetRelSurfaceNVector(RefLatitude, RefLongitude).normalized * CelestialBody.Radius) - CelestialBody.pqsController.radius);
             }
         }
 
-        internal string dbKey
+        public string dbKey
         {
             get
             {
@@ -488,7 +490,7 @@ internal string dbKey
             }
         }
 
-        internal float heading
+        public float heading
         {
             get
             {

src/Core/StaticObjects/StaticInstance.cs

@@ -1,4 +1,5 @@
 using KerbalKonstructs.Modules;
+using KerbalKonstructs.UI;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -121,7 +122,7 @@ internal GameObject mesh
 
         internal GroupCenter groupCenter = null;
 
-        internal bool isInSavegame = false;
+        public bool isInSavegame = false;
 
         internal bool isDestroyed = false;
 
@@ -634,6 +635,8 @@ internal void Deactivate()
 
         internal void Destroy()
         {
+            if (StaticsEditorGUI.selectedObject == this) StaticsEditorGUI.selectedObject = null;
+
             if (groupCenter != null)
             {
                 groupCenter.RemoveInstance(this);