From 57dc1a992b5b8ead78a999698fe1b49ec828f66a Mon Sep 17 00:00:00 2001 From: ChrisAdderley Date: Mon, 25 Feb 2019 16:18:54 -0800 Subject: [PATCH] Turn stuff on and off when MH is installed --- .../Coupling/restock-mh-decouplers.cfg | 17 +++ .../Coupling/restock-mh-separators.cfg | 16 +++ .../FuelTank/restock-mh-fueltanks-rcs.cfg | 14 +++ .../Payload/restock-mh-fairing-bases.cfg | 118 ++++++++++++++++++ Distribution/Restock/changelog.txt | 2 +- .../1875/restock-decoupler-1875-1.cfg | 11 +- .../1875/restock-separator-1875-1.cfg | 11 +- .../restock-fuel-tank-rcs-radial-tiny-1.cfg | 4 +- .../Payload/1875/restock-fairing-1875-1.cfg | 4 + .../Patches/MakingHistoryPartHiding.cfg | 7 ++ 10 files changed, 194 insertions(+), 10 deletions(-) create mode 100644 Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-decouplers.cfg create mode 100644 Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-separators.cfg create mode 100644 Distribution/Restock/GameData/ReStock/PatchesMH/FuelTank/restock-mh-fueltanks-rcs.cfg create mode 100644 Distribution/Restock/GameData/ReStock/PatchesMH/Payload/restock-mh-fairing-bases.cfg create mode 100644 Distribution/RestockPlus/GameData/ReStockPlus/Patches/MakingHistoryPartHiding.cfg 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..ba579f06 --- /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 () + + +// TD-18 Decoupler +@PART[] { + @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..ccf139de --- /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 () + +// TS-18 Separator +@PART[] { + @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..d30ef6e5 --- /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: +// - () + +// Spherical Radial Tiny Tank +@PART[] +{ + @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 e8413b9e..58972d6c 100644 --- a/Distribution/Restock/changelog.txt +++ b/Distribution/Restock/changelog.txt @@ -18,7 +18,7 @@ - RC-L01 Remote Guidance Unit (Nertea) - RC-001S Remote Guidance Unit (Nertea) - Control - - .625m reaction wheel (Andrew Cassidy) + - 0.625m reaction wheel (Andrew Cassidy) - RV-105 RCS Thruster Block (Nertea) - Place-Anywhere 7 Linear RCS Port (Nertea) - Vernor Engine (Nertea) 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 +}