From 2f901eb0a070a49057731340a02213e1d5c14d0e Mon Sep 17 00:00:00 2001
From: LouisB3 <louisb3@gmail.com>
Date: Wed, 17 Feb 2016 13:30:57 -0500
Subject: [PATCH] Fixed issues with duplicate modules

---
 UKS-KPBS_Cupola.cfg     | 29 +++++++++++------------------
 UKS-KPBS_HabitatMk1.cfg | 30 +++++++++---------------------
 UKS-KPBS_HabitatMk2.cfg | 27 ++++++++++-----------------
 UKS-KPBS_ScienceLab.cfg | 28 ++++++++--------------------
 readme.md               |  4 ++--
 5 files changed, 40 insertions(+), 78 deletions(-)

diff --git a/UKS-KPBS_Cupola.cfg b/UKS-KPBS_Cupola.cfg
index 07e679c..a7cf3ac 100644
--- a/UKS-KPBS_Cupola.cfg
+++ b/UKS-KPBS_Cupola.cfg
@@ -1,32 +1,25 @@
-PART[KKAOSS_Cupola_g]:NEEDS[USILifeSupport]:FINAL
+@PART[KKAOSS_Cupola_g]:NEEDS[USILifeSupport]
 {
-	MODULE
-	{
-		name = ModuleLifeSupport
-	}
-	
-	RESOURCE
+	%MODULE[ModuleLifeSupport] { }
+
+	%RESOURCE[ReplacementParts]
 	{
-		name = ReplacementParts
-		amount = 100 //100 * crew capacity + 100 * Kerbal-Months
-		maxAmount = 100
+		%amount = 100 //100 * crew capacity + 100 * Kerbal-Months
+		%maxAmount = 100
 	}
-	
+
 	MODULE
 	{
 		name = ModuleHabitation
-		KerbalMonths = 0 //mass * 5
-		HabMultiplier = 1.75 //equal to mass; mutually exclusive
+		KerbalMonths = 0
+		HabMultiplier = 1.75 //equal to mass
 	}
 
-	MODULE
-	{
-		name = USI_ModuleFieldRepair
-	}
+	%MODULE[USI_ModuleFieldRepair] { }
 
 	MODULE
 	{
 		name = ModulePowerCoupler
 		PowerCouplingRange = 500
 	}
-}
\ No newline at end of file
+}
diff --git a/UKS-KPBS_HabitatMk1.cfg b/UKS-KPBS_HabitatMk1.cfg
index f506918..1b86337 100644
--- a/UKS-KPBS_HabitatMk1.cfg
+++ b/UKS-KPBS_HabitatMk1.cfg
@@ -1,15 +1,11 @@
 @PART[KKAOSS_Habitat_MK1_g]:NEEDS[USILifeSupport]
 {
-	MODULE
-	{
-		name = ModuleLifeSupport
-	}
-	
-	RESOURCE
+	%MODULE[ModuleLifeSupport] { }
+
+	%RESOURCE[ReplacementParts]
 	{
-		name = ReplacementParts
-		amount = 1150 //100 * crew capacity + 100 * Kerbal-Months
-		maxAmount = 1150
+		%amount = 1150 //100 * crew capacity + 100 * Kerbal-Months
+		%maxAmount = 1150
 	}
 
 	MODULE
@@ -17,12 +13,12 @@
 		name = ModuleHabitation
 		KerbalMonths = 8.5 //mass * 5
 	}
-	
+
 	MODULE
 	{
 		name = ModuleLifeSupportRecycler
 		CrewCapacity = 5
-		RecyclePercent = .33
+		RecyclePercent = .34
 		ConverterName = Life Support
 		tag = Life Support
 		StartActionName = Start Life Support
@@ -33,21 +29,13 @@
 			ResourceName = ElectricCharge
 			Ratio = 1 //.2 * crew capacity
 		}
-		//INPUT_RESOURCE
-		//{
-		//	ResourceName = ReplacementParts
-		//	Ratio = 0.00001 //.000002 * crew capacity
-		//}	
 	}
 
-	MODULE
-	{
-		name = USI_ModuleFieldRepair
-	}
+	%MODULE[USI_ModuleFieldRepair] { }
 
 	MODULE
 	{
 		name = ModulePowerCoupler
 		PowerCouplingRange = 500
 	}
