Merge pull request #57 from Nils277/Development

Development

FOR_RELEASE/GameData/PlanetaryBaseInc/BaseSystem/Parts/Command/Control/Automatic_Control_g.cfg

@@ -59,7 +59,9 @@ PART
 			name = ElectricCharge
 			rate = 0.05
 		}
+        hasHibernation = True
 	}
+
 	RESOURCE
 	{
 		name = ElectricCharge

FOR_RELEASE/GameData/PlanetaryBaseInc/BaseSystem/Parts/Command/Control/Landing_Control_g.cfg

@@ -58,6 +58,7 @@ PART
 			name = ElectricCharge
 			rate = 0.020
 		}
+        hasHibernation = True
 	}
 	RESOURCE
 	{

FOR_RELEASE/GameData/PlanetaryBaseInc/BaseSystem/Parts/Utility/Garages/garage_decoupler_g.cfg

@@ -14,6 +14,8 @@ PART
     {
         model = PlanetaryBaseInc/BaseSystem/Parts/Utility/Garages/garage_decoupler_g
     }
+    sound_vent_large = decouple
+    fx_gasBurst_white = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, decouple
 
     scale = 1
     rescaleFactor = 1

FOR_RELEASE/GameData/PlanetaryBaseInc/Localization/zh-cn.cfg

@@ -10,19 +10,19 @@
         //------------Plugin--------------
         //--------------------------------
 
-        #LOC_KPBS.nuclearfuel.transferstate = Transfer Status //TODO
-        #LOC_KPBS.nuclearfuel.fuel.transfer = Transfer <<1>> //TODO
-        #LOC_KPBS.nuclearfuel.error.skill = There needs to be at least a Level <<1>> <<2>> on board to transfer <<3>>. //TODO
-        #LOC_KPBS.nuclearfuel.error.running = Cannot transfer nuclear resources when the parts is running. //TODO
-        #LOC_KPBS.nuclearfuel.error.noFuel = The part does not have any <<1>>. //TODO
-        #LOC_KPBS.nuclearfuel.error.noTarget = There is no target to transfer <<1>> to. //TODO
-        #LOC_KPBS.nuclearfuel.status.selecting = Select Target for <<1>> //TODO
-        #LOC_KPBS.nuclearfuel.target.next = Select next target //TODO
-        #LOC_KPBS.nuclearfuel.target.prev = Select prev. target //TODO
-        #LOC_KPBS.nuclearfuel.startTransfer = Start transfer //TODO
-        #LOC_KPBS.nuclearfuel.stopTransfer = Stop transfer //TODO
-        #LOC_KPBS.nuclearfuel.cancelTransfer = Cancel transfer //TODO
-        #LOC_KPBS.nuclearfuel.status.transfering = Transfering <<1>> //TODO
+        #LOC_KPBS.nuclearfuel.transferstate = 转移状态 //TODO
+        #LOC_KPBS.nuclearfuel.fuel.transfer = 转移 <<1>> //TODO
+        #LOC_KPBS.nuclearfuel.error.skill = 需要Kerbal等级 <<1>> <<2>> 在舱内以转移 <<3>>. //TODO
+        #LOC_KPBS.nuclearfuel.error.running = 不能在核反应堆运行时转移燃料。 //TODO
+        #LOC_KPBS.nuclearfuel.error.noFuel = 这个部件没有任何 <<1>>. //TODO
+        #LOC_KPBS.nuclearfuel.error.noTarget = 没有转移目标 <<1>>  //TODO
+        #LOC_KPBS.nuclearfuel.status.selecting = 选择目标至 <<1>> //TODO
+        #LOC_KPBS.nuclearfuel.target.next = 选择下一个目标 //TODO
+        #LOC_KPBS.nuclearfuel.target.prev = 选择上一个目标 //TODO
+        #LOC_KPBS.nuclearfuel.startTransfer = 开始转移 //TODO
+        #LOC_KPBS.nuclearfuel.stopTransfer = 停止转移 //TODO
+        #LOC_KPBS.nuclearfuel.cancelTransfer = 取消转移 //TODO
+        #LOC_KPBS.nuclearfuel.status.transfering = 正在转移 <<1>> //TODO
 
         //---KPBSSettings---
         #LOC_KPBS.filtersettings.name = 过滤器设置
@@ -412,39 +412,39 @@
         #LOC_KPBS.littlefoot.tags = 地面 着陆 支架 支撑 行星 基地 着陆架
 
         //---Fission Reactor---
-        #LOC_KPBS.reactor.title = K&K Nuclear Reactor //TODO
-        #LOC_KPBS.reactor.description = A relatively small nuclear fission reactor for your base. Efficient but very expensive. One scientist insisted that is is spelled 'nucular', the reactor is considered save nontheless. 
+        #LOC_KPBS.reactor.title = K&K核反应堆 //TODO
+        #LOC_KPBS.reactor.description = 一个较小的核反应堆。 有效但非常昂贵。一位科学家坚持认为是“河反应堆”，因为这个东西用处不大。 
         #LOC_KPBS.reactor.tags = planetary base ec reactor nuclear nucular uran generate
-        #LOC_KPBS.reactor.converter.name = Nuclear Reactor //TODO
-        #LOC_KPBS.reactor.converter.start = Start reactor //TODO
-        #LOC_KPBS.reactor.converter.stop = Shut down reactor //TODO
-        #LOC_KPBS.reactor.converter.toggle = Toggle reactor //TODO
+        #LOC_KPBS.reactor.converter.name = 核反应堆 //TODO
+        #LOC_KPBS.reactor.converter.start = 启动反应堆 //TODO
+        #LOC_KPBS.reactor.converter.stop = 关闭反应堆 //TODO
+        #LOC_KPBS.reactor.converter.toggle = 切换反应堆 //TODO
         
         //---Nuclear Fuel Storage---
-        #LOC_KPBS.nuclearfuel.title = K&K Nuclear Fuel Storage //TODO
-        #LOC_KPBS.nuclearfuel.description = A storage for nuclear and depleted fuel. The radiation levels are save (when measured from 1km distance)
+        #LOC_KPBS.nuclearfuel.title = K&K核燃料罐 //TODO
+        #LOC_KPBS.nuclearfuel.description = 一个存储核燃料和废弃物的罐子. 辐射量还算安全 (在1km外测量)
         #LOC_KPBS.nuclearfuel.tags = reactor nuclear fuel storage planetary base uran  //TODO
         
         //---Centrifuge---
-        #LOC_KPBS.centrifuge.title = K&K Centrifuge
-        #LOC_KPBS.centrifuge.description = The centrifuge can reprocess depleted fuel into usable uranium or extract the uranium from ore. It can also produce xenon as a byproduct. It needs a lot of energy to run. //TODO
+        #LOC_KPBS.centrifuge.title = K&K离心机
+        #LOC_KPBS.centrifuge.description = 这个离心机可以重新加工废弃物变为有用的铀，或从矿石里提取铀。这个离心机还可以产生氙气作为副产品。需要大量电力才可以运行。 //TODO
         #LOC_KPBS.centrifuge.tags = conver isru mine )mining (ore process resource uranium refine reprocess nuclear nuke nearfuture planetary base //TODO
-        #LOC_KPBS.centrifuge.reprocessor.name = Uranium Reprocessor //TODO
-        #LOC_KPBS.centrifuge.reprocessor.start = Start Reprocessing //TODO
-        #LOC_KPBS.centrifuge.reprocessor.stop = Stop Reprocessing //TODO
-        #LOC_KPBS.centrifuge.reprocessor.toggle = Toggle Reprocessing //TODO
-        #LOC_KPBS.centrifuge.xenonextractor.name = Xenon Extractor //TODO
-        #LOC_KPBS.centrifuge.xenonextractor.start = Start Xenon Extractor //TODO
-        #LOC_KPBS.centrifuge.xenonextractor.stop = Stop Xenon Extractor //TODO
-        #LOC_KPBS.centrifuge.xenonextractor.toggle = Toggle Xenon Extractor //TODO
-        #LOC_KPBS.centrifuge.uraniumextractor.name = Uranium Extractor //TODO
-        #LOC_KPBS.centrifuge.uraniumextractor.start = Start Uranium Extractor //TODO
-        #LOC_KPBS.centrifuge.uraniumextractor.stop = Stop Uranium Extractor //TODO
-        #LOC_KPBS.centrifuge.uraniumextractor.toggle = Toggle Uranium Extractor //TODO
+        #LOC_KPBS.centrifuge.reprocessor.name = 铀重新将工器 //TODO
+        #LOC_KPBS.centrifuge.reprocessor.start = 开始重新加工 //TODO
+        #LOC_KPBS.centrifuge.reprocessor.stop = 停止重新加工 //TODO
+        #LOC_KPBS.centrifuge.reprocessor.toggle = 切换重新加工 //TODO
+        #LOC_KPBS.centrifuge.xenonextractor.name = 氙气提取器 //TODO
+        #LOC_KPBS.centrifuge.xenonextractor.start = 启动氙气提取器 //TODO
+        #LOC_KPBS.centrifuge.xenonextractor.stop = 关闭氙气提取器 //TODO
+        #LOC_KPBS.centrifuge.xenonextractor.toggle = 切换氙气提取器 //TODO
+        #LOC_KPBS.centrifuge.uraniumextractor.name = 铀提取器 //TODO
+        #LOC_KPBS.centrifuge.uraniumextractor.start = 启动铀提取器 //TODO
+        #LOC_KPBS.centrifuge.uraniumextractor.stop = 关闭铀提取器 //TODO
+        #LOC_KPBS.centrifuge.uraniumextractor.toggle = 切换铀提取器 //TODO
 
         //---Flatbed---
-        #LOC_KPBS.flatbed.title = K&K Flatbed //TODO
-        #LOC_KPBS.flatbed.description = A flatbed to place multiple usable things on the bases //TODO
+        #LOC_KPBS.flatbed.title = K&K平板货车 //TODO
+        #LOC_KPBS.flatbed.description = 一个平板货车，可以装多样东西。 //TODO
         #LOC_KPBS.flatbed.tags = planetary base store cargo flat //TODO    
 
         //--------------------------------
@@ -696,36 +696,36 @@
         #LOC_KPBS.workshop.stop = 停止生产部件
         
         //---Scrap Metal storage---
-        #LOC_KPBS.scrapmetal.title = K&K Scrap Metal Storage //TODO
-        #LOC_KPBS.scrapmetal.description = A small unit to store scrap metal from recycled rockets //TODO
+        #LOC_KPBS.scrapmetal.title = K&K废金属存储罐 //TODO
+        #LOC_KPBS.scrapmetal.description = 一个存储来自火箭的废金属的小单元 //TODO
         #LOC_KPBS.scrapmetal.tags = fueltank rocket metal scrap launchpad planetary base //TODO
          
         //---OSE Workshop---
         
         //---Material Kits storage---
-        #LOC_KPBS.materialkits.title = K&K Material Kits Storage //TODO
-        #LOC_KPBS.materialkits.description =  A storage for material kits, so you can build all the parts you forgot. //TODO
+        #LOC_KPBS.materialkits.title = K&K材料包存储罐 //TODO
+        #LOC_KPBS.materialkits.description =  一个存储餐料包的容器，所以你可以建造所有你忘记的部件。 //TODO
         #LOC_KPBS.materialkits.tags = Material OSE kits build workshop planetary base //TODO 
         
         //---Converter---
-        #LOC_KPBS.oseconverter.title = K&K OSE Mineral Extractor //TODO
-        #LOC_KPBS.oseconverter.description =  An extractor for all the resources needed in the workshop //TODO
+        #LOC_KPBS.oseconverter.title = K&K OSE矿物提取器 //TODO
+        #LOC_KPBS.oseconverter.description = 一个可以给所有工作室用的材料的提取器。 //TODO
         #LOC_KPBS.oseconverter.tags = Material OSE kits convert extract workshop planetary base //TODO
-        #LOC_KPBS.oseconverter.materialkits.name = Material Kits //TODO
-        #LOC_KPBS.oseconverter.materialkits.start = Start production //TODO
-        #LOC_KPBS.oseconverter.materialkits.stop = Stop production //TODO
-        #LOC_KPBS.oseconverter.prospector.name = Prospector //TODO
-        #LOC_KPBS.oseconverter.prospector.start = Start Prospecting //TODO
-        #LOC_KPBS.oseconverter.prospector.stop = Stop Prospecting //TODO
+        #LOC_KPBS.oseconverter.materialkits.name = 材料包 //TODO
+        #LOC_KPBS.oseconverter.materialkits.start = 开始生产 //TODO
+        #LOC_KPBS.oseconverter.materialkits.stop = 停止生产 //TODO
+        #LOC_KPBS.oseconverter.prospector.name = 探测器 //TODO
+        #LOC_KPBS.oseconverter.prospector.start = 开始探测 //TODO
+        #LOC_KPBS.oseconverter.prospector.stop = 停止探测 //TODO
         
         //---OSE resource storage---
-        #LOC_KPBS.oseresources.title = K&K OSE Resource Storage //TODO
-        #LOC_KPBS.oseresources.description =  A small unit to store resources neeeded by the OSE workshop //TODO
+        #LOC_KPBS.oseresources.title = K&K OSE资源储罐 //TODO
+        #LOC_KPBS.oseresources.description =  一个可以给OSE工作室用的资源储存的小单元。 //TODO
         #LOC_KPBS.oseresources.tags = Material OSE kits resources metal rare build workshop planetary base excotic minerals //TODO
         
         //---OSE workshop---
-        #LOC_KPBS.oseworkshop.title = K&K OSE Workshop //TODO
-        #LOC_KPBS.oseworkshop.description =  A workshop to produce small part on site for your base //TODO
+        #LOC_KPBS.oseworkshop.title = K&K OSE工作室 //TODO
+        #LOC_KPBS.oseworkshop.description = 一个可以生产所有小部件的工作室 //TODO
         #LOC_KPBS.oseworkshop.tags = Material OSE kits build workshop planetary base //TODO
         
         //---KAS---
@@ -753,12 +753,12 @@
         #LOC_KPBS.kisstoragebig.tags = KIS 库存 基座 行星基地 容器 IVA 搬运 容器 cck-containers
 
         //---Base Item Storage---
-        #LOC_KPBS.kisbasestorage.title = K&K Storage [KIS] //TODO
-        #LOC_KPBS.kisbasestorage.description = A big storage for even the biggest parts. //TODO
+        #LOC_KPBS.kisbasestorage.title = K&K储罐[KIS] //TODO
+        #LOC_KPBS.kisbasestorage.description = 一个可以存储甚至最大的部件的储罐。 //TODO
 
         //---Base Item Storage (small)---
-        #LOC_KPBS.kisbasestoragesmall.title = K&K Storage (small) [KIS] //TODO
-        #LOC_KPBS.kisbasestoragesmall.description = A small storage for parts in the Base profile. //TODO
+        #LOC_KPBS.kisbasestoragesmall.title = K&K储罐(小)[KIS] //TODO
+        #LOC_KPBS.kisbasestoragesmall.description = 一个可以存储基地部件的小容器。 //TODO
         
         //---SEP---
         
@@ -793,8 +793,8 @@
         //---Algaefarm---
         #LOC_KPBS.algaefarm.title = K&K海藻培养装置
         #LOC_KPBS.algaefarm.description = 小型海藻培养装置.
-        #LOC_KPBS.algaefarm.description.tacls = A small algae farm to produce fertilizer that is needed to grow food. Do not eat the fertilizer, it tastes aweful. //TODO
-		#LOC_KPBS.algaefarm.description.usils = A small algae farm to produce fertilizer. This can then be used to increase the performance of the greenhouse. Don't eat the fertilizer!  Now with added operational modes from UberDyne Astronautics - These you can eat.  (Though there is still discussion on whether you'd want to.) //TODO        
+        #LOC_KPBS.algaefarm.description.tacls = 一个可以产生种植物须要的肥料的小型海藻培养装置。不要吃肥料，肥料的味道糟透了。 //TODO
+		#LOC_KPBS.algaefarm.description.usils = 一个可以生产肥料的小型海藻农场。这个可以提升温室的性能。不要吃肥料！现在添加了新的设置：海藻可以吃  (尽管仍在讨论你是否想) //TODO        
         #LOC_KPBS.algaefarm.tags = 生命维持 海藻 肥料 容器 cck-lifesupport
         #LOC_KPBS.algaefarm.bayname = 转化器
         #LOC_KPBS.algaefarm.typename = 过滤器
@@ -953,9 +953,9 @@
         #LOC_KPBS.sabatiercontainer.title = K&K光合作用反应器
         #LOC_KPBS.sabatiercontainer.description = 这个装置可以使用二氧化碳和氢气来生成水。 一氧化碳不能代替二氧化碳。
         #LOC_KPBS.sabatiercontainer.tags = 生命维持 TAC 转化器 sabatier hydrogen 容器 cck-lifesupport
-        #LOC_KPBS.sabatiercontainer.converter.name = Sabatier Reactor
-        #LOC_KPBS.sabatiercontainer.converter.start = Start Sabatier
-        #LOC_KPBS.sabatiercontainer.converter.stop = Stop Sabatier
+        #LOC_KPBS.sabatiercontainer.converter.name = 萨巴捷反应器
+        #LOC_KPBS.sabatiercontainer.converter.start = 开始萨巴捷反应
+        #LOC_KPBS.sabatiercontainer.converter.stop = 停止萨巴捷反应
         #LOC_KPBS.sabatiercontainer.converter.tag = 生命维持	
         
         //---Big snacks container---

FOR_RELEASE/GameData/PlanetaryBaseInc/ModSupport/Configs/LifeSupport/KPBS_MM_USI_LS.cfg

@@ -96,11 +96,6 @@
 		}
 	}
 
