More work on Advanced Scoring

- Problem is X or Y direction is always 30
- this means distanceFromWaypoint will always be above 30...annoying