[nexuiz-commits] r8157 - in branches/nexuiz-2.0: . data data/qcsrc/client data/qcsrc/server misc/tools

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Tue Oct 20 05:01:19 EDT 2009


Author: div0
Date: 2009-10-20 05:01:17 -0400 (Tue, 20 Oct 2009)
New Revision: 8157

Added:
   branches/nexuiz-2.0/data/physicsNexrun_dm.cfg
Removed:
   branches/nexuiz-2.0/data/physicsNexrun_defrag.cfg
Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/balance.cfg
   branches/nexuiz-2.0/data/balance25.cfg
   branches/nexuiz-2.0/data/balanceHavoc.cfg
   branches/nexuiz-2.0/data/balanceNexrun.cfg
   branches/nexuiz-2.0/data/balanceSamual.cfg
   branches/nexuiz-2.0/data/qcsrc/client/View.qc
   branches/nexuiz-2.0/data/qcsrc/client/projectile.qc
   branches/nexuiz-2.0/data/qcsrc/server/constants.qh
   branches/nexuiz-2.0/data/qcsrc/server/w_laser.qc
   branches/nexuiz-2.0/misc/tools/makebuild.sh
Log:
r8150 | fruitiex | 2009-10-18 15:00:22 -0400 (Sun, 18 Oct 2009) | 2 lines
move physicsNexrun_defrag.cfg to physicsNexrun_dm.cfg ;)
r8151 | fruitiex | 2009-10-18 15:09:37 -0400 (Sun, 18 Oct 2009) | 2 lines
rename something in physicsNexrun_dm.cfg, give shotgun force in balanceNexrun.cfg
r8152 | div0 | 2009-10-18 15:29:47 -0400 (Sun, 18 Oct 2009) | 1 line
makebuild: add hash-style=sysv now to 686 build too
r8153 | div0 | 2009-10-19 03:27:47 -0400 (Mon, 19 Oct 2009) | 2 lines
fix rifle crosshair and crash
r8154 | div0 | 2009-10-19 04:34:10 -0400 (Mon, 19 Oct 2009) | 2 lines
laser projectile delay (STUUUUUPID)
r8155 | fruitiex | 2009-10-19 13:35:20 -0400 (Mon, 19 Oct 2009) | 2 lines
health/armormedium 25, rl speed back to 1000
r8156 | fruitiex | 2009-10-19 17:08:48 -0400 (Mon, 19 Oct 2009) | 2 lines
more respawntime/item tweaks and a rl change


Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2009-10-19 21:08:48 UTC (rev 8156)
+++ branches/nexuiz-2.0/.patchsets	2009-10-20 09:01:17 UTC (rev 8157)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-7945,7948-7948,7951-7990,7993-8148
+revisions_applied = 1-7945,7948-7948,7951-7990,7993-8156

Modified: branches/nexuiz-2.0/data/balance.cfg
===================================================================
--- branches/nexuiz-2.0/data/balance.cfg	2009-10-19 21:08:48 UTC (rev 8156)
+++ branches/nexuiz-2.0/data/balance.cfg	2009-10-20 09:01:17 UTC (rev 8157)
@@ -3,7 +3,7 @@
 //
 // And... don't forget to edit the other balance*.cfg too.
 
-set cvar_check_balance 7f0cddd65617fa39bd3efb7942dceea9
+set cvar_check_balance 1904952fd0d915f79ab4e6f0622abdb6
 
 // {{{ weapon replacement
 // NOTE: this only replaces weapons on the map
@@ -224,6 +224,7 @@
 set g_balance_laser_primary_animtime 0.3
 set g_balance_laser_primary_lifetime 30
 set g_balance_laser_primary_shotangle 0
+set g_balance_laser_primary_delay 0.05
 set g_balance_laser_secondary 1 // when 1, a secondary laser mode exists
 set g_balance_laser_secondary_damage 25
 set g_balance_laser_secondary_edgedamage 10
@@ -234,6 +235,7 @@
 set g_balance_laser_secondary_animtime 0.3
 set g_balance_laser_secondary_lifetime 30
 set g_balance_laser_secondary_shotangle -90
