Merge branch 'develop' into structural-part-2

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

@@ -16,6 +16,7 @@ Localization
     #LOC_Restock_variant-engine_radial = Radial
     #LOC_Restock_variant-engine_boattail = Boattail
 
+    #LOC_Restock_variant-mounting_classic = Classic
     #LOC_Restock_variant-mounting_truss = Truss
     #LOC_Restock_variant-mounting_compact = Compact
 
@@ -36,6 +37,10 @@ Localization
     #LOC_Restock_variant-surface_truss = Truss
     #LOC_Restock_variant-surface_thermalblankets = Insulated
 
+    #LOC_Restock_variant-surface_yellow = Yellow
+    #LOC_Restock_variant-surface_black = Black
+
+
     #LOC_Restock_variant-service-bay-opaque = Solid Caps
     #LOC_Restock_variant-service-bay-transparent = Truss Caps
     #LOC_Restock_variant-service-bay-hollow = No Caps

Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-intakes-depthmasks.cfg

@@ -0,0 +1,149 @@
+// Patches adding depth masks to air intakes
+// Contents:
+// Circular Intake (CircularIntake)
+// Small Circular Intake (miniIntake)
+// Shock Cone Intake (shockConeIntake)
+// Adjustable Ramp Intake (ramAirIntake)
+// Adjustable Ramp Intake Radial (IntakeRadialLong)
+// XM-G50 Radial Air Intake (airScoop)
+// Mk1 Diverterless Supersonic Intake (MK1IntakeFuselage)
+
+// Circular Intake
+@PART[CircularIntake]
+{
+  !mesh = DELETE
+
+  MODEL
+  {
+    model = Squad/Parts/Aero/circularIntake/CircularIntake
+  }
+
+  MODEL
+  {
+    model = ReStock/Assets/Aero/DepthMasks/restock-fanintake-mask
+  }
+
+  MODULE
+  {
+    name = ModuleRestockDepthMask
+    maskTransform = fanintake_mask
+  }
+}
+
+// Small Circular Intake
+@PART[miniIntake]
+{
+  !mesh = DELETE
+
+  MODEL
+  {
+    model = Squad/Parts/Aero/miniIntake/SmallIntake
+  }
+
+  MODEL
+  {
+    model = ReStock/Assets/Aero/DepthMasks/restock-miniintake-mask
+  }
+
+  MODULE
+  {
+    name = ModuleRestockDepthMask
+    maskTransform = miniintake_mask
+  }
+}
+
+// Shock Cone Intake
+@PART[shockConeIntake]
+{
+  MODEL
+  {
+    model = ReStock/Assets/Aero/DepthMasks/restock-coneintake-mask
+  }
+
+  MODULE
+  {
+    name = ModuleRestockDepthMask
+    maskTransform = coneintake_mask
+  }
+}
+
+// Adjustable Ramp Intake 
+@PART[ramAirIntake]
+{
+  !mesh = DELETE
+
+  MODEL
+  {
+    model = Squad/Parts/Aero/ramAirIntake/RampIntake
+  }
+
+  MODEL
+  {
+    model = ReStock/Assets/Aero/DepthMasks/restock-rampintake-mask
+  }
+
+  MODULE
+  {
+    name = ModuleRestockDepthMask
+    maskTransform = rampintake_mask
+  }
+}
+
+// Adjustable Ramp Intake Radial
+@PART[IntakeRadialLong]
+{
+  !mesh = DELETE
+
+  MODEL
+  {
+    model = Squad/Parts/Aero/intakeRadialLong/IntakeRadial
+  }
+
+  MODEL
+  {
+    model = ReStock/Assets/Aero/DepthMasks/restock-longintake-mask
+  }
+
+  MODULE
+  {
+    name = ModuleRestockDepthMask
+    maskTransform = longintake_mask
+  }
+}
+
+// XM-G50 Radial Air Intake
+@PART[airScoop]
+{
+  !mesh = DELETE
+
+  MODEL
+  {
+    model = Squad/Parts/Aero/airIntakeRadialXM-G50/RadialIntake
+  }
+
+  MODEL
+  {
+    model = ReStock/Assets/Aero/DepthMasks/restock-radialintake-mask
+  }
+
+  MODULE
+  {
+    name = ModuleRestockDepthMask
+    maskTransform = radialintake_mask
+  }
+}
+
+// Mk1 Diverterless Supersonic Intake
+@PART[MK1IntakeFuselage]
+{
+  MODEL
+  {
+    model = ReStock/Assets/Aero/DepthMasks/restock-inlineintake-mask
+  }
+
+  MODULE
+  {
+    name = ModuleRestockDepthMask
+    maskTransform = inlineintake_mask
+  }
+}

Distribution/Restock/GameData/ReStock/Patches/CompoundParts/restock-fuelline.cfg

@@ -0,0 +1,101 @@
+// Patches applying art changes to the fuel line
+// Contents:
+// - FTX-2 External Fuel Duct (fuelLine)
+
+// FTX-2 External Fuel Duct
+@PART[fuelLine]
+{
+  @author = Andrew Cassidy
+
+  !mesh = DELETE
+  MODEL
+  {
+    model = ReStock/Assets/CompoundParts/restock-fuelline-1
+  }
+  rescaleFactor = 1.0
+  !scale = DELETE
+
+  !MODULE[CModuleLinkedMesh] {}
+  MODULE
+  {
+    name = ModuleRestockLinkedMesh
+    lineObjName = line
+    mainAnchorName = pipe_main_anchor
+    targetAnchorName = pipe_target_anchor
+    anchorCapName = pipe_main_cap
+    targetCapName = pipe_target_cap
+    targetColliderName = pipe_target_SPHERECOLLIDER
+    stretchAxis = x
+    stretchTextures = _MainTex _BumpMap
+  }
+
+  MODULE
+  {
+    name = ModulePartVariants
+    useMultipleDragCubes = false
+    baseVariant = Yellow
+    VARIANT
+    {
+      name = Yellow
+      displayName = #LOC_Restock_variant-surface_yellow
+      themeName = YellowAndWhite
+      primaryColor = #B08D43
+      secondaryColor = #999999
+      GAMEOBJECTS
+      {
+        line_yellow = true
+        line_black = false
+        line_metal = false
+        line_sofi = false
+      }
+    }
+
+    VARIANT
+    {
+      name = Black
+      displayName = #LOC_Restock_variant-surface_black
+      themeName = Dark
+      primaryColor = #4c4f47
+      secondaryColor = #999999
+      GAMEOBJECTS
+      {
+        line_yellow = false
+        line_black = true
+        line_metal = false
+        line_sofi = false
+      }
+    }
+
+    VARIANT
+    {
+      name = Metal // 🤘
+      displayName = #LOC_Restock_variant-surface_metal
+      themeName = Metal
+      primaryColor = #6f6e6d
+      secondaryColor = #999999
+      GAMEOBJECTS
+      {
+        line_yellow = false
+        line_black = false
+        line_metal = true
+        line_sofi = false
+      }
+    }
+
+    VARIANT
+    {
+      name = Orange
+      displayName = #autoLOC_8007123
+      themeName = Orange
+      primaryColor = #B08D43
+      secondaryColor = #999999
+      GAMEOBJECTS
+      {
+        line_yellow = false
+        line_black = false
+        line_metal = false
+        line_sofi = true
+      }
+    }
+  }
+}

Distribution/Restock/GameData/ReStock/Patches/CompoundParts/restock-strut.cfg

@@ -0,0 +1,69 @@
+// Patches applying art changes to the strut
+// Contents:
+// - EAS-4 Strut Connector (strutConnector)
+
+// EAS-4 Strut Connector 
+@PART[strutConnector]
+{
+  @author = Andrew Cassidy
+
+  !mesh = DELETE
+  MODEL
+  {
+    model = ReStock/Assets/CompoundParts/restock-strut-1
+  }
+  rescaleFactor = 1.0
+  !scale = DELETE
+
+  !MODULE[CModuleLinkedMesh] {}
+  MODULE
+  {
+    name = ModuleRestockLinkedMesh
+    lineObjName = strut
+    mainAnchorName = strut_main_anchor
+    targetAnchorName = strut_target_anchor
+    anchorCapName = strut_main_cap
+    targetCapName = strut_target_cap
+    targetColliderName = strut_target_SPHERECOLLIDER
+    stretchAxis = x
+    stretchTextures = _MainTex _BumpMap
+  }
+
+  MODULE
+  {
+    name = ModulePartVariants
+    useMultipleDragCubes = false
+    baseVariant = Classic
+    VARIANT
+    {
+      name = Classic
+      displayName = #LOC_Restock_variant-mounting_classic
+      themeName = White
+      primaryColor = #6f6e6d
+      secondaryColor = #999999
+      GAMEOBJECTS
+      {
+        strut_main_body_classic = true
+        strut_target_body_classic = true
+        strut_main_body_compact = false
+        strut_target_body_compact = false
+      }
+    }
+
+    VARIANT
+    {
+      name = Compact
+      displayName = #LOC_Restock_variant-mounting_compact
+      themeName = White
+      primaryColor = #6f6e6d
+      secondaryColor = #999999
+      GAMEOBJECTS
+      {
+        strut_main_body_classic = false
+        strut_target_body_classic = false
+        strut_main_body_compact = true
+        strut_target_body_compact = true
+      }
+    }
+  }
+}

Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-solarpanels.cfg

@@ -44,6 +44,12 @@
   {
     @secondaryTransformName = panel6
   }
+
+  MODULE
+  {
+    name = ModuleRestockDepthMask
+    maskTransform = solarshroud_mask
+  }
 }
 
 // 3x2
@@ -82,6 +88,12 @@
   {
     @secondaryTransformName = solar6
   }
+
+  MODULE
+  {
+    name = ModuleRestockDepthMask
+    maskTransform = solarshroud_mask
+  }
 }
 
 // Gigantor

Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-jet-depthmasks.cfg

@@ -0,0 +1,67 @@
+// Patches adding depth masks to the jet engines
+// Contents:
+// J-33 "Wheesley" Turbofan Engine (JetEngine)
+// J-404 "Panther" Afterburning Turbofan (turboJet)
+// J-X4 "Whiplash" Turbo Ramjet Engine (turboFanEngine)
+// J-20 "Juno" Basic Jet Engine (miniJetEngine)
+
+
+// J-33 "Wheesley" Turbofan Engine
+@PART[JetEngine]
+{
+  MODEL
+  {
+    model = ReStock/Assets/Engine/DepthMasks/restock-basicjet-mask
+  }
+
+  MODULE
+  {
+    name = ModuleRestockDepthMask
+    maskTransform = basicjet_mask
+  }
+}
+
+// J-404 "Panther" Afterburning Turbofan
+@PART[turboJet]
+{
+  MODEL
+  {
+    model = ReStock/Assets/Engine/DepthMasks/restock-turbojet-mask
+  }
+
+  MODULE
+  {
+    name = ModuleRestockDepthMask
+    maskTransform = turbojet_mask
+  }
+}
+
+// J-X4 "Whiplash" Turbo Ramjet Engine
+@PART[turboFanEngine]
+{
+  MODEL
+  {
+    model = ReStock/Assets/Engine/DepthMasks/restock-ramjet-mask
+  }
+
+  MODULE
+  {
+    name = ModuleRestockDepthMask
+    maskTransform = ramjet_mask
+  }
+}
+
+// J-20 "Juno" Basic Jet Engine
+@PART[miniJetEngine]
+{
+  MODEL
+  {
+    model = ReStock/Assets/Engine/DepthMasks/restock-minijet-mask
+  }
+
+  MODULE
+  {
+    name = ModuleRestockDepthMask
+    maskTransform = minijet_mask
+  }
+}

Distribution/Restock/GameData/ReStock/Restock.restockblacklist

@@ -26,6 +26,7 @@ Squad/Parts/Command/probeStackLarge/
 Squad/Parts/Command/probeStackSmall/
 Squad/Parts/Command/probeStackSphere_v2/
 Squad/Parts/Command/probeRoverBody_v2/
+Squad/Parts/CompoundParts/
 Squad/Parts/Coupling/Assets/Decoupler_0.mu
 Squad/Parts/Coupling/Assets/Decoupler_1.mu
 Squad/Parts/Coupling/Assets/Decoupler_2.mu