Merge branch '1-10-updates' into Master

2024-09-01 17:34:42 +00:00 · 2020-08-04 22:08:36 -07:00
parent 2c00d5fa5c 8b77cc27fa
commit cd3987cea9
36 changed files with 547 additions and 53 deletions
--- a/Distribution/Restock/GameData/ReStock/Patches/CompoundParts/restock-fuelline.cfg
+++ b/Distribution/Restock/GameData/ReStock/Patches/CompoundParts/restock-fuelline.cfg
@ -26,14 +26,16 @@
    stretchAxis = x
    stretchTextures = _MainTex _BumpMap
  }
+
+  !MODULE[ModulePartVariants] {}
  MODULE
  {
    name = ModulePartVariants
    useMultipleDragCubes = false
-    baseVariant = Yellow
+    baseVariant = YellowAndWhite
    VARIANT
    {
-      name = Yellow
+      name = YellowAndWhite
      displayName = #LOC_Restock_variant-surface_yellow
      themeName = YellowAndWhite
      primaryColor = #B08D43
@ -44,6 +46,8 @@
        line_black = false
        line_metal = false
        line_sofi = false
+        line_white = false
+        line_blue = false
      }
    }
    VARIANT
@ -59,6 +63,8 @@
        line_black = true
        line_metal = false
        line_sofi = false
+        line_white = false
+        line_blue = false
      }
    }
    VARIANT
@ -74,6 +80,8 @@
        line_black = false
        line_metal = true
        line_sofi = false
+        line_white = false
+        line_blue = false
      }
    }
    VARIANT
@ -81,7 +89,7 @@
      name = Orange
      displayName = #autoLOC_8007123
      themeName = Orange
-      primaryColor = #B08D43
+      primaryColor = #A55929
      secondaryColor = #999999
      GAMEOBJECTS
      {
@ -89,6 +97,42 @@
        line_black = false
        line_metal = false
        line_sofi = true
+        line_white = false
+        line_blue = false
+      }
+    }
+    VARIANT
+    {
+      name = White
+      displayName = #LOC_Restock_variant-surface_white
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #999999
+      GAMEOBJECTS
+      {
+        line_yellow = false
+        line_black = false
+        line_metal = false
+        line_sofi = false
+        line_white = true
+        line_blue = false
+      }
+    }
+    VARIANT
+    {
+      name = Blue
+      displayName = #LOC_Restock_variant-surface_blue
+      themeName = White
+      primaryColor = #426573
+      secondaryColor = #999999
+      GAMEOBJECTS
+      {
+        line_yellow = false
+        line_black = false
+        line_metal = false
+        line_sofi = false
+        line_white = false
+        line_blue = true
      }
    }
  }
--- a/Distribution/Restock/GameData/ReStock/Patches/CompoundParts/restock-strut.cfg
+++ b/Distribution/Restock/GameData/ReStock/Patches/CompoundParts/restock-strut.cfg
@ -26,16 +26,18 @@
    stretchAxis = x
    stretchTextures = _MainTex _BumpMap
  }
+
+  !MODULE[ModulePartVariants] {}
  MODULE
  {
    name = ModulePartVariants
    useMultipleDragCubes = false
-    baseVariant = Classic
+    baseVariant = Gray
    VARIANT
    {
-      name = Classic
-      displayName = #LOC_Restock_variant-mounting_classic
-      themeName = White
+      name = Gray
+      displayName = #LOC_Restock_variant-strut_classic_metal
+      themeName = Metal
      primaryColor = #6f6e6d
      secondaryColor = #999999
      GAMEOBJECTS
@ -44,13 +46,19 @@
        strut_target_body_classic = true
        strut_main_body_compact = false
        strut_target_body_compact = false
+        strut_main_body_classic_white = false
+        strut_target_body_classic_white = false
+        strut_main_body_compact_white = false
+        strut_target_body_compact_white = false
+        strut_metal = true
+        strut_white = false
      }
    }
    VARIANT
    {
      name = Compact
-      displayName = #LOC_Restock_variant-mounting_compact
-      themeName = White
+      displayName = #LOC_Restock_variant-strut_compact_metal
+      themeName = Metal
      primaryColor = #6f6e6d
      secondaryColor = #999999
      GAMEOBJECTS
@ -59,6 +67,54 @@
        strut_target_body_classic = false
        strut_main_body_compact = true
        strut_target_body_compact = true
+        strut_main_body_classic_white = false
+        strut_target_body_classic_white = false
+        strut_main_body_compact_white = false
+        strut_target_body_compact_white = false
+        strut_metal = true
+        strut_white = false
+      }
+    }
+    VARIANT
+    {
+      name = White
+      displayName = #LOC_Restock_variant-strut_classic_white
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #999999
+      GAMEOBJECTS
+      {
+        strut_main_body_classic = false
+        strut_target_body_classic = false
+        strut_main_body_compact = false
+        strut_target_body_compact = false
+        strut_main_body_classic_white = true
+        strut_target_body_classic_white = true
+        strut_main_body_compact_white = false
+        strut_target_body_compact_white = false
+        strut_metal = false
+        strut_white = true
+      }
+    }
+    VARIANT
+    {
+      name = White_Compact
+      displayName = #LOC_Restock_variant-strut_compact_white
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #999999
+      GAMEOBJECTS
+      {
+        strut_main_body_classic = false
+        strut_target_body_classic = false
+        strut_main_body_compact = false
+        strut_target_body_compact = false
+        strut_main_body_classic_white = false
+        strut_target_body_classic_white = false
+        strut_main_body_compact_white = true
+        strut_target_body_compact_white = true
+        strut_metal = false
+        strut_white = true
      }
    }
  }
