[nexuiz-commits] r8338 - in trunk/data: . qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sun Nov 29 09:10:16 EST 2009
Author: div0
Date: 2009-11-29 09:10:15 -0500 (Sun, 29 Nov 2009)
New Revision: 8338
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/constants.qh
trunk/data/qcsrc/server/g_world.qc
trunk/data/qcsrc/server/w_rocketlauncher.qc
Log:
fix more broken cvars
Modified: trunk/data/balance.cfg
===================================================================
--- trunk/data/balance.cfg 2009-11-29 14:03:42 UTC (rev 8337)
+++ trunk/data/balance.cfg 2009-11-29 14:10:15 UTC (rev 8338)
@@ -3,7 +3,7 @@
//
// And... don't forget to edit the other balance*.cfg too.
-set cvar_check_balance 84d3d5976dd5870e8fc739c8f2a6451a
+set cvar_check_balance 78dd1eac1223c09227ae89b307fb4654
// {{{ weapon replacement
// NOTE: this only replaces weapons on the map
Modified: trunk/data/balance25.cfg
===================================================================
--- trunk/data/balance25.cfg 2009-11-29 14:03:42 UTC (rev 8337)
+++ trunk/data/balance25.cfg 2009-11-29 14:10:15 UTC (rev 8338)
@@ -3,7 +3,7 @@
//
// And... don't forget to edit the other balance*.cfg too.
-set cvar_check_balance 84d3d5976dd5870e8fc739c8f2a6451a
+set cvar_check_balance 78dd1eac1223c09227ae89b307fb4654
// {{{ weapon replacement
// NOTE: this only replaces weapons on the map
Modified: trunk/data/balanceHavoc.cfg
===================================================================
--- trunk/data/balanceHavoc.cfg 2009-11-29 14:03:42 UTC (rev 8337)
+++ trunk/data/balanceHavoc.cfg 2009-11-29 14:10:15 UTC (rev 8338)
@@ -3,7 +3,7 @@
//
// And... don't forget to edit the other balance*.cfg too.
-set cvar_check_balance 84d3d5976dd5870e8fc739c8f2a6451a
+set cvar_check_balance 78dd1eac1223c09227ae89b307fb4654
// {{{ weapon replacement
// NOTE: this only replaces weapons on the map
Modified: trunk/data/balanceNexrun.cfg
===================================================================
--- trunk/data/balanceNexrun.cfg 2009-11-29 14:03:42 UTC (rev 8337)
+++ trunk/data/balanceNexrun.cfg 2009-11-29 14:10:15 UTC (rev 8338)
@@ -3,7 +3,7 @@
//
// And... don't forget to edit the other balance*.cfg too.
-set cvar_check_balance 84d3d5976dd5870e8fc739c8f2a6451a
+set cvar_check_balance 78dd1eac1223c09227ae89b307fb4654
// {{{ weapon replacement
// NOTE: this only replaces weapons on the map
Modified: trunk/data/balanceSamual.cfg
===================================================================
--- trunk/data/balanceSamual.cfg 2009-11-29 14:03:42 UTC (rev 8337)
+++ trunk/data/balanceSamual.cfg 2009-11-29 14:10:15 UTC (rev 8338)
@@ -3,7 +3,7 @@
//
// And... don't forget to edit the other balance*.cfg too.
-set cvar_check_balance 84d3d5976dd5870e8fc739c8f2a6451a
+set cvar_check_balance 78dd1eac1223c09227ae89b307fb4654
// {{{ weapon replacement
// NOTE: this only replaces weapons on the map
Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg 2009-11-29 14:03:42 UTC (rev 8337)
+++ trunk/data/defaultNexuiz.cfg 2009-11-29 14:10:15 UTC (rev 8338)
@@ -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 69623911fa2fbe35f109b546de468762
+set cvar_check_default e5b0481ca565fa186011068d736c55a7
// Nexuiz version (formatted for machines)
// used to determine if a client version is compatible
@@ -484,6 +484,7 @@
seta g_maplist_selectrandom 0 "if 1, a random map will be chosen as next map - DEPRECATED in favor of g_maplist_shuffle"
seta g_maplist_shuffle 1 "new randomization method: like selectrandom, but avoid playing the same maps in short succession. This works by taking out the first element and inserting it into g_maplist with a bias to the end of the list"
set g_maplist_check_waypoints 0 "when 1, maps are skipped if there currently are bots, but the map has no waypoints"
+set samelevel 0 "when 1, always play the same level over and over again"
set g_maxpushtime 8.0 "timeout for kill credit when your damage knocks someone into a death trap"
set g_cloaked 0 "display all players mostly invisible"
@@ -1030,6 +1031,8 @@
// and in regular intervals, this weapon is cycled
set g_nixnex 0 "No Items Nexuiz - instead of pickup items, everyone plays with the same weapon. After some time, a countdown will start, after which everyone will switch to another weapon, and so on"
set g_nixnex_with_laser 0 "always carry the laser as an additional weapon in NixNex"
+set g_nixnex_with_healtharmor 0 "when 1, health and armor still show up in NixNex"
+set g_nixnex_with_powerups 0 "when 1, powerups still show up in NixNex"
// score log
set sv_logscores_console 0 "print scores to server console"
Modified: trunk/data/qcsrc/server/constants.qh
===================================================================
--- trunk/data/qcsrc/server/constants.qh 2009-11-29 14:03:42 UTC (rev 8337)
+++ trunk/data/qcsrc/server/constants.qh 2009-11-29 14:10:15 UTC (rev 8338)
@@ -1,5 +1,5 @@
-string CVAR_CHECK_DEFAULT = "69623911fa2fbe35f109b546de468762";
-string CVAR_CHECK_BALANCE = "84d3d5976dd5870e8fc739c8f2a6451a";
+string CVAR_CHECK_DEFAULT = "e5b0481ca565fa186011068d736c55a7";
+string CVAR_CHECK_BALANCE = "78dd1eac1223c09227ae89b307fb4654";
float FALSE = 0;
float TRUE = 1;
Modified: trunk/data/qcsrc/server/g_world.qc
===================================================================
--- trunk/data/qcsrc/server/g_world.qc 2009-11-29 14:03:42 UTC (rev 8337)
+++ trunk/data/qcsrc/server/g_world.qc 2009-11-29 14:10:15 UTC (rev 8338)
@@ -518,8 +518,6 @@
s = strcat(s, ":no_use_ammunition");
if(!cvar("g_pickup_items"))
s = strcat(s, ":no_pickup_items");
- if(cvar("g_instagib"))
- s = strcat(s, ":instagib");
if(cvar_string("g_weaponarena") != "0")
s = strcat(s, ":", cvar_string("g_weaponarena"), " arena");
if(cvar("g_nixnex"))
@@ -2077,7 +2075,7 @@
m = MapInfo_FixName(m);
if(!m)
return "The map you suggested is not available on this server.";
- if(!cvar("g_maplist_votable_override_mostrecent"))
+ if(!cvar("g_maplist_votable_suggestions_override_mostrecent"))
if(Map_IsRecent(m))
return "This server does not allow for recent maps to be played again. Please be patient for some rounds.";
Modified: trunk/data/qcsrc/server/w_rocketlauncher.qc
===================================================================
--- trunk/data/qcsrc/server/w_rocketlauncher.qc 2009-11-29 14:03:42 UTC (rev 8337)
+++ trunk/data/qcsrc/server/w_rocketlauncher.qc 2009-11-29 14:10:15 UTC (rev 8338)
@@ -305,7 +305,7 @@
missile.pushltime = time + cvar("g_balance_rocketlauncher_guidedelay");
missile.classname = "rocket";
missile.bot_dodge = TRUE;
- missile.bot_dodgerating = cvar("g_balance_rocketlauncher_primary_damage") * 2; // * 2 because it can be detonated inflight which makes it even more dangerous
+ missile.bot_dodgerating = cvar("g_balance_rocketlauncher_damage") * 2; // * 2 because it can be detonated inflight which makes it even more dangerous
missile.takedamage = DAMAGE_YES;
missile.damageforcescale = cvar("g_balance_rocketlauncher_damageforcescale");
More information about the nexuiz-commits
mailing list