+set g_balance_laser_secondary_delay 0
 //   }}}
 //   {{{ shotgun
 set g_balance_shotgun_primary_bullets 15

Modified: branches/nexuiz-2.0/data/balance25.cfg
===================================================================
--- branches/nexuiz-2.0/data/balance25.cfg	2009-10-19 21:08:48 UTC (rev 8156)
+++ branches/nexuiz-2.0/data/balance25.cfg	2009-10-20 09:01:17 UTC (rev 8157)
@@ -3,7 +3,7 @@
 //
 // And... don't forget to edit the other balance*.cfg too.
 
-set cvar_check_balance 7f0cddd65617fa39bd3efb7942dceea9
+set cvar_check_balance 1904952fd0d915f79ab4e6f0622abdb6
 
 // {{{ weapon replacement
 // NOTE: this only replaces weapons on the map
@@ -224,6 +224,7 @@
 set g_balance_laser_primary_animtime 0.3
 set g_balance_laser_primary_lifetime 30
 set g_balance_laser_primary_shotangle 0
+set g_balance_laser_primary_delay 0
 set g_balance_laser_secondary 0 // when 1, a secondary laser mode exists
 set g_balance_laser_secondary_damage 35
 set g_balance_laser_secondary_edgedamage 10
@@ -234,6 +235,7 @@
 set g_balance_laser_secondary_animtime 0.3
 set g_balance_laser_secondary_lifetime 30
 set g_balance_laser_secondary_shotangle 0
+set g_balance_laser_secondary_delay 0
 //   }}}
 //   {{{ shotgun
 set g_balance_shotgun_primary_bullets 6

Modified: branches/nexuiz-2.0/data/balanceHavoc.cfg
===================================================================
--- branches/nexuiz-2.0/data/balanceHavoc.cfg	2009-10-19 21:08:48 UTC (rev 8156)
+++ branches/nexuiz-2.0/data/balanceHavoc.cfg	2009-10-20 09:01:17 UTC (rev 8157)
@@ -3,7 +3,7 @@
 //
 // And... don't forget to edit the other balance*.cfg too.
 
-set cvar_check_balance 7f0cddd65617fa39bd3efb7942dceea9
+set cvar_check_balance 1904952fd0d915f79ab4e6f0622abdb6
 
 // {{{ weapon replacement
 // NOTE: this only replaces weapons on the map
@@ -224,6 +224,7 @@
 set g_balance_laser_primary_animtime 0.3
 set g_balance_laser_primary_lifetime 30
 set g_balance_laser_primary_shotangle 0
+set g_balance_laser_primary_delay 0
 set g_balance_laser_secondary 1 // when 1, a secondary laser mode exists
 set g_balance_laser_secondary_damage 25
 set g_balance_laser_secondary_edgedamage 10
@@ -234,6 +235,7 @@
 set g_balance_laser_secondary_animtime 0.3
 set g_balance_laser_secondary_lifetime 30
 set g_balance_laser_secondary_shotangle -90
+set g_balance_laser_secondary_delay 0
 //   }}}
 //   {{{ shotgun
 set g_balance_shotgun_primary_bullets 15

Modified: branches/nexuiz-2.0/data/balanceNexrun.cfg
===================================================================
--- branches/nexuiz-2.0/data/balanceNexrun.cfg	2009-10-19 21:08:48 UTC (rev 8156)
+++ branches/nexuiz-2.0/data/balanceNexrun.cfg	2009-10-20 09:01:17 UTC (rev 8157)
@@ -3,7 +3,7 @@
 //
 // And... don't forget to edit the other balance*.cfg too.
 
-set cvar_check_balance 1e423b95c67bac7998289473abe8feb1
+set cvar_check_balance 1904952fd0d915f79ab4e6f0622abdb6
 
 // {{{ weapon replacement
 // NOTE: this only replaces weapons on the map
@@ -49,7 +49,7 @@
 set g_balance_health_start 125
 set g_balance_armor_start 0
 set g_start_ammo_shells 0
