More 1.1.0 upgrades

- new poodle (#877)
- rockomax tanks (#881)

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

@@ -44,6 +44,18 @@ Localization
     #LOC_Restock_variant-engine_boattail_size1p5_grey-orange = Boattail (1.875m, Orange/Grey)
     #LOC_Restock_variant-engine_tankbutt_size2_white = Tankbutt (2.5m, White)
     #LOC_Restock_variant-engine_tankbutt_size2_grey-orange = Tankbutt (2.5m, Orange/Grey)
+    #LOC_Restock_variant-engine_singlebell_compact = Single Compact
+    #LOC_Restock_variant-engine_singlebell_compact_white = Single Compact (White Shroud)
+    #LOC_Restock_variant-engine_singlebell_compact_grey-orange = Single Compact (Orange/Grey Shroud)
+    #LOC_Restock_variant-engine_singlebell = Single    
+    #LOC_Restock_variant-engine_singlebell_white = Single (White Shroud)
+    #LOC_Restock_variant-engine_singlebell_grey-orange = Single (Orange/Grey Shroud)
+    #LOC_Restock_variant-engine_quadbell = Quad 
+    #LOC_Restock_variant-engine_quadbell_white = Quad (White Shroud)
+    #LOC_Restock_variant-engine_quadbell_grey-orange = Quad (Orange/Grey Shroud)
+    #LOC_Restock_variant-engine_quadbell_compact = Quad Compact
+    #LOC_Restock_variant-engine_quadbell_compact_white = Quad Compact (White Shroud)
+    #LOC_Restock_variant-engine_quadbell_compact_grey-orange = Quad Compact (Orange/Grey Shroud)
 
     #LOC_Restock_variant-engine_boattail_size2_white = Boattail (2.5m, White)
     #LOC_Restock_variant-engine_boattail_size2_grey-orange = Boattail (2.5m, Orange/Grey)

Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-25.cfg

@@ -19,15 +19,11 @@
   !sound_vent_soft = DELETE
   !sound_explosion_low = DELETE
   !DRAG_CUBE {}
-  DRAG_CUBE
-  {
-    cube = Fairing, 3.898,0.7731,1.901, 3.898,0.773,1.901, 3.297,0.7352,1.744, 3.311,0.6924,1.917, 3.895,0.7689,2.073, 3.895,0.7683,2.129, -0.001018,-0.6431,-0.002216, 3.418,1.717,3.42
-    cube = Clean, 3.871,0.7762,1.9, 3.871,0.7763,1.9, 2.683,0.5947,1.751, 2.686,0.6422,1.526, 3.874,0.7711,2.07, 3.874,0.7711,2.127, -0.0007027,-0.6431,0.0001873, 3.415,1.717,3.415
-  }
+  
   !MODEL {}
   MODEL
   {
-    model = ReStock/Assets/Engine/restock-engine-poodle-1
+    model = ReStock/Assets/Engine/restock-engine-poodle-2
     position = 0.0, 0.0, 0.0
     scale = 1,1,1
     rotation = 0, 0, 0
@@ -125,7 +121,7 @@
   {
     @name = ModuleEnginesFX
     %runningEffectName = fx-poodle-running
-  }
+  }s
   !MODULE[FXModuleLookAtConstraint] {}
   MODULE
   {
@@ -212,6 +208,27 @@
       targetName = P_CylCpt_Upper004
       rotatorsName = P_CylCpt_Lower004
     }
+     // Single
+    CONSTRAINLOOKFX
+    {
+      targetName = P_CylSingle_Lower001
+      rotatorsName = P_CylSingle_Upper001
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = P_CylSingle_Lower002
+      rotatorsName = P_CylSingle_Upper002
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = P_CylSingle_Upper001
+      rotatorsName = P_CylSingle_Lower001
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = P_CylSingle_Upper002
+      rotatorsName = P_CylSingle_Lower002
+    }
   }
   !MODULE[FXModuleAnimateThrottle] {}
   MODULE
@@ -292,100 +309,253 @@
   }
   @MODULE[ModuleJettison]
   {
-    @jettisonName = Shroud, Poodle_Shroud_Compact
-    useMultipleDragCubes = true
+    @jettisonName = Shroud1,Shroud2
+    //useMultipleDragCubes = true
   }
