Remove weapon projectile speed modifications from the speed powerup to improve the...

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aa03c51a92113b594180be6aba311e7f97252994..f11908a114245611e83e38a359a80e59a09c01a4 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,7 +32,7 @@ test_sv_game:
     - wget -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints\r
     - wget -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache\r
     - make\r
-    - EXPECT=081ecefbcad92adf350377334733c1d5\r
+    - EXPECT=4067e5eaa2042e3930fb375eaeb517fa\r
     - HASH=$(${ENGINE} -noconfig -nohome +timestamps 1 +exec serverbench.cfg\r
       | tee /dev/stderr\r
       | sed -e 's,^\[[^]]*\] ,,'\r

diff --git a/balance-mario.cfg b/balance-mario.cfg
index eecfccb9c913a9eddea020f6daee36896e430f5d..ad6a0e5c42c40a254c2c8015e3fb7384f6d3b53a 100644 (file)
--- a/balance-mario.cfg
+++ b/balance-mario.cfg
@@ -224,7 +224,6 @@ 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_weaponspeed 1.5
 set g_balance_powerup_strength_damage 3
 set g_balance_powerup_strength_force 3
 set g_balance_powerup_strength_time 30

diff --git a/balance-nexuiz25.cfg b/balance-nexuiz25.cfg
index 69b8dd7f7d3c2357a3cfb8a0365ad0d4b2f796c0..80716a51b945d771c5f6e1c1f357951b91b8d910 100644 (file)
--- a/balance-nexuiz25.cfg
+++ b/balance-nexuiz25.cfg
@@ -224,7 +224,6 @@ 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_weaponspeed 1.5
 set g_balance_powerup_strength_damage 3
 set g_balance_powerup_strength_force 4
 set g_balance_powerup_strength_time 30

diff --git a/balance-overkill.cfg b/balance-overkill.cfg
index ca770845ff94322ea5724fa7d814d6ef61e91aa5..2ab3e5b4c3ff81ec348fd86ba2d6621c11b29b1a 100644 (file)
--- a/balance-overkill.cfg
+++ b/balance-overkill.cfg
@@ -224,7 +224,6 @@ 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_weaponspeed 1.5
 set g_balance_powerup_strength_damage 3
 set g_balance_powerup_strength_force 3
 set g_balance_powerup_strength_time 30

diff --git a/balance-samual.cfg b/balance-samual.cfg
index f6023179adc336271436a00d243e3b19325a4b47..24e166ae02d70595b4a0caf28024ac727e2d20c6 100644 (file)
--- a/balance-samual.cfg
+++ b/balance-samual.cfg
@@ -224,7 +224,6 @@ 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_weaponspeed 1.5
 set g_balance_powerup_strength_damage 3
 set g_balance_powerup_strength_force 3
 set g_balance_powerup_strength_time 30

diff --git a/balance-xdf.cfg b/balance-xdf.cfg
index 6afac0ba3c15fba78aff9c90e0e65325841c014e..ddea3d6eb6c6379eb5c1ea5343696df56274aaf5 100644 (file)
--- a/balance-xdf.cfg
+++ b/balance-xdf.cfg
@@ -224,7 +224,6 @@ 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_weaponspeed 1.5
 set g_balance_powerup_strength_damage 3
 set g_balance_powerup_strength_force 3
 set g_balance_powerup_strength_time 30

diff --git a/balance-xonotic.cfg b/balance-xonotic.cfg
index a2b53dcc62bf0c3e3ba329dea5954f3a1c2c158c..ee2da53f12ce6f447189ac8fe091e7415bb08b47 100644 (file)
--- a/balance-xonotic.cfg
+++ b/balance-xonotic.cfg
@@ -224,7 +224,6 @@ 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_weaponspeed 1.5
 set g_balance_powerup_strength_damage 3
 set g_balance_powerup_strength_force 3
 set g_balance_powerup_strength_time 30

diff --git a/balance-xpm.cfg b/balance-xpm.cfg
index 16a5c1aef5f9ed5a9cc9d78730e9bd5be3cb90b7..2eac05cc557e8f9e62a084d034930fc533beec50 100644 (file)
--- a/balance-xpm.cfg
+++ b/balance-xpm.cfg
@@ -224,7 +224,6 @@ 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_weaponspeed 1.5
 set g_balance_powerup_strength_damage 3
 set g_balance_powerup_strength_force 3
 set g_balance_powerup_strength_time 30

diff --git a/qcsrc/common/mutators/mutator/powerups/powerup/speed.qh b/qcsrc/common/mutators/mutator/powerups/powerup/speed.qh
index 4f645926389029a1a0085e0ed0d89781ed52c63b..3a55a787a33bf46fad10fb169c1187a83e7fcf74 100644 (file)
--- a/qcsrc/common/mutators/mutator/powerups/powerup/speed.qh
+++ b/qcsrc/common/mutators/mutator/powerups/powerup/speed.qh
@@ -19,7 +19,6 @@ SOUND(Speed, Item_Sound("powerup_shield"));
 float autocvar_g_balance_powerup_speed_attackrate = 0.8;
 float autocvar_g_balance_powerup_speed_highspeed = 1.5;
 float autocvar_g_balance_powerup_speed_time = 30;
-float autocvar_g_balance_powerup_speed_weaponspeed = 1.5;
 void powerup_speed_init(Pickup this, entity item)
 {
     if(!item.speed_finished)

diff --git a/qcsrc/common/mutators/mutator/powerups/sv_powerups.qc b/qcsrc/common/mutators/mutator/powerups/sv_powerups.qc
index c4b79eb9c2a09ac5617367cb56efa03883965f78..2ac0bbccc930f46bf52fe3ff9cc472879cb92dd5 100644 (file)
--- a/qcsrc/common/mutators/mutator/powerups/sv_powerups.qc
+++ b/qcsrc/common/mutators/mutator/powerups/sv_powerups.qc
@@ -86,14 +86,6 @@ MUTATOR_HOOKFUNCTION(powerups, PlayerPhysics_UpdateStats)
                STAT(MOVEVARS_HIGHSPEED, player) *= autocvar_g_balance_powerup_speed_highspeed;
 }
 
-MUTATOR_HOOKFUNCTION(powerups, WeaponSpeedFactor)
-{
-       entity player = M_ARGV(1, entity);
-
-       if(StatusEffects_active(STATUSEFFECT_Speed, player))
-               M_ARGV(0, float) *= autocvar_g_balance_powerup_speed_weaponspeed;
-}
-
 MUTATOR_HOOKFUNCTION(powerups, WeaponRateFactor)
 {
        entity player = M_ARGV(1, entity);

diff --git a/ruleset-XDF.cfg b/ruleset-XDF.cfg
index 1bf071d564e0d82762d09fa12cf2f535abcc233b..2229d62b27d6f463972de6925e974c97460ae5a3 100644 (file)
--- a/ruleset-XDF.cfg
+++ b/ruleset-XDF.cfg
@@ -26,7 +26,6 @@ g_movement_highspeed_q3_compat 1
 g_balance_powerup_speed_time 30
 g_balance_powerup_speed_highspeed 1.3  // q3 haste lasts 30 seconds
 g_balance_powerup_speed_attackrate 0.7692307692   // 1/1.3
-g_balance_powerup_speed_weaponspeed 1  // do not increase projectile speed
 
 // game mode settings
 g_cts_finish_kill_delay 2