refactored #distanceHit and #shot