Increase the skill required to be effective with crylink primary

Disables g_balance_crylink_primary_linkexplode because it causes the
inconsistent damage problems in #2559 that !883 was trying to work
around, and is difficult to fix properly.  Also to incentivise proper
aim and use of the join/converge feature.

Reverts the change to g_balance_crylink_primary_edgedamage made in !883
because with linkexplode disabled it's no longer needed, and because you
shouldn't be rewarded with full damage when you didn't hit the target.

Reverts the change to g_balance_crylink_primary_refire made in !883
because with linkexplode disabled it's no longer needed, and because the
more consistent feel of having the same refire time on primary and
secondary is nice.

Keeps the change to g_balance_crylink_primary_bouncedamagefactor made in
!883 because this subtle buff makes it worthwhile to converge and aim
shots around corners, as an alternative to spamming grenades. It also
made the weapon a little more user-friendly.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d1ed8f09324da32f73d164e4e96bd4043ea3e241..1b3fad83590156198c569c958e35bf8bc6f785ca 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,7 +36,7 @@ test_compilation_units:
 test_sv_game:
   stage: test
   script:
-    - export EXPECT=7004fcba787d0fbe17240beb84d8af3c
+    - export EXPECT=6102445105f1647b085d59a8419970a9
     - qcsrc/tools/sv_game-hashtest.sh
     - exit $?
 

diff --git a/bal-wep-xonotic.cfg b/bal-wep-xonotic.cfg
index 07a6fc0d0337d3c5234226472b7c3bb9366fdb36..62d9d1bb8009edac7360c247d25d47c4c7fff245 100644 (file)
--- a/bal-wep-xonotic.cfg
+++ b/bal-wep-xonotic.cfg
@@ -238,7 +238,7 @@ set g_balance_crylink_primary_animtime 0.3
 set g_balance_crylink_primary_bouncedamagefactor 1
 set g_balance_crylink_primary_bounces 1
 set g_balance_crylink_primary_damage 10
-set g_balance_crylink_primary_edgedamage 10
+set g_balance_crylink_primary_edgedamage 5
 set g_balance_crylink_primary_force -50
 set g_balance_crylink_primary_joindelay 0.1
 set g_balance_crylink_primary_joinexplode 1
@@ -247,13 +247,13 @@ set g_balance_crylink_primary_joinexplode_edgedamage 0
 set g_balance_crylink_primary_joinexplode_force 0
 set g_balance_crylink_primary_joinexplode_radius 0
 set g_balance_crylink_primary_joinspread 0.2
-set g_balance_crylink_primary_linkexplode 1
+set g_balance_crylink_primary_linkexplode 0
 set g_balance_crylink_primary_middle_fadetime 5
 set g_balance_crylink_primary_middle_lifetime 5
 set g_balance_crylink_primary_other_fadetime 5
 set g_balance_crylink_primary_other_lifetime 5
 set g_balance_crylink_primary_radius 80
-set g_balance_crylink_primary_refire 0.8
+set g_balance_crylink_primary_refire 0.7
 set g_balance_crylink_primary_shots 6
 set g_balance_crylink_primary_speed 2000
 set g_balance_crylink_primary_spread 0.08