fully implemented new combat system