Fix the sniper rifle ammo and also fix the issue of bots with reading undeclared...

diff --git a/balance25.cfg b/balance25.cfg
index 22ec04d1cc487984933e23fed150b67d02c87b88..665dda5c90682f44730e5c33a4901e2239934e28 100644 (file)
--- a/balance25.cfg
+++ b/balance25.cfg
@@ -671,7 +671,7 @@ set g_balance_sniperrifle_secondary_ammo 10
 set g_balance_sniperrifle_secondary_bulletconstant 130 // 18.3qu
 set g_balance_sniperrifle_secondary_burstcost 0
 set g_balance_sniperrifle_secondary_bullethail 0 // empty magazine on shot
-set g_balance_sniperrifle_reload_ammo 8 //default: 60
+set g_balance_sniperrifle_reload_ammo 80 //default: 80
 set g_balance_sniperrifle_reload_time 2
 // }}}
 // {{{ tuba

diff --git a/balanceLeeStricklin.cfg b/balanceLeeStricklin.cfg
index d0a348418c9a49a791c50750e27f89f5f766f175..77aac858a72abb42b7f3ac1b53828439df052670 100644 (file)
--- a/balanceLeeStricklin.cfg
+++ b/balanceLeeStricklin.cfg
@@ -671,7 +671,7 @@ set g_balance_sniperrifle_secondary_ammo 10
 set g_balance_sniperrifle_secondary_bulletconstant 130 // 18.3qu
 set g_balance_sniperrifle_secondary_burstcost 0
 set g_balance_sniperrifle_secondary_bullethail 0
-set g_balance_sniperrifle_reload_ammo 8 //default: 60
+set g_balance_sniperrifle_reload_ammo 80 //default: 80
 set g_balance_sniperrifle_reload_time 2
 // }}}
 // {{{ tuba

diff --git a/balanceSamual.cfg b/balanceSamual.cfg
index 75ead55dcb443b065ea06a9bfe89103eeb230846..0183a3b5bda2c9afe786a62dd3d3d44192653b22 100644 (file)
--- a/balanceSamual.cfg
+++ b/balanceSamual.cfg
@@ -671,7 +671,7 @@ set g_balance_sniperrifle_secondary_ammo 10
 set g_balance_sniperrifle_secondary_bulletconstant 110 // 15.5qu
 set g_balance_sniperrifle_secondary_burstcost 0
 set g_balance_sniperrifle_secondary_bullethail 0 // empty magazine on shot
-set g_balance_sniperrifle_reload_ammo 8 //default: 60
+set g_balance_sniperrifle_reload_ammo 80 //default: 80
 set g_balance_sniperrifle_reload_time 2
 // }}}
 // {{{ tuba

diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index 3dee36e8ea695641e5e190b35cba6b8a11fb33e2..a782c6387927577d9e0b0d92a39d7d61c1deb534 100644 (file)
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -671,7 +671,7 @@ set g_balance_sniperrifle_secondary_ammo 10
 set g_balance_sniperrifle_secondary_bulletconstant 110 // 15.5qu
 set g_balance_sniperrifle_secondary_burstcost 0
 set g_balance_sniperrifle_secondary_bullethail 0 // empty magazine on shot
-set g_balance_sniperrifle_reload_ammo 8 //default: 60
+set g_balance_sniperrifle_reload_ammo 80 //default: 80
 set g_balance_sniperrifle_reload_time 2
 // }}}
 // {{{ tuba

diff --git a/balancetZork.cfg b/balancetZork.cfg
index 0c5436b24ff5ed8a76ca021c596e004dcc6d9f9c..2fb726764c7bae06ccea84a81d78af958fbd8171 100644 (file)
--- a/balancetZork.cfg
+++ b/balancetZork.cfg
@@ -670,7 +670,7 @@ set g_balance_sniperrifle_secondary_ammo 10
 set g_balance_sniperrifle_secondary_bulletconstant 110 // 15.5qu
 set g_balance_sniperrifle_secondary_burstcost 0
 set g_balance_sniperrifle_secondary_bullethail 0 // empty magazine on shot
-set g_balance_sniperrifle_reload_ammo 8 //default: 60
+set g_balance_sniperrifle_reload_ammo 80 //default: 80
 set g_balance_sniperrifle_reload_time 2
 // }}}
 // {{{ tuba

diff --git a/qcsrc/server/bot/havocbot/havocbot.qc b/qcsrc/server/bot/havocbot/havocbot.qc
index 34db488b134b51b064ba44ba0fce9efd0c198895..e67bc214e6edefe7aa36f1b4163bdd33d11b01d0 100644 (file)
--- a/qcsrc/server/bot/havocbot/havocbot.qc
+++ b/qcsrc/server/bot/havocbot/havocbot.qc
@@ -165,7 +165,7 @@ void havocbot_ai()
                        for(i = WEP_FIRST; i <= WEP_LAST; ++i)
                        {
                                e = get_weaponinfo(i);
-                               if(self.weapon_load[i] < cvar(strcat("g_balance_", e.netname, "_reload_ammo")))
+                               if ((e.spawnflags & WEP_FLAG_RELOADABLE) && (self.weapon_load[i] < cvar(strcat("g_balance_", e.netname, "_reload_ammo"))))
                                        self.switchweapon = i;
                        }
                }