-set g_start_ammo_nails 120
+set g_start_ammo_nails 90
 set g_start_ammo_rockets 0
 set g_start_ammo_cells 0
 set g_start_ammo_fuel 0
@@ -88,14 +88,14 @@
 set g_pickup_nails_max 180
 set g_pickup_rockets 12
 set g_pickup_rockets_max 50
-set g_pickup_cells 15
-set g_pickup_cells_max 50
+set g_pickup_cells 50
+set g_pickup_cells_max 100
 set g_pickup_fuel 25
 set g_pickup_fuel_jetpack 50
 set g_pickup_fuel_max 999
 set g_pickup_armorsmall 5
 set g_pickup_armorsmall_max 200
-set g_pickup_armormedium 20
+set g_pickup_armormedium 25
 set g_pickup_armormedium_max 100
 set g_pickup_armorbig 50
 set g_pickup_armorbig_max 100
@@ -103,22 +103,22 @@
 set g_pickup_armorlarge_max 200
 set g_pickup_healthsmall 5
 set g_pickup_healthsmall_max 200
-set g_pickup_healthmedium 20
+set g_pickup_healthmedium 25
 set g_pickup_healthmedium_max 100
 set g_pickup_healthlarge 50
 set g_pickup_healthlarge_max 100
 set g_pickup_healthmega 100
 set g_pickup_healthmega_max 200
-set g_pickup_respawntime_short 15
-set g_pickup_respawntime_medium 25
+set g_pickup_respawntime_short 30
+set g_pickup_respawntime_medium 30
 set g_pickup_respawntime_long 35
-set g_pickup_respawntime_powerup 120
-set g_pickup_respawntime_weapon 15
-set g_pickup_respawntime_ammo 15
+set g_pickup_respawntime_powerup 90
+set g_pickup_respawntime_weapon 5
+set g_pickup_respawntime_ammo 30
 set g_pickup_respawntimejitter_short 0
 set g_pickup_respawntimejitter_medium 0
 set g_pickup_respawntimejitter_long 0
-set g_pickup_respawntimejitter_powerup 10
+set g_pickup_respawntimejitter_powerup 15
 set g_pickup_respawntimejitter_weapon 0
 set g_pickup_respawntimejitter_ammo 0
 // }}}
@@ -185,13 +185,13 @@
 // }}}
 
 // {{{ powerups
-set g_balance_powerup_invincible_takedamage 0.2
+set g_balance_powerup_invincible_takedamage 0.25
 set g_balance_powerup_invincible_time 30
-set g_balance_powerup_strength_damage 3
-set g_balance_powerup_strength_force 3
+set g_balance_powerup_strength_damage 4
+set g_balance_powerup_strength_force 4
 set g_balance_powerup_strength_time 30
-set g_balance_powerup_strength_selfdamage 1.5
-set g_balance_powerup_strength_selfforce 1.5
+set g_balance_powerup_strength_selfdamage 2
+set g_balance_powerup_strength_selfforce 2
 // }}}
 
 // {{{ jetpack/hook
@@ -225,6 +225,7 @@
 set g_balance_laser_primary_animtime 0.1
 set g_balance_laser_primary_lifetime 0.066
 set g_balance_laser_primary_shotangle 0
+set g_balance_laser_primary_delay 0
 set g_balance_laser_secondary 1 // when 1, a secondary laser mode exists
 set g_balance_laser_secondary_damage 50
 set g_balance_laser_secondary_edgedamage 1
@@ -235,20 +236,21 @@
 set g_balance_laser_secondary_animtime 0.15
 set g_balance_laser_secondary_lifetime 0.066
 set g_balance_laser_secondary_shotangle 0
+set g_balance_laser_secondary_delay 0
 //   }}}
 //   {{{ shotgun
-set g_balance_shotgun_primary_bullets 15
-set g_balance_shotgun_primary_damage 10
-set g_balance_shotgun_primary_force 0
+set g_balance_shotgun_primary_bullets 16
+set g_balance_shotgun_primary_damage 7
+set g_balance_shotgun_primary_force 20
 set g_balance_shotgun_primary_spread 0.2
 set g_balance_shotgun_primary_refire 1
 set g_balance_shotgun_primary_animtime 1
 set g_balance_shotgun_primary_ammo 2
 set g_balance_shotgun_primary_speed 12000
 set g_balance_shotgun_primary_bulletconstant 75 // 3.8qu
