Fix Octoberfest set builder

Pokémon could lack Trick if they would have gotten it as their third movement from randomSet. This is now properly dealt with. (Note that no OF-pokémon gets Present from randomSet.)
Remove a variable not needed anymore
Merge pull request #371 from Slayer95/patch-1

Fix Octoberfest set builder