Skip to content

Commit

Permalink
5.1.3.2 Final
Browse files Browse the repository at this point in the history
  • Loading branch information
PapaJoesSoup committed Jan 17, 2017
1 parent 909f614 commit 456c659
Show file tree
Hide file tree
Showing 13 changed files with 177 additions and 133 deletions.
21 changes: 17 additions & 4 deletions ShipManifest/Distribution/ChangeLog.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
Version 5.1.3.1 - Release 15 Nov 2016 - KSP 1.2.1 Compatibility Edition
- Fixed: Create Kerbal fails.
Version 5.1.3.2 - Release 16 Jan 2017 - KSP 1.2.2 Compatibility Edition
- New: Refactored for KSP 1.2.2
- Fixed: Enumeration error when opening or closing more than one hatch at the same time.
- Fixed: Respawn Kerbal fails. Github issue # 35.
- Fixed: Opening/closing hatches via a part's tweakable doesn't properly update the transfer windows xfer/eva buttons when CLS spaces change.
- Fixed: Fill buttons do not have tooltips. Can be confusing as to their behavior.
- Fixed: Part level fill buttons do not behave as expected by users. Should not be available in flight with realism on.
- Fixed: Roster and Settings Icons sometimes appear in flight scene. Should only be in Space Center Scene.
- Fixed: Highlighting is disabled temporarily when hatches are opened and closed.
- Fixed: Resource selection in the Manifest window is behaving erratically. Resources are disappearing in the display when multiple selections are made.
- Fixed: Vessel to vessel transfers are failing with an NRE in ShipManifest.SMVessel.UpdateDockedVessels. http://forum.kerbalspaceprogram.com/index.php?/topic/56643-121-ship-manifest-crew-science-resources-v-5131-15-nov-16/&do=findComment&comment=2881063
- Fixed: Sometimes crew transfers do not work.

Version 5.1.3.1 - Release 15 Nov 2016 - KSP 1.2.1 Compatibility Edition
- Fixed: Create Kerbal fails. Github issue # 33.
- Fixed: Rename Kerbal changes do not show up after change.
- Fixed: Removed Mod Button from Settings Window. Was there in error.

Expand All @@ -20,8 +33,8 @@ Version 5.1.2.2 - Release 21 Aug, 2016 - KSP 1.1.3 Optimization Edition.
- New: Added support for onCrewTransferPartListCreated. This allows me to intercept the Stock Crew Transfer Dialog and alter the Available parts for Transfer when CLS is enabled or DeepFreeze is installed.
The Stock transfer Part Selection now properly highlights available parts. I can also provide a custom Message for selectinga full or unreachable part.
- Fixed: Crew transfers were incorrectly playing Pumping sounds.
- Fixed: Corrected a logic error in Crew Transfers that caused crew swaps in parts that have a crew capacity greater than their internal seat count.
SM now properly supports "Standing Room Only Transfers".
- Fixed: Corrected a logic error in Crew Transfers that caused crew swaps in parts that have a crew capacity greater than their internal seat count. Github Issue #29.
SM now properly supports "Standing Room Only Transfers".

Version 5.1.2.1 - Release 24 Jul, 2016 - KSP 1.1.3 Optimization Edition.
- Fixed: Enumeration error on kerbal action in Roster Window. Moved action to outside enumerator, so change to list does not throw error.
Expand Down
Binary file modified ShipManifest/Distribution/GameData/ShipManifest/Plugins/CLSInterfaces.dll
View file
Binary file not shown.
Binary file modified ShipManifest/Distribution/GameData/ShipManifest/Plugins/ShipManifest.dll
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions ShipManifest/Distribution/GameData/ShipManifest/ShipManifest.version
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
"MAJOR": 5,
"MINOR": 1,
"PATCH": 3,
"BUILD": 1
"BUILD": 2
},
"KSP_VERSION": {
"MAJOR": 1,
"MINOR": 2,
"PATCH": 1
"PATCH": 2
},
"KSP_VERSION_MIN": {
"MAJOR": 1,
Expand Down
112 changes: 60 additions & 52 deletions ShipManifest/InternalObjects/SMConditions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ internal static bool IsShipControllable()
return (SMAddon.SmVessel.Vessel.IsControllable && SMSettings.RealismMode) || !SMSettings.RealismMode;
}

