Merge pull request #1470 from tjdeckard/DEVELOP

KSP 1.8 Updates
UmbraSpaceIndustries · Oct 28, 2019 · 5e36c5a · 5e36c5a
2 parents d5c174c + e24d314
commit 5e36c5a
Show file tree

Hide file tree

Showing 16 changed files with 449 additions and 517 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/KolonyTools.dll b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/KolonyTools.dll
diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/KolonyTools.dll.mdb b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/KolonyTools.dll.mdb
diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/KolonyTools.pdb b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/KolonyTools.pdb
diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_01.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_01.cfg
@@ -279,7 +279,7 @@ PART
 		UseSpecialistBonus = true
 		ExperienceEffect = DrillSkill
 	}
-	MODULE
+	MODULE:NEEDS[Karbonite]
 	{
 		name = USI_HarvesterSwapOption
 		ConverterName = Karbonite
@@ -291,7 +291,7 @@ PART
 		UseSpecialistBonus = true
 		ExperienceEffect = DrillSkill
 	}
-	MODULE
+	MODULE:NEEDS[Karbonite]
 	{
 		name = USI_HarvesterSwapOption
 		ConverterName = Karborundum

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_01A.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_01A.cfg
@@ -253,7 +253,7 @@ PART
 		Efficiency = 0.8
 		ResourceName = Ore
 	}
-	MODULE
+	MODULE:NEEDS[Karbonite]
 	{
 		name = USI_HarvesterSwapOption
 		ConverterName = Karbonite
@@ -263,7 +263,7 @@ PART
 		Efficiency = 0.8
 		ResourceName = Karbonite
 	}
-	MODULE
+	MODULE:NEEDS[Karbonite]
 	{
 		name = USI_HarvesterSwapOption
 		ConverterName = Karborundum

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_02.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_02.cfg
@@ -155,18 +155,6 @@ PART
 		moduleIndex = 0
 	}
 	MODULE
-	{
-		name = USI_SwappableBay 
-		bayName = Bay 2
-		moduleIndex = 1
-	}
-	MODULE
-	{
-		name = USI_SwappableBay 
-		bayName = Bay 3
-		moduleIndex = 2
-	}
-	MODULE
 	{
 		name = USI_Harvester
 
@@ -202,76 +190,6 @@ PART
 		}
 	}
 	MODULE
-	{
-		name = USI_Harvester
-
-		HarvesterType = 0
-		ImpactTransform = ImpactTransform
-		ImpactRange = 5
-		AutoShutdown = true
-		SpecialistEfficiencyFactor = 0.2
-		SpecialistBonusBase = 0.05
-		EfficiencyBonus = 1
-		GeneratesHeat = true
-
-		TemperatureModifier
-		{
-			key = 0 20000
-			key = 250 10000
-			key = 500 5000
-			key = 750 500
-			key = 1000 0
-		}
-		ThermalEfficiency
-		{
-			key = 0 0.1
-			key = 250 .1
-			key = 500 1
-			key = 750 .1
-			key = 1000 0
-		}
-		INPUT_RESOURCE
-		{
-			ResourceName = ElectricCharge
-			Ratio = 20
-		}
-	}
-	MODULE
-	{
-		name = USI_Harvester
-
-		HarvesterType = 0
-		ImpactTransform = ImpactTransform
-		ImpactRange = 5
-		AutoShutdown = true
-		SpecialistEfficiencyFactor = 0.2
-		SpecialistBonusBase = 0.05
-		EfficiencyBonus = 1
-		GeneratesHeat = true
-		
-		TemperatureModifier
-		{
-			key = 0 20000
-			key = 250 10000
-			key = 500 5000
-			key = 750 500
-			key = 1000 0
-		}
-		ThermalEfficiency
-		{
-			key = 0 0.1
-			key = 250 .1
-			key = 500 1
-			key = 750 .1
-			key = 1000 0
-		}
-		INPUT_RESOURCE
-		{
-			ResourceName = ElectricCharge
-			Ratio = 20
-		}
-	}
-	MODULE
 	{
 		name = USI_HarvesterSwapOption
 		ConverterName = Dirt
@@ -427,7 +345,7 @@ PART
 		UseSpecialistBonus = true
 		ExperienceEffect = DrillSkill
 	}
-	MODULE
+	MODULE:NEEDS[Karbonite]
 	{
 		name = USI_HarvesterSwapOption
 		ConverterName = Karbonite
@@ -439,7 +357,7 @@ PART
 		UseSpecialistBonus = true
 		ExperienceEffect = DrillSkill
 	}
-	MODULE
+	MODULE:NEEDS[Karbonite]
 	{
 		name = USI_HarvesterSwapOption
 		ConverterName = Karborundum

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_02A.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/MKS/Parts/MKS_Drill_02A.cfg
@@ -153,84 +153,6 @@ PART
 		name = USI_SwappableBay 
 		bayName = Bay 1
 		moduleIndex = 0
-	}	
-	MODULE
-	{
-		name = USI_SwappableBay 
-		bayName = Bay 2
-		moduleIndex = 1
-	}
-	MODULE
-	{
-		name = USI_SwappableBay 
-		bayName = Bay 3
-		moduleIndex = 2
-	}
-	MODULE
-	{
-		name = USI_Harvester
-
-		HarvesterType = 0
-		ImpactTransform = ImpactTransform
-		ImpactRange = 5
-		AutoShutdown = true
-		UseSpecialistBonus = false
-		EfficiencyBonus = 1
-		GeneratesHeat = true
-		TemperatureModifier
-		{
-			key = 0 20000
-			key = 250 10000
-			key = 500 5000
-			key = 750 500
-			key = 1000 0
-		}		
-		ThermalEfficiency 
-		{
-			key = 0 0.1
-			key = 250 .1
-			key = 500 1
-			key = 750 .1
-			key = 1000 0
-		}
-		INPUT_RESOURCE
-		{
-			ResourceName = ElectricCharge
-			Ratio = 13.1
-		}
-	}
-	MODULE
-	{
-		name = USI_Harvester
-
-		HarvesterType = 0
-		ImpactTransform = ImpactTransform
-		ImpactRange = 5
-		AutoShutdown = true
-		UseSpecialistBonus = false
-		EfficiencyBonus = 1
-		GeneratesHeat = true
-		TemperatureModifier
-		{
-			key = 0 20000
-			key = 250 10000
-			key = 500 5000
-			key = 750 500
-			key = 1000 0
-		}		
-		ThermalEfficiency 
-		{
-			key = 0 0.1
-			key = 250 .1
-			key = 500 1
-			key = 750 .1
-			key = 1000 0
-		}
-		INPUT_RESOURCE
-		{
-			ResourceName = ElectricCharge
-			Ratio = 13.1
-		}
 	}
 	MODULE
 	{
@@ -395,7 +317,7 @@ PART
 		Efficiency = 1.31
 		ResourceName = Ore
 	}
-	MODULE
+	MODULE:NEEDS[Karbonite]
 	{
 		name = USI_HarvesterSwapOption
 		ConverterName = Karbonite
@@ -405,7 +327,7 @@ PART
 		Efficiency = 1.31
 		ResourceName = Karbonite
 	}
-	MODULE
+	MODULE:NEEDS[Karbonite]
 	{
 		name = USI_HarvesterSwapOption
 		ConverterName = Karborundum