From 54154a3a601f9b40e1cd60e8e2ddbec20f6fbf0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20Schr=C3=B6der?=
<fschroeder@techfak.uni-bielefeld.de>
Date: Wed, 20 Dec 2023 13:47:42 +0100
Subject: [PATCH] only combine items on the sink addon
---
overcooked_simulator/counters.py | 10 +++-------
overcooked_simulator/game_content/layouts/basic.layout | 4 ++--
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/overcooked_simulator/counters.py b/overcooked_simulator/counters.py
index a39ce213..b07f1994 100644
--- a/overcooked_simulator/counters.py
+++ b/overcooked_simulator/counters.py
@@ -362,7 +362,7 @@ class SinkAddon(Counter):
self.occupied_by = deque(occupied_by) if occupied_by else deque()
def can_drop_off(self, item: Item) -> bool:
- return not self.occupied_by or self.occupied_by[-1].can_combine(item)
+ return self.occupied_by and self.occupied_by[-1].can_combine(item)
def drop_off(self, item: Item) -> Item | None:
"""Takes the thing dropped of by the player.
@@ -370,14 +370,10 @@ class SinkAddon(Counter):
Args:
item: The item to be placed on the counter.
- Returns: TODO Return information, whether the score is affected (Serving Window?)
+ Returns:
"""
- if not self.occupied_by:
- self.occupied_by.append(item)
- elif self.occupied_by[-1].can_combine(item):
- return self.occupied_by[-1].combine(item)
- return None
+ return self.occupied_by[-1].combine(item)
def add_clean_plate(self, plate: Plate):
self.occupied_by.appendleft(plate)
diff --git a/overcooked_simulator/game_content/layouts/basic.layout b/overcooked_simulator/game_content/layouts/basic.layout
index eb9b1de1..8b46829b 100644
--- a/overcooked_simulator/game_content/layouts/basic.layout
+++ b/overcooked_simulator/game_content/layouts/basic.layout
@@ -4,8 +4,8 @@ _#_______M_______
_#_______#_______
_W_______________
_#__A__A_________
-_B_______________
-_B_______#_______
+_C_______________
+_C_______#_______
_#_______X_______
_#P#S+#S+#_______
_________________
--
GitLab