diff --git a/Assets/CineboxAndrew b/Assets/CineboxAndrew index 9c3d5595..4ed21b89 160000 --- a/Assets/CineboxAndrew +++ b/Assets/CineboxAndrew @@ -1 +1 @@ -Subproject commit 9c3d5595a90a6d6d539575f33c416f3b7018bdb1 +Subproject commit 4ed21b89e8ab44cda6efbc7aae9634aa6b82af3a diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-les-1-e.dds b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-les-1-e.dds new file mode 100644 index 00000000..411f04f2 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-les-1-e.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-les-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-les-1-n.dds new file mode 100644 index 00000000..01ed9ff3 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-les-1-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-les-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-les-1.dds new file mode 100644 index 00000000..1a92c908 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-les-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-les-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-les-1.mu index f9f814d8..4e51c328 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-les-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-les-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-les-125.cfg b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-les-125.cfg deleted file mode 100644 index b6efe11d..00000000 --- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-les-125.cfg +++ /dev/null @@ -1,146 +0,0 @@ -// Patches applying art changes to the Launch Escape System -// Contents: -// - Launch Escape System (LaunchEscapeSystem) - - - -// 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 = ModulePartVariants - baseVariant = Long - VARIANT - { - name = Long - displayName = #LOC_Restock_variant-telescope_shielded - themeName = White - primaryColor = #ffffff - secondaryColor = #202020 - 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-telescope_bare - themeName = White - primaryColor = #707070 - secondaryColor = #202020 - 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 - } - } - } -} diff --git a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-srb-125.cfg b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-srb-125.cfg index 0d7aa782..5c69ca6f 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-srb-125.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-srb-125.cfg @@ -5,6 +5,7 @@ // - RT-10 "Hammer" Solid Fuel Booster (solidBooster_v2) // - RT-5 "Flea" Solid Fuel Booster (solidBooster_sm_v2) // - Separatron I (sepMotor1) +// - Launch Escape System (LaunchEscapeSystem) // Kickback @PART[MassiveBooster] @@ -700,3 +701,154 @@ 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-telescope_shielded + themeName = White + primaryColor = #ffffff + secondaryColor = #202020 + 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-telescope_bare + themeName = White + primaryColor = #707070 + secondaryColor = #202020 + 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 + } + } + } +} +