Merge branch 'master' into rsplus-0625

This commit is contained in:
ChrisAdderley 2019-01-25 09:52:58 -08:00
commit f4366879e7
9 changed files with 130 additions and 127 deletions

View File

@ -18,18 +18,19 @@
{
running
{
AUDIO
{
channel = Ship
clip = sound_rocket_mini
volume = 0.0 0.0
volume = 0.02 0.2
volume = 0.5 0.2
volume = 1.0 0.2
pitch = 0.0 0.75
pitch = 1.0 1.5
loop = true
}
AUDIO_MULTI_POOL
{
channel = Ship
transformName = RCSjet
clip = sound_rocket_mini
volume = 0.0 0.0
volume = 0.1 0.0
volume = 0.5 0.025
volume = 1.0 0.1
pitch = 0.0 0.75
pitch = 1.0 1.5
loop = true
}
MODEL_MULTI_PARTICLE
{
name = fx1
@ -55,7 +56,7 @@
//localRotation = -90, 0, 0
localPosition = 0, -0.015, 0
}
}
}
}
}
@ -111,7 +112,7 @@
//localRotation = -90, 0, 0
localPosition = 0, -0.015, 0
}
}
}
}
MODULE
{

View File

@ -11,53 +11,54 @@ Localization
#LOC_RestockPlus_restock-engine-corgi_title = KR-10A 'Corgi' Liquid Fuel Engine Cluster
#LOC_RestockPlus_restock-engine-corgi_description = Kerbodyne engineers have discovered that clustering can be an effective solution when you need more thrust, and don't want to add more boosters. This upper stage engine is very efficient as it takes advantage of a set of lovingly handcrafted, free range KR-10 Engines.
#LOC_RestockPlus_restock-engine-corgi_tags =
#LOC_RestockPlus_restock-engine-corgi_tags = orbit vac upper propuls sls rl10 eus restock
#LOC_RestockPlus_restock-engine-boar_title = KR-1 'Boar' Liquid Fuel Engine
#LOC_RestockPlus_restock-engine-boar_description = The single Boar is slightly more efficient than its dual counterpart, and provides, logically, half the thrust. Due to a less integrated set of mounting points, there is a slight decrease in raw thrust-to-weight ratio.
#LOC_RestockPlus_restock-engine-boar_tags =
#LOC_RestockPlus_restock-engine-boar_tags = ascent main propuls lower sls dynetics f1b restock
#LOC_RestockPlus_restock-engine-pug_title = LV-303 'Pug' Liquid Fuel Engine
#LOC_RestockPlus_restock-engine-pug_description =
#LOC_RestockPlus_restock-engine-pug_tags =
#LOC_RestockPlus_restock-engine-pug_tags = orbit vac upper propuls restock
#LOC_RestockPlus_restock-engine-lug_title = LV-T15 'Valiant' Liquid Fuel Engine
#LOC_RestockPlus_restock-engine-lug_description =
#LOC_RestockPlus_restock-engine-lug_tags =
#LOC_RestockPlus_restock-engine-lug_tags = ascent main propuls lower sls restock
#LOC_RestockPlus_restock-drone-core-375-1_title = RC-XL001 Remote Guidance Unit
#LOC_RestockPlus_restock-drone-core-375-1_description =
#LOC_RestockPlus_restock-drone-core-375-1_tags =
#LOC_RestockPlus_restock-drone-core-375-1_description = The massive XL RGU system designed by Kerbodyne and built by STEADLER is a triumph of aerospace engineering and contains important features such as the large empty void in the centre, which can be filled with anything you like. Unlike other stack RGUs, it contains powerful reaction wheels so doubles as a guidance unit.
#LOC_RestockPlus_restock-drone-core-375-1_tags = cmg command control (core fly gyro kerbnet moment probe react sas satellite space stab steer torque restock
#LOC_RestockPlus_restock-battery-375-1_title = Z-10K Rechargable Battery Bank
#LOC_RestockPlus_restock-battery-375-1_description =
#LOC_RestockPlus_restock-battery-375-1_tags =
#LOC_RestockPlus_restock-battery-375-1_title = Z-10K Rechargeable Battery Bank
#LOC_RestockPlus_restock-battery-375-1_description = A gigantic battery pack for the largest rockets. Special on this model, Zaltronic includes mishap insurance - the first time your drop your battery, it will be replaced for free! However, the battery is not user-serviceable.
#LOC_RestockPlus_restock-battery-375-1_tags = capacitor cell charge e/c elect pack power volt watt restock
#LOC_RestockPlus_restock-docking-375-1_title = Clamp-O-Tron Docking Port 'Grande'
#LOC_RestockPlus_restock-docking-375-1_description =
#LOC_RestockPlus_restock-docking-375-1_tags =
#LOC_RestockPlus_restock-docking-375-1_description = When the thrill of docking enormous objects in space disappears, one must logically proceed to humongous objects. This even larger docking port is the result of 6 months of R&D to define the precise meaning of the word 'humongous'.
#LOC_RestockPlus_restock-docking-375-1_tags = restock berth capture connect couple dock fasten join moor socket
#LOC_RestockPlus_restock-fuel-tank-375-4_title = Kerbodyne S3-1800 Tank
#LOC_RestockPlus_restock-fuel-tank-375-4_description =
#LOC_RestockPlus_restock-fuel-tank-375-4_tags =
#LOC_RestockPlus_restock-fuel-tank-375-4_description = A special compact tank filling a particular hole in Kerbodyne's heavy part lineup. Now you can make Kerosene pancakes!
#LOC_RestockPlus_restock-fuel-tank-375-4_tags = restock fuel fueltank ?lfo liquid oxidizer propellant rocket tank
#LOC_RestockPlus_restock-adapter-hollow-25-375-1_title = Kerbodyne ADTP-2-3A
#LOC_RestockPlus_restock-adapter-hollow-25-375-1_description = A gutted version of the 2-3, which allows the storage of spacecraft components in its core.
#LOC_RestockPlus_restock-adapter-hollow-25-375-1_tags =
#LOC_RestockPlus_restock-adapter-hollow-25-375-1_tags = connect frame scaffold adapt structur strut truss hollow skel carg restock
#LOC_RestockPlus_restock-adapter-skeletal-25-375-1_title = Kerbodyne SKLE-2-3
#LOC_RestockPlus_restock-adapter-skeletal-25-375-1_description = A structural adapter for upper stages.
#LOC_RestockPlus_restock-adapter-skeletal-25-375-1_tags =
#LOC_RestockPlus_restock-adapter-skeletal-25-375-1_description = A structural adapter for upper stages.
#LOC_RestockPlus_restock-adapter-skeletal-25-375-1_tags = connect frame scaffold adapt structur strut truss eus hollow skel restock
#LOC_RestockPlus_restock-materialbay-radial-1_title = SC-9001R Radial Science Jr.
#LOC_RestockPlus_restock-materialbay-radial-1_description = The SC-9001R has the same set of experiments as the regular Science Jr. Material Bay, but in a conveniant, radial-mountable package. Recommended for ages 4-8. Small parts inside make it not suitable for small children.
#LOC_RestockPlus_restock-materialbay-radial-1_tags = bay experiment lab material research radial sandwich kracken
#LOC_RestockPlus_restock-materialbay-radial-1_tags = bay experiment lab material research radial sandwich kracken kraken restock
#LOC_RestockPlus_restock-goocanister-625-1_title = Mystery Goo™ Inline Containment Unit
#LOC_RestockPlus_restock-goocanister-625-1_description = After an unfortunate accident where a technician attempted to stock delicate machinery on the classic Mystery Goo™ canister, FLOOYD Dynamics Labs saw a market opportunity for a version with a flat top and bottom.
#LOC_RestockPlus_restock-goocanister-625-1_tags = experiment research science 0.625
#LOC_RestockPlus_restock-goocanister-625-1_description = After an unfortunate accident where a technician attempted to stock delicate machinery on the classic Mystery Goo™ canister, FLOOYD Dynamics Labs saw a market opportunity for a version with a flat top and bottom.
#LOC_RestockPlus_restock-goocanister-625-1_tags = experiment research science 0.625 restock
#LOC_RestockPlus_restock-relay-radial-2_title = HG-20 High Gain Antenna
#LOC_RestockPlus_restock-relay-radial-2_description = A longer range version of the HG-5 that can handle either direct communications or short range relays, using 4 different dishes.
#LOC_RestockPlus_restock-relay-radial-2_tags = relay antenna radial science transmit data Apollo
#LOC_RestockPlus_restock-relay-radial-2_description = A longer range version of the HG-5 that can handle either direct communications or short range relays, using 4 different dishes.
#LOC_RestockPlus_restock-relay-radial-2_tags = relay antenna radial science transmit data Apollo restock
}
}

