From: Mario <mario@smbclan.net>
Date: Mon, 15 Oct 2018 14:22:00 +0000 (+1000)
Subject: Divide the attack rate by the maximum weapon slots instead of halving it
X-Git-Tag: xonotic-v0.8.5~1769
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ce2607cc7491e18b3229e1e24dc2929c894fb2bc;p=xonotic%2Fxonotic-data.pk3dir.git

Divide the attack rate by the maximum weapon slots instead of halving it
---

diff --git a/qcsrc/server/weapons/weaponsystem.qc b/qcsrc/server/weapons/weaponsystem.qc
index 52a1934e5..c4b91b3b3 100644
--- a/qcsrc/server/weapons/weaponsystem.qc
+++ b/qcsrc/server/weapons/weaponsystem.qc
@@ -335,7 +335,7 @@ void weapon_prepareattack_do(entity actor, .entity weaponentity, bool secondary,
 						continue; // still cooling down!
 					if (ATTACK_FINISHED(actor, wepslot) < time - actor.(wepent).weapon_frametime * 1.5)
 						ATTACK_FINISHED(actor, wepslot) = time;
-					ATTACK_FINISHED(actor, wepslot) = ATTACK_FINISHED(actor, wepslot) + (attacktime * arate) * 0.5;
+					ATTACK_FINISHED(actor, wepslot) = ATTACK_FINISHED(actor, wepslot) + (attacktime * arate) / MAX_WEAPONSLOTS;
 				}
 			}
 		}