Combat now uses weapons correctly