-	MODULE
-	{
-		name = USI_ModuleFieldRepair
-	}
-
     MODULE
 	{
 		name = ModuleLifeSupportRecycler
@@ -196,7 +191,7 @@
 		name = ModuleLifeSupport
 	}
 
-    	MODULE
+    MODULE
 	{
 		name = ModuleHabitation
 		BaseKerbalMonths = 0
@@ -236,3 +231,35 @@
 		}
 	}
 }
+
+@PART[*]:HAS[@MODULE[ModuleResourceConverter_USI]:HAS[#ConverterName[Agroponics]]]:NEEDS[USILifeSupport,PlanetaryBaseInc]
+{
+    &MODULE[ModuleScienceExperiment]
+	{
+		name = ModuleScienceExperiment
+		experimentID = KPBS_plantgrowthstudy
+		experimentActionName = #LOC_KPBS.greenhouseexperiment.conduct
+        resetActionName = #LOC_KPBS.greenhouseexperiment.discard
+		reviewActionName = #LOC_KPBS.greenhouseexperiment.review
+		useStaging = False
+		useActionGroups = True
+		hideUIwhenUnavailable = True
+		xmitDataScalar = 0.4
+		FxModules = 0
+		dataIsCollectable = True
+		collectActionName = #LOC_KPBS.greenhouseexperiment.collect
+		interactionRange = 1.2
+		usageReqMaskInternal = 1
+		usageReqMaskExternal = 8
+	}
+
+    &MODULE
+	{
+		name = ModuleScienceContainer
+		reviewActionName = #autoLOC_502201
+		storeActionName = #autoLOC_502202
+		collectActionName = #autoLOC_238018
+		evaOnlyStorage = True
+		storageRange = 2.0
+	}
+}

FOR_RELEASE/GameData/PlanetaryBaseInc/ModSupport/Parts/LifeSupport/Container_CO2_big.cfg

@@ -60,7 +60,7 @@ PART:NEEDS[TacLifeSupport|IoncrossCrewSupport|LifeSupport]
     {
         name = CarbonDioxide
         amount = 0
-        maxAmount = 63941.568426448
+        maxAmount = 127883.136852896
     }
 }
 //------------------IONCROSS CREW SUPPORT CONFIG--------------------

FOR_RELEASE/GameData/PlanetaryBaseInc/ModSupport/Parts/LifeSupport/Container_CO2_small.cfg

@@ -59,7 +59,7 @@ PART:NEEDS[TacLifeSupport|IoncrossCrewSupport|LifeSupport|Kerbalism]
     {
         name = CarbonDioxide
         amount = 0
-        maxAmount = 31970.784213224
+        maxAmount = 63941.568426448
     }
 }
 //------------------IONCROSS CREW SUPPORT CONFIG--------------------

