Changed original conditional to a nest conditional of weapons