diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-1-s.tga b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-1-s.tga index 08419cda..e3b16bd7 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-1-s.tga and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-1-s.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-cells-s.tga b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-cells-s.tga index 0f99d2e1..4d23b92d 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-cells-s.tga and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-cells-s.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-cells.tga b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-cells.tga index b2c3dfd9..c31f4cfd 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-cells.tga and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-cells.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor.mu b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor.mu index ac4a78bf..badb5e7e 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor.mu and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-rcs.cfg b/Distribution/Restock/GameData/ReStock/Patches/Control/restock-rcs.cfg similarity index 100% rename from Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-rcs.cfg rename to Distribution/Restock/GameData/ReStock/Patches/Control/restock-rcs.cfg diff --git a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-solarpanels.cfg b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-solarpanels.cfg index d7ea06f3..3fed2e61 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-solarpanels.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-solarpanels.cfg @@ -1,6 +1,12 @@ // Patches applying art changes to solar panels // Contents: // - (solarPanels4) +// - (solarPanels2) +// - (solarPanels3) +// - SP-W 3x2 Photovoltaic Panels (solarPanels1) +// - Gigantor XL Solar Array (largeSolarPanel) +// - () +// - () // 1x6 @PART[solarPanels4] @@ -19,6 +25,7 @@ { @secondaryTransformName = panel6 } + MODULE { name = ModuleRestockModifyMaterials @@ -38,12 +45,12 @@ FLOAT_PROPERTY { name = _SpecTint - value = 0.08 + value = 0.01 } FLOAT_PROPERTY { name = _Shininess - value = 0.8 + value = 0.8 } } } @@ -66,9 +73,11 @@ { @secondaryTransformName = panel6 } + MODULE { name = ModuleRestockModifyMaterials + MATERIAL { shader = KSP/Bumped Specular (Mapped) @@ -86,7 +95,7 @@ FLOAT_PROPERTY { name = _SpecTint - value = 0.08 + value = 0.01 } FLOAT_PROPERTY { @@ -133,7 +142,7 @@ FLOAT_PROPERTY { name = _SpecTint - value = 0.08 + value = 0.01 } FLOAT_PROPERTY { @@ -143,3 +152,67 @@ } } } + +// 2x3 shroud +@PART[solarPanels1] +{ + @author = Beale + !mesh = DELETE + !MODEL,* {} + MODEL + { + model = ReStock/Assets/Electrical/restock-solarpanel-3x2-shrouded + position = 0.0, 0.0, 0.0 + scale = 1,1,1 + rotation = 0, 0, 0 + } + @MODULE[ModuleDeployableSolarPanel] + { + @secondaryTransformName = solar6 + } + MODULE + { + name = ModuleRestockModifyMaterials + MATERIAL + { + shader = KSP/Bumped Specular (Mapped) + baseTransform = solar1 + TEXTURE_PROPERTY + { + name = _MainTex + textureUrl = ReStock/Assets/Electrical/restock-solarpanel-1 + } + TEXTURE_PROPERTY + { + name = _SpecMap + textureUrl = ReStock/Assets/Electrical/restock-solarpanel-1-s + } + FLOAT_PROPERTY + { + name = _SpecTint + value = 0.01 + } + FLOAT_PROPERTY + { + name = _Shininess + value = 0.8 + } + } + } +} + + +// Gigantor +@PART[largeSolarPanel] +{ + @author = Chris Adderley (Nertea) + !mesh = DELETE + !MODEL,* {} + MODEL + { + model = ReStock/Assets/Electrical/restock-solarpanel-gigantor + position = 0.0, 0.0, 0.0 + scale = 1,1,1 + rotation = 0, 0, 0 + } +} \ No newline at end of file diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/RCS/restock-rcs-block-dual-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-dual-1.cfg similarity index 100% rename from Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/RCS/restock-rcs-block-dual-1.cfg rename to Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-dual-1.cfg diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/RCS/restock-rcs-block-dual-mini-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-dual-mini-1.cfg similarity index 100% rename from Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/RCS/restock-rcs-block-dual-mini-1.cfg rename to Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-dual-mini-1.cfg diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/RCS/restock-rcs-block-quad-angled-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quad-angled-1.cfg similarity index 100% rename from Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/RCS/restock-rcs-block-quad-angled-1.cfg rename to Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quad-angled-1.cfg diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/RCS/restock-rcs-block-quad-angled-mini-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quad-angled-mini-1.cfg similarity index 100% rename from Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/RCS/restock-rcs-block-quad-angled-mini-1.cfg rename to Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quad-angled-mini-1.cfg diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/RCS/restock-rcs-block-quad-mini-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quad-mini-1.cfg similarity index 100% rename from Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/RCS/restock-rcs-block-quad-mini-1.cfg rename to Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quad-mini-1.cfg diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/RCS/restock-rcs-block-quint-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quint-1.cfg similarity index 100% rename from Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/RCS/restock-rcs-block-quint-1.cfg rename to Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quint-1.cfg diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/RCS/restock-rcs-block-quint-mini-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quint-mini-1.cfg similarity index 100% rename from Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/RCS/restock-rcs-block-quint-mini-1.cfg rename to Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quint-mini-1.cfg diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/RCS/restock-rcs-block-triple-angled-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-triple-angled-1.cfg similarity index 100% rename from Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/RCS/restock-rcs-block-triple-angled-1.cfg rename to Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-triple-angled-1.cfg diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/RCS/restock-rcs-block-triple-angled-mini-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-triple-angled-mini-1.cfg similarity index 100% rename from Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/RCS/restock-rcs-block-triple-angled-mini-1.cfg rename to Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-triple-angled-mini-1.cfg diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/RCS/restock-rcs-single-mini-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-single-mini-1.cfg similarity index 100% rename from Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/RCS/restock-rcs-single-mini-1.cfg rename to Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-single-mini-1.cfg