changed the combat form into something that makes more sense