diff --git a/Assets/CineboxAndrew b/Assets/CineboxAndrew index 43a349e7..0b8a3ee6 160000 --- a/Assets/CineboxAndrew +++ b/Assets/CineboxAndrew @@ -1 +1 @@ -Subproject commit 43a349e7f990f35a59ec8aeb5e2c7206882e7dbc +Subproject commit 0b8a3ee6dfe05e5d4f2bdaaf9647bcb461558e0f diff --git a/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheel-1-T.mu b/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheel-1-T.mu index 20a6137d..8b687d5b 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheel-1-T.mu and b/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheel-1-T.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheels-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheels-1.dds index 29de1539..fb5fd4ab 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheels-1.dds and b/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheels-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Patches/Ground/restock-wheels.cfg b/Distribution/Restock/GameData/ReStock/Patches/Ground/restock-wheels.cfg index 676cfb26..abd29cc7 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Ground/restock-wheels.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Ground/restock-wheels.cfg @@ -1,11 +1,13 @@ // 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] +@PART[roverWheel2]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy - @name = restock-wheel-1 !MODEL {} MODEL @@ -101,10 +103,9 @@ } // RoveMax Model M1 -+PART[roverWheel1]:HAS[~RestockIgnore[*]]:FOR[ReStock] +@PART[roverWheel1]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy - @name = restock-wheel-2 !mesh = DELETE MODEL @@ -213,10 +214,9 @@ } // TR-2L Ruggedized Vehicular Wheel -+PART[wheelMed]:HAS[~RestockIgnore[*]]:FOR[ReStock] +@PART[wheelMed]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy - @name = restock-wheel-3 !MODEL {} MODEL @@ -268,174 +268,3 @@ } } } - -// RoveMax M1-F Rover Wheel -+PART[roverWheelM1-F]:HAS[~RestockIgnore[*]]:FOR[ReStock] -{ - @author = Andrew Cassidy - @name = restock-wheel-4 - - !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_broken //Bare - themeName = White - primaryColor = #707070 - secondaryColor = #707070 - GAMEOBJECTS - { - Fender_orange = false - Fender_grey = false - Fender_cernan = false - } - } - } - - !MODULE[FXModuleLookAtConstraint] {} - - MODULE - { - name = ModuleAdvancedLookAtConstraint - - CONSTRAINLOOKFX - { - rotatorsName = Link1 - targetName = Link1Target - } - - CONSTRAINLOOKFX - { - rotatorsName = Link2 - targetName = Link2Target - } - - CONSTRAINLOOKFX - { - rotatorsName = SuspensionPiston - targetName = SuspensionPistonTarget - } - - CONSTRAINLOOKFX - { - rotatorsName = SuspensionCylinder - targetName = SuspensionCylinderTarget - } - } - - MODULE - { - name = FXModuleConstrainPosition - - matchRotation = true - matchPosition = false - - CONSTRAINFX - { - moversName = LowerBracket - targetName = UpperBracket - } - - CONSTRAINFX - { - moversName = SteeringPivotFollower - targetName = SteeringPivot - } - } - - MODULE - { - name = FXModuleConstrainPosition - - matchRotation = false - matchPosition = true - - CONSTRAINFX - { - moversName = WheelMesh - targetName = WheelPivotFollower - } - - CONSTRAINFX - { - moversName = WheelMeshBusted - targetName = WheelPivotFollower - } - } -} - diff --git a/Distribution/Restock/GameData/ReStock/PatchesMH/Ground/restock-mh-wheels.cfg b/Distribution/Restock/GameData/ReStock/PatchesMH/Ground/restock-mh-wheels.cfg new file mode 100644 index 00000000..397e8269 --- /dev/null +++ b/Distribution/Restock/GameData/ReStock/PatchesMH/Ground/restock-mh-wheels.cfg @@ -0,0 +1,172 @@ +// 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 = ModuleAdvancedLookAtConstraint + + CONSTRAINLOOKFX + { + rotatorsName = Link1 + targetName = Link1Target + } + + CONSTRAINLOOKFX + { + rotatorsName = Link2 + targetName = Link2Target + } + + CONSTRAINLOOKFX + { + rotatorsName = SuspensionPiston + targetName = SuspensionPistonTarget + } + + CONSTRAINLOOKFX + { + rotatorsName = SuspensionCylinder + targetName = SuspensionCylinderTarget + } + } + + MODULE + { + name = FXModuleConstrainPosition + + matchRotation = true + matchPosition = false + + CONSTRAINFX + { + moversName = LowerBracket + targetName = UpperBracket + } + + CONSTRAINFX + { + moversName = SteeringPivotFollower + targetName = SteeringPivot + } + } + + MODULE + { + name = FXModuleConstrainPosition + + matchRotation = false + matchPosition = true + + CONSTRAINFX + { + moversName = WheelMesh + targetName = WheelPivotFollower + } + + CONSTRAINFX + { + moversName = WheelMeshBusted + targetName = WheelPivotFollower + } + } +} \ No newline at end of file diff --git a/Distribution/Restock/GameData/ReStock/Restock.restockblacklist b/Distribution/Restock/GameData/ReStock/Restock.restockblacklist index 65fc57a4..f6be548c 100644 --- a/Distribution/Restock/GameData/ReStock/Restock.restockblacklist +++ b/Distribution/Restock/GameData/ReStock/Restock.restockblacklist @@ -136,6 +136,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/ diff --git a/Distribution/Restock/changelog.txt b/Distribution/Restock/changelog.txt index d0e7fc6a..3be733d4 100644 --- a/Distribution/Restock/changelog.txt +++ b/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.1 ----- - Fixed lack of bundled ModuleManager diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg index e16ecdf4..26d8421b 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg @@ -429,5 +429,15 @@ Localization #LOC_RestockPlus_restock-oretank-375-1_title = Jumbo Holding Tank #LOC_RestockPlus_restock-oretank-375-1_description = A very large tank that can be used for storing raw materials. The manufacturer denies any claims that it has been re-purposed from a local farm #LOC_RestockPlus_restock-oretank-375-1_tags = black isru mine )mining (ore resource store restock + + // GROUND + // ============== + #LOC_RestockPlus_restock-wheel-1-T_title = Rovemax Model S2-T + #LOC_RestockPlus_restock-wheel-1-T_description = A modified rover wheel that is rotated 90°, ideal for tricycles or other unusually shaped vehicles. + #LOC_RestockPlus_restock-wheel-1-T_tags = )car drive ground roll rover wheel tricycle restock + + #LOC_RestockPlus_restock-wheel-4_title = Rovemax Model M0 + #LOC_RestockPlus_restock-wheel-4_description = A smaller version of the popular Rovemax wheel with an integrated folding function, allowing it to be stowed for transportation. + #LOC_RestockPlus_restock-wheel-4_tags = )car drive ground roll rover wheel fold LRV restock } } diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Ground/restock-wheel-1-T.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Ground/restock-wheel-1-T.cfg index 684ce705..663f25a2 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Ground/restock-wheel-1-T.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Ground/restock-wheel-1-T.cfg @@ -25,10 +25,10 @@ PART subcategory = 0 mass = 0.06 - title = #LOC_RestockPlus_restock-reactionwheel-radial-1_title //Small Radial Gyroscope - manufacturer = #autoLOC_501631 //#autoLOC_501631 = STEADLER Engineering Corps - description = #LOC_RestockPlus_restock-reactionwheel-radial-1_description - // Steadler's small radial gyroscope provides a small amount of torque but with greater power efficiency, allowing even large stations to maintain attitude with minimal power. We're still not entirely sure how gyroscopes work, but this one allows torque on all three axes. mass = 0.08 + title = #LOC_RestockPlus_restock-wheel-1-T_title // Rovemax Model S2-T + manufacturer = #autoLOC_501649 //#autoLOC_501649 = Kerbal Motion LLC + description = #LOC_RestockPlus_restock-wheel-1-T_description + // A modified rover wheel that is rotated 90°, ideal for tricycles or other unusually shaped vehicles dragModelType = default maximum_drag = 0.3 @@ -37,7 +37,7 @@ PART crashTolerance = 20 maxTemp = 1200 bulkheadProfiles = srf - tags = #LOC_RestockPlus_restock-reactionwheel-1875-1_tags //cmg command control fly gyro moment react stab steer torque magic_spinny_thing + tags = #LOC_RestockPlus_restock-wheel-1-T_tags // drive ground roll rover wheel tricycle restock MODULE { @@ -206,4 +206,4 @@ PART } } } -} +} \ No newline at end of file diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Ground/restock-wheel-4.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Ground/restock-wheel-4.cfg new file mode 100644 index 00000000..5cf5cc37 --- /dev/null +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Ground/restock-wheel-4.cfg @@ -0,0 +1,304 @@ +// ReStock+ 1.1.0 +// Folding LRV wheel +PART +{ + name = restock-wheel-4 + module = Part + author = Andrew Cassidy + + MODEL + { + model = ReStock/Assets/Ground/restock-wheel-4 + scale = 1.0, 1.0, 1.0 + } + rescaleFactor = 1.25 //sigh + + // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision + attachRules = 1,1,0,0,0 + node_attach = 0.36, 0.1207, 0.0, 1.0, 0.0, 0.0, 1 + node_stack_bottom = 0.3815, 0.1207, 0.0, 1.0, 0.0, 0.0, 1 + + TechRequired = fieldScience + entryCost = 5000 + cost = 500 + category = Ground + subcategory = 0 + mass = 0.04 + + title = #LOC_RestockPlus_restock-wheel-4_title // Rovemax Model M0 + manufacturer = #autoLOC_501649 //#autoLOC_501649 = Kerbal Motion LLC + description = #LOC_RestockPlus_restock-wheel-4_description + // A smaller version of the popular Rovemax wheel with an integrated folding function, allowing it to be stowed for transportation. + + dragModelType = default + maximum_drag = 0.3 + minimum_drag = 0.2 + angularDrag = 1 + crashTolerance = 30 + maxTemp = 1200 + bulkheadProfiles = srf + tags = #LOC_RestockPlus_restock-wheel-4_tags // )car drive ground roll rover wheel fold LRV restock + + /// Flag to disable this part if MH is installed + MHReplacement = True + + MODULE + { + name = ModuleWheelBase + + wheelColliderTransformName = WheelCollider + wheelTransformName = WheelPivot + + wheelType = MOTORIZED + + // setting this to true will override the radius and center parameters + FitWheelColliderToMesh = False + radius = 0.23 + center = 0,0,0 + mass = 0.040 + groundHeightOffset = 0 + + TooltipTitle = #autoLOC_502081 //#autoLOC_502081 = Rover Wheel + TooltipPrimaryField = #autoLOC_6004045 //#autoLOC_6004045 = Motorized + } + + MODULE + { + name = ModuleWheelSuspension + baseModuleIndex = 0 + suspensionTransformName = SuspensionPivot + suspensionDistance = 0.1 + targetPosition = 0.0 + springRatio = 12 + damperRatio = 1.0 + maximumLoad = 5.0 + } + + MODULE + { + name = ModuleWheelSteering + baseModuleIndex = 0 + + caliperTransformName = SteeringPivot + + steeringResponse = 2 + steeringCurve + { + key = 0 20 + key = 10 9 + key = 30 3.0 + } + } + MODULE + { + name = ModuleWheelMotor + baseModuleIndex = 0 + + maxRpm = 42 + driveResponse = 2 + + torqueCurve + { + key = 0 0.5 0 0 + key = 2 0.3 0 + key = 10 0.1 0 0 + key = 25 0 0 0 + } + + RESOURCE + { + name = ElectricCharge + rate = 1.0 + } + idleDrain = 0.0 + } + + MODULE + { + name = ModuleWheelBrakes + baseModuleIndex = 0 + + maxBrakeTorque = 0.5 + brakeResponse = 1 + } + + MODULE + { + name = ModuleWheelDamage + baseModuleIndex = 0 + + damagedTransformName = WheelBusted + undamagedTransformName = Wheel + + stressTolerance = 250 + impactTolerance = 100 + deflectionMagnitude = 1.0 + deflectionSharpness = 2.0 + slipMagnitude = 15 + slipSharpness = 2.0 + } + + MODULE + { + name = ModuleWheelDeployment + baseModuleIndex = 0 + + animationTrfName = restock-wheel-4 + animationStateName = restock-wheel-4-deploy + deployedPosition = 0 + deployTargetTransformName = deployTgt + + TsubSys = 1.0 + useStandInCollider = False + slaveModules = 8 + + fxDeploy = deploy + fxRetract = retract + fxDeployed = deployed + fxRetracted = retracted + } + + + 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 + { + name = ModuleTestSubject + environments = 15 + useStaging = False + useEvent = True + } + + + MODULE + { + name = ModuleAdvancedLookAtConstraint + + CONSTRAINLOOKFX + { + rotatorsName = Link1 + targetName = Link1Target + } + + CONSTRAINLOOKFX + { + rotatorsName = Link2 + targetName = Link2Target + } + + CONSTRAINLOOKFX + { + rotatorsName = SuspensionPiston + targetName = SuspensionPistonTarget + } + + CONSTRAINLOOKFX + { + rotatorsName = SuspensionCylinder + targetName = SuspensionCylinderTarget + } + } + + MODULE + { + name = FXModuleConstrainPosition + + matchRotation = true + matchPosition = false + + CONSTRAINFX + { + moversName = LowerBracket + targetName = UpperBracket + } + + CONSTRAINFX + { + moversName = SteeringPivotFollower + targetName = SteeringPivot + } + } + + MODULE + { + name = FXModuleConstrainPosition + + matchRotation = false + matchPosition = true + + CONSTRAINFX + { + moversName = WheelMesh + targetName = WheelPivotFollower + } + + CONSTRAINFX + { + moversName = WheelMeshBusted + targetName = WheelPivotFollower + } + } +} \ No newline at end of file diff --git a/Distribution/RestockPlus/changelog.txt b/Distribution/RestockPlus/changelog.txt index 888e6bd5..1ee282fa 100644 --- a/Distribution/RestockPlus/changelog.txt +++ b/Distribution/RestockPlus/changelog.txt @@ -1,3 +1,9 @@ +v1.1.0 +----- +- New Wheel parts + - Rovemax Model S2-T (Andrew Cassidy): 90° rotated rover wheel for building tricycles + - Rovemax Model M0 (Andrew Cassidy): folding rover wheel. Disabled if Making History is installed + v1.0.1 ------ - Fixed lack of bundled ModuleManager