Fix for DLC: apply kerbalEVA* patches to the core EVA configuration o…

…nly.
Kerbalism · Jul 2, 2019 · 040603d · 040603d
1 parent ec400b5
commit 040603d
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@
 * Configs for SoundingRockets (Arthur, Breach Candy)
 * Fixed DMOS experiment restriction to plantary space. This breaks some DMOS contracts that require experiments in solar orbit (Sir Mortimer)
 * Improved shielding efficiency calculation (Free Thinker)
+* Fixed the configuration for EVA kerbals, a problem introduced by Serenity (Sir Mortimer)
 
 ## v3.0.2 for all versions of KSP from 1.4.0 to 1.7.x
 

diff --git a/GameData/KerbalismConfig/Profiles/Default.cfg b/GameData/KerbalismConfig/Profiles/Default.cfg
@@ -964,7 +964,7 @@ PARTUPGRADE:NEEDS[ProfileDefault]
 // Add scrubber process to EVA kerbals
 // ============================================================================
 
-@PART[kerbalEVA*]:NEEDS[ProfileDefault]:FOR[Kerbalism]
+@PART[kerbalEVA*]:HAS[@MODULE[ModuleTripLogger]]:NEEDS[ProfileDefault]:FOR[Kerbalism]
 {
   MODULE
   {

diff --git a/GameData/KerbalismConfig/System/Habitat.cfg b/GameData/KerbalismConfig/System/Habitat.cfg
@@ -227,7 +227,7 @@
 // Add Atmosphere capacity to EVA Kerbals
 // ============================================================================
 
-@PART[kerbalEVA*]:NEEDS[FeatureHabitat]:FOR[Kerbalism]
+@PART[kerbalEVA*]:HAS[@MODULE[ModuleTripLogger]]:NEEDS[FeatureHabitat]:FOR[Kerbalism]
 {
   RESOURCE
   {
@@ -242,7 +242,7 @@
 // Add WasteAtmosphere capacity to EVA Kerbals
 // ============================================================================
 
-@PART[kerbalEVA*]:NEEDS[FeaturePoisoning]:FOR[Kerbalism]
+@PART[kerbalEVA*]:HAS[@MODULE[ModuleTripLogger]]:NEEDS[FeaturePoisoning]:FOR[Kerbalism]
 {
   RESOURCE
   {

diff --git a/GameData/KerbalismConfig/System/ScienceRework/HardDriveConfigs.cfg b/GameData/KerbalismConfig/System/ScienceRework/HardDriveConfigs.cfg
@@ -33,7 +33,15 @@
 	}
 }
 
-@PART[ScienceBox,kerbalEVA*]:NEEDS[FeatureScience]
+@PART[ScienceBox]:NEEDS[FeatureScience]
+{
+	MODULE
+	{
+		name = HardDrive
+	}
+}
+
+@PART[kerbalEVA*]:HAS[@MODULE[ModuleTripLogger]]:NEEDS[FeatureScience]
 {
 	MODULE
 	{
@@ -238,7 +246,7 @@
 		@sampleCapacity = #$@KERBALISM_HDD_SIZES/STOCK/RC-L01/samples$
 	}
 }
-@PART[kerbalEVA*]:NEEDS[FeatureScience]:FOR[Kerbalism]
+@PART[kerbalEVA*]:HAS[@MODULE[ModuleTripLogger]]:NEEDS[FeatureScience]:FOR[Kerbalism]
 {
 	@MODULE[HardDrive]
 	{
@@ -416,7 +424,7 @@
 // Removing EVA Drive upgrades (they cannot work due to how stock handles the upgrades)
 // They're harmless, but simply avoiding unnecessary upgrade spam.
 // ============================================================================
-@PART[kerbalEVA*]:NEEDS[FeatureScience]:FOR[zzzKerbalism]
+@PART[kerbalEVA*]:HAS[@MODULE[ModuleTripLogger]]:NEEDS[FeatureScience]:FOR[zzzKerbalism]
 {
 	@MODULE[HardDrive]
 	{
@@ -471,4 +479,4 @@
 			}
 		}
 	}
-}
+}
diff --git a/GameData/KerbalismConfig/System/ScienceRework/NewScience.cfg b/GameData/KerbalismConfig/System/ScienceRework/NewScience.cfg
@@ -80,7 +80,7 @@
 		experiment_id = infraredTelescope
 	}
 }
-@PART[kerbalEVA*]:NEEDS[FeatureScience]
+@PART[kerbalEVA*]:HAS[@MODULE[ModuleTripLogger]]:NEEDS[FeatureScience]
 {
 	!MODULE:HAS[#experimentID[surfaceSample]]	{}
 	!MODULE:HAS[#experimentID[evaReport]]		{}
@@ -411,7 +411,7 @@
 // Nerfing EC cost for EVA kerbals for surface sample, otherwise it's unuseable
 // Done this way because of groups that include the surface sample.
 // ============================================================================
-@PART[kerbalEVA*]:NEEDS[FeatureScience]:AFTER[Kerbalism]
+@PART[kerbalEVA*]:HAS[@MODULE[ModuleTripLogger]]:NEEDS[FeatureScience]:AFTER[Kerbalism]
 {
 	@MODULE[Experiment]:HAS[#experiment_id[surfaceSample]]
 	{

diff --git a/GameData/KerbalismConfig/System/ScienceRework/StockExperimentStorage.cfg b/GameData/KerbalismConfig/System/ScienceRework/StockExperimentStorage.cfg
@@ -14,7 +14,7 @@
 	}
 }
 
-@PART[*]:HAS[@MODULE[ModuleScienceExperiment],!MODULE[HardDrive]]:NEEDS[FeatureScience]:AFTER[zzzKerbalism]
+@PART[!kerbalEVA*]:HAS[@MODULE[ModuleScienceExperiment],!MODULE[HardDrive]]:NEEDS[FeatureScience]:AFTER[zzzKerbalism]
 {
 	MODULE
 	{

diff --git a/GameData/KerbalismConfig/System/Signal.cfg b/GameData/KerbalismConfig/System/Signal.cfg
@@ -48,7 +48,7 @@
 // add Antenna to EVA suits
 // ============================================================================
 
-@PART[kerbalEVA*]:FOR[zzzKerbalism]
+@PART[kerbalEVA*]:HAS[@MODULE[ModuleTripLogger]]:FOR[zzzKerbalism]
 {
 	%MODULE[ModuleCommand]
 	{
@@ -62,7 +62,7 @@
 // EVA Kerbals can remote control a probe
 // ============================================================================
 
-@PART[kerbalEVA*]:FOR[Kerbalism]
+@PART[kerbalEVA*]:HAS[@MODULE[ModuleTripLogger]]:FOR[Kerbalism]
 {
 	%MODULE[ModuleProbeControlPoint]
 	{