From: drjaska <drjaska83@gmail.com>
Date: Tue, 16 May 2023 23:24:34 +0000 (+0300)
Subject: shotgun pellets 12 -> 9, damage 4 -> 5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=945aba73f55f4b629f3a8ba7e888bbf1c2cd4f82;p=xonotic%2Fxonotic-data.pk3dir.git

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8f95ec202..5a3c7e770 100644
--- 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
     - wget -nv -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache
 
-    - EXPECT=e3ed40d95a30e41653afde4e6b9b748d
+    - EXPECT=62e1bd236de4e5be1195c63290d7fe81
     - HASH=$(${ENGINE} +timestamps 1 +exec serverbench.cfg
       | tee /dev/stderr
       | sed -e 's,^\[[^]]*\] ,,'
diff --git a/bal-wep-mario.cfg b/bal-wep-mario.cfg
index 3890bf33b..445a07b8b 100644
--- 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 d5a9275f4..213255e2b 100644
--- 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 b87a460e9..ac245d9a0 100644
--- 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