r118 - trunk/progsqc

[DONOTREPLY at icculus.org]

Author: vermeulen
Date: 2008-06-19 22:17:20 -0400 (Thu, 19 Jun 2008)
New Revision: 118

Modified:
   trunk/progsqc/actor.qc
   trunk/progsqc/inventory.qc
   trunk/progsqc/player.qc
Log:
jetpack stopping and starting
HORRIBLE USE OF COLORMOD for teams, rather than pants/shirt skins

Modified: trunk/progsqc/actor.qc
===================================================================
--- trunk/progsqc/actor.qc	2008-06-15 23:40:00 UTC (rev 117)
+++ trunk/progsqc/actor.qc	2008-06-20 02:17:20 UTC (rev 118)
@@ -164,6 +164,20 @@
 	// model seen in first person while holding weapon
 	self.actorpart_viewweapon.viewmodelforclient = self;
 	self.actorpart_hand.viewmodelforclient = self;
+
+	// HORRIBLE COLORMODDING
+	if (self.team == 5)
+	{
+		self.colormod =  '3.73 0.10 0.10';
+		self.actorpart_head.colormod = '3.73 0.10 0.10';
+		self.actorpart_torso.colormod = '3.73 0.10 0.10';
+	}
+	else if (self.team == 14)
+	{
+		self.colormod =  '0.10 0.10 3.73';
+		self.actorpart_head.colormod = '0.10 0.10 3.73';
+		self.actorpart_torso.colormod = '0.10 0.10 3.73';
+	}
 };
 
 void() actor_gib =
@@ -332,10 +346,10 @@
 			{
 			    Inventory_ModifyItem(self, self.itemselected, 0 - iteminfo_ammo1minimumtofire, 0);
 				self.jetpack_fuel = iteminfo_quantity;
-			   	if (!self.jetpackactive)
+			   	if (!self.jetpackactive && self.jetpack_fuel > 10)
 				{
-			   	   sound(self, CHAN_BODY, strcat(self.playerclass.sounddir, "/jetpack.wav"), 1, ATTN_NORM);
-				   self.jetpackactive = TRUE;
+					sound(self, CHAN_BODY, "jetpack/low.wav", 0.4, ATTN_NORM);
+					self.jetpackactive = TRUE;
 				}
 			}
 			else if (iteminfo_ammo1fireflags & FIREFLAG_SHIELD)

Modified: trunk/progsqc/inventory.qc
===================================================================
--- trunk/progsqc/inventory.qc	2008-06-15 23:40:00 UTC (rev 117)
+++ trunk/progsqc/inventory.qc	2008-06-20 02:17:20 UTC (rev 118)
@@ -367,7 +367,7 @@
 				iteminfo_weapon_rank = iteminfo_quantity * iteminfo_ammo1damage_x;
 			}
 		}
-		else if (iteminfo_ammo1minimumtofire)
+		else if (iteminfo_ammo1minimumtofire >= 0)
 		{
 			// weapons
 			if (iteminfo_ammotype >= 0)
@@ -456,6 +456,8 @@
 	precache_sound ("weapons/assaultrailgun_bulletfire2.wav"); // templeofnoise: old style precache for additional sounds
 	precache_sound ("weapons/assaultrailgun_bulletfire3.wav"); // templeofnoise: old style precache for additional sounds
 
+	precache_sound ("jetpack/low.wav");
+
 	precache_sound ("weapons/explode_medium.wav");
 	precache_sound ("weapons/explode_electricity.wav");
 	precache_sound ("weapons/explode_plasma.wav");
@@ -618,7 +620,9 @@
 {
 	if (other.classname != "player")
 		return;
-	sound(other, CHAN_AUTO, self.noise, 1, ATTN_NORM);
+
+	//sound(other, CHAN_AUTO, self.noise, 1, ATTN_NORM);
+	sound(other, CHAN_AUTO, "misc/itempickup.ogg", 1, ATTN_NORM);
 	bprint(self.netname,"\n");
 	
 	if (self.health)

Modified: trunk/progsqc/player.qc
===================================================================
--- trunk/progsqc/player.qc	2008-06-15 23:40:00 UTC (rev 117)
+++ trunk/progsqc/player.qc	2008-06-20 02:17:20 UTC (rev 118)
@@ -649,7 +649,7 @@
 			{
 				self.jetpackactive = FALSE;
 			    self.jetpackacc = cvar("g_jetpack_accbase");
-				sound(self, CHAN_BODY, strcat(self.playerclass.sounddir, "/jetpackstop.wav"), 1, ATTN_NORM);
+				sound(self, CHAN_BODY, "jetpack/stop.wav", 1, ATTN_NORM);
 				self.actorpart_jetpacktrail.effects = self.actorpart_jetpacktrail.effects | EF_NODRAW;
 			}
 			if (self.hook)