--- a/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-claws.cfg
+++ b/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-claws.cfg
@ -0,0 +1,347 @@
+// Patches applying art changes to the asteroid claw
+// Contents:
+// - Advanced Grabbing Unit (GrapplingDevice)
+// - Advanced Grabbing Unit Jr. (smallClaw)
+
+// Advanced Grabbing Unit
+@PART[GrapplingDevice]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+{
+  @author = Andrew Cassidy
+  !mesh = DELETE
+  MODEL
+  {
+    model = ReStock/Assets/Coupling/restock-claw-125-1
+  }
+  %rescaleFactor = 1
+  %node_stack_top = 0.0, -0.14082675, 0.00, 0.0, -1.0, 0.0, 1
+
+  @MODULE[ModuleGrappleNode]
+  {
+    nodeTransformName = Pivot
+  }
+  @MODULE[ModuleAnimateGeneric]
+  {
+    animationName = Deploy
+  }
+  @MODULE[FlagDecal]
+  {
+    textureQuadName = flags
+  }
+
+  !MODULE[FXModuleLookAtConstraint] {}
+  MODULE
+  {
+    name = ModuleRestockConstraints
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = Actuator_0_lower
+      targetName = Actuator_0_upper
+    }
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = Actuator_0_upper
+      targetName = Actuator_0_lower
+    }
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = Actuator_1_lower
+      targetName = Actuator_1_upper
+    }
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = Actuator_1_upper
+      targetName = Actuator_1_lower
+    }
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = Actuator_2_lower
+      targetName = Actuator_2_upper
+    }
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = Actuator_2_upper
+      targetName = Actuator_2_lower
+    }
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = Actuator_3_lower
+      targetName = Actuator_3_upper
+    }
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = Actuator_3_upper
+      targetName = Actuator_3_lower
+    }
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = Actuator_4_lower
+      targetName = Actuator_4_upper
+    }
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = Actuator_4_upper
+      targetName = Actuator_4_lower
+    }
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = Actuator_5_lower
+      targetName = Actuator_5_upper
+    }
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = Actuator_5_upper
+      targetName = Actuator_5_lower
+    }
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = Actuator_6_lower
+      targetName = Actuator_6_upper
+    }
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = Actuator_6_upper
+      targetName = Actuator_6_lower
+    }
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = Actuator_7_lower
+      targetName = Actuator_7_upper
+    }
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = Actuator_7_upper
+      targetName = Actuator_7_lower
+    }
+  } 
+
+  !MODULE[ModulePartVariants] {}
+  MODULE
+  {
+    name = ModulePartVariants
+    baseVariant = White
+    useMultipleDragCubes = false
+    VARIANT
+    {
+      name = White
+      displayName = #LOC_Restock_variant-surface_white
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #999999
+      GAMEOBJECTS
+      {
+        Accents_white = true
+        Accents_black = false
+        Accents_yellow = false
+      }
+    }
+    VARIANT
+    {
+      name = Dark
+      displayName = #LOC_Restock_variant-surface_black
+      themeName = Dark
+      primaryColor = #4c4f47
+      secondaryColor = #999999
+      GAMEOBJECTS
+      {
+        Accents_white = false
+        Accents_black = true
+        Accents_yellow = false
+      }
+    }
+    VARIANT
+    {
+      name = Yellow
+      displayName = #LOC_Restock_variant-surface_yellow
+      themeName = YellowAndWhite
+      primaryColor = #B08D43
+      secondaryColor = #999999
+      GAMEOBJECTS
+      {
+        Accents_white = false
+        Accents_black = false
+        Accents_yellow = true
+      }
+    }
+  }
+
+  MODULE
+  {
+    name = ModuleRestockDepthMask
+    maskTransform = DepthMask
+  }
+
+  MODULE
+  {
+    name = ModuleLight
+    lightName = Lamp
+    useAnimationDim = true
+    lightBrightenSpeed = 2.5
+    lightDimSpeed = 2.5
+    resourceAmount = 0.02
+    useResources = true
+    animationName = RestockClawLamp_On
+  }
+}
+
+// Advanced Grabbing Unit Jr.
+@PART[smallClaw]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+{
+  @author = Andrew Cassidy
+  !mesh = DELETE
+  MODEL
+  {
+    model = ReStock/Assets/Coupling/restock-claw-625-2
+  }
+  %rescaleFactor = 1
+  %node_stack_top = 0.0, -0.14082675, 0.00, 0.0, -1.0, 0.0, 1
+  %node_attach = 0.0, -0.0738, 0.00, 0.0, -1.0, 0.0, 1
+
+  @MODULE[ModuleGrappleNode]
+  {
+    nodeTransformName = Pivot
+  }
+
+  @MODULE[ModuleAnimateGeneric]
+  {
+    animationName = Deploy
+  }
+
+  @MODULE[FlagDecal]
+  {
+    textureQuadName = FlagTransform
+  }
+
+  !MODULE[FXModuleLookAtConstraint] {}
+  MODULE
+  {
+    name = ModuleRestockConstraints
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = Actuator_0_lower
+      targetName = Actuator_0_upper
+    }
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = Actuator_0_upper
+      targetName = Actuator_0_lower
+    }
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = Actuator_1_lower
+      targetName = Actuator_1_upper
+    }
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = Actuator_1_upper
+      targetName = Actuator_1_lower
+    }
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = Actuator_2_lower
+      targetName = Actuator_2_upper
+    }
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = Actuator_2_upper
+      targetName = Actuator_2_lower
+    }
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = Actuator_3_lower
+      targetName = Actuator_3_upper
+    }
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = Actuator_3_upper
+      targetName = Actuator_3_lower
+    }
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = Actuator_4_lower
+      targetName = Actuator_4_upper
+    }
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = Actuator_4_upper
+      targetName = Actuator_4_lower
+    }
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = Actuator_5_lower
+      targetName = Actuator_5_upper
+    }
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = Actuator_5_upper
+      targetName = Actuator_5_lower
+    }
+  } 
+
+  !MODULE[ModulePartVariants] {}
+  MODULE
+  {
+    name = ModulePartVariants
+    baseVariant = White
+    useMultipleDragCubes = false
+    VARIANT
+    {
+      name = White
+      displayName = #LOC_Restock_variant-surface_white
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #999999
+      GAMEOBJECTS
+      {
+        Body_white = true
+        Body_black = false
+        Body_yellow = false
+      }
+    }
+    VARIANT
+    {
+      name = Dark
+      displayName = #LOC_Restock_variant-surface_black
+      themeName = Dark
+      primaryColor = #4c4f47
+      secondaryColor = #999999
+      GAMEOBJECTS
+      {
+        Body_white = false
+        Body_black = true
+        Body_yellow = false
+      }
+    }
+    VARIANT
+    {
+      name = Yellow
+      displayName = #LOC_Restock_variant-surface_yellow
+      themeName = YellowAndWhite
+      primaryColor = #B08D43
+      secondaryColor = #999999
+      GAMEOBJECTS
+      {
+        Body_white = false
+        Body_black = false
+        Body_yellow = true
+      }
+    }
+  }
+
+  MODULE
+  {
+    name = ModuleRestockDepthMask
+    maskTransform = DepthMask
+  }
+
+  MODULE  
+  {
+    name = ModuleLight
+    lightName = SpotLight
+    useAnimationDim = true  
+    lightBrightenSpeed = 2.5  
+    lightDimSpeed = 2.5
+    resourceAmount = 0.02
+    useResources = true
+    animationName = RestockMiniClawLamp_On
+  }
+}
--- a/Distribution/Restock/GameData/ReStock/Patches/Science/restock-science.cfg
+++ b/Distribution/Restock/GameData/ReStock/Patches/Science/restock-science.cfg
@ -186,3 +186,26 @@
    }
  }
 }
+
+// Magnetometer Boom
+@PART[Magnetometer]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+{
+  @author = Andrew Cassidy
+  !mesh = DELETE
+  MODEL
+  {
+    model = ReStock/Assets/Science/restock-magnetometer-1
+  }
+
+  @MODULE[ModuleDeployablePart] 
+  {
+    @animationName = Deploy
+    @breakName = Pivot
+  }
+
+  MODULE
+  {
+    name = ModuleRestockDepthMask
+    maskTransform = DepthMask
+  }
+}