adjusting how drunk works, and making a zone give you drunk
Merge remote-tracking branch 'origin/master'