Merge pull request #587 from PorktoberRevolution/1-7-small-engines

1.7 updates
pull/594/head
Chris Adderley 5 years ago committed by GitHub
commit 43c2e721de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

Binary file not shown.

After

Width:  |  Height:  |  Size: 256 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 256 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 192 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 768 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 64 KiB

@ -19,6 +19,9 @@ Localization
#LOC_Restock_variant-mounting_truss = Truss
#LOC_Restock_variant-mounting_compact = Compact
#LOC_Restock_variant-engine_pod-orange = Pod (Orange)
#LOC_Restock_variant-engine_pod-grey = Pod (Grey)
#LOC_Restock_variant-antenna_size0 = 0.625m
#LOC_Restock_variant-antenna_size1 = 1.25m
#LOC_Restock_variant-antenna_truss = Truss

@ -1,18 +1,18 @@
// Patches applying art changes to RCS blocks
// Contents:
// - RV-105 RCS Thruster Block (RCSBlock)
// - RV-105 RCS Thruster Block (RCSBlock_v2)
// - Place-Anywhere 7 Linear RCS Port (linearRcs)
// - Vernor Engine (vernorEngine)
// RCS block
@PART[RCSBlock]
@PART[RCSBlock_v2]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
!MODEL {}
MODEL
{
model = ReStock/Assets/Control/restock-rcs-block-1
model = ReStock/Assets/Control/restock-rcs-block-2
}
!EFFECTS {}
EFFECTS
@ -58,6 +58,8 @@
}
}
}
!MODULE[FXModuleAnimateRCS] {}
}
// Linear RCS port
@ -187,4 +189,7 @@
}
}
}
!MODULE[FXModuleAnimateRCS] {}
}

@ -1,13 +1,13 @@
// Patches applying art changes to 0.625m engines
// Contents:
// - LV-1 "Ant" Liquid Fuel Engine (microEngine)
// - LV-1R "Spider" Liquid Fuel Engine (radialEngineMini)
// - LV-1 "Ant" Liquid Fuel Engine (microEngine_v2)
// - LV-1R "Spider" Liquid Fuel Engine (radialEngineMini_v2)
// - 48-7S "Spark" Liquid Fuel Engine (liquidEngineMini_v2)
// - 24-77 "Twitch" Liquid Fuel Engine (smallRadialEngine)
// - 24-77 "Twitch" Liquid Fuel Engine (smallRadialEngine_v2)
// - O-10 "Puff" MonoPropellant Fuel Engine (omsEngine)
// Ant
@PART[microEngine]
@PART[microEngine_v2]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
@ -165,7 +165,7 @@
}
// Spider
@PART[radialEngineMini]
@PART[radialEngineMini_v2]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
@ -691,14 +691,14 @@
}
// Twitch
@PART[smallRadialEngine]
@PART[smallRadialEngine_v2]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
!MODEL {}
MODEL
{
model = ReStock/Assets/Engine/restock-engine-twitch-1
model = ReStock/Assets/Engine/restock-engine-twitch-2
}
!EFFECTS {}
EFFECTS
@ -799,29 +799,159 @@
}
}
}
!MODULE[ModulePartVariants] {}
MODULE
{
name = ModulePartVariants
baseVariant = Orange
VARIANT
{
name = Orange
displayName = #autoLOC_8007123
themeName = Orange
primaryColor = #f49841
secondaryColor = #f49841
GAMEOBJECTS
{
CompactStructureGrey = false
CompactStructureOrange = true
StructureRadialGrey = false
StructureRadialOrange = false
CylBotPod001 = false
CylBotPod002 = false
CylTopPod001 = false
CylTopPod002 = false
CylBotBare001 = true
CylBotBare002 = true
CylTopBare001 = true
CylTopBare002 = true
EnginePod = false
EngineBare = true
}
}
VARIANT
{
name = GrayAndOrange
displayName = #autoLOC_8007121
themeName = GrayAndOrange
primaryColor = #4c4f47
secondaryColor = #f49841
GAMEOBJECTS
{
CompactStructureGrey = true
CompactStructureOrange = false
StructureRadialGrey = false
StructureRadialOrange = false
CylBotPod001 = false
CylBotPod002 = false
CylTopPod001 = false
CylTopPod002 = false
CylBotBare001 = true
CylBotBare002 = true
CylTopBare001 = true
CylTopBare002 = true
EnginePod = false
EngineBare = true
}
}
VARIANT
{
name = OrangePodded
displayName = #LOC_Restock_variant-engine_pod-orange
primaryColor = #f49841
secondaryColor = #f49841
GAMEOBJECTS
{
CompactStructureGrey = false
CompactStructureOrange = false
StructureRadialGrey = false
StructureRadialOrange = true
CylBotPod001 = true
CylBotPod002 = true
CylTopPod001 = true
CylTopPod002 = true
CylBotBare001 = false
CylBotBare002 = false
CylTopBare001 = false
CylTopBare002 = false
EnginePod = true
EngineBare = false
}
}
VARIANT
{
name = GrayAndOrangePodded
displayName = #LOC_Restock_variant-engine_pod-grey
primaryColor = #4c4f47
secondaryColor = #f49841
GAMEOBJECTS
{
CompactStructureGrey = false
CompactStructureOrange = false
StructureRadialGrey = true
StructureRadialOrange = false
CylBotPod001 = true
CylBotPod002 = true
CylTopPod001 = true
CylTopPod002 = true
CylBotBare001 = false
CylBotBare002 = false
CylTopBare001 = false
CylTopBare002 = false
EnginePod = true
EngineBare = false
}
}
useMultipleDragCubes = false
}
MODULE
{
name = FXModuleLookAtConstraint
// Ringed
// Bare
CONSTRAINLOOKFX
{
targetName = CylBotBare001
rotatorsName = CylTopBare001
}
CONSTRAINLOOKFX
{
targetName = CylBotBare002
rotatorsName = CylTopBare002
}
CONSTRAINLOOKFX
{
targetName = CylTopBare001
rotatorsName = CylBotBare001
}
CONSTRAINLOOKFX
{
targetName = CylTopBare002
rotatorsName = CylBotBare002
}
// Podded
CONSTRAINLOOKFX
{
targetName = CylBotRad001
rotatorsName = CylTopRad001
targetName = CylBotPod001
rotatorsName = CylTopPod001
}
CONSTRAINLOOKFX
{
targetName = CylBotRad002
rotatorsName = CylTopRad002
targetName = CylBotPod002
rotatorsName = CylTopPod002
}
CONSTRAINLOOKFX
{
targetName = CylTopRad001
rotatorsName = CylBotRad001
targetName = CylTopPod001
rotatorsName = CylBotPod001
}
CONSTRAINLOOKFX
{
targetName = CylTopRad002
rotatorsName = CylBotRad002
targetName = CylTopPod002
rotatorsName = CylBotPod002
}
}
@MODULE[ModuleEnginesFX]

