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

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Tue Sep 15 05:41:52 EDT 2009


Author: div0
Date: 2009-09-15 05:41:52 -0400 (Tue, 15 Sep 2009)
New Revision: 7804

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/defaultNexuiz.cfg
   branches/nexuiz-2.0/data/qcsrc/client/sbar.qc
   branches/nexuiz-2.0/data/qcsrc/server/constants.qh
   branches/nexuiz-2.0/data/qcsrc/server/ctf.qc
   branches/nexuiz-2.0/data/qcsrc/server/g_damage.qc
   branches/nexuiz-2.0/data/qcsrc/server/keyhunt.qc
   branches/nexuiz-2.0/data/qcsrc/server/portals.qc
   branches/nexuiz-2.0/data/qcsrc/server/w_electro.qc
   branches/nexuiz-2.0/data/qcsrc/server/w_grenadelauncher.qc
   branches/nexuiz-2.0/data/qcsrc/server/w_rocketlauncher.qc
Log:
r7781 | lordhavoc | 2009-09-14 07:59:27 -0400 (Mon, 14 Sep 2009) | 3 lines
use less traces for radius damage again, and cap it at 20 (roughly this
means a rocket blast is up to 20 traces)
r7782 | lordhavoc | 2009-09-14 08:03:53 -0400 (Mon, 14 Sep 2009) | 3 lines
use different number of radius damage traces depending on whether target
is a player or not
r7783 | div0 | 2009-09-14 08:28:57 -0400 (Mon, 14 Sep 2009) | 2 lines
whereever event_damage is set (or damageforcescale), also set takedamage
r7784 | div0 | 2009-09-14 08:29:47 -0400 (Mon, 14 Sep 2009) | 2 lines
only apply radius damage if takedamage (NOT FOR 2.5.2)
r7785 | fruitiex | 2009-09-14 08:53:18 -0400 (Mon, 14 Sep 2009) | 2 lines
use sbar_bigfont in cl_showspeed


Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2009-09-15 09:40:21 UTC (rev 7803)
+++ branches/nexuiz-2.0/.patchsets	2009-09-15 09:41:52 UTC (rev 7804)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-7563,7565-7586,7589-7589,7592-7592,7595-7595,7597-7597,7599-7602,7605-7610,7612-7615,7619-7620,7623-7623,7626-7628,7630-7630,7644-7651,7656-7656,7658-7660,7663-7665,7670-7670,7672-7676,7678-7680,7686-7687,7689-7698,7701-7701,7703-7714,7717-7723,7731-7731,7735-7741,7744-7745,7752-7754,7756-7758,7761-7764,7771-7773,7775-7775,7778-7778
+revisions_applied = 1-7563,7565-7586,7589-7589,7592-7592,7595-7595,7597-7597,7599-7602,7605-7610,7612-7615,7619-7620,7623-7623,7626-7628,7630-7630,7644-7651,7656-7656,7658-7660,7663-7665,7670-7670,7672-7676,7678-7680,7686-7687,7689-7698,7701-7701,7703-7714,7717-7723,7731-7731,7735-7741,7744-7745,7752-7754,7756-7758,7761-7764,7771-7773,7775-7775,7778-7778,7781-7785

Modified: branches/nexuiz-2.0/data/defaultNexuiz.cfg
===================================================================
--- branches/nexuiz-2.0/data/defaultNexuiz.cfg	2009-09-15 09:40:21 UTC (rev 7803)
+++ branches/nexuiz-2.0/data/defaultNexuiz.cfg	2009-09-15 09:41:52 UTC (rev 7804)
@@ -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 ce0cb3a86b732067e5fb7347c0e0fb74
+set cvar_check_default 834f8769909c6e05af99c3f32ecd82fd
 
 // Nexuiz version (formatted for machines)
 // used to determine if a client version is compatible

Modified: branches/nexuiz-2.0/data/qcsrc/client/sbar.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/client/sbar.qc	2009-09-15 09:40:21 UTC (rev 7803)
+++ branches/nexuiz-2.0/data/qcsrc/client/sbar.qc	2009-09-15 09:41:52 UTC (rev 7804)
@@ -1948,7 +1948,8 @@
 	pos = cvar("cl_showspeed_position");
 	numsize_x = numsize_y = cvar("cl_showspeed_size");
 	pos = (vid_conheight - numsize_y) * pos;
