- Migrate Mastodon/Galleon and Skiff/Caravel from 1.875m to 2.5m label as per Making History default size.

- Reorganized Mainsail, Skipper variant ordering to follow ReStock convention of: default size truss, boattail, decreasing size trusses, compact - Reorganized Mastodon/Galleon and Skiff/Caravel variant ordering to follow ReStock convention (as above) whilst following MH's ordering a little more closely. - Corrected localization bug where Skiff/Caravel tankbutt variant tag specified a size1p5 diameter rather than size2 and remedied the relevant dictionaries.
2024-09-01 17:34:42 +00:00 · 2020-04-24 14:07:29 +01:00 · 2020-04-24 14:07:29 +01:00 · cf4ae24c2e
commit cf4ae24c2e
parent d50c8ad21c
8 changed files with 1435 additions and 1448 deletions
--- a/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg
+++ b/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg
@ -43,8 +43,8 @@ Localization
    #LOC_Restock_variant-engine_boattail_size1p5_white = Boattail (1.875m, White)
    #LOC_Restock_variant-engine_boattail_size1_grey-orange = Boattail (1.25m, Orange/Grey)
    #LOC_Restock_variant-engine_boattail_size1p5_grey-orange = Boattail (1.875m, Orange/Grey)
-	#LOC_Restock_variant-engine_tankbutt_size1p5_white = Tankbutt (2.5m, White)
-    #LOC_Restock_variant-engine_tankbutt_size1p5_grey-orange = Tankbutt (2.5m, 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_boattail_size2_white = Boattail (2.5m, White)
    #LOC_Restock_variant-engine_boattail_size2_grey-orange = Boattail (2.5m, Orange/Grey)
--- a/Distribution/Restock/GameData/ReStock/Localization/es-es.cfg
+++ b/Distribution/Restock/GameData/ReStock/Localization/es-es.cfg
@ -43,8 +43,8 @@ Localization
    #LOC_Restock_variant-engine_boattail_size1p5_white = Cola (1.875m, Blanca)
    #LOC_Restock_variant-engine_boattail_size1_grey-orange = Cola (1.25m, Naranja/Gris)
    #LOC_Restock_variant-engine_boattail_size1p5_grey-orange = Cola (1.875m, Naranja/Gris)
-	#LOC_Restock_variant-engine_tankbutt_size1p5_white = Protector (2.5m, Blanca)
-    #LOC_Restock_variant-engine_tankbutt_size1p5_grey-orange = Protector (2.5m, Naranja/Gris)
+	#LOC_Restock_variant-engine_tankbutt_size2_white = Protector (2.5m, Blanca)
+    #LOC_Restock_variant-engine_tankbutt_size2_grey-orange = Protector (2.5m, Naranja/Gris)

    #LOC_Restock_variant-engine_boattail_size2_white = Cola (2.5m, Blanca)
    #LOC_Restock_variant-engine_boattail_size2_grey-orange = Cola (2.5m, Naranja/Gris)
--- a/Distribution/Restock/GameData/ReStock/Localization/zh-cn.cfg
+++ b/Distribution/Restock/GameData/ReStock/Localization/zh-cn.cfg
@ -40,8 +40,8 @@ Localization
    #LOC_Restock_variant-engine_boattail_size1p5_white = 艇尾型(1.875m，白色)
    #LOC_Restock_variant-engine_boattail_size1_grey-orange = 艇尾型(1.25m，灰色和橙色)
    #LOC_Restock_variant-engine_boattail_size1p5_grey-orange = 艇尾型(1.875m，灰色和橙色)
-    #LOC_Restock_variant-engine_tankbutt_size1p5_white = 箱尾型(2.5m，白色)
-    #LOC_Restock_variant-engine_tankbutt_size1p5_grey-orange = 箱尾型(2.5m，灰色和橙色)
+    #LOC_Restock_variant-engine_tankbutt_size2_white = 箱尾型(2.5m，白色)
+    #LOC_Restock_variant-engine_tankbutt_size2_grey-orange = 箱尾型(2.5m，灰色和橙色)

    #LOC_Restock_variant-engine_shroud_white = 白色外壳
    #LOC_Restock_variant-engine_shroud_grey-orange = 金属外壳
--- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-25.cfg
+++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-25.cfg
@ -2,7 +2,8 @@
 // Contents:
 // - LFB KR-1x2 "Twin-Boar" Liquid Fuel Engine (Size2LFB)
 // - RE-L10 "Poodle" Liquid Fuel Engine (liquidEngine2-2_v2)
-
+// - RE-M3 "Mainsail" Liquid Fuel Engine (liquidEngineMainsail_v2)
+// - RE-I5 "Skipper" Liquid Fuel Engine (engineLargeSkipper_v2)

 // Poodle
@PART[liquidEngine2-2_v2]:HAS[~RestockIgnore[*]]:FOR[ReStock]
@ -915,7 +916,35 @@
  MODULE
  {
    name = ModulePartVariants
-    baseVariant = Full
+    baseVariant = Mid
+	VARIANT
+    {
+      name = Mid
+      displayName = #LOC_Restock_variant-engine_size2_white
+      primaryColor = #999999
+      secondaryColor = #ffffff
+      sizeGroup = GroupB
+      GAMEOBJECTS
+      {
+        Mainsail_25m = true
+        Mainsail_Shroud25White = true
+        Mainsail_Shroud25Orange = false
+        Mainsail_Boattail = false
+        Mainsail_BoattailOrange = false
+        Mainsail_BoattailWhite = false
+        Mainsail_Compact = false
+        Mainsail_ShroudCompactWhite = false
+        Mainsail_ShroudCompactOrange = false
+        Mainsail_Small = false
+        Mainsail_ShroudSmallWhite = false
+        Mainsail_ShroudSmallOrange = false
+
+        fairing = true
+        fairingSmall = false
+        fairingNewSmall = false
+      }
+      
+    }
    VARIANT
    {
      name = Full
@ -944,34 +973,6 @@
        fairingNewSmall = false
      }
      
-    }
-    VARIANT
-    {
-      name = Mid
-      displayName = #LOC_Restock_variant-engine_size2_white
-      primaryColor = #999999
-      secondaryColor = #ffffff
-      sizeGroup = GroupB
-      GAMEOBJECTS
-      {
-        Mainsail_25m = true
-        Mainsail_Shroud25White = true
-        Mainsail_Shroud25Orange = false
-        Mainsail_Boattail = false
-        Mainsail_BoattailOrange = false
-        Mainsail_BoattailWhite = false
-        Mainsail_Compact = false
-        Mainsail_ShroudCompactWhite = false
-        Mainsail_ShroudCompactOrange = false
-        Mainsail_Small = false
-        Mainsail_ShroudSmallWhite = false
-        Mainsail_ShroudSmallOrange = false
-
-        fairing = true
-        fairingSmall = false
-        fairingNewSmall = false
-      }
-      
    }
    VARIANT
    {
@ -1034,9 +1035,32 @@
        node_stack_bottom = 0.0, -1.945, 0.0, 0.0, -1.0, 0.0, 2
      }
    }
+	VARIANT
+    {
+      name = MidAlt
+      displayName = #LOC_Restock_variant-engine_size2_grey-orange
+      primaryColor = #999999
+      secondaryColor = #f69449
+      GAMEOBJECTS
+      {
+        Mainsail_25m = true
+        Mainsail_Shroud25White = false
+        Mainsail_Shroud25Orange = true
+        Mainsail_Boattail = false
+        Mainsail_BoattailOrange = false
+        Mainsail_BoattailWhite = false
+        Mainsail_Compact = false
+        Mainsail_ShroudCompactWhite = false
+        Mainsail_ShroudCompactOrange = false
+        Mainsail_Small = false
+        Mainsail_ShroudSmallWhite = false
+        Mainsail_ShroudSmallOrange = false

-
-
+        fairing = true
+        fairingSmall = false
+        fairingNewSmall = false
+      }
+    }
    VARIANT
    {
      name = FullAlt
@ -1062,34 +1086,6 @@
        fairingSmall = false
        fairingNewSmall = false
      }
