Moving combat out of mainapp js file