+  !MODULE[ModulePartVariants] {}
   MODULE
   {
     name = ModulePartVariants
-    baseVariant = Size2
-    useMultipleDragCubes = false
+    baseVariant = TwoBell
+    //useMultipleDragCubes = false
     VARIANT
     {
-      name = Size2
-      displayName = #LOC_Restock_variant-engine_size2_white
+      name = TwoBell
+      displayName = #LOC_Restock_variant-engine_quadbell_white
       primaryColor = #999999
       secondaryColor = #ffffff
       GAMEOBJECTS
       {
-        Poodle_25 = true
-        Poodle_Compact = false
-        P_Cyl_Lower001 = true
-        P_Cyl_Lower002 = true
-        P_Cyl_Lower003 = true
-        P_Cyl_Lower004 = true
-        P_CylCpt_Lower001 = false
-        P_CylCpt_Lower002 = false
-        P_CylCpt_Lower003 = false
-        P_CylCpt_Lower004 = false
+        B_Poodle_25 = true
+        B_Poodle_Compact = false
+        B_Poodle_Common = true
+        Poodle_LowerCyls = true
+        Poodle_LowerCylsCompact = false
         ShroudOrange = false
         ShroudWhite = true
+        ShroudOrangeLong = false
+        ShroudWhiteLong = false
+        Shroud1 = true
+        Shroud2 = false
+        B_Poodle_Single = false
+        B_Poodle_SingleCommon =  false
+        B_Poodle_SingleCompact =  false
+      }
+      NODES
+      {
+        node_attach = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 2
+        node_stack_top = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 2
+        node_stack_bottom = 0.0, -1.5, 0.0, 0.0, -1.0, 0.0, 2
       }
     }
     VARIANT
     {
       name = Compact
-      displayName = #LOC_Restock_variant-engine_compact_white
+      displayName = #LOC_Restock_variant-engine_quadbell_compact_white
       primaryColor = #666666
       secondaryColor = #ffffff
       GAMEOBJECTS
       {
-        Poodle_25 = false
-        Poodle_Compact = true
-        P_Cyl_Lower001 = false
-        P_Cyl_Lower002 = false
-        P_Cyl_Lower003 = false
-        P_Cyl_Lower004 = false
-        P_CylCpt_Lower001 = true
-        P_CylCpt_Lower002 = true
-        P_CylCpt_Lower003 = true
-        P_CylCpt_Lower004 = true
+        B_Poodle_25 = false
+        B_Poodle_Compact = true
+        B_Poodle_Common = true
+        Poodle_LowerCyls = false
+        Poodle_LowerCylsCompact = true
         ShroudOrange = false
         ShroudWhite = true
+        ShroudOrangeLong = false
+        ShroudWhiteLong = false
+        Shroud1 = true
+        Shroud2 = false
+        B_Poodle_Single = false
+        B_Poodle_SingleCommon =  false
+        B_Poodle_SingleCompact =  false
+      }
+      NODES
+      {
+        node_attach = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 2
+        node_stack_top = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 2
+        node_stack_bottom = 0.0, -1.5, 0.0, 0.0, -1.0, 0.0, 2
       }
     }
     VARIANT
     {
-      name = Size2_Alternate
-      displayName = #LOC_Restock_variant-engine_size2_grey-orange
+      name = TwoBell_Alternate
+      displayName = #LOC_Restock_variant-engine_quadbell_grey-orange
       primaryColor = #999999
       secondaryColor = #f69449
       GAMEOBJECTS
       {
-        Poodle_25 = true
-        Poodle_Compact = false
-        P_Cyl_Lower001 = true
-        P_Cyl_Lower002 = true
-        P_Cyl_Lower003 = true
-        P_Cyl_Lower004 = true
-        P_CylCpt_Lower001 = false
-        P_CylCpt_Lower002 = false
-        P_CylCpt_Lower003 = false
-        P_CylCpt_Lower004 = false
+        B_Poodle_25 = true
+        B_Poodle_Compact = false
+        B_Poodle_Common = true
+        Poodle_LowerCyls = true
+        Poodle_LowerCylsCompact = false
         ShroudOrange = true
         ShroudWhite = false
+        ShroudOrangeLong = false
+        ShroudWhiteLong = false
+        Shroud1 = true
+        Shroud2 = false
+        B_Poodle_Single = false
+        B_Poodle_SingleCommon =  false
+        B_Poodle_SingleCompact =  false
+      }
+      NODES
+      {
+        node_attach = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 2
+        node_stack_top = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 2
+        node_stack_bottom = 0.0, -1.5, 0.0, 0.0, -1.0, 0.0, 2
       }
     }
     VARIANT
     {
       name = Compact_Alternate
-      displayName = #LOC_Restock_variant-engine_compact_grey-orange
+      displayName = #LOC_Restock_variant-engine_quadbell_compact_grey-orange
       primaryColor = #666666
       secondaryColor = #f69449
       GAMEOBJECTS
       {
-        Poodle_25 = false
-        Poodle_Compact = true
-        P_Cyl_Lower001 = false
-        P_Cyl_Lower002 = false
-        P_Cyl_Lower003 = false
-        P_Cyl_Lower004 = false
-        P_CylCpt_Lower001 = true
-        P_CylCpt_Lower002 = true
-        P_CylCpt_Lower003 = true
-        P_CylCpt_Lower004 = true
+        B_Poodle_25 = false
+        B_Poodle_Compact = true
+        B_Poodle_Common = true
+        Poodle_LowerCyls = false
+        Poodle_LowerCylsCompact = true
         ShroudOrange = true
         ShroudWhite = false
+        ShroudOrangeLong = false
+        ShroudWhiteLong = false
+        Shroud1 = true
+        Shroud2 = false
+        B_Poodle_Single = false
+        B_Poodle_SingleCommon =  false
+        B_Poodle_SingleCompact =  false
+      }
+      NODES
+      {
+        node_attach = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 2
+        node_stack_top = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 2
+        node_stack_bottom = 0.0, -1.5, 0.0, 0.0, -1.0, 0.0, 2
+      }
+    }
+    VARIANT
+    {
+      name = SingleBell
+      displayName =  #LOC_Restock_variant-engine_singlebell_white
+      primaryColor = #999999
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        B_Poodle_25 = false
+        B_Poodle_Compact = false
+        B_Poodle_Common = false
+        Poodle_LowerCyls = false
+        Poodle_LowerCylsCompact = false
+        ShroudOrange = false
+        ShroudWhite = false
+        ShroudOrangeLong = false
+        ShroudWhiteLong = true
+        Shroud1 = false
+        Shroud2 = true
+        B_Poodle_Single = true
+        B_Poodle_SingleCommon =  true
+        B_Poodle_SingleCompact =  false
+      }
+      NODES
+      {
+        node_attach = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 2
+        node_stack_top = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 2
+        node_stack_bottom = 0.0, -2.67668, 0.0, 0.0, -1.0, 0.0, 2
+      }
+    }
+    VARIANT
+    {
+      name = SingleBell-Alt
+      displayName =  #LOC_Restock_variant-engine_singlebell_grey-orange
+      primaryColor = #999999
+      secondaryColor = #f69449
+      GAMEOBJECTS
+      {
+        B_Poodle_25 = false
+        B_Poodle_Compact = false
+        B_Poodle_Common = false
+        Poodle_LowerCyls = false
+        Poodle_LowerCylsCompact = false
+        ShroudOrange = false
+        ShroudWhite = false
+        ShroudOrangeLong = true
+        ShroudWhiteLong = false
+        Shroud1 = false
+        Shroud2 = true
+        B_Poodle_Single = true
+        B_Poodle_SingleCommon =  true
+        B_Poodle_SingleCompact =  false
+      }
+      NODES
+      {
+        node_attach = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 2
+        node_stack_top = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 2
+        node_stack_bottom = 0.0, -2.67668, 0.0, 0.0, -1.0, 0.0, 2
+      }
+    }
+    VARIANT
+    {
+      name = SingleBell-Compact
+      displayName =  #LOC_Restock_variant-engine_singlebell_compact_white
+      primaryColor = #666666
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        B_Poodle_25 = false
+        B_Poodle_Compact = false
+        B_Poodle_Common = false
+        Poodle_LowerCyls = false
+        Poodle_LowerCylsCompact = false
+        ShroudOrange = false
+        ShroudWhite = false
+        ShroudOrangeLong = false
+        ShroudWhiteLong = true
+        Shroud1 = false
+        Shroud2 = true
+        B_Poodle_Single = false
+        B_Poodle_SingleCommon =  true
+        B_Poodle_SingleCompact =  true
+      }
+      NODES
+      {
+        node_attach = 0.0, -0.671, 0.0, 0.0, 1.0, 0.0, 2
+        node_stack_top = 0.0, -0.671, 0.0, 0.0, 1.0, 0.0, 2
+        node_stack_bottom = 0.0, -2.67668, 0.0, 0.0, -1.0, 0.0, 2
+      }
+    }
+    VARIANT
+    {
+      name = SingleBell-Compact-Alt
+      displayName =  #LOC_Restock_variant-engine_singlebell_compact_grey-orange
+      primaryColor = #666666
+      secondaryColor = #f69449
+      GAMEOBJECTS
+      {
+        B_Poodle_25 = false
+        B_Poodle_Compact = false
+        B_Poodle_Common = false
+        Poodle_LowerCyls = false
+        Poodle_LowerCylsCompact = false
+        ShroudOrange = false
+        ShroudWhite = false
+        ShroudOrangeLong = true
+        ShroudWhiteLong = false
+        B_Poodle_Single = false
+        Shroud1 = false
+        Shroud2 = true
+        B_Poodle_SingleCommon =  true
+        B_Poodle_SingleCompact =  true
+      }
+      NODES
+      {
+        node_attach = 0.0, -0.671, 0.0, 0.0, 1.0, 0.0, 2
+        node_stack_top = 0.0, -0.671, 0.0, 0.0, 1.0, 0.0, 2
+        node_stack_bottom = 0.0, -2.67668, 0.0, 0.0, -1.0, 0.0, 2
       }
     }
   }

Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-25.cfg

