Testing-related changes to GameEngine and Gamestate

- Including a flag to disable random combat calculations (for testing
purposes)