Merge pull request #116 from KSP-RO/Develop

Fixes for Making History

Author: JPLRepo

GameData/ThunderAerospace/ChangeLog.txt

@@ -1,3 +1,6 @@
+V0.13.11
+	Add test subject to Making History parts.
+	Fix LS resources not appearing for Female Kerbals on EVA without Making History installed.
 V0.13.10
 	Re-compile for KSP 1.5.x.
 	Should now show converter name in converter part extended part tooltip in VAB/SPH.	

GameData/ThunderAerospace/TacLifeSupport/MM_CrewablePartTests.cfg

@@ -1,5 +1,5 @@
 // Add the test subject module for all stock crewable parts. This will make the contract system generate part tests for them.
-@PART[Mark1-2Pod|cupola|Mark1Cockpit|Mark2Cockpit|landerCabinSmall|mk2Cockpit_Inline|mk1pod|mk2LanderCabin|mk2Cockpit_Standard|mk3Cockpit_Shuttle|crewCabin|]:HAS[!MODULE[ModuleTestSubject]]:FOR[TacLifeSupport]
+@PART[Mark1-2Pod|Mark1-3Pod|cupola|Mark1Cockpit|Mark2Cockpit|landerCabinSmall|mk2Cockpit_Inline|mk1pod_v2|mk2LanderCabin|mk2Cockpit_Standard|mk3Cockpit_Shuttle|crewCabin|]:HAS[!MODULE[ModuleTestSubject]]:FOR[TacLifeSupport]
 {
 	MODULE
 	{
@@ -10,3 +10,14 @@
 		useEvent = True
 	}
 }
+@PART[Mk2Pod|kv1Pod|kv2Pod|kv3Pod|MEMLander]:HAS[!MODULE[ModuleTestSubject]]:NEEDS[SquadExpansion/MakingHistory]:FOR[TacLifeSupport]
+{
+    MODULE
+    {
+        name = ModuleTestSubject
+        // nowhere: 0, srf: 1, ocean: 2, atmo: 4, space: 8
+        environments = 15
+        useStaging = False
+        useEvent = True
+    }
+} 

GameData/ThunderAerospace/TacLifeSupport/TacLifeSupport.version

@@ -3,7 +3,7 @@
   "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.13.10.0",
+  "VERSION": "0.13.11.0",
   "KSP_VERSION": {
     "MAJOR": 1,
     "MINOR": 5,

…rAerospace/TacLifeSupport_v0.13.10.0.txt …rAerospace/TacLifeSupport_v0.13.11.0.txtGameData/ThunderAerospace/TacLifeSupport_v0.13.10.0.txt renamed to GameData/ThunderAerospace/TacLifeSupport_v0.13.11.0.txt GameData/ThunderAerospace/TacLifeSupport_v0.13.10.0.txt renamed to GameData/ThunderAerospace/TacLifeSupport_v0.13.11.0.txt

@@ -1,3 +1,3 @@
-You have installed the TAC Life Support, version 0.13.10.0 (+ ).
+You have installed the TAC Life Support, version 0.13.11.0 (+ ).
 
 See the Readme.txt and LICENSE.txt files for more information.

Source/AddLifeSupport.cs

@@ -27,6 +27,7 @@
  */
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
 
@@ -53,10 +54,13 @@ public void run()
 
                 try
                 {
-                    var evaParts = PartLoader.LoadedPartsList.Where(p => p.name.Contains("kerbalEVA"));
-                    foreach (var evaPart in evaParts)
+                    IEnumerable<AvailablePart> evaParts = PartLoader.LoadedPartsList.Where(p => p.name.Contains("kerbalEVA"));
+                    foreach (AvailablePart evaPart in evaParts)
                     {
-                        EvaAddLifeSupport(evaPart);
+                        if (evaPart.partPrefab != null && evaPart.partPrefab.Resources != null)
+                        {
+                            EvaAddLifeSupport(evaPart);
+                        }
                     }
                 }
                 catch (Exception ex)
@@ -86,11 +90,19 @@ public void ChangeValues()
         private void EvaAddLifeSupport(AvailablePart part)
         {
             Part prefabPart = part.partPrefab;
-
+            if (prefabPart == null)
+            {
+                this.Log("Part " + part.name + " has no partPrefab");
+                return;
+            }
             this.Log("Adding resources to " + part.name + "/" + prefabPart.partInfo.title);
 
             EvaAddPartModule(prefabPart);
             if (HighLogic.CurrentGame == null) return;
+            if (prefabPart.Resources == null || !prefabPart.Resources.IsValid || prefabPart.SimulationResources == null || !prefabPart.SimulationResources.IsValid)
+            {
+                prefabPart.SetupResources();
+            }
             EvaAddResource(prefabPart, HighLogic.CurrentGame.Parameters.CustomParams<TAC_SettingsParms_Sec2>().EvaElectricityConsumptionRate, globalSettings.Electricity, false);
             EvaAddResource(prefabPart, HighLogic.CurrentGame.Parameters.CustomParams<TAC_SettingsParms_Sec2>().FoodConsumptionRate, globalSettings.Food, false);
             EvaAddResource(prefabPart, HighLogic.CurrentGame.Parameters.CustomParams<TAC_SettingsParms_Sec2>().WaterConsumptionRate, globalSettings.Water, false);
@@ -111,20 +123,13 @@ private void EvaAddPartModule(Part part)
             {
                 ConfigNode node = new ConfigNode("MODULE");
                 node.AddValue("name", "LifeSupportModule");
-                int c = part.Modules.Count;
-                bool Found = false;
-                for (int mI = 0; mI < c; ++mI)
+                node.AddValue("moduleName", "LifeSupportModule");
+                if (part.FindModuleImplementing<LifeSupportModule>() == null)
                 {
-                    if (part.Modules[mI].moduleName == "LifeSupportModule")
-                    {
-                        Found = true;
-                        break;
-                    }
-                }
-                if (!Found)
                     part.AddModule(node);
+                }
 
-                this.LogWarning("The expected exception did not happen when adding the Life Support part module to the EVA!");
+                //this.LogWarning("The expected exception did not happen when adding the Life Support part module to " + part.partInfo.name + "-" +  part.partInfo.title);
             }
             catch (Exception ex)
             {

Source/TacLifeSupport.csproj

@@ -112,7 +112,7 @@
   <PropertyGroup>
     <AssemblyMajorVersion>0</AssemblyMajorVersion>
     <AssemblyMinorVersion>13</AssemblyMinorVersion>
-    <AssemblyBuildNumber>10</AssemblyBuildNumber>
+    <AssemblyBuildNumber>11</AssemblyBuildNumber>
     <AssemblyFileMajorVersion>$(AssemblyMajorVersion)</AssemblyFileMajorVersion>
     <AssemblyFileMinorVersion>$(AssemblyMinorVersion)</AssemblyFileMinorVersion>
     <AssemblyFileBuildNumber>$(AssemblyBuildNumber)</AssemblyFileBuildNumber>