Added proper end-of-combat system