Skip to content

Commit

Permalink
Merge pull request #143 from ChrisAdderley/dev
Browse files Browse the repository at this point in the history
Release 1.3.2
  • Loading branch information
ChrisAdderley authored Aug 3, 2020
2 parents c7d8946 + 1968c03 commit 4d236b7
Show file tree
Hide file tree
Showing 13 changed files with 127 additions and 90 deletions.
6 changes: 3 additions & 3 deletions .mod_data.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ package:
- changelog.txt
dependencies: # Configure dependencies
ModuleManager:
version: 4.1.3
version: 4.1.4
location: s3
B9PartSwitch:
version: 2.13.0
version: 2.17.0
location: s3
NearFutureProps:
tag: 0.6.2
tag: 0.6.3
location: github
repository: ChrisAdderley/NearFutureProps
deploy:
Expand Down
7 changes: 6 additions & 1 deletion GameData/NearFutureSpacecraft/Localization/en-us.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ Localization
#LOC_NFSpacecraft_engine-rocket-pack-1_tags = land propuls rocket dragon draco super nearfuture nereid mono tethys

#LOC_NFSpacecraft_engine-rocket-pack-2_title = 96-8S 'Hummingbird' Landing Engine
#LOC_NFSpacecraft_engine-rocket-pack-2_description = A specialized plug-and-play solution to the Amalthea pod's landing problem. When appropriate holes have been carefully cut in the capsule's lower hull, four Hummingbird assemblies can be introduced, allowing for easy landing on a variety of worlds. A podded version is also available.
#LOC_NFSpacecraft_engine-rocket-pack-2_description = A specialized plug-and-play solution to the Amalthea pod's landing problem. When appropriate holes have been carefully cut in the capsule's lower hull, four Hummingbird assemblies can be introduced, allowing for easy landing on a variety of worlds.
#LOC_NFSpacecraft_engine-rocket-pack-2_tags = land propuls rocket nearfuture mono amalthea

// Orbital Engines
Expand Down Expand Up @@ -200,5 +200,10 @@ Localization
#LOC_NFSpacecraft_Action_StopUSIHab = Stop Habitat
#LOC_NFSpacecraft_Action_ToggleUSIHab = Toggle Habitat

// Snacks
#LOC_NFSpacecraft_Snacks_SoilRecycler_ConverterName = Soil Recycler
#LOC_NFSpacecraft_Snacks_SoilRecycler_StartActionName = Start Soil Recycler
#LOC_NFSpacecraft_Snacks_SoilRecycler_StopActionName = Stop Soil Recycler

}
}
5 changes: 5 additions & 0 deletions GameData/NearFutureSpacecraft/Localization/ru.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -209,5 +209,10 @@ Localization
#LOC_NFSpacecraft_Action_StartUSIHab = Включить обитаемый модуль
#LOC_NFSpacecraft_Action_StopUSIHab = Выключить обитаемый модуль
#LOC_NFSpacecraft_Action_ToggleUSIHab = Переключить обитаемый модуль

// Snacks
#LOC_NFSpacecraft_Snacks_SoilRecycler_ConverterName = Переработка почвы
#LOC_NFSpacecraft_Snacks_SoilRecycler_StartActionName = Запуск переработки почвы
#LOC_NFSpacecraft_Snacks_SoilRecycler_StopActionName = Остановить переработку почвы
}
}
5 changes: 5 additions & 0 deletions GameData/NearFutureSpacecraft/Localization/zh-cn.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -201,5 +201,10 @@ Localization
#LOC_NFSpacecraft_Action_StopUSIHab = 关闭Habitat
#LOC_NFSpacecraft_Action_ToggleUSIHab = 开关Habitat

// Snacks
#LOC_NFSpacecraft_Snacks_SoilRecycler_ConverterName = 土壤回收装置
#LOC_NFSpacecraft_Snacks_SoilRecycler_StartActionName = 启动土壤回收装置
#LOC_NFSpacecraft_Snacks_SoilRecycler_StopActionName = 停止土壤回收装置

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ PART
buoyancy = 1.1
CoLOffset = 0.0, 0, 0.0

maxTemp = 1400
maxTemp = 1500
skinMaxTemp = 2400

