diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-flea-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-flea-1.mu index 81548876..c91f9876 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-flea-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-flea-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-hammer-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-hammer-1.mu index 70523446..c4718452 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-hammer-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-hammer-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-125-1-dark.tga b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-125-1-dark.tga new file mode 100644 index 00000000..799770d5 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-125-1-dark.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-125-1-orange.tga b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-125-1-orange.tga new file mode 100644 index 00000000..871cb126 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-125-1-orange.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-125-1-white.tga b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-125-1-white.tga new file mode 100644 index 00000000..2fe08c31 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-125-1-white.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-25.cfg b/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-25.cfg index 58f0b28f..acf8da80 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-25.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-25.cfg @@ -2,7 +2,7 @@ // Contents: // - Protective Rocket Nose Cone Mk7 (rocketNoseCone) -@PART[rocketNoseCone] +@PART[rocketNoseCone_v2] { @author = Chris Adderley (Nertea) @@ -11,4 +11,54 @@ MODEL { model = ReStock/Assets/Structural/restock-nosecone-25-1 } + !MODULE[ModulePartVariants] {} + MODULE + { + name = ModulePartVariants + baseVariant = White + VARIANT + VARIANT + { + name = White + displayName = #autoLOC_8007119 + themeName = White + primaryColor = #ffffff + secondaryColor = #ffffff + GAMEOBJECTS + { + 375mAdapterBlackWhite = false + 375mAdapterWhite = true + 375mAdapterOrange = false + } + } + { + name = BlackAndWhite + displayName = #autoLOC_8007122 + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #000000 + GAMEOBJECTS + { + 375mAdapterBlackWhite = true + 375mAdapterWhite = false + 375mAdapterOrange = false + } + + } + + VARIANT + { + name = Orange + displayName = #autoLOC_8007121 + themeName = Orange + primaryColor = #4c4f47 + secondaryColor = #f49841 + GAMEOBJECTS + { + 375mAdapterBlackWhite = false + 375mAdapterWhite = false + 375mAdapterOrange = true + } + } + } } diff --git a/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-125.cfg b/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-125.cfg index 5dee4da7..15d0bde8 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-125.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-125.cfg @@ -7,7 +7,7 @@ @PART[fuelTankSmallFlat] { - @author = Porkjet + @author = Porkjet and Chris Adderley (Nertea) !mesh = DELETE !MODEL {} @@ -15,11 +15,72 @@ model = ReStock/Assets/FuelTank/restock-fueltank-125-4 } !MODULE[ModulePartVariants] {} + MODULE + { + name = ModulePartVariants + baseVariant = BlackAndWhite + VARIANT + { + name = Dark + displayName = #autoLOC_8007117 + themeName = Dark + primaryColor = #4c4f47 + secondaryColor = #4c4f47 + TEXTURE + { + mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1-dark + _BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n + shader = KSP/Bumped Specular + } + } + VARIANT + { + name = BlackAndWhite + displayName = #autoLOC_8007122 + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #000000 + TEXTURE + { + mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1 + _BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n + shader = KSP/Bumped Specular + } + } + VARIANT + { + name = White + displayName = #autoLOC_8007119 + themeName = White + primaryColor = #ffffff + secondaryColor = #ffffff + TEXTURE + { + mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1-white + _BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n + shader = KSP/Specular + } + } + VARIANT + { + name = GrayAndOrange + displayName = #autoLOC_8007121 + themeName = GrayAndOrange + primaryColor = #4c4f47 + secondaryColor = #f49841 + TEXTURE + { + mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1-orange + _BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n + shader = KSP/Specular + } + } + } } @PART[fuelTankSmall] { - @author = Porkjet + @author = Porkjet and Chris Adderley (Nertea) // @node_stack_top = 0.0, 5.5525, 0.0, 0.0, 1.0, 0.0 // @node_stack_bottom = 0.0, -5.5525, 0.0, 0.0, -1.0, 0.0 // @node_attach = 6.2625, 0.0, 0.0, 1.0, 0.0, 0.0, 1 @@ -30,11 +91,72 @@ } %rescaleFactor = 1 !MODULE[ModulePartVariants] {} + MODULE + { + name = ModulePartVariants + baseVariant = BlackAndWhite + VARIANT + { + name = Dark + displayName = #autoLOC_8007117 + themeName = Dark + primaryColor = #4c4f47 + secondaryColor = #4c4f47 + TEXTURE + { + mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1-dark + _BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n + shader = KSP/Bumped Specular + } + } + VARIANT + { + name = BlackAndWhite + displayName = #autoLOC_8007122 + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #000000 + TEXTURE + { + mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1 + _BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n + shader = KSP/Bumped Specular + } + } + VARIANT + { + name = White + displayName = #autoLOC_8007119 + themeName = White + primaryColor = #ffffff + secondaryColor = #ffffff + TEXTURE + { + mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1-white + _BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n + shader = KSP/Specular + } + } + VARIANT + { + name = GrayAndOrange + displayName = #autoLOC_8007121 + themeName = GrayAndOrange + primaryColor = #4c4f47 + secondaryColor = #f49841 + TEXTURE + { + mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1-orange + _BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n + shader = KSP/Specular + } + } + } } @PART[fuelTank] { - @author = Porkjet + @author = Porkjet and Chris Adderley (Nertea) !mesh = DELETE !MODEL {} @@ -43,6 +165,67 @@ } %rescaleFactor = 1 !MODULE[ModulePartVariants] {} + MODULE + { + name = ModulePartVariants + baseVariant = BlackAndWhite + VARIANT + { + name = Dark + displayName = #autoLOC_8007117 + themeName = Dark + primaryColor = #4c4f47 + secondaryColor = #4c4f47 + TEXTURE + { + mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1-dark + _BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n + shader = KSP/Bumped Specular + } + } + VARIANT + { + name = BlackAndWhite + displayName = #autoLOC_8007122 + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #000000 + TEXTURE + { + mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1 + _BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n + shader = KSP/Bumped Specular + } + } + VARIANT + { + name = White + displayName = #autoLOC_8007119 + themeName = White + primaryColor = #ffffff + secondaryColor = #ffffff + TEXTURE + { + mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1-white + _BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n + shader = KSP/Specular + } + } + VARIANT + { + name = GrayAndOrange + displayName = #autoLOC_8007121 + themeName = GrayAndOrange + primaryColor = #4c4f47 + secondaryColor = #f49841 + TEXTURE + { + mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1-orange + _BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n + shader = KSP/Specular + } + } + } // @node_stack_top = 0.0, 9.81725, 0.0, 0.0, 1.0, 0.0 // @node_stack_bottom = 0.0, -9.12500, 0.0, 0.0, -1.0, 0.0 // @node_attach = 6.2625, 0.0, 0.0, 1.0, 0.0, 0.0, 1 @@ -50,7 +233,7 @@ @PART[fuelTank_long] { - @author = Porkjet + @author = Porkjet and Chris Adderley (Nertea) // @node_stack_top = 0.0, 18.75, 0.0, 0.0, 1.0, 0.0 // @node_stack_bottom = 0.0, -18.87500, 0.0, 0.0, -1.0, 0.0 // @node_attach = 6.2625, 0.0, 0.0, 1.0, 0.0, 0.0, 1 @@ -60,5 +243,66 @@ model = ReStock/Assets/FuelTank/restock-fueltank-125-1 } !MODULE[ModulePartVariants] {} + MODULE + { + name = ModulePartVariants + baseVariant = BlackAndWhite + VARIANT + { + name = Dark + displayName = #autoLOC_8007117 + themeName = Dark + primaryColor = #4c4f47 + secondaryColor = #4c4f47 + TEXTURE + { + mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1-dark + _BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n + shader = KSP/Bumped Specular + } + } + VARIANT + { + name = BlackAndWhite + displayName = #autoLOC_8007122 + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #000000 + TEXTURE + { + mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1 + _BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n + shader = KSP/Bumped Specular + } + } + VARIANT + { + name = White + displayName = #autoLOC_8007119 + themeName = White + primaryColor = #ffffff + secondaryColor = #ffffff + TEXTURE + { + mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1-white + _BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n + shader = KSP/Specular + } + } + VARIANT + { + name = GrayAndOrange + displayName = #autoLOC_8007121 + themeName = GrayAndOrange + primaryColor = #4c4f47 + secondaryColor = #f49841 + TEXTURE + { + mainTextureURL = ReStock/Assets/FuelTank/restock-fueltank-125-1-orange + _BumpMap = ReStock/Assets/FuelTank/restock-fueltank-125-1-n + shader = KSP/Specular + } + } + } %rescaleFactor = 1 } diff --git a/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-125.cfg b/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-125.cfg index fda5913a..52d5ff41 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-125.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-125.cfg @@ -12,6 +12,58 @@ MODEL { model = ReStock/Assets/Structural/restock-adapter-125-0625-1 } + !MODULE[ModulePartVariants] {} + MODULE + { + name = ModulePartVariants + baseVariant = BlackAndWhite + VARIANT + { + name = BlackAndWhite + displayName = #autoLOC_8007122 + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #000000 + GAMEOBJECTS + { + 125mAdapterTallOrange = false + 125mAdapterTallWhite = true + 125mAdapterTallDark = false + } + + } + + + VARIANT + { + name = GrayAndOrange + displayName = #autoLOC_8007121 + themeName = GrayAndOrange + primaryColor = #4c4f47 + secondaryColor = #f49841 + GAMEOBJECTS + { + 125mAdapterTallOrange = true + 125mAdapterTallWhite = false + 125mAdapterTallDark = false + } + } + VARIANT + { + name = Dark + displayName = #autoLOC_8007117 + themeName = Dark + primaryColor = #4c4f47 + secondaryColor = #4c4f47 + GAMEOBJECTS + { + 125mAdapterTallOrange = false + 125mAdapterTallWhite = false + 125mAdapterTallDark = true + } + } + + } } @PART[adapterSmallMiniShort] @@ -23,4 +75,72 @@ MODEL { model = ReStock/Assets/Structural/restock-adapter-125-0625-2 } + !MODULE[ModulePartVariants] {} + MODULE + { + name = ModulePartVariants + baseVariant = BlackAndWhite + VARIANT + { + name = BlackAndWhite + displayName = #autoLOC_8007122 + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #000000 + GAMEOBJECTS + { + 125mAdapterShortOrange = false + 125mAdapterShortWhite = true + 125mAdapterShortDark = false + 125mAdapterShortMetal = false + } + } + VARIANT + { + name = GrayAndOrange + displayName = #autoLOC_8007121 + themeName = GrayAndOrange + primaryColor = #4c4f47 + secondaryColor = #f49841 + GAMEOBJECTS + { + 125mAdapterShortOrange = true + 125mAdapterShortWhite = false + 125mAdapterShortDark = false + 125mAdapterShortMetal = false + } + } + VARIANT + { + name = Dark + displayName = #autoLOC_8007117 + themeName = Dark + primaryColor = #4c4f47 + secondaryColor = #4c4f47 + GAMEOBJECTS + { + 125mAdapterShortOrange = false + 125mAdapterShortWhite = false + 125mAdapterShortDark = true + 125mAdapterShortMetal = false + } + + } + VARIANT + { + name = Metal + displayName = #LOC_Restock_variant-surface_metal + themeName = Metal + primaryColor = #6f6e6d + secondaryColor = #6f6e6d + GAMEOBJECTS + { + 125mAdapterShortOrange = false + 125mAdapterShortWhite = false + 125mAdapterShortDark = false + 125mAdapterShortMetal = true + } + + } + } } diff --git a/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-25.cfg b/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-25.cfg index 5bb8e5b4..330ece1e 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-25.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-25.cfg @@ -12,7 +12,40 @@ MODEL { model = ReStock/Assets/Structural/restock-adapter-25-125-1 } + !MODULE[ModulePartVariants] {} %rescaleFactor = 1 + MODULE + { + name = ModulePartVariants + baseVariant = BlackAndWhite + + VARIANT + { + name = BlackAndWhite + displayName = #autoLOC_8007122 + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #000000 + GAMEOBJECTS + { + 25mAdapterTallOrange = false + 25mAdapterTallWhite = true + } + } + VARIANT + { + name = Orange + displayName = #autoLOC_8007117 + themeName = Orange + primaryColor = #4c4f47 + secondaryColor = #4c4f47 + GAMEOBJECTS + { + 25mAdapterTallOrange = true + 25mAdapterTallWhite = false + } + } + } } @PART[largeAdapter2] { @@ -24,4 +57,54 @@ model = ReStock/Assets/Structural/restock-adapter-25-125-2 } %rescaleFactor = 1 + !MODULE[ModulePartVariants] {} + MODULE + { + name = ModulePartVariants + baseVariant = BlackAndWhite + + VARIANT + { + name = BlackAndWhite + displayName = #autoLOC_8007122 + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #000000 + GAMEOBJECTS + { + 25mAdapterShortOrange = false + 25mAdapterShortWhite = true + 25mAdapterShortMetal = false + } + } + VARIANT + { + name = Orange + displayName = #autoLOC_8007117 + themeName = Orange + primaryColor = #4c4f47 + secondaryColor = #4c4f47 + GAMEOBJECTS + { + 25mAdapterShortOrange = true + 25mAdapterShortWhite = false + 25mAdapterShortMetal = false + } + } + VARIANT + { + name = Metal + displayName = #LOC_Restock_variant-surface_metal + themeName = Metal + primaryColor = #6f6e6d + secondaryColor = #6f6e6d + GAMEOBJECTS + { + 25mAdapterShortOrange = false + 25mAdapterShortWhite = false + 25mAdapterShortMetal = true + } + } + + } } diff --git a/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-375.cfg b/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-375.cfg index d4e63f01..e0c884c3 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-375.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-375.cfg @@ -2,7 +2,7 @@ // Contents: // - Kerbodyne ADTP-2-3 (Size3to2Adapter) -@PART[Size3to2Adapter] { +@PART[Size3To2Adapter_v2] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -11,4 +11,53 @@ model = ReStock/Assets/FuelTank/restock-adapter-375-solid-1 } %rescaleFactor = 1 + !MODULE[ModulePartVariants] {} + MODULE + { + name = ModulePartVariants + baseVariant = BlackAndWhite + VARIANT + { + name = BlackAndWhite + displayName = #autoLOC_8007122 + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #000000 + GAMEOBJECTS + { + 375mAdapterBlackWhite = true + 375mAdapterWhite = false + 375mAdapterOrange = false + } + + } + VARIANT + { + name = White + displayName = #autoLOC_8007119 + themeName = White + primaryColor = #ffffff + secondaryColor = #ffffff + GAMEOBJECTS + { + 375mAdapterBlackWhite = false + 375mAdapterWhite = true + 375mAdapterOrange = false + } + } + VARIANT + { + name = Orange + displayName = #autoLOC_8007121 + themeName = Orange + primaryColor = #4c4f47 + secondaryColor = #f49841 + GAMEOBJECTS + { + 375mAdapterBlackWhite = false + 375mAdapterWhite = false + 375mAdapterOrange = true + } + } + } }