[nexuiz-commits] r8472 - in trunk/data: . qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2010-01-03 14:16:16 -0500 (Sun, 03 Jan 2010)
New Revision: 8472

Modified:
   trunk/data/balance.cfg
   trunk/data/balance25.cfg
   trunk/data/balanceHavoc.cfg
   trunk/data/balanceNexrun.cfg
   trunk/data/balanceSamual.cfg
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/server/cl_weaponsystem.qc
   trunk/data/qcsrc/server/miscfunctions.qc
Log:
new cvar g_weaponspreadfactor


Modified: trunk/data/balance.cfg
===================================================================
--- trunk/data/balance.cfg	2010-01-03 14:02:08 UTC (rev 8471)
+++ trunk/data/balance.cfg	2010-01-03 19:16:16 UTC (rev 8472)
@@ -158,6 +158,7 @@
 set g_weaponratefactor 1 "weapon fire rate multiplier"
 set g_weapondamagefactor 1 "weapon damage multiplier"
 set g_weaponforcefactor 1 "weapon force multiplier"
+set g_weaponspreadfactor 1 "weapon spread multiplier"
 set g_balance_firetransfer_time 0.9
 set g_balance_firetransfer_damage 0.8
 set g_throughfloor_damage 0.4

Modified: trunk/data/balance25.cfg
===================================================================
--- trunk/data/balance25.cfg	2010-01-03 14:02:08 UTC (rev 8471)
+++ trunk/data/balance25.cfg	2010-01-03 19:16:16 UTC (rev 8472)
@@ -157,6 +157,7 @@
 set g_weaponratefactor 1 "weapon fire rate multiplier"
 set g_weapondamagefactor 1 "weapon damage multiplier"
 set g_weaponforcefactor 1 "weapon force multiplier"
+set g_weaponspreadfactor 1 "weapon spread multiplier"
 set g_balance_firetransfer_time 0.9
 set g_balance_firetransfer_damage 0.8
 set g_throughfloor_damage 1

Modified: trunk/data/balanceHavoc.cfg
===================================================================
--- trunk/data/balanceHavoc.cfg	2010-01-03 14:02:08 UTC (rev 8471)
+++ trunk/data/balanceHavoc.cfg	2010-01-03 19:16:16 UTC (rev 8472)
@@ -157,6 +157,7 @@
 set g_weaponratefactor 1 "weapon fire rate multiplier"
 set g_weapondamagefactor 1 "weapon damage multiplier"
 set g_weaponforcefactor 1 "weapon force multiplier"
+set g_weaponspreadfactor 1 "weapon spread multiplier"
 set g_balance_firetransfer_time 0.9
 set g_balance_firetransfer_damage 0.8
 set g_throughfloor_damage 0

Modified: trunk/data/balanceNexrun.cfg
===================================================================
--- trunk/data/balanceNexrun.cfg	2010-01-03 14:02:08 UTC (rev 8471)
+++ trunk/data/balanceNexrun.cfg	2010-01-03 19:16:16 UTC (rev 8472)
@@ -158,6 +158,7 @@
 set g_weaponratefactor 1 "weapon fire rate multiplier"
 set g_weapondamagefactor 1 "weapon damage multiplier"
 set g_weaponforcefactor 1 "weapon force multiplier"
+set g_weaponspreadfactor 1 "weapon spread multiplier"
 set g_balance_firetransfer_time 0.9
 set g_balance_firetransfer_damage 0.8
 set g_throughfloor_damage 0.5

Modified: trunk/data/balanceSamual.cfg
===================================================================
--- trunk/data/balanceSamual.cfg	2010-01-03 14:02:08 UTC (rev 8471)
+++ trunk/data/balanceSamual.cfg	2010-01-03 19:16:16 UTC (rev 8472)
@@ -158,6 +158,7 @@
 set g_weaponratefactor 1 "weapon fire rate multiplier"
 set g_weapondamagefactor 1 "weapon damage multiplier"
 set g_weaponforcefactor 1 "weapon force multiplier"
+set g_weaponspreadfactor 1 "weapon spread multiplier"
 set g_balance_firetransfer_time 0.9
 set g_balance_firetransfer_damage 0.8
 set g_throughfloor_damage 0.4

Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2010-01-03 14:02:08 UTC (rev 8471)
+++ trunk/data/defaultNexuiz.cfg	2010-01-03 19:16:16 UTC (rev 8472)
@@ -19,8 +19,8 @@
 // detect dedicated server or client
 alias "_detect_dedicated_$qport" "$*"
 alias "_detect_dedicated_0" ""
-alias if_dedicated "_detect_dedicated_$qport $*"
-alias if_client "$*"
+alias if_dedicated "_detect_dedicated_$qport ${* asis}"
+alias if_client "${* asis}"
 if_dedicated alias if_client ""
 
 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"

Modified: trunk/data/qcsrc/server/cl_weaponsystem.qc
===================================================================
--- trunk/data/qcsrc/server/cl_weaponsystem.qc	2010-01-03 14:02:08 UTC (rev 8471)
+++ trunk/data/qcsrc/server/cl_weaponsystem.qc	2010-01-03 19:16:16 UTC (rev 8472)
@@ -1378,6 +1378,7 @@
 	vector v1, v2;
 	float dx, dy, r;
 	float sstyle;
+	spread *= g_weaponspreadfactor;
 	if(spread <= 0)
 		return forward;
 	sstyle = cvar("g_projectiles_spread_style");

Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2010-01-03 14:02:08 UTC (rev 8471)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2010-01-03 19:16:16 UTC (rev 8472)
@@ -871,6 +871,7 @@
 float g_weaponratefactor;
 float g_weapondamagefactor;
 float g_weaponforcefactor;
+float g_weaponspreadfactor;
 
 float start_weapons;
 float start_items;
@@ -1278,6 +1279,7 @@
 	g_weaponratefactor = cvar("g_weaponratefactor");
 	g_weapondamagefactor = cvar("g_weapondamagefactor");
 	g_weaponforcefactor = cvar("g_weaponforcefactor");
+	g_weaponspreadfactor = cvar("g_weaponspreadfactor");
 
 	g_pickup_shells = cvar("g_pickup_shells");
 	g_pickup_shells_max = cvar("g_pickup_shells_max");