* improved combat code again
* improved distance calculations