Changed combat to generate its own random number