z-order armor by location, now that it has a location.

Make this whole section consistent; armor has a location now, so we should use it to determine z-ordering.