Added gun ricochets as misses, renamed gunstaff to gun and corrected all references