-
+	
+	drawfont = sbar_bigfont;
 	drawstringcenter('1 0 0' + pos * '0 1 0', speed, numsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
 }
 

Modified: branches/nexuiz-2.0/data/qcsrc/server/constants.qh
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/constants.qh	2009-09-15 09:40:21 UTC (rev 7803)
+++ branches/nexuiz-2.0/data/qcsrc/server/constants.qh	2009-09-15 09:41:52 UTC (rev 7804)
@@ -1,4 +1,4 @@
-string CVAR_CHECK_DEFAULT = "ce0cb3a86b732067e5fb7347c0e0fb74";
+string CVAR_CHECK_DEFAULT = "834f8769909c6e05af99c3f32ecd82fd";
 string CVAR_CHECK_WEAPONS = "c55b862a83b1579ec2996cb2f92b819d";
 
 float	FALSE					= 0;

Modified: branches/nexuiz-2.0/data/qcsrc/server/ctf.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/ctf.qc	2009-09-15 09:40:21 UTC (rev 7803)
+++ branches/nexuiz-2.0/data/qcsrc/server/ctf.qc	2009-09-15 09:41:52 UTC (rev 7804)
@@ -209,6 +209,7 @@
 
 	setattachment(e, world, "");
 	e.damageforcescale = 0;
+	e.takedamage = DAMAGE_NO;
 	e.movetype = MOVETYPE_NONE;
 	if(!e.noalign)
 		e.movetype = MOVETYPE_TOSS;
@@ -296,6 +297,7 @@
 
 	setattachment(e, world, "");
 	e.damageforcescale = cvar("g_balance_ctf_damageforcescale");
+	e.takedamage = DAMAGE_YES;
 
 	if (p.flagcarried == e)
 		p.flagcarried = world;
@@ -618,6 +620,7 @@
 			setorigin(self, FLAG_CARRY_POS);
 			setattachment(self, other, "");
 			self.damageforcescale = 0;
+			e.takedamage = DAMAGE_NO;
 			WaypointSprite_AttachCarrier("flagcarrier", other);
 			WaypointSprite_UpdateTeamRadar(other.waypointsprite_attachedforcarrier, RADARICON_FLAGCARRIER, '1 1 0');
 		}

