Trying to recover from train wreck of last week with hitting counts

Parting shots seems to work again,
but new test in temporary nomos blood magic still isn't being counted right
Finally wrote a test that confirms bug #337 is fixed
Added a comment in test for bug #337
Cleaned up merging typo
Removed some duplicate code left over for messy rebase