FOR_RELEASE/GameData/PlanetaryBaseInc/ModSupport/Parts/LifeSupport/Container_Oxygen_big.cfg

@@ -58,8 +58,8 @@ PART:NEEDS[TacLifeSupport|IoncrossCrewSupport|LifeSupport|Kerbalism]
     RESOURCE
     {
         name = Oxygen
-        amount = 74024.8226950354
-        maxAmount = 74024.8226950354
+        amount = 148049.6453900708
+        maxAmount = 148049.6453900708
     }
 }
 //------------------IONCROSS CREW SUPPORT CONFIG--------------------

FOR_RELEASE/GameData/PlanetaryBaseInc/ModSupport/Parts/LifeSupport/Container_Oxygen_small.cfg

@@ -58,8 +58,8 @@ PART:NEEDS[TacLifeSupport|IoncrossCrewSupport|LifeSupport|Kerbalism]
     RESOURCE
     {
         name = Oxygen
-        amount = 37012.4113475177
-        maxAmount = 37012.4113475177
+        amount = 74024.8226950354
+        maxAmount = 74024.8226950354
     }
 }
 //------------------IONCROSS CREW SUPPORT CONFIG--------------------

FOR_RELEASE/GameData/PlanetaryBaseInc/ModSupport/Parts/LifeSupport/Container_TACLS_Waste_big.cfg

