Merge branch 'master' into feature
Reduced collection rates at higher size hordes
Diagonal directions are calculated fairly, added self direction
Merge branch 'feature'