Consistent combat prompt, dojo update