r2530 - in branches/nexuiz-2.0/data: maps qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2007-05-09 07:01:33 -0400 (Wed, 09 May 2007)
New Revision: 2530

Modified:
   branches/nexuiz-2.0/data/maps/basement.bsp
   branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
   branches/nexuiz-2.0/data/qcsrc/server/cl_player.qc
   branches/nexuiz-2.0/data/qcsrc/server/keyhunt.qc
Log:
revert accidentally broken basement; keyhunt fixes (height of DROPPED KEY); god mode now shows saved damage when it gets disabled


Modified: branches/nexuiz-2.0/data/maps/basement.bsp
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc	2007-05-09 11:00:15 UTC (rev 2529)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc	2007-05-09 11:01:33 UTC (rev 2530)
@@ -1212,6 +1212,13 @@
 			self.vote_nagtime = time + self.cvar_scr_centertime * 0.6;
 		}
 
+	// GOD MODE info
+	if(!(self.flags & FL_GODMODE)) if(self.max_armorvalue)
+	{
+		sprint(self, strcat("godmode saved you ", ftos(self.max_armorvalue), " units of damage, cheater!\n"));
+		self.max_armorvalue = 0;
+	}
+
 	if(self.classname == "player") {
 		local vector m1, m2;
 

Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_player.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_player.qc	2007-05-09 11:00:15 UTC (rev 2529)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_player.qc	2007-05-09 11:01:33 UTC (rev 2530)
@@ -261,13 +261,17 @@
 	if (take > 100)
 		TossGib (world, "models/gibs/chunk.mdl", hitloc, force * -0.2,1);
 
-	if (!(self.flags & FL_GODMODE))
 	if (time > self.spawnshieldtime)
 	{
-		self.armorvalue = self.armorvalue - save;
-		self.health = self.health - take;
-		// pause regeneration for 5 seconds
-		self.pauseregen_finished = max(self.pauseregen_finished, time + cvar("g_balance_pause_health_regen"));
+		if (!(self.flags & FL_GODMODE))
+		{
+			self.armorvalue = self.armorvalue - save;
+			self.health = self.health - take;
+			// pause regeneration for 5 seconds
+			self.pauseregen_finished = max(self.pauseregen_finished, time + cvar("g_balance_pause_health_regen"));
+		}
+		else
+			self.max_armorvalue += (save + take);
 	}
 	self.dmg_save = self.dmg_save + save;//max(save - 10, 0);
 	self.dmg_take = self.dmg_take + take;//max(take - 10, 0);

Modified: branches/nexuiz-2.0/data/qcsrc/server/keyhunt.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/keyhunt.qc	2007-05-09 11:00:15 UTC (rev 2529)
+++ branches/nexuiz-2.0/data/qcsrc/server/keyhunt.qc	2007-05-09 11:01:33 UTC (rev 2530)
@@ -16,6 +16,7 @@
 float KH_KEY_XYDIST = 24;
 float KH_KEY_XYSPEED = 45;
 #endif
+float KH_KEY_WP_ZSHIFT = 20;
 
 vector KH_KEY_MIN = '-10 -10 -46';
 vector KH_KEY_MAX = '10 10 3';
@@ -322,7 +323,7 @@
 
 	sprint(initial_owner, strcat("You got the ^2", key.netname, "\n"));
 
-	WaypointSprite_AttachCarrier("", key);
+	WaypointSprite_Spawn("", 0, 0, key, '0 0 1' * KH_KEY_WP_ZSHIFT, world, key.team, key, waypointsprite_attachedforcarrier, FALSE);
 	key.waypointsprite_attachedforcarrier.waypointsprite_for_player = kh_Key_waypointsprite_for_player;
 
 	kh_Key_AssignTo(key, initial_owner);