Skip to content
Snippets Groups Projects
Commit c45545fb authored by Fabian Heinrich's avatar Fabian Heinrich
Browse files

Fix merge

parent 9d22c368
No related branches found
No related tags found
1 merge request!72Resolve "Too large number of selected players does not break the gui and environment"
Pipeline #47709 failed
......@@ -68,7 +68,9 @@ PREVENT_SQUEEZING_INTO_OTHER_PLAYERS = True
class EnvironmentConfig(TypedDict):
plates: PlateConfig
game: dict[
Literal["time_limit_seconds"] | Literal["undo_dispenser_pickup"], int | bool
Literal["time_limit_seconds"] | Literal["undo_dispenser_pickup"],
int | bool,
bool,
]
meals: dict[Literal["all"] | Literal["list"], bool | list[str]]
orders: OrderConfig
......@@ -232,25 +234,25 @@ class Environment:
"validate_recipes" in self.environment_config["game"].keys()
and self.environment_config["game"]["validate_recipes"]
):
# TODO Maybe validation can be turned off in config...
meals_to_be_ordered = self.validate_environment()
meals_to_be_ordered = self.recipe_validation.validate_environment(
self.counters
)
assert meals_to_be_ordered, "Need possible meals for order generation."
available_meals = {
meal: self.item_info[meal] for meal in meals_to_be_ordered
}
else:
all_meals = {
meal_name: meal_info
for meal_name, meal_info in self.item_info.items()
if meal_info.type == ItemType.Meal
}
available_meals = (
{n: self.item_info[n] for n in self.environment_config["meals"]["list"]}
if not self.environment_config["meals"]["all"]
else all_meals
set_meals = {
n: self.item_info[n] for n in self.environment_config["meals"]["list"]
}
meals_to_be_ordered = (
set_meals if not self.environment_config["meals"]["all"] else all_meals
)
meals_to_be_ordered = self.recipe_validation.validate_environment(self.counters)
assert meals_to_be_ordered, "Need possible meals for order generation."
available_meals = {meal: self.item_info[meal] for meal in meals_to_be_ordered}
self.order_manager.set_available_meals(available_meals)
self.order_manager.create_init_orders(self.env_time)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment