weapon attacks now reflect the gdoc forumlas