Add 2.5m engine colour variants

2024-09-01 17:34:42 +00:00 · 2019-10-19 15:48:19 -07:00
parent 7c64a9d115
commit 07d080af8d
39 changed files with 490 additions and 66 deletions
--- a/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-25.cfg
+++ b/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-25.cfg
@ -6,7 +6,7 @@
 {
  @author = Chris Adderley (Nertea)
  !mesh = DELETE
-  !MODEL {}
+  !MODEL,* {}
  MODEL
  {
    model = ReStock/Assets/Structural/restock-nosecone-25-1
--- 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 = #999999
+      primaryColor = #666666
      secondaryColor = #f69449
      GAMEOBJECTS
      {
@ -606,7 +606,7 @@
    {
      name = Boattail
      displayName = #LOC_Restock_variant-engine_boattail_grey-orange
-      primaryColor = #ffffff
+      primaryColor = #666666
      secondaryColor = #f69449
      GAMEOBJECTS
      {
@ -634,7 +634,7 @@
    {
      name = Compact
      displayName = #LOC_Restock_variant-engine_compact_grey-orange
-      primaryColor = #999999
+      primaryColor = #666666
      secondaryColor = #999999
      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
@ -813,42 +813,6 @@
      }
    }
  }
-   MODULE
-  {
-    name = ModulePartVariants
-    useMultipleDragCubes = false
-    baseVariant = White
-
-    VARIANT
-    {
-      name = White
-      displayName = #autoLOC_8007119
-      themeName = White
-      primaryColor = #ffffff
-      secondaryColor = #ffffff
-      GAMEOBJECTS
-      {
-        ShortShroudWhite = true
-        ShortShroudOrange = false
-        TallShroudWhite = true
-        TallShroudOrange = false
-        Frame_Boat = true
-        Frame_Boat_Orange = false
-      }
-    }
-    VARIANT
-    {
-      name = GrayAndOrange
-      displayName = #autoLOC_8007121
-      themeName = GrayAndOrange
-      primaryColor = #4c4f47
-      secondaryColor = #f49841
-      GAMEOBJECTS
-      {
-
-      }
-    }
-  }

  @MODULE[ModuleEngines]
  {
--- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-25.cfg
+++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-25.cfg
@ -259,7 +259,7 @@
    VARIANT
    {
      name = Size2
-      displayName = #LOC_Restock_variant-engine_size2
+      displayName = #LOC_Restock_variant-engine_size2_white
      primaryColor = #999999
      secondaryColor = #f69449
      GAMEOBJECTS
@ -269,12 +269,18 @@
        fairing = true
        Mainsail_Shroud_Compact = false
        Mainsail_Compact = false
+        Mainsail_Shroud_CompactWhite = false
+        Mainsail_Shroud_CompactOrange = false
+        fairingWhite  = true
+        fairingOrange = false
+        Mainsail_BoattailMeshWhite = false
+        Mainsail_BoattailMeshOrange = false
      }
    }
    VARIANT
    {
      name = Boattail
-      displayName = #LOC_Restock_variant-engine_boattail
+      displayName = #LOC_Restock_variant-engine_boattail_white
      primaryColor = #ffffff
      secondaryColor = #f69449
      GAMEOBJECTS
@ -284,12 +290,18 @@
        fairing = false
        Mainsail_Shroud_Compact = false
        Mainsail_Compact = false
+        Mainsail_Shroud_CompactWhite = false
+        Mainsail_Shroud_CompactOrange = false
+        fairingWhite  = false
+        fairingOrange = false
+        Mainsail_BoattailMeshWhite = true
+        Mainsail_BoattailMeshOrange = false
      }
    }
    VARIANT
    {
      name = Compact
-      displayName = #LOC_Restock_variant-engine_compact
+      displayName = #LOC_Restock_variant-engine_compact_white
      primaryColor = #999999
      secondaryColor = #999999
      GAMEOBJECTS
@ -299,6 +311,75 @@
        fairing = false
        Mainsail_Shroud_Compact = true
        Mainsail_Compact = true
+        Mainsail_Shroud_CompactWhite = true
+        Mainsail_Shroud_CompactOrange = false
+        fairingWhite  = false
+        fairingOrange = false
+        Mainsail_BoattailMeshWhite = false
+        Mainsail_BoattailMeshOrange = false
+      }
+    }
+    VARIANT
+    {
+      name = Size2_Alternate
+      displayName = #LOC_Restock_variant-engine_size2_grey-orange
+      primaryColor = #666666
+      secondaryColor = #666666
+      GAMEOBJECTS
+      {
+        Mainsail_Boattail = false
+        Mainsail_25m = true
+        fairing = true
+        Mainsail_Shroud_Compact = false
+        Mainsail_Compact = false
+        Mainsail_Shroud_CompactWhite = false
+        Mainsail_Shroud_CompactOrange = false
+        fairingWhite  = false
+        fairingOrange = true
+        Mainsail_BoattailMeshWhite = false
+        Mainsail_BoattailMeshOrange = false
+      }
+    }
+    VARIANT
+    {
+      name = Boattail_Alternate
+      displayName = #LOC_Restock_variant-engine_boattail_grey-orange
+      primaryColor = #666666
+      secondaryColor = #f69449
+      GAMEOBJECTS
+      {
+        Mainsail_Boattail = true
+        Mainsail_25m = false
+        fairing = false
+        Mainsail_Shroud_Compact = false
+        Mainsail_Compact = false
+        Mainsail_Shroud_CompactWhite = false
+        Mainsail_Shroud_CompactOrange = false
+        fairingWhite  = false
+        fairingOrange = false
+        Mainsail_BoattailMeshWhite = true
+        Mainsail_BoattailMeshOrange = false
+      }
+    }
+    VARIANT
+    {
+      name = Compact_Alternate
+      displayName = #LOC_Restock_variant-engine_compact_grey-orange
+      primaryColor = #666666
+      secondaryColor = #999999
+      GAMEOBJECTS
+      {
+        Mainsail_Boattail = false
+        Mainsail_25m = false
+        fairing = false
+        Mainsail_Shroud_Compact = true
+        Mainsail_Compact = true
+        Mainsail_Shroud_CompactWhite = false
+        Mainsail_Shroud_CompactOrange = true
+        fairingWhite  = false
+        fairingOrange = false
+        Mainsail_BoattailMeshWhite = false
+        Mainsail_BoattailMeshOrange = false
      }
    }
  }
