Updated combat simulator

testing is getting a little out of hand