Merge branch 'Wheels' into develop

Distribution/Restock/GameData/ReStock/Localization/en-us.cfg

@@ -74,6 +74,9 @@ Localization
     #LOC_Restock_variant-telescope_shielded = Shielded
     #LOC_Restock_variant-telescope_bare = Bare
 
+    #LOC_Restock_variant-wheel_broken = Broken
+    #LOC_Restock_variant-wheel_bare = Bare
+
     #LOC_Restock_variant-surface_metal = Metal
     #LOC_Restock_variant-surface_basic = Basic
     #LOC_Restock_variant-surface_truss = Truss

Distribution/Restock/GameData/ReStock/Patches/Ground/restock-wheels.cfg

@@ -0,0 +1,257 @@
+// Patches applying art changes to wheels
+// Contents:
+// - Rovemax Model S2 (roverWheel2)
+// - Rovemax Model M1 (roverWHeel1)
+// - TR-2L Ruggedized Wheel (wheelMed)
+
+// RoveMax Model S2
+@PART[roverWheel2]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+{
+  @author = Andrew Cassidy
+
+  !MODEL {}
+  MODEL
+  {
+    model = ReStock/Assets/Ground/restock-wheel-1
+  }
+
+  @MODULE[ModuleWheelSuspension] {
+    @suspensionTransformName = SuspensionPivot
+  }
+
+  @MODULE[ModuleWheelSteering] {
+    @steeringTransformName = SteeringPivot
+  }
+
+  @MODULE[ModuleWheelDamage] {
+    @damagedTransformName = WheelBusted
+    @undamagedTransformName = Wheel
+  }
+
+  !MODULE[FXModuleLookAtConstraint] {}
+
+  MODULE
+  {
+    name = ModuleRestockConstraints
+
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = Suspension1
+      targetName = Suspension2
+    }
+
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = Suspension2
+      targetName = Suspension1
+    }
+  }
+
+  MODULE
+  {
+    name = ModulePartVariants
+    useMultipleDragCubes = false
+    baseVariant = Bare
+    VARIANT
+    {
+      name = Bare
+      displayName = #LOC_Restock_variant-probe-bare
+      primaryColor = #999999
+      secondaryColor = #999999
+
+      GAMEOBJECTS
+      {
+        body_gold = false
+        SteeringPivot_gold = false
+        body_silver = false
+        SteeringPivot_silver = false
+      }
+    }
+    VARIANT
+    {
+      name = Gold
+      displayName = #LOC_Restock_variant-probe-gold
+      themeName = Gold
+      primaryColor = #fccb0a
+      secondaryColor = #999999
+
+      GAMEOBJECTS
+      {
+        body_gold = true
+        SteeringPivot_gold = true
+        body_silver = false
+        SteeringPivot_silver = false
+      }
+    }
+    VARIANT
+    {
+      name = Silver
+      displayName = #LOC_Restock_variant-probe-silver
+      themeName = Silver
+      primaryColor =  #cecece
+      secondaryColor = #999999
+
+      GAMEOBJECTS
+      {
+        body_gold = false
+        SteeringPivot_gold = false
+        body_silver = true
+        SteeringPivot_silver = true
+      }
+    }
+  }
+}
+
+// RoveMax Model M1
+@PART[roverWheel1]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+{
+  @author = Andrew Cassidy
+
+  !mesh = DELETE
+  MODEL
+  {
+    model = ReStock/Assets/Ground/restock-wheel-2
+  }
+
+  @MODULE[ModuleWheelSuspension] {
+    @suspensionTransformName = SuspensionPivot
+  }
+
+  @MODULE[ModuleWheelSteering] {
+    @steeringTransformName = SteeringPivot
+  }
+
+  @MODULE[ModuleWheelDamage] {
+    @damagedTransformName = WheelBusted
+    @undamagedTransformName = Wheel
+  }
+
+  !MODULE[FXModuleLookAtConstraint]
+
+  MODULE
+  {
+    name = ModuleRestockConstraints
+
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = Link1
+      targetName = Link1Target
+    }
+
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = Link2
+      targetName = Link2Target
+    }
+
+    COPYROTATIONCONSTRAINT
+    {
+      rotatorsName = LowerBracket
+      targetName = Base
+    }
+
+    COPYROTATIONCONSTRAINT
+    {
+      rotatorsName = SteeringPivotFollower
+      targetName = SteeringPivot
+    }
+
+    COPYROTATIONCONSTRAINT
+    {
+      rotatorsName = WheelPivotFollower 
+      targetName = WheelPivot
+    }
+
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = ShockCylinder
+      targetName = ShockPiston
+    }
+
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = ShockPiston
+      targetName = ShockCylinder
+    }
+
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = SteeringPiston1
+      targetName = SteeringCylinder1
+    }
+
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = SteeringCylinder1
+      targetName = SteeringPiston1
+    }
+
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = SteeringPiston2
+      targetName = SteeringCylinder2
+    }
+
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = SteeringCylinder2
+      targetName = SteeringPiston2
+    }
+  }
+}
+
+// TR-2L Ruggedized Vehicular Wheel
+@PART[wheelMed]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+{
+  @author = Andrew Cassidy
+
+  !MODEL {}
+  MODEL
+  {
+    model = ReStock/Assets/Ground/restock-wheel-3
+  }
+
+  @MODULE[ModuleWheelSuspension] {
+    @suspensionTransformName = SuspensionPivot
+  }
+
+  @MODULE[ModuleWheelSteering] {
+    @steeringTransformName = SteeringPivot
+  }
+
+  @MODULE[ModuleWheelDamage] {
+    @damagedTransformName = WheelBusted
+    @undamagedTransformName = Wheel
+  }
+
+  !MODULE[FXModuleLookAtConstraint] {}
+
+  MODULE
+  {
+    name = ModuleRestockConstraints
+
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = DamperCylinder
+      targetName = DamperPiston
+    }
+
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = DamperPiston
+      targetName = DamperCylinder
+    }
+
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = SteeringCylinder1
+      targetName = SteeringPiston1
+    }
+
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = SteeringPiston1
+      targetName = SteeringCylinder1
+    }
+  }
+}