@@ -61,7 +61,7 @@ PART:NEEDS[TacLifeSupport]
 	{
 		name= CarbonDioxide
 		amount = 0
-		maxAmount = 21313.85614
+		maxAmount = 42627.71228
 	}
 }
 

FOR_RELEASE/GameData/PlanetaryBaseInc/ModSupport/Parts/LifeSupport/Container_TACLS_Waste_small.cfg

@@ -61,7 +61,7 @@ PART:NEEDS[TacLifeSupport]
 	{
 		name= CarbonDioxide
 		amount = 0
-		maxAmount = 10656.92807
+		maxAmount = 21313.85614
 	}
 }
 

FOR_RELEASE/GameData/PlanetaryBaseInc/ModSupport/Parts/LifeSupport/Container_TACLS_big.cfg

@@ -60,8 +60,8 @@ PART:NEEDS[TacLifeSupport]
     RESOURCE
 	{
 		name= Oxygen
-		amount = 24674.9409
-		maxAmount = 24674.9409
+		amount = 49349.8818
+		maxAmount = 49349.8818
 	}
 }
 

FOR_RELEASE/GameData/PlanetaryBaseInc/ModSupport/Parts/LifeSupport/Container_TACLS_small.cfg

@@ -60,8 +60,8 @@ PART:NEEDS[TacLifeSupport]
     RESOURCE
 	{
 		name= Oxygen
-		amount = 12337.47045
-		maxAmount = 12337.47045
+		amount = 24674.9409
+		maxAmount = 24674.9409
 	}
 }
 

FOR_RELEASE/GameData/PlanetaryBaseInc/PlanetaryBaseInc.version

@@ -13,7 +13,7 @@
     "VERSION": {
         "MAJOR": 1,
         "MINOR": 5,
-        "PATCH": 7
+        "PATCH": 8
     },
 
     "KSP_VERSION": {

Sources/PlanetarySurfaceStructures/ModuleKPBSConverter.cs

@@ -26,6 +26,8 @@ public string GetPrimaryField()
             return null;
         }
 
+
+
         [KSPField(isPersistant = true, guiActiveEditor = true, guiActive = true, guiName = "#LOC_KPBS.resourceconverter.dumpoxygen")]
         [UI_Toggle(scene = UI_Scene.All)]
         private bool dumpOxygen = false;
@@ -43,6 +45,11 @@ public override void OnStart(StartState state)
                 Fields["dumpOxygen"].guiActive = false;
                 Fields["dumpOxygen"].guiActiveEditor = false;
             }
+
+            part.highlightColor.r = 0.33f;
+            part.highlightColor.g = 0.635f;
+            part.highlightColor.b = 0.87f;
+            part.Highlight(true);
         }