diff --git a/Assets/CineboxAndrew b/Assets/CineboxAndrew index 26a37466..a70284d4 160000 --- a/Assets/CineboxAndrew +++ b/Assets/CineboxAndrew @@ -1 +1 @@ -Subproject commit 26a374668c4fd822be2ec5f1b270f80af0ca648c +Subproject commit a70284d4a7f42c0d522149124ac5e2ffd06edc01 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 new file mode 100644 index 00000000..20a6137d Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheel-1-T.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheel-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheel-1.mu index 612f6e80..beb9813c 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheel-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheel-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheel-2.mu b/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheel-2.mu index eac29c91..428f2d4f 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheel-2.mu and b/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheel-2.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheel-3.mu b/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheel-3.mu new file mode 100644 index 00000000..0193cfea Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheel-3.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheel-4.mu b/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheel-4.mu index e4c62ec7..99f21d38 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheel-4.mu and b/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheel-4.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheels-1-foil-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheels-1-foil-n.dds new file mode 100644 index 00000000..b14784ba Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheels-1-foil-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheels-1-foil-s.dds b/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheels-1-foil-s.dds new file mode 100644 index 00000000..52e22f4f Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheels-1-foil-s.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheels-1-foil.dds b/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheels-1-foil.dds new file mode 100644 index 00000000..bebb0958 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheels-1-foil.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheels-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheels-1-n.dds new file mode 100644 index 00000000..c6effcde Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheels-1-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheels-1-n.tga b/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheels-1-n.tga deleted file mode 100644 index ac59a9aa..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheels-1-n.tga and /dev/null 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 new file mode 100644 index 00000000..59c7338f Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheels-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheels-1.tga b/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheels-1.tga deleted file mode 100644 index 3cea0604..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Ground/restock-wheels-1.tga and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Patches/Ground/restock-wheels.cfg b/Distribution/Restock/GameData/ReStock/Patches/Ground/restock-wheels.cfg index 82360cd1..676cfb26 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Ground/restock-wheels.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Ground/restock-wheels.cfg @@ -1,6 +1,104 @@ // Patches applying art changes to wheels // Contents: +// RoveMax Model S2 ++PART[roverWheel2]:HAS[~RestockIgnore[*]]:FOR[ReStock] +{ + @author = Andrew Cassidy + @name = restock-wheel-1 + + !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 = ModuleAdvancedLookAtConstraint + + CONSTRAINLOOKFX + { + rotatorsName = Suspension1 + targetName = Suspension2 + } + + CONSTRAINLOOKFX + { + 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] @@ -114,6 +212,63 @@ } } +// TR-2L Ruggedized Vehicular Wheel ++PART[wheelMed]:HAS[~RestockIgnore[*]]:FOR[ReStock] +{ + @author = Andrew Cassidy + @name = restock-wheel-3 + + !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 = ModuleAdvancedLookAtConstraint + + CONSTRAINLOOKFX + { + rotatorsName = DamperCylinder + targetName = DamperPiston + } + + CONSTRAINLOOKFX + { + rotatorsName = DamperPiston + targetName = DamperCylinder + } + + CONSTRAINLOOKFX + { + rotatorsName = SteeringCylinder1 + targetName = SteeringPiston1 + } + + CONSTRAINLOOKFX + { + rotatorsName = SteeringPiston1 + targetName = SteeringCylinder1 + } + } +} + // RoveMax M1-F Rover Wheel +PART[roverWheelM1-F]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @@ -216,7 +371,7 @@ MODULE { - name = FXModuleLookAtConstraint + name = ModuleAdvancedLookAtConstraint CONSTRAINLOOKFX { @@ -229,6 +384,18 @@ rotatorsName = Link2 targetName = Link2Target } + + CONSTRAINLOOKFX + { + rotatorsName = SuspensionPiston + targetName = SuspensionPistonTarget + } + + CONSTRAINLOOKFX + { + rotatorsName = SuspensionCylinder + targetName = SuspensionCylinderTarget + } } MODULE @@ -270,21 +437,5 @@ targetName = WheelPivotFollower } } - - MODULE - { - name = ModuleAdvancedLookAtConstraint - - CONSTRAINLOOKFX - { - rotatorsName = SuspensionPiston - targetName = SuspensionPistonTarget - } - - CONSTRAINLOOKFX - { - rotatorsName = SuspensionCylinder - targetName = SuspensionCylinderTarget - } - } } + 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 new file mode 100644 index 00000000..684ce705 --- /dev/null +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Ground/restock-wheel-1-T.cfg @@ -0,0 +1,209 @@ +// ReStock+ 1.1.0 +// 90° rotated rover wheel +PART +{ + name = restock-wheel-1-T + module = Part + author = Andrew Cassidy + + MODEL + { + model = ReStock/Assets/Ground/restock-wheel-1-T + scale = 1.0, 1.0, 1.0 + } + rescaleFactor = 1.0 + + // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision + attachRules = 1,1,0,0,0 + node_attach = 0.0, 0.5248517, 0.3083052, 0.0, 0.0, -1.0, 1 + node_stack_bottom = 0.0, 0.5248517, 0.321335, 0.0, 0.0, 1.0, 1 + + TechRequired = spaceExploration + entryCost = 3100 + cost = 300 + category = Ground + 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 + + dragModelType = default + maximum_drag = 0.3 + minimum_drag = 0.2 + angularDrag = 1 + 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 + + MODULE + { + name = ModuleWheelBase + + wheelColliderTransformName = WheelCollider + wheelTransformName = WheelPivot + + wheelType = MOTORIZED + + // setting this to true will override the radius and center parameters + FitWheelColliderToMesh = False + radius = 0.157 + 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 + maximumLoad = 8.0 + suspensionDistance = 0.195 + suspensionOffset = -0.05 + targetPosition = 0.2 + springRatio = 5 + damperRatio = 1.0 + useAutoBoost = true + } + + MODULE + { + name = ModuleWheelSteering + baseModuleIndex = 0 + + caliperTransformName = SteeringPivot + + steeringResponse = 1.5 + steeringCurve + { + key = 0 40 + key = 5 27//15 + key = 10 9//6 + key = 30 3.0//1.5 + } + } + MODULE + { + name = ModuleWheelMotor + baseModuleIndex = 0 + + wheelSpeedMax = 11 + driveResponse = 2 + + torqueCurve + { + key = 0 0.17 0 0 + key = 2.5 0.1 0 0 + key = 12 0 0 0 + } + RESOURCE + { + name = ElectricCharge + rate = 1//5 + } + idleDrain = 0.0//0.1// + } + + MODULE + { + name = ModuleWheelBrakes + baseModuleIndex = 0 + + maxBrakeTorque = 0.34 + brakeResponse = 1 + } + + MODULE + { + name = ModuleWheelDamage + baseModuleIndex = 0 + + damagedTransformName = WheelBusted + undamagedTransformName = Wheel + + stressTolerance = 315 + impactTolerance = 65 + deflectionMagnitude = 1.0 + deflectionSharpness = 2.0 + slipMagnitude = 15 + slipSharpness = 2.0 + } + + MODULE + { + name = ModuleAdvancedLookAtConstraint + + CONSTRAINLOOKFX + { + rotatorsName = Suspension1 + targetName = Suspension2 + } + + CONSTRAINLOOKFX + { + 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 + } + } + } +}