Skip to content

Commit

Permalink
Merge pull request #143 from KSP-RO/Develop
Browse files Browse the repository at this point in the history
Updates for 1.12.x
  • Loading branch information
JPLRepo authored Sep 19, 2021
2 parents 0aaaa9c + 55c3318 commit 267e321
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 11 deletions.
Binary file not shown.
5 changes: 5 additions & 0 deletions GameData/ThunderAerospace/ChangeLog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
V0.18.0
Re-compile for KSP 1.12.x.
Fix background resources - Kopernicus solar panels integration.
Fix background resources - NRE spam on Resource Converters.
Fix a NRE log spam on EVA kerbals - usually this involves rescue kerbals.
V0.17.0
Re-compile for KSP 1.11.x.
Fix Kopernicus Solar Panel background processing.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@
"URL": "http://ksp-avc.cybutek.net/version.php?id=9",
"DOWNLOAD": "https://github.com/KSP-RO/TacLifeSupport/releases",
"CHANGE_LOG_URL": "https://github.com/KSP-RO/TacLifeSupport/wiki/Changes",
"VERSION": "0.17.0.0",
"VERSION": "0.18.0.0",
"KSP_VERSION": {
"MAJOR": 1,
"MINOR": 11,
"MINOR": 12,
"PATCH": 0
},
"KSP_VERSION_MIN": {
"MAJOR": 1,
"MINOR": 11,
"MINOR": 12,
"PATCH": 0
},
"KSP_VERSION_MAX": {
"MAJOR": 1,
"MINOR": 11,
"MINOR": 12,
"PATCH": 99
}
}
6 changes: 5 additions & 1 deletion Source/LifeSupportController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1351,6 +1351,10 @@ private bool HaveEnoughResource(Vessel vessel, string resourceName, double amoun
/// <returns></returns>
private double CalculateElectricityConsumptionRate(Vessel vessel, VesselInfo vesselInfo)
{
if (vessel == null || vesselInfo == null)
{
return 0d;
}
if (!vessel.isEVA)
{
if (vesselInfo.numCrew == 0)
Expand All @@ -1376,7 +1380,7 @@ private double CalculateElectricityConsumptionRate(Vessel vessel, VesselInfo ves
private double ConsumeEVALightEC(Vessel vessel)
{
double returnAmount = 0;
if (vessel.isEVA && vessel.loaded)
if (vessel != null && vessel.isEVA && vessel.loaded)
{
KerbalEVA kerbalEVA = vessel.FindPartModuleImplementing<KerbalEVA>();
if (kerbalEVA != null)
Expand Down
4 changes: 2 additions & 2 deletions Source/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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("0.17.0")]
[assembly: AssemblyFileVersion("0.17.0")]
[assembly: AssemblyVersion("0.18.0")]
[assembly: AssemblyFileVersion("0.18.0")]
8 changes: 4 additions & 4 deletions Source/TacLifeSupport.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
<Import Project="$(PROGRAMFILES)\MSBuild\ExtensionPack\4.0\MSBuild.ExtensionPack.tasks" Condition="Exists('$(PROGRAMFILES)\MSBuild\ExtensionPack\4.0\MSBuild.ExtensionPack.tasks')" />
<PropertyGroup>
<AssemblyMajorVersion>0</AssemblyMajorVersion>
<AssemblyMinorVersion>17</AssemblyMinorVersion>
<AssemblyMinorVersion>18</AssemblyMinorVersion>
<AssemblyBuildNumber>0</AssemblyBuildNumber>
<AssemblyFileMajorVersion>$(AssemblyMajorVersion)</AssemblyFileMajorVersion>
<AssemblyFileMinorVersion>$(AssemblyMinorVersion)</AssemblyFileMinorVersion>
Expand All @@ -153,13 +153,13 @@
<DownloadUrl>https://github.com/KSP-RO/TacLifeSupport/releases</DownloadUrl>
<ChangelogUrl>https://github.com/KSP-RO/TacLifeSupport/wiki/Changes</ChangelogUrl>
<KspVersionMajor>1</KspVersionMajor>
<KspVersionMinor>11</KspVersionMinor>
<KspVersionMinor>12</KspVersionMinor>
<KspVersionPatch>0</KspVersionPatch>
<KspMinVersionMajor>1</KspMinVersionMajor>
<KspMinVersionMinor>11</KspMinVersionMinor>
<KspMinVersionMinor>12</KspMinVersionMinor>
<KspMinVersionPatch>0</KspMinVersionPatch>
<KspMaxVersionMajor>1</KspMaxVersionMajor>
<KspMaxVersionMinor>11</KspMaxVersionMinor>
<KspMaxVersionMinor>12</KspMaxVersionMinor>
<KspMaxVersionPatch>99</KspMaxVersionPatch>
</PropertyGroup>
<Target Name="GitInfo">
Expand Down

0 comments on commit 267e321

Please sign in to comment.