diff --git a/project/forge_project.cfg b/project/forge_project.cfg index 0b67696..9a0c7d6 100644 --- a/project/forge_project.cfg +++ b/project/forge_project.cfg @@ -237,7 +237,7 @@ GROUP_3_1_X=48 GROUP_3_1_Y=58 GROUP_3_1_Z= GROUP_3_2_X=0 -GROUP_3_2_Y= +GROUP_3_2_Y=16 GROUP_3_2_Z= # Auto-Random Ignore (ARI) prefixes diff --git a/resources/background.png b/resources/background.png index 2b09675..22de263 100644 Binary files a/resources/background.png and b/resources/background.png differ diff --git a/src/forge_invar/display.py b/src/forge_invar/display.py index 1ac8876..bae7ef6 100644 --- a/src/forge_invar/display.py +++ b/src/forge_invar/display.py @@ -124,9 +124,31 @@ def __get_running_display(data: ForgeData) -> Image.Image: if data.mfx_inverted: draw2.rectangle((101, 30, 111, 30), fill="white") - # TODO show feedback - # TODO show blank out - # TODO show inverted out + # feedback / output + draw_base = False + + if data.frag_state(SRCA_FRAG) == 1: + draw_base = True + draw.rectangle((119, 22, 121, 36), fill="white") + draw.rectangle((119, 22, 127, 24), fill="white") + draw.rectangle((123, 21, 126, 25), fill=None, outline="black") + draw.rectangle((0, 22, 11, 24), fill="white") + draw.rectangle((1, 21, 4, 25), fill=None, outline="black") + + if data.frag_state(SRCB_FRAG) == 1: + draw_base = True + draw.rectangle((119, 34, 121, 48), fill="white") + draw.rectangle((119, 46, 127, 48), fill="white") + draw.rectangle((123, 45, 126, 49), fill=None, outline="black") + draw.rectangle((0, 46, 11, 48), fill="white") + draw.rectangle((1, 45, 4, 49), fill=None, outline="black") + + if not data.output_blank: + draw_base = True + draw.rectangle((119, 34, 128, 36), fill="white") + + if draw_base: + draw.rectangle((114, 34, 121, 36), fill="white") return __xor(im, im_overlay) @@ -170,7 +192,7 @@ def generate_background_image() -> None: # pipes draw.rectangle((26, 22, 78, 24), fill="white") draw.rectangle((26, 46, 78, 48), fill="white") - draw.rectangle((78, 34, 128, 36), fill="white") + draw.rectangle((78, 34, 105, 36), fill="white") draw.rectangle((76, 23, 78, 46), fill="white") # squares diff --git a/src/forge_invar/forge_data.py b/src/forge_invar/forge_data.py index 7c1665f..4997ac8 100644 --- a/src/forge_invar/forge_data.py +++ b/src/forge_invar/forge_data.py @@ -226,6 +226,10 @@ class ForgeData: self.frag_seed(MFX_FRAG), ) + @property + def output_blank(self) -> bool: + return self.group_value(EXTRA_GROUP, 1, 0)[1] > 0 + def mock(self) -> typing.Self: self.__data.read(MOCK_SAVE_PATH) self.state = ForgeState.RUNNING