Distribution/Restock/GameData/ReStock/PatchesMH/Ground/restock-mh-wheels.cfg

@@ -0,0 +1,156 @@
+// Patches applying art changes to the Making History rover wheel
+// Contents:
+// - RoveMax M1-F Rover Wheel (roverWheelM1-F)
+
+// RoveMax M1-F Rover Wheel
+@PART[roverWheelM1-F]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+{
+  @author = Andrew Cassidy
+
+  !MODEL {}
+  MODEL
+  {
+    model = ReStock/Assets/Ground/restock-wheel-4
+  }
+
+  @MODULE[ModuleWheelSuspension] {
+    @suspensionTransformName = SuspensionPivot
+  }
+
+  @MODULE[ModuleWheelSteering] {
+    @steeringTransformName = SteeringPivot
+  }
+
+  @MODULE[ModuleWheelDamage] {
+    @damagedTransformName = WheelBusted
+    @undamagedTransformName = Wheel
+  }
+
+  @MODULE[ModuleWheelDeployment] {
+    @animationTrfName = restock-wheel-4
+    @animationStateName = restock-wheel-4-deploy
+
+  }
+
+  !MODULE[ModulePartVariants] {}
+
+  MODULE
+  {
+    name = ModulePartVariants
+    baseVariant = Orange
+    VARIANT
+    {
+      name = Orange
+      displayName = #autoLOC_8007100 // Orange
+      themeName = Orange
+      primaryColor = #74402B
+      secondaryColor = #707070
+      GAMEOBJECTS
+      {
+        Fender_orange = true
+        Fender_grey = false
+        Fender_cernan = false
+      }
+    }
+
+    VARIANT
+    {
+      name = Grey
+      displayName = #autoLOC_8007119 // White
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #707070
+      GAMEOBJECTS
+      {
+        Fender_orange = false
+        Fender_grey = true
+        Fender_cernan = false
+      }
+    }
+
+    VARIANT
+    {
+      name = Cernan
+      displayName = #LOC_Restock_variant-wheel_broken // Broken
+      themeName = Orange
+      primaryColor = #74402B
+      secondaryColor = #A0A0A0
+      GAMEOBJECTS
+      {
+        Fender_orange = false
+        Fender_grey = false
+        Fender_cernan = true
+      }
+    }
+
+    VARIANT
+    {
+      name = Bare
+      displayName = #LOC_Restock_variant-wheel_bare //Bare
+      themeName = White
+      primaryColor = #707070
+      secondaryColor = #707070
+      GAMEOBJECTS
+      {
+        Fender_orange = false
+        Fender_grey = false
+        Fender_cernan = false
+      }
+    }
+  }
+
+  !MODULE[FXModuleLookAtConstraint] {}
+
+  MODULE
+  {
+    name = ModuleRestockConstraints
+
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = Link1
+      targetName = Link1Target
+    }
+
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = Link2
+      targetName = Link2Target
+    }
+
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = SuspensionPiston
+      targetName = SuspensionPistonTarget
+    }
+
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = SuspensionCylinder
+      targetName = SuspensionCylinderTarget
+    }
+
+    COPYROTATIONCONSTRAINT
+    {
+      rotatorsName = LowerBracket
+      targetName = UpperBracket
+    }
+
+    COPYROTATIONCONSTRAINT
+    {
+      rotatorsName = SteeringPivotFollower
+      targetName = SteeringPivot
+    }
+
+    COPYPOSITIONCONSTRAINT
+    {
+      moversName = WheelMesh
+      targetName = WheelPivotFollower
+    }
+
+    COPYPOSITIONCONSTRAINT
+    {
+      moversName = WheelMeshBusted
+      targetName = WheelPivotFollower
+    }
+  }
+}

Distribution/Restock/GameData/ReStock/Restock.restockblacklist

@@ -135,6 +135,9 @@ Squad/Parts/Utility/launchClamp1/
 Squad/Parts/Utility/landingLegLT-1/
 Squad/Parts/Utility/landingLegLT-2/
 Squad/Parts/Utility/landingLegLT-5/
+Squad/Parts/Wheel/roverWheelM1/
+Squad/Parts/Wheel/roverWheelS2/
+Squad/Parts/Wheel/roverWheelTR-2L/
 Squad/Parts/Resources/RadialTank/
 Squad/Parts/Resources/SmallTank/
 Squad/Parts/Resources/LargeTank/

Distribution/Restock/changelog.txt

@@ -1,3 +1,15 @@
+v1.1.0
+-----
+- New stock part replacements
+ - Wheels
+  - Rovemax Model S2 (Andrew Cassidy)
+  - Rovemax Model M1 (Andrew Cassidy)
+  - TR-2L Ruggedized Wheel (Andrew Cassidy)
+
+- Making History parts replaced:
+ - Wheels
+  - Rovemax Model M1-F (Andrew Cassidy)
+
 v1.0.3
 -----
 - Updated ModuleManager distribution to 4.1.3
@@ -9,7 +21,6 @@ v1.0.2
 - Fixed 'tankbutt' localizations for Skiff showing 1.875m when they should be 2.5m (#766)
 - Fixed inflatable heatshield fairing (#765)
 
-
 v1.0.1
 -----
 - Fixed lack of bundled ModuleManager