Merge pull request missionpinball#1938 from bosh/randomizer_cleanup

clean up duplication in random_event_player and improve randomizer tests

Author: avanwinkle

mpf/config_players/random_event_player.py

@@ -23,48 +23,44 @@ def is_entry_valid_outside_mode(settings) -> bool:
         """Return true if scope is not player."""
         return settings['scope'] != "player"
 
-    def _get_randomizer(self, settings, context, calling_context):
-        key = "random_{}.{}".format(context, calling_context)
-        if settings['scope'] == "player":
-            if not self.machine.game.player[key]:
-                self.machine.game.player[key] = Randomizer(
-                    settings['events'], self.machine, template_type="event")
-                r'''player_var: random_(x).(y)
+    def _build_randomizer(self, settings):
+        randomizer = Randomizer(settings['events'], self.machine, template_type="event")
+
+        if settings['force_all']:
+            randomizer.force_all = True
 
-                desc: Holds references to Randomizer settings that need to be
-                tracked on a player basis. There is nothing you need to know
-                or do with this, rather this is just FYI on what the player
-                variables that start with "random\_" are.
-                '''
+        if not settings['force_different']:
+            randomizer.force_different = False
 
-                if settings['force_all']:
-                    self.machine.game.player[key].force_all = True
+        if settings['disable_random']:
+            randomizer.disable_random = True
 
-                if not settings['force_different']:
-                    self.machine.game.player[key].force_different = False
+        randomizer.fallback_value = settings.get('fallback_event')
+        return randomizer
 
-                if settings['disable_random']:
-                    self.machine.game.player[key].disable_random = True
+    def _get_randomizer(self, settings, context, calling_context):
+        key = "random_{}.{}".format(context, calling_context)
+        if settings['scope'] == "player":
+            if not self.machine.game.player[key]:
+                self.machine.game.player[key] = self._build_randomizer(settings)
 
-                self.machine.game.player[key].fallback_value = settings.get('fallback_event')
+            '''player_var: random_(x).(y)
 
+            desc: Holds references to Randomizer settings that need to be
+            tracked on a player basis. There is nothing you need to know
+            or do with this, rather this is just FYI on what the player
+            variables that start with "random_" are.
+            '''
             return self.machine.game.player[key]
 
         if key not in self._machine_wide_dict:
-            self._machine_wide_dict[key] = Randomizer(
-                settings['events'], self.machine, template_type="event")
-
-            if settings['force_all']:
-                self._machine_wide_dict[key].force_all = True
-
-            if not settings['force_different']:
-                self._machine_wide_dict[key].force_different = False
-
-            if settings['disable_random']:
-                self._machine_wide_dict[key].disable_random = True
+            self._machine_wide_dict[key] = self._build_randomizer(settings)
 
-            self._machine_wide_dict[key].fallback_value = settings.get('fallback_event')
+        '''machine_var: random_(x).(y)
 
+        desc: Holds references to Randomizer settings that need to be
+        tracked on a machine basis.
+        '''
         return self._machine_wide_dict[key]
 
     def play(self, settings, context, calling_context, priority=0, **kwargs):

mpf/core/randomizer.py

@@ -1,5 +1,4 @@
 """Generic list randomizer."""
-from uuid import uuid4
 import random
 
 
@@ -13,13 +12,13 @@ def __init__(self, items, machine=None, template_type=None):
         self.force_different = True
         self.force_all = False
         self.disable_random = False
-        # self.loop - property which sets force_all=True if loop==False
         self.items = list()
 
+        # self.loop - property which sets force_all=True if loop==False
         self._loop = True
+
         self._template_type = template_type
         self.data = None
-        self._uuid = uuid4()
 
         if isinstance(items, (list, tuple)):
             for i in items: