[nexuiz-commits] r8078 - in branches/nexuiz-2.0: . data data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Fri Oct 9 04:28:50 EDT 2009
Author: div0
Date: 2009-10-09 04:28:50 -0400 (Fri, 09 Oct 2009)
New Revision: 8078
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/defaultNexuiz.cfg
branches/nexuiz-2.0/data/qcsrc/server/constants.qh
branches/nexuiz-2.0/data/update-cvarcount.sh
Log:
r8076 | div0 | 2009-10-08 10:11:15 -0400 (Thu, 08 Oct 2009) | 2 lines
cvar checksums
r8077 | div0 | 2009-10-09 04:26:55 -0400 (Fri, 09 Oct 2009) | 1 line
cvar checksums for nexrun balance
Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets 2009-10-09 08:26:55 UTC (rev 8077)
+++ branches/nexuiz-2.0/.patchsets 2009-10-09 08:28:50 UTC (rev 8078)
@@ -1,2 +1,2 @@
master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-7945,7948-7948,7951-7990,7993-8074
+revisions_applied = 1-7945,7948-7948,7951-7990,7993-8077
Modified: branches/nexuiz-2.0/data/balance.cfg
===================================================================
--- branches/nexuiz-2.0/data/balance.cfg 2009-10-09 08:26:55 UTC (rev 8077)
+++ branches/nexuiz-2.0/data/balance.cfg 2009-10-09 08:28:50 UTC (rev 8078)
@@ -3,7 +3,7 @@
//
// And... don't forget to edit the other balance*.cfg too.
-set cvar_check_balance f419825b823199b15cb1aafdb4e5422a
+set cvar_check_balance 7f0cddd65617fa39bd3efb7942dceea9
// {{{ weapon replacement
// NOTE: this only replaces weapons on the map
@@ -26,6 +26,7 @@
set g_weaponreplace_campingrifle ""
set g_weaponreplace_tuba ""
set g_weaponreplace_fireball ""
+set sv_q3acompat_machineshotgunswap 0 "shorthand for swapping uzi and shotgun (for Q3A map compatibility)"
// }}}
// {{{ starting gear
@@ -159,6 +160,10 @@
// {{{ misc
set g_balance_selfdamagepercent 0.6
set g_balance_weaponswitchdelay 0.10
+set g_weaponspeedfactor 1 "weapon projectile speed multiplier"
+set g_weaponratefactor 1 "weapon fire rate multiplier"
+set g_weapondamagefactor 1 "weapon damage multiplier"
+set g_weaponforcefactor 1 "weapon force multiplier"
set g_balance_firetransfer_time 0.9
set g_balance_firetransfer_damage 0.8
set g_throughfloor_damage 0.3
Modified: branches/nexuiz-2.0/data/balance25.cfg
===================================================================
--- branches/nexuiz-2.0/data/balance25.cfg 2009-10-09 08:26:55 UTC (rev 8077)
+++ branches/nexuiz-2.0/data/balance25.cfg 2009-10-09 08:28:50 UTC (rev 8078)
@@ -3,7 +3,7 @@
//
// And... don't forget to edit the other balance*.cfg too.
-set cvar_check_balance f419825b823199b15cb1aafdb4e5422a
+set cvar_check_balance 7f0cddd65617fa39bd3efb7942dceea9
// {{{ weapon replacement
// NOTE: this only replaces weapons on the map
@@ -26,6 +26,7 @@
set g_weaponreplace_campingrifle ""
set g_weaponreplace_tuba ""
set g_weaponreplace_fireball ""
+set sv_q3acompat_machineshotgunswap 0 "shorthand for swapping uzi and shotgun (for Q3A map compatibility)"
// }}}
// {{{ starting gear
@@ -159,6 +160,10 @@
// {{{ misc
set g_balance_selfdamagepercent 0.6
set g_balance_weaponswitchdelay 0.15
+set g_weaponspeedfactor 1 "weapon projectile speed multiplier"
+set g_weaponratefactor 1 "weapon fire rate multiplier"
+set g_weapondamagefactor 1 "weapon damage multiplier"
+set g_weaponforcefactor 1 "weapon force multiplier"
set g_balance_firetransfer_time 0.9
set g_balance_firetransfer_damage 0.8
set g_throughfloor_damage 1
Modified: branches/nexuiz-2.0/data/balanceHavoc.cfg
===================================================================
--- branches/nexuiz-2.0/data/balanceHavoc.cfg 2009-10-09 08:26:55 UTC (rev 8077)
+++ branches/nexuiz-2.0/data/balanceHavoc.cfg 2009-10-09 08:28:50 UTC (rev 8078)
@@ -3,7 +3,7 @@
//
// And... don't forget to edit the other balance*.cfg too.
-set cvar_check_balance f419825b823199b15cb1aafdb4e5422a
+set cvar_check_balance 7f0cddd65617fa39bd3efb7942dceea9
// {{{ weapon replacement
// NOTE: this only replaces weapons on the map
@@ -26,6 +26,7 @@
set g_weaponreplace_campingrifle ""
set g_weaponreplace_tuba ""
set g_weaponreplace_fireball ""
+set sv_q3acompat_machineshotgunswap 0 "shorthand for swapping uzi and shotgun (for Q3A map compatibility)"
// }}}
// {{{ starting gear
@@ -159,6 +160,10 @@
// {{{ misc
set g_balance_selfdamagepercent 0.6
set g_balance_weaponswitchdelay 0.05
+set g_weaponspeedfactor 1 "weapon projectile speed multiplier"
+set g_weaponratefactor 1 "weapon fire rate multiplier"
+set g_weapondamagefactor 1 "weapon damage multiplier"
+set g_weaponforcefactor 1 "weapon force multiplier"
set g_balance_firetransfer_time 0.9
set g_balance_firetransfer_damage 0.8
set g_throughfloor_damage 0
Modified: branches/nexuiz-2.0/data/balanceNexrun.cfg
===================================================================
--- branches/nexuiz-2.0/data/balanceNexrun.cfg 2009-10-09 08:26:55 UTC (rev 8077)
+++ branches/nexuiz-2.0/data/balanceNexrun.cfg 2009-10-09 08:28:50 UTC (rev 8078)
@@ -3,15 +3,13 @@
//
// And... don't forget to edit the other balance*.cfg too.
-set cvar_check_balance f419825b823199b15cb1aafdb4e5422a
+set cvar_check_balance 7f0cddd65617fa39bd3efb7942dceea9
// {{{ weapon replacement
// NOTE: this only replaces weapons on the map
// use g_start_weapon_* to also replace the on-startup weapons!
// example: g_weaponreplace_nex "nex minstanex", then Nexes become MinstaNexes 50% of the times
// set the cvars to "0" to totally disable a weapon
-set sv_q3acompat_machineshotgunswap 1
-
set g_weaponreplace_laser ""
set g_weaponreplace_shotgun ""
set g_weaponreplace_uzi ""
@@ -28,6 +26,7 @@
set g_weaponreplace_campingrifle ""
set g_weaponreplace_tuba ""
set g_weaponreplace_fireball 0 // Don't kill me div0, just for now until I figure out a good balance for it.
+set sv_q3acompat_machineshotgunswap 1 "shorthand for swapping uzi and shotgun (for Q3A map compatibility)"
// }}}
// {{{ starting gear
@@ -161,7 +160,10 @@
// {{{ misc
set g_balance_selfdamagepercent 0.6
set g_balance_weaponswitchdelay 0
-set g_weaponforcefactor 0.65
+set g_weaponspeedfactor 1 "weapon projectile speed multiplier"
+set g_weaponratefactor 1 "weapon fire rate multiplier"
+set g_weapondamagefactor 1 "weapon damage multiplier"
+set g_weaponforcefactor 0.65 "weapon force multiplier"
set g_balance_firetransfer_time 0.9
set g_balance_firetransfer_damage 0.8
set g_throughfloor_damage 0.3
Modified: branches/nexuiz-2.0/data/balanceSamual.cfg
===================================================================
--- branches/nexuiz-2.0/data/balanceSamual.cfg 2009-10-09 08:26:55 UTC (rev 8077)
+++ branches/nexuiz-2.0/data/balanceSamual.cfg 2009-10-09 08:28:50 UTC (rev 8078)
@@ -3,13 +3,14 @@
//
// And... don't forget to edit the other balance*.cfg too.
-set cvar_check_balance f419825b823199b15cb1aafdb4e5422a
+set cvar_check_balance 7f0cddd65617fa39bd3efb7942dceea9
// {{{ weapon replacement
// NOTE: this only replaces weapons on the map
// use g_start_weapon_* to also replace the on-startup weapons!
// example: g_weaponreplace_nex "nex minstanex", then Nexes become MinstaNexes 50% of the times
// set the cvars to "0" to totally disable a weapon
+set sv_q3acompat_machineshotgunswap 0 "shorthand for swapping uzi and shotgun"
set g_weaponreplace_laser ""
set g_weaponreplace_shotgun ""
set g_weaponreplace_uzi ""
@@ -26,6 +27,7 @@
set g_weaponreplace_campingrifle ""
set g_weaponreplace_tuba ""
set g_weaponreplace_fireball 0 // Don't kill me div0, just for now until I figure out a good balance for it.
+set sv_q3acompat_machineshotgunswap 0 "shorthand for swapping uzi and shotgun (for Q3A map compatibility)"
// }}}
// {{{ starting gear
@@ -159,6 +161,10 @@
// {{{ misc
set g_balance_selfdamagepercent 0.6
set g_balance_weaponswitchdelay 0.15
+set g_weaponspeedfactor 1 "weapon projectile speed multiplier"
+set g_weaponratefactor 1 "weapon fire rate multiplier"
+set g_weapondamagefactor 1 "weapon damage multiplier"
+set g_weaponforcefactor 1 "weapon force multiplier"
set g_balance_firetransfer_time 0.9
set g_balance_firetransfer_damage 0.8
set g_throughfloor_damage 0.3
Modified: branches/nexuiz-2.0/data/defaultNexuiz.cfg
===================================================================
--- branches/nexuiz-2.0/data/defaultNexuiz.cfg 2009-10-09 08:26:55 UTC (rev 8077)
+++ branches/nexuiz-2.0/data/defaultNexuiz.cfg 2009-10-09 08:28:50 UTC (rev 8078)
@@ -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 c0254c4c1cc8836cd7cc3989f4ad25f4
+set cvar_check_default 5d48426c72cdfbf78480870c75601f89
// Nexuiz version (formatted for machines)
// used to determine if a client version is compatible
@@ -1270,9 +1270,6 @@
// for menu weapon arena
set menu_weaponarena_with_laser 0 "also enable the Laser in this weapon arena"
-// Q3A
-set sv_q3acompat_machineshotgunswap 0 "settemp this in mapinfo for instant Q3A map conversion"
-
seta menu_maxplayers 8 "maxplayers value when the menu starts a game"
// command executed before loading a map by the menu
@@ -1544,11 +1541,6 @@
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_weaponspeedfactor 1 "weapon projectile speed multiplier"
-set g_weaponratefactor 1 "weapon fire rate multiplier"
-set g_weapondamagefactor 1 "weapon damage multiplier"
-set g_weaponforcefactor 1 "weapon force multiplier"
-
set cl_effects_lightningarc_simple 0
set cl_effects_lightningarc_segmentlength 64
set cl_effects_lightningarc_drift_start 0.45
Modified: branches/nexuiz-2.0/data/qcsrc/server/constants.qh
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/constants.qh 2009-10-09 08:26:55 UTC (rev 8077)
+++ branches/nexuiz-2.0/data/qcsrc/server/constants.qh 2009-10-09 08:28:50 UTC (rev 8078)
@@ -1,5 +1,5 @@
-string CVAR_CHECK_DEFAULT = "c0254c4c1cc8836cd7cc3989f4ad25f4";
-string CVAR_CHECK_BALANCE = "f419825b823199b15cb1aafdb4e5422a";
+string CVAR_CHECK_DEFAULT = "5d48426c72cdfbf78480870c75601f89";
+string CVAR_CHECK_BALANCE = "7f0cddd65617fa39bd3efb7942dceea9";
float FALSE = 0;
float TRUE = 1;
Modified: branches/nexuiz-2.0/data/update-cvarcount.sh
===================================================================
--- branches/nexuiz-2.0/data/update-cvarcount.sh 2009-10-09 08:26:55 UTC (rev 8077)
+++ branches/nexuiz-2.0/data/update-cvarcount.sh 2009-10-09 08:28:50 UTC (rev 8078)
@@ -1,6 +1,6 @@
#!/bin/sh
-balance_cfgs="balanceHavoc.cfg balance25.cfg balanceSamual.cfg"
+balance_cfgs="balanceHavoc.cfg balance25.cfg balanceSamual.cfg balanceNexrun.cfg"
countd=`awk '/^seta? g_/ { print $2; }' defaultNexuiz.cfg | sort -u | tr -d '\r' | md5sum | cut -c 1-32`
countw=`awk '/^seta? g_/ { print $2; }' balance.cfg | sort -u | tr -d '\r' | md5sum | cut -c 1-32`
More information about the nexuiz-commits
mailing list