Move combat to component, unit test