Solved combat engine
Merge branch 'develop' of https://github.com/Poltero/juegojava into develop