From: Dr. Jaska <drjaska83@gmail.com>
Date: Mon, 10 Jan 2022 04:22:43 +0000 (+0000)
Subject: https://forums.xonotic.org/showthread.php?tid=8520 related vortex changes
X-Git-Tag: xonotic-v0.8.5~238^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=abcbf63ec644369a8db9f56b7a36ec3608c2f31c;p=xonotic%2Fxonotic-data.pk3dir.git

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0f195b665..b5031c66b 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=02e0bed62067959602d12a6eb240e6f2
+    - EXPECT=7b55642e475a26f6fb397093e6f8fe81
     - HASH=$(${ENGINE} -noconfig -nohome +timestamps 1 +exec serverbench.cfg
       | tee /dev/stderr
       | sed -e 's,^\[[^]]*\] ,,'
diff --git a/bal-wep-xonotic.cfg b/bal-wep-xonotic.cfg
index 566b869f7..319d77923 100644
--- 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