From: Mario <mario.mario@y7mail.com>
Date: Thu, 17 Jun 2021 08:17:01 +0000 (+1000)
Subject: Remove weapon projectile speed modifications from the speed powerup to improve the... 
X-Git-Tag: xonotic-v0.8.5~393^2~4
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=6923233127a1a66deb2fe25cc4df125b76295eae

Remove weapon projectile speed modifications from the speed powerup to improve the gameplay experience, update gameplay hash
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aa03c51a92..f11908a114 100644
--- 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
     - wget -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache
     - make
-    - EXPECT=081ecefbcad92adf350377334733c1d5
+    - EXPECT=4067e5eaa2042e3930fb375eaeb517fa
     - HASH=$(${ENGINE} -noconfig -nohome +timestamps 1 +exec serverbench.cfg
       | tee /dev/stderr
       | sed -e 's,^\[[^]]*\] ,,'
diff --git a/balance-mario.cfg b/balance-mario.cfg
index eecfccb9c9..ad6a0e5c42 100644
--- 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 69b8dd7f7d..80716a51b9 100644
--- 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 ca770845ff..2ab3e5b4c3 100644
--- 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 f6023179ad..24e166ae02 100644
--- 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 6afac0ba3c..ddea3d6eb6 100644
--- 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 a2b53dcc62..ee2da53f12 100644
--- 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 16a5c1aef5..2eac05cc55 100644
--- 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 4f64592638..3a55a787a3 100644
--- 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 c4b79eb9c2..2ac0bbccc9 100644
--- 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 1bf071d564..2229d62b27 100644
--- 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