From b1e627dc1e181081984fc5f85c48988e1cdec428 Mon Sep 17 00:00:00 2001 From: drewcassidy Date: Tue, 28 Jan 2020 14:44:23 -0800 Subject: [PATCH] Integrate all wheels --- Assets/CineboxAndrew | 2 +- .../Assets/Ground/restock-wheel-1-T.mu | Bin 243302 -> 243302 bytes .../Assets/Ground/restock-wheels-1.dds | Bin 1398256 -> 1398256 bytes .../ReStock/Patches/Ground/restock-wheels.cfg | 183 +---------- .../PatchesMH/Ground/restock-mh-wheels.cfg | 172 ++++++++++ .../GameData/ReStock/Restock.restockblacklist | 3 + Distribution/Restock/changelog.txt | 12 + .../ReStockPlus/Localization/en-us.cfg | 10 + .../Parts/Ground/restock-wheel-1-T.cfg | 12 +- .../Parts/Ground/restock-wheel-4.cfg | 304 ++++++++++++++++++ Distribution/RestockPlus/changelog.txt | 6 + 11 files changed, 520 insertions(+), 184 deletions(-) create mode 100644 Distribution/Restock/GameData/ReStock/PatchesMH/Ground/restock-mh-wheels.cfg create mode 100644 Distribution/RestockPlus/GameData/ReStockPlus/Parts/Ground/restock-wheel-4.cfg 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 20a6137d09168f2e20deb7ad89e149c0bad6b541..8b687d5b839c72d7d76b724b7adc87917ca2eb31 100644 GIT binary patch delta 26 hcmaF%hVR)MzJ?aY7N#xCQ#P?M0KxVdo0!ir0|1>I3L*di delta 26 icmaF%hVR)MzJ?aY7N#xCQ#P?Qh^*VYea0r{bIbs(YYZU( 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 29de1539f9325756d16387b20cfae0efa3ead735..fb5fd4ab534fe88d1499647eabdcd9fe6405099b 100644 GIT binary patch delta 23322 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 b`ojMW%W)^=EKHv}7ZRuLx$`zItPA`9TO97j 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