Add RCS fixes

Distribution/Restock/GameData/ReStock/Patches/Control/restock-rcs.cfg

@@ -1,7 +1,9 @@
 // Patches applying art changes to RCS blocks
 // Contents:
 // - RV-105 RCS Thruster Block (RCSBlock_v2)
+// - RV-1X RCS Thruster Block (RCSblock_01_small)
 // - Place-Anywhere 7 Linear RCS Port (linearRcs)
+// - Place-Anywhere 1 Linear RCS Port (RCSLinearSmall)
 // - Vernor Engine (vernorEngine)
 
 // RV-105 RCS Thruster Block
@@ -12,7 +14,7 @@
   !MODEL {}
   MODEL
   {
-    model = ReStock/Assets/Control/restock-rcs-block-2
+    model = ReStock/Assets/Control/restock-rcs-block-multi-1
   }
   !EFFECTS {}
   EFFECTS
@@ -59,10 +61,302 @@
     }
   }
   !MODULE[FXModuleAnimateRCS] {}
+  !MODULE[ModulePartVariants] {}
+  MODULE
+  {
+    name = ModulePartVariants
+    baseVariant = Angled
+    VARIANT
+    {
+      name = Angled
+      displayName = #autoLOC_8014157 //#autoLOC_8014157 = Angled 4-horn
+      themeName = White
+      primaryColor = #ffffff
+      mass = 0
+      cost = 0
+      GAMEOBJECTS
+      {
+        B_RCS2x = false
+        B_RCS3x = false
+        B_RCS4x = false
+        B_RCS4xA = true
+        B_RCS5x = false
+      }
+    }
+    VARIANT
+    {
+      name = 5Horn
+      displayName = #autoLOC_8014156 //#autoLOC_8014156 = Orthogonal 5-horn
+      themeName = White
+      primaryColor = #ffffff
+      mass = 0.01
+      cost = 7
+      GAMEOBJECTS
+      {
+        B_RCS2x = false
+        B_RCS3x = false
+        B_RCS4x = false
+        B_RCS4xA = false
+        B_RCS5x = true
+      }
+    }
+    VARIANT
+    {
+      name = 4Horn
+      displayName = #autoLOC_8014155 //#autoLOC_8014155 = Orthogonal 4-horn
+      themeName = White
+      primaryColor = #ffffff
+      mass = 0
+      cost = 0
+      GAMEOBJECTS
+      {
+        B_RCS2x = false
+        B_RCS3x = false
+        B_RCS4x = true
+        B_RCS4xA = false
+        B_RCS5x = false
+      }
+    }
+    VARIANT
+    {
+      name = 3Horn
+      displayName = #autoLOC_8014154 //#autoLOC_8014154 = Orthogonal 3-horn
+      themeName = White
+      primaryColor = #ffffff
+      mass = -0.01
+      cost = -8
+      GAMEOBJECTS
+      {
+        B_RCS2x = false
+        B_RCS3x = true
+        B_RCS4x = false
+        B_RCS4xA = false
+        B_RCS5x = false
+      }
+    }
+    VARIANT
+    {
+      name = 2Horn
+      displayName = #autoLOC_8014153 //#autoLOC_8014153 = Orthogonal 2-horn
+      themeName = White
+      primaryColor = #ffffff
+      mass = -0.02
+      cost = -15
+      GAMEOBJECTS
+      {
+        B_RCS2x = true
+        B_RCS3x = false
+        B_RCS4x = false
+        B_RCS4xA = false
+        B_RCS5x = false
+      }
+    }
+    
+  }
   MODULE
   {
     name = ModuleRestockDepthMask
-    maskTransform = 4Mask
+    maskTransform = RCSMask
+  }
+  MODULE
+  {
+    name = ModuleRestockRCSGlow
+    shaderColorParameter = _TintColor
+    alphaCurve
+    {
+      key = 0 0
+      key = 1 1
+    }
+    redCurve
+    {
+      key = 0 1
+    }
+    greenCurve
+    {
+      key = 0 1
+    }
+    blueCurve
+    {
+      key = 0 1
+    }
+  }
+}
+
+// RV-1X RCS Thruster Block
+@PART[RCSblock_01_small]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+
+  @author = Chris Adderley (Nertea)
+  !mesh = DELETE
+  !MODEL {}
+  MODEL
+  {
+    model = ReStock/Assets/Control/restock-rcs-block-multi-mini-1
+  }
+  @rescaleFactor = 1
+  !EFFECTS {}
+  EFFECTS
+  {
+    running
+    {
+      AUDIO_MULTI_POOL
+      {
+        channel = Ship
+        transformName = RCSjet
+        clip = sound_rocket_mini
+        volume = 0.0 0.0
+        volume = 0.1 0.0
+        volume = 0.5 0.025
+        volume = 1.0 0.1
+        pitch = 1.0
+        loop = true
+      }
+      MODEL_MULTI_PARTICLE
+      {
+        name = fx1
+        modelName = ReStock/FX/restock-fx-rcs-mini-1
+        transformName = RCSjet
+        emission = 0.0 0.0
+        emission = 0.1 0.0
+        emission = 1.0 1.0
+        speed = 0.0 0.8
+        speed = 1.0 1.0
+        //localRotation = -90, 0, 0
+      }
+      MODEL_MULTI_PARTICLE
+      {
+        name = fx2
+        modelName = ReStock/FX/restock-fx-rcs-mini-1
+        transformName = RCSjet
+        emission = 0.0 0.0
+        emission = 0.1 0.0
+        emission = 1.0 1.0
+        speed = 0.0 0.8
+        speed = 1.0 1.0
+        //localRotation = -90, 0, 0
+        localPosition = 0, 0.01, 0
+      }
+    }
+  }
+  !MODULE[FXModuleAnimateRCS] {}
+  !MODULE[ModulePartVariants] {}
+  MODULE
+  {
+    name = ModulePartVariants
+    baseVariant = Angled
+    VARIANT
+    {
+      name = Angled
+      displayName = #autoLOC_8014157 //#autoLOC_8014157 = Angled 4-horn
+      themeName = White
+      primaryColor = #ffffff
+      mass = 0
+      cost = 0
+      GAMEOBJECTS
+      {
+        B_RCS2x = false
+        B_RCS3x = false
+        B_RCS4x = false
+        B_RCS4xA = true
+        B_RCS5x = false
+      }
+    }
+    VARIANT
+    {
+      name = 5Horn
+      displayName = #autoLOC_8014156 //#autoLOC_8014156 = Orthogonal 5-horn
+      themeName = White
+      primaryColor = #ffffff
+      mass = 0.00125
+      cost = 5
+      GAMEOBJECTS
+      {
+        B_RCS2x = false
+        B_RCS3x = false
+        B_RCS4x = false
+        B_RCS4xA = false
+        B_RCS5x = true
+      }
+    }
+    VARIANT
+    {
+      name = 4Horn
+      displayName = #autoLOC_8014155 //#autoLOC_8014155 = Orthogonal 4-horn
+      themeName = White
+      primaryColor = #ffffff
+      mass = 0
+      cost = 0
+      GAMEOBJECTS
+      {
+        B_RCS2x = false
+        B_RCS3x = false
+        B_RCS4x = true
+        B_RCS4xA = false
+        B_RCS5x = false
+      }
+    }
+    VARIANT
+    {
+      name = 3Horn
+      displayName = #autoLOC_8014154 //#autoLOC_8014154 = Orthogonal 3-horn
+      themeName = White
+      primaryColor = #ffffff
+      mass = -0.00125
+      cost = -5
+      GAMEOBJECTS
+      {
+        B_RCS2x = false
+        B_RCS3x = true
+        B_RCS4x = false
+        B_RCS4xA = false
+        B_RCS5x = false
+      }
+    }
+    VARIANT
+    {
+      name = 2Horn
+      displayName = #autoLOC_8014153 //#autoLOC_8014153 = Orthogonal 2-horn
+      themeName = White
+      primaryColor = #ffffff
+      mass = -0.0025
+      cost = -10
+      GAMEOBJECTS
+      {
+        B_RCS2x = true
+        B_RCS3x = false
+        B_RCS4x = false
+        B_RCS4xA = false
+        B_RCS5x = false
+      }
+    }
+    
+  }
+  MODULE
+  {
+    name = ModuleRestockDepthMask
+    maskTransform = RCSMask
+  }
+  MODULE
+  {
+    name = ModuleRestockRCSGlow
+    shaderColorParameter = _TintColor
+    alphaCurve
+    {
+      key = 0 0
+      key = 1 1
+    }
+    redCurve
+    {
+      key = 0 1
+    }
+    greenCurve
+    {
+      key = 0 1
+    }
+    blueCurve
+    {
+      key = 0 1
+    }
   }
 }
 
