Adding combat simulation to main branch

Merging both branches. I'll create an option to enable/disable it.