@ -0,0 +1,105 @@
// Patches applying art changes to Legacy RCS blocks
// Contents:
// - RV-105 RCS Thruster Block (RCSBlock)
// - Vernor Engine (vernorEngine)
// RCS block
@PART[RCSBlock]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
!MODEL {}
MODEL
{
model = ReStock/Assets/Control/restock-rcs-block-1
}
!EFFECTS {}
EFFECTS
{
running
{
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 = 1.0
loop = true
}
MODEL_MULTI_PARTICLE
{
name = fx1
modelName = ReStock/FX/restock-fx-rcs-1
transformName = RCSjet
emission = 0.0 0.0
emission = 0.1 0.0
emission = 1.0 1.0
speed = 0.0 0.8
speed = 1.0 1.0
//localRotation = -90, 0, 0
}
MODEL_MULTI_PARTICLE
{
name = fx2
modelName = ReStock/FX/restock-fx-rcs-1
transformName = RCSjet
emission = 0.0 0.0
emission = 0.1 0.0
emission = 1.0 1.0
speed = 0.0 0.8
speed = 1.0 1.0
//localRotation = -90, 0, 0
localPosition = 0, -0.015, 0
}
}
}
}
// Vernor Engine
@PART[vernierEngine]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
!MODEL {}
MODEL
{
model = ReStock/Assets/Control/restock-rcs-vernor-1
scale = 1,1,1
}
@scale = 1
@rescaleFactor = 1
!EFFECTS {}
EFFECTS
{
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 = 1.0
loop = true
}
MODEL_MULTI_PARTICLE
{
name = fx1
modelName = ReStock/FX/restock-fx-vernor-1
transformName = RCSthruster
emission = 0.0 0.0
emission = 0.1 0.0
emission = 1.0 1.0
speed = 0.0 0.8
speed = 1.0 1.0
localRotation = -180, 0, 0
}
}
}
}