View File

@ -19,15 +19,15 @@ PART
node_stack_bottom = 0.0, -0.196, 0.0, 0.0, -1.0, 0.0, 3
TechRequired = largeUnmanned
entryCost = 36800
cost = 7700
entryCost = 32000
cost = 6300
category = Pods
subcategory = 0
title = #LOC_RestockPlus_restock-drone-core-375-1_title
manufacturer = #autoLOC_501631
description = #LOC_RestockPlus_restock-drone-core-375-1_description
attachRules = 1,0,1,1,0
mass = 0.95
mass = 0.85
dragModelType = default
maximum_drag = 0.2
minimum_drag = 0.2
@ -55,7 +55,7 @@ PART
RESOURCE
{
name = ElectricCharge
rate = 0.1
rate = 0.18
}
hasHibernation = True
hibernationMultiplier = 0.00125
@ -69,13 +69,13 @@ PART
MODULE
{
name = ModuleReactionWheel
PitchTorque = 60
YawTorque = 60
RollTorque = 60
PitchTorque = 30
YawTorque = 30
RollTorque = 30
RESOURCE
{
name = ElectricCharge
rate = 1.2
rate = 0.6
}
}
MODULE

View File

@ -10,14 +10,14 @@ PART
model = ReStockPlus/Assets/Coupling/restock-docking-375-1
scale = 1.0, 1.0, 1.0
}
MODEL
MODEL
{
model = ReStock/Assets/Command/restock-hatch-common-round-grey-1
position = 0.0, 0.090099, 0.0
scale = 1.174142,1.174142,1.174142
rotation = 0, -90, 0
}
MODEL
MODEL
{
model = ReStock/Assets/Command/restock-hatch-common-round-white-1
position = 0.0, -0.128, 0.0
@ -34,10 +34,10 @@ PART
// Tech
TechRequired = metaMaterials
entryCost = 125000
entryCost = 21500
// Info
cost = 5600
cost = 1850
category = Coupling
subcategory = 0
title = #LOC_RestockPlus_restock-docking-375-1_title
@ -46,7 +46,7 @@ PART
bulkheadProfiles = size3
// Parameters
mass = 1.6
mass = 0.45
dragModelType = default
maximum_drag = 0.2
minimum_drag = 0.3

View File

@ -21,9 +21,9 @@ PART
node_stack_bottom = 0.0, -0.227, 0.0, 0.0, -1.0, 0.0, 3
// --- editor parameters ---
TechRequired = veryHeavyRocketry
entryCost = 26800
cost = 15200
TechRequired = largeElectrics
entryCost = 21500
cost = 11250
category = Electrical
subcategory = 0
title = #LOC_RestockPlus_restock-battery-375-1_title
@ -35,7 +35,7 @@ PART
bulkheadProfiles = size3
// --- standard part parameters ---
mass = 3
mass = 0.5
dragModelType = default
maximum_drag = 0.2
minimum_drag = 0.2
@ -51,7 +51,7 @@ PART
RESOURCE
{
name = ElectricCharge
amount = 2880
maxAmount = 2880
amount = 10000
maxAmount = 10000
}
}

