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/buildables/acid_tube/animation.cfg | 30 +++++----- models/buildables/barricade/animation.cfg | 34 +++++------ models/players/level1/animation.cfg | 96 +++++++++++++++---------------- 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 ++++------------- 9 files changed, 187 insertions(+), 215 deletions(-) (limited to 'models') diff --git a/models/buildables/acid_tube/animation.cfg b/models/buildables/acid_tube/animation.cfg index d7ff6a14..19f616e2 100644 --- a/models/buildables/acid_tube/animation.cfg +++ b/models/buildables/acid_tube/animation.cfg @@ -1,15 +1,15 @@ -//acid tube -0 12 0 24 // CONSTRUCT1 -0 12 0 24 // CONSTRUCT2 -12 1 0 24 // IDLE1 -0 0 0 0 // IDLE2 -0 0 0 0 // IDLE3 -13 19 0 24 // ATTACK1 -0 0 0 1 // ATTACK2 -0 0 0 1 // SPAWN1 -0 0 0 1 // SPAWN2 -12 8 0 12 // PAIN1 -0 0 0 1 // PAIN2 -0 -12 0 16 // DESTROY -12 0 0 12 // DESTROY2 -0 1 1 1 // DESTROYED +//acid tube +0 12 0 24 // CONSTRUCT1 +0 12 0 24 // CONSTRUCT2 +12 1 0 24 // IDLE1 +0 0 0 0 // IDLE2 +0 0 0 0 // IDLE3 +13 19 0 24 // ATTACK1 +0 0 0 1 // ATTACK2 +0 0 0 1 // SPAWN1 +0 0 0 1 // SPAWN2 +12 8 0 12 // PAIN1 +0 0 0 1 // PAIN2 +0 -12 0 16 // DESTROY +12 0 0 12 // DESTROY2 +0 1 1 1 // DESTROYED diff --git a/models/buildables/barricade/animation.cfg b/models/buildables/barricade/animation.cfg index 6690ec73..b4703ea0 100644 --- a/models/buildables/barricade/animation.cfg +++ b/models/buildables/barricade/animation.cfg @@ -1,17 +1,17 @@ -//barricade -0 12 0 24 // CONSTRUCT1 -0 12 0 24 // CONSTRUCT1 -12 1 1 24 // IDLE1 -0 0 0 24 // IDLE2 -0 0 0 0 // IDLE3 -39 9 0 48 // ATTACK1 (shrink) -39 -9 0 48 // ATTACK2 (unshrink) -0 0 0 0 // SPAWN1 -0 0 0 0 // SPAWN2 -12 12 0 24 // PAIN1 -48 1 0 24 // PAIN2 -36 12 0 24 // DESTROY -0 0 0 0 // DESTROY2 -48 1 1 1 // DEAD - -//12 frames for each pain, 6 going down 6 going up +//barricade +0 12 0 24 // CONSTRUCT1 +0 12 0 24 // CONSTRUCT1 +12 1 1 24 // IDLE1 +0 0 0 24 // IDLE2 +0 0 0 0 // IDLE3 +39 9 0 48 // ATTACK1 (shrink) +39 -9 0 48 // ATTACK2 (unshrink) +0 0 0 0 // SPAWN1 +0 0 0 0 // SPAWN2 +12 12 0 24 // PAIN1 +48 1 0 24 // PAIN2 +36 12 0 24 // DESTROY +0 0 0 0 // DESTROY2 +48 1 1 1 // DEAD + +//12 frames for each pain, 6 going down 6 going up diff --git a/models/players/level1/animation.cfg b/models/players/level1/animation.cfg index ec9a6c06..1c474f90 100644 --- a/models/players/level1/animation.cfg +++ b/models/players/level1/animation.cfg @@ -1,48 +1,48 @@ -// animation config file -// Tremulous: level1 alien - -sex n - -// first frame, num frames, looping frames, frames per second - -footsteps none - -nonsegmented - -0 40 40 30 //NSPA_STAND - -41 141 0 60 //NSPA_GESTURE - -182 31 31 30 //NSPA_WALK -182 31 31 60 //NSPA_RUN -182 -31 31 60 //NSPA_RUNBACK - -0 0 0 30 //NSPA_CHARGE - -213 31 31 60 //NSPA_RUNLEFT -213 31 31 30 //NSPA_WALKLEFT -244 31 31 60 //NSPA_RUNRIGHT -244 31 31 30 //NSPA_WALKRIGHT - -182 31 31 30 //NSPA_SWIM - -275 41 20 30 //NSPA_JUMP -316 20 0 30 //NSPA_LAND -275 41 20 30 //NSPA_JUMPBACK -316 20 0 30 //NSPA_LANDBACK - -182 31 31 30 //NSPA_TURN - -336 31 0 30 //NSPA_ATTACK1 -336 31 0 30 //NSPA_ATTACK2 -336 31 0 30 //NSPA_ATTACK3 - -367 11 0 30 //NSPA_PAIN1 -367 11 0 30 //NSPA_PAIN2 - -378 41 0 30 //NSPA_DEATH1 -418 1 0 30 //NSPA_DEAD1 -378 41 0 30 //NSPA_DEATH2 -418 1 0 30 //NSPA_DEAD2 -378 41 0 30 //NSPA_DEATH3 -418 1 0 30 //NSPA_DEAD3 +// animation config file +// Tremulous: level1 alien + +sex n + +// first frame, num frames, looping frames, frames per second + +footsteps none + +nonsegmented + +0 40 40 30 //NSPA_STAND + +41 141 0 60 //NSPA_GESTURE + +182 31 31 30 //NSPA_WALK +182 31 31 60 //NSPA_RUN +182 -31 31 60 //NSPA_RUNBACK + +0 0 0 30 //NSPA_CHARGE + +213 31 31 60 //NSPA_RUNLEFT +213 31 31 30 //NSPA_WALKLEFT +244 31 31 60 //NSPA_RUNRIGHT +244 31 31 30 //NSPA_WALKRIGHT + +182 31 31 30 //NSPA_SWIM + +275 41 20 30 //NSPA_JUMP +316 20 0 30 //NSPA_LAND +275 41 20 30 //NSPA_JUMPBACK +316 20 0 30 //NSPA_LANDBACK + +182 31 31 30 //NSPA_TURN + +336 31 0 30 //NSPA_ATTACK1 +336 31 0 30 //NSPA_ATTACK2 +336 31 0 30 //NSPA_ATTACK3 + +367 11 0 30 //NSPA_PAIN1 +367 11 0 30 //NSPA_PAIN2 + +378 41 0 30 //NSPA_DEATH1 +418 1 0 30 //NSPA_DEAD1 +378 41 0 30 //NSPA_DEATH2 +418 1 0 30 //NSPA_DEAD2 +378 41 0 30 //NSPA_DEATH3 +418 1 0 30 //NSPA_DEAD3 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