Merge pull request #125 from KnightofStJohn/master

deconflicted remaining engines for StockWaterfallEffects
KSP-RO · Jun 15, 2021 · c7525e1 · c7525e1
2 parents c51991b + 3d845c9
commit c7525e1
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 14 deletions.
diff --git a/GameData/RealPlume-Stock/Squad/ionEngine_Dawn.cfg b/GameData/RealPlume-Stock/Squad/ionEngine_Dawn.cfg
@@ -1,4 +1,4 @@
-@PART[ionEngine]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock] // IX-6315 "Dawn" Electric Propulsion System
+@PART[ionEngine]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock,!StockWaterfallEffects] // IX-6315 "Dawn" Electric Propulsion System
 {
     PLUME
     {

diff --git a/GameData/RealPlume-Stock/Squad/jetEngineAfterburning.cfg b/GameData/RealPlume-Stock/Squad/jetEngineAfterburning.cfg
@@ -1,4 +1,4 @@
-@PART[turboJet]:FOR[RealPlume]:NEEDS[SmokeScreen] // J-404 "Panther" Afterburning Turbofan
+@PART[turboJet]:FOR[RealPlume]:NEEDS[SmokeScreen,!StockWaterfallEffects] // J-404 "Panther" Afterburning Turbofan
 {
     PLUME
     {

diff --git a/GameData/RealPlume-Stock/Squad/jetEngineBasic.cfg b/GameData/RealPlume-Stock/Squad/jetEngineBasic.cfg
@@ -1,4 +1,4 @@
-@PART[JetEngine]:FOR[RealPlume]:NEEDS[SmokeScreen] // J-33 "Wheesley" Turbofan Engine
+@PART[JetEngine]:FOR[RealPlume]:NEEDS[SmokeScreen,!StockWaterfallEffects] // J-33 "Wheesley" Turbofan Engine
 {
     PLUME
     {

diff --git a/GameData/RealPlume-Stock/Squad/jetEngineBig.cfg b/GameData/RealPlume-Stock/Squad/jetEngineBig.cfg
@@ -1,4 +1,4 @@
-@PART[turboFanSize2]:FOR[RealPlume]:NEEDS[SmokeScreen] // J-90 "Goliath" Turbofan Engine
+@PART[turboFanSize2]:FOR[RealPlume]:NEEDS[SmokeScreen,!StockWaterfallEffects] // J-90 "Goliath" Turbofan Engine
 {
     PLUME
     {

diff --git a/GameData/RealPlume-Stock/Squad/jetEngineTurbo.cfg b/GameData/RealPlume-Stock/Squad/jetEngineTurbo.cfg
@@ -1,4 +1,4 @@
-@PART[turboFanEngine]:FOR[RealPlume]:NEEDS[SmokeScreen] // J-X4 "Whiplash" Turbo Ramjet Engine
+@PART[turboFanEngine]:FOR[RealPlume]:NEEDS[SmokeScreen,!StockWaterfallEffects] // J-X4 "Whiplash" Turbo Ramjet Engine
 {
     PLUME
     {

diff --git a/GameData/RealPlume-Stock/Squad/liquidEngineAerospike.cfg b/GameData/RealPlume-Stock/Squad/liquidEngineAerospike.cfg
@@ -1,4 +1,4 @@
-@PART[toroidalAerospike]:NEEDS[ReStock,SmokeScreen]:AFTER[ReStock]
+@PART[toroidalAerospike]:NEEDS[ReStock,SmokeScreen,!StockWaterfallEffects]:AFTER[ReStock]
 {
   !EFFECTS {}
 }

diff --git a/GameData/RealPlume-Stock/Squad/liquidEngineMini_v2_Spark.cfg b/GameData/RealPlume-Stock/Squad/liquidEngineMini_v2_Spark.cfg
@@ -1,4 +1,4 @@
-@PART[liquidEngineMini_v2]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock] // 48-7S "Spark" Liquid Fuel Engine
+@PART[liquidEngineMini_v2]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock,!StockWaterfallEffects] // 48-7S "Spark" Liquid Fuel Engine
 {
     PLUME
     {

diff --git a/GameData/RealPlume-Stock/Squad/microEngine_v2_Ant.cfg b/GameData/RealPlume-Stock/Squad/microEngine_v2_Ant.cfg
@@ -1,4 +1,4 @@
-@PART[microEngine_v2]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock] // LV-1 "Ant" Liquid Fuel Engine
+@PART[microEngine_v2]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock,!StockWaterfallEffects] // LV-1 "Ant" Liquid Fuel Engine
 {
     PLUME
     {

diff --git a/GameData/RealPlume-Stock/Squad/miniJet.cfg b/GameData/RealPlume-Stock/Squad/miniJet.cfg
@@ -1,4 +1,4 @@
-@PART[miniJetEngine]:FOR[RealPlume]:NEEDS[SmokeScreen] // J-20 "Juno" Basic Jet Engine
+@PART[miniJetEngine]:FOR[RealPlume]:NEEDS[SmokeScreen,!StockWaterfallEffects] // J-20 "Juno" Basic Jet Engine
 {
     PLUME
     {

diff --git a/GameData/RealPlume-Stock/Squad/omsEngine_Puff.cfg b/GameData/RealPlume-Stock/Squad/omsEngine_Puff.cfg
@@ -1,4 +1,4 @@
-@PART[omsEngine]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock] // O-10 "Puff" MonoPropellant Fuel Engine
+@PART[omsEngine]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock,!StockWaterfallEffects] // O-10 "Puff" MonoPropellant Fuel Engine
 {
     PLUME
     {

diff --git a/GameData/RealPlume-Stock/Squad/radialEngineMini_v2_Spider.cfg b/GameData/RealPlume-Stock/Squad/radialEngineMini_v2_Spider.cfg
@@ -1,4 +1,4 @@
-@PART[radialEngineMini_v2]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock] // LV-1R "Spider" Liquid Fuel Engine
+@PART[radialEngineMini_v2]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock,!StockWaterfallEffects] // LV-1R "Spider" Liquid Fuel Engine
 {
     PLUME
     {

diff --git a/GameData/RealPlume-Stock/Squad/radialLiquidEngine1-2.cfg b/GameData/RealPlume-Stock/Squad/radialLiquidEngine1-2.cfg
@@ -1,4 +1,4 @@
-@PART[radialLiquidEngine1-2]:FOR[RealPlume]:NEEDS[SmokeScreen] // Mk-55 "Thud" Liquid Fuel Engine
+@PART[radialLiquidEngine1-2]:FOR[RealPlume]:NEEDS[SmokeScreen,!StockWaterfallEffects] // Mk-55 "Thud" Liquid Fuel Engine
 {
     PLUME
     {

diff --git a/GameData/RealPlume-Stock/Squad/smallRadialEngineTwitch_v2.cfg b/GameData/RealPlume-Stock/Squad/smallRadialEngineTwitch_v2.cfg
@@ -1,4 +1,4 @@
-@PART[smallRadialEngine_v2]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock] // 24-77 "Twitch" Liquid Fuel Engine
+@PART[smallRadialEngine_v2]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock,!StockWaterfallEffects] // 24-77 "Twitch" Liquid Fuel Engine
 {
     PLUME
     {

diff --git a/GameData/RealPlume-Stock/SquadExpansion/LiquidEngineRV-1.cfg b/GameData/RealPlume-Stock/SquadExpansion/LiquidEngineRV-1.cfg
@@ -1,4 +1,4 @@
-@PART[LiquidEngineRV-1]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock] // RV-1 'Cub' Vernier Engine
+@PART[LiquidEngineRV-1]:FOR[RealPlume]:NEEDS[SmokeScreen,!ReStock,!StockWaterfallEffects] // RV-1 'Cub' Vernier Engine
 {
     PLUME
     {