Modified: branches/nexuiz-2.0/data/qcsrc/server/g_damage.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_damage.qc	2009-09-15 09:40:21 UTC (rev 7803)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_damage.qc	2009-09-15 09:41:52 UTC (rev 7804)
@@ -1022,7 +1022,7 @@
 	{
 		next = targ.chain;
 		if (targ != inflictor)
-			if (ignore != targ)
+			if (ignore != targ) if(targ.takedamage)
 			{
 				// LordHavoc: measure distance to nearest point on target (not origin)
 				// (this guarentees 100% damage on a touch impact)
@@ -1057,7 +1057,10 @@
 						// test line of sight to multiple positions on box,
 						// and do damage if any of them hit
 						hits = 0;
-						total = ceil(bound(1, finaldmg, 50));
+						if (targ.classname == "player")
+							total = ceil(bound(1, finaldmg, 50));
+						else
+							total = ceil(bound(1, finaldmg/10, 5));
 						hitloc = nearest;
 						c = 0;
 						while (c < total)

Modified: branches/nexuiz-2.0/data/qcsrc/server/keyhunt.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/keyhunt.qc	2009-09-15 09:40:21 UTC (rev 7803)
+++ branches/nexuiz-2.0/data/qcsrc/server/keyhunt.qc	2009-09-15 09:41:52 UTC (rev 7804)
@@ -186,6 +186,7 @@
 	key.team = key.owner.team;
 	key.nextthink = time;
 	key.damageforcescale = 0;
+	key.takedamage = DAMAGE_NO;
 	key.modelindex = kh_key_carried;
 }
 
@@ -240,6 +241,7 @@
 	key.movetype = MOVETYPE_TOSS;
 	key.pain_finished = time + cvar("g_balance_keyhunt_delay_return");
 	key.damageforcescale = cvar("g_balance_keyhunt_damageforcescale");
+	key.takedamage = DAMAGE_YES;
 	// let key.team stay
 	key.modelindex = kh_key_dropped;
 	key.kh_previous_owner = key.owner;

Modified: branches/nexuiz-2.0/data/qcsrc/server/portals.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/portals.qc	2009-09-15 09:40:21 UTC (rev 7803)
+++ branches/nexuiz-2.0/data/qcsrc/server/portals.qc	2009-09-15 09:41:52 UTC (rev 7804)
@@ -603,6 +603,7 @@
 	portal.think = Portal_Think;
 	portal.nextthink = 0;
 	portal.portal_activatetime = time + 0.1;
+	portal.takedamage = DAMAGE_AIM;
 	portal.event_damage = Portal_Damage;
 	portal.fade_time = time + cvar("g_balance_portal_lifetime");
 	portal.health = cvar("g_balance_portal_health");

Modified: branches/nexuiz-2.0/data/qcsrc/server/w_electro.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_electro.qc	2009-09-15 09:40:21 UTC (rev 7803)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_electro.qc	2009-09-15 09:41:52 UTC (rev 7804)
@@ -9,6 +9,7 @@
 						announce(self.owner, "announcer/male/electrobitch.wav");
 
 	self.event_damage = SUB_Null;
+	self.takedamage = DAMAGE_NO;
 	if (self.movetype == MOVETYPE_BOUNCE)
 	{
 		RadiusDamage (self, self.owner, cvar("g_balance_electro_secondary_damage"), cvar("g_balance_electro_secondary_edgedamage"), cvar("g_balance_electro_secondary_radius"), world, cvar("g_balance_electro_secondary_force"), self.projectiledeathtype, other);

Modified: branches/nexuiz-2.0/data/qcsrc/server/w_grenadelauncher.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_grenadelauncher.qc	2009-09-15 09:40:21 UTC (rev 7803)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_grenadelauncher.qc	2009-09-15 09:41:52 UTC (rev 7804)
@@ -8,6 +8,7 @@
 						announce(self.owner, "announcer/male/airshot.wav");
 
 	self.event_damage = SUB_Null;
+	self.takedamage = DAMAGE_NO;
 	RadiusDamage (self, self.owner, cvar("g_balance_grenadelauncher_primary_damage"), cvar("g_balance_grenadelauncher_primary_edgedamage"), cvar("g_balance_grenadelauncher_primary_radius"), world, cvar("g_balance_grenadelauncher_primary_force"), self.projectiledeathtype, other);
 
 	remove (self);
@@ -22,6 +23,7 @@
 					announce(self.owner, "announcer/male/airshot.wav");
 
 	self.event_damage = SUB_Null;
+	self.takedamage = DAMAGE_NO;
 	RadiusDamage (self, self.owner, cvar("g_balance_grenadelauncher_secondary_damage"), cvar("g_balance_grenadelauncher_secondary_edgedamage"), cvar("g_balance_grenadelauncher_secondary_radius"), world, cvar("g_balance_grenadelauncher_secondary_force"), self.projectiledeathtype, other);
 
 	remove (self);

Modified: branches/nexuiz-2.0/data/qcsrc/server/w_rocketlauncher.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_rocketlauncher.qc	2009-09-15 09:40:21 UTC (rev 7803)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_rocketlauncher.qc	2009-09-15 09:41:52 UTC (rev 7804)
@@ -15,6 +15,7 @@
 	W_Rocket_Unregister();
 
 	self.event_damage = SUB_Null;
+	self.takedamage = DAMAGE_NO;
 	RadiusDamage (self, self.owner, cvar("g_balance_rocketlauncher_damage"), cvar("g_balance_rocketlauncher_edgedamage"), cvar("g_balance_rocketlauncher_radius"), world, cvar("g_balance_rocketlauncher_force"), self.projectiledeathtype, other);
 
 	if (self.owner.weapon == WEP_ROCKET_LAUNCHER)



More information about the nexuiz-commits mailing list