Expanded the if condition to check each goal type

A simple transition from all '&&' to all '||' won't work, as the category count
will succeed while the Keeper match will fail, however, with all '||' it will
still consider the player to have won when they have not.
Fix the syntax error in the Keeper limit