Something like that, yeah.
Should we separate them out based on only having the very basic "unequipped player" sounds in a BaseAudioPack or so (PlayerAudioPack?), such as footsteps, entering water, some basic / generic ambiance, but then leave equipment-dependent sounds with the appropriate...