Tweaked HasAdventure logic
Merge branch 'develop'