From be746d32138f6df755ffad05835d0b4e679acb32 Mon Sep 17 00:00:00 2001 From: Evan Goers Date: Fri, 18 Oct 2013 23:01:51 +0000 Subject: Added wip dagon engine particles. Updated all relevent models to use them. Modified other engine particles. --- base/maps/dagon/raptor.map | 30 ------- base/maps/dagon/sections/chimera_engine_large.map | 9 ++- base/maps/dagon/sections/chimera_engine_medium.map | 15 ++-- base/maps/dagon/sections/chimera_engine_small.map | 17 ++-- base/maps/dagon/sections/gorgon_engine.map | 56 +++---------- base/maps/dagon/sections/leo_engine.map | 12 +-- base/particles/engine_exhaust.ini | 20 +++++ base/particles/engine_exhaust_dagon.ini | 91 ++++++++++++++++++++++ base/particles/engine_exhaust_tsukhan.ini | 71 +++++++++++++---- 9 files changed, 201 insertions(+), 120 deletions(-) create mode 100644 base/particles/engine_exhaust_dagon.ini diff --git a/base/maps/dagon/raptor.map b/base/maps/dagon/raptor.map index 3051362..1889f35 100644 --- a/base/maps/dagon/raptor.map +++ b/base/maps/dagon/raptor.map @@ -3615,33 +3615,3 @@ detail/simple_decal "origin" "-144.000000 -109.000000 -1.000000" "script" "dust_trail" } -// entity 11 -{ -"classname" "fx_particles" -"origin" "-112.000000 80.000000 -60.000000" -"spawnflags" "4" -"script" "engine_exhaust" -"scale" "0.5" -} -// entity 12 -{ -"classname" "fx_particles" -"origin" "-88.000000 52.000000 -4.000000" -"spawnflags" "4" -"script" "engine_exhaust" -} -// entity 13 -{ -"classname" "fx_particles" -"origin" "-88.000000 -52.000000 -4.000000" -"spawnflags" "4" -"script" "engine_exhaust" -} -// entity 14 -{ -"classname" "fx_particles" -"origin" "-112.000000 -80.000000 -60.000000" -"spawnflags" "4" -"script" "engine_exhaust" -"scale" "0.5" -} diff --git a/base/maps/dagon/sections/chimera_engine_large.map b/base/maps/dagon/sections/chimera_engine_large.map index 0def1bb..b5be831 100644 --- a/base/maps/dagon/sections/chimera_engine_large.map +++ b/base/maps/dagon/sections/chimera_engine_large.map @@ -172,8 +172,9 @@ colors/grey25 } // entity 3 { -"classname" "light" -"origin" "-32.000000 0.000000 0.000000" -"light" "32" -"spawnflags" "4" +"classname" "fx_particles" +"origin" "-8.000000 0.000000 0.000000" +"angle" "-179.999985" +"script" "engine_exhaust_dagon" +"scale" "2.0" } diff --git a/base/maps/dagon/sections/chimera_engine_medium.map b/base/maps/dagon/sections/chimera_engine_medium.map index 35a322d..ec9cffc 100644 --- a/base/maps/dagon/sections/chimera_engine_medium.map +++ b/base/maps/dagon/sections/chimera_engine_medium.map @@ -158,13 +158,6 @@ colors/grey25 } // entity 2 { -"classname" "light" -"origin" "-24.000000 0.000000 0.000000" -"light" "24" -"spawnflags" "4" -} -// entity 3 -{ "classname" "fx_flare" "origin" "-34.000000 0.000000 0.000000" "angle" "-179.999985" @@ -172,3 +165,11 @@ colors/grey25 "flare" "4" "radius" "80" } +// entity 3 +{ +"classname" "fx_particles" +"origin" "-8.000000 0.000000 0.000000" +"angle" "-179.999985" +"script" "engine_exhaust_dagon" +"scale" "1.25" +} diff --git a/base/maps/dagon/sections/chimera_engine_small.map b/base/maps/dagon/sections/chimera_engine_small.map index 2c7a0d1..aaf0dab 100644 --- a/base/maps/dagon/sections/chimera_engine_small.map +++ b/base/maps/dagon/sections/chimera_engine_small.map @@ -117,20 +117,13 @@ colors/grey25 } // entity 1 { -"classname" "light" -"origin" "-26.000000 0.000000 0.000000" -"light" "16" -"spawnflags" "4" -} -// entity 2 -{ "classname" "fx_flare" "origin" "-10.000000 0.000000 0.000000" "angle" "-179.999985" "radius" "12" "spawnflags" "4" } -// entity 3 +// entity 2 { "classname" "fx_flare" "origin" "-28.000000 0.000000 0.000000" @@ -139,3 +132,11 @@ colors/grey25 "flare" "4" "radius" "32" } +// entity 3 +{ +"classname" "fx_particles" +"origin" "-16.000000 0.000000 0.000000" +"angle" "-179.999985" +"script" "engine_exhaust_dagon" +"scale" "0.75" +} diff --git a/base/maps/dagon/sections/gorgon_engine.map b/base/maps/dagon/sections/gorgon_engine.map index 682c980..6d78e5b 100644 --- a/base/maps/dagon/sections/gorgon_engine.map +++ b/base/maps/dagon/sections/gorgon_engine.map @@ -364,57 +364,19 @@ } // entity 1 { -"classname" "light" -"origin" "-8.000000 0.000000 -28.000000" -"light" "16" -"spawnflags" "4" -} -// entity 2 -{ -"classname" "light" -"origin" "-22.000000 0.000000 28.000000" -"light" "16" -"spawnflags" "4" -} -// entity 3 -{ -"classname" "light" -"origin" "-14.000000 0.000000 20.000000" -"light" "18" -"spawnflags" "4" -} -// entity 4 -{ -"classname" "light" -"origin" "-4.000000 0.000000 -20.000000" -"light" "18" -"spawnflags" "4" -} -// entity 5 -{ -"classname" "light" -"origin" "-18.000000 0.000000 36.000000" -"light" "16" -"spawnflags" "4" -} -// entity 6 -{ -"classname" "light" -"origin" "0.000000 0.000000 -36.000000" -"light" "16" -"spawnflags" "4" -} -// entity 7 -{ "classname" "fx_particles" -"origin" "-18.000000 0.000000 28.000000" -"script" "engine_exhaust" +"origin" "-11.000000 0.000000 28.000000" +"script" "engine_exhaust_dagon" "spawnflags" "4" +"angle" "-179.999985" +"scale" "0.75" } -// entity 8 +// entity 2 { "classname" "fx_particles" -"origin" "-4.000000 0.000000 -28.000000" -"script" "engine_exhaust" +"origin" "3.000000 0.000000 -28.000000" +"script" "engine_exhaust_dagon" "spawnflags" "4" +"angle" "-179.999985" +"scale" "0.75" } diff --git a/base/maps/dagon/sections/leo_engine.map b/base/maps/dagon/sections/leo_engine.map index a9270e7..33c6a61 100644 --- a/base/maps/dagon/sections/leo_engine.map +++ b/base/maps/dagon/sections/leo_engine.map @@ -111,25 +111,17 @@ colors/grey25 } // entity 2 { -"classname" "light" -"origin" "-5.000000 0.000000 0.000000" -"light" "4" -"spawnflags" "4" -} -// entity 3 -{ "classname" "fx_flare" "origin" "-3.000000 0.000000 0.000000" "angle" "-180.000000" "spawnflags" "4" "radius" "3" } -// entity 4 +// entity 3 { "classname" "fx_particles" "origin" "-2.500000 0.000000 0.000000" "angle" "-180.000000" -"script" "engine_exhaust" +"script" "engine_exhaust_dagon" "scale" "0.25" -"spawnflags" "4" } diff --git a/base/particles/engine_exhaust.ini b/base/particles/engine_exhaust.ini index e1770cf..a7d2eb3 100644 --- a/base/particles/engine_exhaust.ini +++ b/base/particles/engine_exhaust.ini @@ -23,6 +23,26 @@ impulse=true attached=true + engine=true + colorsecond=1.0 1.0 1.0 + + [sprites] + texture=fx/engine_exhaust + lifespan=5000 + interval=25 + radius=2 32 1 + ;64 256 16 + spawnradius=1.5 + alpha=1 0.5 0 + offset=0 + speed=16 + cone=0 + 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 diff --git a/base/particles/engine_exhaust_dagon.ini b/base/particles/engine_exhaust_dagon.ini new file mode 100644 index 0000000..b3a187e --- /dev/null +++ b/base/particles/engine_exhaust_dagon.ini @@ -0,0 +1,91 @@ +; +; particles/engine_exhaust.ini +; default engine exhaust particles +; + +[particles] + + ; thruster fire effect + [sprites] + texture=fx/engine_smoke + lifespan=2500 + interval=150 + radius=2 32 1 + ;64 256 16 + spawnradius=2 + alpha=0 0.5 0 + offset=.25 + speed=16 + cone=16 + color=0.0f 1.0f 0.0f + ; only eject particles when thruster is active + thrust=true + impulse=true + attached=true + + engine=true + colorsecond=0.0 1.0 0.0 + + [sprites] + texture=fx/engine_exhaust + lifespan=5000 + interval=25 + radius=2 32 1 + ;64 256 16 + spawnradius=1.5 + alpha=1 0.5 0 + offset=0 + speed=16 + cone=0 + color=0.0f 1.0f 0.0f + ; only eject particles when thruster is active + thrust=true + impulse=true + attached=true + + engine=true + colorsecond=0.0 1.0 0.0 + + ; impulse fire effect + [sprites] + texture=fx/engine_smoke + lifespan=3000 + interval=50 + radius=64 148 2 + ;64 256 16 + spawnradius=1.5 + alpha=.25 0.5 0 + offset=.25 + speed=18 + cone=16 + color=0.0f 1.0f 0.0f + ; only eject particles when thruster is active + thrust=false + impulse=true + attached=true + + engine=true + colorsecond=0.0 1.0 0.0 + + [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.5 0.0 + ; middle point offset [0-1}, default 0.5 + offset=0.1 + ; particle color + color=224 255 224 + ; particle speed + speed=32 + ; ejection cone size, in degrees + cone=0 + ; only eject particles when thruster is active + thrust=true + impulse=true diff --git a/base/particles/engine_exhaust_tsukhan.ini b/base/particles/engine_exhaust_tsukhan.ini index a019bbe..28f6ded 100644 --- a/base/particles/engine_exhaust_tsukhan.ini +++ b/base/particles/engine_exhaust_tsukhan.ini @@ -5,21 +5,64 @@ [particles] -; [flame] -; texture=fx/flame_tsukhan -; timeout=1.0 -; interval=50 -; radius=32 -; alpha=0.5 - + [sprites] + texture=fx/flare01 + lifespan=5000 + interval=10 + radius=2 32 1 + ;64 256 16 + spawnradius=1.5 + alpha=1 0.5 0 + offset=0 + speed=32 + cone=0 + color=0.0f 0.0f 0.0f + thrust=true + impulse=true + attached=true + engine=true + colorsecond=0.3f 0.0f 0.4f + + ; impulse fire effect + [sprites] + texture=fx/flare03 + lifespan=3000 + interval=50 + radius=64 148 2 + ;64 256 16 + spawnradius=1.5 + alpha=.25 0.5 0 + offset=0 + speed=18 + cone=16 + color=1.0f 1.0f 0.9f + ; only eject particles when impulse is active + thrust=false + impulse=true + attached=true + + engine=true + colorsecond=1.0 1.0 1.0 + [trail] - ; particle texture + ; texture texture=fx/engine_trail_tsukhan - ; particle lifespan, in milliseconds + ; lifespan of a particle, in milliseconds lifespan=4000 - ; ejector interval, in milliseconds + ; ejection interval, in milliseconds interval=150 - ; particle radius - radius=4 - ; particle alpha [start] [end] - alpha=1.0 0.0 + ; radius begin middle end + radius= 2 8 2 + ; alpha begin middle end + alpha=0.0 0.5 0.0 + ; middle point offset [0-1}, default 0.5 + offset=0.1 + ; particle color + color=255 255 255 + ; particle speed + speed=32 + ; ejection cone size, in degrees + cone=0 + ; only eject particles when thruster is active + thrust=true + impulse=true -- cgit v1.2.3