From efe71bb0a6fb329bc49bb55bab187e36e5c21c58 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Sat, 28 Sep 2013 17:32:45 +0000 Subject: Updates engine particles. --- base/maps/colonial/tiger.map | 8 +-- base/maps/merchant/matrix.map | 8 +-- base/maps/merchant/scalar.map | 67 +++---------------- base/maps/merchant/vector.map | 132 +++++++++++--------------------------- base/particles/engine_exhaust.ini | 43 +++++++++++++ base/particles/engine_smoke.ini | 48 +++++++------- base/textures/fx/dust_trail.png | Bin 5325 -> 2369 bytes base/textures/fx/engine_trail.png | Bin 8211 -> 5325 bytes 8 files changed, 118 insertions(+), 188 deletions(-) (limited to 'base') diff --git a/base/maps/colonial/tiger.map b/base/maps/colonial/tiger.map index 6fcf905..018c90b 100644 --- a/base/maps/colonial/tiger.map +++ b/base/maps/colonial/tiger.map @@ -3476,7 +3476,7 @@ glass/dark "origin" "-456.000000 256.000000 -128.000000" "angle" "-179.999985" "script" "engine_exhaust" -"scale" "2" +"scale" ".5" } // entity 2 { @@ -3490,7 +3490,7 @@ glass/dark "origin" "-456.000000 256.000000 128.000000" "angle" "-179.999985" "script" "engine_exhaust" -"scale" "2" +"scale" ".5" } // entity 4 { @@ -3504,7 +3504,7 @@ glass/dark "origin" "-456.000000 -256.000000 128.000000" "angle" "-179.999985" "script" "engine_exhaust" -"scale" "2" +"scale" ".5" } // entity 6 { @@ -3518,7 +3518,7 @@ glass/dark "origin" "-456.000000 -256.000000 -128.000000" "angle" "-179.999985" "script" "engine_exhaust" -"scale" "2" +"scale" ".5" } // entity 8 { diff --git a/base/maps/merchant/matrix.map b/base/maps/merchant/matrix.map index 0af223a..0972572 100644 --- a/base/maps/merchant/matrix.map +++ b/base/maps/merchant/matrix.map @@ -4347,16 +4347,16 @@ colors/grey25_shiny "classname" "fx_particles" "origin" "-672.000000 80.000000 0.000000" "angle" "-179.999985" -"script" "engine_smoke" -"scale" "2" +"script" "engine_exhaust" +"scale" "1" } // entity 24 { "classname" "fx_particles" "origin" "-672.000000 -80.000000 0.000000" "angle" "-179.999985" -"script" "engine_smoke" -"scale" "2" +"script" "engine_exhaust" +"scale" "1" } // entity 25 { diff --git a/base/maps/merchant/scalar.map b/base/maps/merchant/scalar.map index f21c177..bf3f20a 100644 --- a/base/maps/merchant/scalar.map +++ b/base/maps/merchant/scalar.map @@ -1966,7 +1966,7 @@ colors/grey75 "origin" "-272.000000 0.000000 16.000000" "angle" "180.000000" "script" "engine_exhaust" -"scale" "1.5" +"scale" "1" } // entity 5 { @@ -2053,93 +2053,44 @@ colors/grey75 // entity 14 { "classname" "light" -"origin" "-300.000000 -8.000000 16.000000" -"light" "20" -"spawnflags" "4" -} -// entity 15 -{ -"classname" "light" -"origin" "-292.000000 0.000000 16.000000" -"light" "28" -"spawnflags" "4" -} -// entity 16 -{ -"classname" "light" -"origin" "-272.000000 -16.000000 16.000000" -"light" "36" -"spawnflags" "4" -} -// entity 17 -{ -"classname" "light" -"origin" "-272.000000 16.000000 16.000000" -"light" "36" -"spawnflags" "4" -} -// entity 18 -{ -"classname" "light" -"origin" "-288.000000 -12.000000 16.000000" -"light" "28" -"spawnflags" "4" -} -// entity 19 -{ -"classname" "light" -"origin" "-288.000000 12.000000 16.000000" -"light" "28" -"spawnflags" "4" -} -// entity 20 -{ -"classname" "light" -"origin" "-300.000000 8.000000 16.000000" -"light" "20" -"spawnflags" "4" -} -// entity 21 -{ -"classname" "light" -"origin" "-308.000000 0.000000 16.000000" +"origin" "-284.000000 0.000000 16.000000" "light" "12" "spawnflags" "4" } -// entity 22 +// entity 15 { "classname" "light" "origin" "-224.000000 -72.000000 -24.000000" "light" "16" "spawnflags" "4" } -// entity 23 +// entity 16 { "classname" "light" "origin" "-224.000000 72.000000 -24.000000" "light" "16" "spawnflags" "4" } -// entity 24 +// entity 17 { "classname" "location_cannon" "origin" "168.000000 0.000000 -8.000000" } -// entity 25 +// entity 18 { "classname" "fx_flare" "origin" "-66.000000 -72.000000 -24.000000" "spawnflags" "2" "radius" "16" } -// entity 26 +// entity 19 { "classname" "fx_flare" "origin" "-66.000000 72.000000 -24.000000" "spawnflags" "2" "radius" "16" } -// entity 27 +// entity 20 { "classname" "light" "origin" "-176.000000 32.000000 -26.000000" @@ -2148,7 +2099,7 @@ colors/grey75 "spawnflags" "1" "offset" ".65" } -// entity 28 +// entity 21 { "classname" "location_turret" "origin" "-176.000000 0.000000 -32.000000" diff --git a/base/maps/merchant/vector.map b/base/maps/merchant/vector.map index ed0cf6f..c5ba14a 100644 --- a/base/maps/merchant/vector.map +++ b/base/maps/merchant/vector.map @@ -4098,122 +4098,38 @@ detail/warn_16_decal_entitysecond // entity 9 { "classname" "fx_flare" -"origin" "-152 72 -8" -"spawnflags" "4" -"angle" "180" +"origin" "-168.000000 72.000000 -8.000000" +"angle" "-179.999985" "radius" "18" "flare" "1" -"_color" "1 1 0" -} -// entity 10 -{ -"classname" "fx_flare" -"origin" "-152 -72 -8" "spawnflags" "4" -"angle" "180" -"radius" "18" -"flare" "1" -"_color" "1 1 0" } -// entity 11 -{ -"classname" "fx_particles" -"origin" "-172 72 -8" -"angle" "180" -"script" "engine_exhaust" -"scale" "0.8" -} -// entity 12 +// entity 10 { "classname" "fx_particles" -"origin" "-172 -72 -8" -"angle" "180" +"origin" "-152.000000 72.000000 -8.000000" +"angle" "-179.999985" "script" "engine_exhaust" -"scale" "0.8" -} -// entity 13 -{ -"classname" "light" -"origin" "-180.000000 -72.000000 -8.000000" -"spawnflags" "4" -"light" "18" -} -// entity 14 -{ -"classname" "light" -"origin" "-180.000000 72.000000 -8.000000" -"spawnflags" "4" -"light" "18" -} -// entity 15 -{ -"classname" "light" -"origin" "-176.000000 -72.000000 -8.000000" -"spawnflags" "4" -"light" "18" -} -// entity 16 -{ -"classname" "light" -"origin" "-176.000000 72.000000 -8.000000" -"spawnflags" "4" -"light" "18" -} -// entity 17 -{ -"classname" "light" -"origin" "-188.000000 -72.000000 -8.000000" -"spawnflags" "4" -"light" "14" +"scale" "0.5" } -// entity 18 -{ -"classname" "light" -"origin" "-188.000000 72.000000 -8.000000" -"spawnflags" "4" -"light" "14" -} -// entity 19 -{ -"classname" "light" -"origin" "-184.000000 -72.000000 -8.000000" -"spawnflags" "4" -"light" "18" -} -// entity 20 +// entity 11 { "classname" "light" -"origin" "-184.000000 72.000000 -8.000000" +"origin" "-168.000000 72.000000 -8.000000" "spawnflags" "4" "light" "18" } -// entity 21 -{ -"classname" "fx_flare" -"origin" "-181.000000 72.000000 -8.000000" -"angle" "-179.999985" -"spawnflags" "4" -"radius" "20" -} -// entity 22 -{ -"classname" "fx_flare" -"origin" "-181.000000 -72.000000 -8.000000" -"angle" "180" -"spawnflags" "4" -"radius" "20" -} -// entity 23 +// entity 12 { "classname" "location_cannon" "origin" "160.000000 64.000000 24.000000" } -// entity 24 +// entity 13 { "classname" "location_cannon" "origin" "160.000000 -64.000000 24.000000" } -// entity 25 +// entity 14 { "classname" "light" "origin" "-112.000000 0.000000 50.000000" @@ -4222,7 +4138,7 @@ detail/warn_16_decal_entitysecond "spawnflags" "1" "offset" "0.8" } -// entity 26 +// entity 15 { "classname" "light" "origin" "-56.000000 0.000000 42.000000" @@ -4232,3 +4148,27 @@ detail/warn_16_decal_entitysecond "offset" "1.3" "frequency" "0.5" } +// entity 16 +{ +"classname" "fx_flare" +"origin" "-168.000000 -72.000000 -8.000000" +"angle" "-179.999985" +"radius" "18" +"flare" "1" +"spawnflags" "4" +} +// entity 17 +{ +"classname" "fx_particles" +"origin" "-152.000000 -72.000000 -8.000000" +"angle" "-179.999985" +"script" "engine_exhaust" +"scale" "0.5" +} +// entity 18 +{ +"classname" "light" +"origin" "-168.000000 -72.000000 -8.000000" +"light" "18" +"spawnflags" "4" +} diff --git a/base/particles/engine_exhaust.ini b/base/particles/engine_exhaust.ini index 39cd740..0fcf65c 100644 --- a/base/particles/engine_exhaust.ini +++ b/base/particles/engine_exhaust.ini @@ -5,6 +5,48 @@ [particles] + ; thruster fire effect + [sprites] + texture=fx/explosion01_15 + lifespan=2500 + interval=150 + radius=8 128 4 + ;64 256 16 + spawnradius=1.5 + alpha=0 0.5 0 + offset=.25 + speed=16 + cone=16 + color=1.0f 1.0f 0.9f + ; only eject particles when thruster is active + thrust=true + impulse=true + attached=true + + engine=true + colorsecond=1.0 1.0 1.0 + + ; impulse fire effect + [sprites] + texture=fx/explosion01_15 + lifespan=1000 + interval=50 + radius=64 148 2 + ;64 256 16 + spawnradius=1.5 + alpha=.25 0.5 0 + offset=.25 + ;speed=16 + cone=16 + color=1.0f 1.0f 0.9f + ; only eject particles when thruster is active + thrust=false + impulse=true + attached=false + + engine=true + colorsecond=1.0 1.0 1.0 + [trail] ; texture texture=fx/engine_trail @@ -26,3 +68,4 @@ cone=0 ; only eject particles when thruster is active thrust=true + impulse=true diff --git a/base/particles/engine_smoke.ini b/base/particles/engine_smoke.ini index b6c7a2d..5e45c1e 100644 --- a/base/particles/engine_smoke.ini +++ b/base/particles/engine_smoke.ini @@ -5,6 +5,28 @@ [particles] + ; thruster fire effect + [sprites] + texture=fx/explosion01_15 + lifespan=2500 + interval=150 + radius=8 128 4 + ;64 256 16 + spawnradius=1.5 + alpha=0 0.5 0 + offset=.25 + speed=16 + cone=16 + color=1.0f 1.0f 0.9f + ; only eject particles when thruster is active + thrust=true + impulse=true + attached=true + + engine=true + colorsecond=1.0 1.0 1.0 + + ; smoke trail [sprites] texture=fx/engine_smoke lifespan=2500 @@ -20,29 +42,3 @@ thrust=true impulse=false attached=false - - [sprites] - texture=fx/flare04 - spawnradius=30 - cone=0.5 - speed=64 96 - lifespan=1500 - interval=5 - radius=6 10 2 - alpha=0.5 0 - color=1 1 1 - attached=false - impulse=true - thrust=false - -; [flares] -; texture=fx/engine_ring -; speed=128 -; lifespan=1000 -; interval=250 -; radius=30 32 -; alpha=0.5 0 -; color=0 1 1 -; impulse=true -; thrust=false -; attached=true diff --git a/base/textures/fx/dust_trail.png b/base/textures/fx/dust_trail.png index 107d609..da72ab6 100644 Binary files a/base/textures/fx/dust_trail.png and b/base/textures/fx/dust_trail.png differ diff --git a/base/textures/fx/engine_trail.png b/base/textures/fx/engine_trail.png index 828099c..13bc194 100644 Binary files a/base/textures/fx/engine_trail.png and b/base/textures/fx/engine_trail.png differ -- cgit v1.2.3