Merge branch 'multicouplers' into develop

Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-125.cfg

@@ -4,6 +4,9 @@
 // - FL-A5 Adapter (adapterSmallMiniShort)
 // - Rockomax HubMax Multi-Point Connector (stationHub)
 // - BZ-52 Radial Attachment Point (stackPoint1)
+// - TVR-200 Stack Bi-Coupler (stackBiCoupler_v2)
+// - TVR-300 Stack Tri-Coupler (stackTriCoupler_v2)
+// - TVR-400 Stack Quad-Coupler (stackQuadCoupler)
 
 @PART[adapterSmallMiniTall]
 {
@@ -244,3 +247,248 @@
     model = ReStock/Assets/Structural/restock-node-125-1
   }
 }
+
+// 1.25m Bicoupler
+@PART[stackBiCoupler_v2]
+{
+  @author = Andrew Cassidy
+
+  !MODEL {}
+  MODEL
+  {
+    model = ReStock/Assets/Structural/restock-multicoupler-125-125-x2
+  }
+
+  // stock nodes are slightly off center and don't match the model
+  // this shouldn't affect too much since nodes are saved for existing craft
+  @node_stack_bottom1 = 0.625, -0.33838, 0.0, 0.0, -1.0, 0.0
+  @node_stack_bottom2 = -0.625, -0.33838, 0.0, 0.0, -1.0, 0.0
+
+  !MODULE[ModulePartVariants] {}
+  MODULE
+  {
+    name = ModulePartVariants
+    useMultipleDragCubes = false
+    baseVariant = BlackAndWhite
+    VARIANT
+    {
+      name = Dark
+      displayName = #autoLOC_8007117
+      themeName = Dark
+      primaryColor = #4c4f47
+      secondaryColor = #4c4f47
+      GAMEOBJECTS
+      {
+        Bicoupler-BW = false
+        Bicoupler-Dark = true
+        Bicoupler-Orange = false
+        Bicoupler-White = false
+      }
+    }
+    VARIANT
+    {
+      name = BlackAndWhite
+      displayName = #autoLOC_8007122
+      themeName = BlackAndWhite
+      primaryColor = #ffffff
+      secondaryColor = #000000
+      GAMEOBJECTS
+      {
+        Bicoupler-BW = true
+        Bicoupler-Dark = false
+        Bicoupler-Orange = false
+        Bicoupler-White = false
+      }
+    }
+    VARIANT
+    {
+      name = White
+      displayName = #autoLOC_8007119
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        Bicoupler-BW = false
+        Bicoupler-Dark = false
+        Bicoupler-Orange = false
+        Bicoupler-White = true
+      }
+    }
+    VARIANT
+    {
+      name = Orange
+      displayName = #autoLOC_8007121
+      themeName = GrayAndOrange
+      primaryColor = #4c4f47
+      secondaryColor = #f49841
+      GAMEOBJECTS
+      {
+        Bicoupler-BW = false
+        Bicoupler-Dark = false
+        Bicoupler-Orange = true
+        Bicoupler-White = false
+      }
+    }
+  }
+}
+
+// 1.25m Tricoupler
+@PART[stackTriCoupler_v2]
+{
+  @author = Andrew Cassidy
+
+  !MODEL {}
+  MODEL
+  {
+    model = ReStock/Assets/Structural/restock-multicoupler-125-125-x3
+  }
+
+  !MODULE[ModulePartVariants] {}
+  MODULE
+  {
+    name = ModulePartVariants
+    useMultipleDragCubes = false
+    baseVariant = BlackAndWhite
+    VARIANT
+    {
+      name = Dark
+      displayName = #autoLOC_8007117
+      themeName = Dark
+      primaryColor = #4c4f47
+      secondaryColor = #4c4f47
+      GAMEOBJECTS
+      {
+        Tricoupler-BW = false
+        Tricoupler-Dark = true
+        Tricoupler-Orange = false
+        Tricoupler-White = false
+      }
+    }
+    VARIANT
+    {
+      name = BlackAndWhite
+      displayName = #autoLOC_8007122
+      themeName = BlackAndWhite
+      primaryColor = #ffffff
+      secondaryColor = #000000
+      GAMEOBJECTS
+      {
+        Tricoupler-BW = true
+        Tricoupler-Dark = false
+        Tricoupler-Orange = false
+        Tricoupler-White = false
+      }
+    }
+    VARIANT
+    {
+      name = White
+      displayName = #autoLOC_8007119
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        Tricoupler-BW = false
+        Tricoupler-Dark = false
+        Tricoupler-Orange = false
+        Tricoupler-White = true
+      }
+    }
+    VARIANT
+    {
+      name = Orange
+      displayName = #autoLOC_8007121
+      themeName = GrayAndOrange
+      primaryColor = #4c4f47
+      secondaryColor = #f49841
+      GAMEOBJECTS
+      {
+        Tricoupler-BW = false
+        Tricoupler-Dark = false
+        Tricoupler-Orange = true
+        Tricoupler-White = false
+      }
+    }
+  }
+}
+
+// 1.25m Quadcoupler
+@PART[stackQuadCoupler]
+{
+  @author = Andrew Cassidy
+
+  !MODEL {}
+  MODEL
+  {
+    model = ReStock/Assets/Structural/restock-multicoupler-125-125-x4
+  }
+
+  !MODULE[ModulePartVariants] {}
+  MODULE
+  {
+    name = ModulePartVariants
+    useMultipleDragCubes = false
+    baseVariant = BlackAndWhite
+    VARIANT
+    {
+      name = Dark
+      displayName = #autoLOC_8007117
+      themeName = Dark
+      primaryColor = #4c4f47
+      secondaryColor = #4c4f47
+      GAMEOBJECTS
+      {
+        Quadcoupler-BW = false
+        Quadcoupler-Dark = true
+        Quadcoupler-Orange = false
+        Quadcoupler-White = false
+      }
+    }
+    VARIANT
+    {
+      name = BlackAndWhite
+      displayName = #autoLOC_8007122
+      themeName = BlackAndWhite
+      primaryColor = #ffffff
+      secondaryColor = #000000
+      GAMEOBJECTS
+      {
+        Quadcoupler-BW = true
+        Quadcoupler-Dark = false
+        Quadcoupler-Orange = false
+        Quadcoupler-White = false
+      }
+    }
+    VARIANT
+    {
+      name = White
+      displayName = #autoLOC_8007119
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        Quadcoupler-BW = false
+        Quadcoupler-Dark = false
+        Quadcoupler-Orange = false
+        Quadcoupler-White = true
+      }
+    }
+    VARIANT
+    {
+      name = Orange
+      displayName = #autoLOC_8007121
+      themeName = GrayAndOrange
+      primaryColor = #4c4f47
+      secondaryColor = #f49841
+      GAMEOBJECTS
+      {
+        Quadcoupler-BW = false
+        Quadcoupler-Dark = false
+        Quadcoupler-Orange = true
+        Quadcoupler-White = false
+      }
+    }
+  }
+}

Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-25.cfg

@@ -2,6 +2,9 @@
 // Contents:
 // - Rockomax Brand Adapter (largeAdapter)
 // - Rockomax Brand Adapter 02 (largeAdapter2)
+// - TVR-200L Stack Bi-Adapter (adapterLargeSmallBi)
+// - TVR-300L Stack Tri-Adapter (adapterLargeSmallTri)
+// - TVR-400L Stack Quad-Adapter (adapterLargeSmallQuad)
 
 @PART[largeAdapter]
 {
@@ -112,3 +115,243 @@
     }
   }
 }
+
+// 2.5m Bicoupler
+@PART[adapterLargeSmallBi]
+{
+  @author = Andrew Cassidy
+
+  !MODEL {}
+  MODEL
+  {
+    model = ReStock/Assets/Structural/restock-multicoupler-25-125-x2
+  }
+
+  !MODULE[ModulePartVariants] {}
+  MODULE
+  {
+    name = ModulePartVariants
+    useMultipleDragCubes = false
+    baseVariant = Dark
+    VARIANT
+    {
+      name = Dark
+      displayName = #autoLOC_8007122
+      themeName = BlackAndWhite
+      primaryColor = #ffffff
+      secondaryColor = #000000
+      GAMEOBJECTS
+      {
+        Bicoupler-Dark = true
+        Bicoupler-Orange = false
+        Bicoupler-White = false
+        Bicoupler-Metal = false
+      }
+    }
+    VARIANT
+    {
+      name = White
+      displayName = #autoLOC_8007119
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        Bicoupler-Dark = false
+        Bicoupler-Orange = false
+        Bicoupler-White = true
+        Bicoupler-Metal = false
+      }
+    }
+    VARIANT
+    {
+      name = Orange
+      displayName = #autoLOC_8007123
+      themeName = Orange
+      primaryColor = #f49841
+      secondaryColor = #4c4f47
+      GAMEOBJECTS
+      {
+        Bicoupler-Dark = false
+        Bicoupler-Orange = true
+        Bicoupler-White = false
+        Bicoupler-Metal = false
+      }
+    }
+    VARIANT
+    {
+      name = Metallic
+      displayName = #LOC_Restock_variant-surface_metal
+      themeName = Metal
+      primaryColor = #6f6e6d
+      secondaryColor = #6f6e6d
+      GAMEOBJECTS
+      {
+        Bicoupler-Dark = false
+        Bicoupler-Orange = false
+        Bicoupler-White = false
+        Bicoupler-Metal = true
+      }
+    }
+  }
+}
+
+// 2.5m Tricoupler
+@PART[adapterLargeSmallTri]
+{
+  @author = Andrew Cassidy
+
+  !MODEL {}
+  MODEL
+  {
+    model = ReStock/Assets/Structural/restock-multicoupler-25-125-x3
+  }
+
+  !MODULE[ModulePartVariants] {}
+  MODULE
+  {
+    name = ModulePartVariants
+    useMultipleDragCubes = false
+    baseVariant = Dark
+    VARIANT
+    {
+      name = Dark
+      displayName = #autoLOC_8007122
+      themeName = BlackAndWhite
+      primaryColor = #ffffff
+      secondaryColor = #000000
+      GAMEOBJECTS
+      {
+        Tricoupler-Dark = true
+        Tricoupler-Orange = false
+        Tricoupler-White = false
+        Tricoupler-Metal = false
+      }
+    }
+    VARIANT
+    {
+      name = White
+      displayName = #autoLOC_8007119
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        Tricoupler-Dark = false
+        Tricoupler-Orange = false
+        Tricoupler-White = true
+        Tricoupler-Metal = false
+      }
+    }
+    VARIANT
+    {
+      name = Orange
+      displayName = #autoLOC_8007123
+      themeName = Orange
+      primaryColor = #f49841
+      secondaryColor = #4c4f47
+      GAMEOBJECTS
+      {
+        Tricoupler-Dark = false
+        Tricoupler-Orange = true
+        Tricoupler-White = false
+        Tricoupler-Metal = false
+      }
+    }
+    VARIANT
+    {
+      name = Metallic
+      displayName = #LOC_Restock_variant-surface_metal
+      themeName = Metal
+      primaryColor = #6f6e6d
+      secondaryColor = #6f6e6d
+      GAMEOBJECTS
+      {
+        Tricoupler-Dark = false
+        Tricoupler-Orange = false
+        Tricoupler-White = false
+        Tricoupler-Metal = true
+      }
+    }
+  }
+}
+
+// 2.5m Quadcoupler
+@PART[adapterLargeSmallQuad]
+{
+  @author = Andrew Cassidy
+
+  !MODEL {}
+  MODEL
+  {
+    model = ReStock/Assets/Structural/restock-multicoupler-25-125-x4
+  }
+
+  !MODULE[ModulePartVariants] {}
+  MODULE
+  {
+    name = ModulePartVariants
+    useMultipleDragCubes = false
+    baseVariant = Dark
+    VARIANT
+    {
+      name = Dark
+      displayName = #autoLOC_8007122
+      themeName = BlackAndWhite
+      primaryColor = #ffffff
+      secondaryColor = #000000
+      GAMEOBJECTS
+      {
+        Quadcoupler-Dark = true
+        Quadcoupler-Orange = false
+        Quadcoupler-White = false
+        Quadcoupler-Metal = false
+      }
+    }
+    VARIANT
+    {
+      name = White
+      displayName = #autoLOC_8007119
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        Quadcoupler-Dark = false
+        Quadcoupler-Orange = false
+        Quadcoupler-White = true
+        Quadcoupler-Metal = false
+      }
+    }
+    VARIANT
+    {
+      name = Orange
+      displayName = #autoLOC_8007123
+      themeName = Orange
+      primaryColor = #f49841
+      secondaryColor = #4c4f47
+      GAMEOBJECTS
+      {
+        Quadcoupler-Dark = false
+        Quadcoupler-Orange = true
+        Quadcoupler-White = false
+        Quadcoupler-Metal = false
+      }
+    }
+    VARIANT
+    {
+      name = Metallic
+      displayName = #LOC_Restock_variant-surface_metal
+      themeName = Metal
+      primaryColor = #6f6e6d
+      secondaryColor = #6f6e6d
+      GAMEOBJECTS
+      {
+        Quadcoupler-Dark = false
+        Quadcoupler-Orange = false
+        Quadcoupler-White = false
+        Quadcoupler-Metal = true
+      }
+    }
+  }
+}

