diff --git a/DFInterface.zip b/DFInterface.zip index b6ab643..822ce19 100644 Binary files a/DFInterface.zip and b/DFInterface.zip differ diff --git a/DFInterface/DFInterface.csproj b/DFInterface/DFInterface.csproj index e5e043f..e6dbbad 100644 --- a/DFInterface/DFInterface.csproj +++ b/DFInterface/DFInterface.csproj @@ -31,7 +31,8 @@ 4 - + + False ..\..\Assembly-CSharp.dll diff --git a/DFInterface/KerbalInfo.cs b/DFInterface/KerbalInfo.cs index ec4c2ba..45b20bd 100644 --- a/DFInterface/KerbalInfo.cs +++ b/DFInterface/KerbalInfo.cs @@ -16,9 +16,6 @@ */ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using UnityEngine; namespace DF @@ -61,10 +58,10 @@ public static KerbalInfo Load(ConfigNode node) Debug.Log("DFInterface - Load of GUID VesselID for frozen kerbal failed Err: " + ex); } info.partID = GetNodeValue(node, "partID", (uint)0); - info.vesselName = GetNodeValue(node, "VesselName", ""); + info.vesselName = GetNodeValue(node, "VesselName", " "); info.seatIdx = GetNodeValue(node, "seatIdx", 0); info.seatName = GetNodeValue(node, "seatName", ""); - info.experienceTraitName = GetNodeValue(node, "experienceTraitName", ""); + info.experienceTraitName = GetNodeValue(node, "experienceTraitName", " "); return info; } diff --git a/DFInterface/Properties/AssemblyInfo.cs b/DFInterface/Properties/AssemblyInfo.cs index f2e080c..58ea620 100644 --- a/DFInterface/Properties/AssemblyInfo.cs +++ b/DFInterface/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following @@ -32,6 +31,6 @@ // 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("0.3.*")] -[assembly: AssemblyFileVersion("0.3.0.0")] -[assembly: KSPAssembly("DFInterface", 0, 3)] \ No newline at end of file +[assembly: AssemblyVersion("0.4.*")] +[assembly: AssemblyFileVersion("0.4.0.0")] +[assembly: KSPAssembly("DFInterface", 0, 4)] \ No newline at end of file diff --git a/DeepFreeze.zip b/DeepFreeze.zip index 1b8831a..cb2f67e 100644 Binary files a/DeepFreeze.zip and b/DeepFreeze.zip differ diff --git a/GameData/REPOSoftTech/DFInterface/Plugins/DFInterface.dll b/GameData/REPOSoftTech/DFInterface/Plugins/DFInterface.dll index 6138a69..0b32a52 100644 Binary files a/GameData/REPOSoftTech/DFInterface/Plugins/DFInterface.dll and b/GameData/REPOSoftTech/DFInterface/Plugins/DFInterface.dll differ diff --git a/GameData/REPOSoftTech/DeepFreeze/DeepFreezeContinued.version b/GameData/REPOSoftTech/DeepFreeze/DeepFreezeContinued.version index c43efce..188afe8 100644 --- a/GameData/REPOSoftTech/DeepFreeze/DeepFreezeContinued.version +++ b/GameData/REPOSoftTech/DeepFreeze/DeepFreezeContinued.version @@ -2,8 +2,8 @@ "NAME":"DeepFreeze Continued...", "URL":"http://ksp-avc.cybutek.net/version.php?id=183", "DOWNLOAD":"https://kerbalstuff.com/mod/895/DeepFreeze%20Continued...", -"VERSION":{"MAJOR":0,"MINOR":19,"PATCH":1,"BUILD":0}, -"KSP_VERSION":{"MAJOR":1,"MINOR":0,"PATCH":4}, +"VERSION":{"MAJOR":0,"MINOR":19,"PATCH":3,"BUILD":0}, +"KSP_VERSION":{"MAJOR":1,"MINOR":0,"PATCH":5}, "KSP_VERSION_MIN":{"MAJOR":1,"MINOR":0,"PATCH":0}, -"KSP_VERSION_MAX":{"MAJOR":1,"MINOR":0,"PATCH":4} +"KSP_VERSION_MAX":{"MAJOR":1,"MINOR":0,"PATCH":5} } \ No newline at end of file diff --git a/GameData/REPOSoftTech/DeepFreeze/Plugins/DFInterface.dll b/GameData/REPOSoftTech/DeepFreeze/Plugins/DFInterface.dll index 6138a69..0b32a52 100644 Binary files a/GameData/REPOSoftTech/DeepFreeze/Plugins/DFInterface.dll and b/GameData/REPOSoftTech/DeepFreeze/Plugins/DFInterface.dll differ diff --git a/GameData/REPOSoftTech/DeepFreeze/Plugins/DeepFreeze.dll b/GameData/REPOSoftTech/DeepFreeze/Plugins/DeepFreeze.dll index 43c7396..7366fdf 100644 Binary files a/GameData/REPOSoftTech/DeepFreeze/Plugins/DeepFreeze.dll and b/GameData/REPOSoftTech/DeepFreeze/Plugins/DeepFreeze.dll differ diff --git a/Source/Changelog.txt b/Source/Changelog.txt index cca8af9..304386a 100644 --- a/Source/Changelog.txt +++ b/Source/Changelog.txt @@ -1,4 +1,6 @@ -[B]V0.19.2.0 "Bug fixes & Enhancements"[/B] +[B]V0.19.3.0 "KSP 1.0.5"[/B] +re-compile for KSP 1.0.5. +[B]V0.19.2.0 "Bug fixes & Enhancements"[/B] Fix distribution to include missing Editor group icon from V0.19.0.0 that somehow got left out of V0.19.1.0. Fix bug that V0.19.2.0 introduced that was causing invalid seat placements and Add more robust checking of Seat placements for frozen kerbals to avoid bugs that have been occurring for some users. diff --git a/Source/DFInterface/DFInterface.csproj b/Source/DFInterface/DFInterface.csproj index e5e043f..e6dbbad 100644 --- a/Source/DFInterface/DFInterface.csproj +++ b/Source/DFInterface/DFInterface.csproj @@ -31,7 +31,8 @@ 4 - + + False ..\..\Assembly-CSharp.dll diff --git a/Source/DFInterface/KerbalInfo.cs b/Source/DFInterface/KerbalInfo.cs index ec4c2ba..45b20bd 100644 --- a/Source/DFInterface/KerbalInfo.cs +++ b/Source/DFInterface/KerbalInfo.cs @@ -16,9 +16,6 @@ */ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using UnityEngine; namespace DF @@ -61,10 +58,10 @@ public static KerbalInfo Load(ConfigNode node) Debug.Log("DFInterface - Load of GUID VesselID for frozen kerbal failed Err: " + ex); } info.partID = GetNodeValue(node, "partID", (uint)0); - info.vesselName = GetNodeValue(node, "VesselName", ""); + info.vesselName = GetNodeValue(node, "VesselName", " "); info.seatIdx = GetNodeValue(node, "seatIdx", 0); info.seatName = GetNodeValue(node, "seatName", ""); - info.experienceTraitName = GetNodeValue(node, "experienceTraitName", ""); + info.experienceTraitName = GetNodeValue(node, "experienceTraitName", " "); return info; } diff --git a/Source/DeepFreeze.cs b/Source/DeepFreeze.cs index e5c8f2f..c001010 100644 --- a/Source/DeepFreeze.cs +++ b/Source/DeepFreeze.cs @@ -271,8 +271,10 @@ internal void ThawFrozenCrew(String FrozenCrew, Guid vesselID) if (kerbal != null) { Vessel vessel = FlightGlobals.Vessels.Find(v => v.id == vesselID); + this.Log_Debug("vessel mainbody" + vessel.mainBody.name + " is homeworld? " + vessel.mainBody.isHomeWorld); + if (vessel == null || - (vessel.mainBody == FlightGlobals.Bodies[1] + (vessel.mainBody.isHomeWorld && (vessel.situation == Vessel.Situations.LANDED || vessel.situation == Vessel.Situations.PRELAUNCH || vessel.situation == Vessel.Situations.SPLASHED))) { if (HighLogic.CurrentGame.Mode == Game.Modes.CAREER) diff --git a/Source/Properties/AssemblyInfo.cs b/Source/Properties/AssemblyInfo.cs index 95c6c87..62e2cb4 100644 --- a/Source/Properties/AssemblyInfo.cs +++ b/Source/Properties/AssemblyInfo.cs @@ -31,7 +31,7 @@ // 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("0.19.2.0")] -[assembly: AssemblyFileVersion("0.19.2.0")] +[assembly: AssemblyVersion("0.19.3.0")] +[assembly: AssemblyFileVersion("0.19.3.0")] [assembly: KSPAssembly("DeepFreeze", 0, 19)] -[assembly: KSPAssemblyDependency("DFInterface", 0, 3)] \ No newline at end of file +[assembly: KSPAssemblyDependency("DFInterface", 0, 4)] \ No newline at end of file diff --git a/Source/ksp_dir.txt b/Source/ksp_dir.txt index dc0e460..c9fa190 100644 --- a/Source/ksp_dir.txt +++ b/Source/ksp_dir.txt @@ -1 +1 @@ -C:\KSP_win 1.0.4 Test \ No newline at end of file +C:\KSP_win 1.0.5 \ No newline at end of file diff --git a/Source/utilities.cs b/Source/utilities.cs index 2b48e14..6a37c60 100644 --- a/Source/utilities.cs +++ b/Source/utilities.cs @@ -385,15 +385,15 @@ internal static void CheckPortraitCams(Vessel vessel) { if (thatKerbal.InPart == null) { - //Log_Debug("kerbal " + thatKerbal.name + " Invessel = null add stowaway"); + Log_Debug("kerbal " + thatKerbal.name + " Invessel = null add stowaway"); stowaways.Add(thatKerbal); } else { - //Log_Debug("kerbal " + thatKerbal.name + " Invessel = " + thatKerbal.InVessel + " InvesselID = " + thatKerbal.InVessel.id); + Log_Debug("kerbal " + thatKerbal.name + " Invessel = " + thatKerbal.InVessel + " InvesselID = " + thatKerbal.InVessel.id); if (thatKerbal.InVessel.id != FlightGlobals.ActiveVessel.id) { - //Log_Debug("Adding stowaway"); + Log_Debug("Adding stowaway"); stowaways.Add(thatKerbal); } } @@ -409,25 +409,25 @@ internal static void CheckPortraitCams(Vessel vessel) List crewparts = (from p in vessel.parts where (p.CrewCapacity > 0 && p.internalModel != null) select p).ToList(); foreach (Part part in crewparts) { - //Log_Debug("Check Portraits for part " + part.name); + Log_Debug("Check Portraits for part " + part.name); foreach (InternalSeat seat in part.internalModel.seats) { - //Log_Debug("checking Seat " + seat.seatTransformName); - //if (seat.kerbalRef != null) Log_Debug("kerbalref=" + seat.kerbalRef.crewMemberName); - //else Log_Debug("Seat kerbalref is null"); + Log_Debug("checking Seat " + seat.seatTransformName); + if (seat.kerbalRef != null) Log_Debug("kerbalref=" + seat.kerbalRef.crewMemberName); + else Log_Debug("Seat kerbalref is null"); if (seat.kerbalRef != null && !KerbalGUIManager.ActiveCrew.Contains(seat.kerbalRef)) { - //Log_Debug("Checking crewstatus " + seat.kerbalRef.protoCrewMember.rosterStatus + " " + seat.kerbalRef.protoCrewMember.type); + Log_Debug("Checking crewstatus " + seat.kerbalRef.protoCrewMember.rosterStatus + " " + seat.kerbalRef.protoCrewMember.type); if (seat.kerbalRef.protoCrewMember.rosterStatus != ProtoCrewMember.RosterStatus.Dead || seat.kerbalRef.protoCrewMember.type != ProtoCrewMember.KerbalType.Unowned) { - //Log_Debug("Adding missing Portrait for " + seat.kerbalRef.crewMemberName); + Log_Debug("Adding missing Portrait for " + seat.kerbalRef.crewMemberName); KerbalGUIManager.AddActiveCrew(seat.kerbalRef); } } } } } - //else Log_Debug("Vessel is not active vessel"); + else Log_Debug("Vessel is not active vessel"); } // The following method is taken from RasterPropMonitor as-is. Which is covered by GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 diff --git a/TACLSTempFixDLLs.zip b/TACLSTempFixDLLs.zip index d626bfd..c95236d 100644 Binary files a/TACLSTempFixDLLs.zip and b/TACLSTempFixDLLs.zip differ