diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-1-n.dds index d55610c5..e8229f5f 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-1-n.dds and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-1-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-1-n.tga b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-1-n.tga deleted file mode 100644 index 4fc90a56..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-1-n.tga and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-1.dds index 61c5b749..1ca142cb 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-1.dds and b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-1.tga b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-1.tga deleted file mode 100644 index 425713b5..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-1.tga and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-2-n.tga b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-2-n.tga deleted file mode 100644 index 50d8c268..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-2-n.tga and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-2.tga b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-2.tga deleted file mode 100644 index 19e477ca..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-mk2-lander-2.tga and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Control/restock-reaction-wheels-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-reaction-wheels-1-n.dds new file mode 100644 index 00000000..1f8d325d Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-reaction-wheels-1-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Control/restock-reaction-wheels-1-n.tga b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-reaction-wheels-1-n.tga deleted file mode 100644 index cf2b6f96..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Control/restock-reaction-wheels-1-n.tga and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Control/restock-reaction-wheels-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-reaction-wheels-1.dds new file mode 100644 index 00000000..017a18a7 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-reaction-wheels-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Control/restock-reaction-wheels-1.tga b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-reaction-wheels-1.tga deleted file mode 100644 index c5d8b848..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Control/restock-reaction-wheels-1.tga and /dev/null differ 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/changelog.txt b/Distribution/Restock/changelog.txt index b5916863..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) @@ -19,7 +19,9 @@ - RC-L01 Remote Guidance Unit (Nertea) - RC-001S Remote Guidance Unit (Nertea) - Control - - .625m reaction wheel (Andrew Cassidy) + - Small Inline Reaction Wheel (Andrew Cassidy) + - 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) @@ -128,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) @@ -137,12 +139,21 @@ - Mystery Goo™ Containment Unit (Andrew Cassidy) - SC-9001 Science Jr. (Andrew Cassidy) - Atmospheric Fluid Spectro-Variometer (Andrew Cassidy) -- Communications + - Experiment Storage Unit (Andrew Cassidy) + - 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/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/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..ac26f672 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 @@ -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 +}