Distribution/Restock/GameData/ReStock/Restock.restockblacklist

@@ -85,6 +85,8 @@ Squad/Parts/Structural/stationHub/
 Squad/Parts/Structural/structuralMicronode/
 Squad/Parts/Structural/strutCubicOcto/
 Squad/Parts/Structural/strutOcto/
+Squad/Parts/Structural/stackAdapters/
+Squad/Parts/Utility/stackCouplers/
 Squad/Parts/Utility/DirectAntennas/
 Squad/Parts/Utility/commDish88-88/
 Squad/Parts/Utility/commsAntennaDTS-M1/

Distribution/Restock/changelog.txt

@@ -14,6 +14,12 @@
   - M-Beam 200 I-Beam Pocket Edition (Nertea): now has Basic, Truss, Insulated variants
   - M-Beam 650 I-Beam (Nertea): now has Basic, Truss, Insulated variants
   - TT18-A Launch Stability Enhancer (Andrew)
+  - TVR-200L Stack Bi-Adapter (Andrew)
+  - TVR-300L Stack Tri-Adapter (Andrew)
+  - TVR-400L Stack Quad-Adapter (Andrew)
+  - TVR-200 Stack Bi-Coupler (Andrew)
+  - TVR-300 Stack Tri-Coupler (Andrew)
+  - TVR-400 Stack Quad-Coupler (Andrew)
  - Resources
   - 'Drill-O-Matic' Mining Excavator (Andrew Cassidy)
   - 'Drill-O-Matic Junior' Mining Excavator (Andrew Cassidy)