Merge pull request #176 from post-kerbin-mining-corporation/dev

Release

.mod_data.yml

@@ -8,7 +8,7 @@ package:
     - changelog.txt
 dependencies:  # Configure dependencies
   ModuleManager:
-    version: 4.1.4
+    version: 4.2.1
     location: s3
   B9PartSwitch:
     version: 2.18.0
@@ -17,27 +17,27 @@ dependencies:  # Configure dependencies
     version: 1.4.2
     location: s3
   DynamicBatteryStorage:
-    tag: 2.2.2
+    tag: 2.2.4
     location: github
     repository: post-kerbin-mining-corporation/DynamicBatteryStorage
   DeployableEngines:
-    tag: 1.3.0
+    tag: 1.3.1
     location: github
     repository: post-kerbin-mining-corporation/DeployableEngines
   CryoTanks:
-    tag: 1.6.0
+    tag: 1.6.1
     location: github
     repository: post-kerbin-mining-corporation/CryoTanks
   Waterfall:
-    tag: 0.6.3
+    tag: 0.6.7
     location: github
     repository: post-kerbin-mining-corporation/Waterfall
   SystemHeat:
-    tag: 0.4.1
+    tag: 0.5.5
     location: github
     repository: post-kerbin-mining-corporation/SystemHeat
   SpaceDust:
-    tag: 0.4.1
+    tag: 0.4.2
     location: github
     repository: post-kerbin-mining-corporation/SpaceDust
 deploy:

GameData/FarFutureTechnologies/Localization/en-us.cfg

@@ -181,17 +181,17 @@ Localization
 
     #LOC_FFT_fft-fusion-axial-zpinch-1_title =  JX-200 'Cascade' Axial Flow Z-Pinch Fusion Engine
     #LOC_FFT_fft-fusion-axial-zpinch-1_description = This engine uses a combination of magnetic confinement and zeta-pinch effects to compress fusion plasmas highly efficiently. This results in great performance as the plume of nuclear fire sprays out the back of the 'open concept' reaction chamber. This engine needs to charge its power banks to be activated, but once running generates up to 750 kW of electrical power siphoned off from the plasma stream to charge ship power banks.
-    #LOC_FFT_fft-fusion-axial-zpinch-1_tags = pulse confinement fusion zpinch axial plasma farfuture nuclear torch
+    #LOC_FFT_fft-fusion-axial-zpinch-1_tags = pulse confinement fusion zpinch axial plasma farfuture nuclear torch cascade
 
     // Super exotic
     // --------------
     #LOC_FFT_fft-nswr-1_title = X-2 'Heinlein' Nuclear Salt Water Rocket Engine
     #LOC_FFT_fft-nswr-1_description = Basically a continuously detonating, barely contained nuclear explosion, this rocket engine is highly radioactive, highly unpleasant and highly... awesome.
-    #LOC_FFT_fft-nswr-1_tags = water nuke juice zubrin moar uranium exotic torch farfuture heinlen
+    #LOC_FFT_fft-nswr-1_tags = water nuke juice zubrin moar uranium exotic torch farfuture heinlein
 
-    #LOC_FFT_fft-nswr-2_title = X-50 'Niven' Nuclear Salt Water Rocket Engine
-    #LOC_FFT_fft-nswr-2_description =
-    #LOC_FFT_fft-nswr-2_tags = water nuke juice zubrin moar uranium exotic torch farfuture
+    #LOC_FFT_fft-nswr-2_title = X-42 'Niven' Nuclear Salt Water Rocket Engine
+    #LOC_FFT_fft-nswr-2_description = Thie engine provides an answer to life, the universe and everything as it uses more fissile material, thus generating a lot more bang for your buck. 
+    #LOC_FFT_fft-nswr-2_tags = water nuke juice zubrin moar uranium exotic torch farfuture niven
 
     // Fission
     // --------------