-set g_balance_shotgun_secondary_bullets 15
-set g_balance_shotgun_secondary_damage 6
-set g_balance_shotgun_secondary_force 0
+set g_balance_shotgun_secondary_bullets 16
+set g_balance_shotgun_secondary_damage 5
+set g_balance_shotgun_secondary_force 20
 set g_balance_shotgun_secondary_spread 0.4
 set g_balance_shotgun_secondary_refire 2
 set g_balance_shotgun_secondary_animtime 0.5
@@ -348,7 +350,7 @@
 set g_balance_crylink_primary_other_lifetime 0.1 // range: 700 full, fades to 2450
 set g_balance_crylink_primary_other_fadetime 0.25
 
-set g_balance_crylink_secondary_damage 6
+set g_balance_crylink_secondary_damage 5
 set g_balance_crylink_secondary_edgedamage 0
 set g_balance_crylink_secondary_force -40
 set g_balance_crylink_secondary_radius 50
@@ -358,7 +360,7 @@
 set g_balance_crylink_secondary_bounces 0
 set g_balance_crylink_secondary_refire 0.1
 set g_balance_crylink_secondary_animtime 0.1
-set g_balance_crylink_secondary_ammo 1
+set g_balance_crylink_secondary_ammo 1.5
 set g_balance_crylink_secondary_bouncedamagefactor 0.5
 
 set g_balance_crylink_secondary_middle_lifetime 5 // range: 35000 full, fades to 70000
@@ -404,21 +406,21 @@
 set g_balance_hagar_secondary_ammo 0.5
 //   }}}
 //   {{{ rocketlauncher
-set g_balance_rocketlauncher_damage 80
+set g_balance_rocketlauncher_damage 70
 set g_balance_rocketlauncher_edgedamage 40
-set g_balance_rocketlauncher_force 400
-set g_balance_rocketlauncher_radius 150
-set g_balance_rocketlauncher_speed 1100
+set g_balance_rocketlauncher_force 375
+set g_balance_rocketlauncher_radius 120
+set g_balance_rocketlauncher_speed 1000
 set g_balance_rocketlauncher_speedaccel 0
-set g_balance_rocketlauncher_speedstart 1100
+set g_balance_rocketlauncher_speedstart 1000
 set g_balance_rocketlauncher_lifetime 30
-set g_balance_rocketlauncher_refire 1.2
-set g_balance_rocketlauncher_animtime 1.2
+set g_balance_rocketlauncher_refire 0.8
+set g_balance_rocketlauncher_animtime 0.8
 set g_balance_rocketlauncher_ammo 3
 set g_balance_rocketlauncher_health 40
 set g_balance_rocketlauncher_damageforcescale 4
 set g_balance_rocketlauncher_detonatedelay -1 // positive: timer till detonation is allowed, negative: "security device" that prevents ANY remote detonation if it could hurt its owner, zero: detonatable at any time
-set g_balance_rocketlauncher_guiderate 120 // max degrees per second
+set g_balance_rocketlauncher_guiderate 90 // max degrees per second
 set g_balance_rocketlauncher_guideratedelay 0.01 // immediate
 set g_balance_rocketlauncher_guidegoal 512 // goal distance for (non-laser) guiding (higher = less control, lower = erratic)
 set g_balance_rocketlauncher_guidedelay 0.15 // delay before guiding kicks in

Modified: branches/nexuiz-2.0/data/balanceSamual.cfg
===================================================================
--- branches/nexuiz-2.0/data/balanceSamual.cfg	2009-10-19 21:08:48 UTC (rev 8156)
+++ branches/nexuiz-2.0/data/balanceSamual.cfg	2009-10-20 09:01:17 UTC (rev 8157)
@@ -3,7 +3,7 @@
 //
 // And... don't forget to edit the other balance*.cfg too.
 
