Merge pull request #1387 from UmbraSpaceIndustries/DEVELOP

SwapConverter Fixes

Author: BobPalmer

FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt

@@ -1,3 +1,7 @@
+0.11.1 - 2018.03.11
+-----------------
+SwapConverter Fixes
+
 0.11.0 - 2018.03.07
 ------------------
 KSP 1.4.0 Compatibility

FOR_RELEASE/GameData/000_USITools/USITools.dll

@@ -10,7 +10,7 @@
      "VERSION":{
          "MAJOR":0,
          "MINOR":11,
-         "PATCH":0,
+         "PATCH":1,
          "BUILD":0
      },
      "KSP_VERSION":{

FOR_RELEASE/GameData/000_USITools/USITools.dll.mdb

@@ -1,3 +1,7 @@
+0.54.1 - 2018.03.11
+-----------------
+SwappableConverter Fixes
+
 0.54.0 - 2018.03.07
 ------------------
 KSP 1.4.0 Compatibility

FOR_RELEASE/GameData/000_USITools/USITools.pdb

@@ -10,7 +10,7 @@
      "VERSION":{
          "MAJOR":0,
          "MINOR":54,
-         "PATCH":0,
+         "PATCH":1,
          "BUILD":0
      },
      "KSP_VERSION":{

FOR_RELEASE/GameData/000_USITools/USITools.version

@@ -142,19 +142,29 @@ PART
 	}
 
 	//*********************
-
 	MODULE
 	{
-		name = ModuleResourceConverter_USI
+		name = ModuleSwapControllerNew
+		typeName = Config
+		ResourceCosts = SpecializedParts,6,MaterialKits,30,ElectricCharge,30
+	}	
+	
+	MODULE
+	{
+		name = ModuleSwappableConverterNew 
+		bayName = C1
+		moduleIndex = 0
+		isConverter = true		
+	}	
+	
+	MODULE
+	{
+		name = ModuleSwapOption
 		ConverterName = Agroponics
 		StartActionName = Start Agroponics
 		StopActionName = Stop Agroponics
-
 		UseSpecialistBonus = true
-		SpecialistEfficiencyFactor = 0.2
-		SpecialistBonusBase = 0.05
 		ExperienceEffect = BotanySkill
-		Efficiency = 1
 
 		INPUT_RESOURCE
 		{
@@ -197,16 +207,12 @@ PART
 
 	MODULE
 	{
-		name = ModuleResourceConverter_USI
+		name = ModuleSwapOption
 		ConverterName = Cultivate(S)
 		StartActionName = Start Cultivate(S)
 		StopActionName = Stop Cultivate(S)
-
 		UseSpecialistBonus = true
-		SpecialistEfficiencyFactor = 0.2
-		SpecialistBonusBase = 0.05
 		ExperienceEffect = BotanySkill
-		Efficiency = 1
 
 		INPUT_RESOURCE
 		{
@@ -254,16 +260,12 @@ PART
 
 	MODULE
 	{
-		name = ModuleResourceConverter_USI
+		name = ModuleSwapOption
 		ConverterName = Cultivate(D)
 		StartActionName = Start Cultivate(D)
 		StopActionName = Stop Cultivate(D)
-
 		UseSpecialistBonus = true
-		SpecialistEfficiencyFactor = 0.2
-		SpecialistBonusBase = 0.05
 		ExperienceEffect = BotanySkill
-		Efficiency = 1
 
 		INPUT_RESOURCE
 		{
@@ -311,16 +313,12 @@ PART
 
 	MODULE
 	{
-		name = ModuleResourceConverter_USI
+		name = ModuleSwapOption
 		ConverterName = Agriculture(S)
 		StartActionName = Start Agriculture(S)
 		StopActionName = Stop Agriculture(S)
-
 		UseSpecialistBonus = true
-		SpecialistEfficiencyFactor = 0.2
-		SpecialistBonusBase = 0.05
 		ExperienceEffect = AgronomySkill
-		Efficiency = 1
 
 		INPUT_RESOURCE
 		{
@@ -371,6 +369,66 @@ PART
 		}
 	}
 
+	MODULE
+	{
+		name = ModuleSwapOption
+		ConverterName = Agriculture(D)
+		StartActionName = Start Agriculture(D)
+		StopActionName = Stop Agriculture(D)
+		UseSpecialistBonus = true
+		ExperienceEffect = AgronomySkill
+
+		INPUT_RESOURCE
+		{
+			ResourceName = Dirt
+			Ratio =  0.0025
+		}
+		INPUT_RESOURCE
+		{
+			ResourceName = Water
+			Ratio =  0.0025000
+		}
+
+		INPUT_RESOURCE
+		{
+			ResourceName = Fertilizer
+			Ratio =  0.00000500
+		}
+		OUTPUT_RESOURCE
+		{
+			ResourceName = Organics
+			Ratio = 0.00005000
+			DumpExcess = False
+		}
+		INPUT_RESOURCE
+		{
+			ResourceName = ElectricCharge
+			Ratio = 5.46
+		}
+		INPUT_RESOURCE
+		{
+			ResourceName = Machinery
+			Ratio = 0.000002
+		}
+		OUTPUT_RESOURCE
+		{
+			ResourceName = Recyclables
+			Ratio = 0.000002
+			DumpExcess = true
+		}
+		REQUIRED_RESOURCE
+		{
+			ResourceName = Machinery
+			Ratio = 100
+		}
+		REQUIRED_RESOURCE
+		{
+			ResourceName = Organics
+			Ratio = 100
+		}
+	}
+
+
 	MODULE
 	{
 		name = ModuleResourceConverter_USI
@@ -434,19 +492,7 @@ PART
 		}
 	}
 
-	MODULE
-	{
-		name = ModuleSwapController
-		typeName = Config
-		ResourceCosts = SpecializedParts,6,MaterialKits,30,ElectricCharge,30
-	}	
 	
-	MODULE
-	{
-		name = ModuleSwappableConverter 
-		bayName = C1
-	}
-
 	MODULE
 	{
 		name = USI_ModuleFieldRepair

FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/CHANGELOG.txt

@@ -118,8 +118,14 @@ PART
 		name = ModulePowerCoupler
 	}
 
-	//*********************
-
+	MODULE
+	{
+		name = ModuleSwappableConverter 
+		bayName = C1
+		typeName = Config
+		ResourceCosts = SpecializedParts,27,MaterialKits,135,ElectricCharge,135
+	}
+	
 	MODULE
 	{
 		name = ModuleLifeSupportRecycler
@@ -173,18 +179,7 @@ PART
 		}
 	}
 
-	MODULE
-	{
-		name = ModuleSwapController
-		typeName = Config
-		ResourceCosts = SpecializedParts,27,MaterialKits,135,ElectricCharge,135
-	}
 
-	MODULE
-	{
-		name = ModuleSwappableConverter 
-		bayName = C1
-	}
 	MODULE
 	{
 		name = USI_ModuleFieldRepair

FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/KolonyTools.dll

@@ -152,50 +152,4 @@ PART
 	{
 		name = ModuleOrbitalLogistics
 	}
-	
-	MODULE
-	{
-		name = ModuleResourceConverter_USI
-		ConverterName = Transport Credits
-		StartActionName = Start T-Credits
-		StopActionName = Stop T-Credits
-
-		UseSpecialistBonus = false
-		Efficiency = 1				
-		
-		INPUT_RESOURCE
-		{
-			ResourceName = MaterialKits
-			Ratio = 0.2
-		}
-		INPUT_RESOURCE
-		{
-			ResourceName = LiquidFuel
-			Ratio = 0.45
-		}
-		INPUT_RESOURCE
-		{
-			ResourceName = Oxidizer
-			Ratio = 0.55
-		}
-		INPUT_RESOURCE
-		{
-			ResourceName = ElectricCharge
-			Ratio = 10
-		}
-		OUTPUT_RESOURCE
-		{
-			ResourceName = TransportCredits
-			Ratio = 1
-			DumpExcess = true
-		}
-	}	
-	
-	RESOURCE
-	{
-		name = TransportCredits
-		amount = 0
-		maxAmount = 100000
-		isTweakable = false
-	}	
 }