XDF: move speed powerup params to balance-xdf.cfg and physicsXDF.cfg

diff --git a/balance-xdf.cfg b/balance-xdf.cfg
index 94e98a6461ccc1f85ded776b3bd7685f9c6f71ad..67e8810b5435f4c1954b59902336391083667002 100644 (file)
--- 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 7653219633599d30c41a59530ddcf616bbbc89d9..30a18cab993a223fbb779e3a3febefdc3043d58e 100644 (file)
--- 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 4fcdcce0fcf66e0211058920a72629d317d58e76..7c0c5170e8216ea94536a2395e5881f8e7ce3d92 100644 (file)
--- 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 a6598de9988b17d71596e22d2af8b1b544ca65c1..fdefb9ccaf724f55c4247e3203fcc2aca2569ddf 100644 (file)
--- 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 9bf0e03abfe9408216ae241d462ae19ccd264981..25f2b54d6f186a98b4078837dcca526586050699 100644 (file)
--- 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 c6ecfd9274acaa863dbfcb02606c83ce24383ee6..5edcfbe27b48a306962295049c6e0cf05874e68d 100644 (file)
--- 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 8b48b003c5f140a145d438d38069da626848e070..a4bdd08ca12be3c403daeba5707d584a48a4e883 100644 (file)
--- 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 25a3b704e2b8996684209c333f9f1f18b457d466..8d54437fb82751732490a9fa5c4f59b3ea14a6c7 100644 (file)
--- 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 bdaa0e66b677ede2e7617cc8e817fde9c9c5cdb4..3ca1ded65ce1ebb2ce281a90dbeb87ee3f8a79e5 100644 (file)
--- 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 c66ac46a0d80f2d4920f7ef141a8df3a86a17fad..03056d184e8ed1fe824137c52f0b542826cadc32 100644 (file)
--- 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 b6022954107529a3b85076a24c20abe3c2c89d60..e2aa58971c1b50373ad16f37af9464ff489432e8 100644 (file)
--- 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 4ecdef9c0751b6d56530b51796e0e1bc96b9c5fa..26f746a7c0d9ae8e961a1afcebcd11f10d23f516 100644 (file)
--- 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 912399130dcde5195fbe9dcf795497827bf9a860..40e7d1f3fca423b90d6c9dd9a0323032975a4f6a 100644 (file)
--- 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 956310b8ebd42a62d3664edc94a67e3b07e1bdb1..24e27b01dd2fb07177d893c61fe69d5d07d24116 100644 (file)
--- 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 0654a9f29ebc15d84419dcb7c854a101dd812eb1..167d2f4d453efb5a0b155c597915d2d3f3dffac0 100644 (file)
--- 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 e20e2c93eac3908ad2695c362b349f53010d729c..6c41d6bbc061e9106bcca2e96b7a9bf22990571a 100644 (file)
--- 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 063d2e365fb5145bbbbb39d89e680ca2ece86f52..c1447c0f091aa748b084ce148ae01af65fc91e98 100644 (file)
--- 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 b40b5a54f7e93292cb2743c1febc55b110a21c06..be6ea49633831011627d7976ff60ca5d00a1c27e 100644 (file)
--- 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 d0adac13e71e2c94b7b08e6cc2b2c8ea8f90593d..b84883d88bc4ab4acc2b8ba9244212339068392d 100644 (file)
--- 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 7e6e2d6620e5173dc181b524e308002d77fd7c98..5e18a2f0491a46da8c336e884ba00d9d70427c18 100644 (file)
--- 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 55e31256419cfc2fc70322f4a5555143d92a88c1..c614e817d350d64d1725b9f17da243ffd216379e 100644 (file)
--- 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 be6c7dd8c2b5ed67a0a71c85ab75a68b6248c1ee..76ee484ec6261c15864e660e499ee7806e6583df 100644 (file)
--- 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 4d7bdfeb5c88a51fb9d02fb40e9aa1433be73ad5..4de2fbd88517603b606b3ca9136bffa5a891cac2 100644 (file)
--- 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 5ae5720c70fc5e81a1d37ef8d88b23de9b0ab7e1..880504782b2d999ca253d8c1b9dce55d7c8cbbfe 100644 (file)
--- 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 8c85486045a59c0991aff5a661f97ce81550aa7f..88165e03df64da0c0afc56cf714f2898423d53c8 100644 (file)
--- 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 a89ff6a80f16ae1cb806314306fa04bc7c8a8562..f89927d5d3b18d259ff134cc7a47c637889362b3 100644 (file)
--- 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 71506511527a73947c552dd867c036b97f3171d7..ac1a96b52a1f9b8306dd2c6d2fdeab1733890295 100644 (file)
--- 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 bc75e8c6220b820a1d59f084d7247c0c5cbfbdb8..7f7bcc8d6fbb1ec494ef141a0739b68783bea611 100644 (file)
--- 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 dfe22345c5e4dc6d3157719b006d8256defe3cbd..252c2e7e9bc044d6806ea7e7ae596afac22eab26 100644 (file)
--- 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 72285355326fb32d76efd5638fdd45adbeb3920d..8b81ca0421b71b4c5f9225313ed8a4559571cb0d 100644 (file)
--- 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 9fcdb9918bc4becd9bac351f9c8915a3ece8434f..aa582bd991ddad8e5dac2cae8ef7ba86aaeaa6f3 100644 (file)
--- 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 d7dd0a50e5f2eb5eeaea9481edb2eb86cf25caec..8bbe28eaa41d1807e79c4e6dcd4f7ac3c38e00cc 100644 (file)
--- 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 3a80e0858eb204c736b4c8ade724a0be121653f9..dd657afaf71a97178c029cb38b957a4874dbd31b 100644 (file)
--- 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 7e7d308a09e26b2754aa7c02ec954f6b72e9fdff..8f622bbcaa332efba9454986903397d625036e4c 100644 (file)
--- 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