Refactor bottle randomization

Bottle randomization refactored to be done on generation of itempool, not with the ItemFactory function. This allows difficulty settings to use different bottle pools more easily as well as allows the pedestal, credits, and spoiler logs to report bottle contents. Expert and insane difficulties deliberately set the same bottle content to all four bottles since the bottle limit is one in those modes so this only guarantees that all racers regardless of play sequence will get the same one free bottle content.

BaseClasses.py

@@ -336,6 +336,9 @@ class CollectionState(object):
     def can_lift_rocks(self):
         return self.has('Power Glove') or self.has('Titans Mitts')
 
+    def has_bottle(self):
+        return self.has('Bottle') or self.has('BottleRedPotion') or self.has('BottleGreenPotion') or self.has('BottleBluePotion') or self.has('BottleFairy') or self.has('BottleBee') or self.has('BottleGoodBee')
+
     def can_lift_heavy_rocks(self):
         return self.has('Titans Mitts')