diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-engine-boar-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-engine-boar-1.dds deleted file mode 100644 index 975d38bb..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-engine-boar-1.dds and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-foil-1-b.dds b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-foil-1-b.dds deleted file mode 100644 index 6768eee5..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-foil-1-b.dds and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-hecs21.dds b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-hecs21.dds deleted file mode 100644 index 87d808b4..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-hecs21.dds and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-sphere-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-sphere-1.mu index 750f3c4b..691692e8 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-sphere-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-sphere-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-stayputnik-1-b.dds b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-stayputnik-1-b.dds deleted file mode 100644 index 27c90827..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-probe-stayputnik-1-b.dds and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decoupler-radial-2.mu b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decoupler-radial-2.mu index 998fd2b5..939d24b3 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decoupler-radial-2.mu and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decoupler-radial-2.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decoupler-radial-3.mu b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decoupler-radial-3.mu index c75d6506..0d408787 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decoupler-radial-3.mu and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decoupler-radial-3.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-2.dds b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-2.dds index fb688710..82c815b9 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-2.dds and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-2.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-2.tga b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-2.tga new file mode 100644 index 00000000..c6f9336b Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-decouplers-2.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/SolarPanel_NRM.dds b/Distribution/Restock/GameData/ReStock/Assets/Electrical/SolarPanel_NRM.dds new file mode 100644 index 00000000..475790f9 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/SolarPanel_NRM.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/SolarPanel_auv.dds b/Distribution/Restock/GameData/ReStock/Assets/Electrical/SolarPanel_auv.dds new file mode 100644 index 00000000..67207363 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/SolarPanel_auv.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/SolarShroud_NRM.dds b/Distribution/Restock/GameData/ReStock/Assets/Electrical/SolarShroud_NRM.dds new file mode 100644 index 00000000..610be3b3 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/SolarShroud_NRM.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/SolarShroud_auv.dds b/Distribution/Restock/GameData/ReStock/Assets/Electrical/SolarShroud_auv.dds new file mode 100644 index 00000000..58765244 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/SolarShroud_auv.dds differ 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 new file mode 100644 index 00000000..08419cda Binary files /dev/null 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-1.tga b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-1.tga new file mode 100644 index 00000000..ab170afd Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-1.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-1x6-shrouded.mu b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-1x6-shrouded.mu new file mode 100644 index 00000000..9907580d Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-1x6-shrouded.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-1x6.mu b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-1x6.mu new file mode 100644 index 00000000..34b700d0 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-1x6.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-2x3.mu b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-2x3.mu new file mode 100644 index 00000000..a4f2fc6a Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-2x3.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-valiant-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-valiant-1.mu index 95f0f85f..2f77953b 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-valiant-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-valiant-1.mu differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/FuelTank/restock-fuel-tank-rcs-radial-tiny-1.mu b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fuel-tank-rcs-radial-tiny-1.mu similarity index 100% rename from Distribution/RestockPlus/GameData/ReStockPlus/Assets/FuelTank/restock-fuel-tank-rcs-radial-tiny-1.mu rename to Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fuel-tank-rcs-radial-tiny-1.mu diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-0625-4.mu b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-0625-4.mu index fc7c0ee1..4c124c17 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-0625-4.mu and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-0625-4.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-oscarb-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-oscarb-1-n.dds deleted file mode 100644 index f492306e..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-oscarb-1-n.dds and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-oscarb-1.dds b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-oscarb-1.dds deleted file mode 100644 index 2564f010..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-oscarb-1.dds and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-xenon-0625-1.mu b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-xenon-0625-1.mu index f04b9e0e..e7a269c6 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-xenon-0625-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-xenon-0625-1.mu differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/FuelTank/restock-rcs-tank-mini-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-rcs-tank-mini-1-n.dds similarity index 100% rename from Distribution/RestockPlus/GameData/ReStockPlus/Assets/FuelTank/restock-rcs-tank-mini-1-n.dds rename to Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-rcs-tank-mini-1-n.dds diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/FuelTank/restock-rcs-tank-mini-1.dds b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-rcs-tank-mini-1.dds similarity index 100% rename from Distribution/RestockPlus/GameData/ReStockPlus/Assets/FuelTank/restock-rcs-tank-mini-1.dds rename to Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-rcs-tank-mini-1.dds diff --git a/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-fairing-cap-1-blackandwhite.dds b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-fairing-cap-1-blackandwhite.dds deleted file mode 100644 index 73f74366..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-fairing-cap-1-blackandwhite.dds and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-fairing-cap-1-orange.dds b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-fairing-cap-1-orange.dds deleted file mode 100644 index 0ebe27a8..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-fairing-cap-1-orange.dds and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-crewed-hatch-1-e.dds b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-crewed-hatch-1-e.dds deleted file mode 100644 index b35cc57a..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-crewed-hatch-1-e.dds and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-crewed-hatch-1-grey.dds b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-crewed-hatch-1-grey.dds deleted file mode 100644 index 82fb980b..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-crewed-hatch-1-grey.dds and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-crewed-hatch-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-crewed-hatch-1-n.dds deleted file mode 100644 index f156a400..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-crewed-hatch-1-n.dds and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-octagonal-strut.mu b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-octagonal-strut.mu index 9ff37d6c..92380a09 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-octagonal-strut.mu and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-octagonal-strut.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Utility/restock-parachute-0625-1-d.dds b/Distribution/Restock/GameData/ReStock/Assets/Utility/restock-parachute-0625-1-d.dds deleted file mode 100644 index bddf31d8..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Utility/restock-parachute-0625-1-d.dds and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Utility/restock-parachute-0625-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Utility/restock-parachute-0625-1-n.dds deleted file mode 100644 index a7c53774..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Utility/restock-parachute-0625-1-n.dds and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Utility/restock-parachute-canopy-1-d.dds b/Distribution/Restock/GameData/ReStock/Assets/Utility/restock-parachute-canopy-1-d.dds deleted file mode 100644 index 70918ef6..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Utility/restock-parachute-canopy-1-d.dds and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-decouplers.cfg b/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-decouplers.cfg index c931abe3..f9c1367a 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-decouplers.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-decouplers.cfg @@ -70,7 +70,7 @@ %rescaleFactor = 1 @MODULE[ModuleAnchoredDecoupler] { - @anchor = LargeDecouplerBase + @anchorName = LargeDecouplerBase } } @@ -88,7 +88,7 @@ %rescaleFactor = 1 @MODULE[ModuleAnchoredDecoupler] { - @anchor = SmallDecouplerBase + @anchorName = SmallDecouplerBase } } @@ -105,6 +105,6 @@ %rescaleFactor = 1 @MODULE[ModuleAnchoredDecoupler] { - @anchor = WeirdDecouplerBase + @anchorName = WeirdDecouplerBase } } diff --git a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-solarpanels.cfg b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-solarpanels.cfg new file mode 100644 index 00000000..aba726ee --- /dev/null +++ b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-solarpanels.cfg @@ -0,0 +1,149 @@ +// Patches applying art changes to solar panels +// Contents: +// - (solarPanels4) + +// 1x6 +@PART[solarPanels4] +{ + @author = Beale + !mesh = DELETE + !MODEL,* {} + MODEL + { + model = ReStock/Assets/Electrical/restock-solarpanel-1x6 + position = 0.0, 0.0, 0.0 + scale = 1,1,1 + rotation = 0, 0, 0 + } + @MODULE[ModuleDeployableSolarPanel] + { + @secondaryTransformName = panel6 + } + + MODULE + { + name = ModuleRestockModifyMaterials + MATERIAL + { + shader = KSP/Bumped Specular (Mapped) + 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.08 + } + FLOAT_PROPERTY + { + name = _Shininess + value = 0.8 + } + } + } +} + +// 1x6 shielded +@PART[solarPanels2] +{ + @author = Beale + !mesh = DELETE + !MODEL,* {} + MODEL + { + model = ReStock/Assets/Electrical/restock-solarpanel-1x6-shrouded + position = 0.0, 0.0, 0.0 + scale = 1,1,1 + rotation = 0, 0, 0 + } + @MODULE[ModuleDeployableSolarPanel] + { + @secondaryTransformName = panel6 + } + + MODULE + { + name = ModuleRestockModifyMaterials + + MATERIAL + { + shader = KSP/Bumped Specular (Mapped) + baseTransform = panel1 + 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.08 + } + FLOAT_PROPERTY + { + name = _Shininess + value = 0.8 + } + } + } +} + +// 2x3 +@PART[solarPanels3] +{ + @author = Beale + !mesh = DELETE + !MODEL,* {} + MODEL + { + model = ReStock/Assets/Electrical/restock-solarpanel-2x3 + 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) + 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.08 + } + FLOAT_PROPERTY + { + name = _Shininess + value = 0.8 + } + } + } +} + diff --git a/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-decouplers.cfg b/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-decouplers.cfg new file mode 100644 index 00000000..41b142f2 --- /dev/null +++ b/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-decouplers.cfg @@ -0,0 +1,17 @@ +// Patches applying art changes to Making History decouplers +// Contents: +- TD-18 Decoupler (Decoupler_1p5) + + +// TD-18 Decoupler +@PART[Decoupler_1p5] { + @author = Chris Adderley (Nertea) + + !mesh = DELETE + !MODEL {} + MODEL { + model = ReStock/Assets/Coupling/restock-decoupler-1875-1 + } + + %rescaleFactor = 1 +} diff --git a/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-separators.cfg b/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-separators.cfg new file mode 100644 index 00000000..469d6fad --- /dev/null +++ b/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-separators.cfg @@ -0,0 +1,16 @@ +// Patches applying art changes to Making History separators +// Contents: +- TS-18 Separator (Separator_1p5) + +// TS-18 Separator +@PART[Separator_1p5] { + @author = Chris Adderley (Nertea) + + !mesh = DELETE + !MODEL {} + MODEL { + model = ReStock/Assets/Coupling/restock-separator-1875-1 + } + + %rescaleFactor = 1 +} diff --git a/Distribution/Restock/GameData/ReStock/PatchesMH/FuelTank/restock-mh-fueltanks-rcs.cfg b/Distribution/Restock/GameData/ReStock/PatchesMH/FuelTank/restock-mh-fueltanks-rcs.cfg new file mode 100644 index 00000000..4ee21bf3 --- /dev/null +++ b/Distribution/Restock/GameData/ReStock/PatchesMH/FuelTank/restock-mh-fueltanks-rcs.cfg @@ -0,0 +1,14 @@ +// Patches applying art changes to Making History RCS tanks +// Contents: +// - (MonoPropMini) + +// Spherical Radial Tiny Tank +@PART[MonoPropMini] +{ + @author = Chris Adderley (Nertea) + !mesh = DELETE + !MODEL {} + MODEL { + model = ReStock/Assets/FuelTank/restock-fuel-tank-rcs-radial-tiny-1 + } +} diff --git a/Distribution/Restock/GameData/ReStock/PatchesMH/Payload/restock-mh-fairing-bases.cfg b/Distribution/Restock/GameData/ReStock/PatchesMH/Payload/restock-mh-fairing-bases.cfg new file mode 100644 index 00000000..2d19771d --- /dev/null +++ b/Distribution/Restock/GameData/ReStock/PatchesMH/Payload/restock-mh-fairing-bases.cfg @@ -0,0 +1,118 @@ +// Patches applying art changes to Making History fairings +// Contents: +- AE-FF1.5 Airstream Protective Shell (1.875m) (fairingSize1p5) + +@PART[fairingSize1p5] +{ + @author = Chris Adderley (Nertea) + + !mesh = DELETE + !MODEL {} + MODEL { + model = ReStock/Assets/Payload/restock-fairing-base-1875-1 + } + MODEL + { + model = Squad/Parts/Aero/fairings/AutoTruss + scale = 1.5,1.5,1.5 + position = 0.0,0.22,0.0 + } + + @MODULE[ModuleProceduralFairing] + { + @pivot = 0,0.151, 0 + @TextureURL = ReStock/Assets/Payload/restock-fairing-25-1 + @CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1 + @TextureNormalURL = ReStock/Assets/Payload/restock-fairing-25-1-n + } + + @MODULE[ModulePartVariants] + { + @VARIANT[White] + { + !TEXTURE {} + !EXTRA_INFO {} + TEXTURE + { + materialName=FairingIconShell + mainTextureURL = ReStock/Assets/Payload/restock-fairing-125-1 + } + EXTRA_INFO + { + FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-125-1 + FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-125-1-n + CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1 + } + GAMEOBJECTS + { + FairingBase1875White = true + FairingBase1875Orange = false + FairingBase1875BlackWhite = false + } + } + @VARIANT[Grey] + { + !TEXTURE {} + !EXTRA_INFO {} + TEXTURE + { + materialName=FairingIconShell + mainTextureURL = ReStock/Assets/Payload/restock-fairing-125-1 + } + EXTRA_INFO + { + FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-125-1 + FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-125-1-n + CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1 + } + GAMEOBJECTS + { + FairingBase1875White = false + FairingBase1875Orange = false + FairingBase1875BlackWhite = true + } + } + @VARIANT[Dark?Grey] + { + !TEXTURE {} + !EXTRA_INFO {} + TEXTURE + { + materialName=FairingIconShell + mainTextureURL = ReStock/Assets/Payload/restock-fairing-125-1-orange + } + EXTRA_INFO + { + FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-125-1-orange + FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-125-1-n + CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-orange + } + GAMEOBJECTS + { + FairingBase1875White = false + FairingBase1875Orange = true + FairingBase1875BlackWhite = false + } + } + } + MODULE + { + name = ModuleRestockModifyFairingMaterials + COLOR_PROPERTY + { + name = _Color + color = 1.0, 1.0, 1.0, 1.0 + } + COLOR_PROPERTY + { + name = _SpecColor + color = 0.753, 0.753, 0.753, 1.0 + } + + FLOAT_PROPERTY + { + name = _Shininess + value = 0.3 + } + } +} diff --git a/Distribution/Restock/GameData/ReStock/Plugins/Restock.dll b/Distribution/Restock/GameData/ReStock/Plugins/Restock.dll index 7d5f50e4..24baa458 100644 Binary files a/Distribution/Restock/GameData/ReStock/Plugins/Restock.dll and b/Distribution/Restock/GameData/ReStock/Plugins/Restock.dll differ diff --git a/Distribution/Restock/changelog.txt b/Distribution/Restock/changelog.txt index 628cd86b..b6987726 100644 --- a/Distribution/Restock/changelog.txt +++ b/Distribution/Restock/changelog.txt @@ -1,7 +1,7 @@ v0.1.0 ------ - Initial release -- Parts included: +- Stock parts included: - Command - Mk1 Command Pod (Nertea) - Mk1-3 Command Pod (Nertea) @@ -20,8 +20,8 @@ - RC-001S Remote Guidance Unit (Nertea) - Control - Small Inline Reaction Wheel (Andrew Cassidy) - - Advanced Inline Stabilizer (advSasModule) - - Advanced Reaction Wheel Module, Large (asasmodule1-2) + - Advanced Inline Stabilizer (Nertea) + - Advanced Reaction Wheel Module, Large (Nertea) - RV-105 RCS Thruster Block (Nertea) - Place-Anywhere 7 Linear RCS Port (Nertea) - Vernor Engine (Nertea) @@ -130,7 +130,7 @@ - Z-400 Rechargeable Battery (Nertea) - Z-100 Rechargeable Battery Pack (Nertea) - PB-NUK Radioisotope Thermoelectric Generator (Beale) -- Science + - Science - Science Mobile Processing Lab MPL-LG-2 (Nertea) - Thermometer (Andrew Cassidy) - Barometer (Andrew Cassidy) @@ -140,12 +140,20 @@ - SC-9001 Science Jr. (Andrew Cassidy) - Atmospheric Fluid Spectro-Variometer (Andrew Cassidy) - Experiment Storage Unit (Andrew Cassidy) -- Communications + - Communications - Communotron 88-88 (Andrew Cassidy) - HG-5 High Gain Antenna (Andrew Cassidy) - RA-2 Relay Antenna (Andrew Cassidy) - RA-15 Relay Antenna (Andrew Cassidy) - RA-100 Relay Antenna (Andrew Cassidy) +- Making History parts included + - Coupling + - TD-18 Decoupler (Nertea) + - TS-18 Separator (Nertea) + - Fuel Tanks + - Stratus-V Minified Monopropellant Tank (Nertea) + - Payload + - AE-FF1.5 Airstream Protective Shell (Nertea) - Additions/new variants: - Probe cores now all have consistent 'Bare' and 'Gold Foil' variants, plus a generally new 'Silver' foil variant - 'Dark' variant for 1.25m tanks has been completely reworked (it is no longer white) diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg index c81f3a46..fb399c6d 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg @@ -104,12 +104,16 @@ Localization #LOC_RestockPlus_restock-decoupler-1875-1_title = TD-18 Decoupler #LOC_RestockPlus_restock-decoupler-1875-1_description = The TD-18 Stack Decoupler is a medium sized tool for splitting rockets. - #LOC_RestockPlus_restock-decoupler-1875-1_tags = restock reak decouple explo kerbodyne separat split + #LOC_RestockPlus_restock-decoupler-1875-1_tags = restock break decouple explo kerbodyne separat split #LOC_RestockPlus_restock-separator-1875-1_title = TS-18 Separator #LOC_RestockPlus_restock-separator-1875-1_description = The TS-18 Stack Separator is a medium sized separator, much like the other separators. Unlike Decouplers, Separators will eject anything connected to themselves. This is good, as it removes the need to worry about which side needs to be pointed away from face. Try to not look at it too much though. #LOC_RestockPlus_restock-separator-1875-1_tags = restock break decouple separat split stag + #LOC_RestockPlus_restock-decoupler-radial-tiny-1_title = TT-14 Radial Decoupler + #LOC_RestockPlus_restock-decoupler-radial-tiny-1_description = The TT-14 is an extra small decoupler for very small separation events. + #LOC_RestockPlus_restock-decoupler-radial-tiny-1_tags = restock break decouple separat split stag + // Aerodynamic #LOC_RestockPlus_restock-nosecone-1875-1_title = Protective Rocket Nose Mk18 #LOC_RestockPlus_restock-nosecone-1875-1_description = For capping off those medium size boosters, you can't beat the Mark 18, unless you're the Mark 19. 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 735e4f44..b178f9a5 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 @@ -37,13 +37,16 @@ PART tags = #LOC_RestockPlus_restock-decoupler-1875-1_tags fx_gasBurst_white = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, decouple sound_decoupler_fire = decouple - + + /// Flag to disable this part if MH is installed + MHReplacement = True + MODULE { name = ModuleDecouple ejectionForce = 125 isOmniDecoupler = false - explosiveNodeID = top + explosiveNodeID = top } MODULE { @@ -149,10 +152,10 @@ PART body = _NotSun } } - + DRAG_CUBE { cube = Default, 0.1988,0.7448,0.8757, 0.1988,0.7448,0.8757, 1.217,0.9952,0.1299, 1.217,0.9952,0.1299, 0.1988,0.7442,0.8871, 0.1988,0.7442,0.8871, 0,0,0, 1.25,0.16,1.25 } - + } 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 62910ee0..af4ef413 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 @@ -37,12 +37,15 @@ PART tags = #LOC_RestockPlus_restock-separator-1875-1_tags fx_gasBurst_white = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, decouple sound_decoupler_fire = decouple - + + /// Flag to disable this part if MH is installed + MHReplacement = True + MODULE { name = ModuleDecouple ejectionForce = 125 - isOmniDecoupler = true + isOmniDecoupler = true } MODULE { @@ -148,10 +151,10 @@ PART body = _NotSun } } - + DRAG_CUBE { cube = Default, 0.1988,0.7448,0.8757, 0.1988,0.7448,0.8757, 1.217,0.9952,0.1299, 1.217,0.9952,0.1299, 0.1988,0.7442,0.8871, 0.1988,0.7442,0.8871, 0,0,0, 1.25,0.16,1.25 } - + } diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/radial/restock-decoupler-radial-tiny-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/radial/restock-decoupler-radial-tiny-1.cfg new file mode 100644 index 00000000..d169fb25 --- /dev/null +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/radial/restock-decoupler-radial-tiny-1.cfg @@ -0,0 +1,150 @@ +// ReStock+ 0.1.0 +// Tiny Radial Decoupler +PART +{ + name = restock-decoupler-radial-tiny-1 + module = Part + author = Chris Adderley + MODEL { + model = ReStock/Assets/Coupling/restock-decoupler-radial-4 + } + scale = 1 + rescaleFactor = 1 + node_attach = 0.00, 0.0, 0.0, 1.0, 0.0, 0.0 + fx_gasBurst_white = -0.056, 0.0, 0, -1.0, 0.0, 0.0, decouple + sound_vent_large = decouple + TechRequired = stability + entryCost = 1000 + cost = 250 + category = Coupling + subcategory = 0 + title = #LOC_RestockPlus_restock-decoupler-radial-tiny-1_title + manufacturer = #autoLOC_501629 //#autoLOC_501629 = O.M.B. Demolition Enterprises + description = #LOC_RestockPlus_restock-decoupler-radial-tiny-1_description + attachRules = 0,1,0,1,0 + mass = 0.0125 + dragModelType = default + maximum_drag = 0.2 + minimum_drag = 0.2 + angularDrag = 1 + crashTolerance = 8 + maxTemp = 2000 // = 3200 + stagingIcon = DECOUPLER_HOR + stageOffset = 1 + childStageOffset = 1 + bulkheadProfiles = srf + tags = #LOC_RestockPlus_restock-decoupler-radial-tiny-1_tags + fuelCrossFeed = False + MODULE + { + name = ModuleAnchoredDecoupler + anchorName = TinyDecouplerBase + ejectionForce = 70 + explosiveNodeID = srf + } + MODULE + { + name = ModuleToggleCrossfeed + crossfeedStatus = false + toggleEditor = true + toggleFlight = true + techRequired = fuelSystems + } + MODULE + { + name = ModuleTestSubject + useStaging = True + useEvent = False + situationMask = 127 + CONSTRAINT + { + type = REPEATABILITY + value = ALWAYS + prestige = Trivial + } + CONSTRAINT + { + type = REPEATABILITY + value = BODYANDSITUATION + prestige = Significant + } + CONSTRAINT + { + type = REPEATABILITY + value = ONCEPERPART + prestige = Exceptional + } + CONSTRAINT + { + type = ALTITUDE + test = GT + value = 0 // this just registers altitude as something to care about + situationMask = 8 + } + CONSTRAINT + { + type = ALTITUDEENV + test = GT + value = 4000 + prestige = Trivial + } + CONSTRAINT + { + type = ALTITUDEENV + test = LT + value = 8000 + prestige = Trivial + } + CONSTRAINT + { + type = ALTITUDEENV + test = GT + value = 2000 + prestige = Significant + } + CONSTRAINT + { + type = ALTITUDEENV + test = LT + value = 4000 + prestige = Significant + } + CONSTRAINT + { + type = ALTITUDEENV + test = GT + value = 1000 + prestige = Exceptional + } + CONSTRAINT + { + type = ALTITUDEENV + test = LT + value = 2000 + prestige = Exceptional + } + CONSTRAINT + { + type = SPEED + test = LT + value = 2000 + situationMask = 8 + } + CONSTRAINT + { + type = ALTITUDE + test = LT + value = 300000 + situationMask = 16 + body = _NotSun + } + CONSTRAINT + { + type = ALTITUDE + test = LT + value = 600000 + situationMask = 32 + body = _NotSun + } + } +} diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/radial/restock-fuel-tank-rcs-radial-tiny-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/radial/restock-fuel-tank-rcs-radial-tiny-1.cfg index 3ae0b3d2..024d2212 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/radial/restock-fuel-tank-rcs-radial-tiny-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/radial/restock-fuel-tank-rcs-radial-tiny-1.cfg @@ -1,6 +1,5 @@ // ReStock+ 0.1.0 // Super tiny radial RCS tank - PART { name = restock-fuel-tank-rcs-radial-tiny-1 @@ -9,7 +8,7 @@ PART MODEL { - model = ReStockPlus/Assets/FuelTank/restock-fuel-tank-rcs-radial-tiny-1 + model = ReStock/Assets/FuelTank/restock-fuel-tank-rcs-radial-tiny-1 scale = 1.0, 1.0, 1.0 } @@ -45,6 +44,9 @@ PART breakingForce = 50 breakingTorque = 50 + /// Flag to disable this part if MH is installed + MHReplacement = True + // Resources RESOURCE { diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Payload/1875/restock-fairing-1875-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Payload/1875/restock-fairing-1875-1.cfg index e11c8fc1..8eaf807f 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Payload/1875/restock-fairing-1875-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Payload/1875/restock-fairing-1875-1.cfg @@ -74,6 +74,10 @@ PART bulkheadProfiles = size1p5 tags = #LOC_RestockPlus_restock-fairing-base-1875-1_tags + + /// Flag to disable this part if MH is installed + MHReplacement = True + MODULE { name = ModuleProceduralFairing diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Patches/MakingHistoryPartHiding.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Patches/MakingHistoryPartHiding.cfg new file mode 100644 index 00000000..8cbe87dd --- /dev/null +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Patches/MakingHistoryPartHiding.cfg @@ -0,0 +1,7 @@ +// Hides all the MH replacing parts if MH is installed +@PART[*]:HAS[MHReplacement[True]]:FOR[zReStockPlus]:NEEDS[SquadExpansion/MakingHistory] +{ + TechHidden = True + category = none + subcategory = 0 +} diff --git a/Source/Restock/ModuleRestockModifyMaterials.cs b/Source/Restock/ModuleRestockModifyMaterials.cs index 85b827ae..5bd254cd 100644 --- a/Source/Restock/ModuleRestockModifyMaterials.cs +++ b/Source/Restock/ModuleRestockModifyMaterials.cs @@ -70,7 +70,7 @@ namespace Restock { if (value.name == "transform") { - Transform[] modelTransforms = part.FindModelTransforms(value.name); + Transform[] modelTransforms = part.FindModelTransforms(value.value); if (modelTransforms.Length == 0) { @@ -89,12 +89,12 @@ namespace Restock transformRenderers.Add(renderer); } - renderers.Concat(transformRenderers); + renderers = renderers.Concat(transformRenderers); useAllRenderers = false; } else if (value.name == "baseTransform") { - Transform[] modelTransforms = part.FindModelTransforms(value.name); + Transform[] modelTransforms = part.FindModelTransforms(value.value); if (modelTransforms.Length == 0) { @@ -109,7 +109,7 @@ namespace Restock if (transformRenderers.Length == 0) this.LogError($"No renderers found on transform '{transform.name}' or its children"); else - renderers.Concat(transform.GetComponentsInChildren()); + renderers = renderers.Concat(transform.GetComponentsInChildren()); } useAllRenderers = false;