@ -606,8 +687,8 @@
    VARIANT
    {
      name = Size2
-      displayName = #LOC_Restock_variant-engine_size2
-      primaryColor = #999999
+      displayName = #LOC_Restock_variant-engine_size2_white
+      primaryColor = #ffffff
      secondaryColor = #f69449
      GAMEOBJECTS
      {
@ -621,12 +702,14 @@
        P_CylCpt_Lower002 = false
        P_CylCpt_Lower003 = false
        P_CylCpt_Lower004 = false
+        ShroudOrange = false
+        ShroudWhite = true
      }
    }
    VARIANT
    {
      name = Compact
-      displayName = #LOC_Restock_variant-engine_compact
+      displayName = #LOC_Restock_variant-engine_compact_white
      primaryColor = #999999
      secondaryColor = #999999
      GAMEOBJECTS
@ -641,6 +724,52 @@
        P_CylCpt_Lower002 = true
        P_CylCpt_Lower003 = true
        P_CylCpt_Lower004 = true
+        ShroudOrange = false
+        ShroudWhite = true
+      }
+    }
+    VARIANT
+    {
+      name = Size2_Alternate
+      displayName = #LOC_Restock_variant-engine_size2_grey-orange
+      primaryColor = #666666
+      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
+        ShroudOrange = true
+        ShroudWhite = false
+      }
+    }
+    VARIANT
+    {
+      name = Compact_Alternate
+      displayName = #LOC_Restock_variant-engine_compact_grey-orange
+      primaryColor = #666666
+      secondaryColor = #999999
+      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
+        ShroudOrange = true
+        ShroudWhite = false
      }
    }
  }