View File

@ -121,8 +121,8 @@ PART
// --- editor parameters ---
TechRequired = veryHeavyRocketry
entryCost = 38800
cost = 9100
entryCost = 31000
cost = 12000
category = Engine
subcategory = 0
title = #LOC_RestockPlus_restock-engine-boar_title
@ -134,7 +134,7 @@ PART
bulkheadProfiles = size2, size1, srf
// --- standard part parameters ---
mass = 7.0
mass = 3.5
dragModelType = default
maximum_drag = 0.2
minimum_drag = 0.2
@ -174,9 +174,9 @@ PART
}
atmosphereCurve
{
key = 0 345
key = 1 295
key = 12 0.001
key = 0 300
key = 1 280
key = 12 100
}
}
MODULE

View File

@ -80,78 +80,79 @@ PART
MODEL_MULTI_PARTICLE
{
name = plume
modelName = ReStockPlus/FX/restock-fx-corgi-plume-1
transformName = fxTransformPlume
emission = 0.0 0.0
emission = 0.01 0.1
emission = 0.075 0.25
emission = 1.0 1.0
speed = 0.0 0.35
speed = 1.0 1.0
}
}
}
modelName = ReStockPlus/FX/restock-fx-corgi-plume-1
transformName = fxTransformPlume
emission = 0.0 0.0
emission = 0.01 0.1
emission = 0.075 0.25
emission = 1.0 1.0
speed = 0.0 0.35
speed = 1.0 1.0
}
// --- editor parameters ---
TechRequired = veryHeavyRocketry
entryCost = 13500
cost = 4250
category = Engine
subcategory = 0
title = #LOC_RestockPlus_restock-engine-corgi_title
manufacturer = #autoLOC_501638
description = #LOC_RestockPlus_restock-engine-corgi_description
}
}
// --- editor parameters ---
TechRequired = veryHeavyRocketry
entryCost = 13500
cost = 4250
category = Engine
subcategory = 0
title = #LOC_RestockPlus_restock-engine-corgi_title
manufacturer = #autoLOC_501638
description = #LOC_RestockPlus_restock-engine-corgi_description
// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
attachRules = 1,1,1,0,0
bulkheadProfiles = size3, size2
// --- standard part parameters ---
mass = 5.25
dragModelType = default
maximum_drag = 0.2
minimum_drag = 0.2
angularDrag = 2
crashTolerance = 20
maxTemp = 2000
// --- standard part parameters ---
mass = 5.25
dragModelType = default
maximum_drag = 0.2
minimum_drag = 0.2
angularDrag = 2
crashTolerance = 20
maxTemp = 2000
breakingForce = 5000
breakingTorque = 5000
tags = #LOC_RestockPlus_restock-engine-corgi_tags
MODULE
{
name = ModuleEnginesFX
engineID = MainExhaust
thrustVectorTransformName = thrustTransform
exhaustDamage = True
runningEffectName = fx-corgi-running
ignitionThreshold = 0.1
minThrust = 0
maxThrust = 750
heatProduction = 5
MODULE
{
name = ModuleEnginesFX
engineID = MainExhaust
thrustVectorTransformName = thrustTransform
exhaustDamage = True
runningEffectName = fx-corgi-running
ignitionThreshold = 0.1
minThrust = 0
maxThrust = 750
heatProduction = 5
fxOffset = 0, 0, 0
EngineType = LiquidFuel
exhaustDamageDistanceOffset = 1.5
PROPELLANT
{
name = LiquidFuel
ratio = 0.9
DrawGauge = True
}
PROPELLANT
{
name = Oxidizer
ratio = 1.1
}
atmosphereCurve
{
key = 0 355
key = 1 95
key = 12 0.001
}
}
EngineType = LiquidFuel
exhaustDamageDistanceOffset = 1.5
PROPELLANT
{
name = LiquidFuel
ratio = 0.9
DrawGauge = True
}
PROPELLANT
{
name = Oxidizer
ratio = 1.1
}
atmosphereCurve
{
key = 0 355
key = 1 95
key = 12 0.001
}
}
MODULE
{
name = ModuleAlternator

View File

@ -19,11 +19,11 @@ PART
node_stack_bottom = 0.0, -1.1, 0.0, 0.0, -1.0, 0.0, 3
// Tech
TechRequired = highPerformanceFuelSystems
entryCost = 12900
TechRequired = nanolathing
entryCost = 3050
// Info
cost = 5750
cost = 1000
category = Structural
subcategory = 0
title = #LOC_RestockPlus_restock-adapter-hollow-25-375-1_title
@ -33,7 +33,7 @@ PART
bulkheadProfiles = size3, size2
// Parameters
mass = 1
mass = 0.5
dragModelType = default
maximum_drag = 0.2
minimum_drag = 0.3

View File

@ -19,11 +19,11 @@ PART
node_stack_bottom = 0.0, -0.36, 0, 0.0, -1.0, 0.0, 3
// Tech
TechRequired = highPerformanceFuelSystems
entryCost = 12900
TechRequired = nanolathing
entryCost = 1800
// Info
cost = 5750
cost = 800
category = Structural
subcategory = 0
title = #LOC_RestockPlus_restock-adapter-skeletal-25-375-1_title
@ -33,7 +33,7 @@ PART
bulkheadProfiles = size3, size2
// Parameters
mass = 1
mass = 0.35
dragModelType = default
maximum_drag = 0.2
minimum_drag = 0.3