Update some 1.10 stuff

- SRB texture swap (#882) - Decoupler/separator striped variants (#880)
2024-09-01 17:34:42 +00:00 · 2020-07-27 10:29:44 -07:00
parent 40d2b4eea0
commit 42b13a08f3
27 changed files with 290 additions and 5 deletions
--- a/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-decouplers.cfg
+++ b/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-decouplers.cfg
@ -19,6 +19,7 @@
    model = ReStock/Assets/Coupling/restock-decoupler-0625-1
  }
  %rescaleFactor = 1
+  !MODULE[ModulePartVariants] {}
  MODULE
  {
    name = ModulePartVariants
@ -35,6 +36,7 @@
      {
        Decoupler0625White = false
        Decoupler0625Metal = true
+        Decoupler0625Yellow = false
      }
    }
    VARIANT
@ -48,6 +50,20 @@
      {
        Decoupler0625White = true
        Decoupler0625Metal = false
+        Decoupler0625Yellow = false
+      }
+    }
+    VARIANT
+    {
+      name = YellowAndWhite
+      displayName = #LOC_Restock_variant-mounting_classic
+      primaryColor = #b18b1b
+      secondaryColor = #000000
+      GAMEOBJECTS
+      {
+        Decoupler0625White = false
+        Decoupler0625Metal = false
+        Decoupler0625Yellow = true
      }
    }
  }
@ -64,6 +80,7 @@
    model = ReStock/Assets/Coupling/restock-decoupler-125-1
  }
  %rescaleFactor = 1
+  !MODULE[ModulePartVariants] {}
  MODULE
  {
    name = ModulePartVariants
@ -81,6 +98,7 @@
        Decoupler125White = false
        Decoupler125Dark = true
        Decoupler125Orange = false
+        Decoupler125Yellow = false
      }
    }
    VARIANT
@ -95,6 +113,7 @@
        Decoupler125White = true
        Decoupler125Dark = false
        Decoupler125Orange = false
+        Decoupler125Yellow = false
      }
    }
    VARIANT
@ -109,6 +128,21 @@
        Decoupler125White = false
        Decoupler125Dark = false
        Decoupler125Orange = true
+        Decoupler125Yellow = false
+      }
+    }
+    VARIANT
+    {
+      name = YellowAndWhite
+      displayName = #LOC_Restock_variant-mounting_classic
+      primaryColor = #b18b1b
+      secondaryColor = #000000
+      GAMEOBJECTS
+      {
+        Decoupler125White = false
+        Decoupler125Dark = false
+        Decoupler125Orange = false
+        Decoupler125Yellow = true
      }
    }
  }
@ -125,6 +159,7 @@
    model = ReStock/Assets/Coupling/restock-decoupler-25-1
  }
  %rescaleFactor = 1
+  !MODULE[ModulePartVariants] {}
  MODULE
  {
    name = ModulePartVariants
@ -142,6 +177,7 @@
        Decoupler25White = false
        Decoupler25Metal = true
        Decoupler25Orange = false
+        Decoupler25Yellow = false
      }
    }
    VARIANT
@ -156,6 +192,7 @@
        Decoupler25White = true
        Decoupler25Metal = false
        Decoupler25Orange = false
+        Decoupler25Yellow = false
      }
    }
    VARIANT
@ -170,6 +207,21 @@
        Decoupler25White = false
        Decoupler25Metal = false
        Decoupler25Orange = true
+        Decoupler25Yellow = false
+      }
+    }
+    VARIANT
+    {
+      name = YellowAndWhite
+      displayName = #LOC_Restock_variant-mounting_classic
+      primaryColor = #b18b1b
+      secondaryColor = #000000
+      GAMEOBJECTS
+      {
+        Decoupler25White = false
+        Decoupler25Metal = false
+        Decoupler25Orange = false
+        Decoupler25Yellow = true
      }
    }
  }
@ -186,6 +238,7 @@
    model = ReStock/Assets/Coupling/restock-decoupler-375-1
  }
  %rescaleFactor = 1
+  !MODULE[ModulePartVariants] {}
  MODULE
  {
    name = ModulePartVariants
@ -202,6 +255,7 @@
      {
        Decoupler375White = true
        Decoupler375Orange = false
+        Decoupler375Yellow = false
      }
    }
    VARIANT
@ -215,6 +269,20 @@
      {
        Decoupler375White = false
        Decoupler375Orange = true
+        Decoupler375Yellow = false
+      }
+    } 
+    VARIANT
+    {
+      name = YellowAndWhite
+      displayName = #LOC_Restock_variant-mounting_classic
+      primaryColor = #b18b1b
+      secondaryColor = #000000
+      GAMEOBJECTS
+      {
+        Decoupler375White = false
+        Decoupler375Orange = false
+        Decoupler375Yellow = true
      }
    }
  }
--- a/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-separators.cfg
+++ b/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-separators.cfg
@ -16,6 +16,7 @@
    model = ReStock/Assets/Coupling/restock-separator-0625-1
  }
  %rescaleFactor = 1
+  !MODULE[ModulePartVariants] {}
  MODULE
  {
    name = ModulePartVariants
@ -32,6 +33,7 @@
      {
        Separator0625White = false
        Separator0625Metal = true
+        Separator0625Yellow = false
      }
    }
    VARIANT
