Made random encounters better
Merge branch 'develop'