Greenhouse fixes

Angel-125 · Dec 2, 2016 · 8fb6d23 · 8fb6d23
1 parent d9adbc3
commit 8fb6d23
Show file tree

Hide file tree

Showing 37 changed files with 165 additions and 93 deletions.
diff --git a/Extras/MCM/MCM.version b/Extras/MCM/MCM.version
@@ -19,6 +19,6 @@
     {
         "MAJOR":1,
         "MINOR":2,
-        "PATCH":0
+        "PATCH":1
     },
 }
diff --git a/Extras/MCM/Parts/HomesteadMk2.cfg b/Extras/MCM/Parts/HomesteadMk2.cfg
@@ -301,7 +301,7 @@ PART
 opsViewTitle = Homestead Operations
 
 		//Snacks
-		resourcesToKeep:NEEDS[Snacks] = ElectricCharge;Snacks
+		resourcesToKeep:NEEDS[SnacksUtils] = ElectricCharge;Snacks
 
 		//Kerbalism
 		resourcesToKeep:NEEDS[Kerbalism] = ElectricCharge;Shielding;Food;Oxygen

diff --git a/Extras/MCM/Parts/MCM.cfg b/Extras/MCM/Parts/MCM.cfg
@@ -238,7 +238,7 @@ PART
 		decalsVisible = true
 
 		//Snacks
-		resourcesToKeep:NEEDS[Snacks] = ElectricCharge;Snacks
+		resourcesToKeep:NEEDS[SnacksUtils] = ElectricCharge;Snacks
 
 		//Kerbalism
 		resourcesToKeep:NEEDS[Kerbalism] = ElectricCharge;Shielding;Food;Oxygen

diff --git a/GameData/WildBlueIndustries/000WildBlueTools/CommonTemplates/Storage/Battery.cfg b/GameData/WildBlueIndustries/000WildBlueTools/CommonTemplates/Storage/Battery.cfg
@@ -3,6 +3,7 @@ BATTERY
 	author = Angel-125
 	name = Battery
 	shortName = Prime Flux Battery
+	title = Prime Flux Battery
 	logoPanel = WildBlueIndustries/000WildBlueTools/CommonTemplates/Decals/Battery
 	glowPanel = WildBlueIndustries/000WildBlueTools/CommonTemplates/Decals/Battery
 	description = This kit stores electrical charge.

diff --git a/GameData/WildBlueIndustries/000WildBlueTools/CommonTemplates/Storage/FusionPellets.cfg b/GameData/WildBlueIndustries/000WildBlueTools/CommonTemplates/Storage/FusionPellets.cfg
@@ -3,6 +3,7 @@ STORAGE_TEMPLATE
 	name = FusionPellets
 	author = Angel-125
 	shortName = Fusion Pellets
+	title = Fusion Pellets
 	logoPanel = WildBlueIndustries/000WildBlueTools/CommonTemplates/Decals/FusionPellets
 	glowPanel = WildBlueIndustries/000WildBlueTools/CommonTemplates/Decals/FusionPelletsGlow
 	description = This kit stores fusion pellets.

diff --git a/GameData/WildBlueIndustries/000WildBlueTools/ModuleManagerPatches/MM_USILS.cfg b/GameData/WildBlueIndustries/000WildBlueTools/ModuleManagerPatches/MM_USILS.cfg
@@ -30,10 +30,11 @@ LIFE_SUPPORT_SETTINGS
 //  4 = M.I.A. (will eventually respawn)
 //  5 = K.I.A. 
 
-STORAGE_TEMPLATE
+STORAGE_TEMPLATE:NEEDS[USILifeSupport]
 {
 	author = Angel-125
 	name = USILS
+	title = Life Support (USI)
 	shortName = Life Support
 	logoPanel = WildBlueIndustries/000WildBlueTools/CommonTemplates/Decals/LifeSupport
 	glowPanel = WildBlueIndustries/000WildBlueTools/CommonTemplates/Decals/LifeSupportGlow
@@ -62,11 +63,12 @@ STORAGE_TEMPLATE
 
 }
 
