diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decoupler-0625-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decoupler-0625-1.mu index 736de32a..bf0f539f 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decoupler-0625-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decoupler-0625-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decoupler-125-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decoupler-125-1.mu index 59171dd5..e37d495f 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decoupler-125-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decoupler-125-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decoupler-1875-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decoupler-1875-1.mu index 64b2503a..5db90b1b 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decoupler-1875-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decoupler-1875-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decoupler-25-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decoupler-25-1.mu index 65758f7d..3135c155 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decoupler-25-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decoupler-25-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decoupler-375-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decoupler-375-1.mu index a6bf5ebb..e05cb228 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decoupler-375-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decoupler-375-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-1-n.tga b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-1-n.tga new file mode 100644 index 00000000..8957e908 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-1-n.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-1.tga b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-1.tga new file mode 100644 index 00000000..6c653240 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-1.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-3-n.tga b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-3-n.tga new file mode 100644 index 00000000..5d0c30b7 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-3-n.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-3.tga b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-3.tga new file mode 100644 index 00000000..d48929be Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-3.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-separator-0625-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-separator-0625-1.mu index 95a70aec..bb68f111 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-separator-0625-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-separator-0625-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-separator-125-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-separator-125-1.mu index 3062bb10..49ff0980 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-separator-125-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-separator-125-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-separator-1875-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-separator-1875-1.mu index 2c2ceb0e..12f956e2 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-separator-1875-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-separator-1875-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-separator-25-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-separator-25-1.mu index e2a8eb05..8a0b0b31 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-separator-25-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-separator-25-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-separator-375-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-separator-375-1.mu index 0c6a3fc6..3e0021e1 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-separator-375-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-separator-375-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-decouplers.cfg b/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-decouplers.cfg index c998f1ec..d8023c2b 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-decouplers.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-decouplers.cfg @@ -19,6 +19,38 @@ model = ReStock/Assets/Coupling/restock-decoupler-0625-1 } %rescaleFactor = 1 + MODULE + { + name = ModulePartVariants + useMultipleDragCubes = false + baseVariant = BlackAndWhite + VARIANT + { + name = Metallic + displayName = #LOC_Restock_variant-surface_metal + themeName = Metal + primaryColor = #6f6e6d + secondaryColor = #6f6e6d + GAMEOBJECTS + { + Decoupler0625White = false + Decoupler0625Metal = true + } + } + VARIANT + { + name = BlackAndWhite + displayName = #autoLOC_8007122 + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #000000 + GAMEOBJECTS + { + Decoupler0625White = true + Decoupler0625Metal = false + } + } + } } // TD-12 Decoupler @@ -32,6 +64,55 @@ model = ReStock/Assets/Coupling/restock-decoupler-125-1 } %rescaleFactor = 1 + MODULE + { + name = ModulePartVariants + useMultipleDragCubes = false + baseVariant = BlackAndWhite + VARIANT + { + name = Dark + displayName = #autoLOC_8007117 + themeName = Dark + primaryColor = #4c4f47 + secondaryColor = #4c4f47 + + GAMEOBJECTS + { + Decoupler125White = false + Decoupler125Dark = true + Decoupler125Orange = false + } + } + VARIANT + { + name = BlackAndWhite + displayName = #autoLOC_8007122 + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #000000 + GAMEOBJECTS + { + Decoupler125White = true + Decoupler125Dark = false + Decoupler125Orange = false + } + } + VARIANT + { + name = GrayAndOrange + displayName = #autoLOC_8007121 + themeName = GrayAndOrange + primaryColor = #4c4f47 + secondaryColor = #f49841 + GAMEOBJECTS + { + Decoupler125White = false + Decoupler125Dark = false + Decoupler125Orange = true + } + } + } } // TD-25 Decoupler @@ -45,6 +126,55 @@ model = ReStock/Assets/Coupling/restock-decoupler-25-1 } %rescaleFactor = 1 + MODULE + { + name = ModulePartVariants + useMultipleDragCubes = false + baseVariant = BlackAndWhite + VARIANT + { + name = Metallic + displayName = #LOC_Restock_variant-surface_metal + themeName = Metal + primaryColor = #6f6e6d + secondaryColor = #6f6e6d + + GAMEOBJECTS + { + Decoupler25White = false + Decoupler25Metal = true + Decoupler25Orange = false + } + } + VARIANT + { + name = BlackAndWhite + displayName = #autoLOC_8007122 + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #000000 + GAMEOBJECTS + { + Decoupler25White = true + Decoupler25Metal = false + Decoupler25Orange = false + } + } + VARIANT + { + name = GrayAndOrange + displayName = #autoLOC_8007121 + themeName = GrayAndOrange + primaryColor = #4c4f47 + secondaryColor = #f49841 + GAMEOBJECTS + { + Decoupler25White = false + Decoupler25Metal = false + Decoupler25Orange = true + } + } + } } // TD-37 Decoupler @@ -58,6 +188,38 @@ model = ReStock/Assets/Coupling/restock-decoupler-375-1 } %rescaleFactor = 1 + MODULE + { + name = ModulePartVariants + useMultipleDragCubes = false + baseVariant = BlackAndWhite + VARIANT + { + name = BlackAndWhite + displayName = #autoLOC_8007122 + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #000000 + GAMEOBJECTS + { + Decoupler375White = true + Decoupler375Orange = false + } + } + VARIANT + { + name = GrayAndOrange + displayName = #autoLOC_8007121 + themeName = GrayAndOrange + primaryColor = #4c4f47 + secondaryColor = #f49841 + GAMEOBJECTS + { + Decoupler375White = false + Decoupler375Orange = true + } + } + } } // TD-70 Decoupler diff --git a/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-separators.cfg b/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-separators.cfg index 9f75e0f9..34f9c3fc 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-separators.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-separators.cfg @@ -16,6 +16,38 @@ model = ReStock/Assets/Coupling/restock-separator-0625-1 } %rescaleFactor = 1 + MODULE + { + name = ModulePartVariants + useMultipleDragCubes = false + baseVariant = BlackAndWhite + VARIANT + { + name = Metallic + displayName = #LOC_Restock_variant-surface_metal + themeName = Metal + primaryColor = #6f6e6d + secondaryColor = #6f6e6d + GAMEOBJECTS + { + Separator0625White = false + Separator0625Metal = true + } + } + VARIANT + { + name = BlackAndWhite + displayName = #autoLOC_8007122 + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #000000 + GAMEOBJECTS + { + Separator0625White = true + Separator0625Metal = false + } + } + } } // TS-12 Separator @@ -29,6 +61,54 @@ model = ReStock/Assets/Coupling/restock-separator-125-1 } %rescaleFactor = 1 + MODULE + { + name = ModulePartVariants + useMultipleDragCubes = false + baseVariant = BlackAndWhite + VARIANT + { + name = Dark + displayName = #autoLOC_8007117 + themeName = Dark + primaryColor = #4c4f47 + secondaryColor = #4c4f47 + GAMEOBJECTS + { + Separator125White = false + Separator125Dark = true + Separator125Orange = false + } + } + VARIANT + { + name = BlackAndWhite + displayName = #autoLOC_8007122 + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #000000 + GAMEOBJECTS + { + Separator125White = true + Separator125Dark = false + Separator125Orange = false + } + } + VARIANT + { + name = GrayAndOrange + displayName = #autoLOC_8007121 + themeName = GrayAndOrange + primaryColor = #4c4f47 + secondaryColor = #f49841 + GAMEOBJECTS + { + Separator125White = false + Separator125Dark = false + Separator125Orange = true + } + } + } } // TS-25 Separator @@ -42,6 +122,55 @@ model = ReStock/Assets/Coupling/restock-separator-25-1 } %rescaleFactor = 1 + MODULE + { + name = ModulePartVariants + useMultipleDragCubes = false + baseVariant = BlackAndWhite + VARIANT + { + name = Metallic + displayName = #LOC_Restock_variant-surface_metal + themeName = Metal + primaryColor = #6f6e6d + secondaryColor = #6f6e6d + + GAMEOBJECTS + { + Separator25White = false + Separator25Metal = true + Separator25Orange = false + } + } + VARIANT + { + name = BlackAndWhite + displayName = #autoLOC_8007122 + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #000000 + GAMEOBJECTS + { + Separator25White = true + Separator25Metal = false + Separator25Orange = false + } + } + VARIANT + { + name = GrayAndOrange + displayName = #autoLOC_8007121 + themeName = GrayAndOrange + primaryColor = #4c4f47 + secondaryColor = #f49841 + GAMEOBJECTS + { + Separator25White = false + Separator25Metal = false + Separator25Orange = true + } + } + } } // TS-37 Separator @@ -55,4 +184,36 @@ model = ReStock/Assets/Coupling/restock-separator-375-1 } %rescaleFactor = 1 + MODULE + { + name = ModulePartVariants + useMultipleDragCubes = false + baseVariant = BlackAndWhite + VARIANT + { + name = BlackAndWhite + displayName = #autoLOC_8007122 + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #000000 + GAMEOBJECTS + { + Separator375White = true + Separator375Orange = false + } + } + VARIANT + { + name = GrayAndOrange + displayName = #autoLOC_8007121 + themeName = GrayAndOrange + primaryColor = #4c4f47 + secondaryColor = #f49841 + GAMEOBJECTS + { + Separator375White = false + Separator375Orange = true + } + } + } } diff --git a/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-decouplers.cfg b/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-decouplers.cfg index f72a2534..8538a5bf 100644 --- a/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-decouplers.cfg +++ b/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-decouplers.cfg @@ -14,17 +14,53 @@ model = ReStock/Assets/Coupling/restock-decoupler-1875-1 } %rescaleFactor = 1 -} - -// Size 1.5 decoupler -@PART[Size1p5_Strut_Decoupler] -{ - @author = Chris Adderley (Nertea) - !mesh = DELETE - !MODEL {} - MODEL + MODULE { - model = ReStock/Assets/Coupling/restock-decoupler-1875-2 + name = ModulePartVariants + useMultipleDragCubes = false + baseVariant = BlackAndWhite + VARIANT + { + name = Metallic + displayName = #LOC_Restock_variant-surface_metal + themeName = Metal + primaryColor = #6f6e6d + secondaryColor = #6f6e6d + + GAMEOBJECTS + { + Decoupler1875White = false + Decoupler1875Metal = true + Decoupler1875Orange = false + } + } + VARIANT + { + name = BlackAndWhite + displayName = #autoLOC_8007122 + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #000000 + GAMEOBJECTS + { + Decoupler1875White = true + Decoupler1875Metal = false + Decoupler1875Orange = false + } + } + VARIANT + { + name = GrayAndOrange + displayName = #autoLOC_8007121 + themeName = GrayAndOrange + primaryColor = #4c4f47 + secondaryColor = #f49841 + GAMEOBJECTS + { + Decoupler1875White = false + Decoupler1875Metal = false + Decoupler1875Orange = true + } + } } - %rescaleFactor = 1 -} +} \ No newline at end of file diff --git a/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-separators.cfg b/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-separators.cfg index b562fa9f..d3c215ca 100644 --- a/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-separators.cfg +++ b/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-separators.cfg @@ -13,4 +13,53 @@ model = ReStock/Assets/Coupling/restock-separator-1875-1 } %rescaleFactor = 1 + MODULE + { + name = ModulePartVariants + useMultipleDragCubes = false + baseVariant = BlackAndWhite + VARIANT + { + name = Metallic + displayName = #LOC_Restock_variant-surface_metal + themeName = Metal + primaryColor = #6f6e6d + secondaryColor = #6f6e6d + + GAMEOBJECTS + { + Separator1875White = false + Separator1875Metal = true + Separator1875Orange = false + } + } + VARIANT + { + name = BlackAndWhite + displayName = #autoLOC_8007122 + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #000000 + GAMEOBJECTS + { + Separator1875White = true + Separator1875Metal = false + Separator1875Orange = false + } + } + VARIANT + { + name = GrayAndOrange + displayName = #autoLOC_8007121 + themeName = GrayAndOrange + primaryColor = #4c4f47 + secondaryColor = #f49841 + GAMEOBJECTS + { + Separator1875White = false + Separator1875Metal = false + Separator1875Orange = true + } + } + } } diff --git a/Distribution/Restock/changelog.txt b/Distribution/Restock/changelog.txt index 0d865e1b..48bc1d06 100644 --- a/Distribution/Restock/changelog.txt +++ b/Distribution/Restock/changelog.txt @@ -104,6 +104,7 @@ - Tweaked Nerv plume to be prettier - Added optional structural strut variants on Baguette and Dumpling tanks - Fixed MH replacement for Stratus-V tank + - Added appropriate Orange/Dark/Metal variants to all stack Decouplers and Separators - Stock parts included: diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/1875/restock-decoupler-1875-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/1875/restock-decoupler-1875-1.cfg index f3c11513..f52e7f90 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/1875/restock-decoupler-1875-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/1875/restock-decoupler-1875-1.cfg @@ -52,6 +52,55 @@ PART crossfeedStatus = false toggleEditor = true toggleFlight = true + } + MODULE + { + name = ModulePartVariants + useMultipleDragCubes = false + baseVariant = BlackAndWhite + VARIANT + { + name = Metallic + displayName = #LOC_Restock_variant-surface_metal + themeName = Metal + primaryColor = #6f6e6d + secondaryColor = #6f6e6d + + GAMEOBJECTS + { + Decoupler1875White = false + Decoupler1875Metal = true + Decoupler1875Orange = false + } + } + VARIANT + { + name = BlackAndWhite + displayName = #autoLOC_8007122 + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #000000 + GAMEOBJECTS + { + Decoupler1875White = true + Decoupler1875Metal = false + Decoupler1875Orange = false + } + } + VARIANT + { + name = GrayAndOrange + displayName = #autoLOC_8007121 + themeName = GrayAndOrange + primaryColor = #4c4f47 + secondaryColor = #f49841 + GAMEOBJECTS + { + Decoupler1875White = false + Decoupler1875Metal = false + Decoupler1875Orange = true + } + } } MODULE { diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/1875/restock-separator-1875-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/1875/restock-separator-1875-1.cfg index 5d5a2903..98ec65a5 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/1875/restock-separator-1875-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/1875/restock-separator-1875-1.cfg @@ -53,6 +53,55 @@ PART toggleFlight = true } MODULE + { + name = ModulePartVariants + useMultipleDragCubes = false + baseVariant = BlackAndWhite + VARIANT + { + name = Metallic + displayName = #LOC_Restock_variant-surface_metal + themeName = Metal + primaryColor = #6f6e6d + secondaryColor = #6f6e6d + + GAMEOBJECTS + { + Separator1875White = false + Separator1875Metal = true + Separator1875Orange = false + } + } + VARIANT + { + name = BlackAndWhite + displayName = #autoLOC_8007122 + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #000000 + GAMEOBJECTS + { + Separator1875White = true + Separator1875Metal = false + Separator1875Orange = false + } + } + VARIANT + { + name = GrayAndOrange + displayName = #autoLOC_8007121 + themeName = GrayAndOrange + primaryColor = #4c4f47 + secondaryColor = #f49841 + GAMEOBJECTS + { + Separator1875White = false + Separator1875Metal = false + Separator1875Orange = true + } + } + } + MODULE { name = ModuleTestSubject useStaging = True diff --git a/Distribution/RestockPlus/changelog.txt b/Distribution/RestockPlus/changelog.txt index 374ebf35..2052faec 100644 --- a/Distribution/RestockPlus/changelog.txt +++ b/Distribution/RestockPlus/changelog.txt @@ -53,6 +53,7 @@ v0.2.0 - Pegasus II Mobility Enhancer (Nertea): 2x size static ladder - Pegasus III Mobility Enhancer (Nertea): 4x size static ladder - Fixes and improvements + - Added appropriate Orange/Dark/Metal variants to all stack Decouplers and Separators - Depth mask added to radial material bay and new RCS parts - 3.75m battery now has surface attach capabilities (#648)