@@ -248,13 +248,21 @@ Localization
     // --------------
     #LOC_FFT_fft-fueltank-fission-25-1_title = NTS-001 Fissonables Tank
     #LOC_FFT_fft-fueltank-fission-25-1_description = Due to the explosion in nuclear propulsion options Post-Kerbin has provided, useful fuel tanks have been needed to take the strain of operations. The NTS-series tanks can hold various fissionable fuels: either carefully mixed water and nuclear salts, or dispersed fissile dust.
-    #LOC_FFT_fft-fueltank-fission-25-1_tags = fueltank propellant water nuke juice uranium farfuture
+    #LOC_FFT_fft-fueltank-fission-25-1_tags = fueltank propellant water nuke juice uranium farfuture spicy nsw
     #LOC_FFT_fft-fueltank-fission-25-2_title = NTS-002 Fissonables Tank
     #LOC_FFT_fft-fueltank-fission-25-2_description = Due to the explosion in nuclear propulsion options Post-Kerbin has provided, useful fuel tanks have been needed to take the strain of operations. The NTS-series tanks can hold various fissionable fuels: either carefully mixed water and nuclear salts, or dispersed fissile dust. This tank is smaller.
-    #LOC_FFT_fft-fueltank-fission-25-2_tags = fueltank propellant water nuke juice uranium farfuture
+    #LOC_FFT_fft-fueltank-fission-25-2_tags = fueltank propellant water nuke juice uranium farfuture spicy nsw
     #LOC_FFT_fft-fueltank-fission-25-3_title = NTS-003 Fissonables Tank
     #LOC_FFT_fft-fueltank-fission-25-3_description = Due to the explosion in nuclear propulsion options Post-Kerbin has provided, useful fuel tanks have been needed to take the strain of operations. The NTS-series tanks can hold various fissionable fuels: either carefully mixed water and nuclear salts, or dispersed fissile dust. This tank is small.
-    #LOC_FFT_fft-fueltank-fission-25-3_tags = fueltank propellant water nuke juice uranium farfuture
+    #LOC_FFT_fft-fueltank-fission-25-3_tags = fueltank propellant water nuke juice uranium farfuture spicy nsw
+
+    #LOC_FFT_fft-fueltank-fission-5-1_title = NTS-501 Fissonables Tank
+    #LOC_FFT_fft-fueltank-fission-5-1_description = For the largest nuclear propulsion applications, you need those big containers. The large versions of the NTS-series tanks can only hold carefully mixed water and nuclear salts.
+    #LOC_FFT_fft-fueltank-fission-5-1_tags = fueltank propellant water nuke juice uranium farfuture spicy nsw
+
+    #LOC_FFT_fft-fueltank-fission-5-2_title = NTS-502 Fissonables Tank
+    #LOC_FFT_fft-fueltank-fission-5-2_description = For the largest nuclear propulsion applications, you need those big containers. The large versions of the NTS-series tanks can only hold carefully mixed water and nuclear salts.
+    #LOC_FFT_fft-fueltank-fission-5-2_tags = fueltank propellant water nuke juice uranium farfuture spicy nsw
 
     #LOC_FFT_fft-fueltank-fission-radial-1_title = NTR-001 Radial Fissonables Tank
     #LOC_FFT_fft-fueltank-fission-radial-1_description = Due to the explosion in nuclear propulsion options Post-Kerbin has provided, useful fuel tanks have been needed to take the strain of operations. The NTS-series tanks can hold various fissionable fuels: either carefully mixed water and nuclear salts, or dispersed fissile dust.
@@ -480,7 +488,7 @@ Localization
     // ModuleChargeableEngine
     // -----------------------
     #LOC_FFT_ModuleChargeableEngine_ModuleName = Chargeable Engine
