updated weaponfire and chargefire