diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-ox-10l.mu b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-ox-10l.mu new file mode 100644 index 00000000..e04b219b Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-ox-10l.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-2.mu b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-2.mu new file mode 100644 index 00000000..e94e26fe Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-2.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-base-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-base-n.dds index 049ab564..8a1ff182 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-base-n.dds and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-base-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-base.dds b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-base.dds index f53d4826..a3f4504a 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-base.dds and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-base.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-cells-2-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-cells-2-n.dds new file mode 100644 index 00000000..99b9d784 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-cells-2-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-cells-2-s.dds b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-cells-2-s.dds new file mode 100644 index 00000000..8b8317e8 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-cells-2-s.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-cells-2.dds b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-cells-2.dds new file mode 100644 index 00000000..aabd006d Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor-cells-2.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-l-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-l-n.dds new file mode 100644 index 00000000..052c9761 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-l-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-l-s.dds b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-l-s.dds new file mode 100644 index 00000000..5a74ee26 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-l-s.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-l.dds b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-l.dds new file mode 100644 index 00000000..8d8cbe20 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-l.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-round-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-round-1-n.dds new file mode 100644 index 00000000..2a1fff41 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-round-1-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-round-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-round-1.dds new file mode 100644 index 00000000..dd5317ca Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-round-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-round-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-round-1.mu new file mode 100644 index 00000000..820be8b5 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-round-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-round-cells-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-round-cells-1-n.dds new file mode 100644 index 00000000..97600453 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-round-cells-1-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-round-cells-1-s.dds b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-round-cells-1-s.dds new file mode 100644 index 00000000..b108be67 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-round-cells-1-s.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-round-cells-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-round-cells-1.dds new file mode 100644 index 00000000..aaa69d97 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-round-cells-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-round-shrouded-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-round-shrouded-1.mu new file mode 100644 index 00000000..2e923e79 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-round-shrouded-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-sp-10l.mu b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-sp-10l.mu new file mode 100644 index 00000000..e5abbe7b Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-sp-10l.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-25-1-alt-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-25-1-alt-n.dds index 6cd2e7d4..4f97ba04 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-25-1-alt-n.dds and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-25-1-alt-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-25-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-25-1-n.dds index b325d721..d83e94ad 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-25-1-n.dds and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-25-1-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-25-2.mu b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-25-2.mu new file mode 100644 index 00000000..54954220 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-25-2.mu 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 1738b37b..b66834b6 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-25.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-25.cfg @@ -1,6 +1,7 @@ // Patches applying art changes to 2.5m aerodynamic parts // Contents: // - Protective Rocket Nose Cone Mk7 (rocketNoseCone_v2) +// - Protective Rocket Nose Cone Mk7 (rocketNoseCone_v3) // Protective Rocket Nose Cone Mk7 @PART[rocketNoseCone_v2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock] @@ -62,3 +63,64 @@ } } } + +// Protective Rocket Nose Cone Mk7 [1.12] +@PART[rocketNoseCone_v3]:HAS[~RestockIgnore[*]]:FOR[000_ReStock] +{ + @author = Chris Adderley (Nertea) + !mesh = DELETE + !MODEL,* {} + MODEL + { + model = ReStock/Assets/Structural/restock-nosecone-25-2 + } + !MODULE[ModulePartVariants] {} + MODULE + { + name = ModulePartVariants + useMultipleDragCubes = false + baseVariant = White + VARIANT + { + name = White + displayName = #autoLOC_8007119 + themeName = White + primaryColor = #ffffff + secondaryColor = #ffffff + GAMEOBJECTS + { + 25mNoseconeBlackWhite = false + 25mNoseconeWhite = true + 25mNoseconeOrange = false + } + } + VARIANT + { + name = BlackAndWhite + displayName = #autoLOC_8007122 + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #000000 + GAMEOBJECTS + { + 25mNoseconeBlackWhite = true + 25mNoseconeWhite = false + 25mNoseconeOrange = false + } + } + VARIANT + { + name = Orange + displayName = #autoLOC_8007121 + themeName = Orange + primaryColor = #4c4f47 + secondaryColor = #f49841 + GAMEOBJECTS + { + 25mNoseconeBlackWhite = false + 25mNoseconeWhite = false + 25mNoseconeOrange = true + } + } + } +} \ No newline at end of file diff --git a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-solarpanels.cfg b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-solarpanels.cfg index 6140dc31..91f33cfb 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-solarpanels.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-solarpanels.cfg @@ -7,6 +7,11 @@ // - Gigantor XL Solar Array (largeSolarPanel) // - OX-STAT Photovoltaic Panels (solarPanels5) // - OX-STAT-XL Photovoltaic Panels (LgRadialSolarPanel) +// - OX-10C Photovoltaic Panels (solarPanelOX10C) +// - SP-10C Photovoltaic Panels (solarPanelSP10C) +// - OX-10L Photovoltaic Panels (solarPanelOX10L) +// - SP-10L Photovoltaic Panels (solarPanelSP10C) + // OX-4L 1x6 Photovoltaic Panels @PART[solarPanels4]:HAS[~RestockIgnore[*]]:FOR[000_ReStock] @@ -111,7 +116,7 @@ !MODEL,* {} MODEL { - model = ReStock/Assets/Electrical/restock-solarpanel-gigantor + model = ReStock/Assets/Electrical/restock-solarpanel-gigantor-2 position = 0.0, 0.0, 0.0 scale = 1,1,1 rotation = 0, 0, 0 @@ -157,3 +162,97 @@ rotation = 0, 0, 0 } } + +// OX-10C Photovoltaic Panels +@PART[solarPanelOX10C]:HAS[~RestockIgnore[*]]:FOR[000_ReStock] +{ + @author = Chris Adderley (Nertea) + !mesh = DELETE + !MODEL,* {} + MODEL + { + model = ReStock/Assets/Electrical/restock-solarpanel-round-1 + position = 0.0, 0.0, 0.0 + scale = 1,1,1 + rotation = 0, 0, 0 + } + @MODULE[ModuleDeployableSolarPanel] + { + @animationName = PanelsExtend + @secondaryTransformName = sunCatcher + %pivotName = B_PanelSunPivot + @breakName = B_PanelPitch + } + MODULE + { + name = ModuleRestockDeployableMeshHider + transformName = Panels + } +} + +// SP-10C Photovoltaic Panels +@PART[solarPanelSP10C] +{ + @author = Chris Adderley (Nertea) + !mesh = DELETE + !MODEL,* {} + MODEL + { + model = ReStock/Assets/Electrical/restock-solarpanel-round-shrouded-1 + position = 0.0, 0.0, 0.0 + scale = 1,1,1 + rotation = 0, 0, 0 + } + @MODULE[ModuleDeployableSolarPanel] + { + @animationName = PanelsExtend + @secondaryTransformName = sunCatcher + %pivotName = B_PanelSunPivot + @breakName = B_PanelPitch + } + MODULE + { + name = ModuleRestockDeployableMeshHider + transformName = Panels + } + MODULE + { + name = ModuleRestockDepthMask + maskTransform = DepthMask + } +} + +// OX-10L Photovoltaic Panels +@PART[solarPanelOX10L]:HAS[~RestockIgnore[*]]:FOR[000_ReStock] +{ + @author = Beale + !mesh = DELETE + !MODEL,* {} + MODEL + { + model = ReStock/Assets/Electrical/restock-ox-10l + position = 0.0, 0.0, 0.0 + scale = 1,1,1 + rotation = 0, 0, 0 + } +} + +// SP-10L Photovoltaic Panels +@PART[solarPanelSP10L]:HAS[~RestockIgnore[*]]:FOR[000_ReStock] +{ + @author = Beale + !mesh = DELETE + !MODEL,* {} + MODEL + { + model = ReStock/Assets/Electrical/restock-sp-10l + position = 0.0, 0.0, 0.0 + scale = 1,1,1 + rotation = 0, 0, 0 + } + MODULE + { + name = ModuleRestockDepthMask + maskTransform = mask + } +} diff --git a/Distribution/Restock/GameData/ReStock/Restock.restockblacklist b/Distribution/Restock/GameData/ReStock/Restock.restockblacklist index b69dfaa2..ca41cff5 100644 --- a/Distribution/Restock/GameData/ReStock/Restock.restockblacklist +++ b/Distribution/Restock/GameData/ReStock/Restock.restockblacklist @@ -2,6 +2,7 @@ Squad/Parts/Aero/aerodynamicNoseCone/ Squad/Parts/Aero/basicFin/ Squad/Parts/Aero/cones/Assets/ConeA.mu Squad/Parts/Aero/cones/Assets/ConeB.mu +Squad/Parts/Aero/cones/Assets/rocketNoseCone_v3 Squad/Parts/Aero/cones/Assets/ConesDiffuse*.dds Squad/Parts/Aero/cones/Assets/ConesHeat*.dds Squad/Parts/Aero/cones/Assets/TinyCone.mu diff --git a/Distribution/Restock/changelog.txt b/Distribution/Restock/changelog.txt index 2551e54a..01609f83 100644 --- a/Distribution/Restock/changelog.txt +++ b/Distribution/Restock/changelog.txt @@ -1,7 +1,16 @@ v1.4.0 ------ - KSP 1.12 -- Updated docking ports to be able to rotate, includes a few texture touchups +- Added new part replacements + - Electrical + - OX-10C Photovoltaic Panels (Nertea) + - SP-10C Photovoltaic Panels (Nertea) + - OX-10L Photovoltaic Panels (Beale) + - SP-10L Photovoltaic Panels (Beale) +- Adapted docking port models for new 1.12 rotational functionality +- Adapter new collider for 2.5m nosecone replacement +- Texture updates for 3.75m docking port +- Texture updates for Gigantor v1.3.3 ------ diff --git a/Distribution/RestockPlus/changelog.txt b/Distribution/RestockPlus/changelog.txt index e63a2e12..6b0470c2 100644 --- a/Distribution/RestockPlus/changelog.txt +++ b/Distribution/RestockPlus/changelog.txt @@ -1,7 +1,6 @@ v1.4.0 ------ - KSP 1.12 -- Updated docking ports to be able to rotate, includes a few texture touchups v1.3.3 ------