-    #LOC_FFT_ModuleChargeableEngine_PartInfo = Engine needs to charge up before activating. Power used to charge can be varied. \n\n<color=#99ff00><b>Startup</b></color>\n<b>Charge Required:</b> <<1>> kJ\n<b>Minimum Time to Charge:</b> <<2>> s
+    #LOC_FFT_ModuleChargeableEngine_PartInfo = Engine needs to charge up before activating. Power used to charge can be varied. \n\n<color=#99ff00><b>Startup</b></color>\n<b>Charge Required:</b> <<1>> EC\n<b>Minimum Time to Charge:</b> <<2>> s
 
     #LOC_FFT_ModuleChargeableEngine_Group_DisplayName = Engine Charge
     #LOC_FFT_ModuleChargeableEngine_Field_ChargeStatus_Title = Capacitor Status
@@ -502,7 +510,7 @@ Localization
     // Fusion Reactor
     // -----------------------
     #LOC_FFT_ModuleFusionReactor_ModuleName = Fusion Reactor
-    #LOC_FFT_ModuleFusionReactor_PartInfo = Converts fusion fuel to energy. \n\n<color=#ff730d>Thermal Parameters:</color>\n<b> - Heat Output:</b> <<1>> kW\n<b> - Outlet Temperature:</b> <<2>> K \n\n<color=#99ff00><b>Fuel Modes:</b></color>
+    #LOC_FFT_ModuleFusionReactor_PartInfo = Converts fusion fuel to energy. Needs a startup charge before activating. Power used to charge can be varied.  \n\n<b>Charge Required:</b> <<1>> EC \n<b>Minimum Time to Charge:</b> <<2>> s\n\n<color=#ff730d>Thermal Parameters:</color>\n<b> - Waste Heat:</b> <<3>> kW\n<b> - Outlet Temperature:</b> <<4>> K \n\n<color=#99ff00><b>Fuel Modes:</b></color>
     #LOC_FFT_ModuleFusionReactor_PartInfo_Mode = \n<b><color=#7cd6f5><<1>></color></b>\n -<b> Power Generated:</b> <<2>> kW\n - <b>Inputs</b>:
     #LOC_FFT_ModuleFusionReactor_PartInfo_Fuel =  \n -- <<1>>: <<2>> u/s
 

GameData/FarFutureTechnologies/Localization/zh-cn.cfg

@@ -5,15 +5,15 @@ Localization
     // CONFIG
     // RESOURCES
     #LOC_FFT_resource_NuclearSaltWater_title = 核盐水 // Nuclear Salt Water
-    #LOC_FFT_resource_NuclearSaltWater_abbrev =  // NSW
+    #LOC_FFT_resource_NuclearSaltWater_abbrev = NSW
     #LOC_FFT_resource_FissionPellets_title = 裂变弹丸 // Fission Pellets
-    #LOC_FFT_resource_FissionPellets_abbrev =  // FiP
+    #LOC_FFT_resource_FissionPellets_abbrev = FiP
     #LOC_FFT_resource_FusionPellets_title = 聚变弹丸 // Fusion Pellets
-    #LOC_FFT_resource_FusionPellets_abbrev =  // FuP
+    #LOC_FFT_resource_FusionPellets_abbrev = FuP
     #LOC_FFT_resource_MtlHydrogen_title = 金属氢 // Metallic Hydrogen
-    #LOC_FFT_resource_MtlHydrogen_abbrev =  // MtlH
+    #LOC_FFT_resource_MtlHydrogen_abbrev = MtlH
     #LOC_FFT_resource_FissionParticles_title = 裂变微粒 // Fissionable Particles
-    #LOC_FFT_resource_FissionParticles_abbrev =  //  FiPt
+    #LOC_FFT_resource_FissionParticles_abbrev = FiPt
 
     // MANUFACTURERS
     #LOC_FFT_manufacturer_postkerbin_title = 后坎星矿业集团(PKMC) // Post-Kerbin Mining Corporation
