Combine armor auto-complete, update knight bonus