Re work of game selection logic to be less shit
Fixes #3532 (force secret only works if game mode is in random pool)
Merge pull request #3696 from MrStonedOne/letmeshowyoumysecrets

Fixes #3532 (force secret only works if game mode is in random pool)