Merge pull request #3142 from RetiredWizard/fruitlogic

Logic_Gates: Fix recursion and NotImplementedErrors

Author: FoamyGuy

Fruit_Jam/Fruit_Jam_Logic_Gates/code.py

@@ -65,6 +65,8 @@
 old_button_values = [True, True, True]
 button_values_changed = False
 
+waiting_for_release = False
+
 while True:
     # update mouse, and get any mouse buttons that are pressed
     pressed_btns = mouse.update()
@@ -73,10 +75,16 @@
     now = time.monotonic()
     if last_click_time is None or now > last_click_time + CLICK_COOLDOWN:
         # if any buttons are pressed
-        if pressed_btns is not None and len(pressed_btns) > 0:
+        if not waiting_for_release and pressed_btns is not None and len(pressed_btns) > 0:
+            waiting_for_release = True
+            click_x = mouse.x
+            click_y = mouse.y
+            click_btns = pressed_btns
+        elif waiting_for_release and not mouse.pressed_btns:
+            waiting_for_release = False
             last_click_time = now
             # let workspace handle the click event
-            workspace.handle_mouse_click(mouse.x, mouse.y, pressed_btns)
+            workspace.handle_mouse_click(click_x, click_y, click_btns)
 
     # if there is an entity on the mouse being moved
     if not workspace.mouse_moving_tg.hidden:

Fruit_Jam/Fruit_Jam_Logic_Gates/entity.py

@@ -121,6 +121,11 @@ def input_one(self, value):
         self._input_one = value
         self.apply_state_palette_mapping()
 
+    @property
+    def value(self):
+        # Output panel does not have a logic output value
+        return False
+
     def update(self):
         """
         Run logic simulation for this entity
@@ -243,6 +248,7 @@ class Wire(Entity):
     TILE_INDEXES = [19, 9, 1, 0, 17]
 
     def __init__(self, location, workspace, state=None, add_to_workspace=True):
+        self._recursion_guard = False
         self.type = "wire"
         self.size = (1, 1)
         self._workspace = workspace
@@ -423,6 +429,12 @@ def get_value(self, ignore_input_entity):
 
     @property
     def value(self):
+        if self._recursion_guard:
+            self._recursion_guard = False
+            return self.input_one or self.input_two or self.input_three or self.input_three
+
+        self._recursion_guard = True
+
         if "left" in self.STATES[self.state]:
             if (
                 self.input_one_entity is None
@@ -435,6 +447,7 @@ def value(self):
                 else:
                     self.input_one = self.input_one_entity.value
                 if self.input_one:
+                    self._recursion_guard = False
                     return True
         if "right" in self.STATES[self.state]:
             if (
@@ -449,6 +462,7 @@ def value(self):
                     # right side only allows input from Wires
                     self.input_two = False
                 if self.input_two:
+                    self._recursion_guard = False
                     return True
         if "up" in self.STATES[self.state]:
             if (
@@ -463,6 +477,7 @@ def value(self):
                     # top side only accepts input from wires
                     self.input_three = False
                 if self.input_three:
+                    self._recursion_guard = False
                     return True
         if "down" in self.STATES[self.state]:
             if (
@@ -477,7 +492,10 @@ def value(self):
                     # bottom side only accepts input from wires?
                     self.input_four = False
                 if self.input_four:
+                    self._recursion_guard = False
                     return True
+
+        self._recursion_guard = False
         return self.input_one or self.input_two or self.input_three or self.input_three
 
     @property
@@ -512,7 +530,6 @@ def input_four_entity(self):
         else:
             return None
 
-
 class TwoInputOneOutputGate(Entity):
     """
     Super class for all Gate objects that have two inputs and one output.
@@ -535,6 +552,13 @@ class TwoInputOneOutputGate(Entity):
 
     _inputs_left = True
     """Whether the inputs are to the left (True), or top/bottom (False)"""
+    def __init__(self):
+        self._recursion_guard = False
+        self.type = "gate"
+
+        self._input_one = False
+        self._input_two = False
+        self._output = False
 
     @property
     def output(self) -> bool:
@@ -573,6 +597,11 @@ def input_two(self, value):
     def value(self):
         """Calculate the output logic value of this gate. Will call
         value property on input entities."""
+        if self._recursion_guard:
+            self._recursion_guard = False
+            return self.output
+
+        self._recursion_guard = True
         input_one_entity = self.input_one_entity
         input_two_entity = self.input_two_entity
 
@@ -594,6 +623,7 @@ def value(self):
             else:
                 self.input_two = input_two_entity.value
 
+        self._recursion_guard = False
         return self.output
 
     def handle_click(self):
@@ -664,7 +694,7 @@ class AndGate(TwoInputOneOutputGate):
     """AndGate - When both inputs are True the output will be True, otherwise False."""
 
     def __init__(self, location, workspace, add_to_workspace=True):
