diff --git a/Assets/CineboxAndrew b/Assets/CineboxAndrew index d2070d81..d7bf6b3d 160000 --- a/Assets/CineboxAndrew +++ b/Assets/CineboxAndrew @@ -1 +1 @@ -Subproject commit d2070d816c135e471be1d1bc2429cb2e98be3198 +Subproject commit d7bf6b3d612154854cf05ec2b38f251cccebfe3d diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-625-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-625-1.mu new file mode 100644 index 00000000..818af6c0 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-625-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-625-2.mu b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-625-2.mu new file mode 100644 index 00000000..eb91c493 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-625-2.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-625-e.dds b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-625-e.dds new file mode 100644 index 00000000..b49f4d97 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-625-e.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-625-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-625-n.dds new file mode 100644 index 00000000..e402fc38 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-625-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-625.dds b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-625.dds new file mode 100644 index 00000000..7afe764e Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-625.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-claw.cfg b/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-claw.cfg deleted file mode 100644 index 0f3921c3..00000000 --- a/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-claw.cfg +++ /dev/null @@ -1,124 +0,0 @@ -// Patches applying art changes to the asteroid claw -// Contents: -// - Advanced Grabbing Unit (GrapplingDevice) - -// Advanced Grabbing Unit -@PART[GrapplingDevice]:HAS[~RestockIgnore[*]]:FOR[ReStock] -{ - @author = Andrew Cassidy - !mesh = DELETE - MODEL - { - model = ReStock/Assets/Coupling/restock-claw-125 - } - %rescaleFactor = 1 - %node_stack_top = 0.0, -0.14082675, 0.00, 0.0, -1.0, 0.0, 1 - @MODULE[ModuleGrappleNode] - { - nodeTransformName = Pivot - } - @MODULE[ModuleAnimateGeneric] - { - animationName = Deploy - } - @MODULE[FlagDecal] - { - textureQuadName = flagTransform - } - !MODULE[FXModuleLookAtConstraint] - MODULE - { - name = FXModuleLookAtConstraint - CONSTRAINLOOKFX - { - rotatorsName = act_cylU.001 - targetName = act_cylL.001 - } - CONSTRAINLOOKFX - { - rotatorsName = act_cylL.001 - targetName = act_cylU.001 - } - CONSTRAINLOOKFX - { - rotatorsName = act_cylU.002 - targetName = act_cylL.002 - } - CONSTRAINLOOKFX - { - rotatorsName = act_cylL.002 - targetName = act_cylU.002 - } - CONSTRAINLOOKFX - { - rotatorsName = act_cylU.003 - targetName = act_cylL.003 - } - CONSTRAINLOOKFX - { - rotatorsName = act_cylL.003 - targetName = act_cylU.003 - } - CONSTRAINLOOKFX - { - rotatorsName = act_cylU.004 - targetName = act_cylL.004 - } - CONSTRAINLOOKFX - { - rotatorsName = act_cylL.004 - targetName = act_cylU.004 - } - CONSTRAINLOOKFX - { - rotatorsName = act_cylU.005 - targetName = act_cylL.005 - } - CONSTRAINLOOKFX - { - rotatorsName = act_cylL.005 - targetName = act_cylU.005 - } - CONSTRAINLOOKFX - { - rotatorsName = act_cylU.006 - targetName = act_cylL.006 - } - CONSTRAINLOOKFX - { - rotatorsName = act_cylL.006 - targetName = act_cylU.006 - } - CONSTRAINLOOKFX - { - rotatorsName = act_cylU.007 - targetName = act_cylL.007 - } - CONSTRAINLOOKFX - { - rotatorsName = act_cylL.007 - targetName = act_cylU.007 - } - CONSTRAINLOOKFX - { - rotatorsName = act_cylU.008 - targetName = act_cylL.008 - } - CONSTRAINLOOKFX - { - rotatorsName = act_cylL.008 - targetName = act_cylU.008 - } - } - MODULE - { - name = ModuleLight - lightName = Lamp - useAnimationDim = true - lightBrightenSpeed = 2.5 - lightDimSpeed = 2.5 - resourceAmount = 0.02 - useResources = true - animationName = RestockClawLamp_On - } -} diff --git a/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-claws.cfg b/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-claws.cfg new file mode 100644 index 00000000..26973476 --- /dev/null +++ b/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-claws.cfg @@ -0,0 +1,287 @@ +// Patches applying art changes to the asteroid claw +// Contents: +// - Advanced Grabbing Unit (GrapplingDevice) + +// Advanced Grabbing Unit +@PART[GrapplingDevice]:HAS[~RestockIgnore[*]]:FOR[ReStock] +{ + @author = Andrew Cassidy + !mesh = DELETE + MODEL + { + model = ReStock/Assets/Coupling/restock-claw-125 + } + %rescaleFactor = 1 + %node_stack_top = 0.0, -0.14082675, 0.00, 0.0, -1.0, 0.0, 1 + @MODULE[ModuleGrappleNode] + { + nodeTransformName = Pivot + } + @MODULE[ModuleAnimateGeneric] + { + animationName = Deploy + } + @MODULE[FlagDecal] + { + textureQuadName = flagTransform + } + !MODULE[FXModuleLookAtConstraint] + MODULE + { + name = FXModuleLookAtConstraint + CONSTRAINLOOKFX + { + rotatorsName = act_cylU.001 + targetName = act_cylL.001 + } + CONSTRAINLOOKFX + { + rotatorsName = act_cylL.001 + targetName = act_cylU.001 + } + CONSTRAINLOOKFX + { + rotatorsName = act_cylU.002 + targetName = act_cylL.002 + } + CONSTRAINLOOKFX + { + rotatorsName = act_cylL.002 + targetName = act_cylU.002 + } + CONSTRAINLOOKFX + { + rotatorsName = act_cylU.003 + targetName = act_cylL.003 + } + CONSTRAINLOOKFX + { + rotatorsName = act_cylL.003 + targetName = act_cylU.003 + } + CONSTRAINLOOKFX + { + rotatorsName = act_cylU.004 + targetName = act_cylL.004 + } + CONSTRAINLOOKFX + { + rotatorsName = act_cylL.004 + targetName = act_cylU.004 + } + CONSTRAINLOOKFX + { + rotatorsName = act_cylU.005 + targetName = act_cylL.005 + } + CONSTRAINLOOKFX + { + rotatorsName = act_cylL.005 + targetName = act_cylU.005 + } + CONSTRAINLOOKFX + { + rotatorsName = act_cylU.006 + targetName = act_cylL.006 + } + CONSTRAINLOOKFX + { + rotatorsName = act_cylL.006 + targetName = act_cylU.006 + } + CONSTRAINLOOKFX + { + rotatorsName = act_cylU.007 + targetName = act_cylL.007 + } + CONSTRAINLOOKFX + { + rotatorsName = act_cylL.007 + targetName = act_cylU.007 + } + CONSTRAINLOOKFX + { + rotatorsName = act_cylU.008 + targetName = act_cylL.008 + } + CONSTRAINLOOKFX + { + rotatorsName = act_cylL.008 + targetName = act_cylU.008 + } + } + MODULE + { + name = ModuleLight + lightName = Lamp + useAnimationDim = true + lightBrightenSpeed = 2.5 + lightDimSpeed = 2.5 + resourceAmount = 0.02 + useResources = true + animationName = RestockClawLamp_On + } +} + +// Advanced Grabbing Unit Jr. +@PART[smallClaw]:HAS[~RestockIgnore[*]]:FOR[ReStock] +{ + @author = Andrew Cassidy + !mesh = DELETE + MODEL + { + model = ReStock/Assets/Coupling/restock-claw-625-2 + } + %rescaleFactor = 1 + %node_stack_top = 0.0, -0.14082675, 0.00, 0.0, -1.0, 0.0, 1 + %node_attach = 0.0, -0.0738, 0.00, 0.0, -1.0, 0.0, 1 + + @MODULE[ModuleGrappleNode] + { + nodeTransformName = Pivot + } + + @MODULE[ModuleAnimateGeneric] + { + animationName = Deploy + } + + @MODULE[FlagDecal] + { + textureQuadName = FlagTransform + } + + !MODULE[FXModuleLookAtConstraint] {} + MODULE + { + name = ModuleRestockConstraints + LOOKATCONSTRAINT + { + rotatorsName = Actuator_0_lower + targetName = Actuator_0_upper + } + LOOKATCONSTRAINT + { + rotatorsName = Actuator_0_upper + targetName = Actuator_0_lower + } + LOOKATCONSTRAINT + { + rotatorsName = Actuator_1_lower + targetName = Actuator_1_upper + } + LOOKATCONSTRAINT + { + rotatorsName = Actuator_1_upper + targetName = Actuator_1_lower + } + LOOKATCONSTRAINT + { + rotatorsName = Actuator_2_lower + targetName = Actuator_2_upper + } + LOOKATCONSTRAINT + { + rotatorsName = Actuator_2_upper + targetName = Actuator_2_lower + } + LOOKATCONSTRAINT + { + rotatorsName = Actuator_3_lower + targetName = Actuator_3_upper + } + LOOKATCONSTRAINT + { + rotatorsName = Actuator_3_upper + targetName = Actuator_3_lower + } + LOOKATCONSTRAINT + { + rotatorsName = Actuator_4_lower + targetName = Actuator_4_upper + } + LOOKATCONSTRAINT + { + rotatorsName = Actuator_4_upper + targetName = Actuator_4_lower + } + LOOKATCONSTRAINT + { + rotatorsName = Actuator_5_lower + targetName = Actuator_5_upper + } + LOOKATCONSTRAINT + { + rotatorsName = Actuator_5_upper + targetName = Actuator_5_lower + } + } + + !MODULE[ModulePartVariants] {} + MODULE + { + name = ModulePartVariants + baseVariant = White + useMultipleDragCubes = false + VARIANT + { + name = White + displayName = #LOC_Restock_variant-surface_white + themeName = White + primaryColor = #ffffff + secondaryColor = #999999 + GAMEOBJECTS + { + Body_white = true + Body_black = false + Body_yellow = false + } + } + VARIANT + { + name = Dark + displayName = #LOC_Restock_variant-surface_black + themeName = Dark + primaryColor = #4c4f47 + secondaryColor = #999999 + GAMEOBJECTS + { + Body_white = false + Body_black = true + Body_yellow = false + } + } + VARIANT + { + name = Yellow + displayName = #LOC_Restock_variant-surface_yellow + themeName = YellowAndWhite + primaryColor = #B08D43 + secondaryColor = #999999 + GAMEOBJECTS + { + Body_white = false + Body_black = false + Body_yellow = true + } + } + } + + MODULE + { + name = ModuleRestockDepthMask + maskTransform = DepthMask + } + + MODULE + { + name = ModuleLight + lightName = SpotLight + useAnimationDim = true + lightBrightenSpeed = 2.5 + lightDimSpeed = 2.5 + resourceAmount = 0.02 + useResources = true + animationName = RestockMiniClawLamp_On + } +} diff --git a/Distribution/Restock/changelog.txt b/Distribution/Restock/changelog.txt index 9ec9c30d..5f2278c7 100644 --- a/Distribution/Restock/changelog.txt +++ b/Distribution/Restock/changelog.txt @@ -2,6 +2,8 @@ v1.2.0 ------ - KSP 1.10 - New stock part replacements + - Coupling + - Advanced Grabbing Unit Jr. (Andrew Cassidy): now has black, yellow, and white variants - Resources - FTE-1 Drain Valve (Andrew Cassidy): now has metal and warning stripe variants - Science diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Coupling/restock-claw-625-e.dds b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Coupling/restock-claw-625-e.dds deleted file mode 100644 index fc9c1c57..00000000 Binary files a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Coupling/restock-claw-625-e.dds and /dev/null differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Coupling/restock-claw-625-n.dds b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Coupling/restock-claw-625-n.dds deleted file mode 100644 index 1c4c847a..00000000 Binary files a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Coupling/restock-claw-625-n.dds and /dev/null differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Coupling/restock-claw-625.dds b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Coupling/restock-claw-625.dds deleted file mode 100644 index a578dd8b..00000000 Binary files a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Coupling/restock-claw-625.dds and /dev/null differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Coupling/restock-claw-625.mu b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Coupling/restock-claw-625.mu deleted file mode 100644 index 0d1b4b50..00000000 Binary files a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Coupling/restock-claw-625.mu and /dev/null differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg index d86783fa..89e5c5a0 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg @@ -315,7 +315,7 @@ Localization #LOC_RestockPlus_restock-decoupler-radial-tiny-1_tags = restock break decouple separat split stag // 0.625m - #LOC_RestockPlus_restock-claw-625-1_title = Advanced Grabbing Unit Junior + #LOC_RestockPlus_restock-claw-625-1_title = Compact Grabbing Unit Jr. #LOC_RestockPlus_restock-claw-625-1_description = A smaller claw for grappling smaller things. Unfortunately, it does not pivot. #LOC_RestockPlus_restock-claw-625-1_tags = restock a.r.m arm asteroid capture clam claw connect dock fasten grab join klaw nasa 625 diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/0625/restock-claw-625-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/0625/restock-claw-625-1.cfg index 04c3b438..39d0a76f 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/0625/restock-claw-625-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/0625/restock-claw-625-1.cfg @@ -7,7 +7,7 @@ PART author = Andrew Cassidy MODEL { - model = ReStockPlus/Assets/Coupling/restock-claw-625 + model = ReStock/Assets/Coupling/restock-claw-625-1 scale = 1.0, 1.0, 1.0 } rescaleFactor = 1.0 diff --git a/Distribution/RestockPlus/changelog.txt b/Distribution/RestockPlus/changelog.txt index 10e3f5bb..a6891fad 100644 --- a/Distribution/RestockPlus/changelog.txt +++ b/Distribution/RestockPlus/changelog.txt @@ -10,6 +10,8 @@ v1.2.0 - New Structural Parts - BZ-26 Radial Attachment Point Jr. (Andrew Cassidy): 0.625m radial attachment node - BZ-78 Radial Attachment Point (Andrew Cassidy): 1.875m radial attachment node +- Bugfixes and tweaks + - Advanced Grabbing Unit Junior renamed to Compact Grabbing Unit Jr. and assets moved to Restock base to be shared with stock Advanced Grabbing Unit Jr. v1.1.2 ------