-      
-    }
-    VARIANT
-    {
-      name = MidAlt
-      displayName = #LOC_Restock_variant-engine_size2_grey-orange
-      primaryColor = #999999
-      secondaryColor = #f69449
-      GAMEOBJECTS
-      {
-        Mainsail_25m = true
-        Mainsail_Shroud25White = false
-        Mainsail_Shroud25Orange = true
-        Mainsail_Boattail = false
-        Mainsail_BoattailOrange = false
-        Mainsail_BoattailWhite = false
-        Mainsail_Compact = false
-        Mainsail_ShroudCompactWhite = false
-        Mainsail_ShroudCompactOrange = false
-        Mainsail_Small = false
-        Mainsail_ShroudSmallWhite = false
-        Mainsail_ShroudSmallOrange = false
-
-        fairing = true
-        fairingSmall = false
-        fairingNewSmall = false
-      }
-      
    }
    VARIANT
    {
@ -1116,7 +1112,6 @@
        fairingSmall = false
        fairingNewSmall = true
      }
-      
    }
    VARIANT
    {
@ -1449,7 +1444,40 @@
  MODULE
  {
    name = ModulePartVariants
-    baseVariant = Full
+    baseVariant = TrussMount
+	VARIANT
+    {
+      name = TrussMount
+      displayName = #LOC_Restock_variant-engine_size2_white
+      primaryColor = #999999
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        Skipper_25m = true
+        Skipper_ShroudWhite = true
+        Skipper_ShroudOrange = false
+        B_SK_ActuatorsLrgTop = true
+        B_SK_ActuatorsLrg = true
+
+        Skipper_Boattail = false
+        Skipper_BoattailOrange = false
+        Skipper_BoattailWhite = false
+
+        Skipper_Compact = false
+        Skipper_ShroudCompactWhite = false
+        Skipper_ShroudCompactOrange = false
+        B_SK_ActuatorsCpt = false
+
+        Skipper_Small = false
+        Skipper_ShroudSmallWhite = false
+        Skipper_ShroudSmallOrange = false
+        B_SK_ActuatorsSmall = false
+
+        fairing1  = true
+        fairing2  = false
+        Skipper_ShroudSmall = false
+      }
+    }
    VARIANT
    {
      name = Shroud
@ -1483,41 +1511,6 @@
        fairing2  = false
        Skipper_ShroudSmall = false
      }
-
-    }
-    VARIANT
-    {
-      name = TrussMount
-      displayName = #LOC_Restock_variant-engine_size2_white
-      primaryColor = #999999
-      secondaryColor = #ffffff
-      GAMEOBJECTS
-      {
-        Skipper_25m = true
-        Skipper_ShroudWhite = true
-        Skipper_ShroudOrange = false
-        B_SK_ActuatorsLrgTop = true
-        B_SK_ActuatorsLrg = true
-
-        Skipper_Boattail = false
-        Skipper_BoattailOrange = false
-        Skipper_BoattailWhite = false
-
-        Skipper_Compact = false
-        Skipper_ShroudCompactWhite = false
-        Skipper_ShroudCompactOrange = false
-        B_SK_ActuatorsCpt = false
-
-        Skipper_Small = false
-        Skipper_ShroudSmallWhite = false
-        Skipper_ShroudSmallOrange = false
-        B_SK_ActuatorsSmall = false
-
-        fairing1  = true
-        fairing2  = false
-        Skipper_ShroudSmall = false
-      }
-
    }
    VARIANT
    {
@ -1551,7 +1544,6 @@
        fairing2  = false
        Skipper_ShroudSmall = true
      }
