[nexuiz-commits] r6838 - in trunk/data: . models/player qcsrc/server sound/announcer/male sound/cdtracks sound/ctf sound/misc sound/player sound/player/pyria-skadi/coms sound/weapons
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Mon Jun 1 12:32:04 EDT 2009
Author: div0
Date: 2009-06-01 12:32:04 -0400 (Mon, 01 Jun 2009)
New Revision: 6838
Added:
trunk/data/sound/announcer/male/amazing.ogg
trunk/data/sound/announcer/male/awesome.ogg
trunk/data/sound/ctf/blue_capture.wav
trunk/data/sound/ctf/blue_dropped.wav
trunk/data/sound/ctf/blue_returned.wav
trunk/data/sound/ctf/blue_taken.wav
trunk/data/sound/ctf/flag_respawn.wav
trunk/data/sound/ctf/red_capture.wav
trunk/data/sound/ctf/red_dropped.wav
trunk/data/sound/ctf/red_returned.wav
trunk/data/sound/ctf/red_taken.wav
trunk/data/sound/player/pyria-skadi/coms/needhelp2.ogg
Modified:
trunk/data/effectinfo.txt
trunk/data/models/player/pyria.zym.sounds
trunk/data/models/player/skadi.zym.sounds
trunk/data/qcsrc/server/ctf.qc
trunk/data/qcsrc/server/defs.qh
trunk/data/qcsrc/server/miscfunctions.qc
trunk/data/qcsrc/server/portals.qc
trunk/data/qcsrc/server/t_teleporters.qc
trunk/data/qcsrc/server/w_common.qc
trunk/data/sound/announcer/male/airshot.ogg
trunk/data/sound/announcer/male/headshot.ogg
trunk/data/sound/announcer/male/impressive.ogg
trunk/data/sound/announcer/male/yoda.ogg
trunk/data/sound/cdtracks/thunder.ogg
trunk/data/sound/misc/armor1.wav
trunk/data/sound/misc/armor10.wav
trunk/data/sound/misc/armor17_5.wav
trunk/data/sound/misc/powerup.ogg
trunk/data/sound/player/lava.wav
trunk/data/sound/player/pyria-skadi/coms/needhelp1.ogg
trunk/data/sound/weapons/brass1.ogg
trunk/data/sound/weapons/brass2.ogg
trunk/data/sound/weapons/brass3.ogg
trunk/data/sound/weapons/campingrifle_fire2.ogg
trunk/data/sound/weapons/campingrifle_reload.ogg
trunk/data/sound/weapons/crylink_fire.ogg
trunk/data/sound/weapons/crylink_fire2.ogg
trunk/data/sound/weapons/electro_fly.ogg
trunk/data/sound/weapons/grenade_fire.ogg
trunk/data/sound/weapons/grenade_impact.ogg
trunk/data/sound/weapons/hagar_fire.ogg
trunk/data/sound/weapons/hagexp1.ogg
trunk/data/sound/weapons/hagexp2.ogg
trunk/data/sound/weapons/hagexp3.ogg
trunk/data/sound/weapons/minstanexfire.ogg
trunk/data/sound/weapons/nexfire.ogg
trunk/data/sound/weapons/rocket_fly.ogg
trunk/data/sound/weapons/rocket_impact.ogg
trunk/data/sound/weapons/shotgun_fire.ogg
trunk/data/sound/weapons/tag_rocket_fly.ogg
trunk/data/sound/weapons/tagexp1.ogg
trunk/data/sound/weapons/tagexp2.ogg
trunk/data/sound/weapons/tagexp3.ogg
trunk/data/sound/weapons/uzi_fire.ogg
Log:
tenshihan 6.1
Modified: trunk/data/effectinfo.txt
===================================================================
--- trunk/data/effectinfo.txt 2009-06-01 15:39:48 UTC (rev 6837)
+++ trunk/data/effectinfo.txt 2009-06-01 16:32:04 UTC (rev 6838)
@@ -1530,7 +1530,7 @@
velocitymultiplier 0.01
lightradius 200
lightradiusfade 2000
-lightcolor 2 1.5 0.2
+lightcolor 1.6 0.2 2
effect crylink_muzzleflash
count 10
type spark
Modified: trunk/data/models/player/pyria.zym.sounds
===================================================================
--- trunk/data/models/player/pyria.zym.sounds 2009-06-01 15:39:48 UTC (rev 6837)
+++ trunk/data/models/player/pyria.zym.sounds 2009-06-01 16:32:04 UTC (rev 6838)
@@ -12,7 +12,7 @@
//getflag sound/player/carni-lycan/player/getflag 0
//incoming sound/player/pyria-skadi/coms/incoming 0
meet sound/player/pyria-skadi/coms/meet 0
-needhelp sound/player/pyria-skadi/coms/needhelp 1
+needhelp sound/player/pyria-skadi/coms/needhelp 2
//negative sound/player/carni-lycan/player/negative 0
//onmyway sound/player/carni-lycan/player/onmyway 0
//roaming sound/player/carni-lycan/player/roaming 0
Modified: trunk/data/models/player/skadi.zym.sounds
===================================================================
--- trunk/data/models/player/skadi.zym.sounds 2009-06-01 15:39:48 UTC (rev 6837)
+++ trunk/data/models/player/skadi.zym.sounds 2009-06-01 16:32:04 UTC (rev 6838)
@@ -12,7 +12,7 @@
//getflag sound/player/carni-lycan/player/getflag 0
//incoming sound/player/pyria-skadi/coms/incoming 0
meet sound/player/pyria-skadi/coms/meet 0
-needhelp sound/player/pyria-skadi/coms/needhelp 1
+needhelp sound/player/pyria-skadi/coms/needhelp 2
//negative sound/player/carni-lycan/player/negative 0
//onmyway sound/player/carni-lycan/player/onmyway 0
//roaming sound/player/carni-lycan/player/roaming 0
Modified: trunk/data/qcsrc/server/ctf.qc
===================================================================
--- trunk/data/qcsrc/server/ctf.qc 2009-06-01 15:39:48 UTC (rev 6837)
+++ trunk/data/qcsrc/server/ctf.qc 2009-06-01 16:32:04 UTC (rev 6838)
@@ -290,6 +290,7 @@
backtrace("Flag carrier had no flag sprite?!?");
}
LogCTF("dropped", p.team, p);
+ sound (self, CHAN_TRIGGER, self.noise4, VOL_BASE, ATTN_NONE);
setattachment(e, world, "");
e.damageforcescale = cvar("g_balance_ctf_damageforcescale");
@@ -759,19 +760,22 @@
if (!self.model)
self.model = cvar_string("g_ctf_flag_red_model");
if (!self.noise)
- self.noise = "ctf/take.wav";
+ self.noise = "ctf/red_taken.wav";
if (!self.noise1)
- self.noise1 = "ctf/return.wav";
+ self.noise1 = "ctf/red_returned.wav";
if (!self.noise2)
- self.noise2 = "ctf/redcapture.wav"; // blue team scores by capturing the red flag
+ self.noise2 = "ctf/red_capture.wav"; // blue team scores by capturing the red flag
if (!self.noise3)
- self.noise3 = "ctf/respawn.wav";
+ self.noise3 = "ctf/flag_respawn.wav";
+ if (!self.noise4)
+ self.noise4 = "ctf/red_dropped.wav";
precache_model (self.model);
setmodel (self, self.model); // precision set below
precache_sound (self.noise);
precache_sound (self.noise1);
precache_sound (self.noise2);
precache_sound (self.noise3);
+ precache_sound (self.noise4);
//setsize(self, '-16 -16 -37', '16 16 37');
setsize(self, FLAG_MIN, FLAG_MAX);
setorigin(self, self.origin + '0 0 37');
@@ -860,19 +864,22 @@
if (!self.model)
self.model = cvar_string("g_ctf_flag_blue_model");
if (!self.noise)
- self.noise = "ctf/take.wav";
+ self.noise = "ctf/blue_taken.wav";
if (!self.noise1)
- self.noise1 = "ctf/return.wav";
+ self.noise1 = "ctf/blue_returned.wav";
if (!self.noise2)
- self.noise2 = "ctf/bluecapture.wav"; // red team scores by capturing the blue flag
+ self.noise2 = "ctf/blue_capture.wav"; // blue team scores by capturing the red flag
if (!self.noise3)
- self.noise3 = "ctf/respawn.wav";
+ self.noise3 = "ctf/flag_respawn.wav";
+ if (!self.noise4)
+ self.noise4 = "ctf/blue_dropped.wav";
precache_model (self.model);
setmodel (self, self.model); // precision set below
precache_sound (self.noise);
precache_sound (self.noise1);
precache_sound (self.noise2);
precache_sound (self.noise3);
+ precache_sound (self.noise4);
//setsize(self, '-16 -16 -37', '16 16 37');
setsize(self, FLAG_MIN, FLAG_MAX);
setorigin(self, self.origin + '0 0 37');
Modified: trunk/data/qcsrc/server/defs.qh
===================================================================
--- trunk/data/qcsrc/server/defs.qh 2009-06-01 15:39:48 UTC (rev 6837)
+++ trunk/data/qcsrc/server/defs.qh 2009-06-01 16:32:04 UTC (rev 6838)
@@ -589,3 +589,4 @@
string matchid;
.float hitplotfh;
+.string noise4;
Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc 2009-06-01 15:39:48 UTC (rev 6837)
+++ trunk/data/qcsrc/server/miscfunctions.qc 2009-06-01 16:32:04 UTC (rev 6838)
@@ -1395,6 +1395,8 @@
precache_sound ("announcer/male/30kills.wav");
precache_sound ("announcer/male/botlike.wav");
precache_sound ("announcer/male/yoda.wav");
+ precache_sound ("announcer/male/amazing.wav");
+ precache_sound ("announcer/male/awesome.wav");
precache_sound ("announcer/male/headshot.wav");
precache_sound ("announcer/male/impressive.wav");
Modified: trunk/data/qcsrc/server/portals.qc
===================================================================
--- trunk/data/qcsrc/server/portals.qc 2009-06-01 15:39:48 UTC (rev 6837)
+++ trunk/data/qcsrc/server/portals.qc 2009-06-01 16:32:04 UTC (rev 6838)
@@ -151,7 +151,14 @@
return 0;
}
+ tdeath_hit = 0;
TeleportPlayer(teleporter, player, to, ang, newvel, teleporter.enemy.absmin, teleporter.enemy.absmax);
+ if(tdeath_hit)
+ {
+ // telefrag within 1 second of portal creation = amazing
+ if(time < teleporter.teleport_time + 1)
+ announce(player, "announcer/male/amazing.wav");
+ }
if not(teleporter.enemy)
{
@@ -336,6 +343,7 @@
destination.fade_time = time + 15;
teleporter.portal_wants_to_vanish = 0;
destination.portal_wants_to_vanish = 0;
+ teleporter.teleport_time = time;
}
void Portal_Remove(entity portal, float killed)
Modified: trunk/data/qcsrc/server/t_teleporters.qc
===================================================================
--- trunk/data/qcsrc/server/t_teleporters.qc 2009-06-01 15:39:48 UTC (rev 6837)
+++ trunk/data/qcsrc/server/t_teleporters.qc 2009-06-01 16:32:04 UTC (rev 6838)
@@ -4,6 +4,7 @@
self.team = activator.team;
}
+float tdeath_hit;
void tdeath(entity player, entity teleporter, entity telefragger, vector telefragmin, vector telefragmax)
{
entity head;
@@ -33,6 +34,7 @@
Damage (head, teleporter, telefragger, 10000, DEATH_TELEFRAG, head.origin, '0 0 0');
else // dead bodies and monsters gib themselves instead of telefragging
Damage (telefragger, teleporter, telefragger, 10000, DEATH_TELEFRAG, telefragger.origin, '0 0 0');
+ ++tdeath_hit;
}
}
Modified: trunk/data/qcsrc/server/w_common.qc
===================================================================
--- trunk/data/qcsrc/server/w_common.qc 2009-06-01 15:39:48 UTC (rev 6837)
+++ trunk/data/qcsrc/server/w_common.qc 2009-06-01 16:32:04 UTC (rev 6838)
@@ -139,7 +139,7 @@
if(headshot)
announce(self.owner, "announcer/male/headshot.wav");
if(yoda)
- announce(self.owner, "announcer/male/yoda.wav");
+ announce(self.owner, "announcer/male/awesome.wav");
}
//sound (self, CHAN_PROJECTILE, "weapons/electro_impact.wav", VOL_BASE, ATTN_NORM);
Modified: trunk/data/sound/announcer/male/airshot.ogg
===================================================================
(Binary files differ)
Added: trunk/data/sound/announcer/male/amazing.ogg
===================================================================
(Binary files differ)
Property changes on: trunk/data/sound/announcer/male/amazing.ogg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/sound/announcer/male/awesome.ogg
===================================================================
(Binary files differ)
Property changes on: trunk/data/sound/announcer/male/awesome.ogg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/data/sound/announcer/male/headshot.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/announcer/male/impressive.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/announcer/male/yoda.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/cdtracks/thunder.ogg
===================================================================
(Binary files differ)
Added: trunk/data/sound/ctf/blue_capture.wav
===================================================================
(Binary files differ)
Property changes on: trunk/data/sound/ctf/blue_capture.wav
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/sound/ctf/blue_dropped.wav
===================================================================
(Binary files differ)
Property changes on: trunk/data/sound/ctf/blue_dropped.wav
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/sound/ctf/blue_returned.wav
===================================================================
(Binary files differ)
Property changes on: trunk/data/sound/ctf/blue_returned.wav
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/sound/ctf/blue_taken.wav
===================================================================
(Binary files differ)
Property changes on: trunk/data/sound/ctf/blue_taken.wav
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/sound/ctf/flag_respawn.wav
===================================================================
(Binary files differ)
Property changes on: trunk/data/sound/ctf/flag_respawn.wav
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/sound/ctf/red_capture.wav
===================================================================
(Binary files differ)
Property changes on: trunk/data/sound/ctf/red_capture.wav
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/sound/ctf/red_dropped.wav
===================================================================
(Binary files differ)
Property changes on: trunk/data/sound/ctf/red_dropped.wav
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/sound/ctf/red_returned.wav
===================================================================
(Binary files differ)
Property changes on: trunk/data/sound/ctf/red_returned.wav
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/sound/ctf/red_taken.wav
===================================================================
(Binary files differ)
Property changes on: trunk/data/sound/ctf/red_taken.wav
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/data/sound/misc/armor1.wav
===================================================================
(Binary files differ)
Modified: trunk/data/sound/misc/armor10.wav
===================================================================
(Binary files differ)
Modified: trunk/data/sound/misc/armor17_5.wav
===================================================================
(Binary files differ)
Modified: trunk/data/sound/misc/powerup.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/player/lava.wav
===================================================================
(Binary files differ)
Modified: trunk/data/sound/player/pyria-skadi/coms/needhelp1.ogg
===================================================================
(Binary files differ)
Added: trunk/data/sound/player/pyria-skadi/coms/needhelp2.ogg
===================================================================
(Binary files differ)
Property changes on: trunk/data/sound/player/pyria-skadi/coms/needhelp2.ogg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/data/sound/weapons/brass1.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/weapons/brass2.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/weapons/brass3.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/weapons/campingrifle_fire2.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/weapons/campingrifle_reload.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/weapons/crylink_fire.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/weapons/crylink_fire2.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/weapons/electro_fly.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/weapons/grenade_fire.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/weapons/grenade_impact.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/weapons/hagar_fire.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/weapons/hagexp1.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/weapons/hagexp2.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/weapons/hagexp3.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/weapons/minstanexfire.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/weapons/nexfire.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/weapons/rocket_fly.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/weapons/rocket_impact.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/weapons/shotgun_fire.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/weapons/tag_rocket_fly.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/weapons/tagexp1.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/weapons/tagexp2.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/weapons/tagexp3.ogg
===================================================================
(Binary files differ)
Modified: trunk/data/sound/weapons/uzi_fire.ogg
===================================================================
(Binary files differ)
More information about the nexuiz-commits
mailing list