From 823b17c386f1dce27e537e1c0263b0bc8670c377 Mon Sep 17 00:00:00 2001 From: Scipio Wright Date: Mon, 20 Jan 2025 11:44:39 -0500 Subject: [PATCH] TUNIC: Make grass go in the regular location name group too (#4504) * Make grass go in the normal loc group too * Make it not overwrite old groups --- worlds/tunic/__init__.py | 3 ++- worlds/tunic/grass.py | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/worlds/tunic/__init__.py b/worlds/tunic/__init__.py index 96d3c10b..087e17c3 100644 --- a/worlds/tunic/__init__.py +++ b/worlds/tunic/__init__.py @@ -78,7 +78,8 @@ class TunicWorld(World): settings: ClassVar[TunicSettings] item_name_groups = item_name_groups location_name_groups = location_name_groups - location_name_groups.update(grass_location_name_groups) + for group_name, members in grass_location_name_groups.items(): + location_name_groups.setdefault(group_name, set()).update(members) item_name_to_id = item_name_to_id location_name_to_id = standard_location_name_to_id.copy() diff --git a/worlds/tunic/grass.py b/worlds/tunic/grass.py index 592b2938..eb688199 100644 --- a/worlds/tunic/grass.py +++ b/worlds/tunic/grass.py @@ -7767,8 +7767,10 @@ grass_location_name_to_id: Dict[str, int] = {name: location_base_id + 302 + inde grass_location_name_groups: Dict[str, Set[str]] = {} for loc_name, loc_data in grass_location_table.items(): - loc_group_name = loc_name.split(" - ", 1)[0] + " Grass" - grass_location_name_groups.setdefault(loc_group_name, set()).add(loc_name) + area_name = loc_name.split(" - ", 1)[0] + # adding it to the normal location group and a grass-only one + grass_location_name_groups.setdefault(area_name, set()).add(loc_name) + grass_location_name_groups.setdefault(area_name + " Grass", set()).add(loc_name) def can_break_grass(state: CollectionState, world: "TunicWorld") -> bool: