[nexuiz-commits] r7451 - in branches/nexuiz-2.0: . data data/qcsrc/client data/qcsrc/server

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Sun Aug 16 12:59:24 EDT 2009


Author: div0
Date: 2009-08-16 12:59:23 -0400 (Sun, 16 Aug 2009)
New Revision: 7451

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/defaultNexuiz.cfg
   branches/nexuiz-2.0/data/qcsrc/client/gibs.qc
   branches/nexuiz-2.0/data/qcsrc/client/sbar.qc
   branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
   branches/nexuiz-2.0/data/qcsrc/server/constants.qh
   branches/nexuiz-2.0/data/qcsrc/server/g_world.qc
   branches/nexuiz-2.0/data/qcsrc/server/mode_onslaught.qc
Log:
r7443 | div0 | 2009-08-16 06:43:25 -0400 (Sun, 16 Aug 2009) | 2 lines
try netfps 32
r7444 | fruitiex | 2009-08-16 09:12:07 -0400 (Sun, 16 Aug 2009) | 2 lines
sbar_alpha_fg fix on armor/health icon
r7445 | fruitiex | 2009-08-16 09:40:34 -0400 (Sun, 16 Aug 2009) | 2 lines
cl_showpressekeys centered, cl_showspeed moved above it
r7446 | fruitiex | 2009-08-16 11:09:07 -0400 (Sun, 16 Aug 2009) | 2 lines
small cleanup to prevent alpha values greater than 1...
r7447 | div0 | 2009-08-16 12:06:15 -0400 (Sun, 16 Aug 2009) | 2 lines
fix "gentle" logic :(
r7448 | mand1nga | 2009-08-16 12:06:42 -0400 (Sun, 16 Aug 2009) | 1 line
Fix audio spam on generator auto-destruction. Disallow complete destruction of generators in warmup stage.
r7449 | div0 | 2009-08-16 12:35:42 -0400 (Sun, 16 Aug 2009) | 2 lines
ONS fixes
r7450 | div0 | 2009-08-16 12:40:26 -0400 (Sun, 16 Aug 2009) | 2 lines
individual hitplot


Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2009-08-16 16:40:26 UTC (rev 7450)
+++ branches/nexuiz-2.0/.patchsets	2009-08-16 16:59:23 UTC (rev 7451)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-7441
+revisions_applied = 1-7450

Modified: branches/nexuiz-2.0/data/defaultNexuiz.cfg
===================================================================
--- branches/nexuiz-2.0/data/defaultNexuiz.cfg	2009-08-16 16:40:26 UTC (rev 7450)
+++ branches/nexuiz-2.0/data/defaultNexuiz.cfg	2009-08-16 16:59:23 UTC (rev 7451)
@@ -26,7 +26,7 @@
 seta g_configversion 0	"Configuration file version (used to upgrade settings) 0: first run, or previous start was <2.4.1  Later, it's overridden by config.cfg, version ranges are defined in config_update.cfg"
 
 // default.cfg versioning (update using update-cvarcount.sh, run that every time after adding a new cvar)
-set cvar_check_default 78d0ce73981951ab9fe404a9607908c9
+set cvar_check_default 40fd98ae84e7814d9494ef3cef6fb162
 
 // Nexuiz version (formatted for machines)
 // used to determine if a client version is compatible
@@ -1569,12 +1569,12 @@
 seta sbar_increment_maptime 0	"set to 1 if you prefer an increasing hud timer"
 
 seta cl_showpressedkeys	0	"Show which movement keys someone is pressing: 1 for spectating, 2 for always"
-set cl_showpressedkeys_position "1 0.8"	"1 0 would be upper right corner, 0.5 0.5 the center"
+seta cl_showpressedkeys_position "0.5 0.8"	"1 0 would be upper right corner, 0.5 0.5 the center"
 
 seta cl_showspeed 0 "show the XY speed of the player"
 seta cl_showspeed_z 0 "include the speed on the Z-axis"
 seta cl_showspeed_size 14 "size of the numbers"
-seta cl_showspeed_position 0.3 "Y-axis positioning of the numbers"
+seta cl_showspeed_position 0.7 "Y-axis positioning of the numbers"
 
 set g_jetpack 0 "Jetpack mutator (uses the hook's button, can't coexist with the offhand hook, but only with the onhand one)"
 set g_jetpack_antigravity 0.8 "factor of gravity compensation of the jetpack"
@@ -1609,6 +1609,9 @@
 set cl_effects_lightningarc_branchfactor_add 0.1
 
 set g_hitplots 0 "when set to 1, hitplots are stored by the server to provide a means of proving that a triggerbot was used"
+seta g_hitplots_individuals "" "the individuals, by IP, that should have their hitplots recorded"
+alias g_hitplots_add "qc_cmd rpn /g_hitplots_individuals g_hitplots_individuals $1 union def"
+alias g_hitplots_remove "qc_cmd rpn /g_hitplots_individuals g_hitplots_individuals $1 difference def"
 
 alias mute "prvm_edictset server $1 muted 1" // I am lazy and not making an actual command of this
 alias unmute "prvm_edictset server $1 muted 0" // dito
@@ -1631,4 +1634,4 @@
 
 set g_mapinfo_settemp_acl "+*" "ACL for mapinfo setting cvars"
 
-cl_netfps 60 // moar
+cl_netfps 32 // moar

Modified: branches/nexuiz-2.0/data/qcsrc/client/gibs.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/client/gibs.qc	2009-08-16 16:40:26 UTC (rev 7450)
+++ branches/nexuiz-2.0/data/qcsrc/client/gibs.qc	2009-08-16 16:59:23 UTC (rev 7451)
@@ -146,7 +146,7 @@
 			gentle_prefix = "morphed_";
 	}
 
