diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-1.tga b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-1.tga index 137a92e1..bc31817e 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-1.tga and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-25-1.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-mainsail-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-mainsail-1.mu index 3d7d2ba1..3a2c8798 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-mainsail-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-mainsail-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 2596869a..90a14afd 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 5882f5f8..a0999d58 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-rhino-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-rhino-1.mu index 757ac00c..31de74d2 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-rhino-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-rhino-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-skipper-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-skipper-1.mu index ea6b7570..15e3cf6d 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-skipper-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-skipper-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 cc433e57..812b4311 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-swivel-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-swivel-1.mu index 661cdbbe..6863d40d 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 8fe7c62e..e6e3add6 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/Engine/restock-engine-vector-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-vector-1.mu index 7f2f5252..da8db408 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-vector-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-vector-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-ion-0625.cfg b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-ion-0625.cfg index 7173a269..1bbef636 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-ion-0625.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-ion-0625.cfg @@ -56,14 +56,4 @@ key = 1 1 } } - MODULE - { - name = ModuleJettison - jettisonName = ShroudAnt - bottomNodeName = bottom - isFairing = True - jettisonedObjectMass = 0.1 - jettisonForce = 5 - jettisonDirection = 0 0 1 - } } 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 db1a9a09..4168f046 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 @@ -552,6 +552,7 @@ SparkBoattail = false AdditionalColliders = false ShroudSparkBasic = true + ShroudSparkCompact = false } } VARIANT @@ -573,6 +574,7 @@ SparkBoattail = true AdditionalColliders = true ShroudSparkBasic = false + ShroudSparkCompact = false } } @@ -594,7 +596,8 @@ SparkCompact = true SparkBoattail = false AdditionalColliders = true - ShroudSparkBasic = true + ShroudSparkBasic = false + ShroudSparkCompact = true } } } @@ -682,7 +685,7 @@ } @MODULE[ModuleJettison] { - @jettisonName = ShroudSparkBasic + @jettisonName = ShroudSparkBasic,ShroudSparkCompact } } 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 d43e0f6a..2d340711 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 @@ -258,6 +258,7 @@ Fairing125 = true Fairing25 = false Fairing25_Boat = false + FairingCompact = false } NODES { @@ -281,6 +282,7 @@ Fairing125 = false Fairing25 = true Fairing25_Boat = false + FairingCompact = false } NODES { @@ -304,6 +306,7 @@ Fairing125 = false Fairing25 = false Fairing25_Boat = false + FairingCompact = false } NODES { @@ -327,6 +330,7 @@ Fairing125 = false Fairing25 = true Fairing25_Boat = false + FairingCompact = true } NODES { @@ -338,16 +342,9 @@ { %runningEffectName = fx-vector-running } - MODULE + @MODULE[ModuleJettison] { - name = ModuleJettison - jettisonName = Fairing125,Fairing25 - bottomNodeName = bottom - isFairing = True - jettisonedObjectMass = 0.1 - jettisonForce = 5 - jettisonDirection = 0 0 1 - useMultipleDragCubes= false + @jettisonName = Fairing125,Fairing25,FairingCompact } @MODULE[ModuleGimbal] @@ -524,6 +521,8 @@ LV_909_Boattail = false LV_909_Basic = true LV_909_Compact = false + Shroud909 = true + Shroud909_Compact = false } } VARIANT @@ -537,6 +536,8 @@ LV_909_Boattail = true LV_909_Basic = false LV_909_Compact = false + Shroud909 = false + Shroud909_Compact = false } } VARIANT @@ -550,6 +551,8 @@ LV_909_Boattail = false LV_909_Basic = false LV_909_Compact = true + Shroud909 = false + Shroud909_Compact = true } } } @@ -560,7 +563,7 @@ } @MODULE[ModuleJettison] { - @jettisonName = Shroud909 + @jettisonName = Shroud909,Shroud909_Compact } @MODULE[ModuleGimbal] @@ -789,6 +792,7 @@ LV_T30_Compact = false LV_T30_Boattail = false ShroudT30 = true + ShroudT30_Compact = false } } VARIANT @@ -802,7 +806,8 @@ LV_T30_Basic = false LV_T30_Compact = false LV_T30_Boattail = true - ShroudT30 = true + ShroudT30 = false + ShroudT30_Compact = false } } VARIANT @@ -816,8 +821,9 @@ LV_T30_Basic = false LV_T30_Compact = true LV_T30_Boattail = false - ShroudT30 = true - } + ShroudT30 = false + ShroudT30_Compact = true + } } } @MODULE[ModuleEngines] @@ -825,16 +831,9 @@ @name = ModuleEnginesFX %runningEffectName = fx-reliant-running } - MODULE + @MODULE[ModuleJettison] { - name = ModuleJettison - jettisonName = ShroudT30 - bottomNodeName = bottom - isFairing = True - jettisonedObjectMass = 0.1 - jettisonForce = 5 - jettisonDirection = 0 0 1 - useMultipleDragCubes= false + @jettisonName = ShroudT30,ShroudT30_Compact } !MODULE[FXModuleAnimateThrottle] {} @@ -1044,9 +1043,14 @@ LV_T45_Boattail = false LV_T45_Basic = true LV_T45_Compact = false - Gimbal_Basic = true - Gimbal_Boattail = false - Gimbal_Compact = false + T45_Piston001 = true + T45_Piston002 = true + T45_Piston003 = false + T45_Piston004 = false + Engine = true + EngineBoattail = false + ShroudT45 = true + ShroudT45_Compact = false } } VARIANT @@ -1060,9 +1064,14 @@ LV_T45_Boattail = true LV_T45_Basic = false LV_T45_Compact = false - Gimbal_Basic = false - Gimbal_Boattail = true - Gimbal_Compact = false + T45_PistonTop001 = false + T45_PistonTop002 = false + T45_PistonTop003 = false + T45_PistonTop004 = false + Engine = false + EngineBoattail = true + ShroudT45 = false + ShroudT45_Compact = false } } VARIANT @@ -1076,22 +1085,20 @@ LV_T45_Boattail = false LV_T45_Basic = false LV_T45_Compact = true - Gimbal_Basic = false - Gimbal_Boattail = false - Gimbal_Compact = true + T45_Piston001 = false + T45_Piston002 = false + T45_Piston003 = true + T45_Piston004 = true + Engine = true + EngineBoattail = false + ShroudT45 = false + ShroudT45_Compact = true } } } - MODULE + @MODULE[ModuleJettison] { - name = ModuleJettison - jettisonName = ShroudT45 - bottomNodeName = bottom - isFairing = True - jettisonedObjectMass = 0.1 - jettisonForce = 5 - jettisonDirection = 0 0 1 - useMultipleDragCubes= false + @jettisonName = ShroudT45,ShroudT45_Compact } @MODULE[ModuleGimbal] @@ -1107,66 +1114,45 @@ // Basic CONSTRAINLOOKFX { - targetName = Piston01Target - rotatorsName = Piston01Anchor + targetName = T45_PistonTop001 + rotatorsName = T45_Piston001 } CONSTRAINLOOKFX { - targetName = Piston02Target - rotatorsName = Piston02Anchor + targetName = T45_PistonTop002 + rotatorsName = T45_Piston002 } CONSTRAINLOOKFX { - targetName = Piston01Anchor - rotatorsName = Piston01Target + targetName = T45_Piston001 + rotatorsName = T45_PistonTop001 } CONSTRAINLOOKFX { - targetName = Piston02Anchor - rotatorsName = Piston02Target - } - // Basic - CONSTRAINLOOKFX - { - targetName = Piston03Target - rotatorsName = Piston03Anchor + targetName = T45_Piston002 + rotatorsName = T45_PistonTop002 } CONSTRAINLOOKFX { - targetName = Piston04Target - rotatorsName = Piston04Target + targetName = T45_PistonTop004 + rotatorsName = T45_Piston003 } CONSTRAINLOOKFX { - targetName = Piston03Anchor - rotatorsName = Piston03Target + targetName = T45_PistonTop003 + rotatorsName = T45_Piston004 } CONSTRAINLOOKFX { - targetName = Piston04Anchor - rotatorsName = Piston04Target - } - // Compact - CONSTRAINLOOKFX - { - targetName = Piston05Target - rotatorsName = Piston05Anchor + targetName = T45_Piston001 + rotatorsName = T45_PistonTop004 } CONSTRAINLOOKFX { - targetName = Piston06Target - rotatorsName = Piston06Target - } - CONSTRAINLOOKFX - { - targetName = Piston05Anchor - rotatorsName = Piston05Target - } - CONSTRAINLOOKFX - { - targetName = Piston06Anchor - rotatorsName = Piston06Target + targetName = T45_Piston002 + rotatorsName = T45_PistonTop003 } + } !MODULE[FXModuleAnimateThrottle] {} MODULE diff --git a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-25.cfg b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-25.cfg index 6a2708a3..3aff88ce 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-25.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-25.cfg @@ -264,6 +264,7 @@ Mainsail_Boattail = true Mainsail_25m = false Mainsail_Shroud = false + Mainsail_Shroud_Compact = false Mainsail_Compact = false } } @@ -278,6 +279,7 @@ Mainsail_Boattail = false Mainsail_25m = true Mainsail_Shroud = true + Mainsail_Shroud_Compact = false Mainsail_Compact = false } } @@ -291,14 +293,15 @@ { Mainsail_Boattail = false Mainsail_25m = false - Mainsail_Shroud = true + Mainsail_Shroud = false + Mainsail_Shroud_Compact = true Mainsail_Compact = true } } } @MODULE[ModuleJettison] { - @jettisonName = Mainsail_Shroud + @jettisonName = Mainsail_Shroud,Mainsail_Shroud_Compact } } @@ -919,6 +922,7 @@ Skipper_Boattail = true Skipper_25m = false Skipper_Shroud = false + Skipper_Shroud_Compact = false } } VARIANT @@ -939,6 +943,7 @@ Skipper_Boattail = false Skipper_25m = true Skipper_Shroud = true + Skipper_Shroud_Compact = false } } VARIANT @@ -958,14 +963,15 @@ Skipper_Compact = true Skipper_Boattail = false Skipper_25m = false - Skipper_Shroud = true + Skipper_Shroud = false + Skipper_Shroud_Compact = true } } } @MODULE[ModuleJettison] { - @jettisonName = Skipper_Shroud + @jettisonName = Skipper_Shroud,Skipper_Shroud_Compact } }