vesselType = Ship
Expand Down Expand Up @@ -271,8 +271,8 @@ PART
name = ModuleAblator
ablativeResource = Ablator
lossExp = -7500
lossConst = 0.1
pyrolysisLossFactor = 6000
lossConst = 0.2
pyrolysisLossFactor = 10000
reentryConductivity = 0.01
ablationTempThresh = 500
useChar = False
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ PART
name = Basic
tankType = Mk4Capsule
title = #LOC_NFSpacecraft_command-mk4-1_switcher_variant1
maxTemp = 1000
maxTemp = 1200
skinMaxTemp = 2000
}
SUBTYPE
Expand All @@ -129,8 +129,8 @@ PART
title =#LOC_NFSpacecraft_command-mk4-1_switcher_variant2
transform = ShroudA
node = bottom02
maxTemp = 2300
skinMaxTemp = 2200
maxTemp = 1500
skinMaxTemp = 2400
}
SUBTYPE
{
Expand All @@ -139,7 +139,7 @@ PART
title =#LOC_NFSpacecraft_command-mk4-1_switcher_variant3
transform = ShroudC
node = bottom02
maxTemp = 2300
maxTemp = 1500
skinMaxTemp = 2400
node = jet1
node = jet2
Expand All @@ -153,17 +153,17 @@ PART
title = #LOC_NFSpacecraft_command-mk4-1_switcher_variant4
transform = ShroudB
node = bottom02
maxTemp = 1300
skinMaxTemp = 2300
maxTemp = 1200
skinMaxTemp = 2000
}
}
MODULE
{
name = ModuleAblator
ablativeResource = Ablator
lossExp = -7500
lossConst = 0.1
pyrolysisLossFactor = 6000
lossConst = 0.3
pyrolysisLossFactor = 9000
reentryConductivity = 0.01
ablationTempThresh = 500
useChar = False
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ PART
node_stack_bottom1 = 0.0, -0.278, 0.0, 0.0, -1.0, 0.0, 1


bulkheadProfiles = size1, size2

// --- FX definitions ---
EFFECTS
{
Expand Down
14 changes: 14 additions & 0 deletions GameData/NearFutureSpacecraft/Patches/NFSpacecraftJNSQ.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
@PART[command-375-biconic-1]:NEEDS[JNSQ]:FOR[NearFutureSpacecraft]
{
@MODULE[ModuleAblator]
{
@pyrolysisLossFactor = 40000
}
}
@PART[command-mk4-1]:NEEDS[JNSQ]:FOR[NearFutureSpacecraft]
{
@MODULE[ModuleAblator]
{
@pyrolysisLossFactor = 30000
}
}
65 changes: 0 additions & 65 deletions GameData/NearFutureSpacecraft/Patches/NFSpacecraftKerbalHealth.cfg

This file was deleted.

64 changes: 64 additions & 0 deletions GameData/NearFutureSpacecraft/Patches/NFSpacecraftSnacks.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
// Snacks! life support recycler functions

//RPD-12 Itinerant Service Compartment
@PART[utility-pod-25]:NEEDS[Snacks]:FOR[NearFutureSpacecraft]
{
MODULE
{
name = SoilRecycler
ConverterName = #LOC_NFSpacecraft_Snacks_SoilRecycler_ConverterName // #LOC_NFSpacecraft_Snacks_SoilRecycler_ConverterName = Soil Recycler
StartActionName = #LOC_NFSpacecraft_Snacks_SoilRecycler_StartActionName // #LOC_NFSpacecraft_Snacks_SoilRecycler_StartActionName = Start Soil Recycler
StopActionName = #LOC_NFSpacecraft_Snacks_SoilRecycler_StopActionName // #LOC_NFSpacecraft_Snacks_SoilRecycler_StopActionName = Stop Soil Recycler
AutoShutdown = false
GeneratesHeat = false
UseSpecialistBonus = true
ExperienceEffect = ScienceSkill
EfficiencyBonus = 1.0
// default
RecyclerCapacity = 1
// use CrewCapacity for RecyclerCapacity
@RecyclerCapacity *= #$../CrewCapacity$

INPUT_RESOURCE
{
ResourceName = Soil
Ratio = 0.00004630
FlowMode = ALL_VESSEL
}
INPUT_RESOURCE
{
ResourceName = ElectricCharge
Ratio = 3
}
OUTPUT_RESOURCE
{
ResourceName = Snacks
Ratio = 0.00004630
DumpExcess = false
FlowMode = ALL_VESSEL
}
}
//Because we are directly monitoring converters,
//ModuleQualityControl has to appear in the config
//AFTER all the converters in the part.
MODULE:NEEDS[BARIS]
{
name = ModuleQualityControl
quality = 65
mtbf = 100
monitorConverters = true //WARNING: this is a performance hit.
}

// Note, Snacks mod adds Snacks capacity to crewed parts automatically.
// Soil capacity is not automatic since only parts with recyclers
// should have it.
RESOURCE
{
name = Soil
amount = 0
maxAmount = 50
@maxAmount *= #$../CrewCapacity$
}

@tags ^= :$: cck-lifesupport:
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
{
"MAJOR":1,
"MINOR":3,
"PATCH":1,
"PATCH":2,
"BUILD":0
},
"KSP_VERSION":
{
"MAJOR":1,
"MINOR":9,
"PATCH":0
"MINOR":10,
"PATCH":1
},
"KSP_VERSION_MIN":{
"MAJOR":1,
Expand All @@ -22,7 +22,7 @@
},
"KSP_VERSION_MAX":{
"MAJOR":1,
"MINOR":9,
"MINOR":10,
"PATCH":99
}
}
11 changes: 11 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
v1.3.2
------
- KSP 1.10.x
- Updated NearFutureProps to 0.6.3
- Updated B9PartSwitch to 2.17.0
- Updated ModuleManager to 4.1.4
- Adjusted a description to indicate that the Hummingbird does not get a podded variant (LouisB3)
- Various heatshield tweaks and tunings, including a patch for JNSQ reentries (Rodger)
- Improved Snacks! support (Michael Paul)
- Improved KerbalHealth support (LouisB3)

v1.3.1
------
- KSP 1.9.x
Expand Down
8 changes: 4 additions & 4 deletions readme.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
==================================
NEAR FUTURE SPACECRAFT PACK v1.3.1
NEAR FUTURE SPACECRAFT PACK v1.3.2
==================================

This pack contains spacecraft parts focused on crewed vehicles. At the moment this includes nine new command pods, one new utility module, several monopropellant engines in orbital and landing variants, more monopropellant tanks, additional RCS thrusters.
Expand All @@ -9,9 +9,9 @@ DEPENDENCIES
============

Required
- NearFutureProps (0.6.2)
- B9 Part Switch (2.13.0)
- ModuleManager (4.1.3)
- NearFutureProps (0.6.3)
- B9 Part Switch (2.17.0)
- ModuleManager (4.1.4)

Optional
- Community Tech Tree (v2.0+)
Expand Down

0 comments on commit 4d236b7

Please sign in to comment.