diff --git a/cooperative_cuisine/pygame_2d_vis/gui.py b/cooperative_cuisine/pygame_2d_vis/gui.py index 8c6ad90a0c6f3be86cfd927a170a609a2bf6a418..b90ddf7f47b285a38afcb4411c2a6937cdc1f623 100644 --- a/cooperative_cuisine/pygame_2d_vis/gui.py +++ b/cooperative_cuisine/pygame_2d_vis/gui.py @@ -1181,6 +1181,7 @@ class PyGameGUI: ) served_meals = state["served_meals"] + served_meals = [("0", "TomatoSoup")] * 20 row_height = self.window_height * 0.07 container_width = self.scroll_width_completed_meals @@ -1224,47 +1225,6 @@ class PyGameGUI: anchors=anchors, ) - text = ":" - rect = pygame.Rect( - (0, 0), - (container_width / 10, row_height), - ) - rect.left = 0 - meal_label = pygame_gui.elements.UILabel( - text=text, - relative_rect=rect, - manager=self.manager, - container=container, - object_id="#served_meal", - anchors={"center": "center"}, - ) - - cook_surface = pygame.Surface( - (row_height, row_height), flags=pygame.SRCALPHA - ) - player_idx = int(player) - player_color = colors[self.vis.player_colors[player_idx]] - self.vis.draw_cook( - screen=cook_surface, - grid_size=row_height, - pos=np.array([row_height / 2, row_height / 2]), - color=player_color, - facing=np.array([0, 1]), - ) - rect = cook_surface.get_rect() - rect.right = 0 - cook_image = pygame_gui.elements.UIImage( - relative_rect=rect, - image_surface=cook_surface, - manager=self.manager, - container=container, - anchors={ - "centery": "centery", - "right": "right", - "right_target": meal_label, - }, - ) - meal_surface = pygame.Surface( (row_height, row_height), flags=pygame.SRCALPHA ) @@ -1285,15 +1245,55 @@ class PyGameGUI: grid_size=row_height, ) rect = meal_surface.get_rect() - # rect.left = 0 + rect.center = (rect.center[0] - (self.buttons_width * 0.3), rect.center[1]) meal_image = pygame_gui.elements.UIImage( relative_rect=rect, image_surface=meal_surface, manager=self.manager, container=container, - anchors={"centery": "centery", "left_target": meal_label}, + anchors={"center": "center"}, ) + rect = pygame.Rect( + (0, 0), + (container_width / 4, row_height), + ) + rect.left = 0 + meal_label = pygame_gui.elements.UILabel( + text="translations.was_served", + relative_rect=rect, + manager=self.manager, + container=container, + object_id="#was_served", + anchors={"centery": "centery", "left_target": meal_image}, + ) + + # cook_surface = pygame.Surface( + # (row_height, row_height), flags=pygame.SRCALPHA + # ) + # player_idx = int(player) + # player_color = colors[self.vis.player_colors[player_idx]] + # self.vis.draw_cook( + # screen=cook_surface, + # grid_size=row_height, + # pos=np.array([row_height / 2, row_height / 2]), + # color=player_color, + # facing=np.array([0, 1]), + # ) + # rect = cook_surface.get_rect() + # rect.right = 0 + # cook_image = pygame_gui.elements.UIImage( + # relative_rect=rect, + # image_surface=cook_surface, + # manager=self.manager, + # container=container, + # anchors={ + # "centery": "centery", + # "right": "right", + # "right_target": meal_label, + # }, + # ) + last_completed_meals.append(container) self.scroll_space_completed_meals.set_scrollable_area_dimensions( @@ -1455,7 +1455,7 @@ class PyGameGUI: ] # layout_path = self.layout_file_paths[self.current_layout_idx] - item_info_path = ROOT_DIR / "configs" / "item_info.yaml" + item_info_path = ROOT_DIR / "configs" / "item_info_debug.yaml" with open(item_info_path, "r") as file: item_info = file.read() with open(layout_path, "r") as file: diff --git a/cooperative_cuisine/pygame_2d_vis/gui_theme.json b/cooperative_cuisine/pygame_2d_vis/gui_theme.json index a67753356698864486856ae56c7e23ab65f296a8..5ceaf4397e562c1e82e53566b5f09e91598e41f9 100644 --- a/cooperative_cuisine/pygame_2d_vis/gui_theme.json +++ b/cooperative_cuisine/pygame_2d_vis/gui_theme.json @@ -226,5 +226,10 @@ "border_width": "0", "shadow_width": "0" } + }, + "#was_served": { + "misc": { + "text_horiz_alignment": "left" + } } } diff --git a/cooperative_cuisine/pygame_2d_vis/locales/translations.de.json b/cooperative_cuisine/pygame_2d_vis/locales/translations.de.json index f792c21ff567d7a47aecbe1c44a843251253a2b4..9e2417d64ded6a72e388667c96936520d43d0c88 100644 --- a/cooperative_cuisine/pygame_2d_vis/locales/translations.de.json +++ b/cooperative_cuisine/pygame_2d_vis/locales/translations.de.json @@ -13,6 +13,7 @@ "salad_recipe": "Rezept für Salat:", "recipes_in_this_level": "Rezepte in diesem Level:", "level_name": "Level: %{level}", + "was_served": " wurde serviert", "waiting_for_players": "WARTE AUF ANDERE SPIELER", "orders": "Bestellungen:", "score": "Punktestand: %{score}", diff --git a/cooperative_cuisine/pygame_2d_vis/locales/translations.en.json b/cooperative_cuisine/pygame_2d_vis/locales/translations.en.json index 5dad4e11708d1ea4f813e54d7a7aa4b9ee3fef1e..a04668b98505343cd4244262a77cd12ba6c09a9d 100644 --- a/cooperative_cuisine/pygame_2d_vis/locales/translations.en.json +++ b/cooperative_cuisine/pygame_2d_vis/locales/translations.en.json @@ -13,6 +13,7 @@ "salad_recipe": "Salad recipe:", "recipes_in_this_level": "Recipes in this level:", "level_name": "Level: %{level}", + "was_served": " was served", "waiting_for_players": "WAITING FOR OTHER PLAYERS", "orders": "Orders:", "score": "Score: %{score}",