@ -45,6 +47,20 @@
      {
        Separator0625White = true
        Separator0625Metal = false
+        Separator0625Yellow = false
+      }
+    } 
+    VARIANT
+    {
+      name = YellowAndWhite
+      displayName = #LOC_Restock_variant-mounting_classic
+      primaryColor = #4b6787
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        Separator0625White = false
+        Separator0625Metal = false
+        Separator0625Yellow = true
      }
    }
  }
@ -61,6 +77,7 @@
    model = ReStock/Assets/Coupling/restock-separator-125-1
  }
  %rescaleFactor = 1
+  !MODULE[ModulePartVariants] {}
  MODULE
  {
    name = ModulePartVariants
@ -78,6 +95,7 @@
        Separator125White = false
        Separator125Dark = true
        Separator125Orange = false
+        Separator125Yellow = false
      }
    }
    VARIANT
@ -92,6 +110,7 @@
        Separator125White = true
        Separator125Dark = false
        Separator125Orange = false
+        Separator125Yellow = false
      }
    }
    VARIANT
@ -106,6 +125,21 @@
        Separator125White = false
        Separator125Dark = false
        Separator125Orange = true
+        Separator125Yellow = false
+      }
+    }
+    VARIANT
+    {
+      name = YellowAndWhite
+      displayName = #LOC_Restock_variant-mounting_classic
+      primaryColor = #4b6787
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        Separator125White = false
+        Separator125Dark = false
+        Separator125Orange = false
+        Separator125Yellow = true
      }
    }
  }
@ -122,6 +156,7 @@
    model = ReStock/Assets/Coupling/restock-separator-25-1
  }
  %rescaleFactor = 1
+  !MODULE[ModulePartVariants] {}
  MODULE
  {
    name = ModulePartVariants
@ -139,6 +174,7 @@
        Separator25White = false
        Separator25Metal = true
        Separator25Orange = false
+        Separator25Yellow = false
      }
    }
    VARIANT
@ -153,6 +189,7 @@
        Separator25White = true
        Separator25Metal = false
        Separator25Orange = false
+        Separator25Yellow = false
      }
    }
    VARIANT
@ -167,6 +204,21 @@
        Separator25White = false
        Separator25Metal = false
        Separator25Orange = true
+        Separator25Yellow = false
+      }
+    }
+    VARIANT
+    {
+      name = YellowAndWhite
+      displayName = #LOC_Restock_variant-mounting_classic
+      primaryColor = #4b6787
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        Separator25White = false
+        Separator25Metal = false
+        Separator25Orange = false
+        Separator25Yellow = true
      }
    }
  }
@ -183,6 +235,7 @@
    model = ReStock/Assets/Coupling/restock-separator-375-1
  }
  %rescaleFactor = 1
+  !MODULE[ModulePartVariants] {}
  MODULE
  {
    name = ModulePartVariants
@ -199,6 +252,7 @@
      {
        Separator375White = true
        Separator375Orange = false
+        Separator375Yellow = false
      }
    }
    VARIANT
@ -212,6 +266,20 @@
      {
        Separator375White = false
        Separator375Orange = true
+        Separator375Yellow = false
+      }
+    }
+    VARIANT
+    {
+      name = YellowAndWhite
+      displayName = #LOC_Restock_variant-mounting_classic
+      primaryColor = #4b6787
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        Separator375White = false
+        Separator375Orange = false
+        Separator375Yellow = 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
@ -15,7 +15,7 @@
  !MODEL {}
  MODEL
  {
-    model = ReStock/Assets/Engine/restock-engine-srb-kickback-1
+    model = ReStock/Assets/Engine/restock-engine-srb-kickback-2
  }
  %rescaleFactor = 1
  !EFFECTS {}
@ -89,6 +89,10 @@
      }
    }
  }
+
+  !MODULE[FXModuleAnimateThrottle] {}
+  !MODULE[ModulePartVariants] {}
+
  @MODULE[ModuleEnginesFX]
  {
    %runningEffectName = fx-kickback-running
@ -137,10 +141,80 @@
      rotatorsName = CylUpper008
    }
  }
-  @MODULE[FXModuleAnimateThrottle]
+  
+
+  MODULE
  {
-    @animationName = restock-srb-kickback-heat-1
-    @responseSpeed = 0.1
+    name = FXModuleThrottleEffects
+    fxModuleNames = heatColor
+    responseSpeed = 1.0
+    dependOnEngineState = True
+    dependOnThrottle = True
+  }
+  MODULE
+  {
+    name = ModuleColorChanger
+    moduleID = heatColor
+    animRate = 0.1
+    shaderProperty = _EmissiveColor
+    toggleInEditor = false
+    toggleInFlight = false
+    redCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+    greenCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+    blueCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+    alphaCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+  }
+
+  MODULE
+  {
+    name = ModulePartVariants
+    baseVariant = White
+    useMultipleDragCubes = false
+    VARIANT
+    {
+      name = White
+      displayName = #autoLOC_8007119
+      description = #autoLOC_8003040
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        KickbackBase = true
+        KickbackTop = true
+        KickbackBaseWhite = false
+      }
+      
+    }
+    VARIANT
+    {
+      name = ESA
+      displayName = #autoLOC_6005083
+      description = #autoLOC_6005084 
+      primaryColor = #ffffff
+      secondaryColor = #124d7f
+      GAMEOBJECTS
+      {
+        KickbackBase = false
+        KickbackTop = false
+        KickbackBaseWhite = true
+      }
+    }
  }
 }