Added combat loading from JSON if provided