-set cvar_check_balance 7f0cddd65617fa39bd3efb7942dceea9
+set cvar_check_balance 1904952fd0d915f79ab4e6f0622abdb6
 
 // {{{ weapon replacement
 // NOTE: this only replaces weapons on the map
@@ -225,6 +225,7 @@
 set g_balance_laser_primary_animtime 0.3
 set g_balance_laser_primary_lifetime 30
 set g_balance_laser_primary_shotangle 0
+set g_balance_laser_primary_delay 0.05
 set g_balance_laser_secondary 1 // when 1, a secondary laser mode exists
 set g_balance_laser_secondary_damage 25
 set g_balance_laser_secondary_edgedamage 10
@@ -235,6 +236,7 @@
 set g_balance_laser_secondary_animtime 0.3
 set g_balance_laser_secondary_lifetime 30
 set g_balance_laser_secondary_shotangle -90
+set g_balance_laser_secondary_delay 0
 //   }}}
 //   {{{ shotgun
 set g_balance_shotgun_primary_bullets 6

Deleted: branches/nexuiz-2.0/data/physicsNexrun_defrag.cfg
===================================================================
--- branches/nexuiz-2.0/data/physicsNexrun_defrag.cfg	2009-10-19 21:08:48 UTC (rev 8156)
+++ branches/nexuiz-2.0/data/physicsNexrun_defrag.cfg	2009-10-20 09:01:17 UTC (rev 8157)
@@ -1,28 +0,0 @@
-// Nexrun tweaked to suit defrag maps
-sv_gravity 800
-sv_maxspeed 320
-// CPMA: 320
-sv_maxairspeed 320
-// CPMA: 320
-sv_accelerate 15
-sv_airaccelerate 1
-sv_friction 8
-edgefriction 1
-sv_stepheight 34
-// CPMA: 18
-sv_jumpvelocity 270
-sv_wateraccelerate 4
-sv_waterfriction 1
-sv_airaccel_sideways_friction 0
-sv_airaccel_qw 0.95
-// CPMA: 1
-sv_airstopaccelerate 2.5
-sv_airstrafeaccelerate 70
-sv_maxairstrafespeed 30
-sv_aircontrol 150
-sv_warsowbunny_turnaccel 0
-sv_warsowbunny_accel 0.1593
-sv_warsowbunny_topspeed 925
-sv_warsowbunny_backtosideratio 0.8
-sv_friction_on_land 0
-sv_doublejump 0

Copied: branches/nexuiz-2.0/data/physicsNexrun_dm.cfg (from rev 8156, trunk/data/physicsNexrun_dm.cfg)
===================================================================
--- branches/nexuiz-2.0/data/physicsNexrun_dm.cfg	                        (rev 0)
+++ branches/nexuiz-2.0/data/physicsNexrun_dm.cfg	2009-10-20 09:01:17 UTC (rev 8157)
@@ -0,0 +1,28 @@
+// Nexrun tweaked to suit CPM
+sv_gravity 800
+sv_maxspeed 320
+// CPMA: 320
+sv_maxairspeed 320
+// CPMA: 320
+sv_accelerate 15
+sv_airaccelerate 1
+sv_friction 8
+edgefriction 1
+sv_stepheight 34
+// CPMA: 18
+sv_jumpvelocity 270
+sv_wateraccelerate 4
+sv_waterfriction 1
+sv_airaccel_sideways_friction 0
+sv_airaccel_qw 0.95
+// CPMA: 1
+sv_airstopaccelerate 2.5
+sv_airstrafeaccelerate 70
+sv_maxairstrafespeed 30
+sv_aircontrol 150
+sv_warsowbunny_turnaccel 0
+sv_warsowbunny_accel 0.1593
+sv_warsowbunny_topspeed 925
+sv_warsowbunny_backtosideratio 0.8
+sv_friction_on_land 0
+sv_doublejump 0

Modified: branches/nexuiz-2.0/data/qcsrc/client/View.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/client/View.qc	2009-10-19 21:08:48 UTC (rev 8156)
+++ branches/nexuiz-2.0/data/qcsrc/client/View.qc	2009-10-20 09:01:17 UTC (rev 8157)
@@ -260,8 +260,12 @@
 	vector vecs, trueaimpoint, w_shotorg;
 	vector mi, ma, dv;
 	float shottype;
