removed weapon choice from dps calc