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

SC2: Move itempool generation logic from `generate_basic` to `create_items`. (#1940)

This commit is contained in:
Ziktofel 2023-07-04 21:27:04 +02:00 committed by GitHub
parent 857364fa78
commit 85a2193f35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
worlds/sc2wol/__init__.py
View File

@ -62,7 +62,9 @@ class SC2WoLWorld(World):
self.multiworld, self.player, get_locations(self.multiworld, self.player), self.location_cache self.multiworld, self.player, get_locations(self.multiworld, self.player), self.location_cache
) )
def generate_basic(self): def create_items(self):
setup_events(self.player, self.locked_locations, self.location_cache)
excluded_items = get_excluded_items(self.multiworld, self.player) excluded_items = get_excluded_items(self.multiworld, self.player)
starter_items = assign_starter_items(self.multiworld, self.player, excluded_items, self.locked_locations) starter_items = assign_starter_items(self.multiworld, self.player, excluded_items, self.locked_locations)
@ -74,7 +76,6 @@ class SC2WoLWorld(World):
self.multiworld.itempool += pool self.multiworld.itempool += pool
def set_rules(self): def set_rules(self):
setup_events(self.player, self.locked_locations, self.location_cache)
self.multiworld.completion_condition[self.player] = lambda state: state.has(self.victory_item, self.player) self.multiworld.completion_condition[self.player] = lambda state: state.has(self.victory_item, self.player)
def get_filler_item_name(self) -> str: def get_filler_item_name(self) -> str: