Moved weapon replacement back to post-inventory