- Cleaned up some localization tags and variant ordering/naming

- Fixed MH Part hiding patch - Fixed MH RSC Mini Tank part name in config
2024-09-01 17:34:42 +00:00 · 2019-03-02 16:29:19 +00:00
parent 609cfa9c98
commit 8b21e98136
7 changed files with 75 additions and 63 deletions
--- a/Distribution/Restock/GameData/ReStock/Patches/Command/restock-probes.cfg
+++ b/Distribution/Restock/GameData/ReStock/Patches/Command/restock-probes.cfg
@ -432,21 +432,6 @@
      }
    }
    VARIANT
-    {
-      name = Gold
-      displayName = #LOC_Restock_variant-probe-gold
-      themeName = Gold
-      primaryColor = #fccb0a
-      GAMEOBJECTS
-      {
-        Rover_White = false
-        Rover_Grey = false
-        Rover_GoldFoil = true
-        Rover_SilverFoil = false
-        Rover_Common = true
-      }
-    }
-    VARIANT
    {
      name = Silver
      displayName = #LOC_Restock_variant-probe-silver
@ -462,6 +447,21 @@
      }
    }
    VARIANT
+    {
+      name = Gold
+      displayName = #LOC_Restock_variant-probe-gold
+      themeName = Gold
+      primaryColor = #fccb0a
+      GAMEOBJECTS
+      {
+        Rover_White = false
+        Rover_Grey = false
+        Rover_GoldFoil = true
+        Rover_SilverFoil = false
+        Rover_Common = true
+      }
+    }
+    VARIANT
    {
      name = Bare
      displayName = #LOC_Restock_variant-probe-bare
--- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-srb-125.cfg
+++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-srb-125.cfg
@ -397,14 +397,12 @@
    @animationName = restock-srb-hammer-heat-1
    @responseSpeed = 0.1
  }
-  @MODULE[ModulePartVariants]
+  !MODULE[ModulePartVariants] {}
+  MODULE
  {
-    baseVariant = White
-    !primaryColor = DELETE
-    !secondaryColor = DELETE
-    !baseDisplayName = DELETE
-    !baseThemeName = DELETE
-    useMultipleDragCubes = false
+    name = ModulePartVariants
+	baseVariant = White
+	useMultipleDragCubes = false
    VARIANT
    {
      name = White
@ -418,23 +416,31 @@
        OrangeStripe = false
      }
    }
-    @VARIANT[YellowAndWhite]
-    {
-      !TEXTURE {}
-      GAMEOBJECTS
-      {
-        YellowStripe = true
-        OrangeStripe = false
-      }
-    }
-    @VARIANT[Orange]
-    {
-      !TEXTURE {}
+	VARIANT
+	{
+      name = Orange
+      primaryColor = #f49841
+      secondaryColor = #f49841
+      displayName = #autoLOC_8007100
+      themeName = Orange
      GAMEOBJECTS
      {
        YellowStripe = false
        OrangeStripe = true
      }
+    }
+	VARIANT
+	{
+      name = YellowAndWhite
+      primaryColor = #E8DB27
+      secondaryColor = #ffffff
+      displayName = #autoLOC_8003114
+      themeName = YellowAndWhite
+      GAMEOBJECTS
+      {
+        YellowStripe = true
+        OrangeStripe = false
+      }
    }
  }
  @MODULE[ModuleJettison]
@ -552,14 +558,12 @@
    dependOnEngineState = True
    dependOnThrottle = True
  }
-  @MODULE[ModulePartVariants]
+  !MODULE[ModulePartVariants] {}
+  MODULE
  {
-    baseVariant = White
-    !primaryColor = DELETE
-    !secondaryColor = DELETE
-    !baseDisplayName = DELETE
-    !baseThemeName = DELETE
-    useMultipleDragCubes = false
+    name = ModulePartVariants
+	baseVariant = White
+	useMultipleDragCubes = false
    VARIANT
    {
      name = White
@ -573,23 +577,31 @@
        OrangeStripe = false
      }
    }
-    @VARIANT[YellowAndWhite]
-    {
-      !TEXTURE {}
-      GAMEOBJECTS
-      {
-        YellowStripe = true
-        OrangeStripe = false
-      }
-    }
-    @VARIANT[Orange]
-    {
-      !TEXTURE {}
+	VARIANT
+	{
+      name = Orange
+      primaryColor = #f49841
+      secondaryColor = #f49841
+      displayName = #autoLOC_8007100
+      themeName = Orange
      GAMEOBJECTS
      {
        YellowStripe = false
        OrangeStripe = true
      }
+    }
+	VARIANT
+	{
+      name = YellowAndWhite
+      primaryColor = #E8DB27
+      secondaryColor = #ffffff
+      displayName = #autoLOC_8003114
+      themeName = YellowAndWhite
+      GAMEOBJECTS
+      {
+        YellowStripe = true
+        OrangeStripe = false
+      }
    }
  }
  @MODULE[ModuleJettison]
