https://forums.xonotic.org/showthread.php?tid=8520 related vortex changes

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0f195b66598fa6be66c1fca5caf419e0f906bca0..b5031c66ba00fd15d0976d0aed715b09e47cc48c 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=02e0bed62067959602d12a6eb240e6f2\r
+    - EXPECT=7b55642e475a26f6fb397093e6f8fe81\r
     - HASH=$(${ENGINE} -noconfig -nohome +timestamps 1 +exec serverbench.cfg\r
       | tee /dev/stderr\r
       | sed -e 's,^\[[^]]*\] ,,'\r

diff --git a/bal-wep-xonotic.cfg b/bal-wep-xonotic.cfg
index 566b869f778bcab92e0a8823f3157714b83e8e65..319d77923035e150b23bf90fa1ca4321d5564e55 100644 (file)
--- a/bal-wep-xonotic.cfg
+++ b/bal-wep-xonotic.cfg
@@ -316,7 +316,7 @@ set g_balance_vortex_primary_damagefalloff_forcehalflife 0
 set g_balance_vortex_primary_damagefalloff_halflife 0
 set g_balance_vortex_primary_damagefalloff_maxdist 0
 set g_balance_vortex_primary_damagefalloff_mindist 0
-set g_balance_vortex_primary_force 400
+set g_balance_vortex_primary_force 200
 set g_balance_vortex_primary_refire 1.5
 set g_balance_vortex_reload_ammo 0
 set g_balance_vortex_reload_time 2