+	entity ta;
+	float mv;
 
 	mi = ma = '0 0 0';
+	ta = trueaim;
+	mv = MOVE_NOMONSTERS;
 
 	switch(activeweapon)
 	{
@@ -270,10 +274,16 @@
 		case WEP_HOOK: // no trueaim
 		case WEP_GRENADE_LAUNCHER: // toss curve
 			return SHOTTYPE_HITWORLD;
+		case WEP_NEX:
+		case WEP_MINSTANEX:
+			mv = MOVE_NORMAL;
+			break;
 		case WEP_CAMPINGRIFLE:
+			ta = trueaim_rifle;
+			mv = MOVE_NORMAL;
 			if(zoomscript_caught)
 			{
-				tracebox(view_origin, '0 0 0', '0 0 0', view_origin + view_forward * MAX_SHOT_DISTANCE, MOVE_NORMAL, trueaim);
+				tracebox(view_origin, '0 0 0', '0 0 0', view_origin + view_forward * MAX_SHOT_DISTANCE, mv, ta);
 				return EnemyHitCheck();
 			}
 			break;
@@ -293,10 +303,7 @@
 
 	vecs = decompressShotOrigin(getstati(STAT_SHOTORG));
 
-	if(activeweapon == WEP_CAMPINGRIFLE)
-		traceline(view_origin, view_origin + view_forward * MAX_SHOT_DISTANCE, MOVE_NORMAL, trueaim_rifle);
-	else
-		traceline(view_origin, view_origin + view_forward * MAX_SHOT_DISTANCE, MOVE_NOMONSTERS, trueaim);
+	traceline(view_origin, view_origin + view_forward * MAX_SHOT_DISTANCE, mv, ta);
 	trueaimpoint = trace_endpos;
 
 	if(vecs_x > 0)
@@ -308,10 +315,10 @@
 	w_shotorg = view_origin + dv;
 
 	// now move the vecs forward as much as requested if possible
-	tracebox(w_shotorg, mi, ma, w_shotorg + view_forward * (vecs_x + nudge), MOVE_NORMAL, trueaim); // FIXME this MOVE_NORMAL part will misbehave a little in csqc
+	tracebox(w_shotorg, mi, ma, w_shotorg + view_forward * (vecs_x + nudge), MOVE_NORMAL, ta); // FIXME this MOVE_NORMAL part will misbehave a little in csqc
 	w_shotorg = trace_endpos - view_forward * nudge;
 
-	tracebox(w_shotorg, mi, ma, trueaimpoint, MOVE_NORMAL, trueaim);
+	tracebox(w_shotorg, mi, ma, trueaimpoint, MOVE_NORMAL, ta);
 	shottype = EnemyHitCheck();
 	if(shottype != SHOTTYPE_HITWORLD)
 		return shottype;
@@ -732,22 +739,21 @@
 				else
 					bullets = 0;
 
-#define CROSSHAIR_DRAW_RING(i,j,sz,dummy1,dummy2) \
+#define CROSSHAIR_DRAW_RING(i,j,sz,wcross_name,wcross_alpha) \
 				drawpic(wcross_origin - ('0.5 0 0' * (sz * wcross_size_x * ring_scale + i * wcross_blur) + '0 0.5 0' * (sz * wcross_size_y * ring_scale + j * wcross_blur)), strcat("gfx/hud/rifle_ring_", ftos(bullets)), sz * wcross_size * ring_scale, wcross_color, wcross_alpha, DRAWFLAG_NORMAL)
 
-#define CROSSHAIR_DO_BLUR(M,sz,a,b) \
+#define CROSSHAIR_DO_BLUR(M,sz,wcross_name,wcross_alpha) \
 				do \
 				{ \
 					if(wcross_blur > 0) \
 					{ \
-						wcross_alpha = wcross_alpha * 0.04; \
 						for(i = -2; i <= 2; ++i) \
 							for(j = -2; j <= 2; ++j) \
-								M(i,j,sz,a,b); \
+								M(i,j,sz,wcross_name,wcross_alpha*0.04); \
 					} \
 					else \
 					{ \
-						M(0,0,sz,a,b); \
+						M(0,0,sz,wcross_name,wcross_alpha); \
 					} \
 				} \
 				while(0)

Modified: branches/nexuiz-2.0/data/qcsrc/client/projectile.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/client/projectile.qc	2009-10-19 21:08:48 UTC (rev 8156)
+++ branches/nexuiz-2.0/data/qcsrc/client/projectile.qc	2009-10-20 09:01:17 UTC (rev 8157)
@@ -293,6 +293,7 @@
 			case PROJECTILE_ROCKET: setmodel(self, "models/rocket.md3"); self.scale = 2; break;
 			case PROJECTILE_BULLET: setmodel(self, "models/tracer.mdl"); break;
 			case PROJECTILE_BULLET_GLOWING: setmodel(self, "models/tracer.mdl"); break;
+			case PROJECTILE_BULLET_GLOWING_TRACER: setmodel(self, "models/tracer.mdl"); break;
 			case PROJECTILE_CRYLINK: setmodel(self, "models/plasmatrail.mdl"); break;
 			case PROJECTILE_CRYLINK_BOUNCING: setmodel(self, "models/plasmatrail.mdl"); break;
 			case PROJECTILE_ELECTRO_BEAM: setmodel(self, "models/elaser.mdl"); break;

Modified: branches/nexuiz-2.0/data/qcsrc/server/constants.qh
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/constants.qh	2009-10-19 21:08:48 UTC (rev 8156)
+++ branches/nexuiz-2.0/data/qcsrc/server/constants.qh	2009-10-20 09:01:17 UTC (rev 8157)
@@ -1,5 +1,5 @@
 string CVAR_CHECK_DEFAULT = "5d48426c72cdfbf78480870c75601f89";
-string CVAR_CHECK_BALANCE = "7f0cddd65617fa39bd3efb7942dceea9";
+string CVAR_CHECK_BALANCE = "1904952fd0d915f79ab4e6f0622abdb6";
 
 float	FALSE					= 0;
 float	TRUE					= 1;

Modified: branches/nexuiz-2.0/data/qcsrc/server/w_laser.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_laser.qc	2009-10-19 21:08:48 UTC (rev 8156)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_laser.qc	2009-10-20 09:01:17 UTC (rev 8157)
@@ -13,6 +13,17 @@
 	remove (self);
 }
 
