Fixed leveling

Updated the way leveling worked, so it works with the new combat system