-STORAGE_TEMPLATE
+STORAGE_TEMPLATE:NEEDS[USILifeSupport]
 {
 	author = Angel-125
 	name = Supplies
 	shortName = N.O.M.S.
+	title = N.O.M.S.
 	needs = LifeSupport
 	logoPanel = WildBlueIndustries/000WildBlueTools/CommonTemplates/Decals/LifeSupport
 	glowPanel = WildBlueIndustries/000WildBlueTools/CommonTemplates/Decals/LifeSupportGlow
@@ -80,10 +82,11 @@ STORAGE_TEMPLATE
 	}
 }
 
-STORAGE_TEMPLATE
+STORAGE_TEMPLATE:NEEDS[USILifeSupport]
 {
 	author = Angel-125
 	name = ReplacementParts
+	title = Replacement Parts
 	shortName = Replacement Parts
 	needs = LifeSupport
 	logoPanel = WildBlueIndustries/000WildBlueTools/CommonTemplates/Decals/ReplacementParts
@@ -96,4 +99,10 @@ STORAGE_TEMPLATE
 		amount = 5600
 		maxAmount = 5600
 	}
+}
+
+@ROCKHOUND[Rockhound]:NEEDS[KolonyTools]
+{
+	@requiredResource = MaterialKits
+	@requiredAmount = 5000
 }
diff --git a/GameData/WildBlueIndustries/000WildBlueTools/Readme.txt b/GameData/WildBlueIndustries/000WildBlueTools/Readme.txt
@@ -6,6 +6,9 @@ A KSP mod that provides common functionality for mods by Wild Blue Industries.
 
 Copy the contents of the mod's GameData directory into your GameData folder.
 
+1.8.9
+- Greenhouse fixes.
+
 1.8.8
 - Bug fixes & enhancements.
 

