From 16c3fc47047b411ef6be99c0525d59ae70c3ce98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20Schr=C3=B6der?=
<fschroeder@techfak.uni-bielefeld.de>
Date: Wed, 17 Jan 2024 17:03:59 +0100
Subject: [PATCH] type hints
---
overcooked_simulator/counters.py | 2 +-
overcooked_simulator/game_items.py | 9 ++++-----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/overcooked_simulator/counters.py b/overcooked_simulator/counters.py
index cff964c5..9fe8eee9 100644
--- a/overcooked_simulator/counters.py
+++ b/overcooked_simulator/counters.py
@@ -145,7 +145,7 @@ class ServingWindow(Counter):
self,
pos,
game_score: GameScore,
- meals: list[str],
+ meals: set[str],
plate_dispenser: PlateDispenser = None,
):
self.game_score = game_score
diff --git a/overcooked_simulator/game_items.py b/overcooked_simulator/game_items.py
index b565fbe1..2b394bd5 100644
--- a/overcooked_simulator/game_items.py
+++ b/overcooked_simulator/game_items.py
@@ -77,7 +77,7 @@ class Item:
def extra_repr(self):
return ""
- def can_combine(self, other):
+ def can_combine(self, other) -> bool:
return False
def combine(self, other) -> Item | None:
@@ -106,7 +106,6 @@ class CookingEquipment(Item):
super().__init__(*args, **kwargs)
self.transitions = transitions
self.active_transition: Optional[dict] = None
- # self.content: Item | list[Item] = [] # list if cooking, meal item when done
self.content_ready: Item | None = None
self.content_list: list[Item] = []
@@ -116,7 +115,7 @@ class CookingEquipment(Item):
for transition in self.transitions.values():
transition["recipe"] = collections.Counter(transition["needs"])
- def can_combine(self, other):
+ def can_combine(self, other) -> bool:
# already cooking or nothing to combine
if other is None:
return False
@@ -134,7 +133,7 @@ class CookingEquipment(Item):
ingredients <= recipe["recipe"] for recipe in self.transitions.values()
)
- def combine(self, other):
+ def combine(self, other) -> Item | None:
return_value = None
if isinstance(other, CookingEquipment):
self.content_list.extend(other.content_list)
@@ -199,7 +198,7 @@ class CookingEquipment(Item):
class Plate(CookingEquipment):
- def __init__(self, transitions, clean, content=None, *args, **kwargs):
+ def __init__(self, transitions, clean, *args, **kwargs):
self.clean = clean
super().__init__(
name=self.create_name(), transitions=transitions, *args, **kwargs
--
GitLab