+void W_Laser_Think()
+{
+	self.movetype = MOVETYPE_FLY;
+	self.think = SUB_Remove;
+	if (self.dmg)
+		self.nextthink = time + cvar("g_balance_laser_secondary_lifetime");
+	else
+		self.nextthink = time + cvar("g_balance_laser_primary_lifetime");
+	CSQCProjectile(self, TRUE, PROJECTILE_LASER, TRUE);
+}
+
 void W_Laser_Attack (float issecondary)
 {
 	local entity missile;
@@ -52,7 +63,6 @@
 			missile.bot_dodgerating = cvar("g_balance_laser_primary_damage");
 	}
 
-	missile.movetype = MOVETYPE_FLY;
 	PROJECTILE_MAKETRIGGER(missile);
 	missile.projectiledeathtype = WEP_LASER;
 	if(issecondary == 1)
@@ -70,15 +80,22 @@
 	//missile.glow_color = 250; // 244, 250
 	//missile.glow_size = 120;
 	missile.touch = W_Laser_Touch;
-	missile.think = SUB_Remove;
-	if (issecondary == 1)
-		missile.nextthink = time + cvar("g_balance_laser_secondary_lifetime");
-	else
-		missile.nextthink = time + cvar("g_balance_laser_primary_lifetime");
 
 	missile.flags = FL_PROJECTILE;
 
