r63 - trunk/basezym/progsqc

[DONOTREPLY at icculus.org]

Author: havoc
Date: 2006-09-30 23:32:20 -0400 (Sat, 30 Sep 2006)
New Revision: 63

Modified:
   trunk/basezym/progsqc/actor.qc
   trunk/basezym/progsqc/inventory.qc
   trunk/basezym/progsqc/player.qc
Log:
changed jetpack to use armorvalue (shield power) instead of the unshown
ammo_cells
added jetpack sound code


Modified: trunk/basezym/progsqc/actor.qc
===================================================================
--- trunk/basezym/progsqc/actor.qc	2006-10-01 02:54:19 UTC (rev 62)
+++ trunk/basezym/progsqc/actor.qc	2006-10-01 03:32:20 UTC (rev 63)
@@ -77,7 +77,7 @@
 	self.ammo_shells = 0;
 	self.ammo_nails = 0;
 	self.ammo_rockets = 0;
-	self.ammo_cells = 200;
+	self.ammo_cells = 0;
 	self.deadflag = DEAD_NO;
 
 	if (self.actorpart_torso == world)

Modified: trunk/basezym/progsqc/inventory.qc
===================================================================
--- trunk/basezym/progsqc/inventory.qc	2006-10-01 02:54:19 UTC (rev 62)
+++ trunk/basezym/progsqc/inventory.qc	2006-10-01 03:32:20 UTC (rev 63)
@@ -479,7 +479,7 @@
 		character.ammo_shells = 0;
 		character.ammo_nails = 0;
 		character.ammo_rockets = 0;
-		//character.ammo_cells = 0;
+		character.ammo_cells = 0;
 		if (iteminfo_ammo1max + iteminfo_ammo1inventorymax)
 		{
 			character.currentammo = iteminfo_ammo1 * 200 / (iteminfo_ammo1max + iteminfo_ammo1inventorymax);

Modified: trunk/basezym/progsqc/player.qc
===================================================================
--- trunk/basezym/progsqc/player.qc	2006-10-01 02:54:19 UTC (rev 62)
+++ trunk/basezym/progsqc/player.qc	2006-10-01 03:32:20 UTC (rev 63)
@@ -500,6 +500,7 @@
 =============
 */
 .float deadtime;
+.float jetpackactive;
 void() PlayerPreThink =
 {
 	local float im;
@@ -547,9 +548,24 @@
 	if (!self.deadflag)
 	{
 		if (self.button5)
-			self.ammo_cells = bound(0, self.ammo_cells - 20 * frametime, 200);
+		{
+			self.armorvalue = max(0, self.armorvalue - 20 * frametime);
+			self.armorregentime = max(self.armorregentime, time + ACTOR_SHIELD_REGENDELAY);
+			self.armorregenplaysound = TRUE;
+			if (!self.jetpackactive)
+			{
+				sound(self, CHAN_BODY, strcat(self.playerclass.sounddir, "/jetpack.wav"), 1, ATTN_NORM);
+				self.jetpackactive = TRUE;
+			}
+		}
 		else
-			self.ammo_cells = bound(0, self.ammo_cells + 20 * frametime, 200);
+		{
+			if (self.jetpackactive)
+			{
+				sound(self, CHAN_BODY, strcat(self.playerclass.sounddir, "/jetpackstop.wav"), 1, ATTN_NORM);
+				self.jetpackactive = FALSE;
+			}
+		}
 	}
 	self.oldvelocity = self.velocity;
 	if (!self.button2)
@@ -733,7 +749,7 @@
 				self.velocity = self.velocity + wishdir * min(f, sv_accelerate * frametime * wishspeed);
 		}
 	}
-	else if (self.button5 && self.ammo_cells >= 1)
+	else if (self.button5 && self.armorvalue >= 1)
 	{
 		local float maxspeed;
 		maxspeed = sv_maxspeed;