KSP-RO · Gordon-Dry · May 31, 2020 · May 31, 2020 · Jun 14, 2020 · Sep 21, 2020
diff --git a/GameData/RealPlume-Stock/CommonwealthRocketryEstablishment/BlackAnvil.cfg b/GameData/RealPlume-Stock/CommonwealthRocketryEstablishment/BlackAnvil.cfg
@@ -1,4 +1,4 @@
-@PART[black_anvil_engine_s1_1]:FOR[RealPlume]:NEEDS[RealPlume,SmokeScreen,CRE]
+@PART[black_anvil_engine_s1_1]:FOR[RealPlume]:NEEDS[RealPlume,SmokeScreen,CRE,!Waterfall]
 {
       @MODULE[ModuleEngines*]
       {
@@ -25,7 +25,7 @@
       plume2Scale = 0.2
       }
 }
-@PART[black_anvil_engine_s1_1]:NEEDS[RealPlume,SmokeScreen,CRE]:AFTER[zzRealPlume]
+@PART[black_anvil_engine_s1_1]:NEEDS[RealPlume,SmokeScreen,CRE,!Waterfall]:AFTER[zzRealPlume]
 {
   @EFFECTS
   {

diff --git a/GameData/RealPlume-Stock/CommonwealthRocketryEstablishment/BlackArrow.cfg b/GameData/RealPlume-Stock/CommonwealthRocketryEstablishment/BlackArrow.cfg
@@ -1,4 +1,4 @@
-@PART[black_arrow_engine_s1_1]:NEEDS[zRealPlume,SmokeScreen,CRE]
+@PART[black_arrow_engine_s1_1]:NEEDS[zRealPlume,SmokeScreen,CRE,!Waterfall]
 {
   PLUME
   {
@@ -29,7 +29,7 @@
   }
 }
 //boost volume
-@PART[black_arrow_engine_s1_1]:NEEDS[zRealPlume,SmokeScreen,CRE]:FOR[zzRealPlume]
+@PART[black_arrow_engine_s1_1]:NEEDS[zRealPlume,SmokeScreen,CRE,!Waterfall]:FOR[zzRealPlume]
 {
   @EFFECTS
   {
@@ -51,7 +51,7 @@
   }
 }
 
-@PART[black_arrow_engine_s1_2]:NEEDS[zRealPlume,SmokeScreen,CRE]
+@PART[black_arrow_engine_s1_2]:NEEDS[zRealPlume,SmokeScreen,CRE,!Waterfall]
 {
   PLUME
   {
@@ -81,7 +81,7 @@
     %powerEffectName = HTP_RP1_Lower
   }
 }
-@PART[black_arrow_engine_s1_3]:NEEDS[zRealPlume,SmokeScreen,CRE]
+@PART[black_arrow_engine_s1_3]:NEEDS[zRealPlume,SmokeScreen,CRE,!Waterfall]
 {
   PLUME
   {

diff --git a/GameData/RealPlume-Stock/CommonwealthRocketryEstablishment/BlackKnight.cfg b/GameData/RealPlume-Stock/CommonwealthRocketryEstablishment/BlackKnight.cfg
@@ -1,4 +1,4 @@
-@PART[black_knight_engine_s1_1]:NEEDS[zRealPlume,SmokeScreen,CRE]
+@PART[black_knight_engine_s1_1]:NEEDS[zRealPlume,SmokeScreen,CRE,!Waterfall]
 {
   PLUME
   {

diff --git a/GameData/RealPlume-Stock/CommonwealthRocketryEstablishment/BlueSteel.cfg b/GameData/RealPlume-Stock/CommonwealthRocketryEstablishment/BlueSteel.cfg
@@ -1,4 +1,4 @@
-@PART[blue_steel_engine_s1_1]:NEEDS[zRealPlume,SmokeScreen,CRE]
+@PART[blue_steel_engine_s1_1]:NEEDS[zRealPlume,SmokeScreen,CRE,!Waterfall]
 {
   PLUME
   {

diff --git a/GameData/RealPlume-Stock/CommonwealthRocketryEstablishment/BlueStreak.cfg b/GameData/RealPlume-Stock/CommonwealthRocketryEstablishment/BlueStreak.cfg
@@ -1,4 +1,4 @@
-@PART[blue_streak_engine_s1_1]:NEEDS[zRealPlume,SmokeScreen,CRE]
+@PART[blue_streak_engine_s1_1]:NEEDS[zRealPlume,SmokeScreen,CRE,!Waterfall]
 {
     @MODULE[ModuleEngines*]
     {
@@ -25,7 +25,7 @@
 		}
 }
 
-@PART[blue_streak_engine_s1_2]:NEEDS[zRealPlume,SmokeScreen,CRE]
+@PART[blue_streak_engine_s1_2]:NEEDS[zRealPlume,SmokeScreen,CRE,!Waterfall]
 {
     @MODULE[ModuleEngines*]
     {
@@ -55,7 +55,7 @@
 		}
 }
 
-@PART[blue_streak_engine_s1_3]:NEEDS[zRealPlume,SmokeScreen,CRE]
+@PART[blue_streak_engine_s1_3]:NEEDS[zRealPlume,SmokeScreen,CRE,!Waterfall]
 {
     @MODULE[ModuleEngines*]
     {
@@ -80,7 +80,7 @@
 				streamScale = 1.2
 	}
 }
-@PART[blue_streak_engine_s1_3]:NEEDS[zRealPlume,Smokescreen,CRE]:FOR[zzRealPlume]
+@PART[blue_streak_engine_s1_3]:NEEDS[zRealPlume,SmokeScreen,CRE,!Waterfall]:FOR[zzRealPlume]
 {
   @EFFECTS
   {

diff --git a/GameData/RealPlume-Stock/Fuji/Polaris_Engine_A.cfg b/GameData/RealPlume-Stock/Fuji/Polaris_Engine_A.cfg
@@ -1,4 +1,4 @@
-@PART[Polaris_Engine_A]:NEEDS[RealPlume,SmokeScreen]
+@PART[Polaris_Engine_A]:NEEDS[RealPlume,SmokeScreen,!Waterfall]
 {
     @MODULE[ModuleEngines*]
     {

diff --git a/GameData/RealPlume-Stock/GemstoneLV/gemstone_engine_srbem_s1_1.cfg b/GameData/RealPlume-Stock/GemstoneLV/gemstone_engine_srbem_s1_1.cfg
@@ -0,0 +1,28 @@
+@PART[gemstone_engine_srbem_s1_1]:AFTER[GemstoneLV]
+{
+  !EFFECTS {}
+}
+@PART[gemstone_engine_srbem_s1_1]:NEEDS[zRealPlume,SmokeScreen,GemstoneLV]// BACC "Thumper" Solid Fuel Booster
+{
+    PLUME
+    {
+        name = Solid-Lower
+        transformName = thrustTransform
+        localRotation = 0,0,0
+        flarePosition = 0,0,0.0
+        plumePosition = 0,0,0.2
+        smokePosition = 0,0,0.1
+        slagPosition = 0,0,0
+        flareScale = 1
+        plumeScale = 1
+        smokeScale = 1.2
+        slagScale = 0.7
+        energy = 1
+        speed = 1
+        emissionMult = 0.5
+    }
+    @MODULE[ModuleEngines*]
+    {
+        %powerEffectName = Solid-Lower
+    }
+}
diff --git a/GameData/RealPlume-Stock/Global Patches.cfg b/GameData/RealPlume-Stock/Global Patches.cfg
@@ -76,4 +76,13 @@
             }
         }
     }
-}
+}
+//  ==================================================
+//  Deconflict with WaterfallFX plume mod
+//  When waterfall FX is installed, waterfall takes priority over RealPlume
+// Has Audio issues, disabled for now. Deconflicting done on individual basis.
+//  ==================================================
+//@PART:HAS[@MODULE[ModuleWaterfallFX]]:BEFORE[zRealPlume]
+//{
+//  !PLUME{}
+//}
diff --git a/GameData/RealPlume-Stock/Kerbal Atomics/Kerbal Atomics.cfg b/GameData/RealPlume-Stock/Kerbal Atomics/Kerbal Atomics.cfg
@@ -1,6 +1,6 @@
 //0.625m
 
-@PART[ntr-sc-0625-1]:FOR[RealPlume]:NEEDS[SmokeScreen] //Eel
+@PART[ntr-sc-0625-1]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] //Eel
 {
   PLUME
   {
@@ -29,7 +29,7 @@
 
 //1.25m
 
-@PART[ntr-sc-125-1]:FOR[RealPlume]:NEEDS[SmokeScreen] //Neptune
+@PART[ntr-sc-125-1]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] //Neptune
 {
     PLUME
     {
@@ -78,7 +78,7 @@
     }
 }
 
-@PART[ntr-sc-125-2]:FOR[RealPlume]:NEEDS[SmokeScreen] // Stubber
+@PART[ntr-sc-125-2]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] // Stubber
 {
     PLUME
     {
@@ -131,7 +131,7 @@
 
 //2.5m
 
-@PART[ntr-sc-25-1]:FOR[RealPlume]:NEEDS[SmokeScreen] // Trimodal Solid Core - 2.5m - Poseidon
+@PART[ntr-sc-25-1]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] // Trimodal Solid Core - 2.5m - Poseidon
 {
     PLUME
     {
@@ -180,7 +180,7 @@
     }
 }
 
-@PART[ntr-gc-25-1]:FOR[RealPlume]:NEEDS[SmokeScreen] //Liberator closed cycle gas core
+@PART[ntr-gc-25-1]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] //Liberator closed cycle gas core
 {
   PLUME
   {
@@ -208,7 +208,7 @@
 }
 
 
-@PART[ntr-gc-25-2]:FOR[RealPlume]:NEEDS[SmokeScreen] // Emancipator open cycle gas core
+@PART[ntr-gc-25-2]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] // Emancipator open cycle gas core
 {
   PLUME
   {
@@ -234,7 +234,7 @@
         !runningEffectName = DELETE
     }
 }
-@PART[ntr-gc-25-2]:FOR[zzRealPlume]
+@PART[ntr-gc-25-2]:FOR[zzRealPlume,!Waterfall]
 {
   @EFFECTS
   {

diff --git a/GameData/RealPlume-Stock/Knes/Knes_Engine_EPS.cfg b/GameData/RealPlume-Stock/Knes/Knes_Engine_EPS.cfg
@@ -1,4 +1,4 @@
-@PART[Knes_Engine_EPS]:FOR[RealPlume]:NEEDS[SmokeScreen]
+@PART[Knes_Engine_EPS]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall]
 {
     @MODULE[ModuleEngines*]
     {

diff --git a/GameData/RealPlume-Stock/Knes/Knes_Engine_Vulcain.cfg b/GameData/RealPlume-Stock/Knes/Knes_Engine_Vulcain.cfg
@@ -1,4 +1,4 @@
-@PART[Knes_Engine_Vulcain]:FOR[RealPlume]:NEEDS[SmokeScreen] // KS-68 'Mars' Cryogenic Rocket Engine
+@PART[Knes_Engine_Vulcain]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] // KS-68 'Mars' Cryogenic Rocket Engine
 {
       @MODULE[ModuleEngines*]
       {
@@ -28,7 +28,7 @@
       }
 }
 //add engine flare since no internal emissive
-@PART[Knes_Engine_Vulcain]:FOR[zzRealPlume]:NEEDS[SmokeScreen]
+@PART[Knes_Engine_Vulcain]:FOR[zzRealPlume]:NEEDS[SmokeScreen,!Waterfall]
 {
   @EFFECTS
   {

diff --git a/GameData/RealPlume-Stock/Knes/Knes_Engine_Zebulon.cfg b/GameData/RealPlume-Stock/Knes/Knes_Engine_Zebulon.cfg
@@ -1,4 +1,4 @@
-@PART[Knes_Engine_Zebulon]:FOR[RealPlume]:NEEDS[SmokeScreen] // Ariane 4 cryogenic 3rd stage engine HM7 "Zebulon" Liquid Fuel Engine
+@PART[Knes_Engine_Zebulon]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] // Ariane 4 cryogenic 3rd stage engine HM7 "Zebulon" Liquid Fuel Engine
 {
       @MODULE[ModuleEngines*]
       {
@@ -25,7 +25,7 @@
       plume2Scale = 0.45
       }
 }
-@PART[Knes_Engine_Zebulon]:FOR[zzRealPlume]
+@PART[Knes_Engine_Zebulon]:FOR[zzRealPlume]:NEEDS[!Waterfall]
 {
   @EFFECTS
   {

diff --git a/GameData/RealPlume-Stock/Knes/Knes_Hermes_Engine_Mk91.cfg b/GameData/RealPlume-Stock/Knes/Knes_Hermes_Engine_Mk91.cfg
@@ -1,4 +1,4 @@
-@PART[Knes_Hermes_Engine_Mk91]:FOR[RealPlume]:NEEDS[SmokeScreen] // Hermes Mk-91 "Callisto" Monoprop Engine
+@PART[Knes_Hermes_Engine_Mk91]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] // Hermes Mk-91 "Callisto" Monoprop Engine
 {
     @MODULE[ModuleEngines*]
     {

diff --git a/GameData/RealPlume-Stock/Knes/Knes_Service_Module_Viking_09375.cfg b/GameData/RealPlume-Stock/Knes/Knes_Service_Module_Viking_09375.cfg
@@ -1,4 +1,4 @@
-@PART[Knes_Service_Module_Viking_09375]:FOR[RealPlume]:NEEDS[SmokeScreen]
+@PART[Knes_Service_Module_Viking_09375]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall]
 {
     @EFFECTS
     {
@@ -28,7 +28,7 @@
 				streamScale = 0.1
 	}
 }
-@PART[Knes_Service_Module_Viking_09375]:FOR[zzRealPlume]
+@PART[Knes_Service_Module_Viking_09375]:FOR[zzRealPlume]:NEEDS[!Waterfall]
 {
   @EFFECTS
   {

diff --git a/GameData/RealPlume-Stock/Knes/_Knes_Catherine_Stage_1875.cfg b/GameData/RealPlume-Stock/Knes/_Knes_Catherine_Stage_1875.cfg
@@ -1,4 +1,4 @@
-@PART[_Knes_Catherine_Stage_1875]:NEEDS[RealPlume,SmokeScreen] //
+@PART[_Knes_Catherine_Stage_1875]:NEEDS[RealPlume,SmokeScreen,!Waterfall] //
 {
     PLUME
     {

diff --git a/GameData/RealPlume-Stock/Knes/_Knes_Cora_Engine_1.cfg b/GameData/RealPlume-Stock/Knes/_Knes_Cora_Engine_1.cfg
@@ -1,4 +1,4 @@
-@PART[_Knes_Cora_Engine_1]:NEEDS[RealPlume,SmokeScreen] //
+@PART[_Knes_Cora_Engine_1]:NEEDS[RealPlume,SmokeScreen,!Waterfall] //
 {
     @MODULE[ModuleEngines*]
     {

diff --git a/GameData/RealPlume-Stock/Knes/_Knes_Cora_Engine_SL.cfg b/GameData/RealPlume-Stock/Knes/_Knes_Cora_Engine_SL.cfg
@@ -1,4 +1,4 @@
-@PART[_Knes_Cora_Engine_SL]:NEEDS[RealPlume,SmokeScreen] //
+@PART[_Knes_Cora_Engine_SL]:NEEDS[RealPlume,SmokeScreen,!Waterfall] //
 {
     PLUME
     {

diff --git a/GameData/RealPlume-Stock/Knes/_Knes_Diamant_Engine_09375.cfg b/GameData/RealPlume-Stock/Knes/_Knes_Diamant_Engine_09375.cfg
@@ -1,4 +1,4 @@
-@PART[_Knes_Diamant_Engine_09375]:FOR[RealPlume]:NEEDS[SmokeScreen] // KEREB-D "Riotous" Engine
+@PART[_Knes_Diamant_Engine_09375]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] // KEREB-D "Riotous" Engine
 {
     PLUME
     {

diff --git a/GameData/RealPlume-Stock/Knes/_Knes_Diane_Engine_125.cfg b/GameData/RealPlume-Stock/Knes/_Knes_Diane_Engine_125.cfg
@@ -1,4 +1,4 @@
-@PART[_Knes_Diane_Engine_125]:NEEDS[RealPlume,SmokeScreen] //
+@PART[_Knes_Diane_Engine_125]:NEEDS[RealPlume,SmokeScreen,!Waterfall] //
 {
     @MODULE[ModuleEngines*]
     {

diff --git a/GameData/RealPlume-Stock/Knes/_Knes_H2_Engine_09375.cfg b/GameData/RealPlume-Stock/Knes/_Knes_H2_Engine_09375.cfg
@@ -1,4 +1,4 @@
-@PART[_Knes_H2_Engine_09375]:FOR[RealPlume]:NEEDS[SmokeScreen] //
+@PART[_Knes_H2_Engine_09375]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] //
 {
       @MODULE[ModuleEngines*]
       {

diff --git a/GameData/RealPlume-Stock/Knes/_Knes_H3_Engine_0625.cfg b/GameData/RealPlume-Stock/Knes/_Knes_H3_Engine_0625.cfg
@@ -1,4 +1,4 @@
-@PART[_Knes_H3_Engine_0625]:FOR[RealPlume]:NEEDS[SmokeScreen] //
+@PART[_Knes_H3_Engine_0625]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] //
 {
       @MODULE[ModuleEngines*]
       {
@@ -25,7 +25,7 @@
       plume2Scale = 0.1
       }
 }
-@PART[_Knes_H3_Engine_0625]:FOR[zzRealPlume]:NEEDS[SmokeScreen]
+@PART[_Knes_H3_Engine_0625]:FOR[zzRealPlume]:NEEDS[SmokeScreen,!Waterfall]
 {
   @EFFECTS
   {

diff --git a/GameData/RealPlume-Stock/Knes/_Knes_L3S_HM4_Engine.cfg b/GameData/RealPlume-Stock/Knes/_Knes_L3S_HM4_Engine.cfg
@@ -1,4 +1,4 @@
-@PART[_Knes_L3S_HM4_Engine]:FOR[RealPlume]:NEEDS[SmokeScreen] //
+@PART[_Knes_L3S_HM4_Engine]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] //
 {
       @MODULE[ModuleEngines*]
       {

diff --git a/GameData/RealPlume-Stock/Knes/_Knes_L3S_L140.cfg b/GameData/RealPlume-Stock/Knes/_Knes_L3S_L140.cfg
@@ -1,4 +1,4 @@
-@PART[_Knes_L3S_L140]:NEEDS[RealPlume,SmokeScreen] // Ariane L-140 "Drakkar" Stage
+@PART[_Knes_L3S_L140]:NEEDS[RealPlume,SmokeScreen,!Waterfall] // Ariane L-140 "Drakkar" Stage
 {
     PLUME
     {

diff --git a/GameData/RealPlume-Stock/Knes/_Knes_L3S_L220.cfg b/GameData/RealPlume-Stock/Knes/_Knes_L3S_L220.cfg
@@ -1,4 +1,4 @@
-@PART[_Knes_L3S_L220]:NEEDS[RealPlume,SmokeScreen] // Ariane L-220 "Valkyrie" Stage
+@PART[_Knes_L3S_L220]:NEEDS[RealPlume,SmokeScreen,!Waterfall] // Ariane L-220 "Valkyrie" Stage
 {
     PLUME
     {

diff --git a/GameData/RealPlume-Stock/Knes/_Knes_L3S_L220N.cfg b/GameData/RealPlume-Stock/Knes/_Knes_L3S_L220N.cfg
@@ -1,4 +1,4 @@
-@PART[_Knes_L3S_L220N]:NEEDS[RealPlume,SmokeScreen] // Ariane L-220N "Ragnarok" Stage
+@PART[_Knes_L3S_L220N]:NEEDS[RealPlume,SmokeScreen,!Waterfall] // Ariane L-220N "Ragnarok" Stage
 {
     PLUME
     {

diff --git a/GameData/RealPlume-Stock/Knes/_Knes_L3S_L33_Engine.cfg b/GameData/RealPlume-Stock/Knes/_Knes_L3S_L33_Engine.cfg
@@ -1,4 +1,4 @@
-@PART[_Knes_L3S_L33_Engine]:NEEDS[RealPlume,SmokeScreen] //Ariane 4 second stage 1.875m engine L33 "Byrding" Liquid Fuel Engine
+@PART[_Knes_L3S_L33_Engine]:NEEDS[RealPlume,SmokeScreen,!Waterfall] //Ariane 4 second stage 1.875m engine L33 "Byrding" Liquid Fuel Engine
 {
     @MODULE[ModuleEngines*]
     {

diff --git a/GameData/RealPlume-Stock/Knes/_Knes_L3S_L3S_HM60_Engine.cfg b/GameData/RealPlume-Stock/Knes/_Knes_L3S_L3S_HM60_Engine.cfg
@@ -1,4 +1,4 @@
-@PART[_Knes_L3S_L3S_HM60_Engine]:NEEDS[RealPlume,SmokeScreen] //Ariane 4 second stage 1.875m engine L33 "Byrding" Liquid Fuel Engine
+@PART[_Knes_L3S_L3S_HM60_Engine]:NEEDS[RealPlume,SmokeScreen,!Waterfall] //Ariane 4 second stage 1.875m engine L33 "Byrding" Liquid Fuel Engine
 {
     @MODULE[ModuleEngines*]
     {

diff --git a/GameData/RealPlume-Stock/Knes/_Knes_L3S_PAL.cfg b/GameData/RealPlume-Stock/Knes/_Knes_L3S_PAL.cfg
@@ -1,4 +1,4 @@
-@PART[_Knes_L3S_PAL]:NEEDS[RealPlume,SmokeScreen] // LRB Ariane "Drako" PAL Booster
+@PART[_Knes_L3S_PAL]:NEEDS[RealPlume,SmokeScreen,!Waterfall] // LRB Ariane "Drako" PAL Booster
 {
     PLUME
     {

diff --git a/GameData/RealPlume-Stock/Knes/_Knes_Mireille_Engine_09375.cfg b/GameData/RealPlume-Stock/Knes/_Knes_Mireille_Engine_09375.cfg
@@ -1,4 +1,4 @@
-@PART[_Knes_Mireille_Engine_09375]:NEEDS[RealPlume,SmokeScreen] //
+@PART[_Knes_Mireille_Engine_09375]:NEEDS[RealPlume,SmokeScreen,!Waterfall] //
 {
     @MODULE[ModuleEngines*]
     {

diff --git a/GameData/RealPlume-Stock/Knes/_Knes_Veronique_Engine_03125.cfg b/GameData/RealPlume-Stock/Knes/_Knes_Veronique_Engine_03125.cfg
@@ -1,4 +1,4 @@
-@PART[_Knes_Veronique_Engine_03125]:FOR[RealPlume]:NEEDS[SmokeScreen] // AGI-E "Vekin" Engine
+@PART[_Knes_Veronique_Engine_03125]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] // AGI-E "Vekin" Engine
 {
     PLUME
     {

diff --git a/GameData/RealPlume-Stock/Knes/_Knes_Vesta_Engine_0625.cfg b/GameData/RealPlume-Stock/Knes/_Knes_Vesta_Engine_0625.cfg
@@ -1,4 +1,4 @@
-@PART[_Knes_Vesta_Engine_0625]:FOR[RealPlume]:NEEDS[SmokeScreen] // LRBA-V "Gauntness" Engine
+@PART[_Knes_Vesta_Engine_0625]:FOR[RealPlume]:NEEDS[SmokeScreen,!Waterfall] // LRBA-V "Gauntness" Engine
 {
     PLUME
     {