Skip to content

Commit 672a97c

Browse files
author
Zach Parks
authored
Core: Set locality rules after set_rules stage. (#2044)
* Core: Set locality rules after `generate_basic`. * Move locality rules to before `generate_basic`.
1 parent b684ba4 commit 672a97c

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

Main.py

+7-6
Original file line numberDiff line numberDiff line change
@@ -133,12 +133,6 @@ def main(args, seed=None, baked_server_options: Optional[Dict[str, object]] = No
133133
world.non_local_items[player].value -= world.local_items[player].value
134134
world.non_local_items[player].value -= set(world.local_early_items[player])
135135

136-
if world.players > 1:
137-
locality_rules(world)
138-
else:
139-
world.non_local_items[1].value = set()
140-
world.local_items[1].value = set()
141-
142136
AutoWorld.call_all(world, "set_rules")
143137

144138
for player in world.player_ids:
@@ -147,6 +141,13 @@ def main(args, seed=None, baked_server_options: Optional[Dict[str, object]] = No
147141
for location_name in world.priority_locations[player].value:
148142
world.get_location(location_name, player).progress_type = LocationProgressType.PRIORITY
149143

144+
# Set local and non-local item rules.
145+
if world.players > 1:
146+
locality_rules(world)
147+
else:
148+
world.non_local_items[1].value = set()
149+
world.local_items[1].value = set()
150+
150151
AutoWorld.call_all(world, "generate_basic")
151152

152153
# remove starting inventory from pool items.

0 commit comments

Comments
 (0)