From ebb9382a86ff8b4d8a0b9db3f1ea45d4b46e616a Mon Sep 17 00:00:00 2001 From: Martin Taibr Date: Mon, 10 Feb 2020 15:10:37 +0100 Subject: [PATCH] allow testing balance to be disabled without restarting server --- balance-mario.cfg | 1 + balance-nexuiz25.cfg | 1 + balance-overkill.cfg | 1 + balance-samual.cfg | 1 + balance-testing.cfg | 3 ++- balance-testingxpm.cfg | 3 ++- balance-xdf.cfg | 1 + balance-xonotic.cfg | 1 + balance-xpm.cfg | 1 + commands.cfg | 2 ++ testing.cfg | 8 +++----- xonotic-server.cfg | 3 ++- 12 files changed, 18 insertions(+), 8 deletions(-) diff --git a/balance-mario.cfg b/balance-mario.cfg index de22d1f7b..ea4c4dbb6 100644 --- a/balance-mario.cfg +++ b/balance-mario.cfg @@ -1,4 +1,5 @@ g_mod_balance Mario +testing_disable // {{{ starting gear set g_balance_health_start 100 diff --git a/balance-nexuiz25.cfg b/balance-nexuiz25.cfg index 81c786ed6..b3d856c05 100644 --- a/balance-nexuiz25.cfg +++ b/balance-nexuiz25.cfg @@ -1,4 +1,5 @@ g_mod_balance Nexuiz25 +testing_disable // {{{ starting gear set g_balance_health_start 150 diff --git a/balance-overkill.cfg b/balance-overkill.cfg index 28f8f17d7..7aea6f87f 100644 --- a/balance-overkill.cfg +++ b/balance-overkill.cfg @@ -1,4 +1,5 @@ g_mod_balance Overkill +testing_disable // {{{ starting gear set g_balance_health_start 100 diff --git a/balance-samual.cfg b/balance-samual.cfg index f98731e01..c177f30ff 100644 --- a/balance-samual.cfg +++ b/balance-samual.cfg @@ -1,4 +1,5 @@ g_mod_balance Samual +testing_disable // {{{ starting gear set g_balance_health_start 100 diff --git a/balance-testing.cfg b/balance-testing.cfg index a83fca7c3..9baac183f 100644 --- a/balance-testing.cfg +++ b/balance-testing.cfg @@ -1,2 +1,3 @@ exec balance-xonotic.cfg -exec testing.cfg +g_mod_balance Testing +testing_enable diff --git a/balance-testingxpm.cfg b/balance-testingxpm.cfg index ffa16c060..93cdc11ce 100644 --- a/balance-testingxpm.cfg +++ b/balance-testingxpm.cfg @@ -1,2 +1,3 @@ exec balance-xpm.cfg -exec testing.cfg +g_mod_balance XPM // XPM is technically modified anyway, this way it'll stay in the right category +testing_enable diff --git a/balance-xdf.cfg b/balance-xdf.cfg index e866bd11d..5ba025a88 100644 --- a/balance-xdf.cfg +++ b/balance-xdf.cfg @@ -1,4 +1,5 @@ g_mod_balance XDF +testing_disable // {{{ starting gear set g_balance_health_start 100 diff --git a/balance-xonotic.cfg b/balance-xonotic.cfg index 2666108f4..8c36402ab 100644 --- a/balance-xonotic.cfg +++ b/balance-xonotic.cfg @@ -1,4 +1,5 @@ g_mod_balance Xonotic +testing_disable // {{{ starting gear set g_balance_health_start 100 diff --git a/balance-xpm.cfg b/balance-xpm.cfg index bcd584878..46e04a950 100644 --- a/balance-xpm.cfg +++ b/balance-xpm.cfg @@ -1,4 +1,5 @@ g_mod_balance XPM +testing_disable // {{{ starting gear set g_balance_health_start 100 diff --git a/commands.cfg b/commands.cfg index 5a5667c8c..cb1cd56e8 100644 --- a/commands.cfg +++ b/commands.cfg @@ -88,7 +88,9 @@ alias g_maplist_shufflenow "qc_cmd_svmenu maplist shuffle" alias g_maplist_cleanup "qc_cmd_svmenu maplist cleanup" // removes maps that don't exist from the map list alias addfav "qc_cmd_svmenu addtolist net_slist_favorites ${* ?}" +alias delfav "qc_cmd_svmenu removefromlist net_slist_favorites ${* ?}" alias addvote "qc_cmd_svmenu addtolist sv_vote_commands ${* ?}" +alias delvote "qc_cmd_svmenu removefromlist sv_vote_commands ${* ?}" // ======================== diff --git a/testing.cfg b/testing.cfg index 2b2380206..58df92720 100644 --- a/testing.cfg +++ b/testing.cfg @@ -1,18 +1,16 @@ // https://forums.xonotic.org/showthread.php?tid=8190 // https://gitlab.com/xonotic/xonotic-data.pk3dir/merge_requests/738 alias test_blaster_switch "settemp g_balance_blaster_primary_animtime 0.1 ; settemp g_balance_blaster_switchdelay_drop 0.1 ; g_balance_blaster_switchdelay_raise 0.1" -addvote test_blaster_switch // https://gitlab.com/xonotic/xonotic-data.pk3dir/merge_requests/614 alias test_crylink_sec_horizontal "settemp g_balance_crylink_secondary_linkexplode 0 ; settemp g_balance_crylink_secondary_other_fadetime 2 ; settemp g_balance_crylink_secondary_other_lifetime 2 ; settemp g_balance_crylink_secondary_speed 4000 ; settemp g_balance_crylink_secondary_spread 0.08 ; settemp g_balance_crylink_secondary_spreadtype 0" -addvote test_crylink_sec_horizontal alias test_rocket_flying "settemp g_balance_devastator_remote_jump 1" -addvote test_rocket_flying // https://forums.xonotic.org/showthread.php?tid=8192 // https://gitlab.com/xonotic/xonotic-data.pk3dir/merge_requests/736 alias test_ctf_stalemate90 "settemp g_ctf_stalemate_time 90" alias test_ctf_stalemate120 "settemp g_ctf_stalemate_time 120" -addvote test_ctf_stalemate90 -addvote test_ctf_stalemate120 + +alias testing_enable "addvote test_blaster_switch ; addvote test_crylink_sec_horizontal ; addvote test_rocket_flying ; addvote test_ctf_stalemate90 ; addvote test_ctf_stalemate120" +alias testing_disable "delvote test_blaster_switch ; delvote test_crylink_sec_horizontal ; delvote test_rocket_flying ; delvote test_ctf_stalemate90 ; delvote test_ctf_stalemate120" diff --git a/xonotic-server.cfg b/xonotic-server.cfg index 87ab27076..6be9124c4 100644 --- a/xonotic-server.cfg +++ b/xonotic-server.cfg @@ -549,7 +549,8 @@ set g_mod_balance "" "Current balance config name" set g_mod_config "" "Current config mod name" // other config files -exec balance-xonotic.cfg +exec testing.cfg +exec balance-xonotic.cfg // depends on testing.cfg exec physicsX.cfg exec turrets.cfg exec vehicles.cfg -- 2.39.2