internal static bool IsInPreflight()
{
return SMAddon.SmVessel.IsRecoverable && SMAddon.SmVessel.Vessel.Landed;
}

internal static bool CanResourceBeXferred(TransferPump.TypePump thisXferMode, double maxXferAmount)
{
return (!TransferPump.PumpProcessOn && maxXferAmount > 0) ||
Expand All @@ -41,6 +46,7 @@ internal static bool CanKerbalsBeXferred(Part sourcePart, Part targetPart)

return CanKerbalsBeXferred(sourceParts, targetParts);
}

internal static bool CanKerbalsBeXferred(List<Part> selectedPartsSource, List<Part> selectedPartsTarget)
{
bool results = false;
Expand Down Expand Up @@ -101,13 +107,13 @@ internal static bool CanKerbalsBeXferred(List<Part> selectedPartsSource, List<Pa
return false;
}
// now if realism mode, are the parts connected to each other in the same living space?
results = IsClsInSameSpace();
results = IsClsInSameSpace(selectedPartsSource[0], selectedPartsTarget[0]);
if (!results)
WindowTransfer.EvaToolTip = "CLS is preventing internal Crew Transfer. Click to initiate EVA operation.";
}
catch (Exception ex)
{
Utilities.LogMessage(string.Format(" in CanBeXferred. Error: {0} \r\n\r\n{1}", ex.Message, ex.StackTrace),
Utilities.LogMessage(String.Format(" in CanBeXferred. Error: {0} \r\n\r\n{1}", ex.Message, ex.StackTrace),
Utilities.LogType.Error, true);
}
if (WindowTransfer.XferToolTip == "")
Expand All @@ -122,6 +128,7 @@ internal static PartModule GetFreezerModule(Part selectedPartSource)

internal static bool IsClsInSameSpace(Part source, Part target)
{
if (source == null || target == null) return false;
bool results = false;
if (SMSettings.EnableCls && SMSettings.RealismMode)
{
Expand Down Expand Up @@ -151,55 +158,56 @@ internal static bool IsClsInSameSpace(Part source, Part target)
}
return results;
}
internal static bool IsClsInSameSpace()
{
bool results = false;
try
{
if (SMSettings.EnableCls && SMSettings.RealismMode)
{
if (SMAddon.ClsAddon.Vessel != null)
{
if (SMAddon.SmVessel.ClsSpaceSource == null || SMAddon.SmVessel.ClsSpaceTarget == null)
SMAddon.UpdateClsSpaces();
if (SMAddon.SmVessel.ClsSpaceSource != null && SMAddon.SmVessel.ClsSpaceTarget != null)
{
if (SMAddon.SmVessel.ClsSpaceSource == SMAddon.SmVessel.ClsSpaceTarget)
{
WindowTransfer.XferToolTip =
"Source & Target Part are in the same space.\r\nInternal Xfers are allowed.";
results = true;
}
else
WindowTransfer.XferToolTip =
"Source and Target parts are not in the same Living Space.\r\nKerbals will have to go EVA.";
}
else
WindowTransfer.XferToolTip =
"You should NOT be seeing this, as Source or Target Space is missing.\r\nPlease reselect source or target part.";
}
else
WindowTransfer.XferToolTip =
"You should NOT be seeing this, as CLS is not behaving correctly.\r\nPlease check your CLS installation.";
}
else
{
WindowTransfer.XferToolTip = "Realism and/or CLS disabled.\r\nXfers anywhere are allowed.";
results = true;
}
}
catch (Exception ex)
{
if (!SMAddon.FrameErrTripped)
{
Utilities.LogMessage(
string.Format(" in IsInCLS (repeating error). Error: {0} \r\n\r\n{1}", ex.Message, ex.StackTrace), Utilities.LogType.Error,
true);
SMAddon.FrameErrTripped = true;
}
}
return results;
}

//internal static bool IsClsInSameSpace()
//{
// bool results = false;
// try
// {
// if (SMSettings.EnableCls && SMSettings.RealismMode)
// {
// if (SMAddon.ClsAddon.Vessel != null)
// {
// if (SMAddon.SmVessel.ClsSpaceSource == null || SMAddon.SmVessel.ClsSpaceTarget == null)
// SMAddon.UpdateClsSpaces();
// if (SMAddon.SmVessel.ClsSpaceSource != null && SMAddon.SmVessel.ClsSpaceTarget != null)
// {
// if (SMAddon.SmVessel.ClsSpaceSource == SMAddon.SmVessel.ClsSpaceTarget)
// {
// WindowTransfer.XferToolTip =
// "Source & Target Part are in the same space.\r\nInternal Xfers are allowed.";
// results = true;
// }
// else
// WindowTransfer.XferToolTip =
// "Source and Target parts are not in the same Living Space.\r\nKerbals will have to go EVA.";
// }
// else
// WindowTransfer.XferToolTip =
// "You should NOT be seeing this, as Source or Target Space is missing.\r\nPlease reselect source or target part.";
// }
// else
// WindowTransfer.XferToolTip =
// "You should NOT be seeing this, as CLS is not behaving correctly.\r\nPlease check your CLS installation.";
// }
// else
// {
// WindowTransfer.XferToolTip = "Realism and/or CLS disabled.\r\nXfers anywhere are allowed.";
// results = true;
// }
// }
// catch (Exception ex)
// {
// if (!SMAddon.FrameErrTripped)
// {
// Utilities.LogMessage(
// string.Format(" in IsInCLS (repeating error). Error: {0} \r\n\r\n{1}", ex.Message, ex.StackTrace), Utilities.LogType.Error,
// true);
// SMAddon.FrameErrTripped = true;
// }
// }
// return results;
//}

internal static bool CanShowShipManifest(bool ignoreShowSm = false)
{
Expand Down Expand Up @@ -239,7 +247,7 @@ internal static bool CanShowShipManifest(bool ignoreShowSm = false)
(CameraManager.Instance.currentCameraMode != CameraManager.CameraMode.IVA);

Utilities.LogMessage(
string.Format(" in CanShowShipManifest (repeating error). Error: {0} \r\n\r\n{1}\r\n\r\nValues: {2}",
String.Format(" in CanShowShipManifest (repeating error). Error: {0} \r\n\r\n{1}\r\n\r\nValues: {2}",
ex.Message, ex.StackTrace, values), Utilities.LogType.Error, true);
SMAddon.FrameErrTripped = true;
}
Expand Down
2 changes: 1 addition & 1 deletion ShipManifest/LocalDev/ksp_dir.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
C:\Games\KSP\Kerbal Space Program1.2.1
C:\Games\KSP\Kerbal Space Program1.2.2
6 changes: 3 additions & 3 deletions ShipManifest/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("PapaJoe's SOUP")]
[assembly: AssemblyProduct("ShipManifest")]
[assembly: AssemblyCopyright("Copyright © 2013-2016")]
[assembly: AssemblyCopyright("Copyright © 2013-2017")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -35,5 +35,5 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]

[assembly: AssemblyVersion("5.1.3.1")]
[assembly: AssemblyFileVersion("5.1.3.1")]
[assembly: AssemblyVersion("5.1.3.2")]
[assembly: AssemblyFileVersion("5.1.3.2")]
Loading

0 comments on commit 456c659

Please sign in to comment.