diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-rtg-1-n.tga b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-rtg-1-n.tga new file mode 100644 index 00000000..c6eca085 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-rtg-1-n.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-rtg-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-rtg-1.mu new file mode 100644 index 00000000..8ba80510 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-rtg-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-rtg-1.tga b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-rtg-1.tga new file mode 100644 index 00000000..58b7cbfd Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-rtg-1.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-ant-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-ant-1.mu index b54f8bca..42204c79 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-ant-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-ant-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-nerv-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-nerv-1.mu index a5030605..1ad2f967 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-nerv-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-nerv-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-reliant-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-reliant-1.mu index a7f9f1ed..a21b5353 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-reliant-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-reliant-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-spark-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-spark-1.mu index 2b98532c..62222eb4 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-spark-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-spark-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-separatron-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-separatron-1.mu index 3ed4c8ae..472549f1 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-separatron-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-separatron-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-swivel-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-swivel-1.mu index 516c3d76..f96085e3 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-swivel-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-swivel-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-terrier-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-terrier-1.mu index 7d7c3e12..7625c336 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-terrier-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-terrier-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-endcap-fueltank-25-orange.mu b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-endcap-fueltank-25-orange.mu index 58ac5dd2..010f9992 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-endcap-fueltank-25-orange.mu and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-endcap-fueltank-25-orange.mu differ diff --git a/Distribution/Restock/GameData/ReStock/FX/restock-fx-srb-separator-1.mu b/Distribution/Restock/GameData/ReStock/FX/restock-fx-srb-separator-1.mu new file mode 100644 index 00000000..ba17a352 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/FX/restock-fx-srb-separator-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-0625.cfg b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-0625.cfg index 92098467..a365c989 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-0625.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-0625.cfg @@ -545,6 +545,7 @@ CylBot006 = false SparkCompact = false SparkBoattail = false + AdditionalColliders = false } } VARIANT @@ -564,6 +565,7 @@ CylBot006 = true SparkCompact = false SparkBoattail = true + AdditionalColliders = true } } @@ -584,6 +586,7 @@ CylBot006 = false SparkCompact = true SparkBoattail = false + AdditionalColliders = true } } @@ -614,7 +617,7 @@ { name = ModuleColorChanger moduleID = heatColor - animRate = 0.05 + animRate = 0.0005 shaderProperty = _EmissiveColor excludedRenderers = EngineCore toggleInEditor = false diff --git a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-125.cfg b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-125.cfg index 499eba43..5e4b402f 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-125.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-125.cfg @@ -105,14 +105,14 @@ PREFAB_PARTICLE { prefabName = fx_smokeTrail_light - transformName = thrustTransform + transformName = smokePoint 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, 1 + } } } @@ -509,7 +509,7 @@ PREFAB_PARTICLE { prefabName = fx_smokeTrail_light - transformName = thrustTransform + transformName = smokePoint emission = 0.0 0.0 emission = 0.05 0.0 emission = 0.075 0.25 @@ -611,7 +611,7 @@ { name = ModuleColorChanger moduleID = heatColor - animRate = 0.05 + animRate = 0.0005 shaderProperty = _EmissiveColor excludedRenderers = EngineCore909 toggleInEditor = false @@ -682,7 +682,7 @@ } %rescaleFactor = 1 @scale = 1 - %node_attach = 0.0, 7.21461, 0.0, 0.0, 1.0, 0.0, 1 + @attachRules = 1,1,1,0,0 !fx_exhaustFlame_blue = DELETE @@ -777,7 +777,7 @@ PREFAB_PARTICLE { prefabName = fx_smokeTrail_light - transformName = thrustTransform + transformName = smokePoint emission = 0.0 0.0 emission = 0.05 0.0 emission = 0.075 0.25 @@ -790,7 +790,7 @@ } @bulkheadProfiles = srf, size1 - @node_attach = 0.0,0,0.0 , 0.0, 1.0, 0.0, 1 + %node_attach = 0.0, 0.90182625, 0.0, 0.0, 1.0, 0.0, 1 @node_stack_top = 0.0, 0.90182625, 0.0, 0.0, 1.0, 0.0 @node_stack_bottom = 0.0, -0.90925375, 0.0, 0.0, -1.0, 0.0 @@ -1038,7 +1038,7 @@ PREFAB_PARTICLE { prefabName = fx_smokeTrail_light - transformName = thrustTransform + transformName = smokePoint emission = 0.0 0.0 emission = 0.05 0.0 emission = 0.075 0.25 @@ -1218,7 +1218,7 @@ { name = ModuleColorChanger moduleID = heatColor - animRate = 0.05 + animRate = 0.0005 shaderProperty = _EmissiveColor excludedRenderers = EngineCoreT45 toggleInEditor = false 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 035e851c..95a89807 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 @@ -506,6 +506,66 @@ !sound_vent_medium = DELETE !sound_rocket_mini = DELETE !sound_vent_soft = DELETE + + EFFECTS + { + engage + { + AUDIO + { + channel = Ship + clip = sound_vent_medium + 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_vent_soft + volume = 1.0 + pitch = 2.0 + loop = false + } + } + fx-separatron-running + { + AUDIO + { + channel = Ship + clip = sound_rocket_mini + volume = 0.0 0.0 + volume = 1.0 1.0 + pitch = 0.0 0.2 + pitch = 1.0 1.0 + loop = true + } + MODEL_MULTI_PARTICLE + { + name = core + modelName = ReStock/FX/restock-fx-srb-separator-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[ModuleEngines] { @name = ModuleEnginesFX