From: Morosophos <1962285-morosophos@users.noreply.gitlab.com> Date: Thu, 17 Mar 2022 17:19:15 +0000 (+0000) Subject: XDF: move speed powerup params to balance-xdf.cfg and physicsXDF.cfg X-Git-Tag: xonotic-v0.8.5~157^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e868f1a78f46c8e090f465a71d00981cfc07b07f;p=xonotic%2Fxonotic-data.pk3dir.git XDF: move speed powerup params to balance-xdf.cfg and physicsXDF.cfg --- diff --git a/balance-xdf.cfg b/balance-xdf.cfg index 94e98a646..67e8810b5 100644 --- a/balance-xdf.cfg +++ b/balance-xdf.cfg @@ -221,9 +221,9 @@ set g_balance_powerup_invincible_takeforce 0.33 set g_balance_powerup_invincible_time 30 set g_balance_powerup_invisibility_alpha 0.15 set g_balance_powerup_invisibility_time 30 -set g_balance_powerup_speed_attackrate 0.8 -set g_balance_powerup_speed_highspeed 1.5 -set g_balance_powerup_speed_time 30 +set g_balance_powerup_speed_attackrate 0.7692307692 // 1/1.3 +set g_balance_powerup_speed_highspeed 1.3 +set g_balance_powerup_speed_time 30 // q3 haste lasts 30 seconds unless count field set otherwise set g_balance_powerup_strength_damage 3 set g_balance_powerup_strength_force 3 set g_balance_powerup_strength_time 30 diff --git a/physicsCPMA.cfg b/physicsCPMA.cfg index 765321963..30a18cab9 100644 --- a/physicsCPMA.cfg +++ b/physicsCPMA.cfg @@ -40,3 +40,4 @@ sv_jumpspeedcap_max_disable_on_ramps 0 g_teleport_maxspeed 400 sv_track_canjump 0 sv_gameplayfix_stepdown_maxspeed 0 +g_movement_highspeed_q3_compat 1 diff --git a/physicsFruit.cfg b/physicsFruit.cfg index 4fcdcce0f..7c0c5170e 100644 --- a/physicsFruit.cfg +++ b/physicsFruit.cfg @@ -38,3 +38,4 @@ sv_jumpspeedcap_max_disable_on_ramps 1 g_teleport_maxspeed 0 sv_track_canjump 0 sv_gameplayfix_stepdown_maxspeed 0 +g_movement_highspeed_q3_compat 0 diff --git a/physicsHavoc.cfg b/physicsHavoc.cfg index a6598de99..fdefb9cca 100644 --- a/physicsHavoc.cfg +++ b/physicsHavoc.cfg @@ -39,3 +39,4 @@ sv_jumpspeedcap_max_disable_on_ramps 0 g_teleport_maxspeed 0 sv_track_canjump 0 sv_gameplayfix_stepdown_maxspeed 0 +g_movement_highspeed_q3_compat 0 diff --git a/physicsLeeStricklin-ModdedFruit.cfg b/physicsLeeStricklin-ModdedFruit.cfg index 9bf0e03ab..25f2b54d6 100644 --- a/physicsLeeStricklin-ModdedFruit.cfg +++ b/physicsLeeStricklin-ModdedFruit.cfg @@ -47,3 +47,4 @@ sv_jumpspeedcap_max_disable_on_ramps 1 g_teleport_maxspeed 0 sv_track_canjump 0 sv_gameplayfix_stepdown_maxspeed 0 +g_movement_highspeed_q3_compat 0 diff --git a/physicsLeeStricklin.cfg b/physicsLeeStricklin.cfg index c6ecfd927..5edcfbe27 100644 --- a/physicsLeeStricklin.cfg +++ b/physicsLeeStricklin.cfg @@ -47,3 +47,4 @@ sv_jumpspeedcap_max_disable_on_ramps 1 g_teleport_maxspeed 0 sv_track_canjump 0 sv_gameplayfix_stepdown_maxspeed 0 +g_movement_highspeed_q3_compat 0 diff --git a/physicsLeeStricklinOld.cfg b/physicsLeeStricklinOld.cfg index 8b48b003c..a4bdd08ca 100644 --- a/physicsLeeStricklinOld.cfg +++ b/physicsLeeStricklinOld.cfg @@ -42,3 +42,4 @@ sv_jumpspeedcap_max_disable_on_ramps 0 g_teleport_maxspeed 0 sv_track_canjump 0 sv_gameplayfix_stepdown_maxspeed 0 +g_movement_highspeed_q3_compat 0 diff --git a/physicsLzd.cfg b/physicsLzd.cfg index 25a3b704e..8d54437fb 100644 --- a/physicsLzd.cfg +++ b/physicsLzd.cfg @@ -40,3 +40,4 @@ sv_jumpspeedcap_max_disable_on_ramps 0 g_teleport_maxspeed 0 sv_track_canjump 0 sv_gameplayfix_stepdown_maxspeed 0 +g_movement_highspeed_q3_compat 0 diff --git a/physicsNexuiz10.cfg b/physicsNexuiz10.cfg index bdaa0e66b..3ca1ded65 100644 --- a/physicsNexuiz10.cfg +++ b/physicsNexuiz10.cfg @@ -40,3 +40,4 @@ sv_jumpspeedcap_max_disable_on_ramps 0 g_teleport_maxspeed 0 sv_track_canjump 0 sv_gameplayfix_stepdown_maxspeed 0 +g_movement_highspeed_q3_compat 0 diff --git a/physicsNexuiz11.cfg b/physicsNexuiz11.cfg index c66ac46a0..03056d184 100644 --- a/physicsNexuiz11.cfg +++ b/physicsNexuiz11.cfg @@ -39,3 +39,4 @@ sv_jumpspeedcap_max_disable_on_ramps 0 g_teleport_maxspeed 0 sv_track_canjump 0 sv_gameplayfix_stepdown_maxspeed 0 +g_movement_highspeed_q3_compat 0 diff --git a/physicsNexuiz151.cfg b/physicsNexuiz151.cfg index b60229541..e2aa58971 100644 --- a/physicsNexuiz151.cfg +++ b/physicsNexuiz151.cfg @@ -39,3 +39,4 @@ sv_jumpspeedcap_max_disable_on_ramps 0 g_teleport_maxspeed 0 sv_track_canjump 0 sv_gameplayfix_stepdown_maxspeed 0 +g_movement_highspeed_q3_compat 0 diff --git a/physicsNexuiz151b.cfg b/physicsNexuiz151b.cfg index 4ecdef9c0..26f746a7c 100644 --- a/physicsNexuiz151b.cfg +++ b/physicsNexuiz151b.cfg @@ -39,3 +39,4 @@ sv_jumpspeedcap_max_disable_on_ramps 0 g_teleport_maxspeed 0 sv_track_canjump 0 sv_gameplayfix_stepdown_maxspeed 0 +g_movement_highspeed_q3_compat 0 diff --git a/physicsNexuiz16rc1.cfg b/physicsNexuiz16rc1.cfg index 912399130..40e7d1f3f 100644 --- a/physicsNexuiz16rc1.cfg +++ b/physicsNexuiz16rc1.cfg @@ -39,3 +39,4 @@ sv_jumpspeedcap_max_disable_on_ramps 0 g_teleport_maxspeed 0 sv_track_canjump 0 sv_gameplayfix_stepdown_maxspeed 0 +g_movement_highspeed_q3_compat 0 diff --git a/physicsNexuiz20.cfg b/physicsNexuiz20.cfg index 956310b8e..24e27b01d 100644 --- a/physicsNexuiz20.cfg +++ b/physicsNexuiz20.cfg @@ -39,3 +39,4 @@ sv_jumpspeedcap_max_disable_on_ramps 0 g_teleport_maxspeed 0 sv_track_canjump 0 sv_gameplayfix_stepdown_maxspeed 0 +g_movement_highspeed_q3_compat 0 diff --git a/physicsNexuiz25.cfg b/physicsNexuiz25.cfg index 0654a9f29..167d2f4d4 100644 --- a/physicsNexuiz25.cfg +++ b/physicsNexuiz25.cfg @@ -39,3 +39,4 @@ sv_jumpspeedcap_max_disable_on_ramps 0 g_teleport_maxspeed 0 sv_track_canjump 0 sv_gameplayfix_stepdown_maxspeed 0 +g_movement_highspeed_q3_compat 0 diff --git a/physicsNexuiz26.cfg b/physicsNexuiz26.cfg index e20e2c93e..6c41d6bbc 100644 --- a/physicsNexuiz26.cfg +++ b/physicsNexuiz26.cfg @@ -39,3 +39,4 @@ sv_jumpspeedcap_max_disable_on_ramps 0 g_teleport_maxspeed 0 sv_track_canjump 0 sv_gameplayfix_stepdown_maxspeed 0 +g_movement_highspeed_q3_compat 0 diff --git a/physicsNoQWBunny-nexbased.cfg b/physicsNoQWBunny-nexbased.cfg index 063d2e365..c1447c0f0 100644 --- a/physicsNoQWBunny-nexbased.cfg +++ b/physicsNoQWBunny-nexbased.cfg @@ -48,3 +48,4 @@ sv_jumpspeedcap_max_disable_on_ramps 1 g_teleport_maxspeed 0 sv_track_canjump 0 sv_gameplayfix_stepdown_maxspeed 0 +g_movement_highspeed_q3_compat 0 diff --git a/physicsOverkill.cfg b/physicsOverkill.cfg index b40b5a54f..be6ea4963 100644 --- a/physicsOverkill.cfg +++ b/physicsOverkill.cfg @@ -53,3 +53,4 @@ sv_jumpspeedcap_max "" sv_jumpspeedcap_max_disable_on_ramps 1 g_teleport_maxspeed 0 sv_gameplayfix_stepdown_maxspeed 400 +g_movement_highspeed_q3_compat 0 diff --git a/physicsQ.cfg b/physicsQ.cfg index d0adac13e..b84883d88 100644 --- a/physicsQ.cfg +++ b/physicsQ.cfg @@ -40,3 +40,4 @@ sv_jumpspeedcap_max_disable_on_ramps 0 g_teleport_maxspeed 0 sv_track_canjump 0 sv_gameplayfix_stepdown_maxspeed 0 +g_movement_highspeed_q3_compat 0 diff --git a/physicsQ2.cfg b/physicsQ2.cfg index 7e6e2d662..5e18a2f04 100644 --- a/physicsQ2.cfg +++ b/physicsQ2.cfg @@ -40,3 +40,4 @@ sv_jumpspeedcap_max_disable_on_ramps 0 g_teleport_maxspeed 0 sv_track_canjump 0 sv_gameplayfix_stepdown_maxspeed 0 +g_movement_highspeed_q3_compat 0 diff --git a/physicsQ2a.cfg b/physicsQ2a.cfg index 55e312564..c614e817d 100644 --- a/physicsQ2a.cfg +++ b/physicsQ2a.cfg @@ -41,3 +41,4 @@ sv_jumpspeedcap_max_disable_on_ramps 0 g_teleport_maxspeed 0 sv_track_canjump 0 sv_gameplayfix_stepdown_maxspeed 0 +g_movement_highspeed_q3_compat 0 diff --git a/physicsQ3.cfg b/physicsQ3.cfg index be6c7dd8c..76ee484ec 100644 --- a/physicsQ3.cfg +++ b/physicsQ3.cfg @@ -40,3 +40,4 @@ sv_jumpspeedcap_max_disable_on_ramps 0 g_teleport_maxspeed 320 sv_track_canjump 0 sv_gameplayfix_stepdown_maxspeed 0 +g_movement_highspeed_q3_compat 0 diff --git a/physicsQBF.cfg b/physicsQBF.cfg index 4d7bdfeb5..4de2fbd88 100644 --- a/physicsQBF.cfg +++ b/physicsQBF.cfg @@ -39,3 +39,4 @@ sv_jumpspeedcap_max_disable_on_ramps 0 g_teleport_maxspeed 0 sv_track_canjump 0 sv_gameplayfix_stepdown_maxspeed 0 +g_movement_highspeed_q3_compat 0 diff --git a/physicsQBFplus.cfg b/physicsQBFplus.cfg index 5ae5720c7..880504782 100644 --- a/physicsQBFplus.cfg +++ b/physicsQBFplus.cfg @@ -39,3 +39,4 @@ sv_jumpspeedcap_max_disable_on_ramps 0 g_teleport_maxspeed 0 sv_track_canjump 0 sv_gameplayfix_stepdown_maxspeed 0 +g_movement_highspeed_q3_compat 0 diff --git a/physicsSamual.cfg b/physicsSamual.cfg index 8c8548604..88165e03d 100644 --- a/physicsSamual.cfg +++ b/physicsSamual.cfg @@ -39,3 +39,4 @@ sv_jumpspeedcap_max_disable_on_ramps 0 g_teleport_maxspeed 0 sv_track_canjump 0 sv_gameplayfix_stepdown_maxspeed 0 +g_movement_highspeed_q3_compat 0 diff --git a/physicsWarsow.cfg b/physicsWarsow.cfg index a89ff6a80..f89927d5d 100644 --- a/physicsWarsow.cfg +++ b/physicsWarsow.cfg @@ -40,3 +40,4 @@ sv_jumpspeedcap_max_disable_on_ramps 0 g_teleport_maxspeed 0 sv_track_canjump 0 sv_gameplayfix_stepdown_maxspeed 0 +g_movement_highspeed_q3_compat 0 diff --git a/physicsWarsowClassicBunny.cfg b/physicsWarsowClassicBunny.cfg index 715065115..ac1a96b52 100644 --- a/physicsWarsowClassicBunny.cfg +++ b/physicsWarsowClassicBunny.cfg @@ -40,3 +40,4 @@ sv_jumpspeedcap_max_disable_on_ramps 0 g_teleport_maxspeed 0 sv_track_canjump 0 sv_gameplayfix_stepdown_maxspeed 0 +g_movement_highspeed_q3_compat 0 diff --git a/physicsWarsowDev.cfg b/physicsWarsowDev.cfg index bc75e8c62..7f7bcc8d6 100644 --- a/physicsWarsowDev.cfg +++ b/physicsWarsowDev.cfg @@ -40,3 +40,4 @@ sv_jumpspeedcap_max_disable_on_ramps 0 g_teleport_maxspeed 0 sv_track_canjump 0 sv_gameplayfix_stepdown_maxspeed 0 +g_movement_highspeed_q3_compat 0 diff --git a/physicsX.cfg b/physicsX.cfg index dfe22345c..252c2e7e9 100644 --- a/physicsX.cfg +++ b/physicsX.cfg @@ -54,3 +54,4 @@ sv_jumpspeedcap_max "" sv_jumpspeedcap_max_disable_on_ramps 1 g_teleport_maxspeed 0 sv_gameplayfix_stepdown_maxspeed 400 +g_movement_highspeed_q3_compat 0 diff --git a/physicsX010.cfg b/physicsX010.cfg index 722853553..8b81ca042 100644 --- a/physicsX010.cfg +++ b/physicsX010.cfg @@ -47,3 +47,4 @@ sv_jumpspeedcap_max "" sv_jumpspeedcap_max_disable_on_ramps 1 g_teleport_maxspeed 0 sv_gameplayfix_stepdown_maxspeed 400 +g_movement_highspeed_q3_compat 0 diff --git a/physicsX07.cfg b/physicsX07.cfg index 9fcdb9918..aa582bd99 100644 --- a/physicsX07.cfg +++ b/physicsX07.cfg @@ -53,3 +53,4 @@ sv_jumpspeedcap_max "" sv_jumpspeedcap_max_disable_on_ramps 1 g_teleport_maxspeed 0 sv_gameplayfix_stepdown_maxspeed 400 +g_movement_highspeed_q3_compat 0 diff --git a/physicsXDF.cfg b/physicsXDF.cfg index d7dd0a50e..8bbe28eaa 100644 --- a/physicsXDF.cfg +++ b/physicsXDF.cfg @@ -45,3 +45,5 @@ sv_jumpspeedcap_max 0.5 sv_jumpspeedcap_max_disable_on_ramps 1 g_teleport_maxspeed 600 sv_gameplayfix_stepdown_maxspeed 400 +// needed for correct q3 haste simulation +g_movement_highspeed_q3_compat 1 diff --git a/physicsXDFLight.cfg b/physicsXDFLight.cfg index 3a80e0858..dd657afaf 100644 --- a/physicsXDFLight.cfg +++ b/physicsXDFLight.cfg @@ -45,3 +45,4 @@ sv_jumpspeedcap_max "" sv_jumpspeedcap_max_disable_on_ramps 1 g_teleport_maxspeed 0 sv_gameplayfix_stepdown_maxspeed 400 +g_movement_highspeed_q3_compat 0 diff --git a/ruleset-XDF.cfg b/ruleset-XDF.cfg index 7e7d308a0..8f622bbca 100644 --- a/ruleset-XDF.cfg +++ b/ruleset-XDF.cfg @@ -25,12 +25,6 @@ sv_vote_nospectators 1 timelimit_override 20 sv_maxidle_playertospectator 0 -// speed powerup (q3 haste replacement) -g_movement_highspeed_q3_compat 1 -g_balance_powerup_speed_time 30 // q3 haste lasts 30 seconds unless count field set otherwise -g_balance_powerup_speed_highspeed 1.3 -g_balance_powerup_speed_attackrate 0.7692307692 // 1/1.3 - // game mode settings g_cts_finish_kill_delay 2 g_cts_selfdamage 0