Merge pull request #119 from RedAV8R/master

TacGenericConverter Fix and move FINAL to zSDHISMS MM pass

Author: sumghai

GameData/SDHI/Service Module System/Parts/MM_configs/SDHI_SMS_MMPatch_Mk1-2Pod_umbilical.cfg

@@ -1,6 +1,7 @@
 // Module Manager patch to alter the stock Mark 1-2 Pod's texture so that it appears to have an SDHI SMS compatible umbilical receptacle
 
-@PART[Mark1-2Pod]:FINAL {
+@PART[Mark1-2Pod]:FOR[zSDHISMS]
+{
 	MODEL
 	{
    		model = Squad/Parts/Command/Mk1-2Pod/model
@@ -11,7 +12,6 @@
    		model = SDHI/Service Module System/Parts/SDHI_2.5_ServiceModule/SM_UmbilicalSocket
    		scale = 1, 1, 1
 	}
-	 
 	 MODULE
 	{
 		name = ModuleAnimateGeneric

GameData/SDHI/Service Module System/Parts/MM_configs/SDHI_SMS_MMPatch_Pebkac.cfg

@@ -5,21 +5,22 @@
 // This adds PEBKAC LES plugin support to the SDHI Launch Escape System and Mk1-2 Pod Boost Protective Cover,
 // to help automate abort sequences
 
-@PART[SDHI_LES]:NEEDS[PebkacLaunchEscape2]:FINAL {
+@PART[SDHI_LES]:NEEDS[PebkacLaunchEscape2]:FOR[zSDHISMS]
+{
 	MODULE
-    {
+	{
 		name = ModulePebkacLesController2
 		hasPitchControl = True
-		stagingEnabled = False    
-    }
+		stagingEnabled = False
+	}
 }
-
-@PART[SDHI_2.5_Mk1-2AeroShroud]:NEEDS[PebkacLaunchEscape2]:FINAL {
+@PART[SDHI_2.5_Mk1-2AeroShroud]:NEEDS[PebkacLaunchEscape2]:FOR[zSDHISMS]
+{
 	MODULE
-    {
+	{
 		name = ModulePebkacLesController2
 		hasPitchControl = False
 		stagingEnabled = False
 		jettisonsToRetro = true
-    }
-}
+	}
+}

GameData/SDHI/Service Module System/Parts/MM_configs/SDHI_SMS_MMPatch_TACLifeSupport.cfg

@@ -30,11 +30,11 @@
 // - three Kerbal days of CarbonDioxide storage
 // - eight Kerbal days of Waste storage
 // - three Kerbal days of WasteWater storage
-@PART[Mark1-2Pod]:NEEDS[TacLifeSupport]:FINAL {
-	
+@PART[Mark1-2Pod]:NEEDS[TacLifeSupport]:FOR[zSDHISMS]
+{
 	// Remove MFT support
-	!MODULE[ModuleFuelTanks] {}
-
+	!MODULE[ModuleFuelTanks]
+	{}
 	// Use replace (%) rather than edit (@), to ensure that the following values are loaded regardless of the presence/absence of MFT/RealFuels 
 	%RESOURCE[Food]
 	{
@@ -67,15 +67,12 @@
 		%maxAmount = 2.772
 	}
 }
-
-
 // Modifies the SDHI SM to provide an additional five Kerbal days of Water and Oxygen, the equivalent in WasteWater and CarbonDioxide storage, and built-in Carbon Extractors / Water Purifiers
-@PART[SDHI_2.5_ServiceModule]:NEEDS[TacLifeSupport]:FINAL {
-
+@PART[SDHI_2.5_ServiceModule]:NEEDS[TacLifeSupport]:FOR[zSDHISMS]
+{
 	// Here, we *don't* apply a MM patch to remove MFT/Real Fuels, since:
 	// - MFT/Real Fuels is needed to allow users to have reconfigurable fuel tanks or non-stock fuels
 	// - The TAC LS patch that uses MFT/RealFuels doesn't cater for the unusual situation where a Service Module is used to hold life support provisions
-	
 	RESOURCE
 	{
 		name = Water
@@ -107,8 +104,28 @@
 		name = TacGenericConverter
 		converterName = Carbon Extractor
 		conversionRate = 8.16
-		inputResources = CarbonDioxide, 0.001703210064733, ElectricCharge, 0.039783051310155
-		outputResources = Oxygen, 0.001713537562385, false, Waste, 0.000001209166498, true
+		INPUT_RESOURCE
+		{
+			ResourceName = CarbonDioxide
+			Ratio = 0.001703210064733
+		}
+		INPUT_RESOURCE
+		{
+			ResourceName = ElectricCharge
+			Ratio = 0.039783051310155
+		}
+		OUTPUT_RESOURCE
+		{
+			ResourceName = Oxygen
+			Ratio = 0.001713537562385
+			DumpExcess = false
+		}
+		OUTPUT_RESOURCE
+		{
+			ResourceName = Waste
+			Ratio = 0.000001209166498
+			DumpExcess = true
+		}
 	}
 	
 	// Standard TAC-LS Water Purifier
@@ -117,23 +134,63 @@
 		name = TacGenericConverter
 		converterName = Water Purifier
 		conversionRate = 8.16
-		inputResources = WasteWater, 0.000014247685185, ElectricCharge, 0.007123842592593
-		outputResources = Water, 0.000012822916667, false, Waste, 0.000001994675926, true
+		INPUT_RESOURCE
+		{
+			ResourceName = WasteWater
+			Ratio = 0.000014247685185
+		}
+		INPUT_RESOURCE
+		{
+			ResourceName = ElectricCharge
+			Ratio = 0.007123842592593
+		}
+		OUTPUT_RESOURCE
+		{
+			ResourceName = Water
+			Ratio = 0.000012822916667
+			DumpExcess = false
+		}
+		OUTPUT_RESOURCE
+		{
+			ResourceName = Waste
+			Ratio = 0.000001994675926
+			DumpExcess = true
+		}
 	}
 }
 
 
 // Modifies the SDHI Avionics Ring to only have the built-in Carbon Extractors / Water Purifiers
-@PART[SDHI_2.5_AvionicsRing]:NEEDS[TacLifeSupport]:FINAL {
-
+@PART[SDHI_2.5_AvionicsRing]:NEEDS[TacLifeSupport]:FOR[zSDHISMS]
+{
 	// Standard TAC-LS Carbon Extractor using the Bosch process
 	MODULE
 	{
 		name = TacGenericConverter
 		converterName = Carbon Extractor
 		conversionRate = 8.16
-		inputResources = CarbonDioxide, 0.001703210064733, ElectricCharge, 0.039783051310155
-		outputResources = Oxygen, 0.001713537562385, false, Waste, 0.000001209166498, true
+		INPUT_RESOURCE
+		{
+			ResourceName = CarbonDioxide
+			Ratio = 0.001703210064733
+		}
+		INPUT_RESOURCE
+		{
+			ResourceName = ElectricCharge
+			Ratio = 0.039783051310155
+		}
+		OUTPUT_RESOURCE
+		{
+			ResourceName = Oxygen
+			Ratio = 0.001713537562385
+			DumpExcess = false
+		}
+		OUTPUT_RESOURCE
+		{
+			ResourceName = Waste
+			Ratio = 0.000001209166498
+			DumpExcess = true
+		}
 	}
 	
 	// Standard TAC-LS Water Purifier
@@ -142,7 +199,27 @@
 		name = TacGenericConverter
 		converterName = Water Purifier
 		conversionRate = 8.16
-		inputResources = WasteWater, 0.000014247685185, ElectricCharge, 0.007123842592593
-		outputResources = Water, 0.000012822916667, false, Waste, 0.000001994675926, true
+		INPUT_RESOURCE
+		{
+			ResourceName = WasteWater
+			Ratio = 0.000014247685185
+		}
+		INPUT_RESOURCE
+		{
+			ResourceName = ElectricCharge
+			Ratio = 0.007123842592593
+		}
+		OUTPUT_RESOURCE
+		{
+			ResourceName = Water
+			Ratio = 0.000012822916667
+			DumpExcess = false
+		}
+		OUTPUT_RESOURCE
+		{
+			ResourceName = Waste
+			Ratio = 0.000001994675926
+			DumpExcess = true
+		}
 	}
-}
+}

GameData/SDHI/Service Module System/Parts/MM_configs/SDHI_SMS_MMPatch_USILifeSupport.cfg

@@ -19,8 +19,8 @@
 // Modifies the stock Mark 1-2 Pod to give, for its three-Kerbal crew, a total of:
 // - eight Kerbal days of Supplies
 // - eight Kerbal days of Mulch storage
-@PART[Mark1-2Pod]:NEEDS[USILifeSupport]:FINAL {
-	
+@PART[Mark1-2Pod]:NEEDS[USILifeSupport]:FOR[zSDHISMS]
+{
 	// Use replace (%) rather than edit (@), to ensure that the following values are loaded regardless of the presence/absence of any other patches
 	%RESOURCE[Supplies]
 	{