-        self.type = "gate"
+        super().__init__()
 
         self._workspace = workspace
         self.location = location
@@ -673,10 +703,6 @@ def __init__(self, location, workspace, add_to_workspace=True):
 
         self.tiles = [0, 10, 11, 20]
 
-        self._input_one = False
-        self._input_two = False
-        self._output = False
-
         if add_to_workspace:
             self._workspace.add_entity(self)
 
@@ -697,7 +723,7 @@ class NandGate(TwoInputOneOutputGate):
     """NandGate - When at least one input is False the output will be True, otherwise False."""
 
     def __init__(self, location, workspace, add_to_workspace=True):
-        self.type = "gate"
+        super().__init__()
 
         self._workspace = workspace
         self.location = location
@@ -706,10 +732,6 @@ def __init__(self, location, workspace, add_to_workspace=True):
 
         self.tiles = [0, 14, 15, 20]
 
-        self._input_one = False
-        self._input_two = False
-        self._output = False
-
         if add_to_workspace:
             self._workspace.add_entity(self)
 
@@ -730,7 +752,7 @@ class OrGate(TwoInputOneOutputGate):
     """OrGate - When either input is True the output will be True, otherwise False."""
 
     def __init__(self, location, workspace, add_to_workspace=True):
-        self.type = "gate"
+        super().__init__()
 
         self._workspace = workspace
         self.location = location
@@ -739,10 +761,6 @@ def __init__(self, location, workspace, add_to_workspace=True):
 
         self.tiles = [0, 12, 13, 20]
 
-        self._input_one = False
-        self._input_two = False
-        self._output = False
-
         if add_to_workspace:
             self._workspace.add_entity(self)
 
@@ -763,7 +781,7 @@ class NorGate(TwoInputOneOutputGate):
     """NorGate - When both inputs are False the output will be True, otherwise False."""
 
     def __init__(self, location, workspace, add_to_workspace=True):
-        self.type = "gate"
+        super().__init__()
 
         self._workspace = workspace
         self.location = location
@@ -772,10 +790,6 @@ def __init__(self, location, workspace, add_to_workspace=True):
 
         self.tiles = [0, 6, 7, 20]
 
-        self._input_one = False
-        self._input_two = False
-        self._output = False
-
         if add_to_workspace:
             self._workspace.add_entity(self)
 
@@ -796,7 +810,7 @@ class XorGate(TwoInputOneOutputGate):
     """XorGate - When one input is True and the other input is False the output will be True, otherwise False."""
 
     def __init__(self, location, workspace, add_to_workspace=True):
-        self.type = "gate"
+        super().__init__()
 
         self._workspace = workspace
         self.location = location
@@ -805,10 +819,6 @@ def __init__(self, location, workspace, add_to_workspace=True):
 
         self.tiles = [0, 4, 5, 20]
 
-        self._input_one = False
-        self._input_two = False
-        self._output = False
-
         if add_to_workspace:
             self._workspace.add_entity(self)
 
@@ -837,7 +847,7 @@ class XnorGate(TwoInputOneOutputGate):
     """XNOR Gate - When both inputs are True, or both inputs are False the output will be True, otherwise False"""
 
     def __init__(self, location, workspace, add_to_workspace=True):
-        self.type = "gate"
+        super().__init__()
 
         self._workspace = workspace
         self.location = location
@@ -846,10 +856,6 @@ def __init__(self, location, workspace, add_to_workspace=True):
 
         self.tiles = [0, 24, 25, 20]
 
-        self._input_one = False
-        self._input_two = False
-        self._output = False
-
         if add_to_workspace:
             self._workspace.add_entity(self)
 
@@ -878,6 +884,8 @@ class NotGate(Entity):
     """NOT Gate - When the input is False the output will be True, otherwise False."""
 
     def __init__(self, location, workspace, add_to_workspace=True):
+        self._recursion_guard = False
+
         self.type = "gate"
 
         self._workspace = workspace
@@ -919,13 +927,19 @@ def input_one_entity(self):
 
     @property
     def value(self):
+        if self._recursion_guard:
+            self._recursion_guard = False
+            return self.output
+
+        self._recursion_guard = True
         input_one_entity = self.input_one_entity
 
         if input_one_entity is not None:
             self.input_one = input_one_entity.value
         else:
             self.input_one = False
 
+        self._recursion_guard = False
         return self.output
 
     def _init_tile_locations(self):
@@ -1057,6 +1071,10 @@ def palette_mapping(self):
         pal[5] = 7 if self.input_three else 1
         return pal
 
+    @property
+    def value(self):
+        return False
+
     def apply_state_palette_mapping(self):
         """
         Apply the current palette mapping to all tiles used by this Gate.