From 5bc3edd2104fb511d55b39dfe644ccd850b5badb Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 15 Jun 2021 20:39:51 -0700 Subject: [PATCH 1/2] Compatibility and fixes --- .../Patches/RestockPlus/RestockPlusBoar.cfg | 2 +- .../Patches/RestockPlus/RestockPlusCaravel.cfg | 4 ++-- .../Patches/RestockPlus/RestockPlusCherenkov.cfg | 2 +- .../Patches/RestockPlus/RestockPlusCorgi.cfg | 2 +- .../Patches/RestockPlus/RestockPlusGalleon.cfg | 2 +- .../Patches/RestockPlus/RestockPlusPug.cfg | 2 +- .../Patches/RestockPlus/RestockPlusRCS.cfg | 14 +++++++------- .../Patches/RestockPlus/RestockPlusSchnauzer.cfg | 2 +- .../Patches/RestockPlus/RestockPlusTorch.cfg | 2 +- .../RestockPlus/RestockPlusTrashPanda.cfg | 2 +- .../Patches/RestockPlus/RestockPlusUrsa.cfg | 8 ++++---- .../Patches/RestockPlus/RestockPlusValiant.cfg | 2 +- .../Patches/Squad/LiquidEngineKE-1.cfg | 4 ++-- .../Patches/Squad/LiquidEngineRE-I2.cfg | 4 ++-- .../Patches/Squad/LiquidEngineRE-J10.cfg | 4 ++-- .../Patches/Squad/LiquidEngineRK-7.cfg | 4 ++-- .../Patches/Squad/LiquidEngineRV-1.cfg | 4 ++-- GameData/WaterfallRestock/Patches/Squad/SSME.cfg | 4 ++-- .../Patches/Squad/Size3AdvancedEngine.cfg | 3 ++- .../Patches/Squad/Size3EngineCluster.cfg | 4 ++-- .../Patches/Squad/SquadLights.cfg | 15 ++++++++++----- .../WaterfallRestock/Patches/Squad/SquadRCS.cfg | 15 ++++++++++----- .../Patches/Squad/engineLargeSkipper_v2.cfg | 4 ++-- .../WaterfallRestock/Patches/Squad/ionEngine.cfg | 4 ++-- .../Patches/Squad/liquidEngineMainsail.cfg | 4 ++-- .../Patches/Squad/liquidEngineMini_v2.cfg | 4 ++-- .../Patches/Squad/liquidEnginePoodle.cfg | 4 ++-- .../Patches/Squad/liquidEngineReliant.cfg | 4 ++-- .../Patches/Squad/liquidEngineSwivel.cfg | 4 ++-- .../Patches/Squad/liquidEngineTerrier.cfg | 4 ++-- .../Patches/Squad/liquidEngineTwinBoar.cfg | 4 ++-- .../Patches/Squad/liquidEngineTwinBoar_v2.cfg | 6 +++--- .../Patches/Squad/microEngine_v2.cfg | 4 ++-- .../Patches/Squad/nuclearEngine.cfg | 4 ++-- .../WaterfallRestock/Patches/Squad/omsEngine.cfg | 16 +++------------- .../Patches/Squad/radialEngineMini_v2.cfg | 4 ++-- .../Patches/Squad/smallRadialEngine_v2.cfg | 4 ++-- .../Patches/Squad/spotLight1.cfg | 3 ++- .../Patches/Squad/spotLight2.cfg | 3 ++- .../Versioning/WaterfallRestock.version | 4 ++-- changelog.txt | 7 +++++++ readme.txt | 4 ++-- 42 files changed, 105 insertions(+), 95 deletions(-) diff --git a/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusBoar.cfg b/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusBoar.cfg index 7cc53eb..0ac6dc6 100644 --- a/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusBoar.cfg +++ b/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusBoar.cfg @@ -1,6 +1,6 @@ -@PART[restock-engine-boar]:AFTER[ReStockPlus] +@PART[restock-engine-boar]:NEEDS[ReStockPlus]:FOR[WaterfallRestock] { !EFFECTS {} diff --git a/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusCaravel.cfg b/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusCaravel.cfg index ee17af4..fbe82ba 100644 --- a/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusCaravel.cfg +++ b/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusCaravel.cfg @@ -1,8 +1,8 @@ -@PART[restock-engine-caravel-1]:AFTER[ReStockPlus] +@PART[restock-engine-caravel-1]:NEEDS[ReStockPlus]:FOR[WaterfallRestock] { - + !EFFECTS {} !MODULE[EngineLightEffect] {} diff --git a/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusCherenkov.cfg b/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusCherenkov.cfg index ca58028..1480b1e 100644 --- a/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusCherenkov.cfg +++ b/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusCherenkov.cfg @@ -1,6 +1,6 @@ -@PART[restock-engine-cherenkov]:AFTER[ReStock] +@PART[restock-engine-cherenkov]:NEEDS[ReStockPlus]:FOR[WaterfallRestock] { // Removes the stock effect block, and replace it with one that has no particles !EFFECTS {} diff --git a/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusCorgi.cfg b/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusCorgi.cfg index 58971df..ff8efbe 100644 --- a/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusCorgi.cfg +++ b/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusCorgi.cfg @@ -1,6 +1,6 @@ -@PART[restock-engine-375-corgi]:AFTER[ReStockPlus] +@PART[restock-engine-375-corgi]:NEEDS[ReStockPlus]:FOR[WaterfallRestock] { !EFFECTS {} diff --git a/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusGalleon.cfg b/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusGalleon.cfg index 9e0ddef..f62ec73 100644 --- a/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusGalleon.cfg +++ b/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusGalleon.cfg @@ -1,6 +1,6 @@ -@PART[restock-engine-galleon-1]:AFTER[ReStockPlus] +@PART[restock-engine-galleon-1]:NEEDS[ReStockPlus]:FOR[WaterfallRestock] { !EFFECTS {} diff --git a/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusPug.cfg b/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusPug.cfg index 44ea127..3994036 100644 --- a/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusPug.cfg +++ b/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusPug.cfg @@ -1,6 +1,6 @@ -@PART[restock-engine-125-pug]:AFTER[ReStockPlus] +@PART[restock-engine-125-pug]:NEEDS[ReStockPlus]:FOR[WaterfallRestock] { !EFFECTS {} diff --git a/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusRCS.cfg b/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusRCS.cfg index 683e764..e29f45b 100644 --- a/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusRCS.cfg +++ b/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusRCS.cfg @@ -1,5 +1,5 @@ -@PART[restock-rcs-block-multi-2]:AFTER[ReStockPlus] +@PART[restock-rcs-block-multi-2]:NEEDS[ReStockPlus]:FOR[WaterfallRestock] { // Removes the stock effect block, and replace it with one that has no particles !EFFECTS {} @@ -56,7 +56,7 @@ } -@PART[restock-rcs-block-multi-mini-2]:AFTER[ReStockPlus] +@PART[restock-rcs-block-multi-mini-2]:NEEDS[ReStockPlus]:FOR[WaterfallRestock] { // Removes the stock effect block, and replace it with one that has no particles !EFFECTS {} @@ -115,7 +115,7 @@ scale = 0.3, 0.4, 0.3 -@PART[restock-rcs-block-dual-1]:AFTER[ReStockPlus] +@PART[restock-rcs-block-dual-1]:NEEDS[ReStockPlus]:FOR[WaterfallRestock] { // Removes the stock effect block, and replace it with one that has no particles !EFFECTS {} @@ -171,7 +171,7 @@ scale = 0.3, 0.4, 0.3 } -@PART[restock-rcs-block-quad-angled-1]:AFTER[ReStockPlus] +@PART[restock-rcs-block-quad-angled-1]:NEEDS[ReStockPlus]:FOR[WaterfallRestock] { // Removes the stock effect block, and replace it with one that has no particles !EFFECTS {} @@ -227,7 +227,7 @@ scale = 0.3, 0.4, 0.3 } -@PART[restock-rcs-block-triple-angled-1]:AFTER[ReStockPlus] +@PART[restock-rcs-block-triple-angled-1]:NEEDS[ReStockPlus]:FOR[WaterfallRestock] { // Removes the stock effect block, and replace it with one that has no particles !EFFECTS {} @@ -282,7 +282,7 @@ scale = 0.3, 0.4, 0.3 } } -@PART[restock-rcs-block-quint-1]:AFTER[ReStockPlus] +@PART[restock-rcs-block-quint-1]:NEEDS[ReStockPlus]:FOR[WaterfallRestock] { // Removes the stock effect block, and replace it with one that has no particles !EFFECTS {} @@ -338,7 +338,7 @@ scale = 0.3, 0.4, 0.3 } -@PART[restock-rcs-block-single-mini-1]:AFTER[ReStockPlus] +@PART[restock-rcs-block-single-mini-1]:NEEDS[ReStockPlus]:FOR[WaterfallRestock] { // Removes the stock effect block, and replace it with one that has no particles !EFFECTS {} diff --git a/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusSchnauzer.cfg b/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusSchnauzer.cfg index d632357..cf7ee0a 100644 --- a/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusSchnauzer.cfg +++ b/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusSchnauzer.cfg @@ -1,6 +1,6 @@ -@PART[restock-engine-schnauzer-1]:AFTER[ReStockPlus] +@PART[restock-engine-schnauzer-1]:NEEDS[ReStockPlus]:FOR[WaterfallRestock] { !EFFECTS {} diff --git a/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusTorch.cfg b/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusTorch.cfg index 102f36d..2802577 100644 --- a/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusTorch.cfg +++ b/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusTorch.cfg @@ -1,6 +1,6 @@ -@PART[restock-engine-torch]:AFTER[ReStockPlus] +@PART[restock-engine-torch]:NEEDS[ReStockPlus]:FOR[WaterfallRestock] { !EFFECTS {} diff --git a/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusTrashPanda.cfg b/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusTrashPanda.cfg index d845a5b..f5cdd8d 100644 --- a/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusTrashPanda.cfg +++ b/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusTrashPanda.cfg @@ -1,6 +1,6 @@ -@PART[restock-engine-panda-1]:AFTER[ReStockPlus] +@PART[restock-engine-panda-1]:NEEDS[ReStockPlus]:FOR[WaterfallRestock] { !EFFECTS {} diff --git a/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusUrsa.cfg b/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusUrsa.cfg index 38c525b..81d1ac0 100644 --- a/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusUrsa.cfg +++ b/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusUrsa.cfg @@ -1,6 +1,6 @@ -@PART[restock-engine-ursa-1]:AFTER[ReStockPlus] +@PART[restock-engine-ursa-1]:NEEDS[ReStockPlus]:FOR[WaterfallRestock] { !EFFECTS {} @@ -93,9 +93,9 @@ templateName = waterfall-kerolox-lower-1 // This field allows you to override the parentTransform name in the EFFECTS contained in the template overrideParentTransform = thrustTransform - pposition = 0,0,-0.1 -rotation = 0, 0, 0 -scale = 0.8, 0.8, 0.9 + position = 0,0,-0.1 + rotation = 0, 0, 0 + scale = 0.8, 0.8, 0.9 } diff --git a/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusValiant.cfg b/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusValiant.cfg index b8b4111..a7dd512 100644 --- a/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusValiant.cfg +++ b/GameData/WaterfallRestock/Patches/RestockPlus/RestockPlusValiant.cfg @@ -1,6 +1,6 @@ -@PART[restock-engine-125-valiant]:AFTER[ReStockPlus] +@PART[restock-engine-125-valiant]:NEEDS[ReStockPlus]:FOR[WaterfallRestock] { !EFFECTS {} diff --git a/GameData/WaterfallRestock/Patches/Squad/LiquidEngineKE-1.cfg b/GameData/WaterfallRestock/Patches/Squad/LiquidEngineKE-1.cfg index fb98315..5f2d4e3 100644 --- a/GameData/WaterfallRestock/Patches/Squad/LiquidEngineKE-1.cfg +++ b/GameData/WaterfallRestock/Patches/Squad/LiquidEngineKE-1.cfg @@ -1,8 +1,8 @@ -@PART[LiquidEngineKE-1]:AFTER[ReStock] +@PART[LiquidEngineKE-1]:NEEDS[ReStock]:FOR[WaterfallRestock] { - + !MODULE[ModuleWaterfallFX] {} !EFFECTS {} !MODULE[EngineLightEffect] {} diff --git a/GameData/WaterfallRestock/Patches/Squad/LiquidEngineRE-I2.cfg b/GameData/WaterfallRestock/Patches/Squad/LiquidEngineRE-I2.cfg index 8b023d8..cfacf91 100644 --- a/GameData/WaterfallRestock/Patches/Squad/LiquidEngineRE-I2.cfg +++ b/GameData/WaterfallRestock/Patches/Squad/LiquidEngineRE-I2.cfg @@ -1,8 +1,8 @@ -@PART[LiquidEngineRE-I2]:AFTER[ReStock] +@PART[LiquidEngineRE-I2]:NEEDS[ReStock]:FOR[WaterfallRestock] { - + !MODULE[ModuleWaterfallFX] {} !EFFECTS {} !MODULE[EngineLightEffect] {} diff --git a/GameData/WaterfallRestock/Patches/Squad/LiquidEngineRE-J10.cfg b/GameData/WaterfallRestock/Patches/Squad/LiquidEngineRE-J10.cfg index eff6b82..5c274ea 100644 --- a/GameData/WaterfallRestock/Patches/Squad/LiquidEngineRE-J10.cfg +++ b/GameData/WaterfallRestock/Patches/Squad/LiquidEngineRE-J10.cfg @@ -1,8 +1,8 @@ -@PART[LiquidEngineRE-J10]:AFTER[ReStock] +@PART[LiquidEngineRE-J10]:NEEDS[ReStock]:FOR[WaterfallRestock] { - + !MODULE[ModuleWaterfallFX] {} !EFFECTS {} !MODULE[EngineLightEffect] {} diff --git a/GameData/WaterfallRestock/Patches/Squad/LiquidEngineRK-7.cfg b/GameData/WaterfallRestock/Patches/Squad/LiquidEngineRK-7.cfg index b50b4e4..fcffe4b 100644 --- a/GameData/WaterfallRestock/Patches/Squad/LiquidEngineRK-7.cfg +++ b/GameData/WaterfallRestock/Patches/Squad/LiquidEngineRK-7.cfg @@ -1,8 +1,8 @@ -@PART[LiquidEngineRK-7]:AFTER[ReStock] +@PART[LiquidEngineRK-7]:NEEDS[ReStock]:FOR[WaterfallRestock] { - + !MODULE[ModuleWaterfallFX] {} !EFFECTS {} !MODULE[EngineLightEffect] {} diff --git a/GameData/WaterfallRestock/Patches/Squad/LiquidEngineRV-1.cfg b/GameData/WaterfallRestock/Patches/Squad/LiquidEngineRV-1.cfg index ef2a5ed..791b9c0 100644 --- a/GameData/WaterfallRestock/Patches/Squad/LiquidEngineRV-1.cfg +++ b/GameData/WaterfallRestock/Patches/Squad/LiquidEngineRV-1.cfg @@ -1,8 +1,8 @@ -@PART[LiquidEngineRV-1]:AFTER[ReStock] +@PART[LiquidEngineRV-1]:NEEDS[ReStock]:FOR[WaterfallRestock] { - + !MODULE[ModuleWaterfallFX] {} !EFFECTS {} !MODULE[EngineLightEffect] {} diff --git a/GameData/WaterfallRestock/Patches/Squad/SSME.cfg b/GameData/WaterfallRestock/Patches/Squad/SSME.cfg index 3b82f71..4dfb448 100644 --- a/GameData/WaterfallRestock/Patches/Squad/SSME.cfg +++ b/GameData/WaterfallRestock/Patches/Squad/SSME.cfg @@ -1,9 +1,9 @@ -@PART[SSME]:AFTER[ReStock] +@PART[SSME]:NEEDS[ReStock]:FOR[WaterfallRestock] { // Engine configured by KnightofStJohn - + !MODULE[ModuleWaterfallFX] {} // Removes the stock effect block, and replace it with one that has no particles !EFFECTS {} !MODULE[EngineLightEffect] {} diff --git a/GameData/WaterfallRestock/Patches/Squad/Size3AdvancedEngine.cfg b/GameData/WaterfallRestock/Patches/Squad/Size3AdvancedEngine.cfg index c0e71bb..1f5ce85 100644 --- a/GameData/WaterfallRestock/Patches/Squad/Size3AdvancedEngine.cfg +++ b/GameData/WaterfallRestock/Patches/Squad/Size3AdvancedEngine.cfg @@ -1,7 +1,8 @@ -@PART[Size3AdvancedEngine]:AFTER[ReStock] +@PART[Size3AdvancedEngine]:NEEDS[ReStock]:FOR[WaterfallRestock] { + !MODULE[ModuleWaterfallFX] {} // Removes the stock effect block, and replace it with one that has no particles !EFFECTS {} !MODULE[EngineLightEffect] {} diff --git a/GameData/WaterfallRestock/Patches/Squad/Size3EngineCluster.cfg b/GameData/WaterfallRestock/Patches/Squad/Size3EngineCluster.cfg index f4ed3db..b962680 100644 --- a/GameData/WaterfallRestock/Patches/Squad/Size3EngineCluster.cfg +++ b/GameData/WaterfallRestock/Patches/Squad/Size3EngineCluster.cfg @@ -1,9 +1,9 @@ -@PART[Size3EngineCluster]:AFTER[ReStock] +@PART[Size3EngineCluster]:NEEDS[ReStock]:FOR[WaterfallRestock] { // Engine configured by KnightofStJohn - + !MODULE[ModuleWaterfallFX] {} // Removes the stock effect block, and replace it with one that has no particles !EFFECTS {} !MODULE[EngineLightEffect] {} diff --git a/GameData/WaterfallRestock/Patches/Squad/SquadLights.cfg b/GameData/WaterfallRestock/Patches/Squad/SquadLights.cfg index 3988399..d7ae55c 100644 --- a/GameData/WaterfallRestock/Patches/Squad/SquadLights.cfg +++ b/GameData/WaterfallRestock/Patches/Squad/SquadLights.cfg @@ -1,5 +1,6 @@ -@PART[spotLight1_v2]:AFTER[ReStock] +@PART[spotLight1_v2]:NEEDS[ReStock]:FOR[WaterfallRestock] { + !MODULE[ModuleWaterfallFX] {} MODULE { name = ModuleWaterfallFX @@ -31,8 +32,9 @@ } } } -@PART[spotLight2_v2]:AFTER[ReStock] +@PART[spotLight2_v2]:NEEDS[ReStock]:FOR[WaterfallRestock] { + !MODULE[ModuleWaterfallFX] {} MODULE { name = ModuleWaterfallFX @@ -65,8 +67,9 @@ } } -@PART[spotLight3]:AFTER[ReStock] +@PART[spotLight3]:NEEDS[ReStock]:FOR[WaterfallRestock] { + !MODULE[ModuleWaterfallFX] {} MODULE { name = ModuleWaterfallFX @@ -99,8 +102,9 @@ } } -@PART[groundLight1]:AFTER[ReStock] +@PART[groundLight1]:NEEDS[ReStock]:FOR[WaterfallRestock] { + !MODULE[ModuleWaterfallFX] {} MODULE { name = ModuleWaterfallFX @@ -133,8 +137,9 @@ } } -@PART[groundLight2]:AFTER[ReStock] +@PART[groundLight2]:NEEDS[ReStock]:FOR[WaterfallRestock] { + !MODULE[ModuleWaterfallFX] {} MODULE { name = ModuleWaterfallFX diff --git a/GameData/WaterfallRestock/Patches/Squad/SquadRCS.cfg b/GameData/WaterfallRestock/Patches/Squad/SquadRCS.cfg index 49f74f4..eba6002 100644 --- a/GameData/WaterfallRestock/Patches/Squad/SquadRCS.cfg +++ b/GameData/WaterfallRestock/Patches/Squad/SquadRCS.cfg @@ -1,7 +1,8 @@ -@PART[RCSBlock_v2]:AFTER[ReStock] +@PART[RCSBlock_v2]:NEEDS[ReStock]:FOR[WaterfallRestock] { + !MODULE[ModuleWaterfallFX] {} // Removes the stock effect block, and replace it with one that has no particles !EFFECTS {} EFFECTS @@ -57,8 +58,9 @@ } -@PART[linearRcs]:AFTER[ReStock] +@PART[linearRcs]:NEEDS[ReStock]:FOR[WaterfallRestock] { + !MODULE[ModuleWaterfallFX] {} // Removes the stock effect block, and replace it with one that has no particles !EFFECTS {} EFFECTS @@ -114,8 +116,9 @@ } -@PART[mk1-3pod]:AFTER[ReStock] +@PART[mk1-3pod]:NEEDS[ReStock]:FOR[WaterfallRestock] { + !MODULE[ModuleWaterfallFX] {} // Removes the stock effect block, and replace it with one that has no particles !EFFECTS {} EFFECTS @@ -172,8 +175,9 @@ -@PART[RCSblock_01_small]:AFTER[ReStock] +@PART[RCSblock_01_small]:NEEDS[ReStock]:FOR[WaterfallRestock] { + !MODULE[ModuleWaterfallFX] {} // Removes the stock effect block, and replace it with one that has no particles !EFFECTS {} EFFECTS @@ -231,8 +235,9 @@ scale = 0.3, 0.4, 0.3 -@PART[RCSLinearSmall]:AFTER[ReStock] +@PART[RCSLinearSmall]:NEEDS[ReStock]:FOR[WaterfallRestock] { + !MODULE[ModuleWaterfallFX] {} // Removes the stock effect block, and replace it with one that has no particles !EFFECTS {} EFFECTS diff --git a/GameData/WaterfallRestock/Patches/Squad/engineLargeSkipper_v2.cfg b/GameData/WaterfallRestock/Patches/Squad/engineLargeSkipper_v2.cfg index 1ad1e8d..326c981 100644 --- a/GameData/WaterfallRestock/Patches/Squad/engineLargeSkipper_v2.cfg +++ b/GameData/WaterfallRestock/Patches/Squad/engineLargeSkipper_v2.cfg @@ -1,8 +1,8 @@ -@PART[engineLargeSkipper_v2]:AFTER[ReStock] +@PART[engineLargeSkipper_v2]:NEEDS[ReStock]:FOR[WaterfallRestock] { - + !MODULE[ModuleWaterfallFX] {} !EFFECTS {} !MODULE[EngineLightEffect] {} diff --git a/GameData/WaterfallRestock/Patches/Squad/ionEngine.cfg b/GameData/WaterfallRestock/Patches/Squad/ionEngine.cfg index f820190..7a527ab 100644 --- a/GameData/WaterfallRestock/Patches/Squad/ionEngine.cfg +++ b/GameData/WaterfallRestock/Patches/Squad/ionEngine.cfg @@ -1,8 +1,8 @@ -@PART[ionEngine]:AFTER[ReStock] +@PART[ionEngine]:NEEDS[ReStock]:FOR[WaterfallRestock] { - // Removes the stock effect block, and replace it with one that has no particles + !MODULE[ModuleWaterfallFX] {} !EFFECTS {} !MODULE[EngineLightEffect] {} diff --git a/GameData/WaterfallRestock/Patches/Squad/liquidEngineMainsail.cfg b/GameData/WaterfallRestock/Patches/Squad/liquidEngineMainsail.cfg index bb3c0c9..16517a4 100644 --- a/GameData/WaterfallRestock/Patches/Squad/liquidEngineMainsail.cfg +++ b/GameData/WaterfallRestock/Patches/Squad/liquidEngineMainsail.cfg @@ -1,8 +1,8 @@ -@PART[liquidEngineMainsail_v2]:AFTER[ReStock] +@PART[liquidEngineMainsail_v2]:NEEDS[ReStock]:FOR[WaterfallRestock] { - + !MODULE[ModuleWaterfallFX] {} !EFFECTS {} !MODULE[EngineLightEffect] {} diff --git a/GameData/WaterfallRestock/Patches/Squad/liquidEngineMini_v2.cfg b/GameData/WaterfallRestock/Patches/Squad/liquidEngineMini_v2.cfg index 1f61659..7dc1654 100644 --- a/GameData/WaterfallRestock/Patches/Squad/liquidEngineMini_v2.cfg +++ b/GameData/WaterfallRestock/Patches/Squad/liquidEngineMini_v2.cfg @@ -2,9 +2,9 @@ -@PART[liquidEngineMini_v2]:AFTER[ReStock] +@PART[liquidEngineMini_v2]:NEEDS[ReStock]:FOR[WaterfallRestock] { - + !MODULE[ModuleWaterfallFX] {} !EFFECTS {} !MODULE[EngineLightEffect] {} diff --git a/GameData/WaterfallRestock/Patches/Squad/liquidEnginePoodle.cfg b/GameData/WaterfallRestock/Patches/Squad/liquidEnginePoodle.cfg index a3828af..cf6bacc 100644 --- a/GameData/WaterfallRestock/Patches/Squad/liquidEnginePoodle.cfg +++ b/GameData/WaterfallRestock/Patches/Squad/liquidEnginePoodle.cfg @@ -1,8 +1,8 @@ -@PART[liquidEngine2-2_v2]:AFTER[ReStock] +@PART[liquidEngine2-2_v2]:NEEDS[ReStock]:FOR[WaterfallRestock] { - + !MODULE[ModuleWaterfallFX] {} !EFFECTS {} EFFECTS { diff --git a/GameData/WaterfallRestock/Patches/Squad/liquidEngineReliant.cfg b/GameData/WaterfallRestock/Patches/Squad/liquidEngineReliant.cfg index ad154c3..b79f399 100644 --- a/GameData/WaterfallRestock/Patches/Squad/liquidEngineReliant.cfg +++ b/GameData/WaterfallRestock/Patches/Squad/liquidEngineReliant.cfg @@ -1,8 +1,8 @@ -@PART[liquidEngine]:AFTER[ReStock] +@PART[liquidEngine]:NEEDS[ReStock]:FOR[WaterfallRestock] { - + !MODULE[ModuleWaterfallFX] {} !EFFECTS {} !MODULE[EngineLightEffect] {} diff --git a/GameData/WaterfallRestock/Patches/Squad/liquidEngineSwivel.cfg b/GameData/WaterfallRestock/Patches/Squad/liquidEngineSwivel.cfg index e33e783..ef3390b 100644 --- a/GameData/WaterfallRestock/Patches/Squad/liquidEngineSwivel.cfg +++ b/GameData/WaterfallRestock/Patches/Squad/liquidEngineSwivel.cfg @@ -1,8 +1,8 @@ -@PART[liquidEngine2]:AFTER[ReStock] +@PART[liquidEngine2]:NEEDS[ReStock]:FOR[WaterfallRestock] { - + !MODULE[ModuleWaterfallFX] {} !EFFECTS {} !MODULE[EngineLightEffect] {} diff --git a/GameData/WaterfallRestock/Patches/Squad/liquidEngineTerrier.cfg b/GameData/WaterfallRestock/Patches/Squad/liquidEngineTerrier.cfg index d65d43e..04afa5e 100644 --- a/GameData/WaterfallRestock/Patches/Squad/liquidEngineTerrier.cfg +++ b/GameData/WaterfallRestock/Patches/Squad/liquidEngineTerrier.cfg @@ -1,8 +1,8 @@ -@PART[liquidEngine3_v2]:AFTER[ReStock] +@PART[liquidEngine3_v2]:NEEDS[ReStock]:FOR[WaterfallRestock] { - + !MODULE[ModuleWaterfallFX] {} !EFFECTS {} !MODULE[EngineLightEffect] {} diff --git a/GameData/WaterfallRestock/Patches/Squad/liquidEngineTwinBoar.cfg b/GameData/WaterfallRestock/Patches/Squad/liquidEngineTwinBoar.cfg index a1c43bd..620d9d4 100644 --- a/GameData/WaterfallRestock/Patches/Squad/liquidEngineTwinBoar.cfg +++ b/GameData/WaterfallRestock/Patches/Squad/liquidEngineTwinBoar.cfg @@ -1,8 +1,8 @@ -@PART[Size2LFB]:AFTER[ReStock] +@PART[Size2LFB]:NEEDS[ReStock]:FOR[WaterfallRestock] { - + !MODULE[ModuleWaterfallFX] {} !EFFECTS {} !MODULE[EngineLightEffect] {} diff --git a/GameData/WaterfallRestock/Patches/Squad/liquidEngineTwinBoar_v2.cfg b/GameData/WaterfallRestock/Patches/Squad/liquidEngineTwinBoar_v2.cfg index 7be43b8..36c850f 100644 --- a/GameData/WaterfallRestock/Patches/Squad/liquidEngineTwinBoar_v2.cfg +++ b/GameData/WaterfallRestock/Patches/Squad/liquidEngineTwinBoar_v2.cfg @@ -1,8 +1,8 @@ -@PART[Size2LFB_v2]:AFTER[ReStock] -{ - +@PART[Size2LFB_v2]:NEEDS[ReStock]:FOR[WaterfallRestock] +{ + !MODULE[ModuleWaterfallFX] {} !EFFECTS {} !MODULE[EngineLightEffect] {} diff --git a/GameData/WaterfallRestock/Patches/Squad/microEngine_v2.cfg b/GameData/WaterfallRestock/Patches/Squad/microEngine_v2.cfg index 92260ca..abc994a 100644 --- a/GameData/WaterfallRestock/Patches/Squad/microEngine_v2.cfg +++ b/GameData/WaterfallRestock/Patches/Squad/microEngine_v2.cfg @@ -1,8 +1,8 @@ -@PART[microEngine_v2]:AFTER[ReStock] +@PART[microEngine_v2]:NEEDS[ReStock]:FOR[WaterfallRestock] { - + !MODULE[ModuleWaterfallFX] {} !EFFECTS {} !MODULE[EngineLightEffect] {} diff --git a/GameData/WaterfallRestock/Patches/Squad/nuclearEngine.cfg b/GameData/WaterfallRestock/Patches/Squad/nuclearEngine.cfg index 93b6fc1..b9e8b1a 100644 --- a/GameData/WaterfallRestock/Patches/Squad/nuclearEngine.cfg +++ b/GameData/WaterfallRestock/Patches/Squad/nuclearEngine.cfg @@ -1,8 +1,8 @@ -@PART[nuclearEngine]:AFTER[ReStock] +@PART[nuclearEngine]:NEEDS[ReStock]:FOR[WaterfallRestock] { - // Removes the stock effect block, and replace it with one that has no particles + !MODULE[ModuleWaterfallFX] {} !EFFECTS {} EFFECTS { diff --git a/GameData/WaterfallRestock/Patches/Squad/omsEngine.cfg b/GameData/WaterfallRestock/Patches/Squad/omsEngine.cfg index 94da92d..b78e026 100644 --- a/GameData/WaterfallRestock/Patches/Squad/omsEngine.cfg +++ b/GameData/WaterfallRestock/Patches/Squad/omsEngine.cfg @@ -1,10 +1,10 @@ -@PART[omsEngine]:AFTER[ReStock] +@PART[omsEngine]:NEEDS[ReStock]:FOR[WaterfallRestock] { - + !MODULE[ModuleWaterfallFX] {} !EFFECTS {} -!MODULE[EngineLightEffect] {} + !MODULE[EngineLightEffect] {} EFFECTS { @@ -86,16 +86,6 @@ rotation = 0, 0, 0 scale = 0.37, 0.37, 0.37 } - TEMPLATE - { - // This is the name of the template to use - templateName = waterfall-kerolox-vernier-2 - // This field allows you to override the parentTransform name in the EFFECTS contained in the template - overrideParentTransform = thrustTransform - position = 0,0,1 - rotation = 0, 0, 0 - scale = 1.7, 1.7, 2 - } diff --git a/GameData/WaterfallRestock/Patches/Squad/radialEngineMini_v2.cfg b/GameData/WaterfallRestock/Patches/Squad/radialEngineMini_v2.cfg index 2b8e239..77950dd 100644 --- a/GameData/WaterfallRestock/Patches/Squad/radialEngineMini_v2.cfg +++ b/GameData/WaterfallRestock/Patches/Squad/radialEngineMini_v2.cfg @@ -1,6 +1,6 @@ -@PART[radialEngineMini_v2]:AFTER[ReStock] +@PART[radialEngineMini_v2]:NEEDS[ReStock]:FOR[WaterfallRestock] { - + !MODULE[ModuleWaterfallFX] {} !EFFECTS {} !MODULE[EngineLightEffect] {} diff --git a/GameData/WaterfallRestock/Patches/Squad/smallRadialEngine_v2.cfg b/GameData/WaterfallRestock/Patches/Squad/smallRadialEngine_v2.cfg index 7446743..fe43235 100644 --- a/GameData/WaterfallRestock/Patches/Squad/smallRadialEngine_v2.cfg +++ b/GameData/WaterfallRestock/Patches/Squad/smallRadialEngine_v2.cfg @@ -1,8 +1,8 @@ -@PART[smallRadialEngine_v2]:AFTER[ReStock] +@PART[smallRadialEngine_v2]:NEEDS[ReStock]:FOR[WaterfallRestock] { - + !MODULE[ModuleWaterfallFX] {} !EFFECTS {} !MODULE[EngineLightEffect] {} diff --git a/GameData/WaterfallRestock/Patches/Squad/spotLight1.cfg b/GameData/WaterfallRestock/Patches/Squad/spotLight1.cfg index 2b3841e..564c9ae 100644 --- a/GameData/WaterfallRestock/Patches/Squad/spotLight1.cfg +++ b/GameData/WaterfallRestock/Patches/Squad/spotLight1.cfg @@ -1,5 +1,6 @@ -@PART[spotLight1]:AFTER[ReStock] +@PART[spotLight1]:NEEDS[ReStock]:FOR[WaterfallRestock] { + !MODULE[ModuleWaterfallFX] {} MODULE { name = ModuleWaterfallFX diff --git a/GameData/WaterfallRestock/Patches/Squad/spotLight2.cfg b/GameData/WaterfallRestock/Patches/Squad/spotLight2.cfg index acdc086..95669ac 100644 --- a/GameData/WaterfallRestock/Patches/Squad/spotLight2.cfg +++ b/GameData/WaterfallRestock/Patches/Squad/spotLight2.cfg @@ -1,5 +1,6 @@ -@PART[spotLight2]:AFTER[ReStock] +@PART[spotLight2]:NEEDS[ReStock]:FOR[WaterfallRestock] { + !MODULE[ModuleWaterfallFX] {} MODULE { name = ModuleWaterfallFX diff --git a/GameData/WaterfallRestock/Versioning/WaterfallRestock.version b/GameData/WaterfallRestock/Versioning/WaterfallRestock.version index 797898e..c45bde9 100644 --- a/GameData/WaterfallRestock/Versioning/WaterfallRestock.version +++ b/GameData/WaterfallRestock/Versioning/WaterfallRestock.version @@ -6,14 +6,14 @@ { "MAJOR":0, "MINOR":2, - "PATCH":1, + "PATCH":2, "BUILD":0 }, "KSP_VERSION": { "MAJOR":1, "MINOR":11, - "PATCH":1 + "PATCH":2 }, "KSP_VERSION_MIN":{ "MAJOR":1, diff --git a/changelog.txt b/changelog.txt index fb52690..63df67b 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,10 @@ +v0.2.2 +------ +- Fixed duplicated plume on Puff +- Updated pass specification of all patches +- Set up for compatibility with StockWaterfallEffects - you can now install both and get SWE effects on engines that Restock doesn't touch +- Fixed Ursa plume position + v0.2.1 ------ - Fixed Restock+ Galleon effects diff --git a/readme.txt b/readme.txt index c231421..f7d735c 100644 --- a/readme.txt +++ b/readme.txt @@ -1,5 +1,5 @@ ================================= -Waterfall - Restock Configs 0.2.1 +Waterfall - Restock Configs 0.2.2 ================================= This is a configuration pack for the Waterfall mod, which applies Waterfall type effects to Restock and Restock+ models. It does nothing on its own and requires the base Waterfall mod to function. @@ -9,7 +9,7 @@ DEPENDENCIES ============ Required: -- Waterfall (0.6.0) +- Waterfall (0.6.4) - Restock (1.3.1+) - ModuleManager (v4.1.4) From 5d14bb28bfab25f2ee28bdcb52cb4ba2e02b0885 Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 16 Jun 2021 21:47:06 -0700 Subject: [PATCH 2/2] Poodle fix v2 --- .mod_data.yml | 2 +- .../WaterfallRestock/Patches/Squad/liquidEnginePoodle.cfg | 8 ++++---- changelog.txt | 1 + readme.txt | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.mod_data.yml b/.mod_data.yml index f15cdcb..b66c0d9 100644 --- a/.mod_data.yml +++ b/.mod_data.yml @@ -11,7 +11,7 @@ dependencies: # Configure dependencies version: 4.1.4 location: s3 Waterfall: - tag: 0.6.0 + tag: 0.6.5 location: github repository: post-kerbin-mining-corporation/Waterfall deploy: diff --git a/GameData/WaterfallRestock/Patches/Squad/liquidEnginePoodle.cfg b/GameData/WaterfallRestock/Patches/Squad/liquidEnginePoodle.cfg index cf6bacc..d5c63b5 100644 --- a/GameData/WaterfallRestock/Patches/Squad/liquidEnginePoodle.cfg +++ b/GameData/WaterfallRestock/Patches/Squad/liquidEnginePoodle.cfg @@ -81,7 +81,7 @@ // This is the name of the template to use templateName = waterfall-kerolox-upper-1 // This field allows you to override the parentTransform name in the EFFECTS contained in the template - overrideParentTransform = fxTransformCore + overrideParentTransform = fxTransformCoreMulti position = 0,-0.33,0 rotation = 90, 0, 0 scale = 0.98, 0.98, 0.98 @@ -127,10 +127,10 @@ scale = 0.98, 0.98, 0.98 // This is the name of the template to use templateName = waterfall-kerolox-upper-1 // This field allows you to override the parentTransform name in the EFFECTS contained in the template - overrideParentTransform = B_PoodleSingle_Gimbal - position = 0,-0.33,0 + overrideParentTransform = fxTransformCoreSingle + position = 0,-0.72,0 rotation = 90, 0, 0 -scale = 0.98, 0.98, 0.98 +scale = 1.77, 1.77, 1.3 } diff --git a/changelog.txt b/changelog.txt index 63df67b..fd45929 100644 --- a/changelog.txt +++ b/changelog.txt @@ -4,6 +4,7 @@ v0.2.2 - Updated pass specification of all patches - Set up for compatibility with StockWaterfallEffects - you can now install both and get SWE effects on engines that Restock doesn't touch - Fixed Ursa plume position +- Fixed Poodle plume (need Restock 1.3.2+) v0.2.1 ------ diff --git a/readme.txt b/readme.txt index f7d735c..245345b 100644 --- a/readme.txt +++ b/readme.txt @@ -9,7 +9,7 @@ DEPENDENCIES ============ Required: -- Waterfall (0.6.4) +- Waterfall (0.6.5) - Restock (1.3.1+) - ModuleManager (v4.1.4)