Specify noncombat choices when re-adventuring

Fixes #204