From 34396b6ba81d11dbecc82aa67f6ee2d028a5350f Mon Sep 17 00:00:00 2001
From: fheinrich <fheinrich@techfak.uni-bielefeld.de>
Date: Mon, 11 Dec 2023 13:23:48 +0100
Subject: [PATCH] Removed comments, made pot more visible
---
overcooked_simulator/counters.py | 14 --------------
overcooked_simulator/pygame_gui/pygame_gui.py | 5 ++---
2 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/overcooked_simulator/counters.py b/overcooked_simulator/counters.py
index b480c1c1..d228137b 100644
--- a/overcooked_simulator/counters.py
+++ b/overcooked_simulator/counters.py
@@ -223,20 +223,6 @@ class Stove(Counter):
occupied_by = Pot()
super().__init__(pos, occupied_by)
- # def drop_off(self, item) -> Item | None:
- # if isinstance(item, (Pot, Pan)):
- # self.occupied_by = item
- # else:
- # self.occupied_by.combine(item)
- # return None
- #
- # def can_drop_off(self, item) -> bool:
- # if isinstance(item, (Pot, Pan)):
- # return not self.occupied_by
- # if self.occupied_by:
- # return self.occupied_by.can_combine(item)
- # return False
-
def progress(self):
"""Called by environment step function for time progression"""
if (
diff --git a/overcooked_simulator/pygame_gui/pygame_gui.py b/overcooked_simulator/pygame_gui/pygame_gui.py
index df41500f..7488799f 100644
--- a/overcooked_simulator/pygame_gui/pygame_gui.py
+++ b/overcooked_simulator/pygame_gui/pygame_gui.py
@@ -38,9 +38,7 @@ BACKGROUND_LINES_COLOR = (200, 200, 200)
KNIFE_COLOR = (120, 120, 120)
PLATE_RETURN_COLOR = (170, 170, 240)
BOARD_COLOR = (239, 193, 151)
-POT_COLOR = (180, 180, 180)
-# STOVE_COLOR = (60, 60, 60)
-# STOVE_HEATING_PLATE_COLOR = (252, 123, 73)
+POT_COLOR = (130, 130, 130)
USE_COOK_SPRITE = True
@@ -231,6 +229,7 @@ class PyGameGUI:
if isinstance(item, Pot):
pot_size = 15
pygame.draw.circle(self.screen, GREY, pos, pot_size)
+ pygame.draw.circle(self.screen, POT_COLOR, pos, pot_size, width=2)
if item.content:
self.draw_item(pos, item.content)
if isinstance(item, Soup):
--
GitLab