Merge branch 'master' into fairings

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

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

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,FairingCompact
-    jettisonName = Fairing125,Fairing25
-    bottomNodeName = bottom
-    isFairing = True
-    jettisonedObjectMass = 0.1
-    jettisonForce = 5
-    jettisonDirection = 0 0 1
-    useMultipleDragCubes= false
   }
 
   @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,ShroudT30_Compact
-    jettisonName = ShroudT30
-    bottomNodeName = bottom
-    isFairing = True
-    jettisonedObjectMass = 0.1
-    jettisonForce = 5
-    jettisonDirection = 0 0 1
-    useMultipleDragCubes= false
   }
 
   !MODULE[FXModuleAnimateThrottle] {}
@@ -1044,9 +1043,14 @@
         LV_T45_Boattail = false
         LV_T45_Basic = true
         LV_T45_Compact = false
-        Gimbal_Basic = true
+        T45_Piston001 = true
-        Gimbal_Boattail = false
+        T45_Piston002 = true
-        Gimbal_Compact = false
+        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
+        T45_PistonTop001 = false
-        Gimbal_Boattail = true
+        T45_PistonTop002 = false
-        Gimbal_Compact = 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
+        T45_Piston001 = false
-        Gimbal_Boattail = false
+        T45_Piston002 = false
-        Gimbal_Compact = true
+        T45_Piston003 = true
+        T45_Piston004 = true
+        Engine = true
+        EngineBoattail = false
+        ShroudT45 = false
+        ShroudT45_Compact = true
       }
     }
   }
-  MODULE
+  @MODULE[ModuleJettison]
   {
-    name = ModuleJettison
+    @jettisonName = ShroudT45,ShroudT45_Compact
-    jettisonName = ShroudT45
-    bottomNodeName = bottom
-    isFairing = True
-    jettisonedObjectMass = 0.1
-    jettisonForce = 5
-    jettisonDirection = 0 0 1
-    useMultipleDragCubes= false
   }
 
   @MODULE[ModuleGimbal]
@@ -1107,66 +1114,45 @@
     // Basic
     CONSTRAINLOOKFX
     {
-      targetName = Piston01Target
+      targetName = T45_PistonTop001
-      rotatorsName = Piston01Anchor
+      rotatorsName = T45_Piston001
     }
     CONSTRAINLOOKFX
     {
-      targetName = Piston02Target
+      targetName = T45_PistonTop002
-      rotatorsName = Piston02Anchor
+      rotatorsName = T45_Piston002
     }
     CONSTRAINLOOKFX
     {
-      targetName = Piston01Anchor
+      targetName = T45_Piston001
-      rotatorsName = Piston01Target
+      rotatorsName = T45_PistonTop001
     }
     CONSTRAINLOOKFX
     {
-      targetName = Piston02Anchor
+      targetName = T45_Piston002
-      rotatorsName = Piston02Target
+      rotatorsName = T45_PistonTop002
-    }
-    // Basic
-    CONSTRAINLOOKFX
-    {
-      targetName = Piston03Target
-      rotatorsName = Piston03Anchor
     }
     CONSTRAINLOOKFX
     {
-      targetName = Piston04Target
+      targetName = T45_PistonTop004
-      rotatorsName = Piston04Target
+      rotatorsName = T45_Piston003
     }
     CONSTRAINLOOKFX
     {
-      targetName = Piston03Anchor
+      targetName = T45_PistonTop003
-      rotatorsName = Piston03Target
+      rotatorsName = T45_Piston004
     }
     CONSTRAINLOOKFX
     {
-      targetName = Piston04Anchor
+      targetName = T45_Piston001
-      rotatorsName = Piston04Target
+      rotatorsName = T45_PistonTop004
-    }
-    // Compact
-    CONSTRAINLOOKFX
-    {
-      targetName = Piston05Target
-      rotatorsName = Piston05Anchor
     }
     CONSTRAINLOOKFX
     {
-      targetName = Piston06Target
+      targetName = T45_Piston002
-      rotatorsName = Piston06Target
+      rotatorsName = T45_PistonTop003
-    }
-    CONSTRAINLOOKFX
-    {
-      targetName = Piston05Anchor
-      rotatorsName = Piston05Target
-    }
-    CONSTRAINLOOKFX
-    {
-      targetName = Piston06Anchor
-      rotatorsName = Piston06Target
     }
+
   }
   !MODULE[FXModuleAnimateThrottle] {}
   MODULE

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