[nexuiz-commits] r8103 - in branches/nexuiz-2.0: . data data/maps data/qcsrc/common data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sun Oct 11 11:57:22 EDT 2009
Author: div0
Date: 2009-10-11 11:57:21 -0400 (Sun, 11 Oct 2009)
New Revision: 8103
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/maps/nr_piece-o-cake.mapinfo
branches/nexuiz-2.0/data/qcsrc/common/mapinfo.qc
branches/nexuiz-2.0/data/qcsrc/common/util.qc
branches/nexuiz-2.0/data/qcsrc/server/constants.qh
Log:
r8099 | fruitiex | 2009-10-11 08:48:24 -0400 (Sun, 11 Oct 2009) | 2 lines
more balanceNexrun changes
r8100 | fruitiex | 2009-10-11 09:00:24 -0400 (Sun, 11 Oct 2009) | 2 lines
cvar hashes...
r8101 | div0 | 2009-10-11 10:21:47 -0400 (Sun, 11 Oct 2009) | 2 lines
better settemp #include and comment support for mapinfo
r8102 | div0 | 2009-10-11 11:25:42 -0400 (Sun, 11 Oct 2009) | 2 lines
support longer settemp lists
Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets 2009-10-11 15:25:42 UTC (rev 8102)
+++ branches/nexuiz-2.0/.patchsets 2009-10-11 15:57:21 UTC (rev 8103)
@@ -1,2 +1,2 @@
master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-7945,7948-7948,7951-7990,7993-8086,8089-8089,8093-8096
+revisions_applied = 1-7945,7948-7948,7951-7990,7993-8086,8089-8089,8093-8096,8099-8102
Modified: branches/nexuiz-2.0/data/balance.cfg
===================================================================
--- branches/nexuiz-2.0/data/balance.cfg 2009-10-11 15:25:42 UTC (rev 8102)
+++ branches/nexuiz-2.0/data/balance.cfg 2009-10-11 15:57:21 UTC (rev 8103)
@@ -3,7 +3,7 @@
//
// And... don't forget to edit the other balance*.cfg too.
-set cvar_check_balance 7f0cddd65617fa39bd3efb7942dceea9
+set cvar_check_balance 1e423b95c67bac7998289473abe8feb1
// {{{ weapon replacement
// NOTE: this only replaces weapons on the map
Modified: branches/nexuiz-2.0/data/balance25.cfg
===================================================================
--- branches/nexuiz-2.0/data/balance25.cfg 2009-10-11 15:25:42 UTC (rev 8102)
+++ branches/nexuiz-2.0/data/balance25.cfg 2009-10-11 15:57:21 UTC (rev 8103)
@@ -3,7 +3,7 @@
//
// And... don't forget to edit the other balance*.cfg too.
-set cvar_check_balance 7f0cddd65617fa39bd3efb7942dceea9
+set cvar_check_balance 1e423b95c67bac7998289473abe8feb1
// {{{ weapon replacement
// NOTE: this only replaces weapons on the map
Modified: branches/nexuiz-2.0/data/balanceHavoc.cfg
===================================================================
--- branches/nexuiz-2.0/data/balanceHavoc.cfg 2009-10-11 15:25:42 UTC (rev 8102)
+++ branches/nexuiz-2.0/data/balanceHavoc.cfg 2009-10-11 15:57:21 UTC (rev 8103)
@@ -3,7 +3,7 @@
//
// And... don't forget to edit the other balance*.cfg too.
-set cvar_check_balance 7f0cddd65617fa39bd3efb7942dceea9
+set cvar_check_balance 1e423b95c67bac7998289473abe8feb1
// {{{ weapon replacement
// NOTE: this only replaces weapons on the map
Modified: branches/nexuiz-2.0/data/balanceNexrun.cfg
===================================================================
--- branches/nexuiz-2.0/data/balanceNexrun.cfg 2009-10-11 15:25:42 UTC (rev 8102)
+++ branches/nexuiz-2.0/data/balanceNexrun.cfg 2009-10-11 15:57:21 UTC (rev 8103)
@@ -3,7 +3,7 @@
//
// And... don't forget to edit the other balance*.cfg too.
-set cvar_check_balance 7f0cddd65617fa39bd3efb7942dceea9
+set cvar_check_balance 1e423b95c67bac7998289473abe8feb1
// {{{ weapon replacement
// NOTE: this only replaces weapons on the map
@@ -215,25 +215,25 @@
// {{{ weapon properties
// {{{ laser
-set g_balance_laser_primary_damage 10
+set g_balance_laser_primary_damage 35
set g_balance_laser_primary_edgedamage 10
-set g_balance_laser_primary_force 50
+set g_balance_laser_primary_force 100
set g_balance_laser_primary_radius 50
-set g_balance_laser_primary_speed 3000
+set g_balance_laser_primary_speed 1500
set g_balance_laser_primary_refire 0
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_secondary 0 // when 1, a secondary laser mode exists
-set g_balance_laser_secondary_damage 25
-set g_balance_laser_secondary_edgedamage 10
-set g_balance_laser_secondary_force 400
-set g_balance_laser_secondary_radius 70
-set g_balance_laser_secondary_speed 9000
-set g_balance_laser_secondary_refire 0.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 1 // when 1, a secondary laser mode exists
+set g_balance_laser_secondary_damage 50
+set g_balance_laser_secondary_edgedamage 1
+set g_balance_laser_secondary_force 100
+set g_balance_laser_secondary_radius 65
+set g_balance_laser_secondary_speed 1500
+set g_balance_laser_secondary_refire 0
+set g_balance_laser_secondary_animtime 0.15
+set g_balance_laser_secondary_lifetime 0.066
+set g_balance_laser_secondary_shotangle 0
// }}}
// {{{ shotgun
set g_balance_shotgun_primary_bullets 15
@@ -411,8 +411,8 @@
set g_balance_rocketlauncher_speedaccel 0
set g_balance_rocketlauncher_speedstart 1100
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 1
+set g_balance_rocketlauncher_animtime 1
set g_balance_rocketlauncher_ammo 3
set g_balance_rocketlauncher_health 40
set g_balance_rocketlauncher_damageforcescale 4
Modified: branches/nexuiz-2.0/data/balanceSamual.cfg
===================================================================
--- branches/nexuiz-2.0/data/balanceSamual.cfg 2009-10-11 15:25:42 UTC (rev 8102)
+++ branches/nexuiz-2.0/data/balanceSamual.cfg 2009-10-11 15:57:21 UTC (rev 8103)
@@ -3,7 +3,7 @@
//
// And... don't forget to edit the other balance*.cfg too.
-set cvar_check_balance 7f0cddd65617fa39bd3efb7942dceea9
+set cvar_check_balance 1e423b95c67bac7998289473abe8feb1
// {{{ weapon replacement
// NOTE: this only replaces weapons on the map
Modified: branches/nexuiz-2.0/data/defaultNexuiz.cfg
===================================================================
--- branches/nexuiz-2.0/data/defaultNexuiz.cfg 2009-10-11 15:25:42 UTC (rev 8102)
+++ branches/nexuiz-2.0/data/defaultNexuiz.cfg 2009-10-11 15:57:21 UTC (rev 8103)
@@ -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 5d48426c72cdfbf78480870c75601f89
+set cvar_check_default 37cc3aae4b042acd9cf2b71135034bcf
// Nexuiz version (formatted for machines)
// used to determine if a client version is compatible
@@ -1181,10 +1181,12 @@
// settemp subsystem. Do not touch. Usage: settemp variable value, next map resets it.
set settemp_list 0
-set settemp_var _settemp_x
-alias settemp "settemp_list \"1 $1 $settemp_var $settemp_list\"; set $settemp_var \"${$1}\"; settemp_var ${settemp_var}x; $1 \"$2\""
+set settemp_idx 0
+set _settemp_var UNUSED
+alias settemp "_settemp_var \"_settemp_x$settemp_idx\"; qc_cmd rpn /settemp_idx settemp_idx 1 add def; _settemp \"$1\" \"$2\""
+alias _settemp "settemp_list \"1 $1 $_settemp_var $settemp_list\"; set $_settemp_var \"${$1}\"; $1 \"$2\""
alias settemp_restore "_settemp_restore_${settemp_list asis}"
-alias _settemp_restore_0 "set settemp_var _settemp_x; set settemp_list 0"
+alias _settemp_restore_0 "set settemp_var 0; set settemp_list 0"
alias _settemp_restore_1 "$1 \"${$2}\"; _settemp_restore_${3- asis}"
// usercommands. These can be edited and bound by the menu.
Modified: branches/nexuiz-2.0/data/maps/nr_piece-o-cake.mapinfo
===================================================================
--- branches/nexuiz-2.0/data/maps/nr_piece-o-cake.mapinfo 2009-10-11 15:25:42 UTC (rev 8102)
+++ branches/nexuiz-2.0/data/maps/nr_piece-o-cake.mapinfo 2009-10-11 15:57:21 UTC (rev 8103)
@@ -4,7 +4,6 @@
cdtrack 17
type cts 20 5
has weapons
+settemp_for_type cts #include balanceNexrun.cfg
settemp_for_type all g_start_weapon_laser 0
settemp_for_type all g_start_weapon_shotgun 0
-settemp_for_type cts #include physicsNexrun.cfg
-settemp_for_type cts #include weaponsNexrun.cfg
Modified: branches/nexuiz-2.0/data/qcsrc/common/mapinfo.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/common/mapinfo.qc 2009-10-11 15:25:42 UTC (rev 8102)
+++ branches/nexuiz-2.0/data/qcsrc/common/mapinfo.qc 2009-10-11 15:57:21 UTC (rev 8103)
@@ -538,8 +538,36 @@
void _MapInfo_Parse_Settemp(string pFilename, string acl, string s, float recurse)
{
string t;
- float fh;
+ float fh, o;
t = car(s); s = cdr(s);
+
+ // limited support of "" and comments
+ // remove trailing and leading " of t
+ if(substring(t, 0, 1) == "\"")
+ {
+ if(substring(t, -1, 1) == "\"")
+ t = substring(t, 1, -2);
+ }
+
+ // remove leading " of s
+ if(substring(s, 0, 1) == "\"")
+ {
+ s = substring(s, 1, -1);
+ }
+ // remove trailing " of s, and all that follows (cvar description)
+ o = strstrofs(s, "\"", 0);
+ if(o >= 0)
+ s = substring(s, 0, o);
+
+ // remove // comments
+ o = strstrofs(s, "//", 0);
+ if(o >= 0)
+ s = substring(s, 0, o);
+
+ // remove trailing spaces
+ while(substring(s, -1, 1) == " ")
+ s = substring(s, 0, -2);
+
if(t == "#include")
{
if(recurse > 0)
@@ -564,6 +592,11 @@
if(substring(s, 0, 1) == "_") // q3map style
continue;
+ if(substring(s, 0, 4) == "set ")
+ s = substring(s, 4, -1);
+ if(substring(s, 0, 5) == "seta ")
+ s = substring(s, 5, -1);
+
_MapInfo_Parse_Settemp(pFilename, acl, s, recurse - 1);
}
fclose(fh);
Modified: branches/nexuiz-2.0/data/qcsrc/common/util.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/common/util.qc 2009-10-11 15:25:42 UTC (rev 8102)
+++ branches/nexuiz-2.0/data/qcsrc/common/util.qc 2009-10-11 15:57:21 UTC (rev 8103)
@@ -882,16 +882,20 @@
#else
void cvar_settemp(string pKey, string pValue)
{
+ float i;
+ string settemp_var;
if(cvar_string(pKey) == pValue)
return;
- cvar_set("settemp_list", strcat("1 ", pKey, " ", cvar_string("settemp_var"), " ", cvar_string("settemp_list")));
+ i = cvar("settemp_idx");
+ cvar_set("settemp_idx", ftos(i+1));
+ settemp_var = strcat("_settemp_x", ftos(i));
#ifdef MENUQC
- registercvar(cvar_string("settemp_var"), "", 0);
+ registercvar(settemp_var, "", 0);
#else
- registercvar(cvar_string("settemp_var"), "");
+ registercvar(settemp_var, "");
#endif
- cvar_set(cvar_string("settemp_var"), cvar_string(pKey));
- cvar_set("settemp_var", strcat(cvar_string("settemp_var"), "x"));
+ cvar_set("settemp_list", strcat("1 ", pKey, " ", settemp_var, " ", cvar_string("settemp_list")));
+ cvar_set(settemp_var, cvar_string(pKey));
cvar_set(pKey, pValue);
}
Modified: branches/nexuiz-2.0/data/qcsrc/server/constants.qh
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/constants.qh 2009-10-11 15:25:42 UTC (rev 8102)
+++ branches/nexuiz-2.0/data/qcsrc/server/constants.qh 2009-10-11 15:57:21 UTC (rev 8103)
@@ -1,5 +1,5 @@
-string CVAR_CHECK_DEFAULT = "5d48426c72cdfbf78480870c75601f89";
-string CVAR_CHECK_BALANCE = "7f0cddd65617fa39bd3efb7942dceea9";
+string CVAR_CHECK_DEFAULT = "37cc3aae4b042acd9cf2b71135034bcf";
+string CVAR_CHECK_BALANCE = "1e423b95c67bac7998289473abe8feb1";
float FALSE = 0;
float TRUE = 1;
More information about the nexuiz-commits
mailing list