r3606 - in trunk/data: qcsrc/server sound/announcer/robotic sound/ctf

[DONOTREPLY at icculus.org]

Author: esteel
Date: 2008-05-06 14:55:02 -0400 (Tue, 06 May 2008)
New Revision: 3606

Added:
   trunk/data/sound/ctf/bluecapture.ogg
   trunk/data/sound/ctf/redcapture.ogg
Removed:
   trunk/data/sound/announcer/robotic/bluecapture.ogg
   trunk/data/sound/announcer/robotic/redcapture.ogg
Modified:
   trunk/data/qcsrc/server/ctf.qc
Log:
moved blue/redcapture.ogg from announcer/robotic/ into ctf/ and make ctf.qc use them


Modified: trunk/data/qcsrc/server/ctf.qc
===================================================================
--- trunk/data/qcsrc/server/ctf.qc	2008-05-01 18:26:51 UTC (rev 3605)
+++ trunk/data/qcsrc/server/ctf.qc	2008-05-06 18:55:02 UTC (rev 3606)
@@ -451,7 +451,7 @@
  (default ctf/return.wav)
 "noise2"
  sound played when flag is captured
- (default ctf/capture.wav)
+ (default ctf/redcapture.wav)
 "noise3"
  sound played when flag is lost in the field and respawns itself
  (default ctf/respawn.wav)
@@ -487,7 +487,7 @@
 	if (!self.noise1)
 		self.noise1 = "ctf/return.wav";
 	if (!self.noise2)
-		self.noise2 = "ctf/capture.wav";
+		self.noise2 = "ctf/redcapture.wav"; // blue team scores by capturing the red flag
 	if (!self.noise3)
 		self.noise3 = "ctf/respawn.wav";
 	precache_model (self.model);
@@ -523,7 +523,21 @@
 "angle"
  Angle the flag will point
 (minus 90 degrees)
-
+"model"
+ model to use, note this needs red and blue as skins 0 and 1
+ (default models/ctf/flag.md3)
+"noise"
+ sound played when flag is picked up
+ (default ctf/take.wav)
+"noise1"
+ sound played when flag is returned by a teammate
+ (default ctf/return.wav)
+"noise2"
+ sound played when flag is captured
+ (default ctf/bluecapture.wav)
+"noise3"
+ sound played when flag is lost in the field and respawns itself
+ (default ctf/respawn.wav)
 */
 
 void() item_flag_team2 =
@@ -555,7 +569,7 @@
 	if (!self.noise1)
 		self.noise1 = "ctf/return.wav";
 	if (!self.noise2)
-		self.noise2 = "ctf/capture.wav";
+		self.noise2 = "ctf/bluecapture.wav"; // red team scores by capturing the blue flag
 	if (!self.noise3)
 		self.noise3 = "ctf/respawn.wav";
 	precache_model (self.model);

Deleted: trunk/data/sound/announcer/robotic/bluecapture.ogg
===================================================================
(Binary files differ)

Deleted: trunk/data/sound/announcer/robotic/redcapture.ogg
===================================================================
(Binary files differ)

Copied: trunk/data/sound/ctf/bluecapture.ogg (from rev 3605, trunk/data/sound/announcer/robotic/bluecapture.ogg)
===================================================================
(Binary files differ)

Copied: trunk/data/sound/ctf/redcapture.ogg (from rev 3605, trunk/data/sound/announcer/robotic/redcapture.ogg)
===================================================================
(Binary files differ)