Merge branch 'master' into science-comms

This commit is contained in:
Andrew Cassidy 2018-12-01 19:57:12 -08:00
commit 6b9708221c
No known key found for this signature in database
GPG Key ID: 963017B38FD477A1
98 changed files with 1717 additions and 30 deletions

View File

@ -30,5 +30,13 @@ Localization
#LOC_Restock_variant-surface_metal = Metal
#LOC_Restock_variant-service-bay-opaque = Solid Caps
#LOC_Restock_variant-service-bay-transparent = Truss Caps
#LOC_Restock_variant-service-bay-hollow = No Caps
#LOC_Restock_variant-heat-shield-black = Black
#LOC_Restock_variant-heat-shield-brown = Classic
#LOC_Restock_variant-heat-shield-red = Unpainted
}
}

View File

@ -0,0 +1,298 @@
// Patches applying art changes to heat shields
// Contents:
- Heat Shield (0.625m) (HeatShield0)
- Heat Shield (1.25m) (HeatShield1)
- Heat Shield (2.5m) (HeatShield2)
- Heat Shield (3.75m) (HeatShield3)
@PART[HeatShield0]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
!MODEL {}
MODEL {
model = ReStock/Assets/Aero/restock-heatshield-0625-1
}
node_stack_bottom02 = 0.0, -0.0389, 0.0, 0.0, -1.0, 0.0, 0
DRAG_CUBE
{
cube = Default, 0.06044,0.4659,0.4447, 0.06044,0.4659,0.4447, 0.3843,0.9488,0.1482, 0.3843,0.9396,0.1682, 0.06044,0.4645,0.4447, 0.06044,0.4673,0.4447, 0,0.003277,-3.906E-10, 0.7,0.1,0.7
}
MODULE
{
name = ModuleJettison
jettisonName = HeatShield0625Fairing
bottomNodeName = bottom02
isFairing = True
jettisonedObjectMass = 0.5
jettisonForce = 15
jettisonDirection = 0 0 1
stagingEnabled = False
checkBottomNode = True
}
MODULE
{
name = ModulePartVariants
baseVariant = Classic
VARIANT
{
name = Classic
displayName = #LOC_Restock_variant-heat-shield-brown
primaryColor = #8d6c24
GAMEOBJECTS
{
HeatShield0625Brown = true
HeatShield0625Red = false
HeatShield0625Black = false
}
}
VARIANT
{
name = Black
displayName = #LOC_Restock_variant-heat-shield-black
primaryColor = #303030
GAMEOBJECTS
{
HeatShield0625Brown = false
HeatShield0625Red = false
HeatShield0625Black = true
}
}
VARIANT
{
name = Red
displayName = #LOC_Restock_variant-heat-shield-red
primaryColor = #793b25
GAMEOBJECTS
{
HeatShield0625Brown = false
HeatShield0625Red = true
HeatShield0625Black = false
}
}
}
@MODULE[ModuleColorChanger]
{
excludedRenderer = HeatShield0625Fairing
excludedRenderer = HeatShield0625Internal
}
}
@PART[HeatShield1]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
!MODEL {}
MODEL {
model = ReStock/Assets/Aero/restock-heatshield-125-1
}
MODULE
{
name = ModulePartVariants
baseVariant = Classic
VARIANT
{
name = Classic
displayName = #LOC_Restock_variant-heat-shield-brown
primaryColor = #8d6c24
GAMEOBJECTS
{
HeatShield125Brown = true
HeatShield125Red = false
HeatShield125Black = false
}
}
VARIANT
{
name = Black
displayName = #LOC_Restock_variant-heat-shield-black
primaryColor = #303030
GAMEOBJECTS
{
HeatShield125Brown = false
HeatShield125Red = false
HeatShield125Black = true
}
}
VARIANT
{
name = Red
displayName = #LOC_Restock_variant-heat-shield-red
primaryColor = #793b25
GAMEOBJECTS
{
HeatShield125Brown = false
HeatShield125Red = true
HeatShield125Black = false
}
}
}
@MODULE[ModuleColorChanger]
{
excludedRenderer = HeatShieldFairing
excludedRenderer = HeatShieldInternals
}
@MODULE[ModuleJettison]
{
@jettisonName = HeatShield125Fairing
}
DRAG_CUBE
{
cube = Fairing, 0.3875,0.7436,0.7686, 0.3875,0.7436,0.7686, 1.44,0.9625,0.1822, 1.44,0.964,0.3017, 0.3875,0.7436,0.7686, 0.3875,0.7436,0.7686, 0,-0.05126,0, 1.355,0.2838,1.355
cube = Clean, 0.1825,0.4643,0.7229, 0.1825,0.4643,0.7229, 1.274,0.9542,0.1829, 1.274,0.9475,0.2177, 0.1825,0.4628,0.7229, 0.1825,0.4658,0.7229, 0,0.005576,-1.994E-09, 1.275,0.1702,1.275
}
}
@PART[HeatShield2]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
!MODEL {}
MODEL {
model = ReStock/Assets/Aero/restock-heatshield-25-1
}
MODULE
{
name = ModulePartVariants
baseVariant = Classic
VARIANT
{
name = Classic
displayName = #LOC_Restock_variant-heat-shield-brown
primaryColor = #8d6c24
GAMEOBJECTS
{
HeatShield25Brown = true
HeatShield25Red = false
HeatShield25Black = false
}
}
VARIANT
{
name = Black
displayName = #LOC_Restock_variant-heat-shield-black
primaryColor = #303030
GAMEOBJECTS
{
HeatShield25Brown = false
HeatShield25Red = false
HeatShield25Black = true
}
}
VARIANT
{
name = Red
displayName = #LOC_Restock_variant-heat-shield-red
primaryColor = #793b25
GAMEOBJECTS
{
HeatShield25Brown = false
HeatShield25Red = true
HeatShield25Black = false
}
}
}
@MODULE[ModuleJettison]
{
@jettisonName = HeatShield25Fairing
}
@MODULE[ModuleColorChanger]
{
excludedRenderer = HeatShield25Fairing
excludedRenderer = HeatShieldInternals
}
DRAG_CUBE
{
cube = Fairing, 1.436,0.7472,1.355, 1.436,0.7472,1.355, 5.341,0.9614,0.259, 5.341,0.9714,0.4709, 1.436,0.7472,1.355, 1.436,0.7471,1.355, 0,-0.1004,0, 2.609,0.5505,2.609
cube = Clean, 0.7091,0.4621,1.346, 0.7091,0.4621,1.346, 4.998,0.9524,0.2587, 4.998,0.9466,0.3249, 0.7091,0.4605,1.346, 0.7091,0.4638,1.346, 0,0.01104,0, 2.525,0.3277,2.525
}
}
@PART[HeatShield3]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
!MODEL {}
MODEL {
model = ReStock/Assets/Aero/restock-heatshield-375-1
}
DRAG_CUBE
{
cube = Fairing, 3.357,0.7502,2.005, 3.357,0.7502,2.005, 12.48,0.9608,0.3456, 12.48,0.9621,0.6953, 3.357,0.7502,2.005, 3.357,0.7502,2.005, 0,-0.1559,0, 3.99,0.8369,3.99
cube = Clean, 1.563,0.4576,1.952, 1.563,0.4576,1.952, 11.03,0.9547,0.3365, 11.03,0.9465,0.4361, 1.563,0.456,1.952, 1.563,0.459,1.952, 0,0.01101,0, 3.75,0.4864,3.75
}
@MODULE[ModuleJettison]
{
@jettisonName = HeatShield375Fairing
}
MODULE
{
name = ModulePartVariants
baseVariant = Classic
VARIANT
{
name = Classic
displayName = #LOC_Restock_variant-heat-shield-brown
primaryColor = #8d6c24
GAMEOBJECTS
{
HeatShield375Brown = true
HeatShield375Red = false
HeatShield375Black = false
}
}
VARIANT
{
name = Black
displayName = #LOC_Restock_variant-heat-shield-black
primaryColor = #303030
GAMEOBJECTS
{
HeatShield375Brown = false
HeatShield375Red = false
HeatShield375Black = true
}
}
VARIANT
{
name = Red
displayName = #LOC_Restock_variant-heat-shield-red
primaryColor = #793b25
GAMEOBJECTS
{
HeatShield375Brown = false
HeatShield375Red = true
HeatShield375Black = false
}
}
}
@MODULE[ModuleColorChanger]
{
excludedRenderer = HeatShield375Fairing
excludedRenderer = HeatShield375Internal
}
}

