consolidated some of the rangedWeapon code