Adding combat simulation to main branch

Will leave an option to choose/disable it