@@ -46,7 +46,9 @@
       {
         25TankTinyGrey = false
         25TankTinyOrange = false
-        25TankTinyWhite = true
+        25TankTinyBlackWhite = true
+        25TankTinyWhite = false
+        25TankTinyESA = false
       }
     }
     VARIANT
@@ -60,7 +62,9 @@
       {
         25TankTinyGrey = false
         25TankTinyOrange = true
+        25TankTinyBlackWhite = false
         25TankTinyWhite = false
+        25TankTinyESA = false
       }
     }
     VARIANT
@@ -74,7 +78,41 @@
       {
         25TankTinyGrey = true
         25TankTinyOrange = false
+        25TankTinyBlackWhite = false
+        25TankTinyWhite = false
+        25TankTinyESA = false
+      }
+    }
+    VARIANT
+    {
+      name = White
+      displayName = #autoLOC_8007119
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        25TankTinyGrey = false
+        25TankTinyOrange = false
+        25TankTinyBlackWhite = false
+        25TankTinyWhite = true
+        25TankTinyESA = false
+      }
+    }
+    VARIANT
+    {
+      name = ESA
+      displayName = #autoLOC_6005083
+      description = #autoLOC_6005084 
+      primaryColor = #ffffff
+      secondaryColor = #124d7f
+      GAMEOBJECTS
+      {
+        25TankTinyGrey = false
+        25TankTinyOrange = false
+        25TankTinyBlackWhite = false
         25TankTinyWhite = false
+        25TankTinyESA = true
       }
     }
   }
