Added some combatsystem stuff

Moved calculateLine to Util.