Improve variant scheme consistency

5 years ago · d9f1454524
parent 6d19b7e060
commit d9f1454524
12 changed files with 199 additions and 193 deletions
--- a/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg
+++ b/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg
@ -18,11 +18,11 @@ Localization
    #LOC_Restock_variant-engine_size0_white = 0.625m (White Shroud)
    #LOC_Restock_variant-engine_size0_grey-orange = 0.625m (Orange/Grey Shroud)
    #LOC_Restock_variant-engine_size1 = 1.25m
-    #LOC_Restock_variant-engine_size1_white = 1.25m  (White Shroud)
+    #LOC_Restock_variant-engine_size1_white = 1.25m (White Shroud)
    #LOC_Restock_variant-engine_size1_grey-orange = 1.25m (Orange/Grey Shroud)
    #LOC_Restock_variant-engine_size1p5 = 1.875m
-    #LOC_Restock_variant-engine_size1p5_white = 1.875m  (White Shroud)
-    #LOC_Restock_variant-engine_size1p5_grey-orange = 1.875m  (Orange/Grey Shroud)
+    #LOC_Restock_variant-engine_size1p5_white = 1.875m (White Shroud)
+    #LOC_Restock_variant-engine_size1p5_grey-orange = 1.875m (Orange/Grey Shroud)
    #LOC_Restock_variant-engine_size2 = 2.5m
    #LOC_Restock_variant-engine_size2_white = 2.5m (White Shroud)
    #LOC_Restock_variant-engine_size2_grey-orange = 2.5m (Orange/Grey Shroud)
@ -33,13 +33,15 @@ Localization
    #LOC_Restock_variant-engine_radial = Radial
    #LOC_Restock_variant-engine_boattail = Boattail
    #LOC_Restock_variant-engine_boattail_white = Boattail (White)
-    #LOC_Restock_variant-engine_boattail_grey-orange = Boattail  (Orange/Grey)
+    #LOC_Restock_variant-engine_boattail_grey-orange = Boattail (Orange/Grey)
    #LOC_Restock_variant-engine_boattail_size1 = Boattail (1.25m)
    #LOC_Restock_variant-engine_boattail_size1p5 = Boattail (1.875m)
    #LOC_Restock_variant-engine_boattail_size1_white = Boattail (1.25m, White)
    #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 (1.875m, White)
+    #LOC_Restock_variant-engine_tankbutt_size1p5_grey-orange = Tankbutt (1.875m, Orange/Grey)

    #LOC_Restock_variant-engine_shroud_white = White Shroud
    #LOC_Restock_variant-engine_shroud_grey-orange = Metallic Shroud
@ -76,11 +78,13 @@ Localization
    #LOC_Restock_variant-surface_basic = Basic
    #LOC_Restock_variant-surface_truss = Truss
    #LOC_Restock_variant-surface_thermalblankets = Insulated
+	
+    #LOC_Restock_variant-decoupler_metal = Metal
+    #LOC_Restock_variant-decoupler_grey-orange = Orange/Grey

    #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