@@ -159,10 +159,6 @@ Localization
     #LOC_FFT_fft-fusion-inertial-laser-1_description = 开始一次点火！ 精确定时的高功率激光束阵列会聚在机载颗粒工厂产生的单个氘和氦3的隔离弹丸上。 外壳的汽化将燃料高度压缩，从而引发核聚变。 这种驱动器模型仅通过强大的电磁喷嘴将反应产物用作废气，从而产生较大的比冲，但推力较小。 每个弹丸中都可以使用额外的氘原料，以适度增加推力。 该引擎需要为其移动电源充电才能激活，但在运行时不消耗电量。 // Commence primary ignition! A precisely timed array of high-power laser beams converges on a single isolated pellet of Deuterium and Helium-3, generated in the onboard pellet factory. Vaporization of the outer shell compresses the fuels to a high degree, initiating fusion of the core. This model of drive uses only reaction products as exhaust using a powerful magnetic nozzle, resulting in a great specific impulse but a low thrust. Additional Deuterium feedstock can be used in each pellet, modestly increasing thrust. This engine needs to charge its power banks to be activated, but uses no energy while running.
     #LOC_FFT_fft-fusion-inertial-laser-1_tags = pulse inertial laser confinement fusion beam ignition plasma farfuture nuclear hammertong death star
 
-    #LOC_FFT_fft-fusion-axial-zpinch-1_title = JX-200 "水槽" 轴流Z箍缩聚变引擎 //  JX-200 'Flume' Axial Flow Z-Pinch Fusion Engine
-    #LOC_FFT_fft-fusion-axial-zpinch-1_description =  // 
-    #LOC_FFT_fft-fusion-axial-zpinch-1_tags = pulse confinement fusion zpinch axial plasma farfuture nuclear torch
-
     // Thermal Fusion
     // --------------
     #LOC_FFT_fft-fusion-magnetic-tokamak-1_title = JR-15 '探索' 球形托尔马克发动机 // JR-15 'Discovery' Spherical Tokamak Fusion Engine
@@ -177,6 +173,10 @@ Localization
     #LOC_FFT_fft-fusion-magnetic-tokamak-aerospike-1_description = 这款先进的磁聚变发动机以球形托卡马克设计来反应氦3和氘。 反应系统已经过优化，可以加热大量液态氢，与其他聚变系统相比，推力更高，但比冲却更低。 使用气尖喷嘴可以有效地在大气中运行。 为了减轻重量，该发动机的机载反应堆在运行时不会产生大量电力，尽管以这种方式保持反应堆的活动状态可以实现即时节气门响应。 确保安装散热器! // This advanced magnetic fusion engine reacts Helium-3 and Deuterium in a spherical tokamak design. The reaction system has been optimized to heat large quantities of Liquid Hydrogen, resulting in higher thrust but much lower specific impulse than other fusion systems. The use of an aerospike nozzle allows effective atmospheric operation. To reduce weight, this engine's onboard reactor does not produce a significant amount of power when running, though keeping the reactor active in this way allows instant throttle response. Make sure to pack radiators!
     #LOC_FFT_fft-fusion-magnetic-tokamak-aerospike-1_tags = fusion thermal plas nuclear rocket tokamak farfuture aerospike op hax ouroboros
 
+    #LOC_FFT_fft-fusion-axial-zpinch-1_title = JX-200 "水槽" 轴流Z箍缩聚变引擎 //  JX-200 'Flume' Axial Flow Z-Pinch Fusion Engine
+    #LOC_FFT_fft-fusion-axial-zpinch-1_description =  该引擎结合使用磁约束聚变等离子体和 zeta-pinch 效应来高效压缩。 当聚变体的羽流从“开放式概念”反应室的背面喷出时，这会产生出色的性能。 这种发动机动力需要为其电池组充电才能被激活，但一旦运行会产生高达 750 kW 的电力，这些电力将从等离子体中抽取到电池组。//This engine uses a combination of magnetic confinement and zeta-pinch effects to compress fusion plasmas highly efficiently. This results in great performance as the plume of nuclear fire sprays out the back of the 'open concept' reaction chamber. This engine needs to charge its power banks to be activated, but once running generates up to 750 kW of electrical power siphoned off from the plasma stream to charge ship power banks.
+    #LOC_FFT_fft-fusion-axial-zpinch-1_tags = pulse confinement fusion zpinch axial plasma farfuture nuclear torch
+
     // Super exotic
     // --------------
     #LOC_FFT_fft-nswr-1_title = X-2 "海因莱因" 核盐水火箭发动机 // X-2 'Heinlein' Nuclear Salt Water Rocket Engine