-
    }
    VARIANT
    {
@ -1592,6 +1584,39 @@
        node_stack_top = 0.0, 0.583, 0.0, 0.0, 1.0, 0.0, 2
        node_stack_bottom = 0.0, -1.362, 0.0, 0.0, -1.0, 0.0, 2
      }
+    }
+	VARIANT
+    {
+      name = TrussMountAlt
+      displayName = #LOC_Restock_variant-engine_size2_grey-orange
+      primaryColor = #999999
+      secondaryColor = #f69449
+      GAMEOBJECTS
+      {
+        Skipper_25m = true
+        Skipper_ShroudWhite = false
+        Skipper_ShroudOrange = true
+        B_SK_ActuatorsLrgTop = true
+        B_SK_ActuatorsLrg = true
+
+        Skipper_Boattail = false
+        Skipper_BoattailOrange = false
+        Skipper_BoattailWhite = false
+
+        Skipper_Compact = false
+        Skipper_ShroudCompactWhite = false
+        Skipper_ShroudCompactOrange = false
+        B_SK_ActuatorsCpt = false
+
+        Skipper_Small = false
+        Skipper_ShroudSmallWhite = false
+        Skipper_ShroudSmallOrange = false
+        B_SK_ActuatorsSmall = false
+
+        fairing1  = true
+        fairing2  = false
+        Skipper_ShroudSmall = false
+      }
    }
    VARIANT
    {
@ -1626,41 +1651,6 @@
        fairing2  = false
        Skipper_ShroudSmall = false
      }
-
-    }
-    VARIANT
-    {
-      name = TrussMountAlt
-      displayName = #LOC_Restock_variant-engine_size2_grey-orange
-      primaryColor = #999999
-      secondaryColor = #f69449
-      GAMEOBJECTS
-      {
-        Skipper_25m = true
-        Skipper_ShroudWhite = false
-        Skipper_ShroudOrange = true
-        B_SK_ActuatorsLrgTop = true
-        B_SK_ActuatorsLrg = true
-
-        Skipper_Boattail = false
-        Skipper_BoattailOrange = false
-        Skipper_BoattailWhite = false
-
-        Skipper_Compact = false
-        Skipper_ShroudCompactWhite = false
-        Skipper_ShroudCompactOrange = false
-        B_SK_ActuatorsCpt = false
-
-        Skipper_Small = false
-        Skipper_ShroudSmallWhite = false
-        Skipper_ShroudSmallOrange = false
-        B_SK_ActuatorsSmall = false
-
-        fairing1  = true
-        fairing2  = false
-        Skipper_ShroudSmall = false
-      }
-
    }
    VARIANT
    {
@ -1694,7 +1684,6 @@
        fairing2  = false
        Skipper_ShroudSmall = true
      }
-
    }
    VARIANT
    {
@ -1736,7 +1725,6 @@
        node_stack_bottom = 0.0, -1.362, 0.0, 0.0, -1.0, 0.0, 2
      }
    }
-
  }

  @MODULE[ModuleJettison]
--- a/Distribution/Restock/GameData/ReStock/PatchesMH/Engine/restock-mh-engines-1875.cfg
+++ b/Distribution/Restock/GameData/ReStock/PatchesMH/Engine/restock-mh-engines-1875.cfg
--- a/Distribution/Restock/GameData/ReStock/PatchesMH/Engine/restock-mh-engines-25.cfg
+++ b/Distribution/Restock/GameData/ReStock/PatchesMH/Engine/restock-mh-engines-25.cfg
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/1875/restock-engine-caravel.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/1875/restock-engine-caravel.cfg
@ -1,5 +1,5 @@
 // ReStock+ 0.2.0