@@ -121,7 +159,9 @@
       {
         25TankSmallGrey = false
         25TankSmallOrange = false
-        25TankSmallWhite = true
+        25TankSmallBlackWhite = true
+        25TankSmallWhite = false
+        25TankSmallESA = false
       }
     }
     VARIANT
@@ -135,7 +175,9 @@
       {
         25TankSmallGrey = false
         25TankSmallOrange = true
+        25TankSmallBlackWhite = false
         25TankSmallWhite = false
+        25TankSmallESA = false
       }
     }
     VARIANT
@@ -149,7 +191,41 @@
       {
         25TankSmallGrey = true
         25TankSmallOrange = false
+        25TankSmallBlackWhite = false
+        25TankSmallWhite = false
+        25TankSmallESA = false
+      }
+    }
+    VARIANT
+    {
+      name = White
+      displayName = #autoLOC_8007119
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        25TankSmallGrey = false
+        25TankSmallOrange = false
+        25TankSmallBlackWhite = false
+        25TankSmallWhite = true
+        25TankSmallESA = false
+      }
+    }
+    VARIANT
+    {
+      name = ESA
+      displayName = #autoLOC_6005083
+      description = #autoLOC_6005084 
+      primaryColor = #ffffff
+      secondaryColor = #124d7f
+      GAMEOBJECTS
+      {
+        25TankSmallGrey = false
+        25TankSmallOrange = false
+        25TankSmallBlackWhite = false
         25TankSmallWhite = false
+        25TankSmallESA = true
       }
     }
   }