diff --git a/GameData/WildBlueIndustries/000WildBlueTools/WildBlueTools.version b/GameData/WildBlueIndustries/000WildBlueTools/WildBlueTools.version
@@ -12,7 +12,7 @@
     {
 	"MAJOR":1,
 	"MINOR":8,
-	"PATCH":8
+	"PATCH":9
     },
     "KSP_VERSION":
     {

diff --git a/GameData/WildBlueIndustries/Buffalo/Buffalo.version b/GameData/WildBlueIndustries/Buffalo/Buffalo.version
@@ -12,7 +12,7 @@
     {
 	"MAJOR":1,
 	"MINOR":0,
-	"PATCH":0
+	"PATCH":1
     },
     "KSP_VERSION":
     {

diff --git a/GameData/WildBlueIndustries/Buffalo/ModuleManagerPatches/MM_Snacks.cfg b/GameData/WildBlueIndustries/Buffalo/ModuleManagerPatches/MM_Snacks.cfg
@@ -1,4 +1,4 @@
-@PART[WBI_CrewCab]:FOR[Snacks]
+@PART[WBI_CrewCab]:FOR[SnacksUtils]
 {
 	MODULE
 	{

diff --git a/GameData/WildBlueIndustries/Buffalo/Parts/Structural/Chassis1u.cfg b/GameData/WildBlueIndustries/Buffalo/Parts/Structural/Chassis1u.cfg
@@ -77,7 +77,7 @@ PART
 		//Short name of the default module template.
 		//This is used when selecting the part in the editor.
 		//User will then right-click on the module to change its type.
-		defaultTemplate = Battery Pack
+		defaultTemplate = Battery
 
 		//Some containers don't hold as much resources as the template specifies, while others hold more.
 		//Since the resource templates specify base amounts, the capacity factor specifies a multiplier to

diff --git a/GameData/WildBlueIndustries/Buffalo/Parts/Structural/Chassis2u.cfg b/GameData/WildBlueIndustries/Buffalo/Parts/Structural/Chassis2u.cfg
@@ -82,7 +82,7 @@ PART
 		//Short name of the default module template.
 		//This is used when selecting the part in the editor.
 		//User will then right-click on the module to change its type.
-		defaultTemplate = Battery Pack
+		defaultTemplate = Battery
 
 		//Some containers don't hold as much resources as the template specifies, while others hold more.
 		//Since the resource templates specify base amounts, the capacity factor specifies a multiplier to

diff --git a/GameData/WildBlueIndustries/Buffalo/Parts/Structural/ChassisEndu.cfg b/GameData/WildBlueIndustries/Buffalo/Parts/Structural/ChassisEndu.cfg
@@ -76,7 +76,7 @@ PART
 		//Short name of the default module template.
 		//This is used when selecting the part in the editor.
 		//User will then right-click on the module to change its type.
-		defaultTemplate = Battery Pack
+		defaultTemplate = Battery
 
 		//Some containers don't hold as much resources as the template specifies, while others hold more.
 		//Since the resource templates specify base amounts, the capacity factor specifies a multiplier to

diff --git a/GameData/WildBlueIndustries/Buffalo/Parts/Structural/ChassisSlim2u.cfg b/GameData/WildBlueIndustries/Buffalo/Parts/Structural/ChassisSlim2u.cfg
@@ -65,7 +65,7 @@ PART
 		//Short name of the default module template.
 		//This is used when selecting the part in the editor.
 		//User will then right-click on the module to change its type.
-		defaultTemplate = Battery Pack
+		defaultTemplate = Battery
 
 		//Some containers don't hold as much resources as the template specifies, while others hold more.
 		//Since the resource templates specify base amounts, the capacity factor specifies a multiplier to

diff --git a/GameData/WildBlueIndustries/Buffalo/Parts/Structural/HalfChassis.cfg b/GameData/WildBlueIndustries/Buffalo/Parts/Structural/HalfChassis.cfg
@@ -61,7 +61,7 @@ PART
 		//Short name of the default module template.
 		//This is used when selecting the part in the editor.
 		//User will then right-click on the module to change its type.
-		defaultTemplate = Battery Pack
+		defaultTemplate = Battery
 
 		//Some containers don't hold as much resources as the template specifies, while others hold more.
 		//Since the resource templates specify base amounts, the capacity factor specifies a multiplier to

diff --git a/GameData/WildBlueIndustries/Buffalo/Parts/Structural/QuarterChassis.cfg b/GameData/WildBlueIndustries/Buffalo/Parts/Structural/QuarterChassis.cfg
@@ -61,7 +61,7 @@ PART
 		//Short name of the default module template.
 		//This is used when selecting the part in the editor.
 		//User will then right-click on the module to change its type.
-		defaultTemplate = Battery Pack
+		defaultTemplate = Battery
 
 		//Some containers don't hold as much resources as the template specifies, while others hold more.
 		//Since the resource templates specify base amounts, the capacity factor specifies a multiplier to

diff --git a/GameData/WildBlueIndustries/Buffalo/Parts/Utility/PowerPack.cfg b/GameData/WildBlueIndustries/Buffalo/Parts/Utility/PowerPack.cfg
@@ -100,7 +100,7 @@ PART
 
 FLEX_FUEL
 {
-	name = LFO
+	name = LF+Ox
 	author = Angel-125
 	shortName = LF+Ox
 	title = Flex Fuel (LF+Ox)

diff --git a/GameData/WildBlueIndustries/Buffalo/Readme.txt b/GameData/WildBlueIndustries/Buffalo/Readme.txt
@@ -32,6 +32,9 @@ If these directories already exist, then delete the existing ones before install
 
 ---REVISION HISTORY---
 
+1.0.1
+- WBT Update
+
 1.0.0
 Buffalo has finally hit its 1.0 release! :) The parts introduced in this release complete the rover side of the Buffalo MSEV. There is still more work to do, but Buffalo is in good shape now. :)
 

diff --git a/GameData/WildBlueIndustries/Pathfinder/MiniAVC.xml b/GameData/WildBlueIndustries/Pathfinder/MiniAVC.xml
diff --git a/GameData/WildBlueIndustries/Pathfinder/ModuleManagerPatches/MM_KPBS.cfg b/GameData/WildBlueIndustries/Pathfinder/ModuleManagerPatches/MM_KPBS.cfg
@@ -117,7 +117,7 @@
 		//Short name of the default module template.
 		//This is used when selecting the part in the editor.
 		//User will then right-click on the module to change its type.
-		defaultTemplate = Science Lab
+		defaultTemplate = DocScience
 
 		//If the part has a KIS container, this is the base and max amount
 		baseStorage = 1000
@@ -177,7 +177,7 @@
 		//Short name of the default module template.
 		//This is used when selecting the part in the editor.
 		//User will then right-click on the module to change its type.
-		defaultTemplate = Geology Lab
+		defaultTemplate = GeoLab
 
 		//If the part has a KIS container, this is the base and max amount
 		baseStorage = 500
@@ -194,7 +194,7 @@
 	}
 }
 
-@PART[KKAOSS_Greenhouse_g]:FOR[Pathfinder]:NEEDS[PlanetarySurfaceStructures,Snacks]
+@PART[KKAOSS_Greenhouse_g]:FOR[Pathfinder]:NEEDS[PlanetarySurfaceStructures,SnacksUtils]
 {
 	!MODULE[PlanetaryGreenhouse]{}
 
@@ -236,12 +236,6 @@
 			ResourceName = ElectricCharge
 			Ratio = 6
 		}
-
-		REQUIRED_RESOURCE
-		{
-			ResourceName = Fertilizer
-			Ratio = 100
-		}
 	}
 
 	MODULE