-// 1.875m sustainer
+// 2.5m sustainer
 PART
 {
 	name = restock-engine-caravel-1
@ -172,15 +172,15 @@ PART
  MODULE
  {
    name = ModulePartVariants
-    baseVariant = Size1p5
+    baseVariant = Shroud
    VARIANT
    {
      // AKA 2.5m boattail (wtf)
      name = Shroud
-      displayName =  #autoLOC_8007104
+      displayName =  #LOC_Restock_variant-engine_tankbutt_size2_white
      themeName = Shroud
      primaryColor = #999999
-      secondaryColor = #111111
+      secondaryColor = #ffffff
      sizeGroup = GroupA
      GAMEOBJECTS
      {
@ -212,8 +212,8 @@ PART
    {
      name = Size1p5
      displayName = #LOC_Restock_variant-engine_size1p5_white
-      primaryColor = #999999
-      secondaryColor = #f69449
+      primaryColor = #666666
+      secondaryColor = #ffffff
      GAMEOBJECTS
      {
        SkiffBoattail = false
@ -243,8 +243,8 @@ PART
    {
      name = Size1
      displayName = #LOC_Restock_variant-engine_size1_white
-      primaryColor = #999999
-      secondaryColor = #f69449
+      primaryColor = #333333
+      secondaryColor = #ffffff
      GAMEOBJECTS
      {
        SkiffBoattail = false
@ -275,8 +275,8 @@ PART
      name = Bare
      displayName = #LOC_Restock_variant-engine_compact_white
      themeName = Bare
-      primaryColor = #999999
-      secondaryColor = #999999
+      primaryColor = #111111
+      secondaryColor = #ffffff
      GAMEOBJECTS
      {
        SkiffBoattail = false
@ -306,10 +306,10 @@ PART
    {
      // AKA 2.5m boattail (wtf)
      name = Shroud_Alternate
-      displayName =  #autoLOC_8007104
+      displayName =  #LOC_Restock_variant-engine_tankbutt_size2_grey-orange
      themeName = Shroud
      primaryColor = #999999
-      secondaryColor = #111111
+      secondaryColor = #f69449
      sizeGroup = GroupA
      GAMEOBJECTS
      {
@ -339,7 +339,7 @@ PART
    {
      name = Size1p5_Alternate
      displayName = #LOC_Restock_variant-engine_size1p5_grey-orange
-      primaryColor = #999999
+      primaryColor = #666666
      secondaryColor = #f69449
      GAMEOBJECTS
      {
@ -370,7 +370,7 @@ PART
    {
      name = Size1_Alternate
      displayName = #LOC_Restock_variant-engine_size1_grey-orange
-      primaryColor = #999999
+      primaryColor = #333333
      secondaryColor = #f69449
      GAMEOBJECTS
      {
@ -402,8 +402,8 @@ PART
      name = Bare_Alternate
      displayName = #LOC_Restock_variant-engine_compact_grey-orange
      themeName = Bare
-      primaryColor = #999999
-      secondaryColor = #999999
+      primaryColor = #111111
+      secondaryColor = #f69449
      GAMEOBJECTS
      {
        SkiffBoattail = false
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/1875/restock-engine-galleon.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/1875/restock-engine-galleon.cfg
@ -1,5 +1,5 @@
 // ReStock+ 1.1.0
-// 1.875m  BOOSTER OF BOOSTERS
+// 2.5m  BOOSTER OF BOOSTERS
 PART
 {
 	name = restock-engine-galleon-1
@ -380,13 +380,50 @@ PART
  MODULE
  {
    name = ModulePartVariants
-    baseVariant = Mid
+    baseVariant = 25Ring
+	VARIANT
+    {
+      name = 25Ring
+      displayName = #LOC_Restock_variant-engine_size2_white
+      primaryColor = #cccccc
+      secondaryColor = #ffffff
+      sizeGroup = GroupB
+      GAMEOBJECTS
+      {
+        B_F1_25 = true
+        B_F1_1875 = false
+        B_F1_Boattail = false
+        B_F1_Boattail375 = false
+        B_F1_Compact = false
+        Shroud2x2 = false
+        Shroud2x3 = false
+        Shroud2x4 = false
+        Shroud25 = true
+        Shroud25BoatWhite = false
+        Shroud25BoatGrey = false
+        Shroud25White = true
+        Shroud25Grey = false
+        Shroud1875White = false
+        Shroud1875Grey = false
+        ShroudCptWhite = false
+        ShroudCptGrey = false
+        375MountBoatWhite = false
+        375MountBoatOrange = false
+        25MountBoatWhite = false
+        25MountBoatOrange = false
+      }
+      NODES
+      {
+        node_stack_top = 0.0, 0.2, 0.0, 0.0, 1.0, 0.0, 2
+        node_stack_bottom = 0.0, -2.5, 0.0, 0.0, -1.0, 0.0, 2
+      }
+    }
    VARIANT
    {
      name = Full
      displayName = #LOC_Restock_variant-engine_boattail_size2_white
-      primaryColor = #ffffff
-      secondaryColor = #494c49
+      primaryColor = #999999
+      secondaryColor = #ffffff
      sizeGroup = GroupA
      GAMEOBJECTS
      {
@ -416,13 +453,50 @@ PART
      {
        node_stack_bottom = 0.0, -2.95, 0.0, 0.0, -1.0, 0.0, 2
      }
+    }
+	VARIANT
+    {
+      name = 375Boat
+      displayName = #LOC_Restock_variant-engine_boattail_size3_white
+      primaryColor = #666666
+      secondaryColor = #ffffff
+      sizeGroup = GroupB
+      GAMEOBJECTS
+      {
+        B_F1_25 = false
+        B_F1_1875 = false
+        B_F1_Boattail = false
+        B_F1_Boattail375 = true
+        B_F1_Compact = false
+        Shroud2x2 = false
+        Shroud2x3 = false
+        Shroud2x4 = false
+        Shroud25 = false
+        Shroud25BoatWhite = false
+        Shroud25BoatGrey = false
+        Shroud25White = false
+        Shroud25Grey = false
+        Shroud1875White = false
+        Shroud1875Grey = false
+        ShroudCptWhite = false
+        ShroudCptGrey = false
+        375MountBoatWhite = true
+        375MountBoatOrange = false
+        25MountBoatWhite = false
+        25MountBoatOrange = false
+      }
+      NODES
+      {
+        node_stack_top = 0.0, 0.2, 0.0, 0.0, 1.0, 0.0, 2
+        node_stack_bottom = 0.0, -2.5, 0.0, 0.0, -1.0, 0.0, 2
+      }
    }
    VARIANT
    {
      name = Mid
      displayName = #LOC_Restock_variant-engine_size1p5_white
-      primaryColor = #494c49
-      secondaryColor = #707070
+      primaryColor = #333333
+      secondaryColor = #ffffff
      sizeGroup = GroupB
      GAMEOBJECTS
      {
@ -459,8 +533,8 @@ PART
      name = Bare
      displayName = #LOC_Restock_variant-engine_compact_white
      themeName = Bare
-      primaryColor = #707070
-      secondaryColor = #707070
+      primaryColor = #7111111
+      secondaryColor = #ffffff
      sizeGroup = GroupC
      GAMEOBJECTS
      {
@ -492,31 +566,36 @@ PART
        node_stack_bottom = 0.0, -2.5, 0.0, 0.0, -1.0, 0.0, 2
      }
    }
-    VARIANT
+	VARIANT
    {
-      name = 25Ring
-      displayName = #LOC_Restock_variant-engine_size2_white
-      primaryColor = #494c49
-      secondaryColor = #707070
+      name = 25RingAlt
+      displayName =  #LOC_Restock_variant-engine_size2_grey-orange
+      primaryColor = #3b572a
+      secondaryColor = #f69449
      sizeGroup = GroupB
      GAMEOBJECTS
      {
+        // Engine Core
        B_F1_25 = true
        B_F1_1875 = false
        B_F1_Boattail = false
        B_F1_Boattail375 = false
        B_F1_Compact = false
+
+        // Shroud bases
        Shroud2x2 = false
        Shroud2x3 = false
        Shroud2x4 = false
        Shroud25 = true
+
+        // Actual shroud colour objects
        Shroud25BoatWhite = false
-        Shroud25BoatGrey = false
-        Shroud25White = true
-        Shroud25Grey = false
-        Shroud1875White = false
-        Shroud1875Grey = false
-        ShroudCptWhite = false
+        Shroud25BoatGrey= false
+        Shroud25White= false
+        Shroud25Grey= true
+        Shroud1875White= false
+        Shroud1875Grey= false
+        ShroudCptWhite= false
        ShroudCptGrey = false
        375MountBoatWhite = false
        375MountBoatOrange = false
@ -530,47 +609,10 @@ PART
      }
    }
    VARIANT
-    {
-      name = 375Boat
-      displayName = #LOC_Restock_variant-engine_boattail_size3_white
-      primaryColor = #ffffff
-      secondaryColor = #000000
-      sizeGroup = GroupB
-      GAMEOBJECTS
-      {
-        B_F1_25 = false
-        B_F1_1875 = false
-        B_F1_Boattail = false
-        B_F1_Boattail375 = true
-        B_F1_Compact = false
-        Shroud2x2 = false
-        Shroud2x3 = false
-        Shroud2x4 = false
-        Shroud25 = false
-        Shroud25BoatWhite = false
-        Shroud25BoatGrey = false
-        Shroud25White = false
-        Shroud25Grey = false
-        Shroud1875White = false
-        Shroud1875Grey = false
-        ShroudCptWhite = false
-        ShroudCptGrey = false
-        375MountBoatWhite = true
-        375MountBoatOrange = false
-        25MountBoatWhite = false
-        25MountBoatOrange = false
-      }
-      NODES
-      {
-        node_stack_top = 0.0, 0.2, 0.0, 0.0, 1.0, 0.0, 2
-        node_stack_bottom = 0.0, -2.5, 0.0, 0.0, -1.0, 0.0, 2
-      }
-    }
-    VARIANT
    {
      name = FullAlt
      displayName = #LOC_Restock_variant-engine_boattail_size2_grey-orange
-      primaryColor = #494c49
+      primaryColor = #35472b
      secondaryColor = #f69449
      sizeGroup = GroupA
      GAMEOBJECTS
@ -599,20 +641,63 @@ PART
        ShroudCptGrey = false
        375MountBoatWhite = false
        375MountBoatOrange = false
-        25MountBoatWhite = true
-        25MountBoatOrange = false
+        25MountBoatWhite = false
+        25MountBoatOrange = true
      }
      NODES
      {
        node_stack_bottom = 0.0, -2.95, 0.0, 0.0, -1.0, 0.0, 2
      }
+    }
+	VARIANT
+    {
+      name = 375BoatAlt
+      displayName =   #LOC_Restock_variant-engine_boattail_size3_grey-orange
+      primaryColor = #2c3626
+      secondaryColor = #f69449
+      sizeGroup = GroupB
+      GAMEOBJECTS
+      {
+        // Engine Core
+        B_F1_25 = false
+        B_F1_1875 = false
+        B_F1_Boattail = false
+        B_F1_Boattail375 = true
+        B_F1_Compact = false
+
+        // Shroud bases
+        Shroud2x2 = false
+        Shroud2x3 = false
+        Shroud2x4 = false
+        Shroud25 = false
+
+        // Actual shroud colour objects
+        Shroud25BoatWhite = false
+        Shroud25BoatGrey= false
+        Shroud25White= false
+        Shroud25Grey= false
+        Shroud1875White= false
+        Shroud1875Grey= false
+        ShroudCptWhite= false
+        ShroudCptGrey = false
+
+        375MountBoatWhite = false
+        375MountBoatOrange = true
+        25MountBoatWhite = false
+        25MountBoatOrange = false 
+      }
+      NODES
+      {
+        node_stack_top = 0.0, 0.2, 0.0, 0.0, 1.0, 0.0, 2
+        node_stack_bottom = 0.0, -2.5, 0.0, 0.0, -1.0, 0.0, 2
+      }
    }
    VARIANT
    {
      name = MidAlt
      displayName = #LOC_Restock_variant-engine_size1p5_grey-orange
-      primaryColor = #f69449
-      secondaryColor = #999999
+      primaryColor = #20241d
+      secondaryColor = #f69449
      sizeGroup = GroupB
      GAMEOBJECTS
      {
@ -654,8 +739,8 @@ PART
      name = BareAlt
      displayName =  #LOC_Restock_variant-engine_compact_grey-orange
      themeName = Bare
-      primaryColor = #999999
-      secondaryColor = #cecece
+      primaryColor = #111211
+      secondaryColor = #f69449
      sizeGroup = GroupC
      GAMEOBJECTS
      {
@ -692,91 +777,6 @@ PART
        node_stack_bottom = 0.0, -2.5, 0.0, 0.0, -1.0, 0.0, 2
      }
    }
-    VARIANT
-    {
-      name = 25RingAlt
-      displayName =  #LOC_Restock_variant-engine_size2_grey-orange
-      primaryColor = #f69449
-      secondaryColor = #999999
-      sizeGroup = GroupB
-      GAMEOBJECTS
-      {
-        // Engine Core
-        B_F1_25 = true
-        B_F1_1875 = false
-        B_F1_Boattail = false
-        B_F1_Boattail375 = false
-        B_F1_Compact = false
-
-        // Shroud bases
-        Shroud2x2 = false
-        Shroud2x3 = false
-        Shroud2x4 = false
-        Shroud25 = true
-
-        // Actual shroud colour objects
-        Shroud25BoatWhite = false
-        Shroud25BoatGrey= false
-        Shroud25White= false
-        Shroud25Grey= true
-        Shroud1875White= false
-        Shroud1875Grey= false
-        ShroudCptWhite= false
-        ShroudCptGrey = false
-        375MountBoatWhite = false
-        375MountBoatOrange = false
-        25MountBoatWhite = false
-        25MountBoatOrange = false
-      }
-      NODES
-      {
-        node_stack_top = 0.0, 0.2, 0.0, 0.0, 1.0, 0.0, 2
-        node_stack_bottom = 0.0, -2.5, 0.0, 0.0, -1.0, 0.0, 2
-      }
-    }
-    VARIANT
-    {
-      name = 375BoatAlt
-      displayName =   #LOC_Restock_variant-engine_boattail_size3_grey-orange
-      primaryColor = #3a562a
-      secondaryColor = #f69449
-      sizeGroup = GroupB
-      GAMEOBJECTS
-      {
-        // Engine Core
-        B_F1_25 = false
-        B_F1_1875 = false
-        B_F1_Boattail = false
-        B_F1_Boattail375 = true
-        B_F1_Compact = false
-
-        // Shroud bases
-        Shroud2x2 = false
-        Shroud2x3 = false
-        Shroud2x4 = false
-        Shroud25 = false
-
-        // Actual shroud colour objects
-        Shroud25BoatWhite = false
-        Shroud25BoatGrey= false
-        Shroud25White= false
-        Shroud25Grey= false
-        Shroud1875White= false
-        Shroud1875Grey= false
-        ShroudCptWhite= false
-        ShroudCptGrey = false
-
-        375MountBoatWhite = false
-        375MountBoatOrange = true
-        25MountBoatWhite = false
-        25MountBoatOrange = false 
-      }
-      NODES
-      {
-        node_stack_top = 0.0, 0.2, 0.0, 0.0, 1.0, 0.0, 2
-        node_stack_bottom = 0.0, -2.5, 0.0, 0.0, -1.0, 0.0, 2
-      }
-    }
  }
  MODULE
  {