From 7145527a1ca44c6afd20adf7e369f5f6f983047b Mon Sep 17 00:00:00 2001 From: Roman Tetelman Date: Sat, 3 Oct 2009 11:54:20 +0000 Subject: * mass driver no longer creates a particle when it hits something (same as upstream) * the whitespace police strike again --- models/weapons/lcannon/weapon.cfg | 62 ++++++++++++++++++------------------- models/weapons/level0/weapon.cfg | 18 +++++------ models/weapons/level3upg/weapon.cfg | 56 ++++++++++++++++----------------- models/weapons/mdriver/weapon.cfg | 23 +++++++------- models/weapons/prifle/weapon.cfg | 31 ++++++++++--------- models/weapons/psaw/weapon.cfg | 52 +++++++------------------------ 6 files changed, 107 insertions(+), 135 deletions(-) (limited to 'models/weapons') diff --git a/models/weapons/lcannon/weapon.cfg b/models/weapons/lcannon/weapon.cfg index e1977d43..be3ae308 100644 --- a/models/weapons/lcannon/weapon.cfg +++ b/models/weapons/lcannon/weapon.cfg @@ -1,33 +1,33 @@ -weaponModel models/weapons/lcannon/lcannon.md3 -icon icons/iconw_lucifer -crosshair 48 gfx/2d/crosshair-lcannon_s -idleSound models/weapons/lcannon/idle.wav - -primary -{ - missileSprite 16 gfx/lcannon/primary - missileSpriteCharge 0.25 - missileSound models/weapons/lcannon/missle.wav +weaponModel models/weapons/lcannon/lcannon.md3 +icon icons/iconw_lucifer +crosshair 48 gfx/2d/crosshair-lcannon_s +idleSound models/weapons/lcannon/idle.wav + +primary +{ + missileSprite 16 gfx/lcannon/primary + missileSpriteCharge 0.25 + missileSound models/weapons/lcannon/missle.wav missileParticleSystem models/weapons/lcannon/missilePS - - flashDlightColor 1.0 1.0 0.0 - flashSound 0 models/weapons/lcannon/flash0.wav - - impactMark 32 gfx/marks/bullet_mrk - impactSound 0 models/weapons/lcannon/impact0.wav - impactParticleSystem models/weapons/lcannon/impactPS -} - -secondary -{ - missileSprite 16 gfx/lcannon/primary - missileSound models/weapons/lcannon/missle.wav + + flashDlightColor 1.0 1.0 0.0 + flashSound 0 models/weapons/lcannon/flash0.wav + + impactMark 32 gfx/marks/bullet_mrk + impactSound 0 models/weapons/lcannon/impact0.wav + impactParticleSystem models/weapons/lcannon/impactPS +} + +secondary +{ + missileSprite 16 gfx/lcannon/primary + missileSound models/weapons/lcannon/missle.wav missileParticleSystem models/weapons/lcannon/secondaryMissilePS - - flashDlightColor 1.0 1.0 0.0 - flashSound 0 models/weapons/lcannon/flash0.wav - - impactMark 8 gfx/marks/bullet_mrk - impactSound 0 models/weapons/lcannon/impact0.wav - impactParticleSystem models/weapons/lcannon/secondaryImpactPS -} + + flashDlightColor 1.0 1.0 0.0 + flashSound 0 models/weapons/lcannon/flash0.wav + + impactMark 8 gfx/marks/bullet_mrk + impactSound 0 models/weapons/lcannon/impact0.wav + impactParticleSystem models/weapons/lcannon/secondaryImpactPS +} diff --git a/models/weapons/level0/weapon.cfg b/models/weapons/level0/weapon.cfg index 15f77ea0..2e525518 100644 --- a/models/weapons/level0/weapon.cfg +++ b/models/weapons/level0/weapon.cfg @@ -1,9 +1,9 @@ -disableIn3rdPerson -crosshair 15 gfx/2d/crosshair-alien_s - -icon icons/icona_lev0 - -primary -{ - flashSound 0 models/weapons/level0/flash0.wav -} +disableIn3rdPerson +crosshair 15 gfx/2d/crosshair-alien_s + +icon icons/icona_lev0 + +primary +{ + flashSound 0 models/weapons/level0/flash0.wav +} diff --git a/models/weapons/level3upg/weapon.cfg b/models/weapons/level3upg/weapon.cfg index ae1c0656..51192f79 100644 --- a/models/weapons/level3upg/weapon.cfg +++ b/models/weapons/level3upg/weapon.cfg @@ -1,28 +1,28 @@ -disableIn3rdPerson - -icon icons/icona_lev3 -crosshair 15 gfx/2d/crosshair-alien_s - -primary -{ - flashSound 0 models/weapons/level3/flash0.wav - impactFleshSound 0 models/weapons/level3/impactflesh0.wav - alwaysImpact -} - -secondary -{ - flashSound 0 models/weapons/level3/pounce.wav -} - -tertiary -{ - flashSound 0 models/weapons/level3upg/flash0.wav - - missileModel models/weapons/level3upg/missile.md3 - missileSound models/weapons/level3upg/missile.wav - - impactMark 30 gfx/marks/bullet_mrk - impactSound 0 models/weapons/rifle/ricochet0.wav - impactParticleSystem models/weapons/level3upg/impactPS -} +disableIn3rdPerson + +icon icons/icona_lev3 +crosshair 15 gfx/2d/crosshair-alien_s + +primary +{ + flashSound 0 models/weapons/level3/flash0.wav + impactFleshSound 0 models/weapons/level3/impactflesh0.wav + alwaysImpact +} + +secondary +{ + flashSound 0 models/weapons/level3/pounce.wav +} + +tertiary +{ + flashSound 0 models/weapons/level3upg/flash0.wav + + missileModel models/weapons/level3upg/missile.md3 + missileSound models/weapons/level3upg/missile.wav + + impactMark 30 gfx/marks/bullet_mrk + impactSound 0 models/weapons/rifle/ricochet0.wav + impactParticleSystem models/weapons/level3upg/impactPS +} diff --git a/models/weapons/mdriver/weapon.cfg b/models/weapons/mdriver/weapon.cfg index 2c74131f..938e7ae0 100644 --- a/models/weapons/mdriver/weapon.cfg +++ b/models/weapons/mdriver/weapon.cfg @@ -1,13 +1,12 @@ -weaponModel models/weapons/mdriver/mdriver.md3 -icon icons/iconw_driver -crosshair 24 gfx/2d/crosshair-mdriver_s - -primary -{ - flashDlightColor 0.0 1.0 0.0 - flashSound 0 models/weapons/mdriver/flash0.wav - - impactMark 6 gfx/marks/bullet_mrk +weaponModel models/weapons/mdriver/mdriver.md3 +icon icons/iconw_driver +crosshair 24 gfx/2d/crosshair-mdriver_s + +primary +{ + flashDlightColor 0.0 1.0 0.0 + flashSound 0 models/weapons/mdriver/flash0.wav + + impactMark 6 gfx/marks/bullet_mrk impactParticleSystem models/weapons/mdriver/impactPS - alwaysImpact -} +} diff --git a/models/weapons/prifle/weapon.cfg b/models/weapons/prifle/weapon.cfg index fb3ade04..ca99f4fb 100644 --- a/models/weapons/prifle/weapon.cfg +++ b/models/weapons/prifle/weapon.cfg @@ -1,16 +1,17 @@ -weaponModel models/weapons/prifle/prifle.md3 -icon icons/iconw_pulse -crosshair 24 gfx/2d/crosshair-prifle_s - -primary -{ - missileSprite 3 gfx/prifle/red_blob - missileTrailSystem models/weapons/prifle/missileTS - - flashDlightColor 1.0 0.0 0.0 - flashSound 0 models/weapons/prifle/flash0.wav - - impactMark 16 gfx/marks/bullet_mrk impactParticleSystem models/weapons/prifle/impactPS +weaponModel models/weapons/prifle/prifle.md3 +icon icons/iconw_pulse +crosshair 24 gfx/2d/crosshair-prifle_s + +primary +{ + missileSprite 3 gfx/prifle/red_blob + missileTrailSystem models/weapons/prifle/missileTS + + flashDlightColor 1.0 0.0 0.0 + flashSound 0 models/weapons/prifle/flash0.wav + + impactMark 16 gfx/marks/bullet_mrk + impactParticleSystem models/weapons/prifle/impactPS impactSound 0 models/weapons/prifle/impact0.wav - alwaysImpact -} + alwaysImpact +} diff --git a/models/weapons/psaw/weapon.cfg b/models/weapons/psaw/weapon.cfg index b5efd883..7b87940b 100644 --- a/models/weapons/psaw/weapon.cfg +++ b/models/weapons/psaw/weapon.cfg @@ -1,41 +1,13 @@ -weaponModel models/weapons/psaw/psaw.md3 -icon icons/iconw_saw +weaponModel models/weapons/psaw/psaw.md3 +icon icons/iconw_saw idleSound models/weapons/psaw/idle.wav -crosshair 24 gfx/2d/crosshair-psaw - -primary -{ - flashDlightColor 1.0 1.0 1.0 - firingSound models/weapons/psaw/firing.wav - - impactParticleSystem models/weapons/psaw/impactPS - alwaysImpact -} -*** 1,13 **** 0 -weaponModel models/weapons/psaw/psaw.md3 -icon icons/iconw_saw -idleSound models/weapons/psaw/idle.wav -crosshair 24 gfx/2d/crosshair-psaw - -primary -{ - flashDlightColor 1.0 1.0 1.0 - firingSound models/weapons/psaw/firing.wav - - impactParticleSystem models/weapons/psaw/impactPS - alwaysImpact -} -*** 1,13 **** 0 -weaponModel models/weapons/psaw/psaw.md3 -icon icons/iconw_saw -idleSound models/weapons/psaw/idle.wav -crosshair 24 gfx/2d/crosshair-psaw - -primary -{ - flashDlightColor 1.0 1.0 1.0 - firingSound models/weapons/psaw/firing.wav - - impactParticleSystem models/weapons/psaw/impactPS - alwaysImpact -} +crosshair 24 gfx/2d/crosshair-psaw + +primary +{ + flashDlightColor 1.0 1.0 1.0 + firingSound models/weapons/psaw/firing.wav + + impactParticleSystem models/weapons/psaw/impactPS + alwaysImpact +} \ No newline at end of file -- cgit