-	if(cvar("cl_gentle"))
+	if not(cvar("cl_gentle"))
 		amount *= 1 - cvar("cl_nogibs");
 
 	if(cvar("ekg"))

Modified: branches/nexuiz-2.0/data/qcsrc/client/sbar.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/client/sbar.qc	2009-08-16 16:40:26 UTC (rev 7450)
+++ branches/nexuiz-2.0/data/qcsrc/client/sbar.qc	2009-08-16 16:59:23 UTC (rev 7451)
@@ -115,7 +115,6 @@
 	string str, tmp, l_length;
 	float minus;
 	vector vsize, num_color;
-	alpha = alpha * sbar_alpha_fg;
 
 	vsize_x = vsize_y = lettersize;
 	vsize_z = 0;
@@ -159,7 +158,7 @@
 		hl_pos_y = pos_y - lettersize/20;
 		hl_pos_z = 0;
 
-		drawpic(hl_pos, strcat("gfx/hud/sb_highlight_", l_length), hl_size, '1 1 1', sbar_alpha_fg, dflags);
+		drawpic(hl_pos, strcat("gfx/hud/sb_highlight_", l_length), hl_size, '1 1 1', alpha, dflags);
 	}
 
 	if (stroke == 1)
@@ -1690,7 +1689,7 @@
 			{
 				drawpic(bottom + '192 -24 0', "gfx/hud/sb_invinc", picsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE);
 			}
