Travelling merchants, attack rework