From beea46563579c7ea88b0d83bff711320e7467153 Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 30 Sep 2018 01:00:26 +1000 Subject: [PATCH] Move some TDM settings to the gamemodes config --- gamemodes-server.cfg | 2 ++ xonotic-server.cfg | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gamemodes-server.cfg b/gamemodes-server.cfg index f13dd854a..5a9ec457b 100644 --- a/gamemodes-server.cfg +++ b/gamemodes-server.cfg @@ -315,6 +315,8 @@ set g_cts_send_rankings_cnt 15 "send this number of map records to clients" // deathmatch (ffa or team) // ========================== set g_dm 1 "Deathmatch: killing any other player is one frag, player with most frags wins" +set g_tdm 0 "Team Deathmatch: the team who kills their opponents most often wins" +set g_tdm_on_dm_maps 0 "when this is set, all DM maps automatically support TDM" set g_tdm_teams 2 "how many teams are in team deathmatch (set by mapinfo)" set g_tdm_team_spawns 0 "when 1, players spawn from the team spawnpoints of the map, if any" seta g_tdm_teams_override 0 "how many teams are in team deathmatch" diff --git a/xonotic-server.cfg b/xonotic-server.cfg index 55d8aee7a..964d783a2 100644 --- a/xonotic-server.cfg +++ b/xonotic-server.cfg @@ -241,8 +241,6 @@ set timelimit_overtimes 0 "how many overtimes to add at max" set timelimit_suddendeath 5 "number of minutes suddendeath mode lasts after all overtimes were added and still no winner was found" // common team values -set g_tdm 0 "Team Deathmatch: the team who kills their opponents most often wins" -set g_tdm_on_dm_maps 0 "when this is set, all DM maps automatically support TDM" set teamplay_mode 4 "default teamplay setting in team games. 1 = no friendly fire, self damage. 2 = friendly fire and self damage enabled. 3 = no friendly fire, but self damage enabled. 4 = obey the cvars g_mirrordamage*, g_friendlyfire* and g_teamdamage*" set g_mirrordamage 0.7 "for teamplay_mode 4: mirror damage factor" -- 2.39.2