-	CSQCProjectile(missile, TRUE, PROJECTILE_LASER, TRUE);
+	missile.think = W_Laser_Think;
+	if (issecondary == 1)
+		missile.nextthink = time + cvar("g_balance_laser_secondary_delay");
+	else
+		missile.nextthink = time + cvar("g_balance_laser_primary_delay");
+	if(time >= missile.nextthink)
+	{
+		entity oldself;
+		oldself = self;
+		self = missile;
+		self.think();
+		self = oldself;
+	}
 }
 
 void spawnfunc_weapon_laser (void)

Modified: branches/nexuiz-2.0/misc/tools/makebuild.sh
===================================================================
--- branches/nexuiz-2.0/misc/tools/makebuild.sh	2009-10-19 21:08:48 UTC (rev 8156)
+++ branches/nexuiz-2.0/misc/tools/makebuild.sh	2009-10-20 09:01:17 UTC (rev 8157)
@@ -111,7 +111,7 @@
 {
 #	buildon alientrap.org                         nexuiz              fteqcc.exe          /tmp/Darkplaces.build 'DP_MAKE_TARGET=mingw CC="/chroot/debian-etch/usr/bin/i586-mingw32msvc-gcc -g -DSUPPORTDIRECTX -I$HOME/dxheaders" WINDRES=/chroot/debian-etch/usr/bin/i586-mingw32msvc-windres SDL_CONFIG=$HOME/sdl-win32/SDL-1.2.13/bin/sdl-config' /chroot/debian-etch/usr/bin/i586-mingw32msvc-strip
 	buildon nex686build                           nexuiz              fteqcc.exe          /tmp/Darkplaces.build 'DP_MAKE_TARGET=mingw CC="$HOME/mingw32/bin/i386-mingw32-gcc -g -DSUPPORTDIRECTX -I$HOME/dxheaders" WINDRES="$HOME/mingw32/bin/i386-mingw32-windres" SDL_CONFIG="$HOME/sdl-win32/SDL-1.2.13/bin/sdl-config"' '"$HOME/mingw32/bin/i386-mingw32-strip"'
-	buildon nex686build                           nexuiz-linux-686    fteqcc-linux-686    /tmp/Darkplaces.build 'CC="gcc -g" DP_MODPLUG_STATIC_LIBDIR=$HOME/modplug-i386/lib DP_LINK_TO_LIBJPEG=1 LDFLAGS_LIBJPEG="$HOME/jpeg7/lib/libjpeg.a" CFLAGS_LIBJPEG="-I$HOME/jpeg7/include"' strip
+	buildon nex686build                           nexuiz-linux-686    fteqcc-linux-686    /tmp/Darkplaces.build 'CC="gcc -g -Wl,--hash-style=sysv" DP_MODPLUG_STATIC_LIBDIR=$HOME/modplug-i386/lib DP_LINK_TO_LIBJPEG=1 LDFLAGS_LIBJPEG="$HOME/jpeg7/lib/libjpeg.a" CFLAGS_LIBJPEG="-I$HOME/jpeg7/include"' strip
 #	buildon eos.thruhere.net                      nexuiz-linux-686    fteqcc-linux-686    /tmp/Darkplaces.build 'CC="gcc -g" DP_MODPLUG_STATIC_LIBDIR=$HOME/modplug-i386/lib DP_LINK_TO_LIBJPEG=1 LDFLAGS_LIBJPEG="$HOME/jpeg7/lib/libjpeg.a" CFLAGS_LIBJPEG="-I$HOME/jpeg7/include"' strip
 	buildon nexmacbuild                           nexuiz-osx          fteqcc-osx          /tmp/Darkplaces.build 'CC="gcc -g -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"' strip
 	buildon alientrap.org                         nexuiz-linux-x86_64 fteqcc-linux-x86_64 /tmp/Darkplaces.build 'CC="gcc -g -Wl,--hash-style=sysv" DP_MODPLUG_STATIC_LIBDIR=/home/divverent/modplug-x86_64/lib DP_LINK_TO_LIBJPEG=1 LDFLAGS_LIBJPEG="$HOME/jpeg7/lib/libjpeg.a" CFLAGS_LIBJPEG="-I$HOME/jpeg7/include"' strip



More information about the nexuiz-commits mailing list