@@ -196,7 +272,9 @@
       {
         25TankMedGrey = false
         25TankMedOrange = false
-        25TankMedWhite = true
+        25TankMedBlackWhite = true
+        25TankMedWhite = false
+        25TankMedESA = false
       }
     }
     VARIANT
@@ -210,7 +288,9 @@
       {
         25TankMedGrey = false
         25TankMedOrange = true
+        25TankMedBlackWhite = false
         25TankMedWhite = false
+        25TankMedESA = false
       }
     }
     VARIANT
@@ -224,7 +304,41 @@
       {
         25TankMedGrey = true
         25TankMedOrange = false
+        25TankMedBlackWhite = false
+        25TankMedWhite = false
+        25TankMedESA = false
+      }
+    }
+    VARIANT
+    {
+      name = White
+      displayName = #autoLOC_8007119
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        25TankMedGrey = false
+        25TankMedOrange = false
+        25TankMedBlackWhite = false
+        25TankMedWhite = true
+        25TankMedESA = false
+      }
+    }
+    VARIANT
+    {
+      name = ESA
+      displayName = #autoLOC_6005083
+      description = #autoLOC_6005084 
+      primaryColor = #ffffff
+      secondaryColor = #124d7f
+      GAMEOBJECTS
+      {
+        25TankMedGrey = false
+        25TankMedOrange = false
+        25TankMedBlackWhite = false
         25TankMedWhite = false
+        25TankMedESA = true
       }
     }
   }
@@ -271,7 +385,9 @@
       {
         25TankLargeGrey = false
         25TankLargeOrange = false
-        25TankLargeWhite = true
+        25TankLargeBlackWhite = true
+        25TankLargeWhite = false
+        25TankLargeESA = false
       }
     }
     VARIANT
@@ -285,7 +401,9 @@
       {
         25TankLargeGrey = false
         25TankLargeOrange = true
+        25TankLargeBlackWhite = false
         25TankLargeWhite = false
+        25TankLargeESA = false
       }
     }
     VARIANT
@@ -299,7 +417,41 @@
       {
         25TankLargeGrey = true
         25TankLargeOrange = false
+        25TankLargeBlackWhite = false
+        25TankLargeWhite = false
+        25TankLargeESA = false
+      }
+    }
+    VARIANT
+    {
+      name = White
+      displayName = #autoLOC_8007119
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        25TankLargeGrey = false
+        25TankLargeOrange = false
+        25TankLargeBlackWhite = false
+        25TankLargeWhite = true
+        25TankLargeESA = false
+      }
+    }
+    VARIANT
+    {
+      name = ESA
+      displayName = #autoLOC_6005083
+      description = #autoLOC_6005084 
+      primaryColor = #ffffff
+      secondaryColor = #124d7f
+      GAMEOBJECTS
+      {
+        25TankLargeGrey = false
+        25TankLargeOrange = false
+        25TankLargeBlackWhite = false
         25TankLargeWhite = false
+        25TankLargeESA = true
       }
     }
   }

Distribution/Restock/changelog.txt

@@ -12,10 +12,13 @@ v1.2.0
   - Mk2 Command Pod (Andrew Cassidy): Now has dark and white variants.
  - Coupling
   - Inflatable Airlock (Andrew Cassidy): now has built in decoupler and optional ring to connect seamlessly with KV-series pods. Has a new IVA.
-- Updates to support KSP 1.10.0 parts:
+- Updates to support KSP 1.10.x part changes:
  - Kickback now supports a new White variant with slightly different geometry and more... white
+ - 2.5m tanks now support new White and ESA variants
+ - Retextured and tuned Poodle model
  - Poodle now supports a new Single Bell variant, which replaces the new Squad variant, and a Single Bell Compact variant, which is new
- - Decouplers now support a Classic variant
+ - Decouplers now support a Classic variant (replaces stock White/Yellow variant)
+ - Separators now support a Classic variant (replaces stock White/Yellow variant)
 
 v1.1.2
 ------