diff options
| author | Roman Tetelman <kevlarman@gmail.com> | 2009-10-03 12:03:29 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:15:38 +0000 |
| commit | b323f7d847719130bc51281d18126c57c9ab7fc8 (patch) | |
| tree | 04b6d3ee3dd5115da97e6fef4fa011ea14b66fa1 | |
| parent | 54f57a94185ccf3bd0b9670cc3b592f78c9fbc91 (diff) | |
* alien buildable bleed particle no longer hardcoded
* tweaks to the human buildable bleed particle
| -rw-r--r-- | scripts/misc.particle | 67 | ||||
| -rw-r--r-- | src/cgame/cg_main.c | 4 |
2 files changed, 67 insertions, 4 deletions
diff --git a/scripts/misc.particle b/scripts/misc.particle index 92c9a459..40f3cc04 100644 --- a/scripts/misc.particle +++ b/scripts/misc.particle @@ -160,6 +160,69 @@ alienBleedPS thirdPersonOnly } +alienBuildableBleedPS +{ + ejector + { + particle + { + shader sync gfx/damage/blood.tga + displacement 0 0 0 0 + + velocityType normal + + velocityDir linear + + velocityMagnitude 15 + velocity 0 0 0 ~35 + + accelerationType static + accelerationDir linear + acceleration 0 0 -1 ~5 + accelerationMagnitude 25 + + radius 0 5 8 + alpha 250 .85 0 + rotation 0 ~-15 ~15 + bounce 0.0 + color 0 { 1.0 1.0 0.6 } - + + lifeTime 400~100 + } + + particle + { + shader sync gfx/damage/blood.tga + displacement 0 0 0 0 + + velocityType normal + + velocityDir linear + + velocityMagnitude 15 + velocity 0 0 0 ~35 + + accelerationType static + accelerationDir linear + acceleration 0 0 -1 ~5 + accelerationMagnitude 25 + + radius 0 5 8 + alpha 250 .85 0 + rotation 0 ~165 ~195 + bounce 0.0 + color 0 { 1.0 1.0 0.6 } - + + lifeTime 400~100 + } + + count 2 + delay 0 + period 0 - 0 + } +} + + humanBleedPS { ejector @@ -251,7 +314,7 @@ humanBuildableBleedPS bounce 0.0 color 0 { 0.8 0.2 0.2 } - - lifeTime 400~100 + lifeTime 200~50 } particle @@ -277,7 +340,7 @@ humanBuildableBleedPS bounce 0.0 color 0 { 0.8 0.2 0.2 } - - lifeTime 400~100 + lifeTime 200~50 } count 2 diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c index 8beb0245..96362760 100644 --- a/src/cgame/cg_main.c +++ b/src/cgame/cg_main.c @@ -788,8 +788,8 @@ static void CG_RegisterGraphics( void ) cgs.media.alienBuildableDestroyedPS = CG_RegisterParticleSystem( "alienBuildableDestroyedPS" ); cgs.media.humanBuildableBleedPS = CG_RegisterParticleSystem( "humanBuildableBleedPS"); - cgs.media.alienBuildableBleedPS = CG_RegisterParticleSystem( "alienBleedPS" ); - // use the regular alien bleed ps for buildables for now + cgs.media.alienBuildableBleedPS = CG_RegisterParticleSystem( "alienBuildableBleedPS" ); + cgs.media.alienBleedPS = CG_RegisterParticleSystem( "alienBleedPS" ); cgs.media.humanBleedPS = CG_RegisterParticleSystem( "humanBleedPS" ); |