@@ -185,7 +185,6 @@ Localization
 
     #LOC_FFT_fft-nswr-2_title = X-50 "尼文" 核盐水火箭发动机
     #LOC_FFT_fft-nswr-2_description =  // X-50 'Niven' Nuclear Salt Water Rocket Engine
-    #LOC_FFT_fft-nswr-2_description =  // 
     #LOC_FFT_fft-nswr-2_tags = water nuke juice zubrin moar uranium exotic torch farfuture 
 
     // Fission
@@ -435,8 +434,7 @@ Localization
     #LOC_FFT_ModuleAntimatterTank_UIGroup_Title = 反物质收容 // Antimatter Containment
 
     #LOC_FFT_ModuleAntimatterTank_ModuleName = 反物质储罐 // Antimatter Tank
-    #LOC_FFT_ModuleAntimatterTank_PartInfo = <b><color= #f30802>须知: 在KSC生产反物质需要科学点数!</color></b> \n\n<b>收储耗能:</b> <<1>> kW \n<b>每单位所需能量:</b> <<2>> MJ
-    // <b><color= #f30802>NOTE: Antimatter costs science!</color></b> \n\n<b>Containment Cost:</b> <<1>> kW \n<b>Energy per unit:</b> <<2>> MJ
+    #LOC_FFT_ModuleAntimatterTank_PartInfo = <b><color=#f30802>须知: 在KSC生产反物质需要科技点数!</color></b> \n\n<b>收储耗能:</b> <<1>> kW \n<b>每单位所需能量:</b> <<2>> MJ // <b><color= #f30802>NOTE: Antimatter costs science!</color></b> \n\n<b>Containment Cost:</b> <<1>> kW \n<b>Energy per unit:</b> <<2>> MJ
 
     #LOC_FFT_ModuleAntimatterTank_Field_DetonationStatus_Title = 稳定 // Stability
     #LOC_FFT_ModuleAntimatterTank_Field_DetonationStatus_Contained = 收容正常 // Contained

GameData/FarFutureTechnologies/Parts/Engines/Antimatter/fft-antimatter-microfission-1.cfg

@@ -100,7 +100,7 @@ PART
     thrustVectorTransformName = thrustTransform
     exhaustDamage = True
     engineID = ReactionProducts
-    runningEffectName = fx-amcf-running
+
     ignitionThreshold = 0.1
     minThrust = 0
     maxThrust = 420
@@ -186,6 +186,7 @@ PART
     name = ModulePulseEngineAnimator
     engineID = ReactionProducts
     PulseAnimation = Pulse
+    pulseEffectName = fx-amcf-running
     PulseInterval
     {
       key = 0 1

GameData/FarFutureTechnologies/Parts/Engines/Antimatter/fft-antimatter-microfusion-1.cfg

@@ -93,7 +93,6 @@ PART
     thrustVectorTransformName = thrustTransform
     exhaustDamage = True
     engineID = AIMReactor
-    runningEffectName = fx-aim-running
     ignitionThreshold = 0.1
     minThrust = 0
     maxThrust = 45
@@ -131,6 +130,7 @@ PART
     name = ModulePulseEngineAnimator
     engineID = AIMReactor
     //PulseAnimation = Pulse
+    pulseEffectName = fx-aim-running
     PulseInterval
     {
       key = 0 1