r4370 - in trunk/data: . qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Fri Sep 5 16:33:23 EDT 2008
Author: esteel
Date: 2008-09-05 16:33:22 -0400 (Fri, 05 Sep 2008)
New Revision: 4370
Modified:
trunk/data/defaultNexuiz.cfg
trunk/data/qcsrc/server/clientcommands.qc
trunk/data/qcsrc/server/defs.qh
trunk/data/qcsrc/server/miscfunctions.qc
Log:
add variable g_tourney_warmup_allguns 0 to make g_tourney different from LMS
fix weapon/health start values when using g_tourney
Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg 2008-09-05 20:13:44 UTC (rev 4369)
+++ trunk/data/defaultNexuiz.cfg 2008-09-05 20:33:22 UTC (rev 4370)
@@ -140,6 +140,7 @@
set g_tourney 0 //enables tourney mode which splits the game into a warmup- and match-stage
set g_tourney_warmup_limit 60 //if set to -1 the warmup-stage is not affected by any timelimit, if set to 0 the usual timelimit also affects warmup-stage, otherwise warmup will be limited to this time (useful for public matches)
set g_tourney_warmup_allow_timeout 0 //if set to 0 you cannot use the calltimeout command during the warmup-stage but only during the match stage
+set g_tourney_warmup_allguns 0 //if set players start with all guns in warmup mode
set g_tourney_disable_spec_chat 1 //if set the chat sent by spectators or observers while being in match-stage can only seen by other specs/observers
set g_tourney_disable_spec_vote 1 //if set only players can call a vote during the match-stage (thus spectators and observers can't call a vote then)
set g_tourney_start_health 250 //starting values when being in warmup-stage
Modified: trunk/data/qcsrc/server/clientcommands.qc
===================================================================
--- trunk/data/qcsrc/server/clientcommands.qc 2008-09-05 20:13:44 UTC (rev 4369)
+++ trunk/data/qcsrc/server/clientcommands.qc 2008-09-05 20:33:22 UTC (rev 4370)
@@ -402,15 +402,7 @@
if(g_tourney) {
tourneyInMatchStage = 1; //once the game is restarted the game is in match stage
//reset weapons and ammo, health and armor to default:
- // TODO is this really the right way?!? see miscfunction.qc readlevelcvars()
- start_weapons = WEPBIT_LASER | WEPBIT_SHOTGUN;
- start_switchweapon = WEP_SHOTGUN;
- start_ammo_shells = cvar("g_start_ammo_shells");
- start_ammo_nails = cvar("g_start_ammo_nails");
- start_ammo_rockets = cvar("g_start_ammo_rockets");
- start_ammo_cells = cvar("g_start_ammo_cells");
- start_health = cvar("g_balance_health_start");
- start_armorvalue = cvar("g_balance_armor_start");
+ readplayerstartcvars();
}
restart_countdown = time + RESTART_COUNTDOWN;
restart_mapalreadyrestarted = 0; //reset this var, needed when cvar sv_ready_restart_repeatable is in use
Modified: trunk/data/qcsrc/server/defs.qh
===================================================================
--- trunk/data/qcsrc/server/defs.qh 2008-09-05 20:13:44 UTC (rev 4369)
+++ trunk/data/qcsrc/server/defs.qh 2008-09-05 20:33:22 UTC (rev 4370)
@@ -20,6 +20,7 @@
float g_cloaked, g_footsteps, g_jump_grunt, g_grappling_hook, g_laserguided_missile, g_midair, g_minstagib, g_nixnex, g_nixnex_with_laser, g_norecoil, g_rocketarena, g_vampire, g_minstagib_invis_alpha;
float g_tourney;
float g_tourney_warmup_limit;
+float g_tourney_warmup_allguns;
float g_ctf_win_mode;
float g_race_qualifying;
float tourneyInMatchStage;
Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc 2008-09-05 20:13:44 UTC (rev 4369)
+++ trunk/data/qcsrc/server/miscfunctions.qc 2008-09-05 20:33:22 UTC (rev 4370)
@@ -712,65 +712,12 @@
entity get_weaponinfo(float w);
-void readlevelcvars(void)
+void readplayerstartcvars()
{
entity e;
float i;
- sv_cheats = cvar("sv_cheats");
- sv_gentle = cvar("sv_gentle");
- sv_foginterval = cvar("sv_foginterval");
- g_cloaked = cvar("g_cloaked");
- g_jump_grunt = cvar("g_jump_grunt");
- g_footsteps = cvar("g_footsteps");
- g_grappling_hook = cvar("g_grappling_hook");
- g_laserguided_missile = cvar("g_laserguided_missile");
- g_midair = cvar("g_midair");
- g_minstagib = cvar("g_minstagib");
- g_nixnex = cvar("g_nixnex");
- g_nixnex_with_laser = cvar("g_nixnex_with_laser");
- g_norecoil = cvar("g_norecoil");
- g_rocketarena = cvar("g_rocketarena");
- g_vampire = cvar("g_vampire");
- g_tourney = cvar("g_tourney");
- g_tourney_warmup_limit = cvar("g_tourney_warmup_limit");
- sv_maxidle = cvar("sv_maxidle");
- sv_maxidle_spectatorsareidle = cvar("sv_maxidle_spectatorsareidle");
- sv_pogostick = cvar("sv_pogostick");
- sv_doublejump = cvar("sv_doublejump");
-
- g_pickup_respawntime_short = cvar("g_pickup_respawntime_short");
- g_pickup_respawntime_medium = cvar("g_pickup_respawntime_medium");
- g_pickup_respawntime_long = cvar("g_pickup_respawntime_long");
- g_pickup_respawntime_powerup = cvar("g_pickup_respawntime_powerup");
-
- if(g_minstagib) g_nixnex = g_rocketarena = 0;
- if(g_nixnex) g_rocketarena = 0;
-
- g_pickup_shells = cvar("g_pickup_shells");
- g_pickup_shells_max = cvar("g_pickup_shells_max");
- g_pickup_nails = cvar("g_pickup_nails");
- g_pickup_nails_max = cvar("g_pickup_nails_max");
- g_pickup_rockets = cvar("g_pickup_rockets");
- g_pickup_rockets_max = cvar("g_pickup_rockets_max");
- g_pickup_cells = cvar("g_pickup_cells");
- g_pickup_cells_max = cvar("g_pickup_cells_max");
- g_pickup_armorsmall = cvar("g_pickup_armorsmall");
- g_pickup_armorsmall_max = cvar("g_pickup_armorsmall_max");
- g_pickup_armormedium = cvar("g_pickup_armormedium");
- g_pickup_armormedium_max = cvar("g_pickup_armormedium_max");
- g_pickup_armorlarge = cvar("g_pickup_armorlarge");
- g_pickup_armorlarge_max = cvar("g_pickup_armorlarge_max");
- g_pickup_healthsmall = cvar("g_pickup_healthsmall");
- g_pickup_healthsmall_max = cvar("g_pickup_healthsmall_max");
- g_pickup_healthmedium = cvar("g_pickup_healthmedium");
- g_pickup_healthmedium_max = cvar("g_pickup_healthmedium_max");
- g_pickup_healthlarge = cvar("g_pickup_healthlarge");
- g_pickup_healthlarge_max = cvar("g_pickup_healthlarge_max");
- g_pickup_healthmega = cvar("g_pickup_healthmega");
- g_pickup_healthmega_max = cvar("g_pickup_healthmega_max");
-
- // initialize starting values for players
+ // initialize starting values for players
start_weapons = 0;
start_items = 0;
start_switchweapon = 0;
@@ -815,7 +762,7 @@
start_health = cvar("g_lms_start_health");
start_armorvalue = cvar("g_lms_start_armor");
}
- else if(g_tourney) {
+ else if(g_tourney && !tourneyInMatchStage) {
start_ammo_shells = cvar("g_tourney_start_ammo_shells");
start_ammo_nails = cvar("g_tourney_start_ammo_nails");
start_ammo_rockets = cvar("g_tourney_start_ammo_rockets");
@@ -841,7 +788,7 @@
e = get_weaponinfo(i);
if(!(e.weapon))
continue;
- if(((e.spawnflags & 1) && (g_lms || g_tourney)) || cvar(strcat("g_start_weapon_", e.netname)))
+ if(((e.spawnflags & 1) && (g_lms || (g_tourney && g_tourney_warmup_allguns))) || cvar(strcat("g_start_weapon_", e.netname)))
{
start_weapons |= e.weapons;
start_switchweapon = e.weapon;
@@ -851,6 +798,65 @@
}
}
+void readlevelcvars(void)
+{
+ sv_cheats = cvar("sv_cheats");
+ sv_gentle = cvar("sv_gentle");
+ sv_foginterval = cvar("sv_foginterval");
+ g_cloaked = cvar("g_cloaked");
+ g_jump_grunt = cvar("g_jump_grunt");
+ g_footsteps = cvar("g_footsteps");
+ g_grappling_hook = cvar("g_grappling_hook");
+ g_laserguided_missile = cvar("g_laserguided_missile");
+ g_midair = cvar("g_midair");
+ g_minstagib = cvar("g_minstagib");
+ g_nixnex = cvar("g_nixnex");
+ g_nixnex_with_laser = cvar("g_nixnex_with_laser");
+ g_norecoil = cvar("g_norecoil");
+ g_rocketarena = cvar("g_rocketarena");
+ g_vampire = cvar("g_vampire");
+ g_tourney = cvar("g_tourney");
+ g_tourney_warmup_limit = cvar("g_tourney_warmup_limit");
+ g_tourney_warmup_allguns = cvar("g_tourney_warmup_allguns");
+ sv_maxidle = cvar("sv_maxidle");
+ sv_maxidle_spectatorsareidle = cvar("sv_maxidle_spectatorsareidle");
+ sv_pogostick = cvar("sv_pogostick");
+ sv_doublejump = cvar("sv_doublejump");
+
+ g_pickup_respawntime_short = cvar("g_pickup_respawntime_short");
+ g_pickup_respawntime_medium = cvar("g_pickup_respawntime_medium");
+ g_pickup_respawntime_long = cvar("g_pickup_respawntime_long");
+ g_pickup_respawntime_powerup = cvar("g_pickup_respawntime_powerup");
+
+ if(g_minstagib) g_nixnex = g_rocketarena = 0;
+ if(g_nixnex) g_rocketarena = 0;
+
+ g_pickup_shells = cvar("g_pickup_shells");
+ g_pickup_shells_max = cvar("g_pickup_shells_max");
+ g_pickup_nails = cvar("g_pickup_nails");
+ g_pickup_nails_max = cvar("g_pickup_nails_max");
+ g_pickup_rockets = cvar("g_pickup_rockets");
+ g_pickup_rockets_max = cvar("g_pickup_rockets_max");
+ g_pickup_cells = cvar("g_pickup_cells");
+ g_pickup_cells_max = cvar("g_pickup_cells_max");
+ g_pickup_armorsmall = cvar("g_pickup_armorsmall");
+ g_pickup_armorsmall_max = cvar("g_pickup_armorsmall_max");
+ g_pickup_armormedium = cvar("g_pickup_armormedium");
+ g_pickup_armormedium_max = cvar("g_pickup_armormedium_max");
+ g_pickup_armorlarge = cvar("g_pickup_armorlarge");
+ g_pickup_armorlarge_max = cvar("g_pickup_armorlarge_max");
+ g_pickup_healthsmall = cvar("g_pickup_healthsmall");
+ g_pickup_healthsmall_max = cvar("g_pickup_healthsmall_max");
+ g_pickup_healthmedium = cvar("g_pickup_healthmedium");
+ g_pickup_healthmedium_max = cvar("g_pickup_healthmedium_max");
+ g_pickup_healthlarge = cvar("g_pickup_healthlarge");
+ g_pickup_healthlarge_max = cvar("g_pickup_healthlarge_max");
+ g_pickup_healthmega = cvar("g_pickup_healthmega");
+ g_pickup_healthmega_max = cvar("g_pickup_healthmega_max");
+
+ readplayerstartcvars();
+}
+
/*
// TODO sound pack system
string soundpack;
More information about the nexuiz-commits
mailing list