Merge pull request #3 from JadeOfMaar/master

Fix redundancies
linuxgurugamer · May 22, 2020 · b2dd887 · b2dd887
2 parents 1153803 + 46fb6c6
commit b2dd887
Show file tree

Hide file tree

Showing 10 changed files with 735 additions and 1,993 deletions.
diff --git a/GameData/JetSoundsUpdated/Patches/Goliath.cfg b/GameData/JetSoundsUpdated/Patches/Goliath.cfg
@@ -68,8 +68,9 @@
 {
 	@EFFECTS
 	{		
-		flameout
+		%flameout
 		{
+			!AUDIO,* {}
 			AUDIO
 			{
 				channel = Ship
@@ -82,129 +83,13 @@
 	}
 }
 
-@PART[turboFanSize2]:NEEDS[RealPlume]:FOR[zzJetSounds]
+@PART[turboFanSize2]:AFTER[zzRealPlume]
 {
-    %EFFECTS
-    {
-        %Turbofan
-        {
-            MODEL_MULTI_SHURIKEN_PERSIST
-            {
-
-                transformName = #$../../../PLUME[Turbofan]/transformName$
-                localRotation = #$../../../PLUME[Turbofan]/localRotation[0]$,$../../../PLUME[Turbofan]/localRotation[1]$,$../../../PLUME[Turbofan]/localRotation[2]$
-                localPosition = #$../../../PLUME[Turbofan]/plumePosition[0]$,$../../../PLUME[Turbofan]/plumePosition[1]$,$../../../PLUME[Turbofan]/plumePosition[2]$
-                fixedScale    = #$../../../PLUME[Turbofan]/plumeScale$
-                energy        = #$../../../PLUME[Turbofan]/energy$
-                speed         = #$../../../PLUME[Turbofan]/speed$
-                emissionMult  = #$../../../PLUME[Turbofan]/emissionMult$
-                //
-                name = plume
-                modelName = RealPlume/MP_Nazari_FX/flamejet3
-                speed = 0.0 1.45
-                speed = 1.0 1.45
-                energy = 0.0 0.05
-                energy = 0.5 0.4
-                energy = 1.0 0.7
-                fixedEmissions = false
-                randConeEmit
-                {
-                  density = 1 0
-                  density = 0 0.5
-                }
-                energy
-                {
-                  density = 1 0.5
-                  density = 0 0.2
-                }
-                emission
-                {
-                  density = 1 1
-                  density = 0 0.5
-                  power = 0.0 0.0
-                  power = 0.42 0.0
-                  power = 0.54 1.55
-                  power = 1.0 1.78
-                }
-                speed
-                {
-                  density = 1 1.2
-                  density = 0 1.5
-                }
-            }
-        }
-        %Turbofan-Spool
-        {
-            MODEL_MULTI_SHURIKEN_PERSIST
-            {
-                //Get the inputs from the other config.
-                transformName = #$../../../PLUME[Turbofan]/transformName$
-                fixedScale    = #$../../../PLUME[Turbofan]/smokeScale$
-                localPosition = #$../../../PLUME[Turbofan]/smokePosition[0]$,$../../../PLUME[Turbofan]/smokePosition[1]$,$../../../PLUME[Turbofan]/smokePosition[2]$
-                //
-                name = smoke
-                modelName = RealPlume/MP_Nazari_FX/smokejet
-                fixedEmissions = false
-                sizeClamp = 50
-                randomInitalVelocityOffsetMaxRadius = 0.5
-                logGrow
-                {
-                  density = 1.0 2
-                  density = 0.1 20
-                  density = 0.0 2
-                }
-                logGrowScale
-                {
-                  density = 1.0 0.0
-                  density = 0.8 2
-                  density = 0.46 3
-                  density = 0.2 3
-                  density = 0.1 4
-                  density = 0.0 5
-                }
-                linGrow
-                {
-                  density = 1.0 0
-                  density = 0.46 0.0
-                  density = 0.2 0
-                  density = 0.05 30
-                  density = 0.0 40
-                }
-                grow
-                {
-                  density = 1 0
-                  density = 0.2 0
-                  density = 0.1 4
-                  density = 0 9
-                }
-                speed
-                {
-                  density = 1.0 1.7
-                  density = 0.46 1.7
-                  density = 0.2 1.5
-                  density = 0.05 1.5
-                  density = 0.0 1.5
-                }
-                emission
-                {
-                   density = 1.0 2
-                  density = 0.8 1.2
-                  density = 0.2 1
-                  density = 0.1 1.2
-                  density = 0.05 1.5
-                  density = 0.0 1.7
-                  power = 1 1
-                  power = 0.01 0.2
-                  power = 0 0
-                }
-                energy
-                {
-                  density = 1.0 2
-                  density = 0.3 2
-                  density = 0.05 1
-                  density = 0.0 0
-                }
-            }
+	%EFFECTS
+	{
+		%Turbofan-Spool
+		{
+			!AUDIO,* {}
 			AUDIO
 			{
 				channel = Ship
@@ -228,9 +113,10 @@
 				pitch = 1.0 1.0
 				loop = true
 			}
-        }
-		engage
+		}
+		%engage
 		{
+			!AUDIO,* {}
 			AUDIO
 			{
 				channel = Ship
@@ -240,8 +126,9 @@
 				loop = false
 			}
 		}
-		disengage
+		%disengage
 		{
+			!AUDIO,* {}
 			AUDIO
 			{
 				channel = Ship
@@ -251,22 +138,5 @@
 				loop = false
 			}
 		}
-		flameout
-		{
-			PREFAB_PARTICLE
-			{
-				prefabName = fx_exhaustSparks_flameout_2
-				transformName = smokePoint
-				oneShot = true
-			}
-			AUDIO
-			{
-				channel = Ship
-				clip = sound_explosion_low
-				volume = 1.0
-				pitch = 2.0
-				loop = false
-			}
-		}
-    }
+	}
 }