ticket:2 dialog logic reworked