r5012 - in trunk/data: qcsrc/server sound/misc sound/player/specop/coms sound/player/specop/player sound/weapons
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sat Nov 8 03:41:17 EST 2008
Author: div0
Date: 2008-11-08 03:41:05 -0500 (Sat, 08 Nov 2008)
New Revision: 5012
Added:
trunk/data/sound/weapons/brass1.ogg
trunk/data/sound/weapons/brass2.ogg
trunk/data/sound/weapons/brass3.ogg
trunk/data/sound/weapons/casings1.ogg
trunk/data/sound/weapons/casings2.ogg
trunk/data/sound/weapons/casings3.ogg
trunk/data/sound/weapons/rocket_mode.ogg
Modified:
trunk/data/qcsrc/server/g_casings.qc
trunk/data/qcsrc/server/w_rocketlauncher.qc
trunk/data/qcsrc/server/w_shotgun.qc
trunk/data/qcsrc/server/w_uzi.qc
trunk/data/sound/misc/hit.wav
trunk/data/sound/player/specop/coms/attack.ogg
trunk/data/sound/player/specop/coms/attackinfive.ogg
trunk/data/sound/player/specop/coms/coverme.ogg
trunk/data/sound/player/specop/coms/defend.ogg
trunk/data/sound/player/specop/coms/freelance1.ogg
trunk/data/sound/player/specop/coms/freelance2.ogg
trunk/data/sound/player/specop/coms/incoming.ogg
trunk/data/sound/player/specop/coms/meet.ogg
trunk/data/sound/player/specop/coms/needhelp1.ogg
trunk/data/sound/player/specop/coms/seenflag.ogg
trunk/data/sound/player/specop/coms/taunt1.ogg
trunk/data/sound/player/specop/coms/taunt2.ogg
trunk/data/sound/player/specop/coms/taunt3.ogg
trunk/data/sound/player/specop/coms/teamshoot1.ogg
trunk/data/sound/player/specop/coms/teamshoot2.ogg
trunk/data/sound/player/specop/coms/teamshoot3.ogg
trunk/data/sound/player/specop/player/death1.ogg
trunk/data/sound/player/specop/player/death2.ogg
trunk/data/sound/player/specop/player/death3.ogg
trunk/data/sound/player/specop/player/drown.ogg
trunk/data/sound/player/specop/player/fall1.ogg
trunk/data/sound/player/specop/player/falling.ogg
trunk/data/sound/player/specop/player/gasp.ogg
trunk/data/sound/player/specop/player/jump.ogg
trunk/data/sound/player/specop/player/pain100.ogg
trunk/data/sound/player/specop/player/pain25.ogg
trunk/data/sound/player/specop/player/pain50.ogg
trunk/data/sound/player/specop/player/pain75.ogg
trunk/data/sound/weapons/crylink_impact.ogg
trunk/data/sound/weapons/electro_fly.wav
trunk/data/sound/weapons/lasergun_fire.ogg
trunk/data/sound/weapons/shotgun_fire.ogg
trunk/data/sound/weapons/uzi_fire.ogg
Log:
Tenshihan 4.1.0, better g_casings support. Please test, maybe make default now?
Modified: trunk/data/qcsrc/server/g_casings.qc
===================================================================
--- trunk/data/qcsrc/server/g_casings.qc 2008-11-07 21:40:25 UTC (rev 5011)
+++ trunk/data/qcsrc/server/g_casings.qc 2008-11-08 08:41:05 UTC (rev 5012)
@@ -5,7 +5,19 @@
if (other.solid == SOLID_BSP)
if (vlen(self.velocity) >= 50)
if (time >= self.attack_finished_single)
- sound (self, CHAN_PROJECTILE, "weapons/casing.wav", VOL_BASE, ATTN_NORM);
+ {
+ string s;
+ float f;
+
+ f = floor(random() * 3) + 1;
+ if(self.state == 1)
+ s = strcat("weapons/casing", ftos(f), ".wav");
+ else if(self.state == 2)
+ s = strcat("weapons/steel", ftos(f), ".wav");
+ else
+ s = strcat("weapons/brass", ftos(f), ".wav");
+ sound (self, CHAN_PROJECTILE, s, VOL_BASE, ATTN_NORM);
+ }
self.attack_finished_single = time + 0.2;
//self.touch = SUB_Null; // one tink is enough
//self.dest = self.origin - self.groundentity.origin;
@@ -57,6 +69,7 @@
e = newdecor();
e.isdecor = TRUE;
e.alpha = 1;
+ e.state = casingtype;
//e.forcescale = 15;
e.movetype = MOVETYPE_BOUNCE;
e.solid = SOLID_TRIGGER;
Modified: trunk/data/qcsrc/server/w_rocketlauncher.qc
===================================================================
--- trunk/data/qcsrc/server/w_rocketlauncher.qc 2008-11-07 21:40:25 UTC (rev 5011)
+++ trunk/data/qcsrc/server/w_rocketlauncher.qc 2008-11-08 08:41:05 UTC (rev 5012)
@@ -406,7 +406,7 @@
self.exteriorweaponentity.attack_finished_single = time + 0.4;
self.laser_on = !self.laser_on;
// UGLY WORKAROUND: play this on CHAN_WEAPON2 so it can't cut off fire sounds
- sound (self, CHAN_WEAPON2, "weapons/tink1.wav", VOL_BASE, ATTN_NORM);
+ sound (self, CHAN_WEAPON2, "weapons/rocket_mode.wav", VOL_BASE, ATTN_NORM);
}
}
else
@@ -445,7 +445,10 @@
precache_sound ("weapons/rocket_fly.wav");
precache_sound ("weapons/rocket_impact.wav");
if (g_laserguided_missile)
+ {
precache_model ("models/laser_dot.mdl"); // rocket launcher
+ precache_sound ("weapons/tink1.wav");
+ }
}
else if (req == WR_SETUP)
{
Modified: trunk/data/qcsrc/server/w_shotgun.qc
===================================================================
--- trunk/data/qcsrc/server/w_shotgun.qc 2008-11-07 21:40:25 UTC (rev 5011)
+++ trunk/data/qcsrc/server/w_shotgun.qc 2008-11-08 08:41:05 UTC (rev 5012)
@@ -133,7 +133,9 @@
precache_sound ("weapons/shotgun_fire.wav");
if (cvar("g_casings") >= 1)
{
- precache_sound ("weapons/casing.wav");
+ precache_sound ("weapons/casing1.wav");
+ precache_sound ("weapons/casing2.wav");
+ precache_sound ("weapons/casing3.wav");
precache_model ("models/casing_shell.mdl");
}
}
Modified: trunk/data/qcsrc/server/w_uzi.qc
===================================================================
--- trunk/data/qcsrc/server/w_uzi.qc 2008-11-07 21:40:25 UTC (rev 5011)
+++ trunk/data/qcsrc/server/w_uzi.qc 2008-11-08 08:41:05 UTC (rev 5012)
@@ -139,7 +139,9 @@
precache_sound ("weapons/uzi_fire.wav");
if (cvar("g_casings") >= 2)
{
- precache_sound ("weapons/casing.wav");
+ precache_sound ("weapons/brass1.wav");
+ precache_sound ("weapons/brass2.wav");
+ precache_sound ("weapons/brass3.wav");
precache_model ("models/casing_bronze.mdl");
}
}
Modified: trunk/data/sound/misc/hit.wav
===================================================================
(Binary files differ)
Modified: trunk/data/sound/player/specop/coms/attack.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/player/specop/coms/attackinfive.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/player/specop/coms/coverme.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/player/specop/coms/defend.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/player/specop/coms/freelance1.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/player/specop/coms/freelance2.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/player/specop/coms/incoming.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/player/specop/coms/meet.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/player/specop/coms/needhelp1.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/player/specop/coms/seenflag.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/player/specop/coms/taunt1.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/player/specop/coms/taunt2.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/player/specop/coms/taunt3.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/player/specop/coms/teamshoot1.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/player/specop/coms/teamshoot2.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/player/specop/coms/teamshoot3.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/player/specop/player/death1.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/player/specop/player/death2.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/player/specop/player/death3.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/player/specop/player/drown.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/player/specop/player/fall1.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/player/specop/player/falling.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/player/specop/player/gasp.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/player/specop/player/jump.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/player/specop/player/pain100.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/player/specop/player/pain25.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/player/specop/player/pain50.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/player/specop/player/pain75.ogg
===================================================================
(Binary files differ)
Added: trunk/data/sound/weapons/brass1.ogg
===================================================================
(Binary files differ)
Property changes on: trunk/data/sound/weapons/brass1.ogg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/sound/weapons/brass2.ogg
===================================================================
(Binary files differ)
Property changes on: trunk/data/sound/weapons/brass2.ogg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/sound/weapons/brass3.ogg
===================================================================
(Binary files differ)
Property changes on: trunk/data/sound/weapons/brass3.ogg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/sound/weapons/casings1.ogg
===================================================================
(Binary files differ)
Property changes on: trunk/data/sound/weapons/casings1.ogg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/sound/weapons/casings2.ogg
===================================================================
(Binary files differ)
Property changes on: trunk/data/sound/weapons/casings2.ogg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/sound/weapons/casings3.ogg
===================================================================
(Binary files differ)
Property changes on: trunk/data/sound/weapons/casings3.ogg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/data/sound/weapons/crylink_impact.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/weapons/electro_fly.wav
===================================================================
(Binary files differ)
Modified: trunk/data/sound/weapons/lasergun_fire.ogg
===================================================================
(Binary files differ)
Added: trunk/data/sound/weapons/rocket_mode.ogg
===================================================================
(Binary files differ)
Property changes on: trunk/data/sound/weapons/rocket_mode.ogg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/data/sound/weapons/shotgun_fire.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/weapons/uzi_fire.ogg
===================================================================
(Binary files differ)
More information about the nexuiz-commits
mailing list