Updated wave spawn logic