10 files changed, 56 insertions, 84 deletions

diff --git a/base/particles/dust_trail.ini b/base/particles/dust_trail.ini
index 59b08d8..75591c0 100644
--- a/base/particles/dust_trail.ini
+++ b/base/particles/dust_trail.ini
@@ -5,8 +5,7 @@
 
 [particles]
 
-	[ejector]
-	type=trail
+	[trail]
 	texture=fx/engine_trail
 	lifespan=4000
 	interval=1500
diff --git a/base/particles/engine_exhaust.ini b/base/particles/engine_exhaust.ini
index c93c191..6ce7231 100644
--- a/base/particles/engine_exhaust.ini
+++ b/base/particles/engine_exhaust.ini
@@ -5,9 +5,7 @@
 
 [particles]
 
-	[ejector]
-	; ejector type
-	type=trail
+	[trail]
 	; texture
 	texture=fx/engine_trail
 	; lifespan of a particle, in milliseconds
diff --git a/base/particles/engine_exhaust_tsukhan.ini b/base/particles/engine_exhaust_tsukhan.ini
index 3745d2c..f546fcd 100644
--- a/base/particles/engine_exhaust_tsukhan.ini
+++ b/base/particles/engine_exhaust_tsukhan.ini
@@ -4,44 +4,22 @@
 ;
 
 [particles]
-type=flame
-texture=fx/flame_tsukhan
-timeout=1.0
-eject=0.01
-radius=32
-alpha=0.5
 
-[particles]
-type=trail
-texture=fx/engine_trail_tsukhan
-timeout=4.0
-eject=0.15
-radius=12
-alpha=1.0
-
-[particles]
-type=trail
-texture=fx/engine_trail_tsukhan
-timeout=4.0
-eject=0.15
-radius=12
-alpha=1.0
-roll=45
+	[flame]
+	texture=fx/flame_tsukhan
+	timeout=1.0
+	eject=0.01
+	radius=32
+	alpha=0.5
 
-[particles]
-type=trail
-texture=fx/engine_trail_tsukhan
-timeout=4.0
-eject=0.15
-radius=12
-alpha=1.0
-roll=90
-
-[particles]
-type=trail
-texture=fx/engine_trail_tsukhan
-timeout=4.0
-eject=0.15
-radius=12
-alpha=1.0
-roll=135
+	[trail]
+	; particle texture
+	texture=fx/engine_trail_tsukhan
+	; particle lifespan, in milliseconds
+	lifespan=4000
+	; ejector interval, in milliseconds
+	eject=150
+	; particle radius
+	radius=4
+	; particle alpha [start] [end]
+	alpha=1.0 0.0
diff --git a/base/particles/engine_smoke.ini b/base/particles/engine_smoke.ini
index 3b84611..759a1e8 100644
--- a/base/particles/engine_smoke.ini
+++ b/base/particles/engine_smoke.ini
@@ -5,8 +5,7 @@
 
 [particles]
 
-	[ejector]
-	type=sprite
+	[sprites]
 	texture=fx/engine_smoke
 	lifespan=2500
 	interval=25
@@ -18,22 +17,31 @@
 	speed=4
 	color=0.5 0.5 0.5
 	thrust=true
+	impulse=false
 	attached=false
 
+	[sprites]
+	texture=fx/flare04
+	spawnradius=30
+	cone=0.5
+	speed=64 96
+	lifespan=1500
+	interval=4
+	radius=6 10 2
+	alpha=0.5 0
+	color=1 1 1
+	attached=true
+	impulse=true
+	thrust=false
 	
-; example impulse speed star ejector
-; note: looks better if the smoke particle system is attached as well
-; 	[ejector]
-; 	type=sprite
-; 	texture=fx/flare04
-; 	spawnradius=32
-; 	speed=128
-; 	lifespan=1500
-; 	interval=4
-; 	radius=6 10 2
-; 	alpha=0.5 0
-; 	color=1 1 1
-; 	attached=true
-; 	impulse=true
-; 	engine=false
-; 	
\ No newline at end of file
+	[flares]
+	texture=fx/engine_ring
+	speed=128
+	lifespan=1000
+	interval=250
+	radius=30 32
+	alpha=0.25 0
+	color=0 1 1
+	impulse=true
+	thrust=false
+	attached=true
\ No newline at end of file
diff --git a/base/particles/engine_trail.ini b/base/particles/engine_trail.ini
index 9ca30db..5a08f84 100644
--- a/base/particles/engine_trail.ini
+++ b/base/particles/engine_trail.ini
@@ -5,8 +5,7 @@
 
 [particles]
 
-	[ejector]
-	type=trail
+	[trail]
 	texture=fx/engine_trail
 	lifespan=4000
 	interval=1500
diff --git a/base/particles/explosion.ini b/base/particles/explosion.ini
index 5541a0c..7ac644a 100644
--- a/base/particles/explosion.ini
+++ b/base/particles/explosion.ini
@@ -5,8 +5,7 @@
 
 [particles]
 
-	[ejector]
-	type=sprite
+	[sprites]
 	texture=fx/explosion03_15
 	lifespan=4000
 	interval=2500
diff --git a/base/particles/laser_trail.ini b/base/particles/laser_trail.ini
index 285a1f3..4dbf2b7 100644
--- a/base/particles/laser_trail.ini
+++ b/base/particles/laser_trail.ini
@@ -5,8 +5,7 @@
 
 [particles]
 
-	[ejector]
-	type=trail
+	[trail]
 	texture=fx/engine_trail
 	lifespan=500
 	interval=200
diff --git a/base/particles/metrion1.ini b/base/particles/metrion1.ini
index afc090b..56e6745 100644
--- a/base/particles/metrion1.ini
+++ b/base/particles/metrion1.ini
@@ -5,8 +5,7 @@
 
 [particles]
 
-	[ejector]
-	type=sprite
+	[sprites]
 	texture=fx/flare02
 	spawnradius=12
 	lifespan=500
@@ -15,8 +14,7 @@
 	alpha=0.7 0
 	entity=true
 
-	[ejector]
-	type=sprite
+	[sprites]
 	texture=fx/flare02
 	spawnradius=16
 	cone=15
diff --git a/base/particles/neutron1.ini b/base/particles/neutron1.ini
index d07af4f..11c9209 100644
--- a/base/particles/neutron1.ini
+++ b/base/particles/neutron1.ini
@@ -5,8 +5,7 @@
 
 [particles]
 
-	[ejector]
-	type=sprite
+	[sprites]
 	texture=fx/flare01
 	lifespan=1000
 	interval=50
@@ -16,8 +15,7 @@
 	cone=150
 	color=0 255 0
 
-	[ejector]
-	type=trail
+	[trail]
 	texture=fx/engine_trail
 	lifespan=500
 	interval=200
diff --git a/base/particles/neutron2.ini b/base/particles/neutron2.ini
index a8ba2bb..46e2762 100644
--- a/base/particles/neutron2.ini
+++ b/base/particles/neutron2.ini
@@ -5,8 +5,7 @@
 
 [particles]
 
-	[ejector]
-	type=sprite
+	[sprites]
 	texture=fx/flare01
 	lifespan=1000
 	interval=50
@@ -16,8 +15,7 @@
 	cone=150
 	color=0 255 0
 
-	[ejector]
-	type=trail
+	[trail]
 	texture=fx/engine_trail
 	lifespan=500
 	interval=200
@@ -25,8 +23,7 @@
 	alpha=0.5
 	color=0 196 0
 	
-	[ejector]
-	type=sprite
+	[sprites]
 	texture=fx/flare04
 	cone=30
 	speed=128
@@ -37,8 +34,7 @@
 	color=0 255 0
 	attached=true
 	
-	[ejector]
-	type=flare
+	[flares]
 	texture=fx/engine_ring
 	speed=128
 	lifespan=1500