Merge pull request #483 from Poodmund/master

Localization/Variant fixes, MH part hide patch fix, MH RCS Mini config fix
5 years ago · 70a2b9c773
parent ad98e85d1a 1921820041
commit 70a2b9c773
7 changed files with 87 additions and 75 deletions
--- a/Distribution/Restock/GameData/ReStock/Patches/Command/restock-probes.cfg
+++ b/Distribution/Restock/GameData/ReStock/Patches/Command/restock-probes.cfg
@ -433,31 +433,31 @@
    }
    VARIANT
    {
-      name = Gold
-      displayName = #LOC_Restock_variant-probe-gold
-      themeName = Gold
-      primaryColor = #fccb0a
+      name = Silver
+      displayName = #LOC_Restock_variant-probe-silver
+      themeName = Silver
+      primaryColor =  #cecece
      GAMEOBJECTS
      {
        Rover_White = false
        Rover_Grey = false
-        Rover_GoldFoil = true
-        Rover_SilverFoil = false
+        Rover_GoldFoil = false
+        Rover_SilverFoil = true
        Rover_Common = true
      }
    }
    VARIANT
    {
-      name = Silver
-      displayName = #LOC_Restock_variant-probe-silver
-      themeName = Silver
-      primaryColor =  #cecece
+      name = Gold
+      displayName = #LOC_Restock_variant-probe-gold
+      themeName = Gold
+      primaryColor = #fccb0a
      GAMEOBJECTS
      {
        Rover_White = false
        Rover_Grey = false
-        Rover_GoldFoil = false
-        Rover_SilverFoil = true
+        Rover_GoldFoil = true
+        Rover_SilverFoil = false
        Rover_Common = true
      }
    }
--- 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,22 +416,30 @@
        OrangeStripe = false
      }
    }
-    @VARIANT[YellowAndWhite]
-    {
-      !TEXTURE {}
+	VARIANT
+	{
+      name = Orange
+      primaryColor = #f49841
+      secondaryColor = #f49841
+      displayName = #autoLOC_8007100
+      themeName = Orange
      GAMEOBJECTS
      {
-        YellowStripe = true
-        OrangeStripe = false
+        YellowStripe = false
+        OrangeStripe = true
      }
    }
-    @VARIANT[Orange]
-    {
-      !TEXTURE {}
+	VARIANT
+	{
+      name = YellowAndWhite
+      primaryColor = #E8DB27
+      secondaryColor = #ffffff
+      displayName = #autoLOC_8003114
+      themeName = YellowAndWhite
      GAMEOBJECTS
      {
-        YellowStripe = false
-        OrangeStripe = true
+        YellowStripe = true
+        OrangeStripe = false
      }
    }
  }
@ -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,22 +577,30 @@
        OrangeStripe = false
      }
    }
-    @VARIANT[YellowAndWhite]
-    {
-      !TEXTURE {}
+	VARIANT
+	{
+      name = Orange
+      primaryColor = #f49841
+      secondaryColor = #f49841
+      displayName = #autoLOC_8007100
+      themeName = Orange
      GAMEOBJECTS
      {
-        YellowStripe = true
-        OrangeStripe = false
+        YellowStripe = false
+        OrangeStripe = true
      }
    }
-    @VARIANT[Orange]
-    {
-      !TEXTURE {}
+	VARIANT
+	{
+      name = YellowAndWhite
+      primaryColor = #E8DB27
+      secondaryColor = #ffffff
+      displayName = #autoLOC_8003114
+      themeName = YellowAndWhite
      GAMEOBJECTS
      {
-        YellowStripe = false
-        OrangeStripe = true
+        YellowStripe = true
+        OrangeStripe = false
      }
    }
  }
--- 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
@ -35,12 +35,12 @@
      TEXTURE
      {
        materialName=FairingIconShell
-        mainTextureURL =  ReStock/Assets/Payload/restock-fairing-125-1
+        mainTextureURL =  ReStock/Assets/Payload/restock-fairing-25-1
      }
      EXTRA_INFO
      {
-        FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-125-1
-        FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-125-1-n
+        FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-25-1
+        FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-25-1-n
        CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1
      }
      GAMEOBJECTS
@ -57,13 +57,13 @@
      TEXTURE
      {
        materialName=FairingIconShell
-        mainTextureURL =  ReStock/Assets/Payload/restock-fairing-125-1
+        mainTextureURL =  ReStock/Assets/Payload/restock-fairing-25-1-blackwhite
      }
      EXTRA_INFO
      {
-        FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-125-1
-        FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-125-1-n
-        CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1
+        FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-25-1-blackwhite
+        FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-25-1-n
+        CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-blackandwhite
      }
      GAMEOBJECTS
      {
@ -79,12 +79,12 @@
      TEXTURE
      {
        materialName=FairingIconShell
-        mainTextureURL =  ReStock/Assets/Payload/restock-fairing-125-1-orange
+        mainTextureURL =  ReStock/Assets/Payload/restock-fairing-25-1-orange
      }
      EXTRA_INFO
      {
-        FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-125-1-orange
-        FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-125-1-n
+        FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-25-1-orange
+        FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-25-1-n
        CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-orange
      }
 			GAMEOBJECTS
--- 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/Parts/Payload/1875/restock-fairing-1875-1.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Payload/1875/restock-fairing-1875-1.cfg
@ -85,9 +85,9 @@ PART
 		nSides = 32
 		nArcs = 2
 		nCollidersPerXSection = 8
-		TextureURL = ReStock/Assets/Payload/restock-fairing-125-1
+		TextureURL = ReStock/Assets/Payload/restock-fairing-25-1
    CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1
-    TextureNormalURL = ReStock/Assets/Payload/restock-fairing-125-1-n
+    TextureNormalURL = ReStock/Assets/Payload/restock-fairing-25-1-n

 		panelGrouping = 3
 		pivot = 0,0.151,0
@ -332,12 +332,12 @@ PART
 			TEXTURE
      {
        materialName=FairingIconShell
-        mainTextureURL =  ReStock/Assets/Payload/restock-fairing-125-1
+        mainTextureURL =  ReStock/Assets/Payload/restock-fairing-25-1
      }
      EXTRA_INFO
      {
-        FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-125-1
-        FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-125-1-n
+        FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-25-1
+        FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-25-1-n
        CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1
      }
      GAMEOBJECTS
@ -357,13 +357,13 @@ PART
 			TEXTURE
      {
        materialName=FairingIconShell
-        mainTextureURL =  ReStock/Assets/Payload/restock-fairing-125-1
+        mainTextureURL =  ReStock/Assets/Payload/restock-fairing-25-1-blackwhite
      }
      EXTRA_INFO
      {
-        FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-125-1
-        FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-125-1-n
-        CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1
+        FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-25-1-blackwhite
+        FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-25-1-n
+        CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-blackandwhite
      }
      GAMEOBJECTS
      {
@ -382,12 +382,12 @@ PART
 			TEXTURE
      {
        materialName=FairingIconShell
-        mainTextureURL =  ReStock/Assets/Payload/restock-fairing-125-1-orange
+        mainTextureURL =  ReStock/Assets/Payload/restock-fairing-25-1-orange
      }
      EXTRA_INFO
      {
-        FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-125-1-orange
-        FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-125-1-n
+        FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-25-1-orange
+        FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-25-1-n
        CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-orange
      }
 			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
 }