mirror of
https://github.com/PorktoberRevolution/ReStocked
synced 2024-09-01 17:34:42 +00:00
Merge branch 'LES' into develop
This commit is contained in:
commit
c5b5ef5eac
@ -1 +1 @@
|
|||||||
Subproject commit 4691b8f2e0b1e266bb917ae402c874bdc150d16e
|
Subproject commit 4ed21b89e8ab44cda6efbc7aae9634aa6b82af3a
|
BIN
Distribution/Restock/GameData/ReStock/Assets/Engine/les_ao.tga
Normal file
BIN
Distribution/Restock/GameData/ReStock/Assets/Engine/les_ao.tga
Normal file
Binary file not shown.
After Width: | Height: | Size: 768 KiB |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -26,6 +26,7 @@ Localization
|
|||||||
#LOC_Restock_variant-engine_boattail_size1p5 = Boattail (1.875m)
|
#LOC_Restock_variant-engine_boattail_size1p5 = Boattail (1.875m)
|
||||||
#LOC_Restock_variant-engine_shroud = Shrouded
|
#LOC_Restock_variant-engine_shroud = Shrouded
|
||||||
#LOC_Restock_variant-engine_shroud_wide = Wide Shrouded
|
#LOC_Restock_variant-engine_shroud_wide = Wide Shrouded
|
||||||
|
#LOC_Restock_variant-engine_docking = Docking Port
|
||||||
|
|
||||||
#LOC_Restock_variant-mounting_classic = Classic
|
#LOC_Restock_variant-mounting_classic = Classic
|
||||||
#LOC_Restock_variant-mounting_truss = Truss
|
#LOC_Restock_variant-mounting_truss = Truss
|
||||||
|
@ -5,6 +5,7 @@
|
|||||||
// - RT-10 "Hammer" Solid Fuel Booster (solidBooster_v2)
|
// - RT-10 "Hammer" Solid Fuel Booster (solidBooster_v2)
|
||||||
// - RT-5 "Flea" Solid Fuel Booster (solidBooster_sm_v2)
|
// - RT-5 "Flea" Solid Fuel Booster (solidBooster_sm_v2)
|
||||||
// - Separatron I (sepMotor1)
|
// - Separatron I (sepMotor1)
|
||||||
|
// - Launch Escape System (LaunchEscapeSystem)
|
||||||
|
|
||||||
// Kickback
|
// Kickback
|
||||||
@PART[MassiveBooster]
|
@PART[MassiveBooster]
|
||||||
@ -700,3 +701,154 @@
|
|||||||
maskTransform = SeparatronMask
|
maskTransform = SeparatronMask
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Launch Escape System
|
||||||
|
@PART[LaunchEscapeSystem]
|
||||||
|
{
|
||||||
|
@author = Andrew Cassidy
|
||||||
|
!mesh = DELETE
|
||||||
|
MODEL
|
||||||
|
{
|
||||||
|
model = ReStock/Assets/Engine/restock-engine-les-1
|
||||||
|
}
|
||||||
|
|
||||||
|
!sound_vent_medium = DELETE
|
||||||
|
!sound_rocket_hard = DELETE
|
||||||
|
!sound_vent_soft = DELETE
|
||||||
|
!sound_explosion_low = DELETE
|
||||||
|
|
||||||
|
!EFFECTS {}
|
||||||
|
EFFECTS
|
||||||
|
{
|
||||||
|
engage
|
||||||
|
{
|
||||||
|
AUDIO
|
||||||
|
{
|
||||||
|
channel = Ship
|
||||||
|
clip = sound_vent_medium
|
||||||
|
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-les-running
|
||||||
|
{
|
||||||
|
AUDIO
|
||||||
|
{
|
||||||
|
channel = Ship
|
||||||
|
clip = sound_rocket_hard
|
||||||
|
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 = pitch
|
||||||
|
modelName = ReStock/FX/restock-fx-srb-separator-1
|
||||||
|
transformName = fxUpper
|
||||||
|
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-srb-tiny-core-1
|
||||||
|
transformName = fxLower
|
||||||
|
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
|
||||||
|
}
|
||||||
|
PREFAB_PARTICLE
|
||||||
|
{
|
||||||
|
prefabName = fx_smokeTrail_light
|
||||||
|
transformName = fxSmoke
|
||||||
|
emission = 0.0 0.0
|
||||||
|
emission = 0.05 0.0
|
||||||
|
emission = 0.075 0.25
|
||||||
|
emission = 1.0 1.25
|
||||||
|
speed = 0.0 0.25
|
||||||
|
speed = 1.0 1.0
|
||||||
|
localOffset = 0, 0, 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@MODULE[ModuleEnginesFX]
|
||||||
|
{
|
||||||
|
%runningEffectName = fx-les-running
|
||||||
|
}
|
||||||
|
|
||||||
|
MODULE
|
||||||
|
{
|
||||||
|
name = FXModuleAnimateThrottle
|
||||||
|
animationName = restock-srb-les-heat-1
|
||||||
|
responseSpeed = 0.5
|
||||||
|
dependOnEngineState = True
|
||||||
|
dependOnThrottle = True
|
||||||
|
}
|
||||||
|
|
||||||
|
MODULE
|
||||||
|
{
|
||||||
|
name = ModulePartVariants
|
||||||
|
baseVariant = Long
|
||||||
|
VARIANT
|
||||||
|
{
|
||||||
|
name = Long
|
||||||
|
displayName = #LOC_Restock_variant-engine_size1
|
||||||
|
themeName = White
|
||||||
|
primaryColor = #ffffff
|
||||||
|
secondaryColor = #E8DB27
|
||||||
|
GAMEOBJECTS
|
||||||
|
{
|
||||||
|
lower_long_COLLIDER = true
|
||||||
|
lower_short_COLLIDER = false
|
||||||
|
}
|
||||||
|
NODES
|
||||||
|
{
|
||||||
|
node_stack_bottom = 0.0, -1.372544, 0.0, 0.0, -1.0, 0.0, 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
VARIANT
|
||||||
|
{
|
||||||
|
name = Short
|
||||||
|
displayName = #LOC_Restock_variant-engine_docking
|
||||||
|
themeName = White
|
||||||
|
primaryColor = #707070
|
||||||
|
secondaryColor = #E8DB27
|
||||||
|
GAMEOBJECTS
|
||||||
|
{
|
||||||
|
lower_long_COLLIDER = false
|
||||||
|
lower_short_COLLIDER = true
|
||||||
|
}
|
||||||
|
NODES
|
||||||
|
{
|
||||||
|
node_stack_bottom = 0.0, -1.1476, 0.0, 0.0, -1.0, 0.0, 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@ -110,6 +110,7 @@ Squad/Parts/Utility/rockomaxAdapters/
|
|||||||
Squad/Parts/Utility/ServiceBay/
|
Squad/Parts/Utility/ServiceBay/
|
||||||
Squad/Parts/Utility/spotLightMk1/
|
Squad/Parts/Utility/spotLightMk1/
|
||||||
Squad/Parts/Utility/spotLightMk2/
|
Squad/Parts/Utility/spotLightMk2/
|
||||||
|
Squad/Parts/Utility/launchEscapeSystem/
|
||||||
Squad/Parts/Resources/RadialTank/
|
Squad/Parts/Resources/RadialTank/
|
||||||
Squad/Parts/Resources/SmallTank/
|
Squad/Parts/Resources/SmallTank/
|
||||||
Squad/Parts/Resources/LargeTank/
|
Squad/Parts/Resources/LargeTank/
|
||||||
|
@ -28,6 +28,7 @@
|
|||||||
- Pegasus I Mobility Enhancer (Nertea)
|
- Pegasus I Mobility Enhancer (Nertea)
|
||||||
- Kelus Mobility Enhancer (Nertea)
|
- Kelus Mobility Enhancer (Nertea)
|
||||||
- Kelus-LV Bay Mobility Enhancer (Nertea)
|
- Kelus-LV Bay Mobility Enhancer (Nertea)
|
||||||
|
- Launch Escape System (Andrew)
|
||||||
- Compound Parts
|
- Compound Parts
|
||||||
- FTX-2 External Fuel Duct (Andrew)
|
- FTX-2 External Fuel Duct (Andrew)
|
||||||
- EAS-4 Strut Connector (Andrew)
|
- EAS-4 Strut Connector (Andrew)
|
||||||
|
@ -61,7 +61,7 @@ PART
|
|||||||
MODEL_MULTI_PARTICLE
|
MODEL_MULTI_PARTICLE
|
||||||
{
|
{
|
||||||
name = core
|
name = core
|
||||||
modelName = ReStockPlus/FX/restock-fx-srb-tiny-core-1
|
modelName = ReStock/FX/restock-fx-srb-tiny-core-1
|
||||||
transformName = fxTransformCore
|
transformName = fxTransformCore
|
||||||
emission = 0.0 0.0
|
emission = 0.0 0.0
|
||||||
emission = 0.01 0.1
|
emission = 0.01 0.1
|
||||||
|
@ -58,7 +58,7 @@ PART
|
|||||||
MODEL_MULTI_PARTICLE
|
MODEL_MULTI_PARTICLE
|
||||||
{
|
{
|
||||||
name = core
|
name = core
|
||||||
modelName = ReStockPlus/FX/restock-fx-srb-tiny-core-1
|
modelName = ReStock/FX/restock-fx-srb-tiny-core-1
|
||||||
transformName = fxTransformCore
|
transformName = fxTransformCore
|
||||||
emission = 0.0 0.0
|
emission = 0.0 0.0
|
||||||
emission = 0.01 0.1
|
emission = 0.01 0.1
|
||||||
|
@ -0,0 +1,14 @@
|
|||||||
|
// adds a built in decoupler to the launch escape system
|
||||||
|
|
||||||
|
@PART[LaunchEscapeSystem]
|
||||||
|
{
|
||||||
|
fx_gasBurst_white = 0.0, -1.372544, 0.0, 0.0, -1.0, 0.0, decouple
|
||||||
|
sound_decoupler_fire = decouple
|
||||||
|
|
||||||
|
MODULE
|
||||||
|
{
|
||||||
|
name = ModuleDecouple
|
||||||
|
ejectionForce = 50
|
||||||
|
explosiveNodeID = bottom
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user