[nexuiz-commits] r8026 - in branches/nexuiz-2.0: . Docs data/qcsrc/server

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Sat Oct 3 10:17:12 EDT 2009


Author: div0
Date: 2009-10-03 10:17:12 -0400 (Sat, 03 Oct 2009)
New Revision: 8026

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/Docs/eventlog.txt
   branches/nexuiz-2.0/data/qcsrc/server/w_campingrifle.qc
Log:
r8024 | div0 | 2009-10-03 10:12:28 -0400 (Sat, 03 Oct 2009) | 2 lines
fix #553
r8025 | div0 | 2009-10-03 10:16:20 -0400 (Sat, 03 Oct 2009) | 2 lines
#545


Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2009-10-03 14:16:20 UTC (rev 8025)
+++ branches/nexuiz-2.0/.patchsets	2009-10-03 14:17:12 UTC (rev 8026)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-7945,7948-7948,7951-7990,7993-8022
+revisions_applied = 1-7945,7948-7948,7951-7990,7993-8025

Modified: branches/nexuiz-2.0/Docs/eventlog.txt
===================================================================
--- branches/nexuiz-2.0/Docs/eventlog.txt	2009-10-03 14:16:20 UTC (rev 8025)
+++ branches/nexuiz-2.0/Docs/eventlog.txt	2009-10-03 14:17:12 UTC (rev 8026)
@@ -39,6 +39,15 @@
    :ctf:return:<flagcolor>:<ID of defender>
    :ctf:returned:<flagcolor>
    :dom:taken:<previouscolor>:<ID of player>
+   :keyhunt:capture:<ID of player>:<points for player>:<ID of key owner>:<points for key owner>:<name of key>
+   :keyhunt:carrierfrag:<ID of player>:<points for player>:<ID of key owner>:<points for key owner>:<name of key>
+   :keyhunt:collect:<ID of player>:<points for player>:<ID of key owner>:<points for key owner>:<name of key>
+   :keyhunt:destroyed:<ID of player>:<points for player>:<ID of key owner>:<points for key owner>:<name of key>
+   :keyhunt:destroyed_holdingkey:<ID of player>:<points for player>:<ID of key owner>:<points for key owner>:<name of key>
+   :keyhunt:dropkey:<ID of player>:<points for player>:<ID of key owner>:<points for key owner>:<name of key>
+   :keyhunt:losekey:<ID of player>:<points for player>:<ID of key owner>:<points for key owner>:<name of key>
+   :keyhunt:push:<ID of player>:<points for player>:<ID of key owner>:<points for key owner>:<name of key>
+   :keyhunt:pushed:<ID of player>:<points for player>:<ID of key owner>:<points for key owner>:<name of key>
    :scores:<gametype>_<mapname>:<map runtime>
    :labels:player:<head1><flags>,<head2><flags>,...
    :player:see-labels:<score1>,<score2>,...:<playtime>:<team>:<ID>:<nickname>

Modified: branches/nexuiz-2.0/data/qcsrc/server/w_campingrifle.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_campingrifle.qc	2009-10-03 14:16:20 UTC (rev 8025)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_campingrifle.qc	2009-10-03 14:17:12 UTC (rev 8026)
@@ -4,14 +4,15 @@
 
 .float campingrifle_accumulator;
 
-float W_CampingRifle_CheckMaxBullets()
+float W_CampingRifle_CheckMaxBullets(float checkammo)
 {
 	float maxbulls;
 	maxbulls = cvar("g_balance_campingrifle_magazinecapacity");
 	if(!maxbulls)
-		maxbulls = 8;
-	if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
-		maxbulls = min(maxbulls, floor(self.ammo_nails / min(cvar("g_balance_campingrifle_primary_ammo"), cvar("g_balance_campingrifle_secondary_ammo"))));
+		maxbulls = 8; // match HUD
+	if(checkammo)
+		if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
+			maxbulls = min(maxbulls, floor(self.ammo_nails / min(cvar("g_balance_campingrifle_primary_ammo"), cvar("g_balance_campingrifle_secondary_ammo"))));
 	if(self.campingrifle_bulletcounter > maxbulls || !cvar("g_balance_campingrifle_magazinecapacity"))
 		self.campingrifle_bulletcounter = maxbulls;
 	return (self.campingrifle_bulletcounter == maxbulls);
@@ -21,7 +22,7 @@
 {
 	float t;
 	self.campingrifle_bulletcounter = cvar("g_balance_campingrifle_magazinecapacity");
-	W_CampingRifle_CheckMaxBullets();
+	W_CampingRifle_CheckMaxBullets(TRUE);
 	t = ATTACK_FINISHED(self) - cvar("g_balance_campingrifle_reloadtime") - 1;
 	ATTACK_FINISHED(self) = t;
 	w_ready();
@@ -31,7 +32,7 @@
 {
 	float t;
 
-	W_CampingRifle_CheckMaxBullets();
+	W_CampingRifle_CheckMaxBullets(TRUE);
 	if (self.campingrifle_bulletcounter >= cvar("g_balance_campingrifle_magazinecapacity"))
 		return;
 
@@ -94,7 +95,7 @@
 		SpawnCasing (((random () * 50 + 50) * v_right) - (v_forward * (random () * 25 + 25)) - ((random () * 5 - 70) * v_up), 2, vectoangles(v_forward),'0 250 0', 100, 3, self);
 	
 	self.campingrifle_bulletcounter = self.campingrifle_bulletcounter - 1;
-	W_CampingRifle_CheckMaxBullets();
+	W_CampingRifle_CheckMaxBullets(TRUE);
 }
 
 void W_CampingRifle_Attack()
@@ -181,7 +182,7 @@
 	{
 		weapon_setup(WEP_CAMPINGRIFLE);
 
-		full = W_CampingRifle_CheckMaxBullets();
+		full = W_CampingRifle_CheckMaxBullets(TRUE);
 		if(cvar("g_balance_campingrifle_auto_reload_after_changing_weapons"))
 			if(!full)
 				self.campingrifle_bulletcounter = -1;
@@ -230,7 +231,7 @@
 	{
 		self.campingrifle_accumulator = time - cvar("g_balance_campingrifle_bursttime");
 		self.campingrifle_bulletcounter = cvar("g_balance_campingrifle_magazinecapacity");
-		W_CampingRifle_CheckMaxBullets();
+		W_CampingRifle_CheckMaxBullets(FALSE);
 	}
 	return TRUE;
 };



More information about the nexuiz-commits mailing list