-}
\ No newline at end of file
+}
diff --git a/UKS-KPBS_HabitatMk2.cfg b/UKS-KPBS_HabitatMk2.cfg
index eddd7d6..ce8d78d 100644
--- a/UKS-KPBS_HabitatMk2.cfg
+++ b/UKS-KPBS_HabitatMk2.cfg
@@ -1,15 +1,11 @@
 @PART[KKAOSS_Habitat_MK2_g]:NEEDS[USILifeSupport]
 {
-	MODULE
-	{
-		name = ModuleLifeSupport
-	}
-	
-	RESOURCE
+	%MODULE[ModuleLifeSupport] { }
+
+	%RESOURCE[ReplacementParts]
 	{
-		name = ReplacementParts
-		amount = 1700 //100 * crew capacity + 100 * Kerbal-Months
-		maxAmount = 1700
+		%amount = 1700 //100 * crew capacity + 100 * Kerbal-Months
+		%maxAmount = 1700
 	}
 
 	MODULE
@@ -17,7 +13,7 @@
 		name = ModuleHabitation
 		KerbalMonths = 13 //mass * 5
 	}
-	
+
 	MODULE
 	{
 		name = ModuleLifeSupportRecycler
@@ -37,17 +33,14 @@
 		{
 			ResourceName = Water
 			Ratio = 0.005
-		}		
+		}
 	}
 
-	MODULE
-	{
-		name = USI_ModuleFieldRepair
-	}
-
+	%MODULE[USI_ModuleFieldRepair] { }
+
 	MODULE
 	{
 		name = ModulePowerCoupler
 		PowerCouplingRange = 500
 	}
-}
\ No newline at end of file
+}
diff --git a/UKS-KPBS_ScienceLab.cfg b/UKS-KPBS_ScienceLab.cfg
index 6aa51d2..9588446 100644
--- a/UKS-KPBS_ScienceLab.cfg
+++ b/UKS-KPBS_ScienceLab.cfg
@@ -1,17 +1,13 @@
 @PART[KKAOSS_Science_g]:NEEDS[USILifeSupport]:FINAL
 {
-	MODULE
-	{
-		name = ModuleLifeSupport
-	}
-	
-	RESOURCE
+	%MODULE[ModuleLifeSupport] { }
+
+	%RESOURCE[ReplacementParts]
 	{
-		name = ReplacementParts
-		amount = 200 //100 * crew capacity + 100 * Kerbal-Months
-		maxAmount = 200
+		%amount = 200 //100 * crew capacity + 100 * Kerbal-Months
+		%maxAmount = 200
 	}
-	
+
 	MODULE
 	{
 		name = ModuleLifeSupportRecycler
@@ -27,21 +23,13 @@
 			ResourceName = ElectricCharge
 			Ratio = 1 //.2 * crew capacity
 		}
-		//INPUT_RESOURCE
-		//{
-		//	ResourceName = ReplacementParts
-		//	Ratio = 0.00001 //.000002 * crew capacity
-		//}	
 	}
 
-	MODULE
-	{
-		name = USI_ModuleFieldRepair
-	}
+	%MODULE[USI_ModuleFieldRepair] { }
 
 	MODULE
 	{
 		name = ModulePowerCoupler
 		PowerCouplingRange = 500
 	}
-}
\ No newline at end of file
+}
diff --git a/readme.md b/readme.md
index 38b6f33..309d145 100644
--- a/readme.md
+++ b/readme.md
@@ -11,13 +11,13 @@ This is a set of configuration files to allow use of the Kerbal Planetary Base S
 
 ### Installation
 
-Drop the UKS-KPBS_Compatibility folder into your GameData folder wherever KSP is installed.
+Delete any existing installed version of this mod, then drop the UKS-KPBS_Compatibility folder into your GameData folder wherever KSP is installed.
 
 ### Features
 
 USI Life Support functions are added to KPBS modules:
 
-- The Habitat Mk1 works as a mid-grade life support recycler (33%); the Science Lab has a 71% recycler; and the Habitat Mk2 has the highest-efficiency recycler (90%), but requires Water as input.
+- The Habitat Mk1 works as a mid-grade life support recycler (34%); the Science Lab has a 71% recycler; and the Habitat Mk2 has the highest-efficiency recycler (90%), but requires Water as input.
 - The Habitat modules have habitation space.
 - The Cupola works as a habitation multiplier.
 - The small (wedge-shaped) and large (deployable) Greenhouse use Agroponics to convert Mulch and Fertilizer into Supplies.