monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move godhome events to create_regions with the others to not try and make them non-events when unshuffled is on (#3221)

This commit is contained in:
qwint 2024-05-02 08:26:17 -05:00 committed by GitHub
parent 0d586a4467
commit 49862dca1f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
worlds/hk/__init__.py
View File

@ -199,8 +199,14 @@ class HKWorld(World):
self.multiworld.regions.append(menu_region) self.multiworld.regions.append(menu_region)
# wp_exclusions = self.white_palace_exclusions() # wp_exclusions = self.white_palace_exclusions()
# check for any goal that godhome events are relevant to
all_event_names = event_names.copy()
if self.multiworld.Goal[self.player] in [Goal.option_godhome, Goal.option_godhome_flower]:
from .GodhomeData import godhome_event_names
all_event_names.update(set(godhome_event_names))
# Link regions # Link regions
for event_name in event_names: for event_name in all_event_names:
#if event_name in wp_exclusions: #if event_name in wp_exclusions:
# continue # continue
loc = HKLocation(self.player, event_name, None, menu_region) loc = HKLocation(self.player, event_name, None, menu_region)
@ -307,12 +313,6 @@ class HKWorld(World):
randomized = True randomized = True
_add("Elevator_Pass", "Elevator_Pass", randomized) _add("Elevator_Pass", "Elevator_Pass", randomized)
# check for any goal that godhome events are relevant to
if self.multiworld.Goal[self.player] in [Goal.option_godhome, Goal.option_godhome_flower]:
from .GodhomeData import godhome_event_names
for item_name in godhome_event_names:
_add(item_name, item_name, False)
for shop, locations in self.created_multi_locations.items(): for shop, locations in self.created_multi_locations.items():
for _ in range(len(locations), getattr(self.multiworld, shop_to_option[shop])[self.player].value): for _ in range(len(locations), getattr(self.multiworld, shop_to_option[shop])[self.player].value):
loc = self.create_location(shop) loc = self.create_location(shop)