diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/125/Re_dockingPortInline/restock-inlinedockingport-mk1-1-d.dds b/Distribution/Restock/GameData/ReStock/Assets/Coupling/125/Re_dockingPortInline/restock-inlinedockingport-mk1-1-d.dds deleted file mode 100644 index 6d75771b..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Coupling/125/Re_dockingPortInline/restock-inlinedockingport-mk1-1-d.dds and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/125/Re_dockingPortInline/restock-inlinedockingport-mk1-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Coupling/125/Re_dockingPortInline/restock-inlinedockingport-mk1-1-n.dds deleted file mode 100644 index 2f8caf04..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Coupling/125/Re_dockingPortInline/restock-inlinedockingport-mk1-1-n.dds and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/125/Re_dockingPortInline/restock-inlinedockingport-mk1-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Coupling/125/Re_dockingPortInline/restock-inlinedockingport-mk1-1.mu deleted file mode 100644 index 3737abd5..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Coupling/125/Re_dockingPortInline/restock-inlinedockingport-mk1-1.mu and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/mk2DockingPort.dds b/Distribution/Restock/GameData/ReStock/Assets/Coupling/mk2DockingPort.dds new file mode 100644 index 00000000..9fea130c Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/mk2DockingPort.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-0625-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-0625-1-n.dds index 334670a4..231f6c56 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-0625-1-n.dds and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-0625-1-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-0625-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-0625-1.dds index 09485472..a807198a 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-0625-1.dds and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-0625-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-0625-2.mu b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-0625-2.mu new file mode 100644 index 00000000..37dd2f04 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-0625-2.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-125-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-125-1-n.dds index 98f4409f..74eca912 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-125-1-n.dds and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-125-1-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-125-2.mu b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-125-2.mu new file mode 100644 index 00000000..461b0473 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-125-2.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-125-shielded-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-125-shielded-1-n.dds index a1a5c35b..f85bf316 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-125-shielded-1-n.dds and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-125-shielded-1-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-25-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-25-1-n.dds index ad6d48d5..fa9ca99d 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-25-1-n.dds and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-25-1-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-25-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-25-1.dds index d37147e1..2569c484 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-25-1.dds and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-25-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-25-2.mu b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-25-2.mu new file mode 100644 index 00000000..210027b9 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-25-2.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-arrrow.dds b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-arrrow.dds new file mode 100644 index 00000000..ee81a21a Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-arrrow.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-inline-125-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-inline-125-1-n.dds new file mode 100644 index 00000000..4ed9f757 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-inline-125-1-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-inline-125-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-inline-125-1.dds new file mode 100644 index 00000000..6c218b75 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-inline-125-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-inline-125-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-inline-125-1.mu new file mode 100644 index 00000000..715c91ab Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-inline-125-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-inline-mk2-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-inline-mk2-1.mu new file mode 100644 index 00000000..b6ede8a6 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-inline-mk2-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-shielded-125-2.mu b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-shielded-125-2.mu new file mode 100644 index 00000000..a83d9931 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-shielded-125-2.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-hatch-0625-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-hatch-0625-1-n.dds index 881013d4..2150857c 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-hatch-0625-1-n.dds and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-hatch-0625-1-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-hatch-0625-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-hatch-0625-1.dds index 77173719..fffb5394 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-hatch-0625-1.dds and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-hatch-0625-1.dds differ 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/Coupling/restock-docking.cfg b/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-docking.cfg index 40754371..a8ec5cda 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-docking.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-docking.cfg @@ -1,6 +1,7 @@ // Patches applying art changes to crewed utility/science parts // Contents: // - Inline Clamp-O-Tron (dockingPortLateral) +// - Mk2 Clamp-O-Tron (mk2DockingPort) // - Clamp-O-Tron Jr. Docking Port (dockingPort3) // - Clamp-O-Tron Docking Port (dockingPort2) // - Clamp-O-Tron Sr. Docking Port (dockingPortLarge) @@ -8,16 +9,39 @@ // Inline Clamp-O-Tron @PART[dockingPortLateral]:HAS[~RestockIgnore[*]]:FOR[000_ReStock] -{ - @author = Passinglurker +{ + @author = Passinglurker and Chris Adderley (Nertea) !mesh = DELETE !MODEL {} MODEL { - model = ReStock/Assets/Coupling/125/Re_dockingPortInline/restock-inlinedockingport-mk1-1 + model = ReStock/Assets/Coupling/restock-docking-inline-125-1 } %rescaleFactor = 1 %manufacturer = #autoLOC_501624 + + @MODULE[ModuleAnimateGeneric] + { + @animationName = DockingPortExtend + } +} + +// Mk2 Clamp-O-Tron +@PART[mk2DockingPort]:HAS[~RestockIgnore[*]]:FOR[000_ReStock] +{ + @author = Porkjet and Chris Adderley (Nertea) + !mesh = DELETE + !MODEL {} + MODEL + { + model = ReStock/Assets/Coupling/restock-docking-inline-mk2-1 + } + %rescaleFactor = 1 + + @MODULE[ModuleAnimateGeneric] + { + @animationName = DockingPortExtend + } } // Clamp-O-Tron Jr. Docking Port @@ -28,7 +52,7 @@ !MODEL {} MODEL { - model = ReStock/Assets/Coupling/restock-docking-0625 + model = ReStock/Assets/Coupling/restock-docking-0625-2 } %rescaleFactor = 1 MODULE @@ -76,7 +100,7 @@ !MODEL {} MODEL { - model = ReStock/Assets/Coupling/restock-docking-125-1 + model = ReStock/Assets/Coupling/restock-docking-125-2 } MODEL { @@ -86,41 +110,7 @@ rotation = 180, 0, 0 } %rescaleFactor = 1 - MODULE - { - name = ModuleColorChanger - shaderProperty = _EmissiveColor - animRate = 0.8 - animState = false - useRate = true - toggleInEditor = true - toggleInFlight = true - unfocusedRange = 5 - toggleName = #autoLOC_502011 //#autoLOC_502011 = Toggle Lights - eventOnName = #autoLOC_502012 //#autoLOC_502012 = Lights On - eventOffName = #autoLOC_502013 //#autoLOC_502013 = Lights Off - toggleAction = True - defaultActionGroup = Light - redCurve - { - key = 0 0 0 3 - key = 1 1 0 0 - } - greenCurve - { - key = 0 0 0 1 - key = 1 1 1 0 - } - blueCurve - { - key = 0 0 0 0 - key = 1 0.7 1.5 0 - } - alphaCurve - { - key = 0 1 - } - } + } // Clamp-O-Tron Sr. Docking Port @@ -131,7 +121,7 @@ !MODEL {} MODEL { - model = ReStock/Assets/Coupling/restock-docking-25-1 + model = ReStock/Assets/Coupling/restock-docking-25-2 } MODEL { @@ -141,41 +131,7 @@ rotation = 180, 0, 0 } %rescaleFactor = 1 - MODULE - { - name = ModuleColorChanger - shaderProperty = _EmissiveColor - animRate = 0.8 - animState = false - useRate = true - toggleInEditor = true - toggleInFlight = true - unfocusedRange = 5 - toggleName = #autoLOC_502011 //#autoLOC_502011 = Toggle Lights - eventOnName = #autoLOC_502012 //#autoLOC_502012 = Lights On - eventOffName = #autoLOC_502013 //#autoLOC_502013 = Lights Off - toggleAction = True - defaultActionGroup = Light - redCurve - { - key = 0 0 0 3 - key = 1 1 0 0 - } - greenCurve - { - key = 0 0 0 1 - key = 1 1 1 0 - } - blueCurve - { - key = 0 0 0 0 - key = 1 0.7 1.5 0 - } - alphaCurve - { - key = 0 1 - } - } + } // Clamp-O-Tron Shielded Docking Port @@ -186,7 +142,7 @@ !MODEL {} MODEL { - model = ReStock/Assets/Coupling/restock-docking-shielded-125-1 + model = ReStock/Assets/Coupling/restock-docking-shielded-125-2 } MODEL { @@ -200,41 +156,7 @@ { @animationName = PortExtend } - MODULE - { - name = ModuleColorChanger - shaderProperty = _EmissiveColor - animRate = 0.8 - animState = false - useRate = true - toggleInEditor = true - toggleInFlight = true - unfocusedRange = 5 - toggleName = #autoLOC_502011 //#autoLOC_502011 = Toggle Lights - eventOnName = #autoLOC_502012 //#autoLOC_502012 = Lights On - eventOffName = #autoLOC_502013 //#autoLOC_502013 = Lights Off - toggleAction = True - defaultActionGroup = Light - redCurve - { - key = 0 0 0 3 - key = 1 1 0 0 - } - greenCurve - { - key = 0 0 0 1 - key = 1 1 1 0 - } - blueCurve - { - key = 0 0 0 0 - key = 1 0.7 1.5 0 - } - alphaCurve - { - key = 0 1 - } - } + MODULE { name = FXModuleLookAtConstraint 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/Patches/Ground/restock-wheels.cfg b/Distribution/Restock/GameData/ReStock/Patches/Ground/restock-wheels.cfg index 1149cc3f..6619548f 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Ground/restock-wheels.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Ground/restock-wheels.cfg @@ -115,7 +115,7 @@ @damagedTransformName = WheelBusted @undamagedTransformName = Wheel } - !MODULE[FXModuleLookAtConstraint] + !MODULE[FXModuleLookAtConstraint]{} MODULE { name = ModuleRestockConstraints diff --git a/Distribution/Restock/GameData/ReStock/Restock.restockblacklist b/Distribution/Restock/GameData/ReStock/Restock.restockblacklist index 159f852d..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 @@ -144,6 +145,7 @@ Squad/Parts/Utility/launchClamp1/ Squad/Parts/Utility/launchEscapeSystem/ Squad/Parts/Utility/Lights/ Squad/Parts/Utility/linearVernorRCS/ +Squad/Parts/Utility/mk2DockingPort/ Squad/Parts/Utility/parachuteMk1/ Squad/Parts/Utility/parachuteMk12-R/ Squad/Parts/Utility/parachuteMk16-XL/ diff --git a/Distribution/Restock/GameData/ReStock/Versioning/ReStock.version b/Distribution/Restock/GameData/ReStock/Versioning/ReStock.version index db6e7ea9..8e9e1313 100644 --- a/Distribution/Restock/GameData/ReStock/Versioning/ReStock.version +++ b/Distribution/Restock/GameData/ReStock/Versioning/ReStock.version @@ -12,17 +12,17 @@ "KSP_VERSION": { "MAJOR":1, - "MINOR":11, - "PATCH":2 + "MINOR":12, + "PATCH":1 }, "KSP_VERSION_MIN":{ "MAJOR":1, - "MINOR":11, + "MINOR":12, "PATCH":1 }, "KSP_VERSION_MAX":{ "MAJOR":1, - "MINOR":11, + "MINOR":12, "PATCH":99 } } diff --git a/Distribution/Restock/changelog.txt b/Distribution/Restock/changelog.txt index ea0c3845..f5276b65 100644 --- a/Distribution/Restock/changelog.txt +++ b/Distribution/Restock/changelog.txt @@ -1,3 +1,16 @@ +v1.4.0 +------ +- KSP 1.12 +- 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 +- Adapted new stock collider for 2.5m nosecone replacement +- Texture updates for Gigantor + v1.3.3 ------ - Fix Poodle shroud shaders diff --git a/Distribution/Restock/readme.txt b/Distribution/Restock/readme.txt index d31d5ed9..763bf8c3 100644 --- a/Distribution/Restock/readme.txt +++ b/Distribution/Restock/readme.txt @@ -1,5 +1,5 @@ ============= -RESTOCK 1.3.3 +RESTOCK 1.4.0 ============= Restock is a project to improve the art of the Kerbal Space Program part set. Some of the revisions are based on the canceled Part Overhaul project by Porkjet. diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Coupling/restock-docking-375-1-e.dds b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Coupling/restock-docking-375-1-e.dds index a53918de..f22a9c6a 100644 Binary files a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Coupling/restock-docking-375-1-e.dds and b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Coupling/restock-docking-375-1-e.dds differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Coupling/restock-docking-375-1-n.dds b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Coupling/restock-docking-375-1-n.dds index 3eacdb84..74f77949 100644 Binary files a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Coupling/restock-docking-375-1-n.dds and b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Coupling/restock-docking-375-1-n.dds differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Coupling/restock-docking-375-1.dds b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Coupling/restock-docking-375-1.dds index a36b604e..cd69fc5a 100644 Binary files a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Coupling/restock-docking-375-1.dds and b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Coupling/restock-docking-375-1.dds differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Coupling/restock-docking-375-2.mu b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Coupling/restock-docking-375-2.mu new file mode 100644 index 00000000..76033380 Binary files /dev/null and b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Coupling/restock-docking-375-2.mu differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Coupling/restock-docking-arrrow.dds b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Coupling/restock-docking-arrrow.dds new file mode 100644 index 00000000..ee81a21a Binary files /dev/null and b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Coupling/restock-docking-arrrow.dds differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/375/restock-docking-375-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/375/restock-docking-375-1.cfg index 3e9d383a..10c9b4ed 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/375/restock-docking-375-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/375/restock-docking-375-1.cfg @@ -7,7 +7,7 @@ PART author = Chris Adderley (Nertea) MODEL { - model = ReStockPlus/Assets/Coupling/restock-docking-375-1 + model = ReStockPlus/Assets/Coupling/restock-docking-375-2 scale = 1.0, 1.0, 1.0 } MODEL @@ -57,6 +57,15 @@ PART referenceAttachNode = top nodeType = size3 stagingEnabled = False + canRotate = True + rotationTransformName = port + maxMotorOutput = 200 + RESOURCE + { + name = ElectricCharge + rate = 1 + } + rotationAxis = Y } MODULE { diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Versioning/ReStockPlus.version b/Distribution/RestockPlus/GameData/ReStockPlus/Versioning/ReStockPlus.version index b488cac6..57ec7c95 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Versioning/ReStockPlus.version +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Versioning/ReStockPlus.version @@ -5,24 +5,24 @@ "VERSION": { "MAJOR":1, - "MINOR":3, - "PATCH":3, + "MINOR":4, + "PATCH":0, "BUILD":0 }, "KSP_VERSION": { "MAJOR":1, - "MINOR":11, - "PATCH":2 + "MINOR":12, + "PATCH":1 }, "KSP_VERSION_MIN":{ "MAJOR":1, - "MINOR":11, + "MINOR":12, "PATCH":1 }, "KSP_VERSION_MAX":{ "MAJOR":1, - "MINOR":11, + "MINOR":12, "PATCH":99 } } diff --git a/Distribution/RestockPlus/changelog.txt b/Distribution/RestockPlus/changelog.txt index 7809af08..1d953234 100644 --- a/Distribution/RestockPlus/changelog.txt +++ b/Distribution/RestockPlus/changelog.txt @@ -1,3 +1,9 @@ +v1.4.0 +------ +- KSP 1.12 +- Added rotational docking port feature to 3.75m docking port +- Texture updates for 3.75m docking port + v1.3.3 ------ - Fixed smoke emission point on single Boar engine diff --git a/Distribution/RestockPlus/readme.txt b/Distribution/RestockPlus/readme.txt index edc38236..fdf0b5e7 100644 --- a/Distribution/RestockPlus/readme.txt +++ b/Distribution/RestockPlus/readme.txt @@ -1,5 +1,5 @@ ============== -RESTOCK+ 1.3.3 +RESTOCK+ 1.4.0 ============== Restock+ is a complement to Restock which adds useful parts that we feel are missing from the base game. Functionally, these parts additions allow better flexibility in craft construction and not add new gameplay systems or form factors. Some examples might include: