Fixed and improved Game state. New combat added.