Will do, or at least some other alternative if the player runs out of ammo.
That is a major problem with the prototype currently.
With Weapons such as a knife or baseball bat, I was thinking of the weapon doing damage based on velocity of the swing, or needs a minimum amount of velocity. That should counter the problem of players just waggeling a melel weapon into enemies.