r2674 - in branches/nexuiz-2.0/data: models qcsrc/server scripts sound/misc

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Wed May 23 11:09:26 EDT 2007


Author: div0
Date: 2007-05-23 11:09:25 -0400 (Wed, 23 May 2007)
New Revision: 2674

Added:
   branches/nexuiz-2.0/data/models/bulcore.tga
   branches/nexuiz-2.0/data/models/bultrail.tga
   branches/nexuiz-2.0/data/models/elecbeam.tga
   branches/nexuiz-2.0/data/models/elecbeam2.tga
   branches/nexuiz-2.0/data/models/elecbeam3.tga
   branches/nexuiz-2.0/data/models/elecbeam4.tga
   branches/nexuiz-2.0/data/models/elecbeam5.tga
   branches/nexuiz-2.0/data/models/elecbeam6.tga
   branches/nexuiz-2.0/data/models/elecbeam7.tga
   branches/nexuiz-2.0/data/models/elecbeam8.tga
   branches/nexuiz-2.0/data/models/eleccore.tga
   branches/nexuiz-2.0/data/models/eleccore2.tga
   branches/nexuiz-2.0/data/models/eleccore3.tga
   branches/nexuiz-2.0/data/models/eleccore4.tga
   branches/nexuiz-2.0/data/models/eleccore5.tga
   branches/nexuiz-2.0/data/models/eleccore6.tga
   branches/nexuiz-2.0/data/models/eleccore7.tga
   branches/nexuiz-2.0/data/models/eleccore8.tga
   branches/nexuiz-2.0/data/models/elecglass.tga
   branches/nexuiz-2.0/data/models/elecglass_gloss.tga
   branches/nexuiz-2.0/data/models/lcore.tga
   branches/nexuiz-2.0/data/models/ltrail.tga
   branches/nexuiz-2.0/data/models/pcore.tga
   branches/nexuiz-2.0/data/models/ptrail.tga
   branches/nexuiz-2.0/data/scripts/leiprojectile.shader
   branches/nexuiz-2.0/data/sound/misc/spawn.wav
   branches/nexuiz-2.0/data/sound/misc/talk2.wav
Removed:
   branches/nexuiz-2.0/data/sound/misc/spawn.ogg
Modified:
   branches/nexuiz-2.0/data/models/ebomb.mdl
   branches/nexuiz-2.0/data/models/laser.mdl
   branches/nexuiz-2.0/data/models/plasmatrail.mdl
   branches/nexuiz-2.0/data/models/tracer.mdl
   branches/nexuiz-2.0/data/qcsrc/server/g_damage.qc
   branches/nexuiz-2.0/data/qcsrc/server/g_hook.qc
   branches/nexuiz-2.0/data/qcsrc/server/w_common.qc
   branches/nexuiz-2.0/data/qcsrc/server/w_crylink.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_hagar.qc
   branches/nexuiz-2.0/data/qcsrc/server/w_laser.qc
   branches/nexuiz-2.0/data/qcsrc/server/w_rocketlauncher.qc
Log:
leileilol's projectiles; separate spawn sound; separate say_team sound (talk2.wav); shot origin fixes; teamplay 4 fix


