Merge branch 'master' into Mario/electro_combo_over_time

[xonotic/xonotic-data.pk3dir.git] / testing.cfg

diff --git a/testing.cfg b/testing.cfg
index f000a084aacbe22fa29ceee679c29ee679947323..a862ffe4928fdd9214226250f4d50de69f6e101b 100644 (file)
--- a/testing.cfg
+++ b/testing.cfg
@@ -6,10 +6,22 @@ alias test_crylink_sec_horizontal "settemp g_balance_crylink_secondary_linkexplo
 
 alias test_rocket_flying "settemp g_balance_devastator_remote_jump 1"
 
+alias test_arc_bounce "settemp g_balance_arc_bolt_bounce_count 1 ; settemp g_balance_arc_bolt_bounce_lifetime 0.5 ; settemp g_balance_arc_bolt_bounce_explode 1 ; settemp g_balance_arc_bolt_ammo 2"
+alias test_arc_bounce_burst "settemp g_balance_arc_bolt_bounce_count 1 ; settemp g_balance_arc_bolt_bounce_lifetime 0.5 ; settemp g_balance_arc_bolt_bounce_explode 1 ; settemp g_balance_arc_bolt_ammo 3 ; settemp g_balance_arc_bolt_refire2 0.33333 ; settemp g_balance_arc_bolt_count 3"
+
 // 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"
 
-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"
+// https://gitlab.com/xonotic/xonotic-data.pk3dir/-/merge_requests/1067
+alias test_electro_combo_over_time "settemp g_balance_electro_combo_duration 1.5"
+
+alias _testing_list "$1 test_blaster_switch ; $1 test_crylink_sec_horizontal ; $1 test_rocket_flying ; $1 test_ctf_stalemate90 ; $1 test_ctf_stalemate120 ; $1 test_arc_bounce ; $1 test_arc_bounce_burst ; $1 test_electro_combo_over_time"
+
+// defer addvote and delvote execution because program commands can't be executed if testing_disable
+// and testing_enable are executed at startup (no program is loaded yet)
+alias _addvote_def "defer 1 \"addvote $1\""
+alias _delvote_def "defer 1 \"delvote $1\""
+alias testing_enable "_testing_list _addvote_def"
+alias testing_disable "_testing_list _delvote_def"