View File

@ -3,7 +3,23 @@
// - Z-200 Rechargeable Battery Bank (batteryBankMini)
// - Z-1K Rechargeable Battery Bank (batteryBank)
// - Z-4K Rechargeable Battery Bank (batteryBankLarge)
// - Z-100 Rechargeable Battery Pack (batteryPack)
// - Z-400 Rechargeable Battery (ksp_r_largeBatteryPack)
// 0.625m battery bank
@PART[batteryBankMini]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
!MODEL,* {}
MODEL
{
model = ReStock/Assets/Electrical/restock-battery-0625-1
position = 0.0, 0.0, 0.0
scale = 1,1,1
rotation = 0, 0, 0
}
}
// 1.25m battery bank
@PART[batteryBank]
{
@ -18,3 +34,45 @@
rotation = 0, 0, 0
}
}
// 2.5m battery bank
@PART[batteryBankLarge]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
!MODEL,* {}
MODEL
{
model = ReStock/Assets/Electrical/restock-battery-25-1
position = 0.0, 0.0, 0.0
scale = 1,1,1
rotation = 0, 0, 0
}
}
// Small radial battery
@PART[batteryPack]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
!MODEL,* {}
MODEL
{
model = ReStock/Assets/Electrical/restock-battery-radial-small-1
position = 0.0, 0.0, 0.0
scale = 1,1,1
rotation = 0, 0, 0
}
}
// Large radial battery
@PART[ksp_r_largeBatteryPack]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
!MODEL,* {}
MODEL
{
model = ReStock/Assets/Electrical/restock-battery-radial-med-1
position = 0.0, 0.0, 0.0
scale = 1,1,1
rotation = 0, 0, 0
}
}

View File

