xonotic-data.pk3dir:Mario/team_spawns: an AWESOME merge request: Adds options to use team spawns in clan arena, freeze tag and key hunt.
git-manager created issue #1828 (closed) on 2013-12-21T01:35:40Z:
Adds options to use team spawns in clan arena, freeze tag and key hunt.
Repository: xonotic/xonotic-data.pk3dir.git Commit: bceb5f87419668864493318aa7cc14117265c369 Branch: Mario/team_spawns
Merge commands:
cd data/xonotic-data.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff 'bceb5f87419668864493318aa7cc14117265c369'..'origin/Mario/team_spawns'
# please check that the diff you just saw did not contain anything complex that
# needs a new merge request, and review these changes
git merge --edit --log --no-ff 'origin/Mario/team_spawns'
# please make sure this merge worked, and if not, fix merge conflicts and git
# commit BEFORE the next command
#
# also, THIS is the point to do final pre-merge testing
#
# use git reset --hard origin/master to bail out
git push && git push --delete origin 'Mario/team_spawns'
Diffstat:
gamemodes.cfg | 3 +++
qcsrc/server/autocvars.qh | 3 +++
qcsrc/server/teamplay.qc | 6 ++++++
3 files changed, 12 insertions(+), 0 deletions(-)
Revision log:
commit bceb5f87419668864493318aa7cc14117265c369
Author: Mario
Commit: Mario
Add options to use team spawns in CA, FT & KH
User agreed to the license.
Diff:
diff --git a/gamemodes.cfg b/gamemodes.cfg
index feed748..feace85 100644
--- a/gamemodes.cfg
+++ b/gamemodes.cfg
@@ -139,6 +139,7 @@ set g_assault 0 "Assault: attack the enemy base as fast as you can, then defend
// clan arena
// ============
set g_ca 0 "Clan Arena: Played in rounds, once you're dead you're out! The team with survivors wins the round."
+set g_ca_team_spawns 0 "when 1, a map can define team spawnpoints for CA"
set g_ca_point_limit 10 "point limit 10 is standard for clan arena"
set g_ca_point_leadlimit 0
set g_ca_spectate_enemies 0 "Allow spectating enemy player by dead player during clan arena games."
@@ -254,6 +255,7 @@ set g_domination_point_glow 0 "domination point glow (warning, slow)"
// freezetag
// ===========
set g_freezetag 0 "Freeze Tag: Freeze the opposing team(s) to win, unfreeze teammates by standing next to them"
+set g_freezetag_team_spawns 0 "when 1, a map can define team spawnpoints for FT"
set g_freezetag_warmup 5 "Time players get to run around before the round starts"
seta g_freezetag_point_limit -1 "Freeze Tag point limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
seta g_freezetag_point_leadlimit -1 "Freeze Tag point lead limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
@@ -300,6 +302,7 @@ set g_keepaway_teams 0
// key hunt
// ==========
set g_keyhunt 0 "Key Hunt: collect all keys from the enemies and bring them together to score"
+set g_keyhunt_team_spawns 0 "when 1, a map can define team spawnpoints for KH"
set g_balance_keyhunt_delay_return 60
set g_balance_keyhunt_delay_round 5
set g_balance_keyhunt_delay_tracking 10
diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 19187a3..3d88159 100644
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -695,6 +695,7 @@ float autocvar_g_banned_list_idmode;
float autocvar_g_bastet;
float autocvar_g_botclip_collisions;
float autocvar_g_bugrigs;
+float autocvar_g_ca_team_spawns;
float autocvar_g_ca_damage2score_multiplier;
float autocvar_g_ca_point_leadlimit;
float autocvar_g_ca_point_limit;
@@ -808,6 +809,7 @@ string autocvar_g_forced_team_pink;
string autocvar_g_forced_team_red;
string autocvar_g_forced_team_yellow;
float autocvar_g_freezetag_frozen_force;
+float autocvar_g_freezetag_team_spawns;
float autocvar_g_freezetag_frozen_maxtime;
float autocvar_g_freezetag_revive_falldamage;
float autocvar_g_freezetag_revive_falldamage_health;
@@ -855,6 +857,7 @@ float autocvar_g_keepawayball_damageforcescale;
float autocvar_g_keepawayball_effects;
float autocvar_g_keepawayball_respawntime;
float autocvar_g_keepawayball_trail_color;
+float autocvar_g_keyhunt_team_spawns;
float autocvar_g_keyhunt_point_leadlimit;
#define autocvar_g_keyhunt_point_limit cvar("g_keyhunt_point_limit")
float autocvar_g_keyhunt_teams;
diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index 5185b2c..b08cac3 100644
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -120,6 +120,8 @@ void InitGameplayMode()
ActivateTeamplay();
fraglimit_override = autocvar_g_ca_point_limit;
leadlimit_override = autocvar_g_ca_point_leadlimit;
+ if(autocvar_g_ca_team_spawns)
+ have_team_spawns = -1; // request team spawns
MUTATOR_ADD(gamemode_ca);
}
@@ -128,6 +130,8 @@ void InitGameplayMode()
ActivateTeamplay();
fraglimit_override = autocvar_g_keyhunt_point_limit;
leadlimit_override = autocvar_g_keyhunt_point_leadlimit;
+ if(autocvar_g_keyhunt_team_spawns)
+ have_team_spawns = -1; // request team spawns
MUTATOR_ADD(gamemode_keyhunt);
}
@@ -136,6 +140,8 @@ void InitGameplayMode()
ActivateTeamplay();
fraglimit_override = autocvar_g_freezetag_point_limit;
leadlimit_override = autocvar_g_freezetag_point_leadlimit;
+ if(autocvar_g_freezetag_team_spawns)
+ have_team_spawns = -1; // request team spawns
MUTATOR_ADD(gamemode_freezetag);
}