Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2013-01-20 21:39:02 +0000
committerStijn Buys <ingar@osirion.org>2013-01-20 21:39:02 +0000
commitab3ec9e0c5879df1c8d9d95326bdff69a3541adc (patch)
treed6cf8b0c4db2eb4ebca5f66e8750c407c1554ff7 /base
parent8ff3f71b683e4793d88376f106790834cc7b11ea (diff)
Updated particle systems for the new particle system engine.
Diffstat (limited to 'base')
-rw-r--r--base/maps/merchant/matrix.map4
-rw-r--r--base/particles/dust_trail.ini21
-rw-r--r--base/particles/engine_exhaust.ini63
-rw-r--r--base/particles/engine_smoke.ini24
-rw-r--r--base/particles/explosion.ini17
-rw-r--r--base/particles/laser_trail.ini22
-rw-r--r--base/particles/metrion1.ini40
-rw-r--r--base/particles/neutron1.ini43
-rw-r--r--base/textures/fx/engine_ring.pngbin0 -> 2177 bytes
-rw-r--r--base/textures/fx/engine_smoke.pngbin2177 -> 33878 bytes
10 files changed, 104 insertions, 130 deletions
diff --git a/base/maps/merchant/matrix.map b/base/maps/merchant/matrix.map
index 8787bbe..0af223a 100644
--- a/base/maps/merchant/matrix.map
+++ b/base/maps/merchant/matrix.map
@@ -4347,7 +4347,7 @@ colors/grey25_shiny
"classname" "fx_particles"
"origin" "-672.000000 80.000000 0.000000"
"angle" "-179.999985"
-"script" "engine_exhaust"
+"script" "engine_smoke"
"scale" "2"
}
// entity 24
@@ -4355,7 +4355,7 @@ colors/grey25_shiny
"classname" "fx_particles"
"origin" "-672.000000 -80.000000 0.000000"
"angle" "-179.999985"
-"script" "engine_exhaust"
+"script" "engine_smoke"
"scale" "2"
}
// entity 25
diff --git a/base/particles/dust_trail.ini b/base/particles/dust_trail.ini
index 2e00d8f..59b08d8 100644
--- a/base/particles/dust_trail.ini
+++ b/base/particles/dust_trail.ini
@@ -4,18 +4,11 @@
;
[particles]
-type=trail
-texture=fx/engine_trail
-timeout=4.0
-eject=0.15
-radius=2
-alpha=0.25
-[particles]
-type=trail
-texture=fx/engine_trail
-timeout=4.0
-eject=0.15
-radius=2
-alpha=0.25
-roll=90
+ [ejector]
+ type=trail
+ texture=fx/engine_trail
+ lifespan=4000
+ interval=1500
+ radius=2
+ alpha=0.25
diff --git a/base/particles/engine_exhaust.ini b/base/particles/engine_exhaust.ini
index e461b04..c93c191 100644
--- a/base/particles/engine_exhaust.ini
+++ b/base/particles/engine_exhaust.ini
@@ -4,46 +4,25 @@
;
[particles]
-type=flame
-texture=fx/flame_plain
-timeout=0.12
-eject=0.02
-radius=18
-alpha=0.5
-offset=0.25
-engine=true
-[particles]
-type=trail
-texture=fx/engine_trail
-timeout=4.0
-eject=0.15
-radius=12
-alpha=0.5
-
-[particles]
-type=trail
-texture=fx/engine_trail
-timeout=4.0
-eject=0.15
-radius=12
-alpha=0.5
-roll=45
-
-[particles]
-type=trail
-texture=fx/engine_trail
-timeout=4.0
-eject=0.15
-radius=12
-alpha=0.5
-roll=90
-
-[particles]
-type=trail
-texture=fx/engine_trail
-timeout=4.0
-eject=0.15
-radius=12
-alpha=0.5
-roll=135
+ [ejector]
+ ; ejector type
+ type=trail
+ ; texture
+ texture=fx/engine_trail
+ ; lifespan of a particle, in milliseconds
+ lifespan=4000
+ ; ejection interval, in milliseconds
+ interval=150
+ ; radius begin middle end
+ radius= 2 8 2
+ ; alpha begin middle end
+ alpha=0.0 0.25 0.0
+ ; middle point offset [0-1}, default 0.5
+ offset=0.1
+ ; particle speed
+ speed=32
+ ; ejection cone size, in degrees
+ cone=0
+ ; only eject particles when thruster is used
+ thrust=true
diff --git a/base/particles/engine_smoke.ini b/base/particles/engine_smoke.ini
index df7ed2b..4fa39e2 100644
--- a/base/particles/engine_smoke.ini
+++ b/base/particles/engine_smoke.ini
@@ -1,13 +1,21 @@
;
-; particles/engine_smoke_tsukhan.ini
-; tsukhan engine smoke particles
+; particles/engine_smoke.ini
+; engine smoke particles
;
[particles]
-type=jet
-texture=fx/engine_smoke
-timeout=3.0
-eject=0.1
-radius=64
-alpha=0.8
+
+ [ejector]
+ type=spray
+ texture=fx/engine_smoke
+ lifespan=2500
+ interval=25
+ spawnradius=24
+ cone=15
+ radius=0 32
+ alpha=0.25 0
+ offset=0.25
+ speed=4
+ color=0.5 0.5 0.5
+ thrust=true
diff --git a/base/particles/explosion.ini b/base/particles/explosion.ini
index 551a6fb..396a94c 100644
--- a/base/particles/explosion.ini
+++ b/base/particles/explosion.ini
@@ -4,10 +4,13 @@
;
[particles]
-type=spray
-texture=fx/explosion03_15
-timeout=4
-eject=.5
-radius=2500
-alpha=0.5
-speed=0.1
+
+ [ejector]
+ type=spray
+ texture=fx/explosion03_15
+ lifespan=4000
+ interval=2500
+ radius=0 256
+ alpha=0.5
+ speed=0.15
+ \ No newline at end of file
diff --git a/base/particles/laser_trail.ini b/base/particles/laser_trail.ini
index cf7891f..285a1f3 100644
--- a/base/particles/laser_trail.ini
+++ b/base/particles/laser_trail.ini
@@ -4,18 +4,12 @@
;
[particles]
-type=trail
-texture=fx/engine_trail
-timeout=0.5
-eject=0.2
-radius=4
-alpha=0.5
-[particles]
-type=trail
-texture=fx/engine_trail
-timeout=0.5
-eject=0.2
-radius=4
-alpha=0.5
-roll=90 \ No newline at end of file
+ [ejector]
+ type=trail
+ texture=fx/engine_trail
+ lifespan=500
+ interval=200
+ radius=4 0
+ offset = 0.9
+ alpha=0.5
diff --git a/base/particles/metrion1.ini b/base/particles/metrion1.ini
index 6e156dd..2105a13 100644
--- a/base/particles/metrion1.ini
+++ b/base/particles/metrion1.ini
@@ -4,25 +4,29 @@
;
[particles]
-type=spray
-texture=fx/flare02
-timeout=0.25
-eject=0.005
-radius=8
-alpha=0.7
-speed=0.5
-entity=true
-[particles]
-type=spray
-texture=fx/flare02
-timeout=0.25
-eject=0.005
-radius=12
-alpha=0.7
-speed=0.2
-entity=false
-entitysecond=true
+ [ejector]
+ type=spray
+ texture=fx/flare02
+ spawnradius=12
+ lifespan=500
+ interval=2
+ radius=8 4
+ alpha=0.7 0
+ entity=true
+
+ [ejector]
+ type=spray
+ texture=fx/flare02
+ spawnradius=16
+ cone=15
+ speed=15
+ lifespan=750
+ interval=5
+ radius=12 2
+ alpha=0.7 0
+ entity=false
+ entitysecond=true
; [particles]
; type=trail
diff --git a/base/particles/neutron1.ini b/base/particles/neutron1.ini
index 4dc8139..a4176b9 100644
--- a/base/particles/neutron1.ini
+++ b/base/particles/neutron1.ini
@@ -4,30 +4,23 @@
;
[particles]
-type=spray
-texture=fx/flare01
-timeout=1.0
-eject=0.01
-radius=1
-alpha=0.8
-speed=0.05
-color=0 255 0
-[particles]
-type=trail
-texture=fx/engine_trail
-timeout=0.5
-eject=0.2
-radius=4
-alpha=0.5
-color=0 127 0
+ [ejector]
+ type=spray
+ texture=fx/flare01
+ lifespan=1000
+ interval=10
+ radius=8 2
+ alpha=0.75 0
+ speed=8
+ cone=150
+ color=0 255 0
-[particles]
-type=trail
-texture=fx/engine_trail
-timeout=0.5
-eject=0.2
-radius=4
-alpha=0.5
-roll=90
-color=0 127 0 \ No newline at end of file
+ [ejector]
+ type=trail
+ texture=fx/engine_trail
+ lifespan=500
+ interval=200
+ radius=4
+ alpha=0.5
+ color=0 196 0 \ No newline at end of file
diff --git a/base/textures/fx/engine_ring.png b/base/textures/fx/engine_ring.png
new file mode 100644
index 0000000..c157dae
--- /dev/null
+++ b/base/textures/fx/engine_ring.png
Binary files differ
diff --git a/base/textures/fx/engine_smoke.png b/base/textures/fx/engine_smoke.png
index c157dae..5c4415e 100644
--- a/base/textures/fx/engine_smoke.png
+++ b/base/textures/fx/engine_smoke.png
Binary files differ