diff --git a/overcooked_simulator/counters.py b/overcooked_simulator/counters.py index 39d8b8cc5d6914fe396ee6eb2a128d8dc5123875..c91a62d08b4024626e6d093d5a5faa3f5b9da694 100644 --- a/overcooked_simulator/counters.py +++ b/overcooked_simulator/counters.py @@ -316,7 +316,7 @@ class Trash(Counter): def drop_off(self, item: Item) -> Item | None: if isinstance(item, CookingEquipment): - item.content = None + item.reset_content() return item return None @@ -367,9 +367,9 @@ class Sink(Counter): self.occupied_by[-1].progress( equipment=self.__class__.__name__, percent=percent ) - print(self.occupied_by[-1].progress_percentage) if self.occupied_by[-1].progress_percentage == 1.0: self.occupied_by[-1].reset() + print(self.transitions[self.occupied_by[-1].name]["result"]) self.occupied_by[-1].name = self.transitions[self.occupied_by[-1].name][ "result" ] diff --git a/overcooked_simulator/game_items.py b/overcooked_simulator/game_items.py index 06df4e12010cedc4551b7a3b64f7f64a3a4bd42b..60abcc4906379ee8e349adbefec51da71356950b 100644 --- a/overcooked_simulator/game_items.py +++ b/overcooked_simulator/game_items.py @@ -248,8 +248,7 @@ e: def release(self): content = self.content_list - self.content_list = None - self.content_ready = None + self.reset_content() return content @property @@ -322,7 +321,7 @@ class Plate(CookingEquipment): # return not self.clean def create_name(self): - return "CleanPlate" if self.clean else "DirtyPlate" + return "Plate" if self.clean else "DirtyPlate" def can_combine(self, other): if not super().can_combine(other): diff --git a/overcooked_simulator/gui_2d_vis/visualization.yaml b/overcooked_simulator/gui_2d_vis/visualization.yaml index 021761424694300f516cd77cfd63e907ac60fa23..8ec7a62e2c1b113416dda6ada81c968c11d14d06 100644 --- a/overcooked_simulator/gui_2d_vis/visualization.yaml +++ b/overcooked_simulator/gui_2d_vis/visualization.yaml @@ -275,7 +275,7 @@ Cook: path: images/pixel_cook.png size: 1 -CleanPlate: +Plate: parts: - type: image path: images/plate_clean.png