diff --git a/GameData/WildBlueIndustries/Pathfinder/ModuleManagerPatches/MM_Kerbalism.cfg b/GameData/WildBlueIndustries/Pathfinder/ModuleManagerPatches/MM_Kerbalism.cfg
@@ -340,13 +340,6 @@ RESOURCE_DEFINITION
 			ResourceName = Oxygen
 			Ratio = 0.0000001
 		}
-
-		REQUIRED_RESOURCE
-		{
-			ResourceName = Fertilizer
-			Ratio = 100
-		}
-
 	}
 
 	RESOURCE

diff --git a/GameData/WildBlueIndustries/Pathfinder/ModuleManagerPatches/MM_ShuttleWings.cfg b/GameData/WildBlueIndustries/Pathfinder/ModuleManagerPatches/MM_ShuttleWings.cfg
@@ -22,7 +22,7 @@
 		//Short name of the default module template.
 		//This is used when selecting the part in the editor.
 		//User will then right-click on the module to change its type.
-		defaultTemplate = Liquid Fuel
+		defaultTemplate = LiquidFuel
 
 		//Some containers don't hold as much resources as the template specifies, while others hold more.
 		//Since the resource templates specify base amounts, the capacity factor specifies a multiplier to
@@ -55,7 +55,7 @@
 		//Short name of the default module template.
 		//This is used when selecting the part in the editor.
 		//User will then right-click on the module to change its type.
-		defaultTemplate = Liquid Fuel
+		defaultTemplate = LiquidFuel
 
 		//Some containers don't hold as much resources as the template specifies, while others hold more.
 		//Since the resource templates specify base amounts, the capacity factor specifies a multiplier to
@@ -88,7 +88,7 @@
 		//Short name of the default module template.
 		//This is used when selecting the part in the editor.
 		//User will then right-click on the module to change its type.
-		defaultTemplate = Liquid Fuel
+		defaultTemplate = LiquidFuel
 
 		//Some containers don't hold as much resources as the template specifies, while others hold more.
 		//Since the resource templates specify base amounts, the capacity factor specifies a multiplier to