@ -0,0 +1,564 @@
// Patches applying art changes to LEGACY 0.625m engines
// Contents:
// - LV-1 "Ant" Liquid Fuel Engine (microEngine)
// - LV-1R "Spider" Liquid Fuel Engine (radialEngineMini)
// - 24-77 "Twitch" Liquid Fuel Engine (smallRadialEngine)
// Ant
@PART[microEngine]
{
@author = Chris Adderley (Nertea)
!mesh = DELETE
!MODEL {}
MODEL
{
model = ReStock/Assets/Engine/restock-engine-ant-1
}
!EFFECTS {}
EFFECTS
{
engage
{
AUDIO
{
channel = Ship
clip = sound_vent_soft
volume = 1.0
pitch = 2.0
loop = false
}
}
flameout
{
AUDIO
{
channel = Ship
clip = sound_explosion_low
volume = 1.0
pitch = 2.0
loop = false
}
}
fx-ant-running
{
AUDIO
{
channel = Ship
clip = sound_rocket_mini
volume = 0.0 0.0
volume = 0.01 0.2
volume = 1.0 0.6
pitch = 0.0 0.1
pitch = 0.01 0.2
pitch = 1.0 0.5
loop = true
}
MODEL_MULTI_PARTICLE
{
name = plume
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-ant-running
@fxOffset = 0, 0, 0
}
!MODULE[FXModuleAnimateThrottle] {}
MODULE
{
name = FXModuleThrottleEffects
fxModuleNames = heatColor
responseSpeed = 1.0
dependOnEngineState = True
dependOnThrottle = True
}
MODULE
{
name = FXModuleThrottleEffects
fxModuleNames = throttleColor
responseSpeed = 1.0
dependOnEngineState = True
dependOnThrottle = True
}
MODULE
{
name = ModuleColorChanger
moduleID = heatColor
animRate = 0.025
shaderProperty = _EmissiveColor
excludedRenderer = EngineCore
toggleInEditor = false
toggleInFlight = false
redCurve
{
key = 0 0 1 1
key = 1 1 1 1
}
greenCurve
{
key = 0 0 1 1
key = 1 1 1 1
}
blueCurve
{
key = 0 0 1 1
key = 1 1 1 1
}
alphaCurve
{
key = 0 0 1 1
key = 1 1 1 1
}
}
MODULE
{
name = ModuleColorChanger
moduleID = throttleColor
animRate = 1
shaderProperty = _TintColor
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
{
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
{
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 = 0.01 0.2
volume = 1.0 0.6
pitch = 0.0 0.1
pitch = 0.01 0.2
pitch = 1.0 0.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
gimbalResponseSpeed = 8
useGimbalResponseSpeed = true
}
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 = 1.0
dependOnEngineState = True
dependOnThrottle = True
}
MODULE
{
name = FXModuleThrottleEffects
fxModuleNames = throttleColor
responseSpeed = 1.0
dependOnEngineState = True
dependOnThrottle = True
}
MODULE
{
name = ModuleColorChanger
moduleID = heatColor
animRate = 0.025
shaderProperty = _EmissiveColor
excludedRenderer = EngineCore
toggleInEditor = false
toggleInFlight = false
redCurve
{
key = 0 0 1 1
key = 1 1 1 1
}
greenCurve
{
key = 0 0 1 1
key = 1 1 1 1
}
blueCurve
{
key = 0 0 1 1
key = 1 1 1 1
}
alphaCurve
{
key = 0 0 1 1
key = 1 1 1 1
}
}
MODULE
{
name = ModuleColorChanger
moduleID = throttleColor
animRate = 1
shaderProperty = _TintColor
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
}
}
}
// 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
{
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 = 0.01 0.4
volume = 1.0 1.0
pitch = 0.0 0.2
pitch = 0.01 0.6
pitch = 1.0 1.8
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 = turboglow
modelName = ReStock/FX/restock-fx-spark-turbo-glow-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 = CylBotRad001
rotatorsName = CylTopRad001
}
CONSTRAINLOOKFX
{
targetName = CylBotRad002
rotatorsName = CylTopRad002
}
CONSTRAINLOOKFX
{
targetName = CylTopRad001
rotatorsName = CylBotRad001
}
CONSTRAINLOOKFX
{
targetName = CylTopRad002
rotatorsName = CylBotRad002
}
}
@MODULE[ModuleEnginesFX]
{
runningEffectName = fx-twitch-running
}
@MODULE[ModuleGimbal]
{
@gimbalTransformName = B_Gimbal
gimbalResponseSpeed = 8
useGimbalResponseSpeed = true
}
!MODULE[FXModuleAnimateThrottle] {}
MODULE
{
name = FXModuleThrottleEffects
fxModuleNames = heatColor
responseSpeed = 1.0
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 0 1 1
key = 1 1 1 1
}
greenCurve
{
key = 0 0 1 1
key = 1 1 1 1
}
blueCurve
{
key = 0 0 1 1
key = 1 1 1 1
}
alphaCurve
{
key = 0 0 1 1
key = 1 1 1 1
}
}
MODULE
{
name = ModuleColorChanger
moduleID = throttleColor
animRate = 1
shaderProperty = _TintColor
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
}
}
}

@ -3,9 +3,14 @@
- KSP 1.7.x
- Fixed scale of linear RCS collider (#569)
- Fixed flag transform on Mk1 lander can (#558)
- Warn user if Restock is installed in the wrong location
- Warn user if old 1.25m tank directories are detected
- Adaptations for stock 1.7 changes
- Propagated legacy patches for 1.6-era parts into a Legacy folder
- New base model for Twitch
- New variants for Twitch with 1.6-era Restock podped model
- Tuned colliders, pivots of parts to line up with 1.7-era parts
- Plugin improvements:
- Warn user if Restock is installed in the wrong location
- Warn user if old 1.25m tank directories are detected
v0.1.3
------

Loading…
Cancel
Save