-			Sbar_DrawXNum(bottom + '152 -22 0', ceil(dt), 2, countdown_fontsize, '1 1 1', 0, 0, 1, DRAWFLAG_NORMAL);
+			Sbar_DrawXNum(bottom + '152 -22 0', ceil(dt), 2, countdown_fontsize, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
 		}
 		else if(dt > -1)
 		{
@@ -2455,11 +2454,14 @@
 			x = armor;
 			if (x > 0)
 			{
-				drawpic(armor_pos + '78 -4.5 0', "gfx/hud/sb_armor", '32 32 0', '1 1 1', (x+10)/55 * sbar_alpha_fg, DRAWFLAG_NORMAL);
-				if (x > 45)
+				if (x > 45) {
+					drawpic(armor_pos + '78 -4.5 0', "gfx/hud/sb_armor", '32 32 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
 					Sbar_DrawXNum_Colored(armor_pos, x, 24, sbar_alpha_fg);
-				else
+				}
+				else {
+					drawpic(armor_pos + '78 -4.5 0', "gfx/hud/sb_armor", '32 32 0', '1 1 1', (x+10)/55 * sbar_alpha_fg, DRAWFLAG_NORMAL);
 					Sbar_DrawXNum_Colored(armor_pos, x, 24, (x+10)/55 * sbar_alpha_fg);
+				}
 			}
 
 			// health
@@ -2565,9 +2567,9 @@
 			}
 			drawpic(pos - '0 2 0' + '52 0 0', GetAmmoPicture(4), '20 20 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
 			if (a > 10)
-				Sbar_DrawXNum(pos, a, 3, 16, '1 1 1', 0, 0, 1, DRAWFLAG_NORMAL);
+				Sbar_DrawXNum(pos, a, 3, 16, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
 			else
-				Sbar_DrawXNum(pos, a, 3, 16, '0.7 0 0', 0, 0, 1, DRAWFLAG_NORMAL);
+				Sbar_DrawXNum(pos, a, 3, 16, '0.7 0 0', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
 		}
 
 		// draw scores and timer

Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc	2009-08-16 16:40:26 UTC (rev 7450)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc	2009-08-16 16:59:23 UTC (rev 7451)
@@ -1444,9 +1444,9 @@
 
 	SoundEntity_Attach(self);
 
-	if(cvar("g_hitplots"))
+	if(cvar("g_hitplots") || strstrofs(strcat(" ", cvar_string("g_hitplots_individuals"), " "), strcat(" ", self.netaddress, " "), 0) >= 0)
 	{
-		self.hitplotfh = fopen(strcat("hits-", matchid, "-", ftos(self.playerid), ".plot"), FILE_WRITE);
+		self.hitplotfh = fopen(strcat("hits-", matchid, "-", self.netaddress, "-", ftos(self.playerid), ".plot"), FILE_WRITE);
 		fputs(self.hitplotfh, strcat("#name ", self.netname, "\n"));
 	}
 	else

Modified: branches/nexuiz-2.0/data/qcsrc/server/constants.qh
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/constants.qh	2009-08-16 16:40:26 UTC (rev 7450)
+++ branches/nexuiz-2.0/data/qcsrc/server/constants.qh	2009-08-16 16:59:23 UTC (rev 7451)
@@ -1,4 +1,4 @@
-string CVAR_CHECK_DEFAULT = "78d0ce73981951ab9fe404a9607908c9";
+string CVAR_CHECK_DEFAULT = "40fd98ae84e7814d9494ef3cef6fb162";
 string CVAR_CHECK_WEAPONS = "a7ca57b891d66754b856e24e5c1745e3";
 
 float	FALSE					= 0;

Modified: branches/nexuiz-2.0/data/qcsrc/server/g_world.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_world.qc	2009-08-16 16:40:26 UTC (rev 7450)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_world.qc	2009-08-16 16:59:23 UTC (rev 7451)
@@ -122,7 +122,7 @@
 			remove(self);
 			return;
 		}
-		
+
 	}
 	else if (timeoutStatus == 0) { //if a player called the resumegame command (which set timeoutStatus to 0 already)
 		FOR_EACH_REALCLIENT(plr) {
@@ -301,7 +301,7 @@
 		tracebox(o, PL_MIN, PL_MAX, o - '0 0 32768', MOVE_WORLDONLY, world);
 		if(trace_fraction == 1)
 			continue;
-		
+
 		v = trace_endpos;
 
 		for(i = 0; i < 64; i += 4)
@@ -591,7 +591,7 @@
 	addstat(STAT_GAMESTARTTIME, AS_FLOAT, stat_game_starttime);
 	addstat(STAT_ALLOW_OLDNEXBEAM, AS_INT, stat_allow_oldnexbeam);
 	Nagger_Init();
-	
+
 	addstat(STAT_STRENGTH_FINISHED, AS_FLOAT, strength_finished);
 	addstat(STAT_INVINCIBLE_FINISHED, AS_FLOAT, invincible_finished);
 	addstat(STAT_PRESSED_KEYS, AS_FLOAT, pressedkeys);
@@ -1222,7 +1222,7 @@
 			GameLogEcho(s);
 		if(to_file)
 			fputs(file, strcat(s, "\n"));
-	
+
 		for(i = 1; i < 16; ++i)
 		{
 			s = strcat(":teamscores:see-labels:", GetTeamScoreString(i, 0));
@@ -1405,7 +1405,7 @@
 			minutesPlural = " ^3minute";
 		else
 			minutesPlural = " ^3minutes";
-		
+
 		bcenterprint(
 			strcat(
 				"^3Now playing ^1OVERTIME^3!\n\n^3Added ^1",
@@ -1415,7 +1415,7 @@
 			)
 		);
 	}
-	else 
+	else
 	{
 		if(!checkrules_suddendeathend)
 		{
@@ -1474,6 +1474,9 @@
 
 	WinningConditionHelper(); // set worldstatus
 
+	if(inWarmupStage)
+		return WINNING_NO;
+
 	// first check if the game has ended
 	t1 = t2 = t3 = t4 = 0;
 	head = find(world, classname, "onslaught_generator");
@@ -1660,7 +1663,7 @@
 {
 	// TODO make everything use THIS winning condition (except LMS)
 	WinningConditionHelper();
-	
+
 	if(teams_matter)
 	{
 		team1_score = TeamScore_GetCompareValue(COLOR_TEAM1);
@@ -1668,7 +1671,7 @@
 		team3_score = TeamScore_GetCompareValue(COLOR_TEAM3);
 		team4_score = TeamScore_GetCompareValue(COLOR_TEAM4);
 	}
-	
+
 	ClearWinners();
 	if(WinningConditionHelper_winner)
 		WinningConditionHelper_winner.winning = 1;
@@ -1871,6 +1874,9 @@
 		leadlimit = 0; // no leadlimit for now
 	}
 
+	if(g_onslaught)
+		timelimit = 0; // ONS has its own overtime rule
+
 	if(timelimit > 0)
 	{
 		timelimit += game_starttime;

Modified: branches/nexuiz-2.0/data/qcsrc/server/mode_onslaught.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/mode_onslaught.qc	2009-08-16 16:40:26 UTC (rev 7450)
+++ branches/nexuiz-2.0/data/qcsrc/server/mode_onslaught.qc	2009-08-16 16:59:23 UTC (rev 7451)
@@ -402,8 +402,10 @@
 	local float d;
 	local entity e;
 	self.nextthink = ceil(time + 1);
-	if (cvar("timelimit"))
-		if (time > cvar("timelimit") * 60 - 60)
+	if (!gameover)
+	{
+		if (cvar("timelimit"))
+		if (time > game_starttime + cvar("timelimit") * 60)
 		{
 			// self.max_health / 300 gives 5 minutes of overtime.
 			// control points reduce the overtime duration.
@@ -420,7 +422,7 @@
 			d = d * self.max_health / 300;
 			Damage(self, self, self, d, DEATH_HURTTRIGGER, self.origin, '0 0 0');
 		}
-
+	}
 };
 
 void onslaught_generator_ring_think()
@@ -623,6 +625,8 @@
 	local float i;
 	if (damage <= 0)
 		return;
+	if(inWarmupStage)
+		return;
 	if (attacker != self)
 	{
 		if (self.isshielded)
@@ -659,7 +663,7 @@
 #endif
 		self.lasthealth = self.health;
 	}
-	else
+	else if not(inWarmupStage)
 	{
 		if (attacker == self)
 			bprint(ColoredTeamName(self.team), " generator spontaneously exploded due to overtime!\n");
@@ -683,6 +687,7 @@
 
 		onslaught_updatelinks();
 	}
+
 	if(self.health <= 0)
 		setmodel(self, "models/onslaught/generator_dead.md3");
 	else if(self.health < self.max_health * 0.10)



More information about the nexuiz-commits mailing list