EventPlayer: Bugfix multiple conditionals

mpf/config_players/event_player.py

@@ -24,15 +24,16 @@ def __init__(self, machine):
 
     def play(self, settings, context, calling_context, priority=0, **kwargs):
         """Post (delayed) events."""
-        for event, s in settings.items():
-            if s["condition"] and not s["condition"].evaluate(kwargs):
-                continue
+        for event, event_configs in settings.items():
+            for s in event_configs:
+                if s["condition"] and not s["condition"].evaluate(kwargs):
+                    continue
 
-            if s["number"] is not None:
-                self.delay.add(callback=self._post_event, ms=s["number"],
-                               event=event, priority=s["priority"], params=s["params"], **kwargs)
-            else:
-                self._post_event(event, s["priority"], s["params"], **kwargs)
+                if s["number"] is not None:
+                    self.delay.add(callback=self._post_event, ms=s["number"],
+                                   event=event, priority=s["priority"], params=s["params"], **kwargs)
+                else:
+                    self._post_event(event, s["priority"], s["params"], **kwargs)
 
     # pylint: disable-msg=too-many-arguments
     def handle_subscription_change(self, value, settings, priority, context, key):
@@ -46,15 +47,16 @@ def handle_subscription_change(self, value, settings, priority, context, key):
         if not value:
             return
 
-        for event, s in settings.items():
-            if s["condition"] and not s["condition"].evaluate({}):
-                continue
+        for event, event_configs in settings.items():
+            for s in event_configs:
+                if s["condition"] and not s["condition"].evaluate({}):
+                    continue
 
-            if s["number"] is not None:
-                self.delay.add(callback=self._post_event, ms=s["number"],
-                               event=event, priority=s["priority"], params=s["params"])
-            else:
-                self._post_event(event, s["priority"], s["params"])
+                if s["number"] is not None:
+                    self.delay.add(callback=self._post_event, ms=s["number"],
+                                event=event, priority=s["priority"], params=s["params"])
+                else:
+                    self._post_event(event, s["priority"], s["params"])
 
     def _post_event(self, event, priority, params, **kwargs):
         if "(" in event:
@@ -74,21 +76,24 @@ def validate_config_entry(self, settings, name):
         final_config = {}
         for event, s in config.items():
             if "(" in event:
-                final_config[event] = {
+                if event not in final_config:
+                    final_config[event] = []
+                final_config[event].append({
                     "condition": None,
                     "number": None,
                     "priority": s["priority"],
                     "params": {k: v for k, v in s.items() if k != "priority"}
-                }
+                })
             else:
                 var = self._parse_and_validate_conditional(event, name)
-                final_config[var.name] = {
+                if var.name not in final_config:
+                    final_config[var.name] = []
+                final_config[var.name].append({
                     "condition": var.condition,
                     "number": Util.string_to_ms(var.number) if var.number else None,
                     "priority": s["priority"],
                     "params": {k: v for k, v in s.items() if k != "priority"}
-                }
-
+                })
         return final_config
 
     def _evaluate_event_param(self, param, kwargs):

mpf/tests/machine_files/event_players/config/test_event_player.yaml

@@ -35,6 +35,13 @@ event_player:
         - event_always
         - event_if_modeactive{mode.mode1.active}
         - event_if_modestopping{mode.mode1.stopping}
+    test_conditional_multiples:
+      conditional_response{value==0}:
+        amount: zero
+      conditional_response{value==1}:
+        amount: one
+      conditional_response{value>1}:
+        amount: greater
     play_placeholder_event:
       - my_event_(machine.test)_123
     play_placeholder_args:

mpf/tests/test_EventPlayer.py

@@ -144,6 +144,19 @@ def test_handler_condition(self):
         self.assertEqual(1, self._events["event_if_modeactive"])
         self.assertEqual(1, self._events["event_if_modestopping"])
 
+    def test_conditional_multiples(self):
+        self.mock_event("conditional_response")
+        self.post_event_with_params("test_conditional_multiples", value=-8)
+        self.assertEqual(0, self._events["conditional_response"])
+        self.post_event_with_params("test_conditional_multiples", value=1)
+        self.assertEqual(1, self._events["conditional_response"])
+        self.assertEqual({"amount": "one", "priority": 0}, self._last_event_kwargs['conditional_response'])
+
+        self.post_event_with_params("test_conditional_multiples", value=20)
+        self.assertEqual({"amount": "greater", "priority": 0}, self._last_event_kwargs['conditional_response'])
+        self.post_event_with_params("test_conditional_multiples", value=0)
+        self.assertEqual({"amount": "zero", "priority": 0}, self._last_event_kwargs['conditional_response'])
+
     def test_event_time_delays(self):
         self.mock_event('td1')
         self.mock_event('td2')