Added rock generation, unified obstacle detection