@@ -74,7 +368,7 @@
   !MODEL {}
   MODEL
   {
-    model = ReStock/Assets/Control/restock-rcs-linear-1
+    model = ReStock/Assets/Control/restock-rcs-linear-2
   }
   !EFFECTS {}
   EFFECTS
@@ -158,6 +452,116 @@
     name = ModuleRestockDepthMask
     maskTransform = 1MaskShroud
   }
+  !MODULE[FXModuleAnimateRCS] {}
+  MODULE
+  {
+    name = ModuleRestockRCSGlow
+    shaderColorParameter = _TintColor
+    alphaCurve
+    {
+      key = 0 0
+      key = 1 1
+    }
+    redCurve
+    {
+      key = 0 1
+    }
+    greenCurve
+    {
+      key = 0 1
+    }
+    blueCurve
+    {
+      key = 0 1
+    }
+  }
+}
+
+// Place-Anywhere 1 Linear RCS Port
+@PART[RCSLinearSmall]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+  @author = Chris Adderley (Nertea)
+  !mesh = DELETE
+  !MODEL {}
+  MODEL
+  {
+    model = ReStock/Assets/Control/restock-rcs-linear-mini-1
+  }
+  !EFFECTS {}
+  EFFECTS
+  {
+    running
+    {
+      AUDIO
+      {
+        channel = Ship
+        clip = sound_rocket_mini
+        volume = 0.0 0.0
+        volume = 0.02 0.2
+        volume = 0.5 0.2
+        volume = 1.0 0.2
+        pitch = 1.0
+        loop = true
+      }
+      MODEL_MULTI_PARTICLE
+      {
+        name = fx1
+        modelName = ReStock/FX/restock-fx-rcs-1
+        transformName = RCSjet
+        emission = 0.0 0.0
+        emission = 0.1 0.0
+        emission = 1.0 1.0
+        speed = 0.0 0.8
+        speed = 1.0 1.0
+        //localRotation = -90, 0, 0
+      }
+      MODEL_MULTI_PARTICLE
+      {
+        name = fx2
+        modelName = ReStock/FX/restock-fx-rcs-1
+        transformName = RCSjet
+        emission = 0.0 0.0
+        emission = 0.1 0.0
+        emission = 1.0 1.0
+        speed = 0.0 0.8
+        speed = 1.0 1.0
+        //localRotation = -90, 0, 0
+        localPosition = 0, -0.015, 0
+      }
+    }
+  }
+  MODULE
+  {
+    name = ModuleRestockDepthMask
+    maskTransform = RCSMask
+  }
+  !MODULE[FXModuleAnimateRCS] {}
+  MODULE
+  {
+    name = ModuleRestockRCSGlow
+    shaderColorParameter = _TintColor
+    alphaCurve
+    {
+      key = 0 0
+      key = 1 1
+    }
+    redCurve
+    {
+      key = 0 1
+    }
+    greenCurve
+    {
+      key = 0 1
+    }
+    blueCurve
+    {
+      key = 0 1
+    }
+  }
+  @MODULE[ModuleRCSFX]
+  {
+    @thrusterTransformName = RCSthruster
+  }
 }
 
 // Vernor Engine

Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-lights.cfg

