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
This commit is contained in:
parent
05d1b2129a
commit
823b17c386
|
@ -78,7 +78,8 @@ class TunicWorld(World):
|
||||||
settings: ClassVar[TunicSettings]
|
settings: ClassVar[TunicSettings]
|
||||||
item_name_groups = item_name_groups
|
item_name_groups = item_name_groups
|
||||||
location_name_groups = location_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
|
item_name_to_id = item_name_to_id
|
||||||
location_name_to_id = standard_location_name_to_id.copy()
|
location_name_to_id = standard_location_name_to_id.copy()
|
||||||
|
|
|
@ -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]] = {}
|
grass_location_name_groups: Dict[str, Set[str]] = {}
|
||||||
for loc_name, loc_data in grass_location_table.items():
|
for loc_name, loc_data in grass_location_table.items():
|
||||||
loc_group_name = loc_name.split(" - ", 1)[0] + " Grass"
|
area_name = loc_name.split(" - ", 1)[0]
|
||||||
grass_location_name_groups.setdefault(loc_group_name, set()).add(loc_name)
|
# 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:
|
def can_break_grass(state: CollectionState, world: "TunicWorld") -> bool:
|
||||||
|
|
Loading…
Reference in New Issue