shotgun pellets 12 -> 9, damage 4 -> 5

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8f95ec202fc7dd6ec4cde98d92ad321b4491c30d..5a3c7e770a7f89c53ebd78724ad6e1aec12294ea 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -75,7 +75,7 @@ test_sv_game:
     - wget -nv -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints\r
     - wget -nv -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache\r
 \r
-    - EXPECT=e3ed40d95a30e41653afde4e6b9b748d\r
+    - EXPECT=62e1bd236de4e5be1195c63290d7fe81\r
     - HASH=$(${ENGINE} +timestamps 1 +exec serverbench.cfg\r
       | tee /dev/stderr\r
       | sed -e 's,^\[[^]]*\] ,,'\r

diff --git a/bal-wep-mario.cfg b/bal-wep-mario.cfg
index 3890bf33b05b99b307b43f6c82654ccc1421f0fa..445a07b8b4b746362bd7ed972e15f1f12aefc538 100644 (file)
--- a/bal-wep-mario.cfg
+++ b/bal-wep-mario.cfg
@@ -34,8 +34,8 @@ set g_balance_blaster_weaponthrowable 0
 // {{{ #2: Shotgun
 set g_balance_shotgun_primary_ammo 1
 set g_balance_shotgun_primary_animtime 0.2
-set g_balance_shotgun_primary_bullets 12
-set g_balance_shotgun_primary_damage 4
+set g_balance_shotgun_primary_bullets 9
+set g_balance_shotgun_primary_damage 5
 set g_balance_shotgun_primary_force 15
 set g_balance_shotgun_primary_refire 0.75
 set g_balance_shotgun_primary_solidpenetration 3.8

diff --git a/bal-wep-xdf.cfg b/bal-wep-xdf.cfg
index d5a9275f485feb68e8f685f0a756fdf754678e2e..213255e2bac270887b1dbfc5a1abb09f44b01625 100644 (file)
--- a/bal-wep-xdf.cfg
+++ b/bal-wep-xdf.cfg
@@ -34,8 +34,8 @@ set g_balance_blaster_weaponthrowable 0
 // {{{ #2: Shotgun
 set g_balance_shotgun_primary_ammo 1
 set g_balance_shotgun_primary_animtime 0.2
-set g_balance_shotgun_primary_bullets 12
-set g_balance_shotgun_primary_damage 4
+set g_balance_shotgun_primary_bullets 9
+set g_balance_shotgun_primary_damage 5
 set g_balance_shotgun_primary_force 15
 set g_balance_shotgun_primary_refire 0.75
 set g_balance_shotgun_primary_solidpenetration 3.8

diff --git a/bal-wep-xonotic.cfg b/bal-wep-xonotic.cfg
index b87a460e9f3cd05a14403441899cbee0250c0884..ac245d9a0d11cab94dc66633bec804c207257063 100644 (file)
--- a/bal-wep-xonotic.cfg
+++ b/bal-wep-xonotic.cfg
@@ -34,8 +34,8 @@ set g_balance_blaster_weaponthrowable 0
 // {{{ #2: Shotgun
 set g_balance_shotgun_primary_ammo 1
 set g_balance_shotgun_primary_animtime 0.2
-set g_balance_shotgun_primary_bullets 12
-set g_balance_shotgun_primary_damage 4
+set g_balance_shotgun_primary_bullets 9
+set g_balance_shotgun_primary_damage 5
 set g_balance_shotgun_primary_force 15
 set g_balance_shotgun_primary_refire 0.75
 set g_balance_shotgun_primary_solidpenetration 3.8