more gameplay mechanics
Merge branch 'gameplay'