@ -0,0 +1,975 @@
// Patches applying art changes to ion engines
// Contents:
// - IX-6315 "Dawn" Electric Propulsion System (ionEngine)
// Dawn
@PART[ionEngine]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
!MODEL {}
MODEL {
model = ReStock/Assets/Engine/restock-engine-dawn-1
}
@MODULE[ModuleEnginesFX]
{
@runningEffectName = fx-ant-running
@fxOffset = 0, 0, 0
}
!MODULE[FXModuleAnimateThrottle] {}
MODULE
{
name = FXModuleThrottleEffects
fxModuleNames = throttleColor
responseSpeed = 1.0
dependOnEngineState = True
dependOnThrottle = True
}
MODULE
{
name = ModuleColorChanger
moduleID = throttleColor
animRate = 1
shaderProperty = _EmissiveColor
includedRenderer = IonEngine
toggleInEditor = false
toggleInFlight = false
redCurve
{
key = 0 1
key = 1 1
}
greenCurve
{
key = 0 1
key = 1 1
}
blueCurve
{
key = 0 1
key = 1 1
}
alphaCurve
{
key = 0 0
key = 1 1
}
}
MODULE
{
name = ModuleJettison
jettisonName = ShroudAnt
bottomNodeName = bottom
isFairing = True
jettisonedObjectMass = 0.1
jettisonForce = 5
jettisonDirection = 0 0 1
}
}
// Spider
@PART[radialEngineMini]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
!MODEL {}
MODEL {
model = ReStock/Assets/Engine/restock-engine-spider-1
}
!EFFECTS {}
EFFECTS
{
engage
{
AUDIO
{
channel = Ship
clip = sound_vent_soft
volume = 1.0
pitch = 2.0
loop = false
}
}
flameout
{
PREFAB_PARTICLE
{
prefabName = fx_exhaustSparks_flameout_2
transformName = thrustTransform
oneShot = true
}
AUDIO
{
channel = Ship
clip = sound_explosion_low
volume = 1.0
pitch = 2.0
loop = false
}
}
fx-spider-running
{
AUDIO
{
channel = Ship
clip = sound_rocket_mini
volume = 0.0 0.0
volume = 1.0 0.3
pitch = 0.0 0.75
pitch = 1.0 1.5
loop = true
}
MODEL_MULTI_PARTICLE
{
name = core
modelName = ReStock/FX/restock-fx-ant-1
transformName = fxTransform
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
}
}
}
@MODULE[ModuleEnginesFX]
{
@runningEffectName = fx-spider-running
}
@MODULE[ModuleGimbal]
{
@gimbalTransformName = B_Gimbal
}
MODULE
{
name = FXModuleLookAtConstraint
CONSTRAINLOOKFX
{
targetName = CylTop001
rotatorsName = Cyl001
}
CONSTRAINLOOKFX
{
targetName = CylTop002
rotatorsName = Cyl002
}
CONSTRAINLOOKFX
{
targetName = Cyl001
rotatorsName = CylTop001
}
CONSTRAINLOOKFX
{
targetName = Cyl002
rotatorsName = CylTop002
}
}
!MODULE[FXModuleAnimateThrottle] {}
MODULE
{
name = FXModuleThrottleEffects
fxModuleNames = heatColor
responseSpeed = 0.005
dependOnEngineState = True
dependOnThrottle = True
}
MODULE
{
name = FXModuleThrottleEffects
fxModuleNames = throttleColor
responseSpeed = 1.0
dependOnEngineState = True
dependOnThrottle = True
}
MODULE
{
name = ModuleColorChanger
moduleID = heatColor
animRate = 0.05
shaderProperty = _EmissiveColor
excludedRenderer = EngineCore
toggleInEditor = false
toggleInFlight = false
redCurve
{
key = 0 1
key = 1 1
}
greenCurve
{
key = 0 1
key = 1 1
}
blueCurve
{
key = 0 1
key = 1 1
}
alphaCurve
{
key = 0 0
key = 1 1
}
}
MODULE
{
name = ModuleColorChanger
moduleID = throttleColor
animRate = 1
shaderProperty = _EmissiveColor
includedRenderer = EngineCore
toggleInEditor = false
toggleInFlight = false
redCurve
{
key = 0 1
key = 1 1
}
greenCurve
{
key = 0 1
key = 1 1
}
blueCurve
{
key = 0 1
key = 1 1
}
alphaCurve
{
key = 0 0
key = 1 1
}
}
}
// Spark
@PART[liquidEngineMini]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
!MODEL {}
MODEL {
model = ReStock/Assets/Engine/restock-engine-spark-1
}
%node_attach = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 3
@attachRules = 1,1,1,0,0
!EFFECTS {}
EFFECTS
{
engage
{
AUDIO
{
channel = Ship
clip = sound_vent_medium
volume = 1.0
pitch = 2.0
loop = false
}
}
disengage
{
AUDIO
{
channel = Ship
clip = sound_vent_soft
loop = false
}
}
flameout
{
PREFAB_PARTICLE
{
prefabName = fx_exhaustSparks_flameout_2
transformName = thrustTransform
oneShot = true
}
AUDIO
{
channel = Ship
clip = sound_explosion_low
volume = 1.0
pitch = 2.0
loop = false
}
}
fx-spark-running
{
AUDIO
{
channel = Ship
clip = sound_rocket_mini
volume = 0.0 0.0
volume = 1.0 1.0
pitch = 0.0 0.75
pitch = 1.0 0.95
loop = true
}
MODEL_MULTI_PARTICLE
{
name = core
modelName = ReStock/FX/restock-fx-spark-core-1
transformName = fxTransformCore
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
}
MODEL_MULTI_PARTICLE
{
name = plume
modelName = ReStock/FX/restock-fx-spark-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
}
MODEL_MULTI_PARTICLE
{
name = turbo
modelName = ReStock/FX/restock-fx-spark-turbo-1
transformName = fxTransformTurbo
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
}
}
}
MODULE
{
name = FXModuleLookAtConstraint
// Basic
CONSTRAINLOOKFX
{
targetName = CylBot001
rotatorsName = CylTop001
}
CONSTRAINLOOKFX
{
targetName = CylBot002
rotatorsName = CylTop002
}
CONSTRAINLOOKFX
{
targetName = CylTop001
rotatorsName = CylBot001
}
CONSTRAINLOOKFX
{
targetName = CylTop002
rotatorsName = CylBot002
}
CONSTRAINLOOKFX
{
targetName = CylBot003
rotatorsName = CylTop003
}
CONSTRAINLOOKFX
{
targetName = CylBot004
rotatorsName = CylTop004
}
CONSTRAINLOOKFX
{
targetName = CylTop003
rotatorsName = CylBot003
}
CONSTRAINLOOKFX
{
targetName = CylTop004
rotatorsName = CylBot004
}
CONSTRAINLOOKFX
{
targetName = CylBot005
rotatorsName = CylTop005
}
CONSTRAINLOOKFX
{
targetName = CylBot006
rotatorsName = CylTop006
}
CONSTRAINLOOKFX
{
targetName = CylTop005
rotatorsName = CylBot005
}
CONSTRAINLOOKFX
{
targetName = CylTop006
rotatorsName = CylBot006
}
}
@MODULE[ModuleGimbal]
{
@gimbalTransformName = B_Gimbal
}
MODULE
{
name = ModulePartVariants
baseVariant = Size0
VARIANT
{
name = Size0
displayName = #LOC_Restock_variant-engine_size0
primaryColor = #999999
secondaryColor = #da8544
GAMEOBJECTS
{
SparkBasic = true
CylBot001 = false
CylBot002 = false
CylBot003 = true
CylBot004 = true
CylBot005 = false
CylBot006 = false
SparkCompact = false
SparkBoattail = false
AdditionalColliders = false
}
}
VARIANT
{
name = Boattail
displayName = #LOC_Restock_variant-engine_boattail
primaryColor = #da8544
secondaryColor = #999999
GAMEOBJECTS
{
SparkBasic = false
CylBot001 = false
CylBot002 = false
CylBot003 = false
CylBot004 = false
CylBot005 = true
CylBot006 = true
SparkCompact = false
SparkBoattail = true
AdditionalColliders = true
}
}
VARIANT
{
name = Compact
displayName = #LOC_Restock_variant-engine_compact
primaryColor = #999999
secondaryColor = #555555
GAMEOBJECTS
{
SparkBasic = false
CylBot001 = true
CylBot002 = true
CylBot003 = false
CylBot004 = false
CylBot005 = false
CylBot006 = false
SparkCompact = true
SparkBoattail = false
AdditionalColliders = true
}
}
}
@MODULE[ModuleEnginesFX]
{
%runningEffectName = fx-spark-running
}
!MODULE[FXModuleAnimateThrottle] {}
MODULE
{
name = FXModuleThrottleEffects
fxModuleNames = heatColor
responseSpeed = 0.005
dependOnEngineState = True
dependOnThrottle = True
}
MODULE
{
name = FXModuleThrottleEffects
fxModuleNames = throttleColor
responseSpeed = 1.0
dependOnEngineState = True
dependOnThrottle = True
}
MODULE
{
name = ModuleColorChanger
moduleID = heatColor
animRate = 0.0005
shaderProperty = _EmissiveColor
excludedRenderer = EngineCore
toggleInEditor = false
toggleInFlight = false
redCurve
{
key = 0 1
key = 1 1
}
greenCurve
{
key = 0 1
key = 1 1
}
blueCurve
{
key = 0 1
key = 1 1
}
alphaCurve
{
key = 0 0
key = 1 1
}
}
MODULE
{
name = ModuleColorChanger
moduleID = throttleColor
animRate = 1
shaderProperty = _EmissiveColor
includedRenderer = EngineCore
toggleInEditor = false
toggleInFlight = false
redCurve
{
key = 0 1
key = 1 1
}
greenCurve
{
key = 0 1
key = 1 1
}
blueCurve
{
key = 0 1
key = 1 1
}
alphaCurve
{
key = 0 0
key = 1 1
}
}
@MODULE[ModuleJettison]
{
@jettisonName = ShroudSparkBasic
}
}
// Twitch
@PART[smallRadialEngine]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
!MODEL {}
MODEL {
model = ReStock/Assets/Engine/restock-engine-twitch-1
}
!EFFECTS {}
EFFECTS
{
engage
{
AUDIO
{
channel = Ship
clip = sound_vent_medium
volume = 1.0
pitch = 2.0
loop = false
}
}
disengage
{
AUDIO
{
channel = Ship
clip = sound_vent_soft
loop = false
}
}
flameout
{
PREFAB_PARTICLE
{
prefabName = fx_exhaustSparks_flameout_2
transformName = thrustTransform
oneShot = true
}
AUDIO
{
channel = Ship
clip = sound_explosion_low
volume = 1.0
pitch = 2.0
loop = false
}
}
fx-twitch-running
{
AUDIO
{
channel = Ship
clip = sound_rocket_mini
volume = 0.0 0.0
volume = 1.0 1.0
pitch = 0.0 0.8
pitch = 1.0 1.0
loop = true
}
MODEL_MULTI_PARTICLE
{
name = turbo
modelName = ReStock/FX/restock-fx-spark-turbo-1
transformName = fxTransformTurbo
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
}
MODEL_MULTI_PARTICLE
{
name = core
modelName = ReStock/FX/restock-fx-spark-core-1
transformName = fxTransformCore
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
}
MODEL_MULTI_PARTICLE
{
name = plume
modelName = ReStock/FX/restock-fx-spark-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
}
}
}
MODULE
{
name = FXModuleLookAtConstraint
// Ringed
CONSTRAINLOOKFX
{
targetName = CyBotRad001
rotatorsName = CylTopRad001
}
CONSTRAINLOOKFX
{
targetName = CyBotRad002
rotatorsName = CylTopRad002
}
CONSTRAINLOOKFX
{
targetName = CylTopRad001
rotatorsName = CyBotRad001
}
CONSTRAINLOOKFX
{
targetName = CylTopRad002
rotatorsName = CyBotRad002
}
}
@MODULE[ModuleEnginesFX]
{
runningEffectName = fx-twitch-running
}
@MODULE[ModuleGimbal]
{
@gimbalTransformName = B_Gimbal
}
!MODULE[FXModuleAnimateThrottle] {}
MODULE
{
name = FXModuleThrottleEffects
fxModuleNames = heatColor
responseSpeed = 0.005
dependOnEngineState = True
dependOnThrottle = True
}
MODULE
{
name = FXModuleThrottleEffects
fxModuleNames = throttleColor
responseSpeed = 1.0
dependOnEngineState = True
dependOnThrottle = True
}
MODULE
{
name = ModuleColorChanger
moduleID = heatColor
animRate = 0.05
shaderProperty = _EmissiveColor
excludedRenderer = EngineCore
toggleInEditor = false
toggleInFlight = false
redCurve
{
key = 0 1
key = 1 1
}
greenCurve
{
key = 0 1
key = 1 1
}
blueCurve
{
key = 0 1
key = 1 1
}
alphaCurve
{
key = 0 0
key = 1 1
}
}
MODULE
{
name = ModuleColorChanger
moduleID = throttleColor
animRate = 1
shaderProperty = _EmissiveColor
includedRenderer = EngineCore
toggleInEditor = false
toggleInFlight = false
redCurve
{
key = 0 1
key = 1 1
}
greenCurve
{
key = 0 1
key = 1 1
}
blueCurve
{
key = 0 1
key = 1 1
}
alphaCurve
{
key = 0 0
key = 1 1
}
}
}
// Puff
@PART[omsEngine]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
!MODEL {}
MODEL {
model = ReStock/Assets/Engine/restock-engine-puff-1
}
!EFFECTS {}
EFFECTS
{
engage
{
AUDIO
{
channel = Ship
clip = sound_vent_soft
volume = 1.0
pitch = 2.0
loop = false
}
}
flameout
{
PREFAB_PARTICLE
{
prefabName = fx_exhaustSparks_flameout_2
transformName = thrustTransform
oneShot = true
}
AUDIO
{
channel = Ship
clip = sound_explosion_low
volume = 1.0
pitch = 2.0
loop = false
}
}
fx-puff-running
{
AUDIO
{
channel = Ship
clip = sound_rocket_mini
volume = 0.0 0.0
volume = 1.0 0.5
pitch = 0.0 0.5
pitch = 1.0 1.0
loop = true
}
MODEL_MULTI_PARTICLE
{
name = plume
modelName = ReStock/FX/restock-fx-puff-1
transformName = fxTransform
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
}
}
}
MODULE
{
name = FXModuleLookAtConstraint
// Ringed
CONSTRAINLOOKFX
{
targetName = Cyl005
rotatorsName = CylTop005
}
CONSTRAINLOOKFX
{
targetName = Cyl006
rotatorsName = CylTop006
}
CONSTRAINLOOKFX
{
targetName = CylTop005
rotatorsName = Cyl005
}
CONSTRAINLOOKFX
{
targetName = CylTop006
rotatorsName = Cyl006
}
}
@MODULE[ModuleEnginesFX]
{
@runningEffectName = fx-puff-running
}
!MODULE[FXModuleAnimateThrottle] {}
MODULE
{
name = FXModuleThrottleEffects
fxModuleNames = heatColor
responseSpeed = 0.005
dependOnEngineState = True
dependOnThrottle = True
}
MODULE
{
name = FXModuleThrottleEffects
fxModuleNames = throttleColor
responseSpeed = 1.0
dependOnEngineState = True
dependOnThrottle = True
}
MODULE
{
name = ModuleColorChanger
moduleID = heatColor
animRate = 0.05
shaderProperty = _EmissiveColor
excludedRenderer = EngineCore
toggleInEditor = false
toggleInFlight = false
redCurve
{
key = 0 1
key = 1 1
}
greenCurve
{
key = 0 1
key = 1 1
}
blueCurve
{
key = 0 1
key = 1 1
}
alphaCurve
{
key = 0 0
key = 1 1
}
}
MODULE
{
name = ModuleColorChanger
moduleID = throttleColor
animRate = 1
shaderProperty = _EmissiveColor
includedRenderer = EngineCore
toggleInEditor = false
toggleInFlight = false
redCurve
{
key = 0 1
key = 1 1
}
greenCurve
{
key = 0 1
key = 1 1
}
blueCurve
{
key = 0 1
key = 1 1
}
alphaCurve
{
key = 0 0
key = 1 1
}
}
}