Copied: branches/nexuiz-2.0/data/models/bulcore.tga (from rev 2658, trunk/data/models/bulcore.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/models/bultrail.tga (from rev 2658, trunk/data/models/bultrail.tga)
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/models/ebomb.mdl
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/models/elecbeam.tga (from rev 2658, trunk/data/models/elecbeam.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/models/elecbeam2.tga (from rev 2658, trunk/data/models/elecbeam2.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/models/elecbeam3.tga (from rev 2658, trunk/data/models/elecbeam3.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/models/elecbeam4.tga (from rev 2658, trunk/data/models/elecbeam4.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/models/elecbeam5.tga (from rev 2658, trunk/data/models/elecbeam5.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/models/elecbeam6.tga (from rev 2658, trunk/data/models/elecbeam6.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/models/elecbeam7.tga (from rev 2658, trunk/data/models/elecbeam7.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/models/elecbeam8.tga (from rev 2658, trunk/data/models/elecbeam8.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/models/eleccore.tga (from rev 2658, trunk/data/models/eleccore.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/models/eleccore2.tga (from rev 2658, trunk/data/models/eleccore2.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/models/eleccore3.tga (from rev 2658, trunk/data/models/eleccore3.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/models/eleccore4.tga (from rev 2658, trunk/data/models/eleccore4.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/models/eleccore5.tga (from rev 2658, trunk/data/models/eleccore5.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/models/eleccore6.tga (from rev 2658, trunk/data/models/eleccore6.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/models/eleccore7.tga (from rev 2658, trunk/data/models/eleccore7.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/models/eleccore8.tga (from rev 2658, trunk/data/models/eleccore8.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/models/elecglass.tga (from rev 2658, trunk/data/models/elecglass.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/models/elecglass_gloss.tga (from rev 2658, trunk/data/models/elecglass_gloss.tga)
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/models/laser.mdl
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/models/lcore.tga (from rev 2658, trunk/data/models/lcore.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/models/ltrail.tga (from rev 2658, trunk/data/models/ltrail.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/models/pcore.tga (from rev 2658, trunk/data/models/pcore.tga)
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/models/plasmatrail.mdl
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/models/ptrail.tga (from rev 2658, trunk/data/models/ptrail.tga)
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/models/tracer.mdl
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/qcsrc/server/g_damage.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_damage.qc	2007-05-23 15:07:49 UTC (rev 2673)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_damage.qc	2007-05-23 15:09:25 UTC (rev 2674)
@@ -341,33 +341,34 @@
 
 	// nullify damage if teamplay is on
 	if(deathtype != DEATH_TELEFRAG)
+	if(attacker.team == targ.team)
+	if(attacker.classname == "player")
 	{
 		if(teamplay == 1)
-			if(attacker.team)
-				if(attacker.team == targ.team)
+			damage = 0;
+		else if(attacker != targ)
+		{
+			if(teamplay == 3)
+				damage = 0;
+			else if(teamplay == 4)
+			{
+				if(targ.classname == "player" && targ.deadflag == DEAD_NO)
+				{
+					mirrordamage = cvar("g_mirrordamage") * damage;
+					mirrorforce = cvar("g_mirrordamage") * vlen(force);
+					if(cvar("g_minstagib"))
+					{
+						if(cvar("g_friendlyfire") == 0)
+							damage = 0;
+					}
+					else
+						damage = cvar("g_friendlyfire") * damage;
+					// mirrordamage will be used LATER
+				}
+				else
 					damage = 0;
-		if(teamplay == 3)
-			if(attacker != targ)
-				if(attacker.team)
-					if(attacker.team == targ.team)
-						damage = 0;
-		if(teamplay == 4)
-			if(attacker != targ)
-				if(attacker.team == targ.team)
-					if(attacker.classname == "player")
-						if((targ.classname == "player") && (targ.health > 0))
-						{
-							mirrordamage = cvar("g_mirrordamage") * damage;
-							mirrorforce = cvar("g_mirrordamage") * vlen(force);
-							if(cvar("g_minstagib"))
-							{
-								if(cvar("g_friendlyfire") == 0)
-									damage = 0;
-							}
-							else
-								damage = cvar("g_friendlyfire") * damage;
-							// mirrordamage will be used LATER
-						}
+			}
+		}
 	}
 
 	if(cvar("g_lms"))

Modified: branches/nexuiz-2.0/data/qcsrc/server/g_hook.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_hook.qc	2007-05-23 15:07:49 UTC (rev 2673)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_hook.qc	2007-05-23 15:09:25 UTC (rev 2674)
@@ -77,7 +77,7 @@
 	self.nextthink = time;
 
 	makevectors(self.owner.v_angle);
-	org = self.owner.origin + self.owner.view_ofs + v_forward * 15 - v_right * 5 + v_up * -12;
+	org = self.owner.origin + self.owner.view_ofs + v_forward * 8 - v_right * 8 + v_up * -12;
 
 	if(self.rope_length < 0)
 		self.rope_length = vlen(org - self.origin);
@@ -226,7 +226,7 @@
 	missile.movetype = MOVETYPE_FLY;
 	missile.solid = SOLID_BBOX;
 
-	setmodel (missile, "models/ebomb.mdl"); // replace by something CENTERED!, precision set below
+	setmodel (missile, "models/ebomb.mdl"); // precision set below
 	setsize (missile, '-3 -3 -3', '3 3 3');
 	setorigin (missile, org);
 

Modified: branches/nexuiz-2.0/data/qcsrc/server/w_common.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_common.qc	2007-05-23 15:07:49 UTC (rev 2673)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_common.qc	2007-05-23 15:09:25 UTC (rev 2674)
@@ -154,7 +154,7 @@
 		setmodel (e, "models/tracer.mdl"); // precision set below
 		setsize (e, '0 0 0', '0 0 0');
 		setorigin (e, start);
-		e.effects = EF_ADDITIVE | EF_FULLBRIGHT | EF_NOSHADOW | EF_LOWPRECISION;
+		e.effects = EF_LOWPRECISION;
 		e.flags = FL_PROJECTILE;
 	}
 

Modified: branches/nexuiz-2.0/data/qcsrc/server/w_crylink.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_crylink.qc	2007-05-23 15:07:49 UTC (rev 2673)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_crylink.qc	2007-05-23 15:09:25 UTC (rev 2674)
@@ -29,7 +29,7 @@
 	self.glow_color = 0;
 	self.think = SUB_Remove;
 	self.movetype = MOVETYPE_NONE;
-	self.effects = EF_FULLBRIGHT | EF_LOWPRECISION;
+	self.effects = EF_LOWPRECISION;
 	SUB_SetFade(self, time, 1);
 	//remove (self);
 	*/
@@ -61,7 +61,7 @@
 	self.glow_color = 0;
 	self.think = SUB_Remove;
 	self.movetype = MOVETYPE_NONE;
-	self.effects = EF_FULLBRIGHT | EF_LOWPRECISION;
+	self.effects = EF_LOWPRECISION;
 	SUB_SetFade(self, time, 1);
 	//remove (self);
 	*/
@@ -105,7 +105,7 @@
 
 		//proj.glow_size = 20;
 
-		proj.effects = EF_NOSHADOW | EF_FULLBRIGHT | EF_LOWPRECISION;
+		proj.effects = EF_LOWPRECISION;
 		proj.flags = FL_PROJECTILE;
 		proj.colormod = proj_color;
 		counter = counter + 1;
@@ -150,7 +150,7 @@
 
 		//proj.glow_size = 20;
 
-		proj.effects = EF_NOSHADOW | EF_FULLBRIGHT | EF_LOWPRECISION;
+		proj.effects = EF_LOWPRECISION;
 		proj.flags = FL_PROJECTILE;
 		proj.colormod = proj_color;
 		counter = counter + 1;

Modified: branches/nexuiz-2.0/data/qcsrc/server/w_electro.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_electro.qc	2007-05-23 15:07:49 UTC (rev 2673)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_electro.qc	2007-05-23 15:09:25 UTC (rev 2674)
@@ -100,7 +100,7 @@
 
 	if (cvar("g_use_ammunition"))
 		self.ammo_cells = self.ammo_cells - cvar("g_balance_electro_primary_ammo");
-	proj.effects = EF_BRIGHTFIELD | EF_FULLBRIGHT | EF_NOSHADOW | EF_LOWPRECISION;
+	proj.effects = EF_BRIGHTFIELD | EF_LOWPRECISION;
 	proj.movetype = MOVETYPE_FLY;
 	proj.velocity = w_shotdir * cvar("g_balance_electro_primary_speed");
 	W_SetupProjectileVelocity(proj);
@@ -118,7 +118,7 @@
 {
 	local entity proj;
 
-	W_SetupShot (self, '11 8 -8', FALSE, 2, "weapons/electro_fire2.wav");
+	W_SetupShot (self, '8 4.5 -13', FALSE, 2, "weapons/electro_fire2.wav");
 
 	proj = spawn ();
 	proj.classname = "plasma";
@@ -132,7 +132,7 @@
 
 	if (cvar("g_use_ammunition"))
 		self.ammo_cells = self.ammo_cells - cvar("g_balance_electro_secondary_ammo");
-	proj.effects = EF_FULLBRIGHT | EF_NOSHADOW | EF_LOWPRECISION;
+	proj.effects = EF_LOWPRECISION;
 	//proj.glow_size = 50;
 	//proj.glow_color = 45;
 	proj.movetype = MOVETYPE_BOUNCE;

Modified: branches/nexuiz-2.0/data/qcsrc/server/w_grenadelauncher.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_grenadelauncher.qc	2007-05-23 15:07:49 UTC (rev 2673)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_grenadelauncher.qc	2007-05-23 15:09:25 UTC (rev 2674)
@@ -90,7 +90,7 @@
 	gren.bot_dodgerating = cvar("g_balance_grenadelauncher_primary_damage");
 	gren.movetype = MOVETYPE_BOUNCE;
 	gren.solid = SOLID_BBOX;
-	gren.effects = EF_NOSHADOW | EF_LOWPRECISION;
+	gren.effects = EF_LOWPRECISION;
 	setmodel(gren, "models/grenademodel.md3"); // precision set above
 	setsize(gren, '0 0 0', '0 0 0');
 	setorigin(gren, w_shotorg);
@@ -121,7 +121,7 @@
 	gren.bot_dodgerating = cvar("g_balance_grenadelauncher_secondary_damage");
 	gren.movetype = MOVETYPE_BOUNCE;
 	gren.solid = SOLID_BBOX;
-	gren.effects = EF_NOSHADOW | EF_LOWPRECISION;
+	gren.effects = EF_LOWPRECISION;
 	setmodel(gren, "models/grenademodel.md3"); // precision set above
 	setsize(gren, '0 0 -3', '0 0 -3');
 	setorigin(gren, w_shotorg);

Modified: branches/nexuiz-2.0/data/qcsrc/server/w_hagar.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_hagar.qc	2007-05-23 15:07:49 UTC (rev 2673)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_hagar.qc	2007-05-23 15:09:25 UTC (rev 2674)
@@ -100,7 +100,7 @@
 	//missile.damageforcescale = 4;
 	//missile.health = 10;
 	//missile.event_damage = W_Hagar_Damage;
-	missile.effects = EF_LOWPRECISION | EF_NOSHADOW | EF_FULLBRIGHT;
+	missile.effects = EF_LOWPRECISION;
 
 	missile.movetype = MOVETYPE_FLY;
 	missile.velocity = (w_shotdir + randomvec() * cvar("g_balance_hagar_primary_spread")) * cvar("g_balance_hagar_primary_speed");
@@ -136,7 +136,7 @@
 	//missile.damageforcescale = 4;
 	//missile.health = 10;
 	//missile.event_damage = W_Hagar_Damage;
-	missile.effects = EF_LOWPRECISION | EF_NOSHADOW | EF_FULLBRIGHT;
+	missile.effects = EF_LOWPRECISION;
 
 	missile.movetype = MOVETYPE_BOUNCEMISSILE;
 	missile.velocity = (w_shotdir + randomvec() * cvar("g_balance_hagar_secondary_spread")) * cvar("g_balance_hagar_secondary_speed");

Modified: branches/nexuiz-2.0/data/qcsrc/server/w_laser.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_laser.qc	2007-05-23 15:07:49 UTC (rev 2673)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_laser.qc	2007-05-23 15:09:25 UTC (rev 2674)
@@ -69,7 +69,7 @@
 	else
 		missile.nextthink = time + cvar("g_balance_laser_primary_lifetime");
 
-	missile.effects = EF_NOSHADOW | EF_FULLBRIGHT | EF_FULLBRIGHT | EF_LOWPRECISION;
+	missile.effects = EF_LOWPRECISION;
 	missile.flags = FL_PROJECTILE;
 }
 

Modified: branches/nexuiz-2.0/data/qcsrc/server/w_rocketlauncher.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_rocketlauncher.qc	2007-05-23 15:07:49 UTC (rev 2673)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_rocketlauncher.qc	2007-05-23 15:09:25 UTC (rev 2674)
@@ -236,7 +236,7 @@
 	missile.think = W_Rocket_Think;
 	missile.nextthink = time;
 	missile.cnt = time + cvar("g_balance_rocketlauncher_lifetime");
-	missile.effects = EF_NOSHADOW | EF_LOWPRECISION;
+	missile.effects = EF_LOWPRECISION;
 	sound (missile, CHAN_BODY, "weapons/rocket_fly.wav", 0.4, ATTN_NORM);
 	missile.flags = FL_PROJECTILE;
 

Copied: branches/nexuiz-2.0/data/scripts/leiprojectile.shader (from rev 2658, trunk/data/scripts/leiprojectile.shader)
===================================================================
--- branches/nexuiz-2.0/data/scripts/leiprojectile.shader	                        (rev 0)
+++ branches/nexuiz-2.0/data/scripts/leiprojectile.shader	2007-05-23 15:09:25 UTC (rev 2674)
@@ -0,0 +1,88 @@
+models/lasertrail
+{
+	cull disable
+	{
+		map models/ltrail.tga
+		blendfunc add
+		rgbGen identity
+	}
+}
+
+models/lasercore
+{
+	deformVertexes autosprite
+	{
+		map models/lcore.tga
+		blendfunc add
+		rgbGen identity
+	}
+}
+
+models/plastrail
+{
+	cull disable
+	{
+		map models/ptrail.tga
+		blendfunc add
+		rgbGen identity
+	}
+}
+
+models/plascore
+{
+	deformVertexes autosprite
+	{
+		map models/pcore.tga
+		blendfunc add
+		rgbGen identity
+	}
+}
+
+models/bultrail
+{
+	cull disable
+	{
+		map models/bultrail.tga
+		blendfunc add
+		rgbGen identity
+	}
+}
+
+models/bulcore
+{
+	deformVertexes autosprite
+	{
+		map models/bulcore.tga
+		blendfunc add
+		rgbGen identity
+	}
+}
+
+models/eleccore
+{
+	{
+		animmap 45 models/eleccore.tga models/eleccore2.tga models/eleccore3.tga models/eleccore4.tga models/eleccore5.tga models/eleccore6.tga models/eleccore7.tga models/eleccore8.tga 
+		blendfunc blend
+		rgbGen identity
+	}
+}
+
+models/elecglass
+{
+	{
+		map models/elecglass.tga
+		blendfunc add
+		rgbGen lightingDiffuse
+	}
+}
+
+models/elecbeam
+{
+	cull disable
+	{
+		animmap 35 models/elecbeam.tga models/elecbeam2.tga models/elecbeam3.tga models/elecbeam4.tga models/elecbeam5.tga models/elecbeam6.tga models/elecbeam7.tga models/elecbeam8.tga 
+		blendfunc add
+		rgbGen identity
+	}
+}
+

Deleted: branches/nexuiz-2.0/data/sound/misc/spawn.ogg
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/sound/misc/spawn.wav (from rev 2673, trunk/data/sound/misc/spawn.wav)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/sound/misc/talk2.wav (from rev 2673, trunk/data/sound/misc/talk2.wav)
===================================================================
(Binary files differ)




More information about the nexuiz-commits mailing list