Update ShipSaveSplicer to enable crew import again. Add a bunch of additional logging to SSS.

magico13 · magico13 · commit 33a049aebea9 · 2018-03-27T22:21:23.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -189,3 +189,4 @@ _Pvt_Extensions/
 ModelManifest.xml
 /.vs/Modlets/v15/Server/sqlite3
 /.vs/slnx.sqlite
+/.vs/VSWorkspaceState.json
diff --git a/ShipSaveSplicer/Properties/AssemblyInfo.cs b/ShipSaveSplicer/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.4.0")]
-[assembly: AssemblyFileVersion("1.1.4.0")]
+[assembly: AssemblyVersion("1.2.0.0")]
+[assembly: AssemblyFileVersion("1.2.0.0")]
diff --git a/ShipSaveSplicer/ShipSaveSplicer.cs b/ShipSaveSplicer/ShipSaveSplicer.cs
@@ -11,35 +11,33 @@ namespace ShipSaveSplicer
     [KSPAddon(KSPAddon.Startup.TrackingStation, false)]
     public class ShipSaveSplicer : MonoBehaviour
     {
-        public static ApplicationLauncherButton theButton;
-        public static bool includeCrew = false;
-        private static bool EventAdded = false;
+        private static ApplicationLauncherButton _theButton;
+        private static bool _includeCrew = false;
+        private static bool _eventAdded = false;
         public void Start()
         {
             //add button to the Stock toolbar
-            if (!EventAdded)
+            if (!_eventAdded)
             {
                 GameEvents.onGUIApplicationLauncherReady.Add(AddButton);
-                EventAdded = true;
+                _eventAdded = true;
             }
-
-            //AddButton();
         }
 
         public void OnDestroy()
         {
-            if (theButton != null)
+            if (_theButton != null)
             {
-                ApplicationLauncher.Instance.RemoveModApplication(theButton);
-                theButton = null;
+                ApplicationLauncher.Instance.RemoveModApplication(_theButton);
+                _theButton = null;
             }
         }
 
         public void AddButton()
         {
-            if (ApplicationLauncher.Ready && theButton == null)
+            if (ApplicationLauncher.Ready && _theButton == null && HighLogic.LoadedScene == GameScenes.TRACKSTATION)
             {
-                theButton = ApplicationLauncher.Instance.AddModApplication(
+                _theButton = ApplicationLauncher.Instance.AddModApplication(
                     OnClick,
                     Dummy, Dummy, Dummy, Dummy, Dummy, ApplicationLauncher.AppScenes.TRACKSTATION, GameDatabase.Instance.GetTexture("ShipSaveSplicer/icon", false));
             }
@@ -50,22 +48,22 @@ private void Dummy() { }
         public void OnClick()
         {
             //figure out if mod+clicked
-            //includeCrew = GameSettings.MODIFIER_KEY.GetKey(); //TODO: Reenable when fixed
-            includeCrew = false;
+            _includeCrew = GameSettings.MODIFIER_KEY.GetKey();
+            //includeCrew = false;
             bool ctrlHeld = Input.GetKey(KeyCode.LeftControl);
 
             if (Input.GetKey(KeyCode.LeftShift))
             {
                 OpenConvertWindow(); //convert ships to craft files
-                theButton.SetFalse();
+                _theButton.SetFalse();
                 return;
             }
 
             //get the selected craft
             SpaceTracking trackingStation = (SpaceTracking)FindObjectOfType(typeof(SpaceTracking));
             Vessel selectedVessel = trackingStation.SelectedVessel;
 
-            if (ctrlHeld || includeCrew) //ctrl or modifier held
+            if (ctrlHeld || _includeCrew) //ctrl or modifier held
             {
                 OpenImportWindow();
             }
@@ -74,14 +72,16 @@ public void OnClick()
                 ExportSelectedCraft(selectedVessel);
             }
 
-            theButton.SetFalse(false);
+            _theButton.SetFalse(false);
         }
 
         public void ExportSelectedCraft(Vessel vessel)
         {
             CreateFolder();
 
             string filename = KSPUtil.ApplicationRootPath + "/Ships/export/" + HighLogic.SaveFolder + "_" + vessel.vesselName;
+            Log($"Exporting vessel: {vessel.vesselName}\nExporting to file: {filename}");
+
             ConfigNode nodeToSave = new ConfigNode();
 
             //save vessel
@@ -116,7 +116,7 @@ public void OpenConvertWindow()
             for (int i = 0; i < count; i++)
             {
                 int select = i;
-                options[i] = new DialogGUIButton(files[i].Split('/').Last(), () => { ConvertVessel(files[select]); });
+                options[i] = new DialogGUIButton(files[i].Split('/').Last(), () => { ConvertToCraft(files[select]); });
             }
             options[count] = new DialogGUIButton("Close", Dummy);
             string msg = "Select a vessel to convert to a .craft file.";
@@ -125,21 +125,17 @@ public void OpenConvertWindow()
             PopupDialog.SpawnPopupDialog(new Vector2(0.5f, 0.5f), new Vector2(0.5f, 0.5f), a, false, HighLogic.UISkin);
         }
 
-        public void ConvertVessel(string name)
+        public void ConvertToCraft(string name)
         {
             if (System.IO.File.Exists(name))
             {
+                Log($"Converting ship to craft file: {name}");
                 ConfigNode storedNode = ConfigNode.Load(name);
 
                 ConfigNode vesselNode = storedNode.GetNode("VESSEL");
 
-                List<string> invalidParts = InvalidParts(vesselNode);
-                if (invalidParts.Count > 0) //contains invalid parts and can't be loaded
+                if (WarnOfInvalidParts(vesselNode, false))
                 {
-                    StringBuilder msg = new StringBuilder("The selected vessel cannot be converted because it contains the following invalid parts (perhaps you removed a mod?):\n");
-                    foreach (string invalid in invalidParts)
-                        msg.Append("    ").AppendLine(invalid);
-                    PopupDialog.SpawnPopupDialog(new Vector2(0.5f, 0.5f), new Vector2(0.5f, 0.5f), "missingPartsPopup", "Missing Parts", msg.ToString(), "Ok", false, HighLogic.UISkin);
                     return;
                 }
                 //clear out all crew on vessel
@@ -165,14 +161,13 @@ public void VesselToCraftFile(ConfigNode VesselNode)
             ProtoVessel VesselToSave = HighLogic.CurrentGame.AddVessel(VesselNode);
             if (VesselToSave.vesselRef == null)
             {
-                Debug.LogError("Vessel reference is null!");
+                Log("Vessel reference is null!");
                 return;
             }
 
             try
             {
                 string ShipName = VesselToSave.vesselName;
-                // Debug.LogWarning("Saving: " + ShipName);
 
                 //Vessel FromFlight = FlightGlobals.Vessels.Find(v => v.id == VesselToSave.vesselID);
                 try
@@ -182,7 +177,7 @@ public void VesselToCraftFile(ConfigNode VesselNode)
                 catch (Exception ex)
                 {
                     Debug.LogException(ex);
-                    Debug.Log("Attempting to continue.");
+                    Log("Attempting to continue.");
                 }
 
                 ShipConstruct ConstructToSave = new ShipConstruct(ShipName, "", VesselToSave.vesselRef.Parts[0]);
@@ -247,8 +242,7 @@ public void OpenImportWindow()
                 options[i] = new DialogGUIButton(files[i].Split('/').Last(), () => { ImportVessel(files[select]); });
             }
             options[count] = new DialogGUIButton("Close", Dummy);
-            string msg = "Select a vessel to import. Will " + (includeCrew ? "" : "not ") + "import crew members.";// +(includeCrew ? "": " (modifier+click the SSS button to include crew)");
-            //TODO: Reenable when fixed
+            string msg = string.Format("Select a vessel to import. Will {0}import crew.{1}", (_includeCrew ? string.Empty : "not "), (_includeCrew ? string.Empty : "\n(modifier+click the SSS button to include crew)"));
 
             MultiOptionDialog a = new MultiOptionDialog("importPopup", msg, "Import Vessel", null, options);
             PopupDialog.SpawnPopupDialog(new Vector2(0.5f, 0.5f), new Vector2(0.5f, 0.5f), a, false, HighLogic.UISkin);
@@ -258,25 +252,21 @@ public void ImportVessel(string name)
         {
             if (System.IO.File.Exists(name))
             {
+                Log($"Importing vessel: {name}");
                 ConfigNode storedNode = ConfigNode.Load(name);
 
                 ConfigNode vesselNode = storedNode.GetNode("VESSEL");
 
                 vesselNode.SetValue("pid", Guid.NewGuid().ToString());
 
-                List<string> invalidParts = InvalidParts(vesselNode);
-                if (invalidParts.Count > 0) //contains invalid parts and can't be loaded
+                if (WarnOfInvalidParts(vesselNode, true))
                 {
-                    string msg = "The selected vessel cannot be imported because it contains the following invalid parts (perhaps you removed a mod?):\n";
-                    foreach (string invalid in invalidParts)
-                        msg += "    " + invalid + "\n";
-                    PopupDialog.SpawnPopupDialog(new Vector2(0.5f, 0.5f), new Vector2(0.5f, 0.5f), "missingPartsPopup", "Missing Parts", msg, "Ok", false, HighLogic.UISkin);
                     return;
                 }
 
+                List<ProtoCrewMember> crewAdded = new List<ProtoCrewMember>();
 
-
-                if (!includeCrew)
+                if (!_includeCrew)
                 {
                     //clear out all crew on vessel
                     StripCrew(vesselNode);
@@ -294,29 +284,35 @@ public void ImportVessel(string name)
                                 foreach (ConfigNode.Value crewValue in partNode.values)//(string crewmember in partNode.GetValues("crew"))
                                 {
                                     if (crewValue.name != "crew")
+                                    {
                                         continue;
+                                    }
+
                                     string crewmember = crewValue.value;
                                     //find the confignode saved with the vessel
                                     ConfigNode crewNode = storedNode.GetNodes("CREW")?.FirstOrDefault(c => c.GetValue("name") == crewmember);
                                     if (crewNode == null || crewNode.GetValue("type") != "Crew") //if no data or is tourist then remove from ship
                                     {
                                         //can't find the required data, so remove that kerbal from the ship
+                                        Log($"Vessel occupant is not crew: {crewmember}");
                                         toRemove.Add(crewmember);
                                         continue;
                                     }
 
 
                                     ProtoCrewMember newCrew = new ProtoCrewMember(HighLogic.CurrentGame.Mode, crewNode, ProtoCrewMember.KerbalType.Crew);
-                                    if (HighLogic.CurrentGame.CrewRoster.Crew.FirstOrDefault(c => c.name == crewmember) != null) //there's already a kerbal with that name (sadness :( )
+                                    if (HighLogic.CurrentGame.CrewRoster.Exists(crewmember)) //there's already a kerbal with that name (sadness :( )
                                     {
                                         //alright, rename this kerbal to a new name
                                         string newName = RenameKerbal(crewmember);
                                         newCrew.ChangeName(newName);
                                         crewValue.value = newName;
                                     }
+                                    Log($"Creating crewmember {newCrew.name}");
                                     //add the crew member to the crew roster
                                     //the function to do this is hidden for some reason. yay!
                                     HighLogic.CurrentGame.CrewRoster.AddCrewMember(newCrew); //no longer hidden! MORE YAY!
+                                    crewAdded.Add(newCrew);
                                 }
                                 foreach (string crewmember in toRemove) //remove all crews that shouldn't be here anymore
                                 {
@@ -325,6 +321,7 @@ public void ImportVessel(string name)
                                     {
                                         if (val.name == "crew" && val.value == crewmember)
                                         {
+                                            Log($"Removing non-valid crew member {val.value}");
                                             partNode.values.Remove(val);
                                             break;
                                         }
@@ -335,7 +332,7 @@ public void ImportVessel(string name)
                     }
                     catch (Exception ex)
                     {
-                        Debug.Log("[ShipSaveSplicer] Encountered exception while transferring crew. The exception follows. Stripping crew data.");
+                        Log("Encountered exception while transferring crew. The exception follows. Stripping crew data.");
                         Debug.LogException(ex);
 
                         StripCrew(vesselNode);
@@ -349,15 +346,19 @@ public void ImportVessel(string name)
                 }
 
                 ProtoVessel addedVessel = HighLogic.CurrentGame.AddVessel(vesselNode);
-                //we might have to assign the kerbals to the vessel here
-
-            //related issue, in 1.2.2 (at least) we fail validation of assignments when there are two ships with the same part ids (guessing).
-            //All I know is that if I terminate the original flight, I can import crew. Otherwise it NREs when I save.
+                foreach (ProtoCrewMember crew in crewAdded)
+                {
+                    Log($"Assigning {crew.name}");
+                    addedVessel.AddCrew(crew);
+                }
+                //In 1.2.2+ saving fails when there are two copies of a ship with crew onboard both. Might be part ID related.
+                //All I know is that if I terminate the original flight, I can import crew. Otherwise it NREs when it tries to save the flight state.
             }
         }
 
         private void StripCrew(ConfigNode vesselNode)
         {
+            Log("Stripping out crew information");
             foreach (ConfigNode partNode in vesselNode.GetNodes("PART"))
             {
                 if (partNode.HasValue("crew"))
@@ -395,7 +396,9 @@ public void CreateFolder()
         {
             string filename = KSPUtil.ApplicationRootPath + "/Ships/export/";
             if (!System.IO.Directory.Exists(filename))
+            {
                 System.IO.Directory.CreateDirectory(filename);
+            }
         }
 
         public List<string> InvalidParts(ConfigNode vesselNode)
@@ -408,21 +411,51 @@ public List<string> InvalidParts(ConfigNode vesselNode)
             {
                 string partName = PartNameFromNode(partNode);
                 if (!invalid.Contains(partName) && PartLoader.getPartInfoByName(partName) == null) //don't add duplicates
+                {
                     invalid.Add(partName);
+                }
             }
             return invalid;
         }
 
+        public bool WarnOfInvalidParts(ConfigNode vesselNode, bool importing)
+        {
+            List<string> invalidParts = InvalidParts(vesselNode);
+            if (invalidParts.Count > 0)
+            {
+                string action = importing ? "impoerted" : "converted";
+                StringBuilder msg = new StringBuilder($"The selected vessel cannot be {action} because it contains the following invalid parts (perhaps you removed a mod?):").AppendLine();
+                foreach (string invalid in invalidParts)
+                {
+                    msg.Append("    ").AppendLine(invalid);
+                }
+
+                PopupDialog.SpawnPopupDialog(new Vector2(0.5f, 0.5f), new Vector2(0.5f, 0.5f), "missingPartsPopup", "Missing Parts", msg.ToString(), "Ok", false, HighLogic.UISkin);
+                return true;
+            }
+            return false;
+        }
+
         public string PartNameFromNode(ConfigNode part)
         {
             string name = part.GetValue("part");
             if (name != null)
+            {
                 name = name.Split('_')[0];
+            }
             else
+            {
                 name = part.GetValue("name");
+            }
+
             return name;
         }
 
+        public void Log(object msg)
+        {
+            Debug.Log("[ShipSaveSplicer] " + msg.ToString());
+        }
+
         /* The following is directly from Claw's InflightShipSave and credit goes to the original author */
         private void CleanEditorNodes(ConfigNode CN)
         {
@@ -467,11 +500,11 @@ private void PristineNodes(ConfigNode CN)
             {
                 string PartName = ((CN.GetValue("part")).Split('_'))[0];
 
-                Debug.LogWarning("PART: " + PartName);
+                Log("PART: " + PartName);
 
                 Part NewPart = PartLoader.getPartInfoByName(PartName).partPrefab;
                 ConfigNode NewPartCN = new ConfigNode();
-                Debug.LogWarning("New Part: " + NewPart.name);
+                Log("New Part: " + NewPart.name);
 
                 NewPart.InitializeModules();
 
@@ -510,7 +543,7 @@ private void PristineNodes(ConfigNode CN)
     }
 }
 /*
-Copyright (C) 2017  Michael Marvin
+Copyright (C) 2018  Michael Marvin
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/ShipSaveSplicer/ShipSaveSplicer.csproj b/ShipSaveSplicer/ShipSaveSplicer.csproj
@@ -53,6 +53,12 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>"C:\Users\magico13\Desktop\KSP_Modding\Tools\pdb2mdb\pdb2mdb.exe" "$(TargetFileName)"
+xcopy /Y "$(TargetPath)" "D:\SteamLibrary\SteamApps\common\Kerbal Space Program\GameData\$(TargetName)\"
+xcopy /Y "$(TargetDir)$(TargetName).pdb" "D:\SteamLibrary\SteamApps\common\Kerbal Space Program\GameData\$(TargetName)\"
+xcopy /Y "$(TargetDir)$(TargetName).dll.mdb" "D:\SteamLibrary\SteamApps\common\Kerbal Space Program\GameData\$(TargetName)\"</PostBuildEvent>
+  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

Original file line number	Diff line number	Diff line change
`@@ -11,35 +11,33 @@ namespace ShipSaveSplicer`
`11`	`11`	`[KSPAddon(KSPAddon.Startup.TrackingStation, false)]`
`12`	`12`	`public class ShipSaveSplicer : MonoBehaviour`
`13`	`13`	`{`
`14`		`- public static ApplicationLauncherButton theButton;`
`15`		`- public static bool includeCrew = false;`
`16`		`- private static bool EventAdded = false;`
	`14`	`+ private static ApplicationLauncherButton _theButton;`
	`15`	`+ private static bool _includeCrew = false;`
	`16`	`+ private static bool _eventAdded = false;`
`17`	`17`	`public void Start()`
`18`	`18`	`{`
`19`	`19`	`//add button to the Stock toolbar`
`20`		`- if (!EventAdded)`
	`20`	`+ if (!_eventAdded)`
`21`	`21`	`{`
`22`	`22`	`GameEvents.onGUIApplicationLauncherReady.Add(AddButton);`
`23`		`- EventAdded = true;`
	`23`	`+ _eventAdded = true;`
`24`	`24`	`}`
`25`		`-`
`26`		`- //AddButton();`
`27`	`25`	`}`
`28`	`26`
`29`	`27`	`public void OnDestroy()`
`30`	`28`	`{`
`31`		`- if (theButton != null)`
	`29`	`+ if (_theButton != null)`
`32`	`30`	`{`
`33`		`- ApplicationLauncher.Instance.RemoveModApplication(theButton);`
`34`		`- theButton = null;`
	`31`	`+ ApplicationLauncher.Instance.RemoveModApplication(_theButton);`
	`32`	`+ _theButton = null;`
`35`	`33`	`}`
`36`	`34`	`}`
`37`	`35`
`38`	`36`	`public void AddButton()`
`39`	`37`	`{`
`40`		`- if (ApplicationLauncher.Ready && theButton == null)`
	`38`	`+ if (ApplicationLauncher.Ready && _theButton == null && HighLogic.LoadedScene == GameScenes.TRACKSTATION)`
`41`	`39`	`{`
`42`		`- theButton = ApplicationLauncher.Instance.AddModApplication(`
	`40`	`+ _theButton = ApplicationLauncher.Instance.AddModApplication(`
`43`	`41`	`OnClick,`
`44`	`42`	`Dummy, Dummy, Dummy, Dummy, Dummy, ApplicationLauncher.AppScenes.TRACKSTATION, GameDatabase.Instance.GetTexture("ShipSaveSplicer/icon", false));`
`45`	`43`	`}`
`@@ -50,22 +48,22 @@ private void Dummy() { }`
`50`	`48`	`public void OnClick()`
`51`	`49`	`{`
`52`	`50`	`//figure out if mod+clicked`
`53`		`- //includeCrew = GameSettings.MODIFIER_KEY.GetKey(); //TODO: Reenable when fixed`
`54`		`- includeCrew = false;`
	`51`	`+ _includeCrew = GameSettings.MODIFIER_KEY.GetKey();`
	`52`	`+ //includeCrew = false;`
`55`	`53`	`bool ctrlHeld = Input.GetKey(KeyCode.LeftControl);`
`56`	`54`
`57`	`55`	`if (Input.GetKey(KeyCode.LeftShift))`
`58`	`56`	`{`
`59`	`57`	`OpenConvertWindow(); //convert ships to craft files`
`60`		`- theButton.SetFalse();`
	`58`	`+ _theButton.SetFalse();`
`61`	`59`	`return;`
`62`	`60`	`}`
`63`	`61`
`64`	`62`	`//get the selected craft`
`65`	`63`	`SpaceTracking trackingStation = (SpaceTracking)FindObjectOfType(typeof(SpaceTracking));`
`66`	`64`	`Vessel selectedVessel = trackingStation.SelectedVessel;`
`67`	`65`
`68`		`- if (ctrlHeld \|\| includeCrew) //ctrl or modifier held`
	`66`	`+ if (ctrlHeld \|\| _includeCrew) //ctrl or modifier held`
`69`	`67`	`{`
`70`	`68`	`OpenImportWindow();`
`71`	`69`	`}`
`@@ -74,14 +72,16 @@ public void OnClick()`
`74`	`72`	`ExportSelectedCraft(selectedVessel);`
`75`	`73`	`}`
`76`	`74`
`77`		`- theButton.SetFalse(false);`
	`75`	`+ _theButton.SetFalse(false);`
`78`	`76`	`}`
`79`	`77`
`80`	`78`	`public void ExportSelectedCraft(Vessel vessel)`
`81`	`79`	`{`
`82`	`80`	`CreateFolder();`
`83`	`81`
`84`	`82`	`string filename = KSPUtil.ApplicationRootPath + "/Ships/export/" + HighLogic.SaveFolder + "_" + vessel.vesselName;`
	`83`	`+ Log($"Exporting vessel: {vessel.vesselName}\nExporting to file: {filename}");`
	`84`	`+`
`85`	`85`	`ConfigNode nodeToSave = new ConfigNode();`
`86`	`86`
`87`	`87`	`//save vessel`
`@@ -116,7 +116,7 @@ public void OpenConvertWindow()`
`116`	`116`	`for (int i = 0; i < count; i++)`
`117`	`117`	`{`
`118`	`118`	`int select = i;`
`119`		`- options[i] = new DialogGUIButton(files[i].Split('/').Last(), () => { ConvertVessel(files[select]); });`
	`119`	`+ options[i] = new DialogGUIButton(files[i].Split('/').Last(), () => { ConvertToCraft(files[select]); });`
`120`	`120`	`}`
`121`	`121`	`options[count] = new DialogGUIButton("Close", Dummy);`
`122`	`122`	`string msg = "Select a vessel to convert to a .craft file.";`
`@@ -125,21 +125,17 @@ public void OpenConvertWindow()`
`125`	`125`	`PopupDialog.SpawnPopupDialog(new Vector2(0.5f, 0.5f), new Vector2(0.5f, 0.5f), a, false, HighLogic.UISkin);`
`126`	`126`	`}`
`127`	`127`
`128`		`- public void ConvertVessel(string name)`
	`128`	`+ public void ConvertToCraft(string name)`
`129`	`129`	`{`
`130`	`130`	`if (System.IO.File.Exists(name))`
`131`	`131`	`{`
	`132`	`+ Log($"Converting ship to craft file: {name}");`
`132`	`133`	`ConfigNode storedNode = ConfigNode.Load(name);`
`133`	`134`
`134`	`135`	`ConfigNode vesselNode = storedNode.GetNode("VESSEL");`
`135`	`136`
`136`		`- List<string> invalidParts = InvalidParts(vesselNode);`
`137`		`- if (invalidParts.Count > 0) //contains invalid parts and can't be loaded`
	`137`	`+ if (WarnOfInvalidParts(vesselNode, false))`
`138`	`138`	`{`
`139`		`- StringBuilder msg = new StringBuilder("The selected vessel cannot be converted because it contains the following invalid parts (perhaps you removed a mod?):\n");`
`140`		`- foreach (string invalid in invalidParts)`
`141`		`- msg.Append(" ").AppendLine(invalid);`
`142`		`- PopupDialog.SpawnPopupDialog(new Vector2(0.5f, 0.5f), new Vector2(0.5f, 0.5f), "missingPartsPopup", "Missing Parts", msg.ToString(), "Ok", false, HighLogic.UISkin);`
`143`	`139`	`return;`
`144`	`140`	`}`
`145`	`141`	`//clear out all crew on vessel`
`@@ -165,14 +161,13 @@ public void VesselToCraftFile(ConfigNode VesselNode)`
`165`	`161`	`ProtoVessel VesselToSave = HighLogic.CurrentGame.AddVessel(VesselNode);`
`166`	`162`	`if (VesselToSave.vesselRef == null)`
`167`	`163`	`{`
`168`		`- Debug.LogError("Vessel reference is null!");`
	`164`	`+ Log("Vessel reference is null!");`
`169`	`165`	`return;`
`170`	`166`	`}`
`171`	`167`
`172`	`168`	`try`
`173`	`169`	`{`
`174`	`170`	`string ShipName = VesselToSave.vesselName;`
`175`		`- // Debug.LogWarning("Saving: " + ShipName);`
`176`	`171`
`177`	`172`	`//Vessel FromFlight = FlightGlobals.Vessels.Find(v => v.id == VesselToSave.vesselID);`
`178`	`173`	`try`
`@@ -182,7 +177,7 @@ public void VesselToCraftFile(ConfigNode VesselNode)`
`182`	`177`	`catch (Exception ex)`
`183`	`178`	`{`
`184`	`179`	`Debug.LogException(ex);`
`185`		`- Debug.Log("Attempting to continue.");`
	`180`	`+ Log("Attempting to continue.");`
`186`	`181`	`}`
`187`	`182`
`188`	`183`	`ShipConstruct ConstructToSave = new ShipConstruct(ShipName, "", VesselToSave.vesselRef.Parts[0]);`
`@@ -247,8 +242,7 @@ public void OpenImportWindow()`
`247`	`242`	`options[i] = new DialogGUIButton(files[i].Split('/').Last(), () => { ImportVessel(files[select]); });`
`248`	`243`	`}`
`249`	`244`	`options[count] = new DialogGUIButton("Close", Dummy);`
`250`		`- string msg = "Select a vessel to import. Will " + (includeCrew ? "" : "not ") + "import crew members.";// +(includeCrew ? "": " (modifier+click the SSS button to include crew)");`
`251`		`- //TODO: Reenable when fixed`
	`245`	`+ string msg = string.Format("Select a vessel to import. Will {0}import crew.{1}", (_includeCrew ? string.Empty : "not "), (_includeCrew ? string.Empty : "\n(modifier+click the SSS button to include crew)"));`
`252`	`246`
`253`	`247`	`MultiOptionDialog a = new MultiOptionDialog("importPopup", msg, "Import Vessel", null, options);`
`254`	`248`	`PopupDialog.SpawnPopupDialog(new Vector2(0.5f, 0.5f), new Vector2(0.5f, 0.5f), a, false, HighLogic.UISkin);`
`@@ -258,25 +252,21 @@ public void ImportVessel(string name)`
`258`	`252`	`{`
`259`	`253`	`if (System.IO.File.Exists(name))`
`260`	`254`	`{`
	`255`	`+ Log($"Importing vessel: {name}");`
`261`	`256`	`ConfigNode storedNode = ConfigNode.Load(name);`
`262`	`257`
`263`	`258`	`ConfigNode vesselNode = storedNode.GetNode("VESSEL");`
`264`	`259`
`265`	`260`	`vesselNode.SetValue("pid", Guid.NewGuid().ToString());`
`266`	`261`
`267`		`- List<string> invalidParts = InvalidParts(vesselNode);`
`268`		`- if (invalidParts.Count > 0) //contains invalid parts and can't be loaded`
	`262`	`+ if (WarnOfInvalidParts(vesselNode, true))`
`269`	`263`	`{`
`270`		`- string msg = "The selected vessel cannot be imported because it contains the following invalid parts (perhaps you removed a mod?):\n";`
`271`		`- foreach (string invalid in invalidParts)`
`272`		`- msg += " " + invalid + "\n";`
`273`		`- PopupDialog.SpawnPopupDialog(new Vector2(0.5f, 0.5f), new Vector2(0.5f, 0.5f), "missingPartsPopup", "Missing Parts", msg, "Ok", false, HighLogic.UISkin);`
`274`	`264`	`return;`
`275`	`265`	`}`
`276`	`266`
	`267`	`+ List<ProtoCrewMember> crewAdded = new List<ProtoCrewMember>();`
`277`	`268`
`278`		`-`
`279`		`- if (!includeCrew)`
	`269`	`+ if (!_includeCrew)`
`280`	`270`	`{`
`281`	`271`	`//clear out all crew on vessel`
`282`	`272`	`StripCrew(vesselNode);`
`@@ -294,29 +284,35 @@ public void ImportVessel(string name)`
`294`	`284`	`foreach (ConfigNode.Value crewValue in partNode.values)//(string crewmember in partNode.GetValues("crew"))`
`295`	`285`	`{`
`296`	`286`	`if (crewValue.name != "crew")`
	`287`	`+ {`
`297`	`288`	`continue;`
	`289`	`+ }`
	`290`	`+`
`298`	`291`	`string crewmember = crewValue.value;`
`299`	`292`	`//find the confignode saved with the vessel`
`300`	`293`	`ConfigNode crewNode = storedNode.GetNodes("CREW")?.FirstOrDefault(c => c.GetValue("name") == crewmember);`
`301`	`294`	`if (crewNode == null \|\| crewNode.GetValue("type") != "Crew") //if no data or is tourist then remove from ship`
`302`	`295`	`{`
`303`	`296`	`//can't find the required data, so remove that kerbal from the ship`
	`297`	`+ Log($"Vessel occupant is not crew: {crewmember}");`
`304`	`298`	`toRemove.Add(crewmember);`
`305`	`299`	`continue;`
`306`	`300`	`}`
`307`	`301`
`308`	`302`
`309`	`303`	`ProtoCrewMember newCrew = new ProtoCrewMember(HighLogic.CurrentGame.Mode, crewNode, ProtoCrewMember.KerbalType.Crew);`
`310`		`- if (HighLogic.CurrentGame.CrewRoster.Crew.FirstOrDefault(c => c.name == crewmember) != null) //there's already a kerbal with that name (sadness :( )`
	`304`	`+ if (HighLogic.CurrentGame.CrewRoster.Exists(crewmember)) //there's already a kerbal with that name (sadness :( )`
`311`	`305`	`{`
`312`	`306`	`//alright, rename this kerbal to a new name`
`313`	`307`	`string newName = RenameKerbal(crewmember);`
`314`	`308`	`newCrew.ChangeName(newName);`
`315`	`309`	`crewValue.value = newName;`
`316`	`310`	`}`
	`311`	`+ Log($"Creating crewmember {newCrew.name}");`
`317`	`312`	`//add the crew member to the crew roster`
`318`	`313`	`//the function to do this is hidden for some reason. yay!`
`319`	`314`	`HighLogic.CurrentGame.CrewRoster.AddCrewMember(newCrew); //no longer hidden! MORE YAY!`
	`315`	`+ crewAdded.Add(newCrew);`
`320`	`316`	`}`
`321`	`317`	`foreach (string crewmember in toRemove) //remove all crews that shouldn't be here anymore`
`322`	`318`	`{`
`@@ -325,6 +321,7 @@ public void ImportVessel(string name)`
`325`	`321`	`{`
`326`	`322`	`if (val.name == "crew" && val.value == crewmember)`
`327`	`323`	`{`
	`324`	`+ Log($"Removing non-valid crew member {val.value}");`
`328`	`325`	`partNode.values.Remove(val);`
`329`	`326`	`break;`
`330`	`327`	`}`
`@@ -335,7 +332,7 @@ public void ImportVessel(string name)`
`335`	`332`	`}`
`336`	`333`	`catch (Exception ex)`
`337`	`334`	`{`
`338`		`- Debug.Log("[ShipSaveSplicer] Encountered exception while transferring crew. The exception follows. Stripping crew data.");`
	`335`	`+ Log("Encountered exception while transferring crew. The exception follows. Stripping crew data.");`
`339`	`336`	`Debug.LogException(ex);`
`340`	`337`
`341`	`338`	`StripCrew(vesselNode);`
`@@ -349,15 +346,19 @@ public void ImportVessel(string name)`
`349`	`346`	`}`
`350`	`347`
`351`	`348`	`ProtoVessel addedVessel = HighLogic.CurrentGame.AddVessel(vesselNode);`
`352`		`- //we might have to assign the kerbals to the vessel here`
`353`		`-`
`354`		`- //related issue, in 1.2.2 (at least) we fail validation of assignments when there are two ships with the same part ids (guessing).`
`355`		`- //All I know is that if I terminate the original flight, I can import crew. Otherwise it NREs when I save.`
	`349`	`+ foreach (ProtoCrewMember crew in crewAdded)`
	`350`	`+ {`
	`351`	`+ Log($"Assigning {crew.name}");`
	`352`	`+ addedVessel.AddCrew(crew);`
	`353`	`+ }`
	`354`	`+ //In 1.2.2+ saving fails when there are two copies of a ship with crew onboard both. Might be part ID related.`
	`355`	`+ //All I know is that if I terminate the original flight, I can import crew. Otherwise it NREs when it tries to save the flight state.`
`356`	`356`	`}`
`357`	`357`	`}`
`358`	`358`
`359`	`359`	`private void StripCrew(ConfigNode vesselNode)`
`360`	`360`	`{`
	`361`	`+ Log("Stripping out crew information");`
`361`	`362`	`foreach (ConfigNode partNode in vesselNode.GetNodes("PART"))`
`362`	`363`	`{`
`363`	`364`	`if (partNode.HasValue("crew"))`
`@@ -395,7 +396,9 @@ public void CreateFolder()`
`395`	`396`	`{`
`396`	`397`	`string filename = KSPUtil.ApplicationRootPath + "/Ships/export/";`
`397`	`398`	`if (!System.IO.Directory.Exists(filename))`
	`399`	`+ {`
`398`	`400`	`System.IO.Directory.CreateDirectory(filename);`
	`401`	`+ }`
`399`	`402`	`}`
`400`	`403`
`401`	`404`	`public List<string> InvalidParts(ConfigNode vesselNode)`
`@@ -408,21 +411,51 @@ public List<string> InvalidParts(ConfigNode vesselNode)`
`408`	`411`	`{`
`409`	`412`	`string partName = PartNameFromNode(partNode);`
`410`	`413`	`if (!invalid.Contains(partName) && PartLoader.getPartInfoByName(partName) == null) //don't add duplicates`
	`414`	`+ {`
`411`	`415`	`invalid.Add(partName);`
	`416`	`+ }`
`412`	`417`	`}`
`413`	`418`	`return invalid;`
`414`	`419`	`}`
`415`	`420`
	`421`	`+ public bool WarnOfInvalidParts(ConfigNode vesselNode, bool importing)`
	`422`	`+ {`
	`423`	`+ List<string> invalidParts = InvalidParts(vesselNode);`
	`424`	`+ if (invalidParts.Count > 0)`
	`425`	`+ {`
	`426`	`+ string action = importing ? "impoerted" : "converted";`
	`427`	`+ StringBuilder msg = new StringBuilder($"The selected vessel cannot be {action} because it contains the following invalid parts (perhaps you removed a mod?):").AppendLine();`
	`428`	`+ foreach (string invalid in invalidParts)`
	`429`	`+ {`
	`430`	`+ msg.Append(" ").AppendLine(invalid);`
	`431`	`+ }`
	`432`	`+`
	`433`	`+ PopupDialog.SpawnPopupDialog(new Vector2(0.5f, 0.5f), new Vector2(0.5f, 0.5f), "missingPartsPopup", "Missing Parts", msg.ToString(), "Ok", false, HighLogic.UISkin);`
	`434`	`+ return true;`
	`435`	`+ }`
	`436`	`+ return false;`
	`437`	`+ }`
	`438`	`+`
`416`	`439`	`public string PartNameFromNode(ConfigNode part)`
`417`	`440`	`{`
`418`	`441`	`string name = part.GetValue("part");`
`419`	`442`	`if (name != null)`
	`443`	`+ {`
`420`	`444`	`name = name.Split('_')[0];`
	`445`	`+ }`
`421`	`446`	`else`
	`447`	`+ {`
`422`	`448`	`name = part.GetValue("name");`
	`449`	`+ }`
	`450`	`+`
`423`	`451`	`return name;`
`424`	`452`	`}`
`425`	`453`
	`454`	`+ public void Log(object msg)`
	`455`	`+ {`
	`456`	`+ Debug.Log("[ShipSaveSplicer] " + msg.ToString());`
	`457`	`+ }`
	`458`	`+`
`426`	`459`	`/* The following is directly from Claw's InflightShipSave and credit goes to the original author */`
`427`	`460`	`private void CleanEditorNodes(ConfigNode CN)`
`428`	`461`	`{`
`@@ -467,11 +500,11 @@ private void PristineNodes(ConfigNode CN)`
`467`	`500`	`{`
`468`	`501`	`string PartName = ((CN.GetValue("part")).Split('_'))[0];`
`469`	`502`
`470`		`- Debug.LogWarning("PART: " + PartName);`
	`503`	`+ Log("PART: " + PartName);`
`471`	`504`
`472`	`505`	`Part NewPart = PartLoader.getPartInfoByName(PartName).partPrefab;`
`473`	`506`	`ConfigNode NewPartCN = new ConfigNode();`
`474`		`- Debug.LogWarning("New Part: " + NewPart.name);`
	`507`	`+ Log("New Part: " + NewPart.name);`
`475`	`508`
`476`	`509`	`NewPart.InitializeModules();`
`477`	`510`
`@@ -510,7 +543,7 @@ private void PristineNodes(ConfigNode CN)`
`510`	`543`	`}`
`511`	`544`	`}`
`512`	`545`	`/*`
`513`		`-Copyright (C) 2017 Michael Marvin`
	`546`	`+Copyright (C) 2018 Michael Marvin`
`514`	`547`
`515`	`548`	`This program is free software: you can redistribute it and/or modify`
`516`	`549`	`it under the terms of the GNU General Public License as published by`