Refactor game modes

Fix dogfights using multiple lives