View File

@ -122,15 +122,12 @@
@name = ModuleEnginesFX
%runningEffectName = fx-nerv-running
}
@MODULE[FXModuleAnimateThrottle]
@MODULE[ModuleAnimateHeat]
{
@animationName = restock-vector-heat-1
%layer = 1
}
@MODULE[FXModuleAnimateThrottle]
{
@animationName = restock-nerv-heat-1
@name = FXModuleAnimateThrottle
%animationName = restock-nerv-heat-1
%layer = 1
%responseSpeed = 0.005
}
MODULE
{

View File

@ -3,7 +3,7 @@
// - Kickback (MassiveBooster)
// - Thumper (solidBooster1-1)
// - Hammer (solidBooster)
// - Flea (solidBooster_sm)
// - Flea (solidBooster_sm_v2)
// - Separatron I (sepMotor1)
// Kickback
@ -287,7 +287,7 @@
}
// Hammer
@PART[solidBooster] {
@PART[solidBooster_v2] {
@author = Chris Adderley (Nertea)
!mesh = DELETE
@ -297,9 +297,9 @@
}
%rescaleFactor = 1
@scale = 1
@node_stack_bottom = 0.0, -1.5640875, 0.0, 0.0, -1.0, 0.0, 1
@node_stack_top = 0.0, 1.2818375, 0.0, 0.0, 1.0, 0.0, 1
@node_attach = 0.0, 0.0, -0.625, 0.0, 0.0, 1.0, 1
// @node_stack_bottom = 0.0, -1.5640875, 0.0, 0.0, -1.0, 0.0, 1
// @node_stack_top = 0.0, 1.2818375, 0.0, 0.0, 1.0, 0.0, 1
// @node_attach = 0.0, 0.0, -0.625, 0.0, 0.0, 1.0, 1
!fx_exhaustFlame_yellow = DELETE
!fx_smokeTrail_medium = DELETE
@ -387,10 +387,49 @@
@animationName = restock-srb-hammer-heat-1
@responseSpeed = 0.1
}
@MODULE[ModulePartVariants]
{
baseVariant = White
!primaryColor = DELETE
!secondaryColor = DELETE
!baseDisplayName = DELETE
!baseThemeName = DELETE
VARIANT
{
name = White
primaryColor = #ffffff
secondaryColor = #ffffff
displayName = #autoLOC_8007119
themeName = White
GAMEOBJECTS
{
YellowStripe = false
OrangeStripe = false
}
}
@VARIANT[YellowAndWhite]
{
!TEXTURE {}
GAMEOBJECTS
{
YellowStripe = true
OrangeStripe = false
}
}
@VARIANT[Orange]
{
!TEXTURE {}
GAMEOBJECTS
{
YellowStripe = false
OrangeStripe = true
}
}
}
}
// Flea
@PART[solidBooster_sm] {
@PART[solidBooster_sm_v2] {
@author = Chris Adderley (Nertea)
!mesh = DELETE
@ -488,6 +527,45 @@
dependOnEngineState = True
dependOnThrottle = True
}
@MODULE[ModulePartVariants]
{
baseVariant = White
!primaryColor = DELETE
!secondaryColor = DELETE
!baseDisplayName = DELETE
!baseThemeName = DELETE
VARIANT
{
name = White
primaryColor = #ffffff
secondaryColor = #ffffff
displayName = #autoLOC_8007119
themeName = White
GAMEOBJECTS
{
YellowStripe = false
OrangeStripe = false
}
}
@VARIANT[YellowAndWhite]
{
!TEXTURE {}
GAMEOBJECTS
{
YellowStripe = true
OrangeStripe = false
}
}
@VARIANT[Orange]
{
!TEXTURE {}
GAMEOBJECTS
{
YellowStripe = false
OrangeStripe = true
}
}
}
}
// Separatron
@PART[sepMotor1] {
@ -506,7 +584,7 @@
!sound_vent_medium = DELETE
!sound_rocket_mini = DELETE
!sound_vent_soft = DELETE
EFFECTS
{
engage
@ -561,16 +639,17 @@
speed = 0.0 0.35
speed = 1.0 1.0
}
}
}
@MODULE[ModuleEngines]
{
@name = ModuleEnginesFX
%runningEffectName = fx-separatron-running
}
MODULE
{
name = FXModuleAnimateThrottle

View File

@ -10,24 +10,26 @@
@author = Porkjet
!mesh = DELETE
!MODEL = {}
!MODEL {}
MODEL {
model = ReStock/Assets/FuelTank/restock-fueltank-125-4
}
!MODULE[ModulePartVariants] {}
}
@PART[fuelTankSmall]
{
@author = Porkjet
@node_stack_top = 0.0, 5.5525, 0.0, 0.0, 1.0, 0.0
@node_stack_bottom = 0.0, -5.5525, 0.0, 0.0, -1.0, 0.0
@node_attach = 6.2625, 0.0, 0.0, 1.0, 0.0, 0.0, 1
// @node_stack_top = 0.0, 5.5525, 0.0, 0.0, 1.0, 0.0
// @node_stack_bottom = 0.0, -5.5525, 0.0, 0.0, -1.0, 0.0
// @node_attach = 6.2625, 0.0, 0.0, 1.0, 0.0, 0.0, 1
!mesh = DELETE
!MODEL = {}
!MODEL {}
MODEL {
model = ReStock/Assets/FuelTank/restock-fueltank-125-3
}
%rescaleFactor = 1
!MODULE[ModulePartVariants] {}
}
@PART[fuelTank]
@ -35,26 +37,28 @@
@author = Porkjet
!mesh = DELETE
!MODEL = {}
!MODEL {}
MODEL {
model = ReStock/Assets/FuelTank/restock-fueltank-125-2
}
%rescaleFactor = 1
@node_stack_top = 0.0, 9.81725, 0.0, 0.0, 1.0, 0.0
@node_stack_bottom = 0.0, -9.12500, 0.0, 0.0, -1.0, 0.0
@node_attach = 6.2625, 0.0, 0.0, 1.0, 0.0, 0.0, 1
!MODULE[ModulePartVariants] {}
// @node_stack_top = 0.0, 9.81725, 0.0, 0.0, 1.0, 0.0
// @node_stack_bottom = 0.0, -9.12500, 0.0, 0.0, -1.0, 0.0
// @node_attach = 6.2625, 0.0, 0.0, 1.0, 0.0, 0.0, 1
}
@PART[fuelTank_long]
{
@author = Porkjet
@node_stack_top = 0.0, 18.75, 0.0, 0.0, 1.0, 0.0
@node_stack_bottom = 0.0, -18.87500, 0.0, 0.0, -1.0, 0.0
@node_attach = 6.2625, 0.0, 0.0, 1.0, 0.0, 0.0, 1
// @node_stack_top = 0.0, 18.75, 0.0, 0.0, 1.0, 0.0
// @node_stack_bottom = 0.0, -18.87500, 0.0, 0.0, -1.0, 0.0
// @node_attach = 6.2625, 0.0, 0.0, 1.0, 0.0, 0.0, 1
!mesh = DELETE
!MODEL = {}
!MODEL {}
MODEL {
model = ReStock/Assets/FuelTank/restock-fueltank-125-1
}
!MODULE[ModulePartVariants] {}
%rescaleFactor = 1
}

