added weapon reordering to put equipped weapon first