--- a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-fuelcells.cfg
+++ b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-fuelcells.cfg
@ -19,6 +19,7 @@
@PART[FuelCellArray]:HAS[~RestockIgnore[*]]:FOR[ReStock]
 {
  @author = Andrew Cassidy
+  @description = #LOC_Restock_description-FuelCellArray

  !MODEL {}
  MODEL
--- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-0625.cfg
+++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-0625.cfg
@ -577,7 +577,7 @@
    {
      name = Size0
      displayName = #LOC_Restock_variant-engine_size0_grey-orange
-      primaryColor = #666666
+      primaryColor = #999999
      secondaryColor = #f69449
      GAMEOBJECTS
      {
--- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-125.cfg
+++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-125.cfg
@ -685,7 +685,7 @@
      name = Size1
      displayName = #LOC_Restock_variant-engine_size1_white
      primaryColor = #999999
-      secondaryColor = #ffb80c
+      secondaryColor = #ffffff
      GAMEOBJECTS
      {
        LV_909_Boattail = false
@ -707,7 +707,7 @@
      name = Boattail
      displayName = #LOC_Restock_variant-engine_boattail_white
      primaryColor = #ffffff
-      secondaryColor = #ffb80c
+      secondaryColor = #ffffff
      GAMEOBJECTS
      {
        LV_909_Boattail = true
@ -728,8 +728,8 @@
    {
      name = Compact
      displayName = #LOC_Restock_variant-engine_compact_white
-      primaryColor = #999999
-      secondaryColor = #999999
+      primaryColor = #666666
+      secondaryColor = #ffffff
      GAMEOBJECTS
      {
        LV_909_Boattail = false
@ -750,8 +750,8 @@
    {
      name = Size1_Alternate
      displayName = #LOC_Restock_variant-engine_size1_grey-orange
-      primaryColor = #666666
-      secondaryColor = #ffb80c
+      primaryColor = #999999
+      secondaryColor = #f69449
      GAMEOBJECTS
      {
        LV_909_Boattail = false
@ -773,7 +773,7 @@
      name = Boattail_Alternate
      displayName = #LOC_Restock_variant-engine_boattail_grey-orange
      primaryColor = #666666
-      secondaryColor = #ffb80c
+      secondaryColor = #666666
      GAMEOBJECTS
      {
        LV_909_Boattail = true
@ -794,8 +794,8 @@
    {
      name = Compact_Alternate
      displayName = #LOC_Restock_variant-engine_compact_grey-orange
-      primaryColor = #6f6e6d
-      secondaryColor = #999999
+      primaryColor = #666666
+      secondaryColor = #f69449
      GAMEOBJECTS
      {
        LV_909_Boattail = false
@ -1039,7 +1039,7 @@
      name = Size1
      displayName = #LOC_Restock_variant-engine_size1_white
      primaryColor = #999999
-      secondaryColor = #ffb80c
+      secondaryColor = #ffffff
      GAMEOBJECTS
      {
        LV_T30_Basic = true
@ -1061,7 +1061,7 @@
      name = Boattail
      displayName = #LOC_Restock_variant-engine_boattail_white
      primaryColor = #ffffff
-      secondaryColor = #ffb80c
+      secondaryColor = #ffffff
      GAMEOBJECTS
      {
        LV_T30_Basic = false
@ -1082,8 +1082,8 @@
    {
      name = Compact
      displayName = #LOC_Restock_variant-engine_compact_white
-      primaryColor = #999999
-      secondaryColor = #999999
+      primaryColor = #666666
+      secondaryColor = #ffffff
      GAMEOBJECTS
      {
        LV_T30_Basic = false
@ -1104,8 +1104,8 @@
    {
      name = Size1_Alternate
      displayName = #LOC_Restock_variant-engine_size1_grey-orange
-      primaryColor = #6f6e6d
-      secondaryColor = #ffb80c
+      primaryColor = #999999
+      secondaryColor = #f69449
      GAMEOBJECTS
      {
        LV_T30_Basic = true
@ -1127,7 +1127,7 @@
      name = Boattail_Alternate
      displayName = #LOC_Restock_variant-engine_boattail_grey-orange
      primaryColor = #666666
-      secondaryColor = #ffb80c
+      secondaryColor = #666666
      GAMEOBJECTS
      {
        LV_T30_Basic = false
@ -1148,8 +1148,8 @@
    {
      name = Compact_Alternate
      displayName = #LOC_Restock_variant-engine_compact_grey-orange
-      primaryColor = #6f6e6d
-      secondaryColor = #999999
+      primaryColor = #666666
+      secondaryColor = #f69449
      GAMEOBJECTS
      {
        LV_T30_Basic = false
@ -1378,7 +1378,7 @@
      name = Size1
      displayName = #LOC_Restock_variant-engine_size1_white
      primaryColor = #999999
-      secondaryColor = #ffb80c
+      secondaryColor = #ffffff
      GAMEOBJECTS
      {
        LV_T45_Boattail = false
@ -1406,7 +1406,7 @@
      name = Boattail
      displayName = #LOC_Restock_variant-engine_boattail_white
      primaryColor = #ffffff
-      secondaryColor = #ffb80c
+      secondaryColor = #ffffff
      GAMEOBJECTS
      {
        LV_T45_Boattail = true
@ -1433,8 +1433,8 @@
    {
      name = Compact
      displayName = #LOC_Restock_variant-engine_compact_white
-      primaryColor = #999999
-      secondaryColor = #999999
+      primaryColor = #666666
+      secondaryColor = #ffffff
      GAMEOBJECTS
      {
        LV_T45_Boattail = false
@ -1461,8 +1461,8 @@
    {
      name = Size1_Alternate
      displayName = #LOC_Restock_variant-engine_size1_grey-orange
-      primaryColor = #666666
-      secondaryColor = #ffb80c
+      primaryColor = #999999
+      secondaryColor = #f69449
      GAMEOBJECTS
      {
        LV_T45_Boattail = false
@ -1490,7 +1490,7 @@
      name = Boattail_Alternate
      displayName = #LOC_Restock_variant-engine_boattail_grey-orange
      primaryColor = #666666
-      secondaryColor = #ffb80c
+      secondaryColor = #666666
      GAMEOBJECTS
      {
        LV_T45_Boattail = true
@ -1518,8 +1518,8 @@
    {
      name = Compact_Alternate
      displayName = #LOC_Restock_variant-engine_compact_grey-orange
-      primaryColor = #6f6e6d
-      secondaryColor = #999999
+      primaryColor = #666666
+      secondaryColor = #f69449
      GAMEOBJECTS
      {
        LV_T45_Boattail = false
--- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-25.cfg
+++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-25.cfg
@ -261,7 +261,7 @@
      name = Size2
      displayName = #LOC_Restock_variant-engine_size2_white
      primaryColor = #999999
-      secondaryColor = #f69449
+      secondaryColor = #ffffff
      GAMEOBJECTS
      {
        Mainsail_Boattail = false
@ -282,7 +282,7 @@
      name = Boattail
      displayName = #LOC_Restock_variant-engine_boattail_white
      primaryColor = #ffffff
-      secondaryColor = #f69449
+      secondaryColor = #ffffff
      GAMEOBJECTS
      {
        Mainsail_Boattail = true
@ -302,8 +302,8 @@
    {
      name = Compact
      displayName = #LOC_Restock_variant-engine_compact_white
-      primaryColor = #999999
-      secondaryColor = #999999
+      primaryColor = #666666
+      secondaryColor = #ffffff
      GAMEOBJECTS
      {
        Mainsail_Boattail = false
@ -323,8 +323,8 @@
    {
      name = Size2_Alternate
      displayName = #LOC_Restock_variant-engine_size2_grey-orange
-      primaryColor = #666666
-      secondaryColor = #666666
+      primaryColor = #999999
+      secondaryColor = #f69449
      GAMEOBJECTS
      {
        Mainsail_Boattail = false
@ -345,7 +345,7 @@
      name = Boattail_Alternate
      displayName = #LOC_Restock_variant-engine_boattail_grey-orange
      primaryColor = #666666
-      secondaryColor = #f69449
+      secondaryColor = #666666
      GAMEOBJECTS
      {
        Mainsail_Boattail = true
@ -366,7 +366,7 @@
      name = Compact_Alternate
      displayName = #LOC_Restock_variant-engine_compact_grey-orange
      primaryColor = #666666
-      secondaryColor = #999999
+      secondaryColor = #f69449
      GAMEOBJECTS
      {
        Mainsail_Boattail = false
@ -688,8 +688,8 @@
    {
      name = Size2
      displayName = #LOC_Restock_variant-engine_size2_white
-      primaryColor = #ffffff
-      secondaryColor = #f69449
+      primaryColor = #999999
+      secondaryColor = #ffffff
      GAMEOBJECTS
      {
        Poodle_25 = true
@ -710,8 +710,8 @@
    {
      name = Compact
      displayName = #LOC_Restock_variant-engine_compact_white
-      primaryColor = #999999
-      secondaryColor = #999999
+      primaryColor = #666666
+      secondaryColor = #ffffff
      GAMEOBJECTS
      {
        Poodle_25 = false
@ -732,7 +732,7 @@
    {
      name = Size2_Alternate
      displayName = #LOC_Restock_variant-engine_size2_grey-orange
-      primaryColor = #666666
+      primaryColor = #999999
      secondaryColor = #f69449
      GAMEOBJECTS
      {
@ -755,7 +755,7 @@
      name = Compact_Alternate
      displayName = #LOC_Restock_variant-engine_compact_grey-orange
      primaryColor = #666666
-      secondaryColor = #999999
+      secondaryColor = #f69449
      GAMEOBJECTS
      {
        Poodle_25 = false
@ -1049,7 +1049,7 @@
      name = Size2
      displayName = #LOC_Restock_variant-engine_size2_white
      primaryColor = #999999
-      secondaryColor = #f69449
+      secondaryColor = #ffffff
      GAMEOBJECTS
      {
        ActutatorCpt_Bottom001 = false
@ -1076,7 +1076,7 @@
      name = Boattail
      displayName = #LOC_Restock_variant-engine_boattail_white
      primaryColor = #ffffff
-      secondaryColor = #f69449
+      secondaryColor = #ffffff
      GAMEOBJECTS
      {
        ActutatorCpt_Bottom001 = false
@ -1102,8 +1102,8 @@
    {
      name = Compact
      displayName = #LOC_Restock_variant-engine_compact_white
-      primaryColor = #999999
-      secondaryColor = #999999
+      primaryColor = #666666
+      secondaryColor = #ffffff
      GAMEOBJECTS
      {
        ActutatorCpt_Bottom001 = true
@ -1129,7 +1129,7 @@
    {
      name = Size2_Alternate
      displayName = #LOC_Restock_variant-engine_size2_grey-orange
-      primaryColor = #666666
+      primaryColor = #999999
      secondaryColor = #f69449
      GAMEOBJECTS
      {
@ -1157,7 +1157,7 @@
      name = Boattail_Alternate
      displayName = #LOC_Restock_variant-engine_boattail_grey-orange
      primaryColor = #666666
-      secondaryColor = #f69449
+      secondaryColor = #666666
      GAMEOBJECTS
      {
        ActutatorCpt_Bottom001 = false
@ -1184,7 +1184,7 @@
      name = Compact_Alternate
      displayName = #LOC_Restock_variant-engine_compact_grey-orange
      primaryColor = #666666
-      secondaryColor = #999999
+      secondaryColor = #f69449
      GAMEOBJECTS
      {
        ActutatorCpt_Bottom001 = true
--- a/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-decouplers.cfg
+++ b/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-decouplers.cfg
@ -87,9 +87,9 @@
    VARIANT
    {
      name = Gray
-      displayName = #autoLOC_8007101
-      primaryColor = #212121
-      secondaryColor = #212121
+      displayName = #LOC_Restock_variant-decoupler_metal
+      primaryColor = #999999
+      secondaryColor = #666666
      themeName = Gray
      GAMEOBJECTS
      {
@ -100,9 +100,9 @@
    VARIANT
    {
      name = Orange
-      displayName = #autoLOC_8007100 // autoLOC_8007100 = Orange
-      primaryColor = #dc5a28
-      secondaryColor = #dc5a28
+      displayName = #LOC_Restock_variant-decoupler_grey-orange
+      primaryColor = #666666
+      secondaryColor = #f69449
      themeName = Orange
      GAMEOBJECTS
      {
--- a/Distribution/Restock/GameData/ReStock/PatchesMH/Engine/restock-mh-engines-1875.cfg
+++ b/Distribution/Restock/GameData/ReStock/PatchesMH/Engine/restock-mh-engines-1875.cfg
@ -105,39 +105,40 @@
 MODULE
  {
    name = ModulePartVariants
-    baseVariant = Size1p5Bare
+    baseVariant = Size1Bare
    VARIANT
    {
-      name = Bare
-      displayName =  #LOC_Restock_variant-engine_compact_white
+      // 1.25 bare
+      name = Size1Bare
+      displayName =  #LOC_Restock_variant-engine_size1_white
      primaryColor = #999999
-      secondaryColor = #999999
+      secondaryColor = #ffffff
      GAMEOBJECTS
      {
        Kodiak1875 = false
-        Kodiak125 = false
-        KodiakCompact = true
+        Kodiak125 = true
+        KodiakCompact = false
        UrsaBoattail125 = false
        UrsaBoattail1875 = false
        UrsaBoattailCommon = false
        UrsaShroud1875 = false
-        UrsaShroud125 = false
-        Shroud1p5x2 = true
+        UrsaShroud125 = true
+        Shroud1p5x2 = false
        Shroud1x0 = false
        Shroud1p5x0 = false

        UrsaShroud1875White = false
        UrsaShroud1875Orange = false
-        UrsaShroud125White = false
+        UrsaShroud125White = true
        UrsaShroud125Orange = false
-        Shroud1p5x2White = true
+        Shroud1p5x2White = false
        Shroud1p5x2Orange = false
        UrsaBoattail1875Orange = false
        UrsaBoattail125Orange = false
      }
      NODES
      {
-        node_stack_bottom = 0.0, -1.125, 0.0, 0.0, -1.0, 0.0, 1
+        node_stack_bottom = 0.0, -1.292, 0.0, 0.0, -1.0, 0.0, 1
      }
    }
    VARIANT
@ -146,7 +147,7 @@
      name = ShroudSmall
      displayName =  #LOC_Restock_variant-engine_boattail_size1_white
      primaryColor = #ffffff
-      secondaryColor = #f69449
+      secondaryColor = #ffffff
      GAMEOBJECTS
      {
        Kodiak1875 = false
@ -177,28 +178,28 @@
    }
    VARIANT
    {
-      // 1.25 bare
-      name = Size1Bare
-      displayName =  #LOC_Restock_variant-engine_size1_white
+      // 1.875 bare
+      name = Size1p5Bare
+      displayName =  #LOC_Restock_variant-engine_size1p5_white
      primaryColor = #999999
-      secondaryColor = #f69449
+      secondaryColor = #ffffff
      GAMEOBJECTS
      {
-        Kodiak1875 = false
-        Kodiak125 = true
+        Kodiak1875 = true
+        Kodiak125 = false
        KodiakCompact = false
        UrsaBoattail125 = false
        UrsaBoattail1875 = false
        UrsaBoattailCommon = false
-        UrsaShroud1875 = false
-        UrsaShroud125 = true
+        UrsaShroud1875 = true
+        UrsaShroud125 = false
        Shroud1p5x2 = false
        Shroud1x0 = false
        Shroud1p5x0 = false

-        UrsaShroud1875White = false
+        UrsaShroud1875White = true
        UrsaShroud1875Orange = false
-        UrsaShroud125White = true
+        UrsaShroud125White = false
        UrsaShroud125Orange = false
        Shroud1p5x2White = false
        Shroud1p5x2Orange = false
@ -207,7 +208,7 @@
      }
      NODES
      {
-        node_stack_bottom = 0.0, -1.292, 0.0, 0.0, -1.0, 0.0, 1
+        node_stack_bottom = 0.0, -1.3, 0.0, 0.0, -1.0, 0.0, 1
      }
    }
    VARIANT
@ -216,7 +217,7 @@
      name = ShroudBig
      displayName = #LOC_Restock_variant-engine_boattail_size1p5_white
      primaryColor = #ffffff
-      secondaryColor = #f69449
+      secondaryColor = #ffffff
      sizeGroup = GroupB
      GAMEOBJECTS
      {
@ -248,71 +249,71 @@
    }
    VARIANT
    {
-      // 1.875 bare
-      name = Size1p5Bare
-      displayName =  #LOC_Restock_variant-engine_size1p5_white
-      primaryColor = #999999
-      secondaryColor = #f69449
+      name = Bare
+      displayName =  #LOC_Restock_variant-engine_compact_white
+      primaryColor = #666666
+      secondaryColor = #999999
      GAMEOBJECTS
      {
-        Kodiak1875 = true
+        Kodiak1875 = false
        Kodiak125 = false
-        KodiakCompact = false
+        KodiakCompact = true
        UrsaBoattail125 = false
        UrsaBoattail1875 = false
        UrsaBoattailCommon = false
-        UrsaShroud1875 = true
+        UrsaShroud1875 = false
        UrsaShroud125 = false
-        Shroud1p5x2 = false
+        Shroud1p5x2 = true
        Shroud1x0 = false
        Shroud1p5x0 = false

-        UrsaShroud1875White = true
+        UrsaShroud1875White = false
        UrsaShroud1875Orange = false
        UrsaShroud125White = false
        UrsaShroud125Orange = false
-        Shroud1p5x2White = false
+        Shroud1p5x2White = true
        Shroud1p5x2Orange = false
        UrsaBoattail1875Orange = false
        UrsaBoattail125Orange = false
      }
      NODES
      {
-        node_stack_bottom = 0.0, -1.3, 0.0, 0.0, -1.0, 0.0, 1
+        node_stack_bottom = 0.0, -1.125, 0.0, 0.0, -1.0, 0.0, 1
      }
    }
    VARIANT
    {
-      name = Bare_Alternate
-      displayName =  #LOC_Restock_variant-engine_compact_grey-orange
+      // 1.25 bare
+      name = Size1Bare_Alternate
+      displayName =  #LOC_Restock_variant-engine_size1_grey-orange
      primaryColor = #999999
-      secondaryColor = #999999
+      secondaryColor = #f69449
      GAMEOBJECTS
      {
        Kodiak1875 = false
-        Kodiak125 = false
-        KodiakCompact = true
+        Kodiak125 = true
+        KodiakCompact = false
        UrsaBoattail125 = false
        UrsaBoattail1875 = false
        UrsaBoattailCommon = false
        UrsaShroud1875 = false
-        UrsaShroud125 = false
-        Shroud1p5x2 = true
+        UrsaShroud125 = true
+        Shroud1p5x2 = false
        Shroud1x0 = false
        Shroud1p5x0 = false

        UrsaShroud1875White = false
        UrsaShroud1875Orange = false
        UrsaShroud125White = false
-        UrsaShroud125Orange = false
+        UrsaShroud125Orange = true
        Shroud1p5x2White = false
-        Shroud1p5x2Orange = true
+        Shroud1p5x2Orange = false
        UrsaBoattail1875Orange = false
        UrsaBoattail125Orange = false
      }
      NODES
      {
-        node_stack_bottom = 0.0, -1.125, 0.0, 0.0, -1.0, 0.0, 1
+        node_stack_bottom = 0.0, -1.292, 0.0, 0.0, -1.0, 0.0, 1
      }
    }
    VARIANT
@ -320,7 +321,7 @@
      // 1.25 covered
      name = ShroudSmall_Alternate
      displayName =  #LOC_Restock_variant-engine_boattail_size1_grey-orange
-      primaryColor = #ffffff
+      primaryColor = #666666
      secondaryColor = #f69449
      GAMEOBJECTS
      {
@ -352,29 +353,29 @@
    }
    VARIANT
    {
-      // 1.25 bare
-      name = Size1Bare_Alternate
-      displayName =  #LOC_Restock_variant-engine_size1_grey-orange
+      // 1.875 bare
+      name = Size1p5Bare_Alternate
+      displayName =  #LOC_Restock_variant-engine_size1p5_grey-orange
      primaryColor = #999999
      secondaryColor = #f69449
      GAMEOBJECTS
      {
-        Kodiak1875 = false
-        Kodiak125 = true
+        Kodiak1875 = true
+        Kodiak125 = false
        KodiakCompact = false
        UrsaBoattail125 = false
        UrsaBoattail1875 = false
        UrsaBoattailCommon = false
-        UrsaShroud1875 = false
-        UrsaShroud125 = true
+        UrsaShroud1875 = true
+        UrsaShroud125 = false
        Shroud1p5x2 = false
        Shroud1x0 = false
        Shroud1p5x0 = false

        UrsaShroud1875White = false
-        UrsaShroud1875Orange = false
+        UrsaShroud1875Orange = true
        UrsaShroud125White = false
-        UrsaShroud125Orange = true
+        UrsaShroud125Orange = false
        Shroud1p5x2White = false
        Shroud1p5x2Orange = false
        UrsaBoattail1875Orange = false
@ -382,7 +383,7 @@
      }
      NODES
      {
-        node_stack_bottom = 0.0, -1.292, 0.0, 0.0, -1.0, 0.0, 1
+        node_stack_bottom = 0.0, -1.3, 0.0, 0.0, -1.0, 0.0, 1
      }
    }
    VARIANT
@ -390,7 +391,7 @@
      // 1.875 covered
      name = ShroudBig_Alternate
      displayName = #LOC_Restock_variant-engine_boattail_size1p5_grey-orange
-      primaryColor = #ffffff
+      primaryColor = #666666
      secondaryColor = #f69449
      sizeGroup = GroupB
      GAMEOBJECTS
@ -423,37 +424,36 @@
    }
    VARIANT
    {
-      // 1.875 bare
-      name = Size1p5Bare_Alternate
-      displayName =  #LOC_Restock_variant-engine_size1p5_grey-orange
-      primaryColor = #999999
-      secondaryColor = #f69449
+      name = Bare_Alternate
+      displayName =  #LOC_Restock_variant-engine_compact_grey-orange
+      primaryColor = #666666
+      secondaryColor = #999999
      GAMEOBJECTS
      {
-        Kodiak1875 = true
+        Kodiak1875 = false
        Kodiak125 = false
-        KodiakCompact = false
+        KodiakCompact = true
        UrsaBoattail125 = false
        UrsaBoattail1875 = false
        UrsaBoattailCommon = false
-        UrsaShroud1875 = true
+        UrsaShroud1875 = false
        UrsaShroud125 = false
-        Shroud1p5x2 = false
+        Shroud1p5x2 = true
        Shroud1x0 = false
        Shroud1p5x0 = false

        UrsaShroud1875White = false
-        UrsaShroud1875Orange = true
+        UrsaShroud1875Orange = false
        UrsaShroud125White = false
        UrsaShroud125Orange = false
        Shroud1p5x2White = false
-        Shroud1p5x2Orange = false
+        Shroud1p5x2Orange = true
        UrsaBoattail1875Orange = false
        UrsaBoattail125Orange = false
      }
      NODES
      {
-        node_stack_bottom = 0.0, -1.3, 0.0, 0.0, -1.0, 0.0, 1
+        node_stack_bottom = 0.0, -1.125, 0.0, 0.0, -1.0, 0.0, 1
      }
    }
  }
@ -644,13 +644,13 @@
 MODULE
  {
    name = ModulePartVariants
-    baseVariant = Size1p5
+    baseVariant = Shroud
    VARIANT
    {
      name = Shroud
      displayName = #LOC_Restock_variant-mounting_classic_white
-      primaryColor = #999999
-      secondaryColor = #000000
+      primaryColor = #111111
+      secondaryColor = #ffffff
      GAMEOBJECTS
      {
        WH_25 = false
@ -683,7 +683,7 @@
      name = Size2
      displayName = #LOC_Restock_variant-engine_size2_white
      primaryColor = #999999
-      secondaryColor = #f69449
+      secondaryColor = #ffffff
      GAMEOBJECTS
      {
        WH_25 = true
@ -716,7 +716,7 @@
      name = Size1p5
      displayName =  #LOC_Restock_variant-engine_size1p5_white
      primaryColor = #999999
-      secondaryColor = #f69449
+      secondaryColor = #ffffff
      GAMEOBJECTS
      {
        WH_25 = false
@ -748,8 +748,8 @@
    {
      name = Bare
      displayName = #LOC_Restock_variant-engine_compact_white
-      primaryColor = #999999
-      secondaryColor = #999999
+      primaryColor = #666666
+      secondaryColor = #ffffff
      GAMEOBJECTS
      {
        WH_25 = false
@ -781,8 +781,8 @@
    {
      name = Shroud_Alternate
      displayName = #LOC_Restock_variant-mounting_classic_grey-orange
-      primaryColor = #999999
-      secondaryColor = #000000
+      primaryColor = #111111
+      secondaryColor = #f69449
      GAMEOBJECTS
      {
        WH_25 = false
@ -847,6 +847,7 @@
    {
      name = Size1p5_Alternate
      displayName =  #LOC_Restock_variant-engine_size1p5_grey-orange
+	  primaryColor = #999999
      secondaryColor = #f69449
      GAMEOBJECTS
      {
@ -879,8 +880,8 @@
    {
      name = Bare_Alternate
      displayName = #LOC_Restock_variant-engine_compact_grey-orange
-      primaryColor = #999999
-      secondaryColor = #999999
+      primaryColor = #666666
+      secondaryColor = #f69449
      GAMEOBJECTS
      {
        WH_25 = false
@ -1125,10 +1126,10 @@
    {
      // AKA 2.5m boattail (wtf)
      name = Shroud
-      displayName =  #autoLOC_8007104
+      displayName =  #LOC_Restock_variant-engine_tankbutt_size1p5_white
      themeName = Shroud
-      primaryColor = #999999
-      secondaryColor = #111111
+      primaryColor = #111111
+      secondaryColor = #ffffff
      sizeGroup = GroupA
      GAMEOBJECTS
      {
@ -1161,7 +1162,7 @@
      name = Size1p5
      displayName = #LOC_Restock_variant-engine_size1p5_white
      primaryColor = #999999
-      secondaryColor = #f69449
+      secondaryColor = #ffffff
      GAMEOBJECTS
      {
        SkiffBoattail = false
@ -1192,7 +1193,7 @@
      name = Size1
      displayName = #LOC_Restock_variant-engine_size1_white
      primaryColor = #999999
-      secondaryColor = #f69449
+      secondaryColor = #ffffff
      GAMEOBJECTS
      {
        SkiffBoattail = false
@ -1223,8 +1224,8 @@
      name = Bare
      displayName = #LOC_Restock_variant-engine_compact_white
      themeName = Bare
-      primaryColor = #999999
-      secondaryColor = #999999
+      primaryColor = #666666
+      secondaryColor = #ffffff
      GAMEOBJECTS
      {
        SkiffBoattail = false
@ -1254,10 +1255,10 @@
    {
      // AKA 2.5m boattail (wtf)
      name = Shroud_Alternate
-      displayName =  #autoLOC_8007104
+      displayName =  #LOC_Restock_variant-engine_tankbutt_size1p5_grey-orange
      themeName = Shroud
-      primaryColor = #999999
-      secondaryColor = #111111
+      primaryColor = #111111
+      secondaryColor = #f69449
      sizeGroup = GroupA
      GAMEOBJECTS
      {
@ -1350,8 +1351,8 @@
      name = Bare_Alternate
      displayName = #LOC_Restock_variant-engine_compact_grey-orange
      themeName = Bare
-      primaryColor = #999999
-      secondaryColor = #999999
+      primaryColor = #666666
+      secondaryColor = #f69449
      GAMEOBJECTS
      {
        SkiffBoattail = false
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-engine-torch.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-engine-torch.cfg
@ -205,8 +205,8 @@ PART
    {
      name = Boattail
      displayName = #LOC_Restock_variant-engine_boattail_grey-orange
-      primaryColor = #ffffff
-      secondaryColor = #f69449
+      primaryColor = #666666
+      secondaryColor = #666666
      GAMEOBJECTS
      {
        Torch_0625 = false
@ -235,8 +235,8 @@ PART
    {
      name = Compact
      displayName = #LOC_Restock_variant-engine_compact_grey-orange
-      primaryColor = #999999
-      secondaryColor = #999999
+      primaryColor = #666666
+      secondaryColor = #f69449
      GAMEOBJECTS
      {
        Torch_0625 = false
@ -296,7 +296,7 @@ PART
      name = Boattail_Alternate
      displayName = #LOC_Restock_variant-engine_boattail_white
      primaryColor = #ffffff
-      secondaryColor = #f69449
+      secondaryColor = #ffffff
      GAMEOBJECTS
      {
        Torch_0625 = false
@ -325,8 +325,8 @@ PART
    {
      name = Compact_Alternate
      displayName = #LOC_Restock_variant-engine_compact_white
-      primaryColor = #ffffff
-      secondaryColor = #999999
+      primaryColor = #666666
+      secondaryColor = #ffffff
      GAMEOBJECTS
      {
        Torch_0625 = false
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/125/restock-engine-pug.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/125/restock-engine-pug.cfg
@ -144,7 +144,7 @@ PART
      name = Size1
      displayName = #LOC_Restock_variant-engine_size1_white
      primaryColor = #999999
-      secondaryColor = #ffb80c
+      secondaryColor = #ffffff
      GAMEOBJECTS
      {
        LV_303 = true
@ -166,7 +166,7 @@ PART
      name = Boattail
      displayName = #LOC_Restock_variant-engine_boattail_white
      primaryColor = #ffffff
-      secondaryColor = #ffb80c
+      secondaryColor = #ffffff
      GAMEOBJECTS
      {
        LV_303 = false
@ -187,8 +187,8 @@ PART
    {
      name = Compact
      displayName = #LOC_Restock_variant-engine_compact_white
-      primaryColor = #999999
-      secondaryColor = #999999
+      primaryColor = #666666
+      secondaryColor = #ffffff
      GAMEOBJECTS
      {
        LV_303 = false
@ -209,8 +209,8 @@ PART
    {
      name = Size1Alternate
      displayName = #LOC_Restock_variant-engine_size1_grey-orange
-      primaryColor = #6f6e6d
-      secondaryColor = #ffb80c
+      primaryColor = #999999
+      secondaryColor = #f69449
      GAMEOBJECTS
      {
        LV_303 = true
@ -232,7 +232,7 @@ PART
      name = Boattail_Alternate
      displayName = #LOC_Restock_variant-engine_boattail_grey-orange
      primaryColor = #666666
-      secondaryColor = #ffb80c
+      secondaryColor = #666666
      GAMEOBJECTS
      {
        LV_303 = false
@ -253,8 +253,8 @@ PART
    {
      name = Compact_Alternate
      displayName = #LOC_Restock_variant-engine_compact_grey-orange
-      primaryColor = #6f6e6d
-      secondaryColor = #999999
+      primaryColor = #666666
+      secondaryColor = #f69449
      GAMEOBJECTS
      {
        LV_303 = false
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/125/restock-engine-valiant.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/125/restock-engine-valiant.cfg
@ -170,7 +170,7 @@ PART
      name = Size1
      displayName = #LOC_Restock_variant-engine_size1_white
      primaryColor = #999999
-      secondaryColor = #ffb80c
+      secondaryColor = #ffffff
      GAMEOBJECTS
      {
        LV_T15 = true
@ -204,7 +204,7 @@ PART
      name = Boattail
      displayName = #LOC_Restock_variant-engine_boattail_white
      primaryColor = #ffffff
-      secondaryColor = #ffb80c
+      secondaryColor = #ffffff
      GAMEOBJECTS
      {
        LV_T15 = false
@ -237,8 +237,8 @@ PART
    {
      name = Compact
      displayName = #LOC_Restock_variant-engine_compact_white
-      primaryColor = #999999
-      secondaryColor = #999999
+      primaryColor = #666666
+      secondaryColor = #ffffff
      GAMEOBJECTS
      {
        LV_T15 = false
@ -271,8 +271,8 @@ PART
    {
      name = Size1_Alternate
      displayName = #LOC_Restock_variant-engine_size1_grey-orange
-      primaryColor = #6f6e6d
-      secondaryColor = #ffb80c
+      primaryColor = #999999
+      secondaryColor = #f69449
      GAMEOBJECTS
      {
        LV_T15 = true
@ -306,7 +306,7 @@ PART
      name = Boattail_Alternate
      displayName = #LOC_Restock_variant-engine_boattail_grey-orange
      primaryColor = #666666
-      secondaryColor = #ffb80c
+      secondaryColor = #666666
      GAMEOBJECTS
      {
        LV_T15 = false
@ -339,8 +339,8 @@ PART
    {
      name = Compact_Alternate
      displayName = #LOC_Restock_variant-engine_compact_grey-orange
-      primaryColor = #6f6e6d
-      secondaryColor = #999999
+      primaryColor = #666666
+      secondaryColor = #f69449
      GAMEOBJECTS
      {
        LV_T15 = false
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/25/restock-engine-cherenkov.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/25/restock-engine-cherenkov.cfg
@ -176,7 +176,7 @@ PART
    {
      name = Size2
      displayName = #LOC_Restock_variant-engine_size2_white
-      primaryColor = #999999
+      primaryColor = #ffffff
      secondaryColor = #f69449
      GAMEOBJECTS
      {
@ -198,7 +198,7 @@ PART
    {
      name = Compact
      displayName = #LOC_Restock_variant-engine_compact_white
-      primaryColor = #ffffff
+      primaryColor = #999999
      secondaryColor = #f69449
      GAMEOBJECTS
      {
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/0625/restock-fuel-tank-sphere-0625-1.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/0625/restock-fuel-tank-sphere-0625-1.cfg
@ -62,6 +62,19 @@ PART
    name = ModulePartVariants
    baseVariant = Metallic
    useMultipleDragCubes = false
+	VARIANT
+    {
+      name = Metallic
+      displayName = #LOC_Restock_variant-surface_metal
+      themeName = Metal
+      primaryColor = #6f6e6d
+      secondaryColor = #6f6e6d
+      GAMEOBJECTS
+      {
+        ConeSphere0625Metal = true
+        ConeSphere0625White = false
+      }
+    }
    VARIANT
    {
      name = BlackAndWhite
@ -75,18 +88,5 @@ PART
        ConeSphere0625White = true
      }
    }
-    VARIANT
-    {
-      name = Metallic
-      displayName = #LOC_Restock_variant-surface_metal
-      themeName = Metal
-      primaryColor = #6f6e6d
-      secondaryColor = #6f6e6d
-      GAMEOBJECTS
-      {
-        ConeSphere0625Metal = true
-        ConeSphere0625White = false
-      }
-    }
  }
 }