Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions worlds/crosscode/world.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ class CrossCodeWorld(World):
pre_fill_any_dungeon: list[CrossCodeItem]

dungeon_location_list: dict[str, set[CrossCodeLocation]]
dungeon_areas: typing.ClassVar[set[str]] = {"cold-dng", "heat-dng", "shock-dng", "wave-dng", "tree-dng", "final-dng"}
dungeon_areas: typing.ClassVar[list[str]] = ["cold-dng", "heat-dng", "shock-dng", "wave-dng", "tree-dng", "final-dng"]

logic_dict: LogicDict

Expand Down Expand Up @@ -660,10 +660,7 @@ def set_rules(self):

def get_pre_fill_items(self) -> list[Item]:
pre_fill_items = self.pre_fill_any_dungeon.copy()
# self.dungeon_areas is a set, so sort for deterministic results. This probably isn't necessary in most cases,
# but other apworlds could do whatever they like with the returned list, so it is safer to return a list with a
# deterministic order.
for dungeon in sorted(self.dungeon_areas):
for dungeon in self.dungeon_areas:
pre_fill_items.extend(self.pre_fill_specific_dungeons[dungeon])
return pre_fill_items

Expand Down