r97 - trunk/progsqc

[DONOTREPLY at icculus.org]

Author: vermeulen
Date: 2008-02-02 06:56:43 -0500 (Sat, 02 Feb 2008)
New Revision: 97

Modified:
   trunk/progsqc/actor.qc
   trunk/progsqc/damage.qc
   trunk/progsqc/gamedefs.qc
   trunk/progsqc/inventory.qc
   trunk/progsqc/mapentities.qc
   trunk/progsqc/player.qc
Log:
Added Shield and Invis items

Modified: trunk/progsqc/actor.qc
===================================================================
--- trunk/progsqc/actor.qc	2008-01-14 10:40:25 UTC (rev 96)
+++ trunk/progsqc/actor.qc	2008-02-02 11:56:43 UTC (rev 97)
@@ -336,6 +336,16 @@
 				   self.jetpackactive = TRUE;
 				}
 			}
+			else if (iteminfo_ammo1fireflags & FIREFLAG_SHIELD)
+			{
+			    Inventory_ModifyItem(self, self.itemselected, 0 - iteminfo_ammo1minimumtofire, 0);
+				self.shieldactive = TRUE;
+			}
+			else if (iteminfo_ammo1fireflags & FIREFLAG_INVIS)
+			{
+			    Inventory_ModifyItem(self, self.itemselected, 0 - iteminfo_ammo1minimumtofire, 0);
+				self.invisactive = TRUE;
+			}
 		}
 	}
 	self.weapon_oldbutton0 = self.button0;

Modified: trunk/progsqc/damage.qc
===================================================================
--- trunk/progsqc/damage.qc	2008-01-14 10:40:25 UTC (rev 96)
+++ trunk/progsqc/damage.qc	2008-02-02 11:56:43 UTC (rev 97)
@@ -344,6 +344,8 @@
 float FIREFLAG_ZOOM = 4;
 float FIREFLAG_HOOK = 8;
 float FIREFLAG_JETPACK = 16;
+float FIREFLAG_SHIELD = 32;
+float FIREFLAG_INVIS = 64;
 
 float EXPLFLAG_EXPLODE = 1;
 float EXPLFLAG_EXPLODELARGE = 2;

Modified: trunk/progsqc/gamedefs.qc
===================================================================
--- trunk/progsqc/gamedefs.qc	2008-01-14 10:40:25 UTC (rev 96)
+++ trunk/progsqc/gamedefs.qc	2008-02-02 11:56:43 UTC (rev 97)
@@ -52,6 +52,8 @@
 .float jetpack_maxmovespeed;
 .float jetpack_use;
 .float jetpackactive;
+.float shieldactive;
+.float invisactive;
 
 .float bloodtype;
 .float gibtype;

Modified: trunk/progsqc/inventory.qc
===================================================================
--- trunk/progsqc/inventory.qc	2008-01-14 10:40:25 UTC (rev 96)
+++ trunk/progsqc/inventory.qc	2008-02-02 11:56:43 UTC (rev 97)
@@ -31,13 +31,15 @@
 float ITEMTYPE_ITEM1 = 22;
 float ITEMTYPE_ITEM2 = 23;
 float ITEMTYPE_ITEM3 = 24;
+float ITEMTYPE_ITEM4 = 25;
+float ITEMTYPE_ITEM5 = 25;
 
-float ITEMTYPE_AMMO1 = 25;
-float ITEMTYPE_AMMO2 = 26;
-float ITEMTYPE_AMMO3 = 27;
-float ITEMTYPE_AMMO4 = 28;
+float ITEMTYPE_AMMO1 = 27;
+float ITEMTYPE_AMMO2 = 28;
+float ITEMTYPE_AMMO3 = 29;
+float ITEMTYPE_AMMO4 = 30;
 
-float ITEMTYPE_TOTAL = 29;
+float ITEMTYPE_TOTAL = 31;
 
 float WS_IDLE = 0;
 float WS_FIRE1 = 1;

Modified: trunk/progsqc/mapentities.qc
===================================================================
--- trunk/progsqc/mapentities.qc	2008-01-14 10:40:25 UTC (rev 96)
+++ trunk/progsqc/mapentities.qc	2008-02-02 11:56:43 UTC (rev 97)
@@ -99,7 +99,6 @@
 	// hide myself a tic
 	other.flags = other.flags | FL_TELEPORT;
 	other.effects = other.effects | EF_NODRAW;
-	other.actorpart_jetpacktrail.effects = other.actorpart_jetpacktrail.effects | EF_NODRAW;
 	other.teleport_time = time + cvar("sys_ticrate");
 
 	other.flags = other.flags - (other.flags & FL_ONGROUND);

Modified: trunk/progsqc/player.qc
===================================================================
--- trunk/progsqc/player.qc	2008-01-14 10:40:25 UTC (rev 96)
+++ trunk/progsqc/player.qc	2008-02-02 11:56:43 UTC (rev 97)
@@ -556,6 +556,43 @@
 		}
 		else
 			self.viewzoom = 1;
+			
+		if (self.button7 & self.invisactive)
+		{
+		    self.alpha = 0.4;
+			self.actorpart_torso.alpha = 0.4;
+			self.actorpart_head.alpha = 0.4;
+			self.actorpart_weapon.alpha = 0.4;
+			self.actorpart_viewweapon.alpha = 0.4;
+		}
+		else
+		{
+		 	self.invisactive = 0;
+		 	self.alpha = 1;
+			self.actorpart_torso.alpha = 1;
+			self.actorpart_head.alpha = 1;
+			self.actorpart_weapon.alpha = 1;
+			self.actorpart_viewweapon.alpha = 1;
+		}
+		
+		if (self.button7 & self.shieldactive)
+		{
+		    self.colormod = '5 0 0';
+			self.actorpart_torso.colormod = '5 0 0';
+			self.actorpart_head.colormod = '5 0 0';
+			self.actorpart_weapon.colormod = '5 0 0';
+			self.actorpart_viewweapon.colormod = '5 0 0';
+		}
+		else
+		{
+		 	self.shieldactive = 0;
+		 	self.colormod = '1 1 1';
+			self.actorpart_torso.colormod = '1 1 1';
+			self.actorpart_head.colormod = '1 1 1';
+			self.actorpart_weapon.colormod = '1 1 1';
+			self.actorpart_viewweapon.colormod = '1 1 1';
+		}
+		
 		if (self.button7 & self.jetpackactive)
 		{
 			if ((self.jetpack_fuel > 10) && (self.actorpart_jetpacktrail.effects & EF_NODRAW))