@@ -86,13 +86,12 @@
   {
     @lightMeshRendererName = FloodLightLens
     @lightName = Spot
-    movementTransformName = FloodLight
+    movementTransformName = FloodR
     canRotate = false
     canPitch = true
     pitchAxisName = X
-    pitchMin = -194
-    pitchMax = -13
-    pitchAngle = -13
+    pitchMin = 0
+    pitchMax = 180
   }
   MODULE
   {

Distribution/Restock/GameData/ReStock/Restock.restockblacklist

@@ -151,6 +151,7 @@ Squad/Parts/Utility/parachuteMk25/
 Squad/Parts/Utility/radialAttachmentPoint/
 Squad/Parts/Utility/rcsBlockRV-105/
 Squad/Parts/Utility/rcsBlockRV-105_v2/
+Squad/Parts/Utility/rcsSmallLinear/
 Squad/Parts/Utility/RelayAntennas/
 Squad/Parts/Utility/rockomaxAdapters/
 Squad/Parts/Utility/ServiceBay/

Distribution/Restock/changelog.txt

@@ -9,9 +9,14 @@ v1.3.0
   - Navigation Light Mk1 (Nertea): now has a Metal variant
   - Work Lamp - small (Nertea)
   - Work Lamp - Stand (Nertea)
+ - RCS
+  - RV-105 RCS Block (Nertea): ported RCS models from Restock+ to support new variants
+  - RV-1X RCS Block (Nertea): ported RCS models from Restock+ to support new model
+  - PlaceAnywhere 1 Linear RCS thruster (Nertea): ported RCS model from Restock+
 - Updates and fixes
  - Updated old Mk1, Mk2 Illuminator models to use reflectivity on their lenses
  - Added White variant to Mk1, Mk2 Illuminators
+ - Added RCS nozzle glows to improve RCS effects
  - Updated Russian localization (Fedor-St)
  - Updated Japanese localization (Chemical-Factory)