Revert changes to combatsimulation.cpp