Combat: Converting the turn counter into a clock
Combat: Combat now ends when the timer runs out

This is not well tested since the teams can't hurt each other yet.