@ -918,7 +1047,7 @@
    VARIANT
    {
      name = Size2
-      displayName = #LOC_Restock_variant-engine_size2
+      displayName = #LOC_Restock_variant-engine_size2_white
      primaryColor = #999999
      secondaryColor = #f69449
      GAMEOBJECTS
@ -934,12 +1063,18 @@
        Skipper_25m = true
        obj_fairing = true
        Skipper_Shroud_Compact = false
+        obj_fairingWhite = true
+        obj_fairingOrange = false
+        Skipper_BoatttailOrange = false
+        Skipper_BoatttailWhite = false
+        Skipper_Shroud_CompactWhite = false
+        Skipper_Shroud_CompactOrange = false
      }
    }
    VARIANT
    {
      name = Boattail
-      displayName = #LOC_Restock_variant-engine_boattail
+      displayName = #LOC_Restock_variant-engine_boattail_white
      primaryColor = #ffffff
      secondaryColor = #f69449
      GAMEOBJECTS
@ -955,12 +1090,18 @@
        Skipper_25m = false
        obj_fairing = false
        Skipper_Shroud_Compact = false
+        obj_fairingWhite = false
+        obj_fairingOrange = false
+        Skipper_BoatttailOrange = false
+        Skipper_BoatttailWhite = true
+        Skipper_Shroud_CompactWhite = false
+        Skipper_Shroud_CompactOrange = false
      }
    }
    VARIANT
    {
      name = Compact
-      displayName = #LOC_Restock_variant-engine_compact
+      displayName = #LOC_Restock_variant-engine_compact_white
      primaryColor = #999999
      secondaryColor = #999999
      GAMEOBJECTS
@ -976,6 +1117,93 @@
        Skipper_25m = false
        obj_fairing = false
        Skipper_Shroud_Compact = true
+        obj_fairingWhite = false
+        obj_fairingOrange = false
+        Skipper_BoatttailOrange = false
+        Skipper_BoatttailWhite = false
+        Skipper_Shroud_CompactWhite = true
+        Skipper_Shroud_CompactOrange = false
+      }
+    }
+    VARIANT
+    {
+      name = Size2_Alternate
+      displayName = #LOC_Restock_variant-engine_size2_grey-orange
+      primaryColor = #666666
+      secondaryColor = #f69449
+      GAMEOBJECTS
+      {
+        ActutatorCpt_Bottom001 = false
+        ActutatorCpt_Bottom002 = false
+        Actutator_Bottom001 = true
+        Actutator_Bottom002 = true
+        Skipper_GimbalMount = true
+        Skipper_GimbalMountCompact = false
+        Skipper_Compact = false
+        Skipper_Boattail = false
+        Skipper_25m = true
+        obj_fairing = true
+        Skipper_Shroud_Compact = false
+        obj_fairingWhite = false
+        obj_fairingOrange = true
+        Skipper_BoatttailOrange = false
+        Skipper_BoatttailWhite = false
+        Skipper_Shroud_CompactWhite = false
+        Skipper_Shroud_CompactOrange = false
+      }
+    }
+    VARIANT
+    {
+      name = Boattail_Alternate
+      displayName = #LOC_Restock_variant-engine_boattail_grey-orange
+      primaryColor = #666666
+      secondaryColor = #f69449
+      GAMEOBJECTS
+      {
+        ActutatorCpt_Bottom001 = false
+        ActutatorCpt_Bottom002 = false
+        Actutator_Bottom001 = true
+        Actutator_Bottom002 = true
+        Skipper_GimbalMount = true
+        Skipper_GimbalMountCompact = false
+        Skipper_Compact = false
+        Skipper_Boattail = true
+        Skipper_25m = false
+        obj_fairing = false
+        Skipper_Shroud_Compact = false
+        obj_fairingWhite = false
+        obj_fairingOrange = false
+        Skipper_BoatttailOrange = true
+        Skipper_BoatttailWhite = false
+        Skipper_Shroud_CompactWhite = false
+        Skipper_Shroud_CompactOrange = false
+      }
+    }
+    VARIANT
+    {
+      name = Compact_Alternate
+      displayName = #LOC_Restock_variant-engine_compact_grey-orange
+      primaryColor = #666666
+      secondaryColor = #999999
+      GAMEOBJECTS
+      {
+        ActutatorCpt_Bottom001 = true
+        ActutatorCpt_Bottom002 = true
+        Actutator_Bottom001 = false
+        Actutator_Bottom002 = false
+        Skipper_GimbalMount = false
+        Skipper_GimbalMountCompact = true
+        Skipper_Compact = true
+        Skipper_Boattail = false
+        Skipper_25m = false
+        obj_fairing = false
+        Skipper_Shroud_Compact = true
+        obj_fairingWhite = false
+        obj_fairingOrange = false
+        Skipper_BoatttailOrange = false
+        Skipper_BoatttailWhite = false
+        Skipper_Shroud_CompactWhite = false
+        Skipper_Shroud_CompactOrange = true
      }
    }
  }
--- a/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-375.cfg
+++ b/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-375.cfg
@ -28,6 +28,8 @@
    rotation = 0, 0, 0
  }
  %rescaleFactor = 1
+
+  !MODULE[ModulePartVariants] {}
  MODULE
  {
    name = ModulePartVariants
@ -86,6 +88,7 @@
    rotation = 0, 0, 0
  }
  %rescaleFactor = 1
+  !MODULE[ModulePartVariants] {}
  MODULE
  {
    name = ModulePartVariants
@ -144,6 +147,7 @@
    rotation = 0, 0, 0
  }
  %rescaleFactor = 1
+  !MODULE[ModulePartVariants] {}
  MODULE
  {
    name = ModulePartVariants
--- a/Distribution/Restock/GameData/ReStock/Patches/Payload/restock-service-bays.cfg
+++ b/Distribution/Restock/GameData/ReStock/Patches/Payload/restock-service-bays.cfg
@ -1,16 +1,16 @@
 // Patches applying art changes to service bays
 // Contents:
- Service Bay (1.25m) (ServiceBay_125)
+- Service Bay (1.25m) (ServiceBay_125_v2)
 - Service Bay (2.5m) (ServiceBay_250)

-@PART[ServiceBay_125]
+@PART[ServiceBay_125_v2]
 {
  @author = Chris Adderley (Nertea)
  !mesh = DELETE
  !MODEL {}
  MODEL
  {
-    model = ReStock/Assets/Payload/restock-service-bay-125-1
+    model = ReStock/Assets/Payload/restock-service-bay-125-2
  }
  @MODULE[ModuleAnimateGeneric]
  {
@ -70,14 +70,14 @@
  }
 }

-@PART[ServiceBay_250]
+@PART[ServiceBay_250_v2]
 {
  @author = Chris Adderley (Nertea)
  !mesh = DELETE
  !MODEL {}
  MODEL
  {
-    model = ReStock/Assets/Payload/restock-service-bay-25-1
+    model = ReStock/Assets/Payload/restock-service-bay-25-2
  }
  @MODULE[ModuleAnimateGeneric]
  {