View File

@ -0,0 +1,42 @@
// Patches applying art changes to Xenon fuel tanks
// Contents:
// - PB-X150 Xenon Container (xenonTank)
// - PB-X750 Xenon Container (xenonTankLarge)
// - PB-X50R Xenon Container (xenonTankRadial)
// Tiny Xenon tank
@PART[xenonTank]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
!MODEL {}
MODEL {
model = ReStock/Assets/FuelTank/restock-fueltank-xenon-0625-1
}
}
// Small Xenon tank
@PART[xenonTankLarge]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
!MODEL {}
MODEL {
model = ReStock/Assets/FuelTank/restock-fueltank-xenon-125-1
}
}
// Radial Xenon tank
@PART[xenonTankRadial]
{
@author = Chris Adderley (Nertea)
//!mesh = DELETE
//!MODEL {}
MODEL {
model = ReStock/Assets/FuelTank/restock-fueltank-xenon-radial-1
}
}

View File

@ -0,0 +1,198 @@
// Patches applying art changes to service bays
// Contents:
- Service Bay (1.25m) (ServiceBay_125)
- Service Bay (2.5m) (ServiceBay_250)
@PART[ServiceBay_125]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
!MODEL {}
MODEL {
model = ReStock/Assets/Payload/restock-service-bay-125-1
}
@MODULE[ModuleAnimateGeneric]
{
@animationName = DoorsOpen
}
@MODULE[ModuleSeeThroughObject]
{
@transformName = NewBay125
}
MODULE
{
name = ModulePartVariants
baseVariant = Opaque
VARIANT
{
name = Opaque
displayName = #LOC_Restock_variant-service-bay-opaque
primaryColor = #999999
secondaryColor = #ffb80c
GAMEOBJECTS
{
ServiceBay125_Opaque = true
ServiceBay125 = false
ServiceBay125_Transparent = false
FloorColliders = true
}
}
VARIANT
{
name = Transparent
displayName = #LOC_Restock_variant-service-bay-transparent
primaryColor = #ffffff
secondaryColor = #ffb80c
GAMEOBJECTS
{
ServiceBay125_Opaque = false
ServiceBay125 = false
ServiceBay125_Transparent = true
FloorColliders = true
}
}
VARIANT
{
name = Hollow
displayName = #LOC_Restock_variant-service-bay-hollow
primaryColor = #ffffff
secondaryColor = #ffb80c
GAMEOBJECTS
{
ServiceBay125_Opaque = false
ServiceBay125 = true
ServiceBay125_Transparent = false
FloorColliders = false
}
}
}
}
@PART[ServiceBay_250]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
!MODEL {}
MODEL {
model = ReStock/Assets/Payload/restock-service-bay-25-1
}
@MODULE[ModuleAnimateGeneric]
{
@animationName = DoorsOpen
}
@MODULE[ModuleSeeThroughObject]
{
@transformName = NewBay25
}
MODULE
{
name = ModulePartVariants
baseVariant = Opaque
VARIANT
{
name = Opaque
displayName = #LOC_Restock_variant-service-bay-opaque
primaryColor = #999999
secondaryColor = #ffb80c
GAMEOBJECTS
{
ServiceBay25_Opaque = true
ServiceBay25 = false
ServiceBay25_Transparent = false
FloorColliders = true
}
}
VARIANT
{
name = Transparent
displayName = #LOC_Restock_variant-service-bay-transparent
primaryColor = #ffffff
secondaryColor = #ffb80c
GAMEOBJECTS
{
ServiceBay25_Opaque = false
ServiceBay25 = false
ServiceBay25_Transparent = true
FloorColliders = true
}
}
VARIANT
{
name = Hollow
displayName = #LOC_Restock_variant-service-bay-hollow
primaryColor = #ffffff
secondaryColor = #ffb80c
GAMEOBJECTS
{
ServiceBay25_Opaque = false
ServiceBay25 = true
ServiceBay25_Transparent = false
FloorColliders = false
}
}
}
MODULE
{
name = FXModuleLookAtConstraint
// Ringed
CONSTRAINLOOKFX
{
targetName = CylBottom001
rotatorsName = CylTop001
}
CONSTRAINLOOKFX
{
targetName = CylBottom002
rotatorsName = CylTop002
}
CONSTRAINLOOKFX
{
targetName = CylBottom003
rotatorsName = CylTop003
}
CONSTRAINLOOKFX
{
targetName = CylBottom004
rotatorsName = CylTop004
}
CONSTRAINLOOKFX
{
targetName = CylTop001
rotatorsName = CylBottom001
}
CONSTRAINLOOKFX
{
targetName = CylTop002
rotatorsName = CylBottom002
}
CONSTRAINLOOKFX
{
targetName = CylTop003
rotatorsName = CylBottom003
}
CONSTRAINLOOKFX
{
targetName = CylTop004
rotatorsName = CylBottom004
}
}
}