--- a/Distribution/Restock/GameData/ReStock/PatchesMH/FuelTank/restock-mh-fueltanks-rcs.cfg
+++ b/Distribution/Restock/GameData/ReStock/PatchesMH/FuelTank/restock-mh-fueltanks-rcs.cfg
@ -3,7 +3,7 @@
 // -  (MonoPropMini)

 //  Spherical Radial Tiny Tank
-@PART[MonoPropMini]
+@PART[monopropMiniSphere]
 {
  @author = Chris Adderley (Nertea)
  !mesh = DELETE
--- a/Distribution/Restock/GameData/ReStock/PatchesMH/Payload/restock-mh-fairing-bases.cfg
+++ b/Distribution/Restock/GameData/ReStock/PatchesMH/Payload/restock-mh-fairing-bases.cfg
@ -21,9 +21,9 @@
  @MODULE[ModuleProceduralFairing]
  {
    @pivot = 0,0.151, 0
-    @TextureURL = ReStock/Assets/Payload/restock-fairing-25-1
+    @TextureURL = ReStock/Assets/Payload/restock-fairing-125-1
    @CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1
-    @TextureNormalURL = ReStock/Assets/Payload/restock-fairing-25-1-n
+    @TextureNormalURL = ReStock/Assets/Payload/restock-fairing-125-1-n
  }

  @MODULE[ModulePartVariants]
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg
@ -142,7 +142,7 @@ Localization
    #LOC_RestockPlus_restock-fairing-base-0625-1_description = While the Kerbals at Mission Control were still figuring out how to get their rockets back down to Kerbin safely, the research engineers at FLOOYD were quickly realising that protecting parts on ascent was just as important. Heavy research into two-dimensional-input driven procedural construction was then funded with the hopes of making protective shells for important payloads and interstage areas of the crafts. The protective shells also have the benefit of making the craft more aerodynamic, hopefully saving on precious rocket fuel! The AE-FF0 is an even tinier size available from FLOOYD.
    #LOC_RestockPlus_restock-fairing-base-0625-1_tags = restock aero )cap cargo cone contain drag fairing hollow inter nose payload protect rocket shroud stage (stor transport

-    #LOC_RestockPlus_restock-fairing-base-1875-1_title = AE-FF1-L Airstream Protective Shell (1.875m)
+    #LOC_RestockPlus_restock-fairing-base-1875-1_title = AE-FF1.5 Airstream Protective Shell (1.875m)
    #LOC_RestockPlus_restock-fairing-base-1875-1_description = While the Kerbals at Mission Control were still figuring out how to get their rockets back down to Kerbin safely, the research engineers at FLOOYD were quickly realising that protecting parts on ascent was just as important. Heavy research into two-dimensional-input driven procedural construction was then funded with the hopes of making protective shells for important payloads and interstage areas of the crafts. The protective shells also have the benefit of making the craft more aerodynamic, hopefully saving on precious rocket fuel! As a result of budget schedule realignments, the AE-FF1-L has become available.
    #LOC_RestockPlus_restock-fairing-base-1875-1_tags = restock aero )cap cargo cone contain drag fairing hollow inter nose payload protect rocket shroud stage (stor transport

--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Aero/1875/restock-nosecone-1875-1.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Aero/1875/restock-nosecone-1875-1.cfg
@ -50,7 +50,7 @@ PART
    VARIANT
    {
      name = White
-      displayName = #autoLOC_8007122
+      displayName = #autoLOC_8007119
      themeName = White
      primaryColor = #ffffff
      secondaryColor = #ffffff
@ -65,7 +65,7 @@ PART
    {
      name = BlackAndWhite
      displayName = #autoLOC_8007122
-      themeName = White
+      themeName = BlackAndWhite
      primaryColor = #ffffff
      secondaryColor = #000000
      GAMEOBJECTS
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Patches/MakingHistoryPartHiding.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Patches/MakingHistoryPartHiding.cfg
@ -1,7 +1,7 @@
 // Hides all the MH replacing parts if MH is installed
-@PART[*]:HAS[MHReplacement[True]]:FOR[zReStockPlus]:NEEDS[SquadExpansion/MakingHistory]
+@PART[*]:HAS[#MHReplacement[True]]:FOR[zzReStockPlus]:NEEDS[SquadExpansion/MakingHistory]
 {
-  TechHidden = True
-  category = none
-	subcategory = 0
+  @TechHidden = True
+  @category = none
+  @subcategory = 0
 }