From: Mario Date: Thu, 1 Aug 2024 06:05:48 +0000 (+1000) Subject: Merge branch 'master' into Mario/electro_combo_over_time X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c5580ee293d15501b570cdaccaa85a2678215e68;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into Mario/electro_combo_over_time --- c5580ee293d15501b570cdaccaa85a2678215e68 diff --cc testing.cfg index 1797bc677,8469b6318..a862ffe49 --- a/testing.cfg +++ b/testing.cfg @@@ -14,7 -14,11 +14,14 @@@ alias test_arc_bounce_burst "settemp g_ alias test_ctf_stalemate90 "settemp g_ctf_stalemate_time 90" alias test_ctf_stalemate120 "settemp g_ctf_stalemate_time 120" - alias test_electro_combo_over_time "settemp g_balance_electro_combo_damage_interval 0.05 ; 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" ++// 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_enable "addvote test_blaster_switch ; addvote test_crylink_sec_horizontal ; addvote test_rocket_flying ; addvote test_ctf_stalemate90 ; addvote test_ctf_stalemate120 ; addvote test_arc_bounce ; addvote test_arc_bounce_burst ; addvote test_electro_combo_over_time" - alias testing_disable "delvote test_blaster_switch ; delvote test_crylink_sec_horizontal ; delvote test_rocket_flying ; delvote test_ctf_stalemate90 ; delvote test_ctf_stalemate120 ; delvote test_arc_bounce ; delvote test_arc_bounce_burst ; delvote test_electro_combo_over_time" ++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"