View File

@ -5,7 +5,6 @@
- Command
- PPD-12 Cupola Module (Nertea)
- PPD-10 Hitchhiker Storage Container (Nertea)
- Science Mobile Processing Lab MPL-LG-2 (Nertea)
- Control
- .625m reaction wheel (Andrew Cassidy)
- Coupling
@ -17,6 +16,14 @@
- Aero
- Aerodynamic Nose Cone (Nertea)
- Protective Rocket Nose Cone Mk7 (Nertea)
- Thermal
- Heat Shield (0.625m) (Nertea)
- Heat Shield (1.25m) (Nertea)
- Heat Shield (2.5m) (Nertea)
- Heat Shield (3.75m) (Nertea)
- Payload
- Service Bay (1.25m) (Nertea)
- Service Bay (2.5m) (Nertea)
- Structural
- The Not-Rockomax Micronode (Nertea)
- Cubic Octagonal Strut (Nertea)
@ -39,6 +46,9 @@
- Kerbodyne S3-3600 Tank (Nertea)
- Kerbodyne S3-7200 Tank (Nertea)
- Kerbodyne S3-14400 Tank (Nertea)
- PB-X150 Xenon Container (Nertea)
- PB-X750 Xenon Container (Nertea)
- PB-X50R Xenon Container (Nertea)
- Engines
- Separatron I (Nertea)
- Flea (Nertea)
@ -58,7 +68,25 @@
- LFB KR-1x2 "Twin-Boar" Liquid Fuel Engine (Nertea)
- Kerbodyne KR-2L+ "Rhino" Liquid Fuel Engine (Nertea)
- S3 KS-25x4 "Mammoth" Liquid Fuel Engine (Nertea)
- IX-6315 "Dawn" Electric Propulsion System (Nertea)
- Electrical
- Z-200 Rechargeable Battery Bank (Nertea)
- Z-1K Rechargeable Battery Bank (Nertea)
- Z-4K Rechargeable Battery Bank (Nertea)
- Z-400 Rechargeable Battery (Nertea)
- Z-100 Rechargeable Battery Pack (Nertea)
- PB-NUK Radioisotope Thermoelectric Generator (Beale)
- Science
- Science Mobile Processing Lab MPL-LG-2 (Nertea)
- Thermometer (Andrew Cassidy)
- Barometer (Andrew Cassidy)
- Accelerometer (Andrew Cassidy)
- Negative Gravioli Detector (Andrew Cassidy)
- Mystery Goo™ Containment Unit (Andrew Cassidy)
- SC-9001 Science Jr. (Andrew Cassidy)
- Engines are all surface attachable
- New 'Metallic' variant for 2.5m tanks
- New Unpainted, Black variants for heat shields
- Engines have a basic and a compact variant
- Most atmospheric engines also have a boattail variant
- New plumes/FX for all redone engines