Merge branch 'LES' into develop

Assets/CineboxAndrew

@@ -1 +1 @@
-Subproject commit 4691b8f2e0b1e266bb917ae402c874bdc150d16e
+Subproject commit 4ed21b89e8ab44cda6efbc7aae9634aa6b82af3a

Distribution/Restock/GameData/ReStock/Localization/en-us.cfg

@@ -26,6 +26,7 @@ Localization
     #LOC_Restock_variant-engine_boattail_size1p5 = Boattail (1.875m)
     #LOC_Restock_variant-engine_shroud = 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_truss = Truss

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-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
+      }
+    }
+  }
+}
+

Distribution/Restock/GameData/ReStock/Restock.restockblacklist

@@ -110,6 +110,7 @@ Squad/Parts/Utility/rockomaxAdapters/
 Squad/Parts/Utility/ServiceBay/
 Squad/Parts/Utility/spotLightMk1/
 Squad/Parts/Utility/spotLightMk2/
+Squad/Parts/Utility/launchEscapeSystem/
 Squad/Parts/Resources/RadialTank/
 Squad/Parts/Resources/SmallTank/
 Squad/Parts/Resources/LargeTank/

Distribution/Restock/changelog.txt

@@ -28,6 +28,7 @@
   - Pegasus I Mobility Enhancer (Nertea)
   - Kelus Mobility Enhancer (Nertea)
   - Kelus-LV Bay Mobility Enhancer (Nertea)
+  - Launch Escape System (Andrew)
  - Compound Parts
   - FTX-2 External Fuel Duct (Andrew)
   - EAS-4 Strut Connector (Andrew)

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-srb-mallet-1.cfg

@@ -61,7 +61,7 @@ PART
       MODEL_MULTI_PARTICLE
       {
         name = core
-        modelName = ReStockPlus/FX/restock-fx-srb-tiny-core-1
+        modelName = ReStock/FX/restock-fx-srb-tiny-core-1
         transformName = fxTransformCore
         emission = 0.0 0.0
         emission = 0.01 0.1

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-srb-striker-1.cfg

@@ -58,7 +58,7 @@ PART
       MODEL_MULTI_PARTICLE
       {
         name = core
-        modelName = ReStockPlus/FX/restock-fx-srb-tiny-core-1
+        modelName = ReStock/FX/restock-fx-srb-tiny-core-1
         transformName = fxTransformCore
         emission = 0.0 0.0
         emission = 0.01 0.1

Distribution/RestockPlus/GameData/ReStockPlus/Patches/Engine/restock-engine-les-decoupler.cfg

@@ -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
+  }
+}