allow testing balance to be disabled without restarting server

diff --git a/balance-mario.cfg b/balance-mario.cfg
index de22d1f7b5f5d71392bee5d050c31a27f877f232..ea4c4dbb600ff07ff440f8e4a84b708999e33af6 100644 (file)
--- 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 81c786ed60cb08e895c964470125c8f061069fd4..b3d856c054bb6493295fdd3f088c2c5819aa8926 100644 (file)
--- 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 28f8f17d768c4424e5b60261fa5ad639b142906d..7aea6f87f41d7d8db4ee79e8c022955d57af6baf 100644 (file)
--- 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 f98731e01726b4c381c3459974a7bfd2b974e7a2..c177f30ff2502411b4da4886370fba5347f714f9 100644 (file)
--- 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 a83fca7c360217c356490f308b8128534aa0d766..9baac183f416d9ff31b85405667f027ac7e279f7 100644 (file)
--- 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 ffa16c060e7bb2926ff5beef4c0ff4b1cfa487b8..93cdc11cecae71bc6ee0703243fa2ab1b92d46b4 100644 (file)
--- 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 e866bd11d18ef8ea51f9b029029b15bed328833f..5ba025a88ba04c0c00718a83888c8ec267206a57 100644 (file)
--- 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 2666108f48b2e4163d985cb03f33dcd44dffbeae..8c36402ab5c49cce391eff869608b88b316ab132 100644 (file)
--- 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 bcd58487892e716a01ba8122360838054ef65777..46e04a9504d5a55160dc20ce3e60f025e357a565 100644 (file)
--- 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 5a5667c8c31a53f3b6443488db13c40c665daa57..cb1cd56e8433bbd5c29253151bdebbc130f809d1 100644 (file)
--- 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 2b2380206b49767a2e6224d45dbe40f839a90d96..58df92720d14048b7bae33a3fb3a073d5850cb38 100644 (file)
--- 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 87ab27076a7fd4890686383f52029a0986e09edd..6be9124c432205f4bc21e6e1efa46e9b56fdf599 100644 (file)
--- 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