From 85a2193f35bd5a946f46ef832cd6d1b1576cb9e0 Mon Sep 17 00:00:00 2001 From: Ziktofel Date: Tue, 4 Jul 2023 21:27:04 +0200 Subject: [PATCH] SC2: Move itempool generation logic from `generate_basic` to `create_items`. (#1940) --- worlds/sc2wol/__init__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/worlds/sc2wol/__init__.py b/worlds/sc2wol/__init__.py index 822d36fc..49052429 100644 --- a/worlds/sc2wol/__init__.py +++ b/worlds/sc2wol/__init__.py @@ -62,7 +62,9 @@ class SC2WoLWorld(World): 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) 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 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) def get_filler_item_name(self) -> str: