Added new combat system (untested)