work on engine restructure

2024-09-01 17:34:42 +00:00 · 2019-10-18 11:04:21 -07:00 · 2019-10-18 11:04:21 -07:00 · 6ea78d95f1
commit 6ea78d95f1
parent 1d7a5d97fc
7 changed files with 100 additions and 84 deletions
--- a/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg
+++ b/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg
@ -15,15 +15,31 @@ Localization
    #LOC_Restock_scanner_screen_toggle = Toggle Screen

    #LOC_Restock_variant-engine_size0 = 0.625m
+    #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_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_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)
    #LOC_Restock_variant-engine_size3 = 3.75m
    #LOC_Restock_variant-engine_compact = Compact
+    #LOC_Restock_variant-engine_compact_white = Compact (White Shroud)
+    #LOC_Restock_variant-engine_compact_grey-orange = Compact (Orange/Grey Shroud)
    #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_size1 = Boattail (1.25m)
    #LOC_Restock_variant-engine_boattail_size1p5 = Boattail (1.875m)
+
+    #LOC_Restock_variant-engine_shroud_white = Metallic Shroud
+    #LOC_Restock_variant-engine_shroud_grey-orange = White Shroud
+
    #LOC_Restock_variant-engine_shroud = Shrouded
    #LOC_Restock_variant-engine_shroud_wide = Wide Shrouded
    #LOC_Restock_variant-engine_docking = Docking Port
@ -80,6 +96,6 @@ Localization
    #LOC_Restock_variant-radiator_flat = Flat
    #LOC_Restock_variant-radiator_compact = Compact

-    #LOC_Restock_description-FuelCellArray = Why have just one small fuel cell when you can have three large ones?  The fuel cell array is ideal for situations where you need a large source of reliable power.  Like the smaller fuel cells, this array operates by converting fuel and oxidizer into energy. 
+    #LOC_Restock_description-FuelCellArray = Why have just one small fuel cell when you can have three large ones?  The fuel cell array is ideal for situations where you need a large source of reliable power.  Like the smaller fuel cells, this array operates by converting fuel and oxidizer into energy.
  }
 }
--- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-0625.cfg
+++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-0625.cfg
@ -32,7 +32,7 @@
    }
    flameout
    {
-    
+
      AUDIO
      {
        channel = Ship
@ -81,11 +81,11 @@
    name = ModulePartVariants
    useMultipleDragCubes = false
    baseVariant = Metallic
-    
+
    VARIANT
    {
      name = Metallic
-      displayName = #LOC_Restock_variant-surface_metal
+      displayName =   #LOC_Restock_variant-engine_shroud_grey-orange
      themeName = Metal
      primaryColor = #6f6e6d
      secondaryColor = #6f6e6d
@ -93,13 +93,13 @@
      {
        ShroudAntWhite = false
        ShroudAntMetal = true
-        
+
      }
    }
    VARIANT
    {
      name = White
-      displayName = #autoLOC_8007119
+      displayName =   #LOC_Restock_variant-engine_shroud_white
      themeName = White
      primaryColor = #ffffff
      secondaryColor = #ffffff
@ -107,7 +107,7 @@
      {
        ShroudAntWhite = true
        ShroudAntMetal = false
-        
+
      }
    }
  }
@ -226,7 +226,7 @@
    }
    flameout
    {
-     
+

      AUDIO
      {
@ -421,7 +421,7 @@
    }
    flameout
    {
-      
+
      AUDIO
      {
        channel = Ship
@ -576,7 +576,7 @@
    VARIANT
    {
      name = Size0
-      displayName = #LOC_Restock_variant-engine_size0
+      displayName = #LOC_Restock_variant-engine_size0_grey-orange
      primaryColor = #999999
      secondaryColor = #f69449
      GAMEOBJECTS
@ -605,7 +605,7 @@
    VARIANT
    {
      name = Boattail
-      displayName = #LOC_Restock_variant-engine_boattail
+      displayName = #LOC_Restock_variant-engine_boattail_grey-orange
      primaryColor = #ffffff
      secondaryColor = #f69449
      GAMEOBJECTS
@ -633,7 +633,7 @@
    VARIANT
    {
      name = Compact
-      displayName = #LOC_Restock_variant-engine_compact
+      displayName = #LOC_Restock_variant-engine_compact_grey-orange
      primaryColor = #999999
      secondaryColor = #999999
      GAMEOBJECTS
@ -661,8 +661,8 @@
     VARIANT
    {
      name = Size0_Alternate
-      displayName = #LOC_Restock_variant-engine_size0
-      primaryColor = #999999
+      displayName = #LOC_Restock_variant-engine_size0_white
+      primaryColor = #ffffff
      secondaryColor = #f69449
      GAMEOBJECTS
      {
@ -690,9 +690,9 @@
    VARIANT
    {
      name = Boattail_Alternate
-      displayName = #LOC_Restock_variant-engine_boattail
+      displayName = #LOC_Restock_variant-engine_boattail_white
      primaryColor = #ffffff
-      secondaryColor = #f69449
+      secondaryColor = #ffffff
      GAMEOBJECTS
      {
        SparkBasic = false
@ -718,8 +718,8 @@
    VARIANT
    {
      name = Compact_Alternate
-      displayName = #LOC_Restock_variant-engine_compact
-      primaryColor = #999999
+      displayName = #LOC_Restock_variant-engine_compact_white
+      primaryColor = #ffffff
      secondaryColor = #999999
      GAMEOBJECTS
      {
@ -873,7 +873,7 @@
    }
    flameout
    {
-      
+
      AUDIO
      {
        channel = Ship
@ -978,7 +978,7 @@
        EnginePod = false
        EngineBare = true
      }
-      
+
    }
    VARIANT
    {
@ -1054,7 +1054,7 @@
      }
    }
    useMultipleDragCubes = false
-  } 
+  }
  MODULE
  {
    name = FXModuleLookAtConstraint
--- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-125.cfg
+++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-125.cfg
@ -202,11 +202,11 @@
    name = ModulePartVariants
    useMultipleDragCubes = false
    baseVariant = White
-    
+
    VARIANT
    {
      name = White
-      displayName = #autoLOC_8007119
+      displayName = #LOC_Restock_variant-engine_size1_white
      themeName = White
      primaryColor = #ffffff
      secondaryColor = #ffffff
@ -221,7 +221,7 @@
    VARIANT
    {
      name = GrayAndOrange
-      displayName = #autoLOC_8007121
+      displayName = #LOC_Restock_variant-engine_size1_grey-orange
      themeName = GrayAndOrange
      primaryColor = #4c4f47
      secondaryColor = #f49841
@ -683,7 +683,7 @@
    VARIANT
    {
      name = Size1
-      displayName = #LOC_Restock_variant-engine_size1
+      displayName = #LOC_Restock_variant-engine_size1_white
      primaryColor = #999999
      secondaryColor = #ffb80c
      GAMEOBJECTS
@ -705,7 +705,7 @@
    VARIANT
    {
      name = Boattail
-      displayName = #LOC_Restock_variant-engine_boattail
+      displayName = #LOC_Restock_variant-engine_boattail_white
      primaryColor = #ffffff
      secondaryColor = #ffb80c
      GAMEOBJECTS
@ -727,7 +727,7 @@
    VARIANT
    {
      name = Compact
-      displayName = #LOC_Restock_variant-engine_compact
+      displayName = #LOC_Restock_variant-engine_compact_white
      primaryColor = #999999
      secondaryColor = #999999
      GAMEOBJECTS
@ -749,8 +749,8 @@
    VARIANT
    {
      name = Size1_Alternate
-      displayName = #LOC_Restock_variant-engine_size1
-      primaryColor = #999999
+      displayName = #LOC_Restock_variant-engine_size1_grey-orange
+      primaryColor = #666666
      secondaryColor = #ffb80c
      GAMEOBJECTS
      {
@ -771,8 +771,8 @@
    VARIANT
    {
      name = Boattail_Alternate
-      displayName = #LOC_Restock_variant-engine_boattail
-      primaryColor = #ffffff
+      displayName = #LOC_Restock_variant-engine_boattail_grey-orange
+      primaryColor = #666666
      secondaryColor = #ffb80c
      GAMEOBJECTS
      {
@ -793,8 +793,8 @@
    VARIANT
    {
      name = Compact_Alternate
-      displayName = #LOC_Restock_variant-engine_compact
-      primaryColor = #999999
+      displayName = #LOC_Restock_variant-engine_compact_grey-orange
+      primaryColor = #6f6e6d
      secondaryColor = #999999
      GAMEOBJECTS
      {
@ -818,7 +818,7 @@
    name = ModulePartVariants
    useMultipleDragCubes = false
    baseVariant = White
-    
+
    VARIANT
    {
      name = White
@ -845,11 +845,11 @@
      secondaryColor = #f49841
      GAMEOBJECTS
      {
-        
+
      }
    }
  }
-  
+
  @MODULE[ModuleEngines]
  {
    @name = ModuleEnginesFX
@ -1073,7 +1073,7 @@
    VARIANT
    {
      name = Size1
-      displayName = #LOC_Restock_variant-engine_size1
+      displayName = #LOC_Restock_variant-engine_size1_white
      primaryColor = #999999
      secondaryColor = #ffb80c
      GAMEOBJECTS
@ -1095,7 +1095,7 @@
    VARIANT
    {
      name = Boattail
-      displayName = #LOC_Restock_variant-engine_boattail
+      displayName = #LOC_Restock_variant-engine_boattail_white
      primaryColor = #ffffff
      secondaryColor = #ffb80c
      GAMEOBJECTS
@ -1117,7 +1117,7 @@
    VARIANT
    {
      name = Compact
-      displayName = #LOC_Restock_variant-engine_compact
+      displayName = #LOC_Restock_variant-engine_compact_white
      primaryColor = #999999
      secondaryColor = #999999
      GAMEOBJECTS
@ -1139,8 +1139,8 @@
    VARIANT
    {
      name = Size1_Alternate
-      displayName = #LOC_Restock_variant-engine_size1
-      primaryColor = #999999
+      displayName = #LOC_Restock_variant-engine_size1_grey-orange
+      primaryColor = #6f6e6d
      secondaryColor = #ffb80c
      GAMEOBJECTS
      {
@ -1161,8 +1161,8 @@
    VARIANT
    {
      name = Boattail_Alternate
-      displayName = #LOC_Restock_variant-engine_boattail
-      primaryColor = #ffffff
+      displayName = #LOC_Restock_variant-engine_boattail_grey-orange
+      primaryColor = #666666
      secondaryColor = #ffb80c
      GAMEOBJECTS
      {
@ -1183,8 +1183,8 @@
    VARIANT
    {
      name = Compact_Alternate
-      displayName = #LOC_Restock_variant-engine_compact
-      primaryColor = #999999
+      displayName = #LOC_Restock_variant-engine_compact_grey-orange
+      primaryColor = #6f6e6d
      secondaryColor = #999999
      GAMEOBJECTS
      {
@ -1412,7 +1412,7 @@
    VARIANT
    {
      name = Size1
-      displayName = #LOC_Restock_variant-engine_size1
+      displayName = #LOC_Restock_variant-engine_size1_white
      primaryColor = #999999
      secondaryColor = #ffb80c
      GAMEOBJECTS
@ -1440,7 +1440,7 @@
    VARIANT
    {
      name = Boattail
-      displayName = #LOC_Restock_variant-engine_boattail
+      displayName = #LOC_Restock_variant-engine_boattail_white
      primaryColor = #ffffff
      secondaryColor = #ffb80c
      GAMEOBJECTS
@ -1468,7 +1468,7 @@
    VARIANT
    {
      name = Compact
-      displayName = #LOC_Restock_variant-engine_compact
+      displayName = #LOC_Restock_variant-engine_compact_white
      primaryColor = #999999
      secondaryColor = #999999
      GAMEOBJECTS
@ -1496,8 +1496,8 @@
    VARIANT
    {
      name = Size1_Alternate
-      displayName = #LOC_Restock_variant-engine_size1
-      primaryColor = #999999
+      displayName = #LOC_Restock_variant-engine_size1_grey-orange
+      primaryColor = #666666
      secondaryColor = #ffb80c
      GAMEOBJECTS
      {
@ -1524,8 +1524,8 @@
    VARIANT
    {
      name = Boattail_Alternate
-      displayName = #LOC_Restock_variant-engine_boattail
-      primaryColor = #ffffff
+      displayName = #LOC_Restock_variant-engine_boattail_grey-orange
+      primaryColor = #666666
      secondaryColor = #ffb80c
      GAMEOBJECTS
      {
@ -1553,8 +1553,8 @@
    VARIANT
    {
      name = Compact_Alternate
-      displayName = #LOC_Restock_variant-engine_compact
-      primaryColor = #999999
+      displayName = #LOC_Restock_variant-engine_compact_grey-orange
+      primaryColor = #6f6e6d
      secondaryColor = #999999
      GAMEOBJECTS
      {
@ -1579,7 +1579,7 @@
      }
    }
  }
-  
+
  @MODULE[ModuleJettison]
  {
    @jettisonName = fairing,ShroudT45_Compact
--- a/Distribution/Restock/changelog.txt
+++ b/Distribution/Restock/changelog.txt
@ -115,7 +115,7 @@
  - 1.25m engine revisions
    - Repainted legacy Porkjet boattails
    - Terrier now uses a MLI texture on part of its Basic variant
-    - Engines now have White/Grey and Orange surface variants that affect shrouds and boattails
+    - Engines now have White and Orange/Grey surface variants that affect shrouds and boattails
  - Added optional structural strut variants on Baguette and Dumpling tanks
  - Fixed MH replacement for Stratus-V tank
  - Added appropriate Orange/Dark/Metal variants to all stack Decouplers and Separators
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-engine-torch.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-engine-torch.cfg
@ -174,7 +174,7 @@ PART
    VARIANT
    {
      name = Size0
-      displayName = #LOC_Restock_variant-engine_size0
+      displayName = #LOC_Restock_variant-engine_size0_grey-orange
      primaryColor = #999999
      secondaryColor = #f69449
      GAMEOBJECTS
@ -204,7 +204,7 @@ PART
    VARIANT
    {
      name = Boattail
-      displayName = #LOC_Restock_variant-engine_boattail
+      displayName = #LOC_Restock_variant-engine_boattail_grey-orange
      primaryColor = #ffffff
      secondaryColor = #f69449
      GAMEOBJECTS
@ -234,7 +234,7 @@ PART
    VARIANT
    {
      name = Compact
-      displayName = #LOC_Restock_variant-engine_compact
+      displayName = #LOC_Restock_variant-engine_compact_grey-orange
      primaryColor = #999999
      secondaryColor = #999999
      GAMEOBJECTS
@ -264,9 +264,9 @@ PART
    VARIANT
    {
      name = Size0_Alternate
-      displayName = #LOC_Restock_variant-engine_size0
+      displayName = #LOC_Restock_variant-engine_size0_white
      primaryColor = #999999
-      secondaryColor = #f69449
+      secondaryColor = #ffffff
      GAMEOBJECTS
      {
        Torch_0625 = true
@ -294,7 +294,7 @@ PART
    VARIANT
    {
      name = Boattail_Alternate
-      displayName = #LOC_Restock_variant-engine_boattail
+      displayName = #LOC_Restock_variant-engine_boattail_white
      primaryColor = #ffffff
      secondaryColor = #f69449
      GAMEOBJECTS
@ -324,8 +324,8 @@ PART
    VARIANT
    {
      name = Compact_Alternate
-      displayName = #LOC_Restock_variant-engine_compact
-      primaryColor = #999999
+      displayName = #LOC_Restock_variant-engine_compact_white
+      primaryColor = #ffffff
      secondaryColor = #999999
      GAMEOBJECTS
      {
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/125/restock-engine-pug.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/125/restock-engine-pug.cfg
@ -142,7 +142,7 @@ PART
    VARIANT
    {
      name = Size1
-      displayName = #LOC_Restock_variant-engine_size1
+      displayName = #LOC_Restock_variant-engine_size1_white
      primaryColor = #999999
      secondaryColor = #ffb80c
      GAMEOBJECTS
@ -164,7 +164,7 @@ PART
    VARIANT
    {
      name = Boattail
-      displayName = #LOC_Restock_variant-engine_boattail
+      displayName = #LOC_Restock_variant-engine_boattail_white
      primaryColor = #ffffff
      secondaryColor = #ffb80c
      GAMEOBJECTS
@ -186,7 +186,7 @@ PART
    VARIANT
    {
      name = Compact
-      displayName = #LOC_Restock_variant-engine_compact
+      displayName = #LOC_Restock_variant-engine_compact_white
      primaryColor = #999999
      secondaryColor = #999999
      GAMEOBJECTS
@ -208,8 +208,8 @@ PART
    VARIANT
    {
      name = Size1Alternate
-      displayName = #LOC_Restock_variant-engine_size1
-      primaryColor = #999999
+      displayName = #LOC_Restock_variant-engine_size1_grey-orange
+      primaryColor = #6f6e6d
      secondaryColor = #ffb80c
      GAMEOBJECTS
      {
@ -230,8 +230,8 @@ PART
    VARIANT
    {
      name = Boattail_Alternate
-      displayName = #LOC_Restock_variant-engine_boattail
-      primaryColor = #ffffff
+      displayName = #LOC_Restock_variant-engine_boattail_grey-orange
+      primaryColor = #666666
      secondaryColor = #ffb80c
      GAMEOBJECTS
      {
@ -252,8 +252,8 @@ PART
    VARIANT
    {
      name = Compact_Alternate
-      displayName = #LOC_Restock_variant-engine_compact
-      primaryColor = #999999
+      displayName = #LOC_Restock_variant-engine_compact_grey-orange
+      primaryColor = #6f6e6d
      secondaryColor = #999999
      GAMEOBJECTS
      {
@ -272,7 +272,7 @@ PART
      }
    }
  }
-  
+
  MODULE
  {
    name = ModuleJettison
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/125/restock-engine-valiant.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/125/restock-engine-valiant.cfg
@ -168,7 +168,7 @@ PART
    VARIANT
    {
      name = Size1
-      displayName = #LOC_Restock_variant-engine_size1
+      displayName = #LOC_Restock_variant-engine_size1_white
      primaryColor = #999999
      secondaryColor = #ffb80c
      GAMEOBJECTS
@ -202,7 +202,7 @@ PART
    VARIANT
    {
      name = Boattail
-      displayName = #LOC_Restock_variant-engine_boattail
+      displayName = #LOC_Restock_variant-engine_boattail_white
      primaryColor = #ffffff
      secondaryColor = #ffb80c
      GAMEOBJECTS
@ -236,7 +236,7 @@ PART
    VARIANT
    {
      name = Compact
-      displayName = #LOC_Restock_variant-engine_compact
+      displayName = #LOC_Restock_variant-engine_compact_white
      primaryColor = #999999
      secondaryColor = #999999
      GAMEOBJECTS
@ -270,8 +270,8 @@ PART
    VARIANT
    {
      name = Size1_Alternate
-      displayName = #LOC_Restock_variant-engine_size1
-      primaryColor = #999999
+      displayName = #LOC_Restock_variant-engine_size1_grey-orange
+      primaryColor = #6f6e6d
      secondaryColor = #ffb80c
      GAMEOBJECTS
      {
@ -304,8 +304,8 @@ PART
    VARIANT
    {
      name = Boattail_Alternate
-      displayName = #LOC_Restock_variant-engine_boattail
-      primaryColor = #ffffff
+      displayName = #LOC_Restock_variant-engine_boattail_grey-orange
+      primaryColor = #666666
      secondaryColor = #ffb80c
      GAMEOBJECTS
      {
@ -338,8 +338,8 @@ PART
    VARIANT
    {
      name = Compact_Alternate
-      displayName = #LOC_Restock_variant-engine_compact
-      primaryColor = #999999
+      displayName = #LOC_Restock_variant-engine_compact_grey-orange
+      primaryColor = #6f6e6d
      secondaryColor = #999999
      GAMEOBJECTS
      {
@ -370,7 +370,7 @@ PART
      }
    }
  }
-  
+
  MODULE
  {
    name = ModuleGimbal