diff --git a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-winglet-basic-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-winglet-basic-1.mu index 1cd2cdc4..0593e150 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-winglet-basic-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-winglet-basic-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-winglets-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-winglets-1.dds index 17f11748..f22ef14d 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-winglets-1.dds and b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-winglets-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-winglets-2.dds b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-winglets-2.dds new file mode 100644 index 00000000..74e229de Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-winglets-2.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-winglets.cfg b/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-winglets.cfg index bd741c17..d954c58e 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-winglets.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-winglets.cfg @@ -20,6 +20,39 @@ { cube = Default, 0.04573,0.9754,0.373, 0.04573,0.2997,0.648, 0.02582,0.2292,1.08, 0.02582,0.2819,0.3014, 0.5039,0.9864,0.1276, 0.5039,0.9864,0.1276, -0.1697,0.25,0, 0.7607,1.25,0.05625 } + + MODULE + { + name = ModulePartVariants + useMultipleDragCubes = false + baseVariant = White + VARIANT + { + name = White + displayName = #autoLOC_8007119 + themeName = White + primaryColor = #ffffff + secondaryColor = #ffffff + TEXTURE + { + mainTextureURL = ReStock/Assets/Aero/restock-winglets-1 + shader = KSP/Specular + } + } + VARIANT + { + name = Dark + displayName = #autoLOC_8007117 + themeName = Dark + primaryColor = #4c4f47 + secondaryColor = #4c4f47 + TEXTURE + { + mainTextureURL = ReStock/Assets/Aero/restock-winglets-2 + shader = KSP/Specular + } + } + } } // AV-R8 Winglet @@ -39,6 +72,38 @@ cube = fullDeflectionPos, 0.2244,0.6744,1.628, 0.2244,0.6269,1.557, 0.6671,0.3797,2.03, 0.6671,0.3659,1.886, 1.907,0.9236,0.9155, 1.907,0.9215,0.9155, -0.07445,-0.008513,0.02857, 1.629,1.966,0.866 cube = fullDeflectionNeg, 0.2243,0.6742,1.628, 0.2243,0.6276,1.549, 0.6671,0.4279,2.03, 0.6671,0.4123,1.886, 1.907,0.9045,0.9155, 1.907,0.9084,0.9155, -0.07445,-0.008513,-0.02857, 1.629,1.966,0.866 } + MODULE + { + name = ModulePartVariants + useMultipleDragCubes = false + baseVariant = White + VARIANT + { + name = White + displayName = #autoLOC_8007119 + themeName = White + primaryColor = #ffffff + secondaryColor = #ffffff + TEXTURE + { + mainTextureURL = ReStock/Assets/Aero/restock-winglets-1 + shader = KSP/Specular + } + } + VARIANT + { + name = Dark + displayName = #autoLOC_8007117 + themeName = Dark + primaryColor = #4c4f47 + secondaryColor = #4c4f47 + TEXTURE + { + mainTextureURL = ReStock/Assets/Aero/restock-winglets-2 + shader = KSP/Specular + } + } + } } // AV-T1 Winglet @@ -56,6 +121,38 @@ { cube = Default, 0.131,1,0.09983, 0.131,0.1167,1.597, 0.08604,0.07243,1.567, 0.08604,0.009355,1.241, 1.657,0.9968,0.1479, 1.657,0.997,0.1479, -0.1187,0.2268,0.006638, 1.497,2.11,0.09696 } + MODULE + { + name = ModulePartVariants + useMultipleDragCubes = false + baseVariant = White + VARIANT + { + name = White + displayName = #autoLOC_8007119 + themeName = White + primaryColor = #ffffff + secondaryColor = #ffffff + TEXTURE + { + mainTextureURL = ReStock/Assets/Aero/restock-winglets-1 + shader = KSP/Specular + } + } + VARIANT + { + name = Dark + displayName = #autoLOC_8007117 + themeName = Dark + primaryColor = #4c4f47 + secondaryColor = #4c4f47 + TEXTURE + { + mainTextureURL = ReStock/Assets/Aero/restock-winglets-2 + shader = KSP/Specular + } + } + } } // Delta-Deluxe Winglet @@ -75,4 +172,36 @@ cube = fullDeflectionPos, 0.1975,1,0.3855, 0.1975,0.7641,1.535, 0.2903,0.4871,2.28, 0.2903,0.6346,0.3927, 2.654,0.9567,0.3349, 2.654,0.9698,0.3168, -0.2699,0.005937,-0.08691, 1.587,2.242,0.2617 cube = fullDeflectionNeg, 0.1975,1,0.3855, 0.1975,0.7638,1.535, 0.2903,0.4828,2.28, 0.2903,0.63,0.3927, 2.654,0.9699,0.3168, 2.654,0.9576,0.3349, -0.2699,0.005937,0.08691, 1.587,2.242,0.2617 } + MODULE + { + name = ModulePartVariants + useMultipleDragCubes = false + baseVariant = White + VARIANT + { + name = White + displayName = #autoLOC_8007119 + themeName = White + primaryColor = #ffffff + secondaryColor = #ffffff + TEXTURE + { + mainTextureURL = ReStock/Assets/Aero/restock-winglets-1 + shader = KSP/Specular + } + } + VARIANT + { + name = Dark + displayName = #autoLOC_8007117 + themeName = Dark + primaryColor = #4c4f47 + secondaryColor = #4c4f47 + TEXTURE + { + mainTextureURL = ReStock/Assets/Aero/restock-winglets-2 + shader = KSP/Specular + } + } + } } diff --git a/Distribution/Restock/changelog.txt b/Distribution/Restock/changelog.txt index 6717cfdd..27cdf6d4 100644 --- a/Distribution/Restock/changelog.txt +++ b/Distribution/Restock/changelog.txt @@ -26,6 +26,7 @@ v1.2.0 - EAS-4 Strut Connector now supports new White and White (compact) variants - FTX-2 External Fuel Duct now supports new White variant, plus an additional Delta Blue variant. - Advanced Grabbing Unit Jr. now supports new White, Black, and Yellow variants + - Added Dark variant for basic winglets - Fixes: - Fixed duplicate drag cubes on reaction wheels. - Rebuilt colliders for the following parts: QBE, HECS, HECS2, OKTO, OKTO2, Twin Boar (#862, #865)